Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[evm] defer Cancun enabling #4308

Merged
merged 1 commit into from
Jun 20, 2024
Merged

[evm] defer Cancun enabling #4308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions action/protocol/execution/evm/evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
8 changes: 4 additions & 4 deletions action/protocol/execution/evm/evm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions action/protocol/execution/protocol_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
}
Expand Down
Loading