[staking] extra bonus requires enable auto-stake for at least 3 months (iotexproject#2144)

Author: dustinxie

action/protocol/poll/protocol.go

@@ -51,14 +51,6 @@ var ErrDelegatesNotAsExpected = errors.New("delegates are not as expected")
 var ErrDelegatesNotExist = errors.New("delegates cannot be found")
 
 type (
-	validationContextKey struct{}
-
-	// ValidationCtx provides validation auxiliary information.
-	ValidationCtx struct {
-		// Validated indicates validation has been done
-		Validated bool
-	}
-
 	// GetCandidates returns the current candidates
 	GetCandidates func(protocol.StateReader, uint64, bool, bool) ([]*state.Candidate, uint64, error)
 
@@ -123,17 +115,6 @@ func MustGetProtocol(registry *protocol.Registry) Protocol {
 	return pp
 }
 
-// WithValidationlCtx add ValidationCtx into context.
-func WithValidationlCtx(ctx context.Context, val ValidationCtx) context.Context {
-	return context.WithValue(ctx, validationContextKey{}, val)
-}
-
-// GetValidationCtx gets ValidationCtx
-func GetValidationCtx(ctx context.Context) (ValidationCtx, bool) {
-	val, ok := ctx.Value(validationContextKey{}).(ValidationCtx)
-	return val, ok
-}
-
 // NewProtocol instantiates a rewarding protocol instance.
 func NewProtocol(
 	cfg config.Config,

action/protocol/poll/protocol_test.go

@@ -77,15 +77,3 @@ func TestMustGetProtocol(t *testing.T) {
 	require.NoError(p.Register(re))
 	require.NotNil(FindProtocol(re))
 }
-
-func TestGetValidationCtx(t *testing.T) {
-	require := require.New(t)
-	pCtx := ValidationCtx{
-		Validated: true,
-	}
-	ctx := WithValidationlCtx(context.Background(), pCtx)
-	require.NotNil(ctx)
-	ret, ok := GetValidationCtx(ctx)
-	require.True(ok)
-	require.Equal(true, ret.Validated)
-}

action/protocol/poll/util.go

@@ -68,11 +68,6 @@ func handle(ctx context.Context, act action.Action, sm protocol.StateManager, in
 }
 
 func validate(ctx context.Context, sr protocol.StateReader, p Protocol, act action.Action) error {
-	valCtx, ok := GetValidationCtx(ctx)
-	if ok && valCtx.Validated {
-		return nil
-	}
-
 	ppr, ok := act.(*action.PutPollResult)
 	if !ok {
 		return nil

action/protocol/staking/handlers_test.go

@@ -274,7 +274,7 @@ func TestProtocol_HandleCandidateRegister(t *testing.T) {
 			identityset.Address(29).String(),
 			"",
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			nil,
@@ -316,7 +316,7 @@ func TestProtocol_HandleCandidateRegister(t *testing.T) {
 			identityset.Address(29).String(),
 			identityset.Address(30).String(),
 			"120000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			nil,
@@ -337,7 +337,7 @@ func TestProtocol_HandleCandidateRegister(t *testing.T) {
 			identityset.Address(29).String(),
 			identityset.Address(30).String(),
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			nil,
@@ -357,7 +357,7 @@ func TestProtocol_HandleCandidateRegister(t *testing.T) {
 			identityset.Address(29).String(),
 			identityset.Address(30).String(),
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			nil,
@@ -524,7 +524,7 @@ func TestProtocol_handleCandidateUpdate(t *testing.T) {
 			identityset.Address(29).String(),
 			"",
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			[]byte("payload"),
@@ -571,7 +571,7 @@ func TestProtocol_handleCandidateUpdate(t *testing.T) {
 			identityset.Address(29).String(),
 			identityset.Address(27).String(),
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			[]byte("payload"),
@@ -594,7 +594,7 @@ func TestProtocol_handleCandidateUpdate(t *testing.T) {
 			identityset.Address(29).String(),
 			identityset.Address(27).String(),
 			"1200000000000000000000000",
-			"1914576399585798860414342",
+			"1806204150552640363969204",
 			uint32(10000),
 			false,
 			[]byte("payload"),

action/protocol/staking/vote_bucket.go

@@ -313,7 +313,8 @@ func calculateVoteWeight(c genesis.VoteWeightCalConsts, v *VoteBucket, selfStake
 	if remainingTime > 0 {
 		weight += math.Log(math.Ceil(remainingTime/86400)*(1+m)) / math.Log(c.DurationLg) / 100
 	}
-	if selfStake {
+	if selfStake && v.AutoStake && v.StakedDuration >= time.Duration(91)*24*time.Hour {
+		// self-stake extra bonus requires enable auto-stake for at least 3 months
 		weight *= c.SelfStake
 	}
 

e2etest/native_staking_test.go

@@ -36,11 +36,14 @@ const (
 
 	candidate1Name = "candidate1"
 	candidate2Name = "candidate2"
-	selfStake      = "1200000000000000000000000"
-	initVotes      = "1272000000000000063948846"
-	vote           = "100000000000000000000"
-	autoStakeVote  = "103801784016923925869"
-	initBalance    = "100000000000000000000000000"
+)
+
+var (
+	selfStake, _     = big.NewInt(0).SetString("1200000000000000000000000", 10)
+	cand1Votes, _    = big.NewInt(0).SetString("1635067133824581908640994", 10)
+	vote, _          = big.NewInt(0).SetString("100000000000000000000", 10)
+	autoStakeVote, _ = big.NewInt(0).SetString("103801784016923925869", 10)
+	initBalance, _   = big.NewInt(0).SetString("100000000000000000000000000", 10)
 )
 
 var (
@@ -57,14 +60,14 @@ func TestNativeStaking(t *testing.T) {
 			identityset.Address(23).String(),
 			identityset.Address(23).String(),
 			"test1",
-			selfStake,
+			selfStake.String(),
 		},
 		{
 			identityset.Address(24).String(),
 			identityset.Address(25).String(),
 			identityset.Address(25).String(),
 			"test2",
-			selfStake,
+			selfStake.String(),
 		},
 	}
 
@@ -93,10 +96,10 @@ func TestNativeStaking(t *testing.T) {
 		cand2PriKey := identityset.PrivateKey(1)
 
 		register1, err := testutil.SignedCandidateRegister(1, candidate1Name, cand1Addr.String(), cand1Addr.String(),
-			cand1Addr.String(), selfStake, 1, false, nil, gasLimit, gasPrice, cand1PriKey)
+			cand1Addr.String(), selfStake.String(), 91, true, nil, gasLimit, gasPrice, cand1PriKey)
 		require.NoError(err)
 		register2, err := testutil.SignedCandidateRegister(1, candidate2Name, cand2Addr.String(), cand2Addr.String(),
-			cand2Addr.String(), selfStake, 1, false, nil, gasLimit, gasPrice, cand2PriKey)
+			cand2Addr.String(), selfStake.String(), 1, false, nil, gasLimit, gasPrice, cand2PriKey)
 		require.NoError(err)
 
 		fixedTime := time.Unix(cfg.Genesis.Timestamp, 0)
@@ -106,8 +109,8 @@ func TestNativeStaking(t *testing.T) {
 			[]action.SealedEnvelope{register2}, fixedTime))
 
 		// check candidate state
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, initVotes, cand1Addr))
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, initVotes, cand1Addr))
+		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, cand1Votes, cand1Addr))
+		require.NoError(checkCandidateState(sf, candidate2Name, cand2Addr.String(), selfStake, selfStake, cand2Addr))
 
 		// check candidate account state
 		require.NoError(checkAccountState(cfg, sf, register1, true, initBalance, cand1Addr))
@@ -126,21 +129,19 @@ func TestNativeStaking(t *testing.T) {
 		voter2Addr := identityset.Address(3)
 		voter2PriKey := identityset.PrivateKey(3)
 
-		cs1, err := testutil.SignedCreateStake(1, candidate1Name, vote, 1, false,
+		cs1, err := testutil.SignedCreateStake(1, candidate1Name, vote.String(), 1, false,
 			nil, gasLimit, gasPrice, voter1PriKey)
 		require.NoError(err)
-		cs2, err := testutil.SignedCreateStake(1, candidate1Name, vote, 1, false,
+		cs2, err := testutil.SignedCreateStake(1, candidate1Name, vote.String(), 1, false,
 			nil, gasLimit, gasPrice, voter2PriKey)
 		require.NoError(err)
 
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter1Addr, voter2Addr},
 			[]action.SealedEnvelope{cs1, cs2}, fixedTime))
 
 		// check candidate state
-		wv, _ := big.NewInt(0).SetString(vote, 10)
-		expectedVotes, _ := big.NewInt(0).SetString(initVotes, 10)
-		expectedVotes.Add(expectedVotes, big.NewInt(0).Mul(wv, big.NewInt(2)))
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, expectedVotes.String(), cand1Addr))
+		expectedVotes := big.NewInt(0).Add(cand1Votes, big.NewInt(0).Mul(vote, big.NewInt(2)))
+		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, expectedVotes, cand1Addr))
 
 		// check voter account state
 		require.NoError(checkAccountState(cfg, sf, cs1, false, initBalance, voter1Addr))
@@ -162,14 +163,13 @@ func TestNativeStaking(t *testing.T) {
 		cc, err := testutil.SignedChangeCandidate(2, candidate2Name, voter2BucketIndex, nil,
 			gasLimit, gasPrice, voter2PriKey)
 		require.NoError(err)
-
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter2Addr}, []action.SealedEnvelope{cc}, fixedTime))
 
 		// check candidate state
