Merge remote-tracking branch 'upstream/master' into rf-call

Makefile

@@ -54,7 +54,7 @@ endif
 endif
 GO_VERSION := $(shell go version)
 BUILD_TIME=$(shell date +%F-%Z/%T)
-VersionImportPath := github.com/iotexproject/iotex-core/pkg/version
+VersionImportPath := github.com/iotexproject/iotex-core/v2/pkg/version
 PackageFlags += -X '$(VersionImportPath).PackageVersion=$(PACKAGE_VERSION)'
 PackageFlags += -X '$(VersionImportPath).PackageCommitID=$(PACKAGE_COMMIT_ID)'
 PackageFlags += -X '$(VersionImportPath).GitStatus=$(GIT_STATUS)'

action/envelope.go

@@ -50,7 +50,6 @@ type (
 		Nonce() uint64
 		Gas() uint64
 		GasPrice() *big.Int
-		EffectiveGasPrice(*big.Int) *big.Int
 		TxDynamicGas
 		AccessList() types.AccessList
 		TxBlob
@@ -71,6 +70,7 @@ type (
 	TxDynamicGas interface {
 		GasTipCap() *big.Int
 		GasFeeCap() *big.Int
+		EffectiveGasPrice(*big.Int) *big.Int
 	}
 
 	TxBlob interface {

action/protocol/context.go

@@ -86,6 +86,8 @@ type (
 		IntrinsicGas uint64
 		// Nonce is the nonce of the action
 		Nonce uint64
+		// ReadOnly indicates two scenarios: eth_estimateGas and eth_call
+		ReadOnly bool
 	}
 
 	// CheckFunc is function type to check by height.
@@ -150,6 +152,7 @@ type (
 		VerifyNotContainerBeforeRun             bool
 		ValidateActionWithState                 bool
 		CheckStakingDurationUpperLimit          bool
+		FixRevertSnapshot                       bool
 	}
 
 	// FeatureWithHeightCtx provides feature check functions.
@@ -313,6 +316,7 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			VerifyNotContainerBeforeRun:             g.IsVanuatu(height),
 			ValidateActionWithState:                 g.IsVanuatu(height),
 			CheckStakingDurationUpperLimit:          g.IsVanuatu(height),
+			FixRevertSnapshot:                       g.IsVanuatu(height),
 		},
 	)
 }

action/protocol/execution/evm/evm.go

