[evm] defer Cancun enabling (#4308)

iotexproject · Jun 20, 2024 · 1e42b55 · 1e42b55
1 parent 5a6871d
commit 1e42b55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/action/protocol/execution/evm/evm.go b/action/protocol/execution/evm/evm.go
@@ -441,12 +441,6 @@ func getChainConfig(g genesis.Blockchain, height uint64, id uint32, getBlockTime
 	}
 	sumatraTimestamp := (uint64)(sumatraTime.Unix())
 	chainConfig.ShanghaiTime = &sumatraTimestamp
-	upernavikTime, err := getBlockTime(g.UpernavikBlockHeight)
-	if err != nil {
-		return nil, err
-	}
-	upernavikTimestamp := (uint64)(upernavikTime.Unix())
-	chainConfig.CancunTime = &upernavikTimestamp
 	return &chainConfig, nil
 }
 

diff --git a/action/protocol/execution/evm/evm_test.go b/action/protocol/execution/evm/evm_test.go
@@ -364,10 +364,10 @@ func TestConstantinople(t *testing.T) {
 		require.Equal(isSumatra, chainRules.IsMerge)
 		require.Equal(isSumatra, chainRules.IsShanghai)
 
-		// Upernavik = enable Cancun
-		isUpernavik := g.IsUpernavik(e.height)
-		require.Equal(isUpernavik, chainRules.IsCancun)
-		//Prague not yet enabled
+		// Cancun and Prague not yet enabled
+		require.False(chainRules.IsCancun)
+		require.False(evmChainConfig.IsCancun(big.NewInt(int64(e.height)), evm.Context.Time))
+		require.False(chainRules.IsPrague)
 		require.False(evmChainConfig.IsPrague(big.NewInt(int64(e.height)), evm.Context.Time))
 
 		// test basefee

diff --git a/action/protocol/execution/protocol_test.go b/action/protocol/execution/protocol_test.go
@@ -1328,6 +1328,8 @@ func TestShanghaiEVM(t *testing.T) {
 
 func TestCancunEVM(t *testing.T) {
 	t.Run("eip1153-transientstorage", func(t *testing.T) {
+		// TODO: re-enable this test when enable Cancun
+		t.Skip()
 		NewSmartContractTest(t, "testdata-cancun/transientstorage.json")
 	})
 }