Remove per action gas limit cap (iotexproject#1289)

Author: zjshen14

action/const.go

@@ -17,8 +17,6 @@ var (
 	ErrInsufficientBalanceForGas = errors.New("Insufficient balance for gas")
 	// ErrOutOfGas is the error when running out of gas
 	ErrOutOfGas = errors.New("Out of gas")
-	// ErrGasHigherThanLimit indicates the error of gas value
-	ErrGasHigherThanLimit = errors.New("invalid gas for action")
 	// ErrTransfer indicates the error of transfer
 	ErrTransfer = errors.New("invalid transfer")
 	// ErrNonce indicates the error of nonce

action/protocol/context.go

@@ -34,8 +34,6 @@ type RunActionsCtx struct {
 	Caller address.Address
 	// ActionHash is the hash of the action with the sealed envelope
 	ActionHash hash.Hash256
-	// ActionGasLimit is the action gas limit
-	ActionGasLimit uint64
 	// GasPrice is the action gas price
 	GasPrice *big.Int
 	// IntrinsicGas is the action intrinsic gas

action/protocol/context_test.go

@@ -22,14 +22,14 @@ func TestWithRunActionsCtx(t *testing.T) {
 	require := require.New(t)
 	addr, err := address.FromString("io1mflp9m6hcgm2qcghchsdqj3z3eccrnekx9p0ms")
 	require.NoError(err)
-	actionCtx := RunActionsCtx{1, time.Now(), 1, addr, addr, hash.ZeroHash256, 0, nil, 0, 0, nil}
+	actionCtx := RunActionsCtx{1, time.Now(), 1, addr, addr, hash.ZeroHash256, nil, 0, 0, nil}
 	require.NotNil(WithRunActionsCtx(context.Background(), actionCtx))
 }
 func TestGetRunActionsCtx(t *testing.T) {
 	require := require.New(t)
 	addr, err := address.FromString("io1mflp9m6hcgm2qcghchsdqj3z3eccrnekx9p0ms")
 	require.NoError(err)
-	actionCtx := RunActionsCtx{1111, time.Now(), 1, addr, addr, hash.ZeroHash256, 0, nil, 0, 0, nil}
+	actionCtx := RunActionsCtx{1111, time.Now(), 1, addr, addr, hash.ZeroHash256, nil, 0, 0, nil}
 	ctx := WithRunActionsCtx(context.Background(), actionCtx)
 	require.NotNil(ctx)
 	ret, ok := GetRunActionsCtx(ctx)
@@ -40,7 +40,7 @@ func TestMustGetRunActionsCtx(t *testing.T) {
 	require := require.New(t)
 	addr, err := address.FromString("io1mflp9m6hcgm2qcghchsdqj3z3eccrnekx9p0ms")
 	require.NoError(err)
-	actionCtx := RunActionsCtx{1111, time.Now(), 1, addr, addr, hash.ZeroHash256, 0, nil, 0, 0, nil}
+	actionCtx := RunActionsCtx{1111, time.Now(), 1, addr, addr, hash.ZeroHash256, nil, 0, 0, nil}
 	ctx := WithRunActionsCtx(context.Background(), actionCtx)
 	require.NotNil(ctx)
 	// Case I: Normal

action/protocol/execution/evm/evm.go

@@ -21,11 +21,18 @@ import (
 	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/action/protocol/rewarding"
+	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/pkg/log"
 )
 
-// ErrInconsistentNonce is the error that the nonce is different from executor's nonce
-var ErrInconsistentNonce = errors.New("Nonce is not identical to executor nonce")
+var (
+	// TODO: whenever ActionGasLimit is removed from genesis, we need to hard code it to 5M to make it compatible with
+	// the mainnet.
+	preAleutianActionGasLimit = genesis.Default.ActionGasLimit
+
+	// ErrInconsistentNonce is the error that the nonce is different from executor's nonce
+	ErrInconsistentNonce = errors.New("Nonce is not identical to executor nonce")
+)
 
 // CanTransfer checks whether the from account has enough balance
 func CanTransfer(db vm.StateDB, fromHash common.Address, balance *big.Int) bool {
@@ -65,16 +72,12 @@ func NewHeightChange(pacific, aleutian uint64) HeightChange {
 }
 
 // NewParams creates a new context for use in the EVM.
-func NewParams(raCtx protocol.RunActionsCtx, execution *action.Execution, stateDB *StateDBAdapter) (*Params, error) {
-	// If we don't have an explicit author (i.e. not mining), extract from the header
-	/*
-		var beneficiary common.Address
-		if author == nil {
-			beneficiary, _ = chain.Engine().Author(header) // Ignore error, we're past header validation
-		} else {
-			beneficiary = *author
-		}
-	*/
+func NewParams(
+	raCtx protocol.RunActionsCtx,
+	execution *action.Execution,
+	stateDB *StateDBAdapter,
+	hc HeightChange,
+) (*Params, error) {
 	executorAddr := common.BytesToAddress(raCtx.Caller.Bytes())
 	var contractAddrPointer *common.Address
 	if execution.Contract() != action.EmptyAddress {
@@ -85,20 +88,19 @@ func NewParams(raCtx protocol.RunActionsCtx, execution *action.Execution, stateD
 		contractAddr := common.BytesToAddress(contract.Bytes())
 		contractAddrPointer = &contractAddr
 	}
-	producer := common.BytesToAddress(raCtx.Producer.Bytes())
 
 	gasLimit := execution.GasLimit()
 	// Reset gas limit to the system wide action gas limit cap if it's greater than it
-	if gasLimit > raCtx.ActionGasLimit {
-		gasLimit = raCtx.ActionGasLimit
+	if raCtx.BlockHeight < hc.AleutianHeight && gasLimit > preAleutianActionGasLimit {
+		gasLimit = preAleutianActionGasLimit
 	}
 
 	context := vm.Context{
 		CanTransfer: CanTransfer,
 		Transfer:    MakeTransfer,
 		GetHash:     GetHashFn(stateDB),
 		Origin:      executorAddr,
-		Coinbase:    producer,
+		Coinbase:    common.BytesToAddress(raCtx.Producer.Bytes()),
 		BlockNumber: new(big.Int).SetUint64(raCtx.BlockHeight),
 		Time:        new(big.Int).SetInt64(raCtx.BlockTimeStamp.Unix()),
 		Difficulty:  new(big.Int).SetUint64(uint64(50)),
@@ -112,7 +114,7 @@ func NewParams(raCtx protocol.RunActionsCtx, execution *action.Execution, stateD
 		raCtx.Caller.String(),
 		execution.Amount(),
 		contractAddrPointer,
-		execution.GasLimit(),
+		gasLimit,
 		execution.Data(),
 	}, nil
 }
@@ -157,7 +159,7 @@ func ExecuteContract(
 ) ([]byte, *action.Receipt, error) {
 	raCtx := protocol.MustGetRunActionsCtx(ctx)
 	stateDB := NewStateDBAdapter(cm, sm, &hc, raCtx.BlockHeight, execution.Hash())
-	ps, err := NewParams(raCtx, execution, stateDB)
+	ps, err := NewParams(raCtx, execution, stateDB, hc)
 	if err != nil {
 		return nil, nil, err
 	}

action/protocol/execution/protocol_test.go

@@ -34,7 +34,6 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol/rewarding"
 	"github.com/iotexproject/iotex-core/action/protocol/rolldpos"
 	"github.com/iotexproject/iotex-core/blockchain"
-	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/pkg/log"
 	"github.com/iotexproject/iotex-core/pkg/unit"
@@ -273,7 +272,7 @@ func (sct *SmartContractTest) prepareBlockchain(
 	r.NoError(registry.Register(rewarding.ProtocolID, reward))
 
 	r.NotNil(bc)
-	bc.Validator().AddActionEnvelopeValidators(protocol.NewGenericValidator(bc, genesis.Default.ActionGasLimit))
+	bc.Validator().AddActionEnvelopeValidators(protocol.NewGenericValidator(bc))
 	bc.Validator().AddActionValidators(account.NewProtocol(0), NewProtocol(bc, 0, 0), reward)
 	sf := bc.GetFactory()
 	r.NotNil(sf)
@@ -422,7 +421,7 @@ func TestProtocol_Handle(t *testing.T) {
 			blockchain.BoltDBDaoOption(),
 			blockchain.RegistryOption(&registry),
 		)
-		bc.Validator().AddActionEnvelopeValidators(protocol.NewGenericValidator(bc, genesis.Default.ActionGasLimit))
+		bc.Validator().AddActionEnvelopeValidators(protocol.NewGenericValidator(bc))
 		bc.Validator().AddActionValidators(account.NewProtocol(0), NewProtocol(bc, 0, 0))
 		sf := bc.GetFactory()
 		require.NotNil(sf)

action/protocol/generic_validator.go

@@ -17,26 +17,20 @@ import (
 
 // GenericValidator is the validator for generic action verification
 type GenericValidator struct {
-	mu             sync.RWMutex
-	cm             ChainManager
-	actionGasLimit uint64
+	mu sync.RWMutex
+	cm ChainManager
 }
 
 // NewGenericValidator constructs a new genericValidator
-func NewGenericValidator(cm ChainManager, actionGasLimit uint64) *GenericValidator {
+func NewGenericValidator(cm ChainManager) *GenericValidator {
 	return &GenericValidator{
-		cm:             cm,
-		actionGasLimit: actionGasLimit,
+		cm: cm,
 	}
 }
 
 // Validate validates a generic action
 func (v *GenericValidator) Validate(ctx context.Context, act action.SealedEnvelope) error {
 	vaCtx := MustGetValidateActionsCtx(ctx)
-	// Reject over-gassed action
-	if act.GasLimit() > v.actionGasLimit {
-		return errors.Wrap(action.ErrGasHigherThanLimit, "gas is higher than gas limit")
-	}
 	// Reject action with insufficient gas limit
 	intrinsicGas, err := act.IntrinsicGas()
 	if intrinsicGas > act.GasLimit() || err != nil {

action/protocol/generic_validator_test.go

@@ -30,7 +30,7 @@ func TestActionProto(t *testing.T) {
 	ctx := ValidateActionsCtx{1, "io1emxf8zzqckhgjde6dqd97ts0y3q496gm3fdrl6", caller}
 	c := WithValidateActionsCtx(context.Background(), ctx)
 	cm := &MockChainManager{}
-	valid := NewGenericValidator(cm, 100000)
+	valid := NewGenericValidator(cm)
 	data, err := hex.DecodeString("")
 	require.NoError(err)
 	// Case I: Normal
@@ -47,23 +47,7 @@ func TestActionProto(t *testing.T) {
 		require.NoError(nselp.LoadProto(selp.Proto()))
 		require.NoError(valid.Validate(c, nselp))
 	}
-	// Case II: GasLimit higher
-	{
-		v, err := action.NewExecution("", 0, big.NewInt(10), uint64(10), big.NewInt(10), data)
-		require.NoError(err)
-		bd := &action.EnvelopeBuilder{}
-		elp := bd.SetGasPrice(big.NewInt(10)).
-			SetGasLimit(uint64(1000000)).
-			SetAction(v).Build()
-		selp, err := action.Sign(elp, identityset.PrivateKey(28))
-		require.NoError(err)
-		nselp := action.SealedEnvelope{}
-		require.NoError(nselp.LoadProto(selp.Proto()))
-		err = valid.Validate(c, nselp)
-		require.Error(err)
-		require.True(strings.Contains(err.Error(), "gas is higher than gas limit"))
-	}
-	// Case III: GasLimit lower
+	// Case II: GasLimit lower
 	{
 		v, err := action.NewExecution("", 0, big.NewInt(10), uint64(10), big.NewInt(10), data)
 		require.NoError(err)
@@ -79,7 +63,7 @@ func TestActionProto(t *testing.T) {
 		require.Error(err)
 		require.True(strings.Contains(err.Error(), "insufficient gas"))
 	}
-	// Case IV: Call cm Nonce err
+	// Case III: Call cm Nonce err
 	{
 		caller, err := address.FromString("io1emxf8zzqckhgjde6dqd97ts0y3q496gm3fdrl6")
 		require.NoError(err)
@@ -99,7 +83,7 @@ func TestActionProto(t *testing.T) {
 		require.Error(err)
 		require.True(strings.Contains(err.Error(), "invalid nonce value of account"))
 	}
-	// Case V: Call Nonce err
+	// Case IV: Call Nonce err
 	{
 		v, err := action.NewExecution("", 1, big.NewInt(10), uint64(10), big.NewInt(10), data)
 		require.NoError(err)

action/protocol/multichain/mainchain/protocol_test.go

@@ -19,7 +19,6 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/actpool"
 	"github.com/iotexproject/iotex-core/blockchain"
-	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/pkg/unit"
 	"github.com/iotexproject/iotex-core/test/identityset"
@@ -47,7 +46,7 @@ func TestAddSubChainActions(t *testing.T) {
 	require.NoError(t, err)
 	p := NewProtocol(bc)
 	ap.AddActionValidators(p)
-	ap.AddActionEnvelopeValidators(protocol.NewGenericValidator(bc, genesis.Default.ActionGasLimit))
+	ap.AddActionEnvelopeValidators(protocol.NewGenericValidator(bc))
 	defer func() {
 		require.NoError(t, bc.Stop(ctx))
 	}()