Release v0.10.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine AS build-env
+FROM golang:1.19-alpine AS build-env
 
 # Set up dependencies
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3 \

Makefile

@@ -2,9 +2,9 @@
 
 BUILDDIR ?= $(CURDIR)/build
 
-APP_VER := v0.9.1
-COMMIT := $(shell git log -1 --format='%H')
-TEST_DOCKER_REPO=stratos-chain
+APP_VER := v0.10.0
+COMMIT := $(GIT_COMMIT_HASH)
+TEST_DOCKER_REPO=stratos-chain-e2e
 
 ifeq ($(COMMIT),)
  VERSION := $(APP_VER)

app/ante/ante.go

@@ -39,9 +39,6 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
  case "/stratos.evm.v1.ExtensionOptionsEthereumTx":
  // handle as *evmtypes.MsgEthereumTx
  anteHandler = newEthAnteHandler(options)
- case "/stratos.types.v1.ExtensionOptionsWeb3Tx":
- // handle as normal Cosmos SDK tx, except signature is checked for EIP712 representation
- anteHandler = newCosmosAnteHandlerEip712(options)
  default:
  return ctx, sdkerrors.Wrapf(
  sdkerrors.ErrUnknownExtensionOptions,

app/ante/eth.go

@@ -550,21 +550,26 @@ func (mfd EthMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulat
  if ctx.IsCheckTx() && !simulate {
  params := mfd.evmKeeper.GetParams(ctx)
  ethCfg := params.ChainConfig.EthereumConfig()
+ evmDenom := params.EvmDenom
  baseFee := mfd.evmKeeper.GetBaseFee(ctx, ethCfg)
- if baseFee == nil {
- for _, msg := range tx.GetMsgs() {
- ethMsg, ok := msg.(*evmtypes.MsgEthereumTx)
- if !ok {
- return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid message type %T, expected %T", msg, (*evmtypes.MsgEthereumTx)(nil))
- }
-
- evmDenom := params.EvmDenom
- feeAmt := ethMsg.GetFee()
- glDec := sdk.NewDec(int64(ethMsg.GetGas()))
- requiredFee := ctx.MinGasPrices().AmountOf(evmDenom).Mul(glDec)
- if sdk.NewDecFromBigInt(feeAmt).LT(requiredFee) {
- return ctx, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeAmt, requiredFee)
- }
+
+ for _, msg := range tx.GetMsgs() {
+ ethMsg, ok := msg.(*evmtypes.MsgEthereumTx)
+ if !ok {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid message type %T, expected %T", msg, (*evmtypes.MsgEthereumTx)(nil))
+ }
+
+ var feeAmt *big.Int
+ // if base fee disabled, calculate without effective fee mechanics
+ if baseFee == nil {
+ feeAmt = ethMsg.GetFee()
+ } else {
+ feeAmt = ethMsg.GetEffectiveFee(baseFee)
+ }
+ glDec := sdk.NewDec(int64(ethMsg.GetGas()))
+ requiredFee := ctx.MinGasPrices().AmountOf(evmDenom).Mul(glDec)
+ if sdk.NewDecFromBigInt(feeAmt).LT(requiredFee) {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeAmt, requiredFee)
  }
  }
  }

app/ante/handler_options.go

@@ -48,8 +48,7 @@ func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
  NewEthSetUpContextDecorator(options.EvmKeeper), // outermost AnteDecorator. SetUpContext must be called first
  NewEthMempoolFeeDecorator(options.EvmKeeper), // Check eth effective gas price against minimal-gas-prices
  NewEthValidateBasicDecorator(options.EvmKeeper),
- // TODO: UNCOMMENT THIS FOR PROD!!!!!!
- // NewEthTxPayloadVerificationDecorator(),
+ NewEthTxPayloadVerificationDecorator(),
  NewEthSigVerificationDecorator(options.EvmKeeper),
  NewEthAccountVerificationDecorator(options.AccountKeeper, options.EvmKeeper),
  NewEthGasConsumeDecorator(options.EvmKeeper, options.MaxTxGasWanted),
@@ -78,26 +77,3 @@ func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
  ibcante.NewAnteDecorator(options.IBCKeeper),
  )
 }
-
-func newCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
- return sdk.ChainAnteDecorators(
- RejectMessagesDecorator{}, // reject MsgEthereumTxs
- ante.NewSetUpContextDecorator(),
- // NOTE: extensions option decorator removed
- // ante.NewRejectExtensionOptionsDecorator(),
- ante.NewMempoolFeeDecorator(),
- ante.NewValidateBasicDecorator(),
- ante.NewTxTimeoutHeightDecorator(),
- ante.NewValidateMemoDecorator(options.AccountKeeper),
- ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
- ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
- // SetPubKeyDecorator must be called before all signature verification decorators
- ante.NewSetPubKeyDecorator(options.AccountKeeper),
- ante.NewValidateSigCountDecorator(options.AccountKeeper),
- ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
- // Note: signature verification uses EIP instead of the cosmos signature validator
- NewEip712SigVerificationDecorator(options.AccountKeeper, options.EvmKeeper, options.SignModeHandler),
- ante.NewIncrementSequenceDecorator(options.AccountKeeper),
- ibcante.NewAnteDecorator(options.IBCKeeper),
- )
-}