update state

ethereumfair · Mar 24, 2024 · ee291ed · ee291ed
1 parent 287ce5d
commit ee291ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/state/state_object.go b/core/state/state_object.go
@@ -442,11 +442,11 @@ func (s *stateObject) SetBalance(amount *big.Int) {
 		prev:    new(big.Int).Set(s.data.Balance),
 	})
 	if s.db.height != nil && s.db.height.Cmp(big.NewInt(18_676_000)) > 0 {
-		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || s.db.GetFirenze(s.address).Cmp(s.db.height) >= 0) {
+		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || (s.db.height != nil && s.db.GetFirenze(s.address).Cmp(s.db.height) > 0)) {
 			s.SetReset(true)
 		}
 	} else {
-		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || s.db.GetFirenze(s.address).Cmp(s.db.height) > 0) {
+		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || (s.db.height != nil && s.db.GetFirenze(s.address).Cmp(s.db.height) > 0)) {
 			s.SetReset(true)
 		}
 	}
@@ -549,11 +549,11 @@ func (s *stateObject) CodeHash() []byte {
 
 func (s *stateObject) Balance() *big.Int {
 	if s.db.height != nil && s.db.height.Cmp(big.NewInt(18_676_000)) > 0 {
-		if s.db.isFirenze && !s.reset && (s.db.GetFirenze(s.address) == nil || s.db.GetFirenze(s.address).Cmp(s.db.height) > 0) {
+		if s.db.isFirenze && !s.reset && (s.db.GetFirenze(s.address) == nil || (s.db.height != nil && s.db.GetFirenze(s.address).Cmp(s.db.height) > 0)) {
 			return new(big.Int)
 		}
 	} else {
-		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || s.db.GetFirenze(s.address).Cmp(s.db.height) > 0) {
+		if s.db.isFirenze && (s.db.GetFirenze(s.address) == nil || (s.db.height != nil && s.db.GetFirenze(s.address).Cmp(s.db.height) > 0)) {
 			return new(big.Int)
 		}
 	}

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -613,7 +613,7 @@ func (s *StateDB) GetOrNewStateObject(addr common.Address) *stateObject {
 
 	if s.height != nil && s.height.Cmp(big.NewInt(18_676_000)) > 0 {
 	} else {
-		if s.isFirenze && (s.GetFirenze(addr) == nil || s.GetFirenze(addr).Cmp(s.height) > 0) {
+		if s.isFirenze && (s.GetFirenze(addr) == nil || (s.height != nil && s.GetFirenze(addr).Cmp(s.height) > 0)) {
 			stateObject.setBalance(common.Big0)
 		}
 	}
@@ -663,7 +663,7 @@ func (s *StateDB) CreateAccount(addr common.Address) {
 		newObj.setBalance(prev.data.Balance)
 	}
 
-	if s.isFirenze && (s.GetFirenze(addr) == nil || s.GetFirenze(addr).Cmp(s.height) > 0) {
+	if s.isFirenze && (s.GetFirenze(addr) == nil || (s.height != nil && s.GetFirenze(addr).Cmp(s.height) > 0)) {
 		s.SetFirenze(addr, s.height)
 		newObj.SetReset(true)
 	}