prevent huge gas

types/util/softfork.go

@@ -4,20 +4,35 @@ import sdk "github.com/cosmos/cosmos-sdk/types"
 
 // IsWaitingForSoftfork returns whether current block
 // height is bigger than reserved softfork block height
-func IsWaitingForSoftfork(ctx sdk.Context, _version uint8) bool {
-	// Expected time:
-	// MAINNET
-	// Fri Jan 01 2021 18:00:00 GMT+0900 (KST)
-	// Fri Jan 01 2021 09:00:00 GMT+0000 (UTC)
-	// Fri Jan 01 2021 01:00:00 GMT-0800 (PST)
-	//
-	// TEQUILA
-	// Fri Nov 27 2020 12:00:00 GMT+0900 (KST)
-	// Fri Nov 27 2020 03:00:00 GMT+0000 (UTC)
-	// Fri Nov 26 2020 19:00:00 GMT-0800 (KST)
+func IsWaitingForSoftfork(ctx sdk.Context, version uint8) bool {
+	if version == 1 {
+		// Expected time:
+		// MAINNET
+		// Fri Jan 01 2021 18:00:00 GMT+0900 (KST)
+		// Fri Jan 01 2021 09:00:00 GMT+0000 (UTC)
+		// Fri Jan 01 2021 01:00:00 GMT-0800 (PST)
+		//
+		// TEQUILA
+		// Fri Nov 27 2020 12:00:00 GMT+0900 (KST)
+		// Fri Nov 27 2020 03:00:00 GMT+0000 (UTC)
+		// Fri Nov 26 2020 19:00:00 GMT-0800 (KST)
 
-	return (ctx.ChainID() == "columbus-4" && ctx.BlockHeight() < 1200000) ||
-		(ctx.ChainID() == "tequila-0004" && ctx.BlockHeight() < 1350000)
+		return (ctx.ChainID() == "columbus-4" && ctx.BlockHeight() < 1200000) ||
+			(ctx.ChainID() == "tequila-0004" && ctx.BlockHeight() < 1350000)
+	} else if version == 2 {
+		// Expected time:
+		// MAINNET
+		// Tue Mar 30 2021 18:00:00 GMT+0900 (KST)
+		// Tue Mar 30 2021 09:00:00 GMT+0000 (UTC)
+		// Tue Mar 30 2021 01:00:00 GMT-0800 (PST)
+		//
+		// TEQUILA
+		// ASAP
+		return (ctx.ChainID() == "columbus-4" && ctx.BlockHeight() < 2380000) ||
+			(ctx.ChainID() == "tequila-0004" && ctx.BlockHeight() < 3052265)
+	}
+
+	return false
 }
 
 // IsSoftforkHeight return whether current block

x/auth/ante/spamming_prevention.go

@@ -4,10 +4,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/spf13/viper"
+
+	core "github.com/terra-project/core/types"
 )
 
 // FlagTxGasHardLimit defines the hard cap to prevent tx spamming attack
 const FlagTxGasHardLimit = "tx-gas-hard-limit"
+const transactionGasHardCap = 30000000
 
 // SpammingPreventionDecorator will check if the transaction's gas is smaller than
 // configured hard cap
@@ -21,18 +24,24 @@ func NewSpammingPreventionDecorator() SpammingPreventionDecorator {
 
 // AnteHandle handles msg tax fee checking
 func (spd SpammingPreventionDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	if ctx.IsCheckTx() {
-		feeTx, ok := tx.(FeeTx)
-		if !ok {
-			return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
-		}
+	feeTx, ok := tx.(FeeTx)
+	if !ok {
+		return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
+	}
 
-		gas := feeTx.GetGas()
+	gas := feeTx.GetGas()
+	if ctx.IsCheckTx() {
 		gasHardLimit := viper.GetUint64(FlagTxGasHardLimit)
 		if gas > gasHardLimit {
 			return ctx, sdkerrors.Wrapf(sdkerrors.ErrOutOfGas, "Tx cannot spend more than %d gas", gasHardLimit)
 		}
 	}
 
+	if !core.IsWaitingForSoftfork(ctx, 2) {
+		if gas > transactionGasHardCap {
+			return ctx, sdkerrors.Wrap(sdkerrors.ErrOutOfGas, "Tx exceed max gas usage")
+		}
+	}
+
 	return next(ctx, tx, simulate)
 }

x/auth/ante/spamming_prevention_test.go

@@ -0,0 +1,73 @@
+package ante_test
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+	"github.com/tendermint/tendermint/crypto"
+	"github.com/terra-project/core/x/auth/ante"
+)
+
+func TestEnsureSoftforkGasCheck(t *testing.T) {
+	tempDir, err := ioutil.TempDir("", "wasmtest")
+	require.NoError(t, err)
+	defer os.RemoveAll(tempDir)
+	viper.Set(flags.FlagHome, tempDir)
+
+	_, ctx := createTestApp()
+
+	// setup
+	spd := ante.NewSpammingPreventionDecorator()
+	antehandler := sdk.ChainAnteDecorators(spd)
+
+	// keys and addresses
+	priv1, _, addr1 := types.KeyTestPubAddr()
+
+	// msg and signatures
+	msg1 := types.NewTestMsg(addr1)
+	fee := types.NewTestStdFee()
+	fee.Gas = 100000000
+
+	msgs := []sdk.Msg{msg1}
+
+	privs, accNums, seqs := []crypto.PrivKey{priv1}, []uint64{0}, []uint64{0}
+	tx := types.NewTestTx(ctx, msgs, privs, accNums, seqs, fee)
+
+	// Set IsCheckTx to true
+	ctx = ctx.WithIsCheckTx(true)
+
+	// antehandler errors with insufficient fees
+	_, err = antehandler(ctx, tx, false)
+	require.Error(t, err, "Decorator should have errored on too high gas for local gasPrice")
+
+	// Set IsCheckTx to false
+	ctx = ctx.WithIsCheckTx(false)
+
+	// antehandler should not error since we do not check minGasPrice in DeliverTx
+	_, err = antehandler(ctx, tx, false)
+	require.Error(t, err, "Decorator should have errored on too high gas for local gasPrice")
+
+	// Set ChainID to columbus-4 and height to before fork
+	ctx = ctx.WithChainID("columbus-4")
+	ctx = ctx.WithBlockHeight(2379999)
+
+	_, err = antehandler(ctx, tx, false)
+	require.NoError(t, err, "SpammingPreventionDecorator returned error in DeliverTx")
+
+	// Set height to after fork
+	ctx = ctx.WithBlockHeight(2380000)
+
+	_, err = antehandler(ctx, tx, false)
+	require.Error(t, err, "Decorator should have errored on high gas than hard cap")
+
+	ctx = ctx.WithBlockHeight(2380001)
+
+	_, err = antehandler(ctx, tx, false)
+	require.Error(t, err, "Decorator should have errored on high gas than hard cap")
+}