fix SimulateExecution, add sgd contract check

action/protocol/execution/evm/evm.go

@@ -177,7 +177,7 @@
 		BaseFee:     new(big.Int),
 	}
 	if vmCfg, ok := protocol.GetVMConfigCtx(ctx); ok {
 		vmConfig = vmCfg
 	}
 	chainConfig := getChainConfig(g.Blockchain, blkCtx.BlockHeight, evmNetworkID)
 
@@ -246,17 +246,17 @@
 	}
 	receipt := &action.Receipt{
 		GasConsumed:     ps.gas - remainingGas,
 		BlockHeight:     ps.blkCtx.BlockHeight,
 		ActionHash:      ps.actionCtx.ActionHash,
 		ContractAddress: contractAddress,
 	}
 
 	receipt.Status = uint64(statusCode)
 	var (
 		depositLog, burnLog *action.TransactionLog
 		consumedGas         = depositGas - remainingGas
 	)
 	if ps.featureCtx.FixDoubleChargeGas {
 		// Refund all deposit and, actual gas fee will be subtracted when depositing gas fee to the rewarding protocol
 		stateDB.AddBalance(ps.txCtx.Origin, big.NewInt(0).Mul(big.NewInt(0).SetUint64(depositGas), ps.txCtx.GasPrice))
 	} else {
@@ -264,37 +264,40 @@
 			remainingValue := new(big.Int).Mul(new(big.Int).SetUint64(remainingGas), ps.txCtx.GasPrice)
 			stateDB.AddBalance(ps.txCtx.Origin, remainingValue)
 		}
 		if consumedGas > 0 {
 			burnLog = &action.TransactionLog{
 				Type:      iotextypes.TransactionLogType_GAS_FEE,
 				Sender:    ps.actionCtx.Caller.String(),
 				Recipient: "", // burned
 				Amount:    new(big.Int).Mul(new(big.Int).SetUint64(consumedGas), ps.txCtx.GasPrice),
 			}
 		}
 	}
 	if consumedGas > 0 {
 		var (
 			receiver                  address.Address
 			sharedGas                 uint64
 			sharedGasFee, totalGasFee *big.Int
 		)
 		if ps.featureCtx.SharedGasWithDapp && sgd != nil {
 			// TODO: sgd is whether nil should be checked in processSGD
 			receiver, sharedGas, err = processSGD(ctx, sm, execution, consumedGas, sgd)
 			if err != nil {
 				return nil, nil, errors.Wrap(err, "failed to process Sharing of Gas-fee with DApps")
 			}
 		}
 		if sharedGas > 0 {
 			sharedGasFee = big.NewInt(int64(sharedGas))
 			sharedGasFee.Mul(sharedGasFee, ps.txCtx.GasPrice)
 		}
 		totalGasFee = new(big.Int).Mul(new(big.Int).SetUint64(consumedGas), ps.txCtx.GasPrice)
-		depositLog, err = ps.helperCtx.DepositGasFunc(ctx, sm, receiver, totalGasFee, sharedGasFee)
-		if err != nil {
-			return nil, nil, err
+		if ps.helperCtx.DepositGasFunc != nil {
+			depositLog, err = ps.helperCtx.DepositGasFunc(ctx, sm, receiver, totalGasFee, sharedGasFee)
+			if err != nil {
+				return nil, nil, err
+			}
 		}
+
 	}
 
 	if err := stateDB.CommitContracts(); err != nil {
@@ -302,12 +305,12 @@
 	}
 	receipt.AddLogs(stateDB.Logs()...).AddTransactionLogs(depositLog, burnLog)
 	if receipt.Status == uint64(iotextypes.ReceiptStatus_Success) ||
 		ps.featureCtx.AddOutOfGasToTransactionLog && receipt.Status == uint64(iotextypes.ReceiptStatus_ErrCodeStoreOutOfGas) {
 		receipt.AddTransactionLogs(stateDB.TransactionLogs()...)
 	}
 	stateDB.clear()
 
 	if ps.featureCtx.SetRevertMessageToReceipt && receipt.Status == uint64(iotextypes.ReceiptStatus_ErrExecutionReverted) && retval != nil && bytes.Equal(retval[:4], _revertSelector) {
 		// in case of the execution revert error, parse the retVal and add to receipt
 		data := retval[4:]
 		msgLength := byteutil.BytesToUint64BigEndian(data[56:64])
@@ -319,24 +322,24 @@
 }
 
 func processSGD(ctx context.Context, sm protocol.StateManager, execution *action.Execution, consumedGas uint64, sgd SGDRegistry,
 ) (address.Address, uint64, error) {
 	if execution.Contract() == action.EmptyAddress {
 		return nil, 0, nil
 	}
 	height, err := sm.Height()
 	if err != nil {
 		return nil, 0, err
 	}
 	receiver, percentage, ok, err := sgd.CheckContract(ctx, execution.Contract(), height-1)
 	if err != nil || !ok {
 		return nil, 0, err
 	}
 
 	sharedGas := consumedGas * percentage / 100
 	if sharedGas > consumedGas {
 		sharedGas = consumedGas
 	}
 	return receiver, sharedGas, nil
 }
 
 // ReadContractStorage reads contract's storage
@@ -438,7 +441,7 @@
 	var (
 		accessList types.AccessList
 	)
 	evm := vm.NewEVM(evmParams.context, evmParams.txCtx, stateDB, chainConfig, evmParams.evmConfig)
 	if g.IsOkhotsk(blockHeight) {
 		accessList = evmParams.accessList
 	}
@@ -502,7 +505,7 @@
 	// the tx is reverted. After Okhotsk height, it is fixed inside RevertToSnapshot()
 	var (
 		deltaRefundByDynamicGas = evm.DeltaRefundByDynamicGas
 		featureCtx              = evmParams.featureCtx
 	)
 	if !featureCtx.CorrectGasRefund && deltaRefundByDynamicGas != 0 {
 		if deltaRefundByDynamicGas > 0 {
@@ -639,15 +642,6 @@
 	)
 
 	ctx = protocol.WithFeatureCtx(ctx)
-	// TODO: move the logic out of SimulateExecution
-	helperCtx := mustGetHelperCtx(ctx)
-	ctx = WithHelperCtx(ctx, HelperContext{
-		GetBlockHash: helperCtx.GetBlockHash,
-		DepositGasFunc: func(context.Context, protocol.StateManager, address.Address, *big.Int, *big.Int) (*action.TransactionLog, error) {
-			return nil, nil
-		},
-		Sgd: nil,
-	})
 	return ExecuteContract(
 		ctx,
 		sm,

api/coreservice.go

@@ -39,6 +39,7 @@
 	accountutil "github.com/iotexproject/iotex-core/action/protocol/account/util"
 	"github.com/iotexproject/iotex-core/action/protocol/execution/evm"
 	"github.com/iotexproject/iotex-core/action/protocol/poll"
+	"github.com/iotexproject/iotex-core/action/protocol/rewarding"
 	"github.com/iotexproject/iotex-core/action/protocol/rolldpos"
 	"github.com/iotexproject/iotex-core/actpool"
 	logfilter "github.com/iotexproject/iotex-core/api/logfilter"
@@ -182,6 +183,7 @@
 		readCache         *ReadCache
 		messageBatcher    *batch.Manager
 		apiStats          *nodestats.APILocalStats
+		sgdIndexer        blockindex.SGDRegistry
 	}
 
 	// jobDesc provides a struct to get and store logs in core.LogsInRange
@@ -212,12 +214,19 @@
 }
 
 // WithAPIStats is the option to return RPC stats through API.
 func WithAPIStats(stats *nodestats.APILocalStats) Option {
 	return func(svr *coreService) {
 		svr.apiStats = stats
 	}
 }
 
+// WithSGDIndexer is the option to return SGD Indexer through API.
+func WithSGDIndexer(sgdIndexer blockindex.SGDRegistry) Option {
+	return func(svr *coreService) {
+		svr.sgdIndexer = sgdIndexer
+	}
+}
+
 type intrinsicGasCalculator interface {
 	IntrinsicGas() (uint64, error)
 }
@@ -270,8 +279,8 @@
 
 	if core.broadcastHandler != nil {
 		core.messageBatcher = batch.NewManager(func(msg *batch.Message) error {
 			return core.broadcastHandler(context.Background(), core.bc.ChainID(), msg.Data)
 		})
 	}
 
 	return &core, nil
@@ -488,7 +497,7 @@
 		return status.Errorf(codes.InvalidArgument, "ChainID does not match, expecting %d, got %d", core.bc.ChainID(), chainID)
 	}
 	if ge.IsMidway(core.bc.TipHeight()) && chainID != core.bc.ChainID() && chainID != 0 {
 		return status.Errorf(codes.InvalidArgument, "ChainID does not match, expecting %d, got %d", core.bc.ChainID(), chainID)
 	}
 	return nil
 }
