[config] enable web3 staking and broadcast node info at Queensland he…

…ight

action/protocol/context.go

@@ -246,8 +246,8 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			FixUnproductiveDelegates:                g.IsOkhotsk(height),
 			CorrectGasRefund:                        g.IsOkhotsk(height),
 			FixRewardErroCheckPosition:              g.IsOkhotsk(height),
-			EnableWeb3Rewarding:                     g.IsToBeEnabled(height),
-			EnableNodeInfo:                          g.IsToBeEnabled(height),
+			EnableWeb3Rewarding:                     g.IsQueensland(height),
+			EnableNodeInfo:                          g.IsQueensland(height),
 		},
 	)
 }

api/coreservice.go

@@ -459,7 +459,7 @@ func (core *coreService) validateChainID(chainID uint32) error {
 }
 
 func (core *coreService) validateWeb3Rewarding(selp action.SealedEnvelope) error {
-	if ge := core.bc.Genesis(); ge.IsToBeEnabled(core.bc.TipHeight()) || selp.Encoding() != uint32(iotextypes.Encoding_ETHEREUM_RLP) {
+	if ge := core.bc.Genesis(); ge.IsQueensland(core.bc.TipHeight()) || selp.Encoding() != uint32(iotextypes.Encoding_ETHEREUM_RLP) {
 		return nil
 	}
 	switch selp.Action().(type) {

blockchain/genesis/genesis.go

@@ -69,6 +69,7 @@ func defaultConfig() Genesis {
 			MidwayBlockHeight:       16509241,
 			NewfoundlandBlockHeight: 17662681,
 			OkhotskBlockHeight:      21542761,
+			QueenslandBlockHeight:   31542761,
 			ToBeEnabledBlockHeight:  math.MaxUint64,
 		},
 		Account: Account{
@@ -225,9 +226,12 @@ type (
 		// 3. fix gas and nonce update
 		// 4. fix unproductive delegates in staking protocol
 		OkhotskBlockHeight uint64 `yaml:"okhotskHeight"`
+		// QueenslandBlockHeight is the the start height to
+		// 1. enable rewarding action via web3
+		// 2. broadcast node info into the p2p network
+		QueenslandBlockHeight uint64 `yaml:"queenslandBlockHeight"`
 		// ToBeEnabledBlockHeight is a fake height that acts as a gating factor for WIP features
 		// upon next release, change IsToBeEnabled() to IsNextHeight() for features to be released
-		// 1. web3 rewarding api
 		ToBeEnabledBlockHeight uint64 `yaml:"toBeEnabledHeight"`
 	}
 	// Account contains the configs for account protocol
@@ -541,6 +545,11 @@ func (g *Blockchain) IsOkhotsk(height uint64) bool {
 	return g.isPost(g.OkhotskBlockHeight, height)
 }
 
+// IsQueensland checks whether height is equal to or larger than queensland height
+func (g *Blockchain) IsQueensland(height uint64) bool {
+	return g.isPost(g.QueenslandBlockHeight, height)
+}
+
 // IsToBeEnabled checks whether height is equal to or larger than toBeEnabled height
 func (g *Blockchain) IsToBeEnabled(height uint64) bool {
 	return g.isPost(g.ToBeEnabledBlockHeight, height)

blockchain/genesis/heightupgrade_test.go

@@ -53,6 +53,8 @@ func TestNewHeightChange(t *testing.T) {
 	require.True(cfg.IsNewfoundland(uint64(17662681)))
 	require.False(cfg.IsOkhotsk(uint64(21542760)))
 	require.True(cfg.IsOkhotsk(uint64(21542761)))
+	require.False(cfg.IsQueensland(uint64(31542760)))
+	require.True(cfg.IsQueensland(uint64(31542761)))
 
 	require.Equal(cfg.PacificBlockHeight, uint64(432001))
 	require.Equal(cfg.AleutianBlockHeight, uint64(864001))
@@ -72,4 +74,5 @@ func TestNewHeightChange(t *testing.T) {
 	require.Equal(cfg.MidwayBlockHeight, uint64(16509241))
 	require.Equal(cfg.NewfoundlandBlockHeight, uint64(17662681))
 	require.Equal(cfg.OkhotskBlockHeight, uint64(21542761))
+	require.Equal(cfg.QueenslandBlockHeight, uint64(31542761))
 }

config/config.go

@@ -321,6 +321,8 @@ func ValidateForkHeights(cfg Config) error {
 		return errors.Wrap(ErrInvalidCfg, "Midway is heigher than Newfoundland")
 	case hu.NewfoundlandBlockHeight > hu.OkhotskBlockHeight:
 		return errors.Wrap(ErrInvalidCfg, "Newfoundland is heigher than Okhotsk")
+	case hu.OkhotskBlockHeight > hu.QueenslandBlockHeight:
+		return errors.Wrap(ErrInvalidCfg, "Okhotsk is heigher than Queensland")
 	}
 	return nil
 }

config/config_test.go

@@ -365,6 +365,9 @@ func TestValidateForkHeights(t *testing.T) {
 		{
 			"Newfoundland", ErrInvalidCfg, "Newfoundland is heigher than Okhotsk",
 		},
+		{
+			"Okhotsk", ErrInvalidCfg, "Okhotsk is heigher than Queensland",
+		},
 		{
 			"", nil, "",
 		},
@@ -415,6 +418,8 @@ func newTestCfg(fork string) Config {
 		cfg.Genesis.MidwayBlockHeight = cfg.Genesis.NewfoundlandBlockHeight + 1
 	case "Newfoundland":
 		cfg.Genesis.NewfoundlandBlockHeight = cfg.Genesis.OkhotskBlockHeight + 1
+	case "Okhotsk":
+		cfg.Genesis.OkhotskBlockHeight = cfg.Genesis.QueenslandBlockHeight + 1
 	}
 	return cfg
 }

e2etest/nodeinfo_test.go

@@ -22,7 +22,7 @@ func newConfigForNodeInfoTest(triePath, dBPath, idxDBPath string) (config.Config
 	if err != nil {
 		return cfg, nil, err
 	}
-	cfg.Genesis.ToBeEnabledBlockHeight = 0
+	cfg.Genesis.QueenslandBlockHeight = 0
 	testTriePath, err := testutil.PathOfTempFile(triePath)
 	if err != nil {
 		return cfg, nil, err

nodeinfo/manager_test.go

@@ -47,7 +47,7 @@ func TestNewDelegateManager(t *testing.T) {
 		hMock.EXPECT().TipHeight().Return(uint64(2)).MinTimes(1)
 		hMock.EXPECT().Genesis().DoAndReturn(func() genesis.Genesis {
 			g := genesis.TestDefault()
-			g.ToBeEnabledBlockHeight = 1
+			g.QueenslandBlockHeight = 1
 			return g
 		}).MinTimes(1)
 		err := dm.Start(context.Background())
@@ -69,7 +69,7 @@ func TestNewDelegateManager(t *testing.T) {
 		hMock.EXPECT().TipHeight().Return(uint64(10)).MinTimes(1)
 		hMock.EXPECT().Genesis().DoAndReturn(func() genesis.Genesis {
 			g := genesis.TestDefault()
-			g.ToBeEnabledBlockHeight = 1
+			g.QueenslandBlockHeight = 1
 			return g
 		}).MinTimes(1)
 		tMock.EXPECT().BroadcastOutbound(gomock.Any(), gomock.Any()).Return(nil).MinTimes(1)
@@ -97,7 +97,7 @@ func TestNewDelegateManager(t *testing.T) {
 		hMock.EXPECT().TipHeight().Return(uint64(10)).MinTimes(1)
 		hMock.EXPECT().Genesis().DoAndReturn(func() genesis.Genesis {
 			g := genesis.TestDefault()
-			g.ToBeEnabledBlockHeight = 1
+			g.QueenslandBlockHeight = 1
 			return g
 		}).MinTimes(1)
 		tMock.EXPECT().BroadcastOutbound(gomock.Any(), gomock.Any()).Return(nil).MinTimes(1)