enable wake height (#4617)

Co-authored-by: CoderZhi <[email protected]>

Author: envestcc

action/protocol/context.go

@@ -315,8 +315,8 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			UnstakedButNotClearSelfStakeAmount:      !g.IsVanuatu(height),
 			CheckStakingDurationUpperLimit:          g.IsVanuatu(height),
 			FixRevertSnapshot:                       g.IsVanuatu(height),
-			TimestampedStakingContract:              g.IsToBeEnabled(height),
-			MakeUpBlockReward:                       g.IsToBeEnabled(height),
+			TimestampedStakingContract:              g.IsWake(height),
+			MakeUpBlockReward:                       g.IsWake(height),
 		},
 	)
 }

action/protocol/rewarding/protocol.go

@@ -111,7 +111,7 @@ func (p *Protocol) CreatePreStates(ctx context.Context, sm protocol.StateManager
 		return p.migrateValueGreenland(ctx, sm)
 	case g.KamchatkaBlockHeight:
 		return p.setFoundationBonusExtension(ctx, sm)
-	case g.ToBeEnabledBlockHeight: // todo: change to wake block height
+	case g.WakeBlockHeight:
 		return p.SetReward(ctx, sm, g.WakeBlockReward(), true)
 	}
 	return nil

action/protocol/rewarding/reward_test.go

@@ -49,7 +49,7 @@ func TestProtocol_GrantBlockReward(t *testing.T) {
 				g := genesis.MustExtractGenesisContext(ctx)
 				g.WakeBlockRewardStr = tv.blockReward.String()
 				blkCtx := protocol.MustGetBlockCtx(ctx)
-				blkCtx.BlockHeight = g.ToBeEnabledBlockHeight
+				blkCtx.BlockHeight = g.WakeBlockHeight
 				ctx = genesis.WithGenesisContext(protocol.WithBlockCtx(ctx, blkCtx), g)
 				req.NoError(p.CreatePreStates(ctx, sm))
 			}
