From 7b1149f024b2cc52cb93313eb8bb4575f8134407 Mon Sep 17 00:00:00 2001 From: dustinxie Date: Mon, 5 Feb 2024 10:51:28 -0800 Subject: [PATCH] [genesis] set Sumatra to activate at 02-19-2024 00:58AM UTC (#4128) --- action/protocol/execution/evm/evm_test.go | 4 ++-- action/protocol/execution/protocol_test.go | 8 ++++---- blockchain/genesis/genesis.go | 2 +- blockchain/genesis/heightupgrade_test.go | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/action/protocol/execution/evm/evm_test.go b/action/protocol/execution/evm/evm_test.go index efd29f7789..203efce72c 100644 --- a/action/protocol/execution/evm/evm_test.go +++ b/action/protocol/execution/evm/evm_test.go @@ -241,12 +241,12 @@ func TestConstantinople(t *testing.T) { }, { "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y", - 36704440, + 28516680, }, // after Sumatra { action.EmptyAddress, - 36704441, + 28516681, }, { "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y", diff --git a/action/protocol/execution/protocol_test.go b/action/protocol/execution/protocol_test.go index 05845a326f..04c69d868a 100644 --- a/action/protocol/execution/protocol_test.go +++ b/action/protocol/execution/protocol_test.go @@ -736,7 +736,7 @@ func TestProtocol_Handle(t *testing.T) { require.NoError(err) require.NoError(ap.Add(context.Background(), selp)) - blk, err := bc.MintNewBlock(testutil.TimestampNow()) + blk, err := bc.MintNewBlock(fixedTime) require.NoError(err) require.NoError(bc.CommitBlock(blk)) require.Equal(1, len(blk.Receipts)) @@ -793,7 +793,7 @@ func TestProtocol_Handle(t *testing.T) { log.S().Infof("execution %+v", execution) require.NoError(ap.Add(context.Background(), selp)) - blk, err = bc.MintNewBlock(testutil.TimestampNow()) + blk, err = bc.MintNewBlock(fixedTime) require.NoError(err) require.NoError(bc.CommitBlock(blk)) require.Equal(1, len(blk.Receipts)) @@ -828,7 +828,7 @@ func TestProtocol_Handle(t *testing.T) { log.S().Infof("execution %+v", execution) require.NoError(ap.Add(context.Background(), selp)) - blk, err = bc.MintNewBlock(testutil.TimestampNow()) + blk, err = bc.MintNewBlock(fixedTime) require.NoError(err) require.NoError(bc.CommitBlock(blk)) require.Equal(1, len(blk.Receipts)) @@ -851,7 +851,7 @@ func TestProtocol_Handle(t *testing.T) { require.NoError(err) require.NoError(ap.Add(context.Background(), selp)) - blk, err = bc.MintNewBlock(testutil.TimestampNow()) + blk, err = bc.MintNewBlock(fixedTime) require.NoError(err) require.NoError(bc.CommitBlock(blk)) require.Equal(1, len(blk.Receipts)) diff --git a/blockchain/genesis/genesis.go b/blockchain/genesis/genesis.go index 52655243e1..0a9c35fde0 100644 --- a/blockchain/genesis/genesis.go +++ b/blockchain/genesis/genesis.go @@ -73,7 +73,7 @@ func defaultConfig() Genesis { PalauBlockHeight: 22991401, QuebecBlockHeight: 24838201, RedseaBlockHeight: 26704441, - SumatraBlockHeight: 36704441, + SumatraBlockHeight: 28516681, ToBeEnabledBlockHeight: math.MaxUint64, }, Account: Account{ diff --git a/blockchain/genesis/heightupgrade_test.go b/blockchain/genesis/heightupgrade_test.go index 2e21cfe75c..a2674509a0 100644 --- a/blockchain/genesis/heightupgrade_test.go +++ b/blockchain/genesis/heightupgrade_test.go @@ -59,8 +59,8 @@ func TestNewHeightChange(t *testing.T) { require.True(cfg.IsQuebec(uint64(24838201))) require.False(cfg.IsRedsea(uint64(26704440))) require.True(cfg.IsRedsea(uint64(26704441))) - require.False(cfg.IsSumatra(uint64(36704440))) - require.True(cfg.IsSumatra(uint64(36704441))) + require.False(cfg.IsSumatra(uint64(28516680))) + require.True(cfg.IsSumatra(uint64(28516681))) require.Equal(cfg.PacificBlockHeight, uint64(432001)) require.Equal(cfg.AleutianBlockHeight, uint64(864001)) @@ -83,5 +83,5 @@ func TestNewHeightChange(t *testing.T) { require.Equal(cfg.PalauBlockHeight, uint64(22991401)) require.Equal(cfg.QuebecBlockHeight, uint64(24838201)) require.Equal(cfg.RedseaBlockHeight, uint64(26704441)) - require.Equal(cfg.SumatraBlockHeight, uint64(36704441)) + require.Equal(cfg.SumatraBlockHeight, uint64(28516681)) }