-		expectedVotes, _ = big.NewInt(0).SetString(initVotes, 10)
-		expectedVotes.Add(expectedVotes, wv)
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, expectedVotes.String(), cand1Addr))
-		require.NoError(checkCandidateState(sf, candidate2Name, cand2Addr.String(), selfStake, expectedVotes.String(), cand2Addr))
+		expectedVotes = big.NewInt(0).Add(cand1Votes, vote)
+		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, expectedVotes, cand1Addr))
+		expectedVotes = big.NewInt(0).Add(selfStake, vote)
+		require.NoError(checkCandidateState(sf, candidate2Name, cand2Addr.String(), selfStake, expectedVotes, cand2Addr))
 
 		// transfer stake
 		ts, err := testutil.SignedTransferStake(2, voter2Addr.String(), voter1BucketIndex, nil, gasLimit, gasPrice, voter1PriKey)
@@ -191,7 +191,7 @@ func TestNativeStaking(t *testing.T) {
 		require.Equal(voter1BucketIndex, bis[1])
 
 		// deposit to stake
-		ds, err := testutil.SignedDepositToStake(3, voter2BucketIndex, vote, nil, gasLimit, gasPrice, voter2PriKey)
+		ds, err := testutil.SignedDepositToStake(3, voter2BucketIndex, vote.String(), nil, gasLimit, gasPrice, voter2PriKey)
 		require.NoError(err)
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter2Addr}, []action.SealedEnvelope{ds}, fixedTime))
 		r, err := dao.GetReceiptByActionHash(ds.Hash(), 6)
