Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
cda88ce3
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,发现更多精彩内容 >>
提交
cda88ce3
编写于
3月 13, 2015
作者:
O
obscuren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implemented a manage state for keeping track of nonces
上级
aa9f981d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
63 addition
and
6 deletion
+63
-6
core/chain_manager.go
core/chain_manager.go
+6
-5
state/managed_state.go
state/managed_state.go
+56
-0
xeth/xeth.go
xeth/xeth.go
+1
-1
未找到文件。
core/chain_manager.go
浏览文件 @
cda88ce3
...
...
@@ -86,7 +86,7 @@ type ChainManager struct {
lastBlockHash
[]
byte
transState
*
state
.
StateDB
txState
*
state
.
StateDB
txState
*
state
.
ManagedState
quit
chan
struct
{}
}
...
...
@@ -95,7 +95,8 @@ func NewChainManager(blockDb, stateDb ethutil.Database, mux *event.TypeMux) *Cha
bc
:=
&
ChainManager
{
blockDb
:
blockDb
,
stateDb
:
stateDb
,
genesisBlock
:
GenesisBlock
(
stateDb
),
eventMux
:
mux
,
quit
:
make
(
chan
struct
{})}
bc
.
setLastBlock
()
bc
.
transState
=
bc
.
State
()
.
Copy
()
bc
.
txState
=
bc
.
State
()
.
Copy
()
// Take ownership of this particular state
bc
.
txState
=
state
.
ManageState
(
bc
.
State
()
.
Copy
())
go
bc
.
update
()
return
bc
...
...
@@ -144,17 +145,17 @@ func (self *ChainManager) TransState() *state.StateDB {
return
self
.
transState
}
func
(
self
*
ChainManager
)
TxState
()
*
state
.
StateDB
{
func
(
self
*
ChainManager
)
TxState
()
*
state
.
ManagedState
{
self
.
tsmu
.
RLock
()
defer
self
.
tsmu
.
RUnlock
()
return
self
.
txState
}
func
(
self
*
ChainManager
)
setTxState
(
state
*
state
.
StateDB
)
{
func
(
self
*
ChainManager
)
setTxState
(
state
db
*
state
.
StateDB
)
{
self
.
tsmu
.
Lock
()
defer
self
.
tsmu
.
Unlock
()
self
.
txState
=
state
self
.
txState
=
state
.
ManageState
(
statedb
)
}
func
(
self
*
ChainManager
)
setTransState
(
statedb
*
state
.
StateDB
)
{
...
...
state/managed_state.go
0 → 100644
浏览文件 @
cda88ce3
package
state
import
"sync"
type
ManagedState
struct
{
*
StateDB
mu
sync
.
RWMutex
accounts
map
[
string
]
*
StateObject
}
func
ManageState
(
statedb
*
StateDB
)
*
ManagedState
{
return
&
ManagedState
{
StateDB
:
statedb
,
accounts
:
make
(
map
[
string
]
*
StateObject
),
}
}
func
(
ms
*
ManagedState
)
IncrementNonce
(
addr
[]
byte
)
{
ms
.
mu
.
Lock
()
defer
ms
.
mu
.
Unlock
()
ms
.
getAccount
(
addr
)
.
nonce
++
}
func
(
ms
*
ManagedState
)
DecrementNonce
(
addr
[]
byte
)
{
// Decrementing a nonce does not mean we are interested in the account
// incrementing only happens if you control the account, therefor
// incrementing behaves differently from decrementing
if
ms
.
hasAccount
(
addr
)
{
ms
.
mu
.
Lock
()
defer
ms
.
mu
.
Unlock
()
ms
.
getAccount
(
addr
)
.
nonce
--
}
}
func
(
ms
*
ManagedState
)
GetNonce
(
addr
[]
byte
)
uint64
{
ms
.
mu
.
RLock
()
defer
ms
.
mu
.
RUnlock
()
return
ms
.
getAccount
(
addr
)
.
nonce
}
func
(
ms
*
ManagedState
)
hasAccount
(
addr
[]
byte
)
bool
{
_
,
ok
:=
ms
.
accounts
[
string
(
addr
)]
return
ok
}
func
(
ms
*
ManagedState
)
getAccount
(
addr
[]
byte
)
*
StateObject
{
if
_
,
ok
:=
ms
.
accounts
[
string
(
addr
)];
!
ok
{
ms
.
accounts
[
string
(
addr
)]
=
ms
.
GetOrNewStateObject
(
addr
)
}
return
ms
.
accounts
[
string
(
addr
)]
}
xeth/xeth.go
浏览文件 @
cda88ce3
...
...
@@ -362,7 +362,7 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
if
err
:=
self
.
eth
.
TxPool
()
.
Add
(
tx
);
err
!=
nil
{
return
""
,
err
}
state
.
SetNonce
(
from
,
nonce
+
1
)
state
.
IncrementNonce
(
from
)
if
contractCreation
{
addr
:=
core
.
AddressFromMessage
(
tx
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录