Merge branch 'master' into gastonponti/mycelo-validators-election

celo-org · Jul 26, 2023 · d185fad · d185fad
2 parents 48bec05 + 84ca735
commit d185fad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
@@ -3083,7 +3083,6 @@ func TestEIP1559Transition(t *testing.T) {
 					Code: testutil.RegistryProxyOpcodes,
 					Storage: map[common.Hash]common.Hash{
 						common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"): common.HexToHash("0xce11"), // Registry Implementation
-						common.HexToHash("0x91646b8507bf2e54d7c3de9155442ba111546b81af1cbdd1f68eeb6926b98d58"): common.HexToHash("0xd023"), // Governance Proxy
 					},
 					Balance: big.NewInt(0),
 				},
@@ -3245,7 +3244,6 @@ func TestEIP1559TransitionPreGingerbread(t *testing.T) {
 					Code: testutil.RegistryProxyOpcodes,
 					Storage: map[common.Hash]common.Hash{
 						common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"): common.HexToHash("0xce11"), // Registry Implementation
-						common.HexToHash("0x91646b8507bf2e54d7c3de9155442ba111546b81af1cbdd1f68eeb6926b98d58"): common.HexToHash("0xd023"), // Governance Proxy
 					},
 					Balance: big.NewInt(0),
 				},

diff --git a/core/types/block_compatibility.go b/core/types/block_compatibility.go
@@ -86,12 +86,12 @@ func (h *Header) DecodeRLP(s *rlp.Stream) error {
 }
 
 func (h *Header) EncodeRLP(w io.Writer) error {
-	if h.Difficulty == nil {
+	if (h.UncleHash == common.Hash{}) {
 		// Before gingerbread hardfork Celo did not include all of
 		// Ethereum's header fields. In that case we must omit the new
 		// fields from the header when encoding as RLP to maintain the same encoding and hashes.
-		// `Difficulty` is a safe way to check, since it is always nil before
-		// gingerbread and always 0 after.
+		// `UncleHash` is a safe way to check, since it is the zero hash before
+		// gingerbread and non-zero after.
 		rlpFields := []interface{}{
 			h.ParentHash,
 			h.Coinbase,

diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go
@@ -567,7 +567,6 @@ func TestTraceBlockWithEIP1559Tx(t *testing.T) {
 				Code: testutil.RegistryProxyOpcodes,
 				Storage: map[common.Hash]common.Hash{
 					common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"): common.HexToHash("0xce11"), // Registry Implementation
-					common.HexToHash("0x91646b8507bf2e54d7c3de9155442ba111546b81af1cbdd1f68eeb6926b98d58"): common.HexToHash("0xd023"), // Governance Proxy
 				},
 				Balance: big.NewInt(0),
 			},
@@ -643,7 +642,6 @@ func TestTraceTransactionWithRegistryDeployed(t *testing.T) {
 			Code: testutil.RegistryProxyOpcodes,
 			Storage: map[common.Hash]common.Hash{
 				common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"): common.HexToHash("0xce11"), // Registry Implementation
-				common.HexToHash("0x91646b8507bf2e54d7c3de9155442ba111546b81af1cbdd1f68eeb6926b98d58"): common.HexToHash("0xd023"), // Governance Proxy
 			},
 			Balance: big.NewInt(0),
 		},