Merge branch 'release/v0.18.x-astra' into astra

# Conflicts: # CHANGELOG.md
AstraProtocol · Aug 14, 2022 · c220c56 · c220c56
2 parents d49e40e + 1447418
commit c220c56
Show file tree

Hide file tree

Showing 17 changed files with 2,416 additions and 488 deletions.
diff --git a/app/ante/eth.go b/app/ante/eth.go
@@ -193,7 +193,7 @@ func (egcd EthGasConsumeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
 			return ctx, sdkerrors.Wrap(err, "failed to unpack tx data")
 		}
 
-		if ctx.IsCheckTx() {
+		if ctx.IsCheckTx() && egcd.maxGasWanted != 0 {
 			// We can't trust the tx gas limit, because we'll refund the unused gas.
 			if txData.GetGas() > egcd.maxGasWanted {
 				gasWanted += egcd.maxGasWanted

diff --git a/app/ante/eth_test.go b/app/ante/eth_test.go
@@ -279,7 +279,7 @@ func (suite AnteTestSuite) TestEthGasConsumeDecorator() {
 		{
 			"success",
 			tx2,
-			config.DefaultMaxTxGasWanted, // it's capped
+			tx2GasLimit, // it's capped
 			func() {
 				vmdb.AddBalance(addr, big.NewInt(1000000))
 

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go