[genesis] set Okhotsk to activate at 01-11-2023 12am UTC (#3720)

iotexproject · Dec 20, 2022 · 5d4e409 · 5d4e409
1 parent c2e8d5e
commit 5d4e409
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/action/protocol/execution/evm/evm_test.go b/action/protocol/execution/evm/evm_test.go
@@ -199,12 +199,12 @@ func TestConstantinople(t *testing.T) {
  },
  {
  "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y",
- 37662680,
+ 21542760,
  },
  // after Okhotsk
  {
  action.EmptyAddress,
- 37662681,
+ 21542761,
  },
  {
  "io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y",
@@ -222,25 +222,14 @@ func TestConstantinople(t *testing.T) {
  nil,
  )
  require.NoError(err)
- opt := []StateDBAdapterOption{}
- if !g.IsAleutian(e.height) {
- opt = append(opt, NotFixTopicCopyBugOption())
- }
- if g.IsGreenland(e.height) {
- opt = append(opt, AsyncContractTrieOption())
- }
- if g.IsKamchatka(e.height) {
- opt = append(opt, FixSnapshotOrderOption())
- }
- stateDB, err := NewStateDBAdapter(sm, e.height, hash.ZeroHash256, opt...)
- require.NoError(err)
 
- fCtx := protocol.WithBlockCtx(ctx, protocol.BlockCtx{
+ fCtx := protocol.WithFeatureCtx(protocol.WithBlockCtx(ctx, protocol.BlockCtx{
  Producer: identityset.Address(27),
  GasLimit: testutil.TestGasLimit,
  BlockHeight: e.height,
- })
- fCtx = protocol.WithFeatureCtx(fCtx)
+ }))
+ stateDB, err := prepareStateDB(fCtx, sm)
+ require.NoError(err)
  ps, err := newParams(fCtx, ex, stateDB, func(uint64) (hash.Hash256, error) {
  return hash.ZeroHash256, nil
  })
@@ -289,6 +278,8 @@ func TestConstantinople(t *testing.T) {
 
  // Okhotsk = enable Berlin and London
  isOkhotsk := g.IsOkhotsk(e.height)
+ require.Equal(big.NewInt(int64(g.OkhotskBlockHeight)), evmChainConfig.BerlinBlock)
+ require.Equal(big.NewInt(int64(g.OkhotskBlockHeight)), evmChainConfig.LondonBlock)
  require.Equal(isOkhotsk, evmChainConfig.IsBerlin(evm.Context.BlockNumber))
  require.Equal(isOkhotsk, chainRules.IsBerlin)
  require.Equal(isOkhotsk, evmChainConfig.IsLondon(evm.Context.BlockNumber))

diff --git a/blockchain/genesis/genesis.go b/blockchain/genesis/genesis.go
@@ -69,7 +69,7 @@ func defaultConfig() Genesis {
  LordHoweBlockHeight: 13979161,
  MidwayBlockHeight: 16509241,
  NewfoundlandBlockHeight: 17662681,
- OkhotskBlockHeight: 37662681,
+ OkhotskBlockHeight: 21542761,
  ToBeEnabledBlockHeight: math.MaxUint64,
  },
  Account: Account{

diff --git a/blockchain/genesis/heightupgrade_test.go b/blockchain/genesis/heightupgrade_test.go
@@ -52,8 +52,8 @@ func TestNewHeightChange(t *testing.T) {
  require.True(cfg.IsMidway(uint64(16509241)))
  require.False(cfg.IsNewfoundland(uint64(17662680)))
  require.True(cfg.IsNewfoundland(uint64(17662681)))
- require.False(cfg.IsOkhotsk(uint64(37662680)))
- require.True(cfg.IsOkhotsk(uint64(37662681)))
+ require.False(cfg.IsOkhotsk(uint64(21542760)))
+ require.True(cfg.IsOkhotsk(uint64(21542761)))
 
  require.Equal(cfg.PacificBlockHeight, uint64(432001))
  require.Equal(cfg.AleutianBlockHeight, uint64(864001))
@@ -72,5 +72,5 @@ func TestNewHeightChange(t *testing.T) {
  require.Equal(cfg.LordHoweBlockHeight, uint64(13979161))
  require.Equal(cfg.MidwayBlockHeight, uint64(16509241))
  require.Equal(cfg.NewfoundlandBlockHeight, uint64(17662681))
- require.Equal(cfg.OkhotskBlockHeight, uint64(37662681))
+ require.Equal(cfg.OkhotskBlockHeight, uint64(21542761))
 }