From aad4890082c1624795991d534db9497c8b63630d Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Sun, 20 Nov 2016 12:18:39 +0100 Subject: cmd/geth, core, light, mobile: removed state account StartingNonce All account's nonce start at 0. --- core/state/statedb.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'core/state') diff --git a/core/state/statedb.go b/core/state/statedb.go index 1c4af0295..3742c178b 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -34,10 +34,6 @@ import ( lru "github.com/hashicorp/golang-lru" ) -// The starting nonce determines the default nonce when new accounts are being -// created. -var StartingNonce uint64 - // Trie cache generation limit after which to evic trie nodes from memory. var MaxTrieCacheGen = uint16(120) @@ -239,7 +235,7 @@ func (self *StateDB) GetNonce(addr common.Address) uint64 { return stateObject.Nonce() } - return StartingNonce + return 0 } func (self *StateDB) GetCode(addr common.Address) []byte { @@ -423,7 +419,7 @@ func (self *StateDB) MarkStateObjectDirty(addr common.Address) { func (self *StateDB) createObject(addr common.Address) (newobj, prev *StateObject) { prev = self.GetStateObject(addr) newobj = newObject(self, addr, Account{}, self.MarkStateObjectDirty) - newobj.setNonce(StartingNonce) // sets the object to dirty + newobj.setNonce(0) // sets the object to dirty if prev == nil { if glog.V(logger.Core) { glog.Infof("(+) %x\n", addr) -- cgit v1.2.3