[state] convert clean address to zero-nonce type (#3991)

action/protocol/context.go

@@ -115,6 +115,7 @@ type (
 		FixContractStakingWeightedVotes         bool
 		SharedGasWithDapp                       bool
 		ExecutionSizeLimit32KB                  bool
+		UseZeroNonceForFreshAccount             bool
 	}
 
 	// FeatureWithHeightCtx provides feature check functions.
@@ -255,6 +256,7 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			FixContractStakingWeightedVotes:         g.IsRedsea(height),
 			SharedGasWithDapp:                       g.IsToBeEnabled(height),
 			ExecutionSizeLimit32KB:                  !g.IsToBeEnabled(height),
+			UseZeroNonceForFreshAccount:             g.IsToBeEnabled(height),
 		},
 	)
 }

action/protocol/generic_validator.go

@@ -58,13 +58,21 @@ func (v *GenericValidator) Validate(ctx context.Context, selp action.SealedEnvel
 			return action.ErrSystemActionNonce
 		}
 	} else {
-		featureCtx, ok := GetFeatureCtx(ctx)
+		var (
+			nonce          uint64
+			featureCtx, ok = GetFeatureCtx(ctx)
+		)
 		if ok && featureCtx.FixGasAndNonceUpdate || selp.Nonce() != 0 {
 			confirmedState, err := v.accountState(ctx, v.sr, caller)
 			if err != nil {
 				return errors.Wrapf(err, "invalid state of account %s", caller.String())
 			}
-			if confirmedState.PendingNonce() > selp.Nonce() {
+			if featureCtx.UseZeroNonceForFreshAccount {
+				nonce = confirmedState.PendingNonceConsideringFreshAccount()
+			} else {
+				nonce = confirmedState.PendingNonce()
+			}
+			if nonce > selp.Nonce() {
 				return action.ErrNonceTooLow
 			}
 		}

actpool/actpool.go

@@ -319,7 +319,10 @@ func (ap *actPool) GetPendingNonce(addrStr string) (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
-	return confirmedState.PendingNonce(), err
+	if protocol.MustGetFeatureCtx(ctx).UseZeroNonceForFreshAccount {
+		return confirmedState.PendingNonceConsideringFreshAccount(), nil
+	}
+	return confirmedState.PendingNonce(), nil
 }
 
 // GetUnconfirmedActs returns unconfirmed actions in pool given an account address
@@ -424,7 +427,11 @@ func (ap *actPool) removeInvalidActs(acts []action.SealedEnvelope) {
 }
 
 func (ap *actPool) context(ctx context.Context) context.Context {
-	return genesis.WithGenesisContext(ctx, ap.g)
+	height, _ := ap.sf.Height()
+	return protocol.WithFeatureCtx(protocol.WithBlockCtx(
+		genesis.WithGenesisContext(ctx, ap.g), protocol.BlockCtx{
+			BlockHeight: height + 1,
+		}))
 }
 
 func (ap *actPool) enqueue(ctx context.Context, act action.SealedEnvelope, replace bool) error {

actpool/actpool_test.go

@@ -1040,6 +1040,7 @@ func TestActPool_GetSize(t *testing.T) {
 func TestActPool_AddActionNotEnoughGasPrice(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	sf := mock_chainmanager.NewMockStateReader(ctrl)
+	sf.EXPECT().Height().Return(uint64(0), nil).Times(2)
 
 	apConfig := DefaultConfig
 	ap, err := NewActPool(genesis.Default, sf, apConfig)
@@ -1056,7 +1057,10 @@ func TestActPool_AddActionNotEnoughGasPrice(t *testing.T) {
 	require.NoError(t, err)
 
 	ctx := protocol.WithBlockchainCtx(context.Background(), protocol.BlockchainCtx{})
-	ctx = genesis.WithGenesisContext(ctx, genesis.Default)
+	ctx = protocol.WithFeatureCtx(protocol.WithBlockCtx(
+		genesis.WithGenesisContext(ctx, genesis.Default), protocol.BlockCtx{
+			BlockHeight: 1,
+		}))
 	require.Error(t, ap.Add(ctx, tsf))
 }
 

actpool/actqueue.go

@@ -18,6 +18,7 @@ import (
 	"github.com/iotexproject/iotex-address/address"
 
 	"github.com/iotexproject/iotex-core/action"
+	"github.com/iotexproject/iotex-core/action/protocol"
 	accountutil "github.com/iotexproject/iotex-core/action/protocol/account/util"
 	"github.com/iotexproject/iotex-core/pkg/log"
 )
@@ -283,10 +284,15 @@ func (q *actQueue) PendingActs(ctx context.Context) []action.SealedEnvelope {
 	}
 
 	var (
-		nonce   = confirmedState.PendingNonce()
+		nonce   uint64
 		balance = new(big.Int).Set(confirmedState.Balance)
 		acts    = make([]action.SealedEnvelope, 0, len(q.items))
 	)
+	if protocol.MustGetFeatureCtx(ctx).UseZeroNonceForFreshAccount {
+		nonce = confirmedState.PendingNonceConsideringFreshAccount()
+	} else {
+		nonce = confirmedState.PendingNonce()
+	}
 	q.mu.RLock()
 	defer q.mu.RUnlock()
 	for ; ; nonce++ {

actpool/actqueue_test.go

@@ -133,7 +133,10 @@ func TestActQueuePendingActs(t *testing.T) {
 		accountState.Balance = big.NewInt(maxBalance)
 	}).Return(uint64(0), nil).Times(1)
 	sf.EXPECT().Height().Return(uint64(1), nil).AnyTimes()
-	ctx := genesis.WithGenesisContext(context.Background(), genesis.Default)
+	ctx := protocol.WithFeatureCtx(protocol.WithBlockCtx(
+		genesis.WithGenesisContext(context.Background(), genesis.Default), protocol.BlockCtx{
+			BlockHeight: 1,
+		}))
 	ap, err := NewActPool(genesis.Default, sf, DefaultConfig)
 	require.NoError(err)
 	q := NewActQueue(ap.(*actPool), identityset.Address(0).String(), 1, big.NewInt(maxBalance)).(*actQueue)

actpool/queueworker.go

@@ -15,6 +15,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/iotexproject/iotex-core/action"
+	"github.com/iotexproject/iotex-core/action/protocol"
 	accountutil "github.com/iotexproject/iotex-core/action/protocol/account/util"
 	"github.com/iotexproject/iotex-core/pkg/log"
 	"github.com/iotexproject/iotex-core/pkg/tracer"
@@ -144,7 +145,13 @@ func (worker *queueWorker) getConfirmedState(ctx context.Context, sender address
 		if err != nil {
 			return 0, nil, err
 		}
-		return confirmedState.PendingNonce(), confirmedState.Balance, nil
+		var nonce uint64
+		if protocol.MustGetFeatureCtx(ctx).UseZeroNonceForFreshAccount {
+			nonce = confirmedState.PendingNonceConsideringFreshAccount()
+		} else {
+			nonce = confirmedState.PendingNonce()
+		}
+		return nonce, confirmedState.Balance, nil
 	}
 	nonce, balance := queue.AccountState()
 	return nonce, balance, nil

api/web3server.go

@@ -454,7 +454,7 @@ func (svr *web3Handler) sendRawTransaction(in *gjson.Result) (interface{}, error
 		pubkey   crypto.PublicKey
 		err      error
 	)
-	if g := cs.Genesis(); g.IsSumatra(cs.TipHeight()) {
+	if g := cs.Genesis(); g.IsToBeEnabled(cs.TipHeight()) {
 		tx, err = action.DecodeEtherTx(dataStr.String())
 		if err != nil {
 			return nil, err