revert iip49 (#4638)

Author: CoderZhi

action/protocol/context.go

@@ -156,7 +156,6 @@ type (
 		FixRevertSnapshot                       bool
 		TimestampedStakingContract              bool
 		PreStateSystemAction                    bool
-		MakeUpBlockReward                       bool
 		CreatePostActionStates                  bool
 	}
 
@@ -319,7 +318,6 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			FixRevertSnapshot:                       g.IsVanuatu(height),
 			TimestampedStakingContract:              g.IsWake(height),
 			PreStateSystemAction:                    !g.IsWake(height),
-			MakeUpBlockReward:                       g.IsWake(height),
 			CreatePostActionStates:                  g.IsWake(height),
 		},
 	)

action/protocol/rewarding/reward.go

@@ -429,14 +429,7 @@ func (p *Protocol) calculateTotalRewardAndTip(ctx context.Context, sm protocol.S
 		blockReward  = (&big.Int{}).Set(a.blockReward)
 		effectiveTip = &big.Int{}
 	)
-	if featureCtx.MakeUpBlockReward {
-		effectiveTip.Set(&blkCtx.AccumulatedTips)
-		if blkCtx.AccumulatedTips.Cmp(blockReward) >= 0 {
-			blockReward.SetUint64(0)
-		} else {
-			blockReward.Sub(blockReward, &blkCtx.AccumulatedTips)
-		}
-	} else if featureCtx.EnableDynamicFeeTx {
+	if featureCtx.EnableDynamicFeeTx {
 		if blkCtx.AccumulatedTips.Sign() > 0 {
 			effectiveTip.Set(&blkCtx.AccumulatedTips)
 		}

action/protocol/rewarding/reward_test.go

@@ -563,7 +563,7 @@ func TestProtocol_CalculateReward(t *testing.T) {
 	req := require.New(t)
 	var (
 		dardanellesBlockReward = unit.ConvertIotxToRau(8)
-		wakeBlockReward, _     = big.NewInt(0).SetString("4800000000000000000", 10)
+		wakeBlockReward, _     = big.NewInt(0).SetString("4000000000000000000", 10)
 	)
 	for _, tv := range []struct {
 		accumuTips                    *big.Int
@@ -572,8 +572,8 @@ func TestProtocol_CalculateReward(t *testing.T) {
 	}{
 		{unit.ConvertIotxToRau(3), false, dardanellesBlockReward, unit.ConvertIotxToRau(11), unit.ConvertIotxToRau(3)},
 		{unit.ConvertIotxToRau(12), false, dardanellesBlockReward, unit.ConvertIotxToRau(20), unit.ConvertIotxToRau(12)},
-		{unit.ConvertIotxToRau(3), true, (&big.Int{}).Sub(wakeBlockReward, unit.ConvertIotxToRau(3)), wakeBlockReward, unit.ConvertIotxToRau(3)},
-		{unit.ConvertIotxToRau(6), true, (&big.Int{}).SetInt64(0), unit.ConvertIotxToRau(6), unit.ConvertIotxToRau(6)},
+		{unit.ConvertIotxToRau(3), true, wakeBlockReward, big.NewInt(0).Add(unit.ConvertIotxToRau(3), wakeBlockReward), unit.ConvertIotxToRau(3)},
+		{unit.ConvertIotxToRau(6), true, wakeBlockReward, big.NewInt(0).Add(unit.ConvertIotxToRau(6), wakeBlockReward), unit.ConvertIotxToRau(6)},
 	} {
 		testProtocol(t, func(t *testing.T, ctx context.Context, sm protocol.StateManager, p *Protocol) {
 			// update block reward