@@ -1690,7 +1699,7 @@
 		return nil, nil, nil, err
 	}
 	if gasLimit == 0 {
 		gasLimit = core.bc.Genesis().BlockGasLimit
 	}
 	traces := logger.NewStructLogger(config)
 	ctx = protocol.WithVMConfigCtx(ctx, vm.Config{
@@ -1721,7 +1730,7 @@
 		return nil, nil, nil, err
 	}
 	getblockHash := func(height uint64) (hash.Hash256, error) {
 		return blkHash, nil
 	}
 	retval, receipt, err := core.simulateExecution(ctx, callerAddr, exec, getblockHash)
 	return retval, receipt, traces, err
@@ -1732,18 +1741,19 @@
 	if core.apiStats == nil {
 		return
 	}
 	elapsed := time.Since(start)
 	core.apiStats.ReportCall(nodestats.APIReport{
 		Method:       method,
 		HandlingTime: elapsed,
 		Success:      success,
 	}, size)
 }
 
 func (core *coreService) simulateExecution(ctx context.Context, addr address.Address, exec *action.Execution, getBlockHash evm.GetBlockHash) ([]byte, *action.Receipt, error) {
-	// TODO: add depositGas
 	ctx = evm.WithHelperCtx(ctx, evm.HelperContext{
-		GetBlockHash: getBlockHash,
+		GetBlockHash:   getBlockHash,
+		DepositGasFunc: rewarding.DepositGasWithSGD,
+		Sgd:            core.sgdIndexer,
 	})
 	return core.sf.SimulateExecution(ctx, addr, exec)
 }

chainservice/chainservice.go

@@ -191,6 +191,7 @@ func (cs *ChainService) NewAPIServer(cfg api.Config, plugins map[int]interface{}
 		}),
 		api.WithNativeElection(cs.electionCommittee),
 		api.WithAPIStats(cs.apiStats),
+		api.WithSGDIndexer(cs.sgdIndexer),
 	}
 
 	svr, err := api.NewServerV2(