Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
7fc9b5b3
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,体验更适合开发者的 AI 搜索 >>
提交
7fc9b5b3
编写于
2月 17, 2015
作者:
O
obscuren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed to ChainEvent and fixed a nil pointer in transact
上级
11e12680
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
47 addition
and
14 deletion
+47
-14
cmd/mist/assets/examples/info.html
cmd/mist/assets/examples/info.html
+4
-0
cmd/mist/gui.go
cmd/mist/gui.go
+0
-6
core/chain_manager.go
core/chain_manager.go
+0
-2
eth/backend.go
eth/backend.go
+2
-2
event/filter/eth_filter.go
event/filter/eth_filter.go
+5
-2
rpc/args.go
rpc/args.go
+29
-0
rpc/packages.go
rpc/packages.go
+6
-0
xeth/xeth.go
xeth/xeth.go
+1
-2
未找到文件。
cmd/mist/assets/examples/info.html
浏览文件 @
7fc9b5b3
...
...
@@ -71,6 +71,10 @@
document
.
querySelector
(
"
#gas_price
"
).
innerHTML
=
eth
.
gasPrice
;
document
.
querySelector
(
"
#mining
"
).
innerHTML
=
eth
.
mining
;
document
.
querySelector
(
"
#listening
"
).
innerHTML
=
eth
.
listening
;
eth
.
watch
(
'
chain
'
).
changed
(
function
()
{
document
.
querySelector
(
"
#number
"
).
innerHTML
=
eth
.
number
;
});
</script>
</html>
...
...
cmd/mist/gui.go
浏览文件 @
7fc9b5b3
...
...
@@ -394,7 +394,6 @@ func (gui *Gui) update() {
miningLabel
:=
gui
.
getObjectByName
(
"miningLabel"
)
events
:=
gui
.
eth
.
EventMux
()
.
Subscribe
(
core
.
NewBlockEvent
{},
core
.
TxPreEvent
{},
core
.
TxPostEvent
{},
)
...
...
@@ -407,11 +406,6 @@ func (gui *Gui) update() {
return
}
switch
ev
:=
ev
.
(
type
)
{
case
core
.
NewBlockEvent
:
gui
.
processBlock
(
ev
.
Block
,
false
)
balance
:=
ethutil
.
CurrencyToString
(
gui
.
eth
.
ChainManager
()
.
State
()
.
GetBalance
(
gui
.
address
()))
gui
.
getObjectByName
(
"balanceLabel"
)
.
Set
(
"text"
,
fmt
.
Sprintf
(
"%v"
,
balance
))
case
core
.
TxPreEvent
:
tx
:=
ev
.
Tx
...
...
core/chain_manager.go
浏览文件 @
7fc9b5b3
...
...
@@ -393,8 +393,6 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
}
}
self
.
mu
.
Unlock
()
self
.
eventMux
.
Post
(
NewBlockEvent
{
block
})
}
return
nil
...
...
eth/backend.go
浏览文件 @
7fc9b5b3
...
...
@@ -25,8 +25,8 @@ var (
jsonlogger
=
ethlogger
.
NewJsonLogger
()
defaultBootNodes
=
[]
*
discover
.
Node
{
discover
.
MustParseNode
(
"enode://6cdd090303f394a1cac34ecc9f7cda18127eafa2a3a06de39f6d920b0e583e062a7362097c7c65ee490a758b442acd5c80c6fce4b148c6a391e946b45131365b@54.169.166.226:30303"
),
discover
.
MustParseNode
(
"enode://
d1760a33c2f25c3b419ee4f6787fb0ea148828f5e678f0450d4be978fef908b42fc47a4c0fbf19832754f17881d381e50364fa93be42f31801d60ac64933f0a
5@127.0.0.1:30303"
),
//
discover.MustParseNode("enode://6cdd090303f394a1cac34ecc9f7cda18127eafa2a3a06de39f6d920b0e583e062a7362097c7c65ee490a758b442acd5c80c6fce4b148c6a391e946b45131365b@54.169.166.226:30303"),
discover
.
MustParseNode
(
"enode://
364d179a050fb3192ea25ee2c4836cb808f13bb1a98a058e5bf215a597080edd742a00d6fd4b5f348a08024097f0b8f567610902dddf8db573362d8b22cabef
5@127.0.0.1:30303"
),
}
)
...
...
event/filter/eth_filter.go
浏览文件 @
7fc9b5b3
...
...
@@ -60,7 +60,10 @@ func (self *FilterManager) GetFilter(id int) *core.Filter {
func
(
self
*
FilterManager
)
filterLoop
()
{
// Subscribe to events
events
:=
self
.
eventMux
.
Subscribe
(
core
.
PendingBlockEvent
{},
core
.
NewBlockEvent
{},
state
.
Logs
(
nil
))
events
:=
self
.
eventMux
.
Subscribe
(
core
.
PendingBlockEvent
{},
core
.
ChainEvent
{},
state
.
Logs
(
nil
))
out
:
for
{
...
...
@@ -69,7 +72,7 @@ out:
break
out
case
event
:=
<-
events
.
Chan
()
:
switch
event
:=
event
.
(
type
)
{
case
core
.
NewBlock
Event
:
case
core
.
Chain
Event
:
self
.
filterMu
.
RLock
()
for
_
,
filter
:=
range
self
.
filters
{
if
filter
.
BlockCallback
!=
nil
{
...
...
rpc/args.go
浏览文件 @
7fc9b5b3
...
...
@@ -38,6 +38,35 @@ type NewTxArgs struct {
Data
string
`json:"data"`
}
func
(
obj
*
NewTxArgs
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
// Data can be either specified as "data" or "code" :-/
var
ext
struct
{
From
string
To
string
Value
string
Gas
string
GasPrice
string
Data
string
Code
string
}
if
err
=
json
.
Unmarshal
(
b
,
&
ext
);
err
==
nil
{
if
len
(
ext
.
Data
)
==
0
{
ext
.
Data
=
ext
.
Code
}
obj
.
From
=
ext
.
From
obj
.
To
=
ext
.
To
obj
.
Value
=
ext
.
Value
obj
.
Gas
=
ext
.
Gas
obj
.
GasPrice
=
ext
.
GasPrice
obj
.
Data
=
ext
.
Data
return
}
return
NewErrorResponse
(
ErrorDecodeArgs
)
}
type
PushTxArgs
struct
{
Tx
string
`json:"tx"`
}
...
...
rpc/packages.go
浏览文件 @
7fc9b5b3
...
...
@@ -127,6 +127,9 @@ func (self *EthereumApi) NewFilterString(args string, reply *interface{}) error
filter
:=
core
.
NewFilter
(
self
.
xeth
.
Backend
())
callback
:=
func
(
block
*
types
.
Block
)
{
self
.
logMut
.
Lock
()
defer
self
.
logMut
.
Unlock
()
self
.
logs
[
id
]
=
append
(
self
.
logs
[
id
],
&
state
.
StateLog
{})
}
if
args
==
"pending"
{
...
...
@@ -153,6 +156,9 @@ func (self *EthereumApi) FilterChanged(id int, reply *interface{}) error {
}
func
(
self
*
EthereumApi
)
Logs
(
id
int
,
reply
*
interface
{})
error
{
self
.
logMut
.
Lock
()
defer
self
.
logMut
.
Unlock
()
filter
:=
self
.
filterManager
.
GetFilter
(
id
)
*
reply
=
toLogs
(
filter
.
Find
())
...
...
xeth/xeth.go
浏览文件 @
7fc9b5b3
...
...
@@ -16,7 +16,6 @@ import (
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/whisper"
)
...
...
@@ -220,7 +219,7 @@ func (self *XEth) Call(toStr, valueStr, gasStr, gasPriceStr, dataStr string) (st
var
(
statedb
=
self
.
chainManager
.
TransState
()
key
=
self
.
eth
.
KeyManager
()
.
KeyPair
()
from
=
state
.
NewStateObject
(
key
.
Address
(),
self
.
eth
.
Db
())
from
=
state
db
.
GetOrNewStateObject
(
key
.
Address
())
block
=
self
.
chainManager
.
CurrentBlock
()
to
=
statedb
.
GetOrNewStateObject
(
fromHex
(
toStr
))
data
=
fromHex
(
dataStr
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录