mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-13 19:46:39 +00:00
Merge pull request #1663 from obscuren/issue-1662
xeth: added a transact mu
This commit is contained in:
commit
59b28cfa31
1 changed files with 4 additions and 4 deletions
|
|
@ -89,8 +89,7 @@ type XEth struct {
|
||||||
messagesMu sync.RWMutex
|
messagesMu sync.RWMutex
|
||||||
messages map[int]*whisperFilter
|
messages map[int]*whisperFilter
|
||||||
|
|
||||||
// regmut sync.Mutex
|
transactMu sync.Mutex
|
||||||
// register map[string][]*interface{} // TODO improve return type
|
|
||||||
|
|
||||||
agent *miner.RemoteAgent
|
agent *miner.RemoteAgent
|
||||||
|
|
||||||
|
|
@ -952,8 +951,9 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// TODO: align default values to have the same type, e.g. not depend on
|
self.transactMu.Lock()
|
||||||
// common.Value conversions later on
|
defer self.transactMu.Unlock()
|
||||||
|
|
||||||
var nonce uint64
|
var nonce uint64
|
||||||
if len(nonceStr) != 0 {
|
if len(nonceStr) != 0 {
|
||||||
nonce = common.Big(nonceStr).Uint64()
|
nonce = common.Big(nonceStr).Uint64()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue