Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
31811365
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
31811365
编写于
4月 24, 2015
作者:
J
Jeffrey Wilcke
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #800 from obscuren/ethereum_js_update
Ethereum js update
上级
b6ec1c72
dc62fb2e
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
8 addition
and
13 deletion
+8
-13
.gitignore
.gitignore
+0
-2
.gitmodules
.gitmodules
+1
-1
cmd/geth/js.go
cmd/geth/js.go
+1
-1
cmd/mist/assets/examples/coin.html
cmd/mist/assets/examples/coin.html
+1
-2
cmd/mist/assets/ext/ethereum.js
cmd/mist/assets/ext/ethereum.js
+1
-1
eth/handler.go
eth/handler.go
+1
-5
jsre/ethereum_js.go
jsre/ethereum_js.go
+3
-1
未找到文件。
.gitignore
浏览文件 @
31811365
...
...
@@ -23,8 +23,6 @@ Godeps/_workspace/bin
.project
.settings
mist
cmd/mist/mist
deploy/osx/Mist.app
deploy/osx/Mist\ Installer.dmg
...
...
.gitmodules
浏览文件 @
31811365
[submodule "cmd/mist/assets/ext/ethereum.js"]
path = cmd/mist/assets/ext/ethereum.js
url = https://github.com/ethereum/
ethereum
.js
url = https://github.com/ethereum/
web3
.js
cmd/geth/js.go
浏览文件 @
31811365
...
...
@@ -118,7 +118,7 @@ func (js *jsre) apiBindings() {
utils
.
Fatalf
(
"Error loading ethereum.js: %v"
,
err
)
}
_
,
err
=
js
.
re
.
Eval
(
"var web3 = require('
ethereum.js
');"
)
_
,
err
=
js
.
re
.
Eval
(
"var web3 = require('
web3
');"
)
if
err
!=
nil
{
utils
.
Fatalf
(
"Error requiring web3: %v"
,
err
)
}
...
...
cmd/mist/assets/examples/coin.html
浏览文件 @
31811365
...
...
@@ -3,7 +3,7 @@
<title>
JevCoin
</title>
<head>
<script
type=
"text/javascript"
src=
"../ext/bignumber.min.js"
></script>
<script
type=
"text/javascript"
src=
"../ext/ethereum.js/dist/
ethereum
-light.min.js"
></script>
<script
type=
"text/javascript"
src=
"../ext/ethereum.js/dist/
web3
-light.min.js"
></script>
</head>
<body>
...
...
@@ -32,7 +32,6 @@
</body>
<script
type=
"text/javascript"
>
var
web3
=
require
(
'
ethereum.js
'
);
var
eth
=
web3
.
eth
;
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
'
http://localhost:8545
'
));
...
...
ethereum.js
@
f8a43edd
Subproject commit
c80ede50c3b60a482f1ec76038325ec52f5e73b0
Subproject commit
f8a43eddfb450d0e0ba1669a6916babe0ea43642
eth/handler.go
浏览文件 @
31811365
...
...
@@ -276,7 +276,7 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
return
errResp
(
ErrDecode
,
"block validation %v: %v"
,
msg
,
err
)
}
hash
:=
request
.
Block
.
Hash
()
// Add the block hash as a known hash to the peer. This will later be used to det
i
rmine
// Add the block hash as a known hash to the peer. This will later be used to det
e
rmine
// who should receive this.
p
.
blockHashes
.
Add
(
hash
)
...
...
@@ -296,7 +296,6 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
if
self
.
chainman
.
HasBlock
(
hash
)
{
break
}
/* XXX unsure about this */
if
self
.
chainman
.
Td
()
.
Cmp
(
request
.
TD
)
>
0
&&
new
(
big
.
Int
)
.
Add
(
request
.
Block
.
Number
(),
big
.
NewInt
(
7
))
.
Cmp
(
self
.
chainman
.
CurrentBlock
()
.
Number
())
<
0
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"[%s] dropped block %v due to low TD %v
\n
"
,
p
.
id
,
request
.
Block
.
Number
(),
request
.
TD
)
break
...
...
@@ -305,14 +304,12 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
// Attempt to insert the newly received by checking if the parent exists.
// if the parent exists we process the block and propagate to our peers
// if the parent does not exists we delegate to the downloader.
// NOTE we can reduce chatter by dropping blocks with Td < currentTd
if
self
.
chainman
.
HasBlock
(
request
.
Block
.
ParentHash
())
{
if
err
:=
self
.
chainman
.
InsertChain
(
types
.
Blocks
{
request
.
Block
});
err
!=
nil
{
// handle error
return
nil
}
self
.
BroadcastBlock
(
hash
,
request
.
Block
)
//fmt.Println(request.Block.Hash().Hex(), "our calculated TD =", request.Block.Td, "their TD =", request.TD)
}
else
{
// adding blocks is synchronous
go
func
()
{
...
...
@@ -322,7 +319,6 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
return
}
self
.
BroadcastBlock
(
hash
,
request
.
Block
)
//fmt.Println(request.Block.Hash().Hex(), "our calculated TD =", request.Block.Td, "their TD =", request.TD)
}()
}
default
:
...
...
jsre/ethereum_js.go
浏览文件 @
31811365
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录