@@ -205,21 +205,16 @@ func TestNativeStaking(t *testing.T) {
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter2Addr}, []action.SealedEnvelope{rs}, fixedTime))
 
 		// check candidate state
-		expectedVotes, _ = big.NewInt(0).SetString(initVotes, 10)
-		wv, _ = big.NewInt(0).SetString(autoStakeVote, 10)
-		expectedVotes.Add(expectedVotes, wv)
-		require.NoError(checkCandidateState(sf, candidate2Name, cand2Addr.String(), selfStake, expectedVotes.String(), cand2Addr))
+		expectedVotes = big.NewInt(0).Add(selfStake, autoStakeVote)
+		require.NoError(checkCandidateState(sf, candidate2Name, cand2Addr.String(), selfStake, expectedVotes, cand2Addr))
 
 		// deposit to stake again
-		ds, err = testutil.SignedDepositToStake(3, voter2BucketIndex, vote, nil, gasLimit, gasPrice, voter2PriKey)
+		ds, err = testutil.SignedDepositToStake(3, voter2BucketIndex, vote.String(), nil, gasLimit, gasPrice, voter2PriKey)
 		require.NoError(err)
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter2Addr}, []action.SealedEnvelope{ds}, fixedTime))
 
 		// check voter account state
-		voterBalance, _ := big.NewInt(0).SetString(initBalance, 10)
-		vote, _ := big.NewInt(0).SetString(vote, 10)
-		voterBalance.Sub(voterBalance, vote)
-		require.NoError(checkAccountState(cfg, sf, ds, false, voterBalance.String(), voter2Addr))
+		require.NoError(checkAccountState(cfg, sf, ds, false, big.NewInt(0).Sub(initBalance, vote), voter2Addr))
 
 		// unstake voter stake
 		us, err := testutil.SignedReclaimStake(false, 4, voter1BucketIndex, nil, gasLimit, gasPrice, voter2PriKey)
