Merge branch 'master' into master

Author: CoderZhi

api/web3server.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/iotexproject/go-pkgs/crypto"
 	"github.com/iotexproject/go-pkgs/hash"
 	"github.com/iotexproject/go-pkgs/util"
@@ -418,9 +419,12 @@ func (svr *web3Handler) getBalance(in *gjson.Result) (interface{}, error) {
 		return nil, err
 	}
 	var (
-		accountMeta     *iotextypes.AccountMeta
-		height, archive = blockNumberToHeight(bn)
+		accountMeta *iotextypes.AccountMeta
 	)
+	height, archive, err := svr.blockNumberOrHashToHeight(rpc.BlockNumberOrHashWithNumber(bn))
+	if err != nil {
+		return nil, err
+	}
 	if !archive {
 		accountMeta, _, err = svr.coreService.Account(ioAddr)
 	} else {
@@ -496,10 +500,13 @@ func (svr *web3Handler) call(ctx context.Context, in *gjson.Result) (interface{}
 	var (
 		elp = (&action.EnvelopeBuilder{}).SetAction(action.NewExecution(to, callMsg.Value, data)).
 			SetGasLimit(callMsg.Gas).Build()
-		ret             string
-		receipt         *iotextypes.Receipt
-		height, archive = blockNumberToHeight(callMsg.BlockNumber)
+		ret     string
+		receipt *iotextypes.Receipt
 	)
+	height, archive, err := svr.blockNumberOrHashToHeight(callMsg.BlockNumberOrHash)
+	if err != nil {
+		return nil, err
+	}
 	if !archive {
 		ret, receipt, err = svr.coreService.ReadContract(context.Background(), callMsg.From, elp)
 	} else {
@@ -1153,6 +1160,7 @@ func (svr *web3Handler) traceCall(ctx context.Context, in *gjson.Result) (interf
 		err     error
 		callMsg *callMsg
 	)
+	// TODO: refactor blkNumOrHashObj to avoid code duplication
 	blkNumOrHashObj, options := in.Get("params.1"), in.Get("params.2")
 	callMsg, err = parseCallObject(in)
 	if err != nil {

api/web3server_utils.go

@@ -284,16 +284,16 @@ func parseLogRequest(in gjson.Result) (*filterObject, error) {
 }
 
 type callMsg struct {
-	From        address.Address  // the sender of the 'transaction'
-	To          string           // the destination contract (empty for contract creation)
-	Gas         uint64           // if 0, the call executes with near-infinite gas
-	GasPrice    *big.Int         // wei <-> gas exchange ratio
-	GasFeeCap   *big.Int         // EIP-1559 fee cap per gas.
-	GasTipCap   *big.Int         // EIP-1559 tip per gas.
-	Value       *big.Int         // amount of wei sent along with the call
-	Data        []byte           // input data, usually an ABI-encoded contract method invocation
-	AccessList  types.AccessList // EIP-2930 access list.
-	BlockNumber rpc.BlockNumber
+	From              address.Address       // the sender of the 'transaction'
+	To                string                // the destination contract (empty for contract creation)
+	Gas               uint64                // if 0, the call executes with near-infinite gas
+	GasPrice          *big.Int              // wei <-> gas exchange ratio
+	GasFeeCap         *big.Int              // EIP-1559 fee cap per gas.
+	GasTipCap         *big.Int              // EIP-1559 tip per gas.
+	Value             *big.Int              // amount of wei sent along with the call
+	Data              []byte                // input data, usually an ABI-encoded contract method invocation
+	AccessList        types.AccessList      // EIP-2930 access list.
+	BlockNumberOrHash rpc.BlockNumberOrHash // EIP-1898
 }
 
 func parseCallObject(in *gjson.Result) (*callMsg, error) {
@@ -307,7 +307,7 @@ func parseCallObject(in *gjson.Result) (*callMsg, error) {
 		value     *big.Int = big.NewInt(0)
 		data      []byte
 		acl       types.AccessList
-		bn        = rpc.LatestBlockNumber
+		bn        = rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber)
 		err       error
 	)
 	fromStr := in.Get("params.0.from").String()
@@ -378,24 +378,25 @@ func parseCallObject(in *gjson.Result) (*callMsg, error) {
 		}
 	}
 	if bnParam := in.Get("params.1"); bnParam.Exists() {
-		if err = bn.UnmarshalJSON([]byte(bnParam.String())); err != nil {
+		if err = bn.UnmarshalJSON([]byte(bnParam.Raw)); err != nil {
 			return nil, errors.Wrapf(err, "failed to unmarshal height %s", bnParam.String())
 		}
 	}
 	return &callMsg{
-		From:        from,
-		To:          to,
-		Gas:         gasLimit,
-		GasPrice:    gasPrice,
-		GasFeeCap:   gasFeeCap,
-		GasTipCap:   gasTipCap,
-		Value:       value,
-		Data:        data,
-		AccessList:  acl,
-		BlockNumber: bn,
+		From:              from,
+		To:                to,
+		Gas:               gasLimit,
+		GasPrice:          gasPrice,
+		GasFeeCap:         gasFeeCap,
+		GasTipCap:         gasTipCap,
+		Value:             value,
+		Data:              data,
+		AccessList:        acl,
+		BlockNumberOrHash: bn,
 	}, nil
 }
 
+// TODO: fix this to support eip 1898
 func parseBlockNumber(in *gjson.Result) (rpc.BlockNumber, error) {
 	if !in.Exists() {
 		return rpc.LatestBlockNumber, nil
@@ -407,14 +408,23 @@ func parseBlockNumber(in *gjson.Result) (rpc.BlockNumber, error) {
 	return height, nil
 }
 
-func blockNumberToHeight(bn rpc.BlockNumber) (uint64, bool) {
-	switch bn {
+func (svr *web3Handler) blockNumberOrHashToHeight(bn rpc.BlockNumberOrHash) (uint64, bool, error) {
+	if bn.BlockHash != nil {
+		bh := (*bn.BlockHash).String()
+		blk, err := svr.coreService.BlockByHash(util.Remove0xPrefix(bh))
+		if err != nil {
+			return 0, false, errors.Wrapf(err, "failed to get block height by hash %s", bh)
+		}
+		return uint64(blk.Block.Height()), true, nil
+	}
+
+	switch *bn.BlockNumber {
 	case rpc.SafeBlockNumber, rpc.FinalizedBlockNumber, rpc.LatestBlockNumber, rpc.PendingBlockNumber:
-		return 0, false
+		return 0, false, nil
 	case rpc.EarliestBlockNumber:
-		return 1, true
+		return 1, true, nil
 	default:
-		return uint64(bn), true
+		return uint64(*bn.BlockNumber), true, nil
 	}
 }