From ae653539f2efad797b81bdda9e7bf799ca013058 Mon Sep 17 00:00:00 2001 From: dustinxie Date: Sun, 17 Nov 2024 11:43:21 -0800 Subject: [PATCH] Revert "[genesis] set Vanuatu to activate at Nov-25-2024 01:05:15AM +UTC (#4480)" This reverts commit 216959203bebfa1f1a532952b4fee5998c59fc8f. --- action/protocol/execution/evm/evm_test.go | 4 ++-- blockchain/genesis/genesis.go | 2 +- blockchain/genesis/heightupgrade_test.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/action/protocol/execution/evm/evm_test.go b/action/protocol/execution/evm/evm_test.go index 8c63fc524d..97499c295d 100644 --- a/action/protocol/execution/evm/evm_test.go +++ b/action/protocol/execution/evm/evm_test.go @@ -260,12 +260,12 @@ func TestConstantinople(t *testing.T) { }, { "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y", - 33350760, + 41174200, }, // after Vanuatu { action.EmptyAddress, - 33350761, + 41174201, }, { "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y", diff --git a/blockchain/genesis/genesis.go b/blockchain/genesis/genesis.go index e8206af47b..9eece49354 100644 --- a/blockchain/genesis/genesis.go +++ b/blockchain/genesis/genesis.go @@ -78,7 +78,7 @@ func defaultConfig() Genesis { SumatraBlockHeight: 28516681, TsunamiBlockHeight: 29275561, UpernavikBlockHeight: 31174201, - VanuatuBlockHeight: 33350761, + VanuatuBlockHeight: 41174201, ToBeEnabledBlockHeight: math.MaxUint64, }, Account: Account{ diff --git a/blockchain/genesis/heightupgrade_test.go b/blockchain/genesis/heightupgrade_test.go index 97217e43f6..2724c35857 100644 --- a/blockchain/genesis/heightupgrade_test.go +++ b/blockchain/genesis/heightupgrade_test.go @@ -65,8 +65,8 @@ func TestNewHeightChange(t *testing.T) { require.True(cfg.IsTsunami(uint64(29275561))) require.False(cfg.IsUpernavik(uint64(31174200))) require.True(cfg.IsUpernavik(uint64(31174201))) - require.False(cfg.IsVanuatu(uint64(33350760))) - require.True(cfg.IsVanuatu(uint64(33350761))) + require.False(cfg.IsVanuatu(uint64(41174200))) + require.True(cfg.IsVanuatu(uint64(41174201))) require.Equal(cfg.PacificBlockHeight, uint64(432001)) require.Equal(cfg.AleutianBlockHeight, uint64(864001)) @@ -92,5 +92,5 @@ func TestNewHeightChange(t *testing.T) { require.Equal(cfg.SumatraBlockHeight, uint64(28516681)) require.Equal(cfg.TsunamiBlockHeight, uint64(29275561)) require.Equal(cfg.UpernavikBlockHeight, uint64(31174201)) - require.Equal(cfg.VanuatuBlockHeight, uint64(33350761)) + require.Equal(cfg.VanuatuBlockHeight, uint64(41174201)) }