@@ -232,47 +227,39 @@ func TestNativeStaking(t *testing.T) {
 		require.NoError(createAndCommitBlock(bc, []address.Address{voter2Addr}, []action.SealedEnvelope{us}, unstakeTime))
 
 		// check candidate state
-		expectedVotes, _ = big.NewInt(0).SetString(initVotes, 10)
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, expectedVotes.String(), cand1Addr))
+		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, cand1Votes, cand1Addr))
 
 		// unstake self stake
 		us, err = testutil.SignedReclaimStake(false, 2, selfstakeIndex1, nil, gasLimit, gasPrice, cand1PriKey)
 		require.NoError(err)
 		require.NoError(createAndCommitBlock(bc, []address.Address{cand1Addr}, []action.SealedEnvelope{us}, unstakeTime))
 
 		// check candidate state
-		expectedVotes = big.NewInt(0)
-		expectedSelfStake := big.NewInt(0)
-		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), expectedSelfStake.String(),
-			expectedVotes.String(), cand1Addr))
+		require.NoError(checkCandidateState(sf, candidate1Name, cand1Addr.String(), selfStake, cand1Votes, cand1Addr))
 
 		// withdraw stake
 		ws, err := testutil.SignedReclaimStake(true, 3, selfstakeIndex1, nil, gasLimit, gasPrice, cand1PriKey)
 		require.NoError(err)
 		require.NoError(createAndCommitBlock(bc, []address.Address{cand1Addr}, []action.SealedEnvelope{ws}, unstakeTime))
 		r, err = dao.GetReceiptByActionHash(ws.Hash(), 12)
 		require.NoError(err)
-		require.Equal(uint64(iotextypes.ReceiptStatus_ErrWithdrawBeforeMaturity), r.Status)
+		require.Equal(uint64(iotextypes.ReceiptStatus_ErrWithdrawBeforeUnstake), r.Status)
 
 		require.NoError(createAndCommitBlock(bc, []address.Address{cand1Addr}, []action.SealedEnvelope{ws}, unstakeTime.Add(cfg.Genesis.WithdrawWaitingPeriod)))
 
 		// check buckets
 		_, err = sf.State(&bis, protocol.NamespaceOption(staking.StakingNameSpace),
 			protocol.KeyOption(addrKeyWithPrefix(cand1Addr, _voterIndex)))
-		require.Error(err)
-		require.Equal(state.ErrStateNotExist, errors.Cause(err))
+		require.NoError(err)
+		require.Equal(1, len(bis))
 
 		_, err = sf.State(&bis, protocol.NamespaceOption(staking.StakingNameSpace),
 			protocol.KeyOption(addrKeyWithPrefix(cand1Addr, _candIndex)))
 		require.NoError(err)
-		require.Equal(1, len(bis))
+		require.Equal(2, len(bis))
 
 		// check candidate account state
-		candidateBalance, _ := big.NewInt(0).SetString(initBalance, 10)
-		registrationFee, ok := new(big.Int).SetString(cfg.Genesis.RegistrationConsts.Fee, 10)
-		require.True(ok)
-		candidateBalance.Sub(candidateBalance, registrationFee)
-		require.NoError(checkAccountState(cfg, sf, ws, false, candidateBalance.String(), cand1Addr))
+		require.NoError(checkAccountState(cfg, sf, ws, true, big.NewInt(0).Sub(initBalance, selfStake), cand1Addr))
 	}
 
 	cfg := config.Default
