account type with zero init nonce (#3387)

* set balance via SubBalance and AddBalance

* create account with NewAccount and NewEmptyAccount

* refactor state.nonce

* skip update nonce and gas for system actions

* check nonce value

* account type

* read state with context

* address comments

* fix unit test

* address comment

* address comment

Co-authored-by: Haaai <55118568+Liuhaai@users.noreply.github.com>

action/const.go

@@ -16,6 +16,7 @@ var (
 	ErrChainID            = errors.New("invalid chainID")
 	ErrExistedInPool      = errors.New("known transaction")
 	ErrReplaceUnderpriced = errors.New("replacement transaction underpriced")
+	ErrSystemActionNonce  = errors.New("invalid system action nonce")
 	ErrNonceTooLow        = errors.New("nonce too low")
 	ErrUnderpriced        = errors.New("transaction underpriced")
 	ErrNegativeValue      = errors.New("negative value")

action/protocol/account/accountpb/account.proto

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 IoTeX
+// Copyright (c) 2022 IoTeX
 // This is an alpha (internal) release and is not suitable for production. This source code is provided 'as is' and no
 // warranties are given as to title or non-infringement, merchantability or fitness for purpose and, to the extent
 // permitted by law, all liability for your use of the code is disclaimed. This source code is governed by Apache
@@ -8,6 +8,12 @@
 //      protoc --go_out=plugins=grpc:. *.proto
 syntax = "proto3";
 package accountpb;
+option go_package = "github.com/iotexproject/iotex-core/action/protocol/account/accountpb";
+
+enum AccountType {
+    DEFAULT = 0;
+    ZERO_NONCE = 1;
+}
 
 message Account {
     // used by state-based model
@@ -17,5 +23,5 @@ message Account {
     bytes codeHash  = 4;
     bool isCandidate = 5;
     bytes votingWeight  = 6;
+    AccountType type = 7;
 }
-

action/protocol/account/protocol.go

@@ -107,20 +107,25 @@ func (p *Protocol) Name() string {
 	return protocolID
 }
 
-func createAccount(sm protocol.StateManager, encodedAddr string, init *big.Int) error {
-	var account state.Account
+func createAccount(sm protocol.StateManager, encodedAddr string, init *big.Int, opts ...state.AccountCreationOption) error {
+	account := &state.Account{}
 	addr, err := address.FromString(encodedAddr)
 	if err != nil {
 		return errors.Wrap(err, "failed to get address public key hash from encoded address")
 	}
 	addrHash := hash.BytesToHash160(addr.Bytes())
-	_, err = sm.State(&account, protocol.LegacyKeyOption(addrHash))
+	_, err = sm.State(account, protocol.LegacyKeyOption(addrHash))
 	switch errors.Cause(err) {
 	case nil:
 		return errors.Errorf("failed to create account %s", encodedAddr)
 	case state.ErrStateNotExist:
-		account.Balance = init
-		account.VotingWeight = big.NewInt(0)
+		account, err := state.NewAccount(opts...)
+		if err != nil {
+			return err
+		}
+		if err := account.AddBalance(init); err != nil {
+			return errors.Wrapf(err, "failed to add balance %s", init)
+		}
 		if _, err := sm.PutState(account, protocol.LegacyKeyOption(addrHash)); err != nil {
 			return errors.Wrapf(err, "failed to put state for account %x", addrHash)
 		}
@@ -143,8 +148,12 @@ func (p *Protocol) CreateGenesisStates(ctx context.Context, sm protocol.StateMan
 	if err := p.assertAmounts(amounts); err != nil {
 		return err
 	}
+	opts := []state.AccountCreationOption{}
+	if protocol.MustGetFeatureCtx(ctx).CreateLegacyNonceAccount {
+		opts = append(opts, state.LegacyNonceAccountTypeOption())
+	}
 	for i, addr := range addrs {
-		if err := createAccount(sm, addr.String(), amounts[i]); err != nil {
+		if err := createAccount(sm, addr.String(), amounts[i], opts...); err != nil {
 			return err
 		}
 	}

action/protocol/account/protocol_test.go

@@ -61,14 +61,14 @@ func TestLoadOrCreateAccountState(t *testing.T) {
 	addrv1 := identityset.Address(27)
 	s, err := accountutil.LoadAccount(sm, addrv1)
 	require.NoError(err)
-	require.Equal(s.Balance, state.EmptyAccount().Balance)
+	require.Equal(s.Balance, big.NewInt(0))
 
 	// create account
-	require.NoError(createAccount(sm, addrv1.String(), big.NewInt(5)))
+	require.NoError(createAccount(sm, addrv1.String(), big.NewInt(5), state.LegacyNonceAccountTypeOption()))
 	s, err = accountutil.LoadAccount(sm, addrv1)
 	require.NoError(err)
 	require.Equal("5", s.Balance.String())
-	require.Equal(uint64(0x0), s.Nonce)
+	require.Equal(uint64(0x1), s.PendingNonce())
 }
 
 func TestProtocol_Initialize(t *testing.T) {
@@ -109,7 +109,7 @@ func TestProtocol_Initialize(t *testing.T) {
 	ctx := protocol.WithBlockCtx(context.Background(), protocol.BlockCtx{
 		BlockHeight: 0,
 	})
-	ctx = genesis.WithGenesisContext(ctx, ge)
+	ctx = protocol.WithFeatureCtx(genesis.WithGenesisContext(ctx, ge))
 	p := NewProtocol(rewarding.DepositGas)
 	require.NoError(
 		p.CreateGenesisStates(

action/protocol/account/transfer.go

@@ -25,20 +25,23 @@ const TransferSizeLimit = 32 * 1024
 
 // handleTransfer handles a transfer
 func (p *Protocol) handleTransfer(ctx context.Context, act action.Action, sm protocol.StateManager) (*action.Receipt, error) {
-	actionCtx := protocol.MustGetActionCtx(ctx)
-	blkCtx := protocol.MustGetBlockCtx(ctx)
 	tsf, ok := act.(*action.Transfer)
 	if !ok {
 		return nil, nil
 	}
+	accountCreationOpts := []state.AccountCreationOption{}
+	if protocol.MustGetFeatureCtx(ctx).CreateLegacyNonceAccount {
+		accountCreationOpts = append(accountCreationOpts, state.LegacyNonceAccountTypeOption())
+	}
+	actionCtx := protocol.MustGetActionCtx(ctx)
 	// check sender
-	sender, err := accountutil.LoadOrCreateAccount(sm, actionCtx.Caller)
+	sender, err := accountutil.LoadOrCreateAccount(sm, actionCtx.Caller, accountCreationOpts...)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to load or create the account of sender %s", actionCtx.Caller.String())
 	}
 
 	gasFee := big.NewInt(0).Mul(tsf.GasPrice(), big.NewInt(0).SetUint64(actionCtx.IntrinsicGas))
-	if big.NewInt(0).Add(tsf.Amount(), gasFee).Cmp(sender.Balance) == 1 {
+	if !sender.HasSufficientBalance(big.NewInt(0).Add(tsf.Amount(), gasFee)) {
 		return nil, errors.Wrapf(
 			state.ErrNotEnoughBalance,
 			"sender %s balance %s, required amount %s",
@@ -74,13 +77,19 @@ func (p *Protocol) handleTransfer(ctx context.Context, act action.Action, sm pro
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to decode recipient address %s", tsf.Recipient())
 	}
-	recipientAcct, err := accountutil.LoadAccount(sm, recipientAddr)
+	recipientAcct, err := accountutil.LoadAccount(sm, recipientAddr, accountCreationOpts...)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to load address %s", tsf.Recipient())
 	}
+	fixNonce := protocol.MustGetFeatureCtx(ctx).FixGasAndNonceUpdate
+	blkCtx := protocol.MustGetBlockCtx(ctx)
 	if recipientAcct.IsContract() {
-		// update sender Nonce
-		accountutil.SetNonce(tsf, sender)
+		if fixNonce || tsf.Nonce() != 0 {
+			// update sender Nonce
+			if err := sender.SetPendingNonce(tsf.Nonce() + 1); err != nil {
+				return nil, errors.Wrapf(err, "failed to update pending nonce of sender %s", actionCtx.Caller.String())
+			}
+		}
 		// put updated sender's state to trie
 		if err := accountutil.StoreAccount(sm, actionCtx.Caller, sender); err != nil {
 			return nil, errors.Wrap(err, "failed to update pending account changes to trie")
@@ -108,18 +117,24 @@ func (p *Protocol) handleTransfer(ctx context.Context, act action.Action, sm pro
 	if err := sender.SubBalance(tsf.Amount()); err != nil {
 		return nil, errors.Wrapf(err, "failed to update the Balance of sender %s", actionCtx.Caller.String())
 	}
-	// update sender Nonce
-	accountutil.SetNonce(tsf, sender)
+	if fixNonce || tsf.Nonce() != 0 {
+		// update sender Nonce
+		if err := sender.SetPendingNonce(tsf.Nonce() + 1); err != nil {
+			return nil, errors.Wrapf(err, "failed to update pending nonce of sender %s", actionCtx.Caller.String())
+		}
+	}
 	// put updated sender's state to trie
 	if err := accountutil.StoreAccount(sm, actionCtx.Caller, sender); err != nil {
 		return nil, errors.Wrap(err, "failed to update pending account changes to trie")
 	}
 	// check recipient
-	recipient, err := accountutil.LoadOrCreateAccount(sm, recipientAddr)
+	recipient, err := accountutil.LoadOrCreateAccount(sm, recipientAddr, accountCreationOpts...)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to load or create the account of recipient %s", tsf.Recipient())
 	}
-	recipient.AddBalance(tsf.Amount())
+	if err := recipient.AddBalance(tsf.Amount()); err != nil {
+		return nil, errors.Wrapf(err, "failed to add balance %s", tsf.Amount())
+	}
 	// put updated recipient's state to trie
 	if err := accountutil.StoreAccount(sm, recipientAddr, recipient); err != nil {
 		return nil, errors.Wrap(err, "failed to update pending account changes to trie")