@@ -337,10 +337,12 @@ func ReadContractStorage(
 }
 
 func prepareStateDB(ctx context.Context, sm protocol.StateManager) (*StateDBAdapter, error) {
-	actionCtx := protocol.MustGetActionCtx(ctx)
-	blkCtx := protocol.MustGetBlockCtx(ctx)
-	featureCtx := protocol.MustGetFeatureCtx(ctx)
-	opts := []StateDBAdapterOption{}
+	var (
+		actionCtx  = protocol.MustGetActionCtx(ctx)
+		blkCtx     = protocol.MustGetBlockCtx(ctx)
+		featureCtx = protocol.MustGetFeatureCtx(ctx)
+		opts       = []StateDBAdapterOption{}
+	)
 	if featureCtx.CreateLegacyNonceAccount {
 		opts = append(opts, LegacyNonceAccountOption())
 	}
@@ -376,7 +378,9 @@ func prepareStateDB(ctx context.Context, sm protocol.StateManager) (*StateDBAdap
 	if featureCtx.EnableCancunEVM {
 		opts = append(opts, EnableCancunEVMOption())
 	}
-
+	if featureCtx.FixRevertSnapshot || actionCtx.ReadOnly {
+		opts = append(opts, FixRevertSnapshotOption())
+	}
 	return NewStateDBAdapter(
 		sm,
 		blkCtx.BlockHeight,
@@ -613,6 +617,7 @@ func SimulateExecution(
 	sm protocol.StateManager,
 	caller address.Address,
 	ex action.TxDataForSimulation,
+	opts ...protocol.SimulateOption,
 ) ([]byte, *action.Receipt, error) {
 	ctx, span := tracer.NewSpan(ctx, "evm.SimulateExecution")
 	defer span.End()
@@ -626,13 +631,23 @@ func SimulateExecution(
 		protocol.ActionCtx{
 			Caller:     caller,
 			ActionHash: hash.Hash256b(byteutil.Must(proto.Marshal(ex.Proto()))),
+			ReadOnly:   true,
 		},
 	)
 	zeroAddr, err := address.FromString(address.ZeroAddress)
 	if err != nil {
 		return nil, nil, err
 	}
-	ctx = protocol.WithBlockCtx(
+	cfg := &protocol.SimulateOptionConfig{}
+	for _, opt := range opts {
+		opt(cfg)
+	}
+	if cfg.PreOpt != nil {
+		if err := cfg.PreOpt(sm); err != nil {
+			return nil, nil, err
+		}
+	}
+	ctx = protocol.WithFeatureCtx(protocol.WithBlockCtx(
 		ctx,
 		protocol.BlockCtx{
 			BlockHeight:    bcCtx.Tip.Height + 1,
@@ -642,8 +657,6 @@ func SimulateExecution(
 			BaseFee:        protocol.CalcBaseFee(g.Blockchain, &bcCtx.Tip),
 			ExcessBlobGas:  protocol.CalcExcessBlobGas(bcCtx.Tip.ExcessBlobGas, bcCtx.Tip.BlobGasUsed),
 		},
-	)
-
-	ctx = protocol.WithFeatureCtx(ctx)
+	))
 	return ExecuteContract(ctx, sm, ex)
 }

action/protocol/execution/evm/evmstatedbadapter.go

@@ -82,6 +82,7 @@ type (
 		zeroNonceForFreshAccount   bool
 		panicUnrecoverableError    bool
 		enableCancun               bool
+		fixRevertSnapshot          bool
 	}
 )
 
@@ -187,6 +188,14 @@ func EnableCancunEVMOption() StateDBAdapterOption {
 	}
 }
 
+// FixRevertSnapshotOption set fixRevertSnapshot as true
+func FixRevertSnapshotOption() StateDBAdapterOption {
+	return func(adapter *StateDBAdapter) error {
+		adapter.fixRevertSnapshot = true
+		return nil
+	}
+}
+
 // NewStateDBAdapter creates a new state db with iotex blockchain
 func NewStateDBAdapter(
 	sm protocol.StateManager,
@@ -626,10 +635,14 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 		log.L().Error("Failed to revert to snapshot.", zap.Int("snapshot", snapshot))
 		return
 	}
+	deleteSnapshot := snapshot
+	if stateDB.fixRevertSnapshot {
+		deleteSnapshot++
+	}
 	// restore gas refund
 	if !stateDB.manualCorrectGasRefund {
 		stateDB.refund = stateDB.refundSnapshot[snapshot]
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.refundSnapshot[i]; ok {
 				delete(stateDB.refundSnapshot, i)
 			} else {
@@ -640,7 +653,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 	// restore access list
 	stateDB.accessList = stateDB.accessListSnapshot[snapshot]
 	{
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.accessListSnapshot[i]; ok {
 				delete(stateDB.accessListSnapshot, i)
 			} else {
@@ -652,7 +665,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 		//restore transientStorage
 		stateDB.transientStorage = stateDB.transientStorageSnapshot[snapshot]
 		{
-			for i := snapshot; ; i++ {
+			for i := deleteSnapshot; ; i++ {
 				if _, ok := stateDB.transientStorageSnapshot[i]; ok {
 					delete(stateDB.transientStorageSnapshot, i)
 				} else {
@@ -663,7 +676,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 		// restore created accounts
 		stateDB.createdAccount = stateDB.createdAccountSnapshot[snapshot]
 		{
-			for i := snapshot; ; i++ {
+			for i := deleteSnapshot; ; i++ {
 				if _, ok := stateDB.createdAccountSnapshot[i]; ok {
 					delete(stateDB.createdAccountSnapshot, i)
 				} else {
@@ -675,15 +688,15 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 	// restore logs and txLogs
 	if stateDB.revertLog {
 		stateDB.logs = stateDB.logs[:stateDB.logsSnapshot[snapshot]]
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.logsSnapshot[i]; ok {
 				delete(stateDB.logsSnapshot, i)
 			} else {
 				break
 			}
 		}
 		stateDB.transactionLogs = stateDB.transactionLogs[:stateDB.txLogsSnapshot[snapshot]]
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.txLogsSnapshot[i]; ok {
 				delete(stateDB.txLogsSnapshot, i)
 			} else {
@@ -694,7 +707,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 	// restore the SelfDestruct accounts
 	stateDB.selfDestructed = ds
 	if stateDB.fixSnapshotOrder {
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.selfDestructedSnapshot[i]; ok {
 				delete(stateDB.selfDestructedSnapshot, i)
 			} else {
@@ -712,7 +725,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 		}
 	}
 	if stateDB.fixSnapshotOrder {
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.contractSnapshot[i]; ok {
 				delete(stateDB.contractSnapshot, i)
 			} else {
@@ -723,7 +736,7 @@ func (stateDB *StateDBAdapter) RevertToSnapshot(snapshot int) {
 	// restore preimages
 	stateDB.preimages = stateDB.preimageSnapshot[snapshot]
 	if stateDB.fixSnapshotOrder {
-		for i := snapshot; ; i++ {
+		for i := deleteSnapshot; ; i++ {
 			if _, ok := stateDB.preimageSnapshot[i]; ok {
 				delete(stateDB.preimageSnapshot, i)
 			} else {

action/protocol/execution/protocol_test.go

@@ -293,7 +293,11 @@ func readExecution(
 		GetBlockTime:   getBlockTimeForTest,
 		DepositGasFunc: rewarding.DepositGas,
 	})
-	return sf.SimulateExecution(ctx, addr, elp)
+	ws, err := sf.WorkingSet(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+	return evm.SimulateExecution(ctx, ws, addr, elp)
 }
 
 func (sct *SmartContractTest) runExecutions(

action/protocol/protocol.go

@@ -130,10 +130,11 @@ func HashStringToAddress(str string) address.Address {
 
 func SplitGas(ctx context.Context, tx action.TxDynamicGas, usedGas uint64) (*big.Int, *big.Int, error) {
 	var (
-		baseFee = MustGetBlockCtx(ctx).BaseFee
-		gas     = new(big.Int).SetUint64(usedGas)
+		baseFee  = MustGetBlockCtx(ctx).BaseFee
+		gas      = new(big.Int).SetUint64(usedGas)
+		readOnly = MustGetActionCtx(ctx).ReadOnly
 	)
-	if baseFee == nil {
+	if baseFee == nil || readOnly {
 		// treat as basefee if before enabling EIP-1559
 		return new(big.Int), new(big.Int).Mul(tx.GasFeeCap(), gas), nil
 	}
@@ -148,7 +149,7 @@ func SplitGas(ctx context.Context, tx action.TxDynamicGas, usedGas uint64) (*big
 	return priority.Mul(priority, gas), base.Mul(base, gas), nil
 }
 
-func EffectiveGasPrice(ctx context.Context, tx action.TxCommon) *big.Int {
+func EffectiveGasPrice(ctx context.Context, tx action.TxDynamicGas) *big.Int {
 	if !MustGetFeatureCtx(ctx).EnableDynamicFeeTx {
 		return nil
 	}

action/protocol/rewarding/protocol.go

@@ -387,7 +387,7 @@ func (p *Protocol) deleteStateV2(sm protocol.StateManager, key []byte) error {
 func (p *Protocol) settleSystemAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	logs []*action.Log,
@@ -399,7 +399,7 @@ func (p *Protocol) settleSystemAction(
 func (p *Protocol) settleUserAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	logs []*action.Log,
@@ -411,7 +411,7 @@ func (p *Protocol) settleUserAction(
 func (p *Protocol) settleAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	isSystemAction bool,