@@ -318,9 +305,9 @@ func addrKeyWithPrefix(voterAddr address.Address, prefix byte) []byte {
 func checkCandidateState(
 	sr protocol.StateReader,
 	expectedName,
-	expectedOwnerAddr,
+	expectedOwnerAddr string,
 	expectedSelfStake,
-	expectedVotes string,
+	expectedVotes *big.Int,
 	candidateAddr address.Address,
 ) error {
 	var cand staking.Candidate
@@ -333,10 +320,10 @@ func checkCandidateState(
 	if expectedOwnerAddr != cand.Owner.String() {
 		return errors.New("Owner address does not match")
 	}
-	if expectedSelfStake != cand.SelfStake.String() {
+	if expectedSelfStake.Cmp(cand.SelfStake) != 0 {
 		return errors.New("self stake does not match")
 	}
-	if expectedVotes != cand.Votes.String() {
+	if expectedVotes.Cmp(cand.Votes) != 0 {
 		return errors.New("votes does not match")
 	}
 	return nil
@@ -347,7 +334,7 @@ func checkAccountState(
 	sr protocol.StateReader,
 	act action.SealedEnvelope,
 	registrationFee bool,
-	expectedBalance string,
+	expectedBalance *big.Int,
 	accountAddr address.Address,
 ) error {
 	cost, err := act.Cost()
@@ -362,7 +349,7 @@ func checkAccountState(
 	if err != nil {
 		return err
 	}
-	if expectedBalance != big.NewInt(0).Add(acct1.Balance, cost).String() {
+	if expectedBalance.Cmp(cost.Add(cost, acct1.Balance)) != 0 {
 		return errors.New("balance does not match")
 	}
 	return nil

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/golang-lru v0.5.1
-	github.com/iotexproject/go-ethereum v1.7.3 // indirect
 	github.com/iotexproject/go-fsm v1.0.0
 	github.com/iotexproject/go-p2p v0.2.12
 	github.com/iotexproject/go-pkgs v0.1.2-0.20200212033110-8fa5cf96fc1b

go.sum

@@ -163,17 +163,11 @@ github.com/iotexproject/iotex-address v0.2.1 h1:ZJH2ajx5OBrbaRJ0ZWlWUo685zr5kjWi
 github.com/iotexproject/iotex-address v0.2.1/go.mod h1:ONmTqmg6zO7VWF9TcWN+UrreFr/xpazlv9PWOALbLFA=
 github.com/iotexproject/iotex-antenna-go/v2 v2.3.2 h1:xCJa1QYV/f9cSF9z32fFmfTcGb8sYvn1No+uDlgwABA=
 github.com/iotexproject/iotex-antenna-go/v2 v2.3.2/go.mod h1:R6WIWVfZAnpSo8llzEsSoGJgHSYeYamjBqG35oHpgxU=
-github.com/iotexproject/iotex-election v0.2.11 h1:opQk5DVVtem2u6tIO/wFND4qX9QqpL8Pb/hiPG3fuFw=
-github.com/iotexproject/iotex-election v0.2.11/go.mod h1:y5niif2oeYT1MVS4WOIqNgSlDCpmGWjR8clafzrOg6E=
-github.com/iotexproject/iotex-election v0.2.16 h1:MilLe/wpT/yJL9QV2oN+wI/h9EC2roatoH5/dsESAPg=
-github.com/iotexproject/iotex-election v0.2.16/go.mod h1:8GJZXtJeTaqOypPaQNzPWqCXEde4tU8fL00vsbvqEkw=
 github.com/iotexproject/iotex-election v0.2.17-0.20200424232423-683b3d35aa4b h1:EHrO7nE8ryh5X4a+V8LwG+UVoUC3rSB2f9lYVD5tJzA=
 github.com/iotexproject/iotex-election v0.2.17-0.20200424232423-683b3d35aa4b/go.mod h1:8GJZXtJeTaqOypPaQNzPWqCXEde4tU8fL00vsbvqEkw=
 github.com/iotexproject/iotex-proto v0.2.1-0.20190814190638-f74c55ffedf5/go.mod h1:962P5o0qlB5sqRT07TJBMX31i2u309kzDqqwCg+cGz0=
 github.com/iotexproject/iotex-proto v0.2.5 h1:SYdl9Lqb0LYfFf3sfw92fN8GY3bthfCvGmltz+2uvDQ=
 github.com/iotexproject/iotex-proto v0.2.5/go.mod h1:962P5o0qlB5sqRT07TJBMX31i2u309kzDqqwCg+cGz0=
-github.com/iotexproject/iotex-proto v0.2.6-0.20200402191724-24f4101d4987 h1:mxVn3FVBuYn0g0RcAhhOwcWVoLj5Mv4H9wkdyX0x/sI=
-github.com/iotexproject/iotex-proto v0.2.6-0.20200402191724-24f4101d4987/go.mod h1:xKA4yUbg208k1j3+t10Pe7IzT6uHcP+/4rsDanF4Q58=
 github.com/iotexproject/iotex-proto v0.2.6-0.20200409230611-748f6ab69ca5 h1:ggKAkpi4j0aDPnLS5tIgZcfr6MKrWbnDScnqZ4NsyEU=
 github.com/iotexproject/iotex-proto v0.2.6-0.20200409230611-748f6ab69ca5/go.mod h1:xKA4yUbg208k1j3+t10Pe7IzT6uHcP+/4rsDanF4Q58=
 github.com/ipfs/go-cid v0.0.1 h1:GBjWPktLnNyX0JiQCNFpUuUSoMw5KMyqrsejHYlILBE=