@@ -582,7 +582,7 @@ func TestProtocol_CalculateReward(t *testing.T) {
 			blkCtx.AccumulatedTips.Set(tv.accumuTips)
 			if tv.isWakeBlock {
 				g.WakeBlockRewardStr = wakeBlockReward.String()
-				blkCtx.BlockHeight = g.ToBeEnabledBlockHeight
+				blkCtx.BlockHeight = g.WakeBlockHeight
 				ctx = protocol.WithFeatureCtx(genesis.WithGenesisContext(protocol.WithBlockCtx(ctx, blkCtx), g))
 				req.NoError(p.CreatePreStates(ctx, sm))
 			} else {

action/protocol/staking/vote_reviser_test.go

@@ -316,7 +316,7 @@ func TestVoteRevise_CorrectEndorsement(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		g := deepcopy.Copy(genesis.Default).(genesis.Genesis)
 		g.TsunamiBlockHeight = 2
-		g.ToBeEnabledBlockHeight = 2
+		g.WakeBlockHeight = 2
 		ctx := protocol.WithBlockCtx(context.Background(), protocol.BlockCtx{BlockHeight: 2})
 		ctx = genesis.WithGenesisContext(ctx, g)
 		ctx = protocol.WithFeatureCtx(ctx)

chainservice/builder.go

@@ -355,7 +355,7 @@ func (builder *Builder) buildContractStakingIndexer(forTest bool) error {
 	dbConfig.DbPath = builder.cfg.Chain.ContractStakingIndexDBPath
 	kvstore := db.NewBoltDB(dbConfig)
 	blockDurationFn := func(start uint64, end uint64, viewAt uint64) time.Duration {
-		if viewAt < cfg.Genesis.ToBeEnabledBlockHeight {
+		if viewAt < cfg.Genesis.WakeBlockHeight {
 			return time.Duration(end-start) * cfg.DardanellesUpgrade.BlockInterval
 		}
 		return time.Duration(end-start) * cfg.WakeUpgrade.BlockInterval
@@ -385,7 +385,7 @@ func (builder *Builder) buildContractStakingIndexer(forTest bool) error {
 			builder.cfg.Genesis.SystemStakingContractV2Address,
 			builder.cfg.Genesis.SystemStakingContractV2Height,
 			blockDurationFn,
-			stakingindex.WithMuteHeight(builder.cfg.Genesis.ToBeEnabledBlockHeight),
+			stakingindex.WithMuteHeight(builder.cfg.Genesis.WakeBlockHeight),
 		)
 		builder.cs.contractStakingIndexerV2 = indexer
 	}
@@ -727,7 +727,7 @@ func (builder *Builder) registerRollDPoSProtocol() error {
 		builder.cfg.Genesis.NumDelegates,
 		builder.cfg.Genesis.NumSubEpochs,
 		rolldpos.EnableDardanellesSubEpoch(builder.cfg.Genesis.DardanellesBlockHeight, builder.cfg.Genesis.DardanellesNumSubEpochs),
-		rolldpos.EnableWakeSubEpoch(builder.cfg.Genesis.ToBeEnabledBlockHeight, builder.cfg.Genesis.WakeNumSubEpochs),
+		rolldpos.EnableWakeSubEpoch(builder.cfg.Genesis.WakeBlockHeight, builder.cfg.Genesis.WakeNumSubEpochs),
 	).Register(builder.cs.registry); err != nil {
 		return err
 	}
@@ -881,7 +881,7 @@ func (builder *Builder) build(forSubChain, forTest bool) (*ChainService, error)
 // it ignores the influence of the block missing in the blockchain
 // it must >= the real head height of the block
 func estimateTipHeight(cfg *config.Config, blk *block.Block, duration time.Duration) uint64 {
-	heights, intervals := []uint64{0, cfg.Genesis.DardanellesBlockHeight, cfg.Genesis.ToBeEnabledBlockHeight}, []time.Duration{cfg.Genesis.BlockInterval, cfg.DardanellesUpgrade.BlockInterval, cfg.WakeUpgrade.BlockInterval}
+	heights, intervals := []uint64{0, cfg.Genesis.DardanellesBlockHeight, cfg.Genesis.WakeBlockHeight}, []time.Duration{cfg.Genesis.BlockInterval, cfg.DardanellesUpgrade.BlockInterval, cfg.WakeUpgrade.BlockInterval}
 	tip := blk.Height()
 	interval := intervals[0]
 	for i := 1; i < len(heights); i++ {
@@ -902,7 +902,7 @@ func estimateTipHeight(cfg *config.Config, blk *block.Block, duration time.Durat
 
 // blockDistance calculates the time duration between two blocks
 func blockDistance(cfg *config.Config, start, end, viewAt uint64) time.Duration {
-	origHeights := []uint64{0, cfg.Genesis.DardanellesBlockHeight, cfg.Genesis.ToBeEnabledBlockHeight}
+	origHeights := []uint64{0, cfg.Genesis.DardanellesBlockHeight, cfg.Genesis.WakeBlockHeight}
 	origIntervals := []time.Duration{
 		cfg.Genesis.BlockInterval,
 		cfg.DardanellesUpgrade.BlockInterval,

chainservice/builder_test.go

@@ -16,13 +16,13 @@ func TestEstimateTipHeight(t *testing.T) {
 	r := require.New(t)
 	cfg := deepcopy.Copy(config.Default).(config.Config)
 	cfg.Genesis.DardanellesBlockHeight = 10000
-	cfg.Genesis.ToBeEnabledBlockHeight = 20000
+	cfg.Genesis.WakeBlockHeight = 20000
 	sk := identityset.PrivateKey(1)
 	t.Run("after dardanelles", func(t *testing.T) {
 		blk, err := block.NewBuilder(block.RunnableActions{}).SetHeight(cfg.Genesis.DardanellesBlockHeight + 1).SignAndBuild(sk)
 		r.NoError(err)
 		r.Equal(blk.Height()+2, estimateTipHeight(&cfg, &blk, 10*time.Second))
-		blk, err = block.NewBuilder(block.RunnableActions{}).SetHeight(cfg.Genesis.ToBeEnabledBlockHeight - 3).SignAndBuild(sk)
+		blk, err = block.NewBuilder(block.RunnableActions{}).SetHeight(cfg.Genesis.WakeBlockHeight - 3).SignAndBuild(sk)
 		r.NoError(err)
 		r.Equal(blk.Height()+2, estimateTipHeight(&cfg, &blk, 10*time.Second))
 		r.Equal(blk.Height()+3, estimateTipHeight(&cfg, &blk, 13*time.Second))
@@ -37,7 +37,7 @@ func TestEstimateTipHeight(t *testing.T) {
 		r.Equal(blk.Height()+4, estimateTipHeight(&cfg, &blk, 20*time.Second))
 	})
 	t.Run("after wake", func(t *testing.T) {
-		blk, err := block.NewBuilder(block.RunnableActions{}).SetHeight(cfg.Genesis.ToBeEnabledBlockHeight).SignAndBuild(sk)
+		blk, err := block.NewBuilder(block.RunnableActions{}).SetHeight(cfg.Genesis.WakeBlockHeight).SignAndBuild(sk)
 		r.NoError(err)
 		r.Equal(blk.Height()+1, estimateTipHeight(&cfg, &blk, 3*time.Second))
 		r.Equal(blk.Height()+1, estimateTipHeight(&cfg, &blk, 5*time.Second))
@@ -49,7 +49,7 @@ func TestBlockDistance(t *testing.T) {
 	r := require.New(t)
 	cfg := deepcopy.Copy(config.Default).(config.Config)
 	cfg.Genesis.DardanellesBlockHeight = 10
-	cfg.Genesis.ToBeEnabledBlockHeight = 20
+	cfg.Genesis.WakeBlockHeight = 20
 	t.Run("before dardanelles", func(t *testing.T) {
 		r.Equal(3*cfg.Genesis.BlockInterval, blockDistance(&cfg, 5, 8, 0))
 		r.Equal(10*cfg.Genesis.BlockInterval, blockDistance(&cfg, 5, 15, 0))

consensus/consensusfsm/consensus_ttl.go

@@ -104,7 +104,7 @@ func NewConsensusConfig(timing ConsensusTiming, dardanelles DardanellesUpgrade,
 		blockInterval:     g.Blockchain.BlockInterval,
 		delay:             delay,
 		wake:              wake,
-		wakeHeight:        g.ToBeEnabledBlockHeight,
+		wakeHeight:        g.WakeBlockHeight,
 	}
 }
 

e2etest/contract_staking_v2_test.go

@@ -51,7 +51,7 @@ func TestContractStakingV2(t *testing.T) {
 	cfg := initCfg(require)
 	cfg.Genesis.UpernavikBlockHeight = 1
 	cfg.Genesis.VanuatuBlockHeight = 100
-	cfg.Genesis.ToBeEnabledBlockHeight = 120 // mute staking v2
+	cfg.Genesis.WakeBlockHeight = 120 // mute staking v2
 	cfg.Genesis.SystemStakingContractV2Address = contractAddress
 	cfg.Genesis.SystemStakingContractV2Height = 1
 	cfg.DardanellesUpgrade.BlockInterval = time.Second * 8640
@@ -305,7 +305,7 @@ func TestContractStakingV3(t *testing.T) {
 	cfg := initCfg(require)
 	cfg.Genesis.UpernavikBlockHeight = 1
 	cfg.Genesis.VanuatuBlockHeight = 100
-	cfg.Genesis.ToBeEnabledBlockHeight = 120 // mute staking v2 & enable staking v3
+	cfg.Genesis.WakeBlockHeight = 120 // mute staking v2 & enable staking v3
 	cfg.Genesis.SystemStakingContractV2Address = contractV2Address
 	cfg.Genesis.SystemStakingContractV2Height = 1
 	cfg.Genesis.SystemStakingContractV3Address = contractV3Address
@@ -583,7 +583,7 @@ func TestMigrateStake(t *testing.T) {
 		cfg.Genesis.SystemStakingContractV3Address = contractAddress
 		cfg.Genesis.SystemStakingContractV3Height = 1
 		cfg.Genesis.VanuatuBlockHeight = 1
-		cfg.Genesis.ToBeEnabledBlockHeight = 1
+		cfg.Genesis.WakeBlockHeight = 1
 		testutil.NormalizeGenesisHeights(&cfg.Genesis.Blockchain)
 		cfg.DardanellesUpgrade.BlockInterval = time.Second * 8640
 		cfg.Plugins[config.GatewayPlugin] = nil

testutil/genesis.go

@@ -31,6 +31,7 @@ func NormalizeGenesisHeights(g *genesis.Blockchain) {
 		&g.TsunamiBlockHeight,
 		&g.UpernavikBlockHeight,
 		&g.VanuatuBlockHeight,
+		&g.WakeBlockHeight,
 		&g.ToBeEnabledBlockHeight,
 	}
 	for i := len(heights) - 2; i >= 0; i-- {