Updated the struct Message to align with Ethereum code.

Author: Frozen

core/state_transition.go

@@ -89,7 +89,7 @@ type Message interface {
 	Value() *big.Int
 
 	Nonce() uint64
-	CheckNonce() bool
+	SkipNonceChecks() bool
 	Data() []byte
 	Type() types.TransactionType
 	BlockNum() *big.Int
@@ -195,7 +195,7 @@ func (st *StateTransition) buyGas() error {
 
 func (st *StateTransition) preCheck() error {
 	// Make sure this transaction's nonce is correct.
-	if st.msg.CheckNonce() {
+	if !st.msg.SkipNonceChecks() {
 		nonce := st.state.GetNonce(st.msg.From())
 
 		if nonce < st.msg.Nonce() {

core/types/eth_transaction.go

@@ -358,13 +358,13 @@ func (tx *EthTransaction) IsEthCompatible() bool {
 // XXX Rename message to something less arbitrary?
 func (tx *EthTransaction) AsMessage(s Signer) (Message, error) {
 	msg := Message{
-		nonce:      tx.data.AccountNonce,
-		gasLimit:   tx.data.GasLimit,
-		gasPrice:   new(big.Int).Set(tx.data.Price),
-		to:         tx.data.Recipient,
-		amount:     tx.data.Amount,
-		data:       tx.data.Payload,
-		checkNonce: true,
+		nonce:           tx.data.AccountNonce,
+		gasLimit:        tx.data.GasLimit,
+		gasPrice:        new(big.Int).Set(tx.data.Price),
+		to:              tx.data.Recipient,
+		value:           tx.data.Amount,
+		data:            tx.data.Payload,
+		skipNonceChecks: false,
 	}
 
 	var err error

core/types/transaction.go

@@ -474,13 +474,13 @@ func (tx *Transaction) ConvertToEth() *EthTransaction {
 // XXX Rename message to something less arbitrary?
 func (tx *Transaction) AsMessage(s Signer) (Message, error) {
 	msg := Message{
-		nonce:      tx.data.AccountNonce,
-		gasLimit:   tx.data.GasLimit,
-		gasPrice:   new(big.Int).Set(tx.data.Price),
-		to:         tx.data.Recipient,
-		amount:     tx.data.Amount,
-		data:       tx.data.Payload,
-		checkNonce: true,
+		nonce:           tx.data.AccountNonce,
+		gasLimit:        tx.data.GasLimit,
+		gasPrice:        new(big.Int).Set(tx.data.Price),
+		to:              tx.data.Recipient,
+		value:           tx.data.Amount,
+		data:            tx.data.Payload,
+		skipNonceChecks: false,
 	}
 
 	var err error
@@ -681,43 +681,82 @@ func (t *TransactionsByPriceAndNonce) Pop() {
 // Message is a fully derived transaction and implements core.Message
 // NOTE: In a future PR this will be removed.
 type Message struct {
-	to         *common.Address
-	from       common.Address
-	nonce      uint64
-	amount     *big.Int
-	gasLimit   uint64
-	gasPrice   *big.Int
-	data       []byte
-	checkNonce bool
-	blockNum   *big.Int
-	txType     TransactionType
-}
+	to        *common.Address
+	from      common.Address
+	nonce     uint64
+	value     *big.Int
+	gasLimit  uint64
+	gasPrice  *big.Int
+	gasFeeCap *big.Int
+	gasTipCap *big.Int
+	data      []byte
+	// AccessList types.AccessList TODO: implemented in Berlin 2021-04-15
+	BlobGasFeeCap *big.Int
+	BlobHashes    []common.Hash
+
+	// SetCodeAuthorizations []types.SetCodeAuthorization TODO: understand do we need this
+
+	// When SkipNonceChecks is true, the message nonce is not checked against the
+	// account nonce in state.
+	// This field will be set to true for operations like RPC eth_call.
+	skipNonceChecks bool
+
+	// When SkipFromEOACheck is true, the message sender is not checked to be an EOA.
+	skipFromEOACheck bool
+
+	blockNum *big.Int
+	txType   TransactionType
+}
+
+//type Message struct {
+//	To                    *common.Address
+//	From                  common.Address
+//	Nonce                 uint64
+//	Value                 *big.Int
+//	GasLimit              uint64
+//	GasPrice              *big.Int
+//	GasFeeCap             *big.Int
+//	GasTipCap             *big.Int
+//	Data                  []byte
+//	AccessList            types.AccessList
+//	BlobGasFeeCap         *big.Int
+//	BlobHashes            []common.Hash
+//	SetCodeAuthorizations []types.SetCodeAuthorization
+//
+//	// When SkipNonceChecks is true, the message nonce is not checked against the
+//	// account nonce in state.
+//	// This field will be set to true for operations like RPC eth_call.
+//	SkipNonceChecks bool
+//
+//	// When SkipFromEOACheck is true, the message sender is not checked to be an EOA.
+//	SkipFromEOACheck bool
+//}
 
 // NewMessage returns new message.
-func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte, checkNonce bool) Message {
+func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte, skipNonceChecks bool) Message {
 	return Message{
-		from:       from,
-		to:         to,
-		nonce:      nonce,
-		amount:     amount,
-		gasLimit:   gasLimit,
-		gasPrice:   gasPrice,
-		data:       data,
-		checkNonce: checkNonce,
+		from:            from,
+		to:              to,
+		nonce:           nonce,
+		value:           amount,
+		gasLimit:        gasLimit,
+		gasPrice:        gasPrice,
+		data:            data,
+		skipNonceChecks: skipNonceChecks,
 	}
 }
 
 // NewStakingMessage returns new message of staking type
 // always need checkNonce
 func NewStakingMessage(from common.Address, nonce uint64, gasLimit uint64, gasPrice *big.Int, data []byte, blockNum *big.Int) Message {
 	return Message{
-		from:       from,
-		nonce:      nonce,
-		gasLimit:   gasLimit,
-		gasPrice:   new(big.Int).Set(gasPrice),
-		data:       data,
-		checkNonce: true,
-		blockNum:   blockNum,
+		from:            from,
+		nonce:           nonce,
+		gasLimit:        gasLimit,
+		gasPrice:        new(big.Int).Set(gasPrice),
+		data:            data,
+		skipNonceChecks: false,
+		blockNum:        blockNum,
 	}
 }
 
@@ -738,7 +777,7 @@ func (m Message) GasPrice() *big.Int {
 
 // Value returns the value amount from Message.
 func (m Message) Value() *big.Int {
-	return m.amount
+	return m.value
 }
 
 // Gas returns gas limit of the Message.
@@ -757,8 +796,8 @@ func (m Message) Data() []byte {
 }
 
 // CheckNonce returns checkNonce of Message.
-func (m Message) CheckNonce() bool {
-	return m.checkNonce
+func (m Message) SkipNonceChecks() bool {
+	return m.skipNonceChecks
 }
 
 // Type returns the type of message

rpc/harmony/types.go

@@ -72,7 +72,7 @@ func (args *CallArgs) ToMessage(globalGasCap *big.Int) types.Message {
 		data = []byte(*args.Data)
 	}
 
-	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, data, false)
+	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, data, true)
 	return msg
 }