fix(gas-fees): use effective gas price in RefundGas

.gitignore

@@ -21,6 +21,7 @@ txout.json
 vote.json
 **__pycache**
 scratch-paper.md
+logs
 
 ### TypeScript and Friends
 

CHANGELOG.md

@@ -129,6 +129,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#2056](https://github.com/NibiruChain/nibiru/pull/2056) - feat(evm): add oracle precompile
 - [#2065](https://github.com/NibiruChain/nibiru/pull/2065) - refactor(evm)!: Refactor out dead code from the evm.Params
 - [#2073](https://github.com/NibiruChain/nibiru/pull/2073) - fix(evm-keeper): better utilize ERC20 metadata during FunToken creation
+- [#2xxx](https://github.com/NibiruChain/nibiru/pull/2xxx) - fix(evm-gas-fees): fix(gas-fees): use effective gas price in RefundGas
 
 
 #### Dapp modules: perp, spot, oracle, etc

app/evmante/evmante_can_transfer.go

@@ -44,27 +44,28 @@ func (ctd CanTransferDecorator) AnteHandle(
 				"invalid message type %T, expected %T", msg, (*evm.MsgEthereumTx)(nil),
 			)
 		}
-		baseFee := ctd.evmKeeper.GetBaseFee(ctx)
+		baseFeeMicronibiPerGas := ctd.evmKeeper.BaseFeeMicronibiPerGas(ctx)
+		baseFeeWeiPerGas := evm.NativeToWei(baseFeeMicronibiPerGas)
 
-		coreMsg, err := msgEthTx.AsMessage(signer, baseFee)
+		coreMsg, err := msgEthTx.AsMessage(signer, baseFeeWeiPerGas)
 		if err != nil {
 			return ctx, errors.Wrapf(
 				err,
 				"failed to create an ethereum core.Message from signer %T", signer,
 			)
 		}
 
-		if baseFee == nil {
+		if baseFeeMicronibiPerGas == nil {
 			return ctx, errors.Wrap(
 				evm.ErrInvalidBaseFee,
 				"base fee is supported but evm block context value is nil",
 			)
 		}
-		if coreMsg.GasFeeCap().Cmp(baseFee) < 0 {
+		if coreMsg.GasFeeCap().Cmp(baseFeeMicronibiPerGas) < 0 {
 			return ctx, errors.Wrapf(
 				sdkerrors.ErrInsufficientFee,
 				"max fee per gas less than block base fee (%s < %s)",
-				coreMsg.GasFeeCap(), baseFee,
+				coreMsg.GasFeeCap(), baseFeeMicronibiPerGas,
 			)
 		}
 
@@ -73,7 +74,7 @@ func (ctd CanTransferDecorator) AnteHandle(
 			ChainConfig: ethCfg,
 			Params:      params,
 			CoinBase:    gethcommon.Address{},
-			BaseFee:     baseFee,
+			BaseFee:     baseFeeMicronibiPerGas,
 		}
 
 		stateDB := statedb.New(

app/evmante/evmante_gas_consume.go

@@ -68,7 +68,7 @@ func (anteDec AnteDecEthGasConsume) AnteHandle(
 
 	// Use the lowest priority of all the messages as the final one.
 	minPriority := int64(math.MaxInt64)
-	baseFeeMicronibiPerGas := anteDec.evmKeeper.GetBaseFee(ctx)
+	baseFeeMicronibiPerGas := anteDec.evmKeeper.BaseFeeMicronibiPerGas(ctx)
 
 	for _, msg := range tx.GetMsgs() {
 		msgEthTx, ok := msg.(*evm.MsgEthereumTx)

app/evmante/evmante_mempool_fees.go

@@ -39,7 +39,7 @@ func (d MempoolGasPriceDecorator) AnteHandle(
 	}
 
 	minGasPrice := ctx.MinGasPrices().AmountOf(evm.EVMBankDenom)
-	baseFeeMicronibi := d.evmKeeper.GetBaseFee(ctx)
+	baseFeeMicronibi := d.evmKeeper.BaseFeeMicronibiPerGas(ctx)
 	baseFeeDec := math.LegacyNewDecFromBigInt(baseFeeMicronibi)
 
 	// if MinGasPrices is not set, skip the check
@@ -61,7 +61,7 @@ func (d MempoolGasPriceDecorator) AnteHandle(
 
 		baseFeeWei := evm.NativeToWei(baseFeeMicronibi)
 		effectiveGasPriceDec := math.LegacyNewDecFromBigInt(
-			evm.WeiToNative(ethTx.GetEffectiveGasPrice(baseFeeWei)),
+			evm.WeiToNative(ethTx.EffectiveGasPriceWeiPerGas(baseFeeWei)),
 		)
 		if effectiveGasPriceDec.LT(minGasPrice) {
 			// if sdk.NewDecFromBigInt(effectiveGasPrice).LT(minGasPrice) {

app/evmante/evmante_validate_basic.go

@@ -89,7 +89,7 @@ func (vbd EthValidateBasicDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simu
 	txFee := sdk.Coins{}
 	txGasLimit := uint64(0)
 
-	baseFee := vbd.evmKeeper.GetBaseFee(ctx)
+	baseFeeMicronibi := vbd.evmKeeper.BaseFeeMicronibiPerGas(ctx)
 
 	for _, msg := range protoTx.GetMsgs() {
 		msgEthTx, ok := msg.(*evm.MsgEthereumTx)
@@ -115,7 +115,7 @@ func (vbd EthValidateBasicDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simu
 			return ctx, errorsmod.Wrap(err, "failed to unpack MsgEthereumTx Data")
 		}
 
-		if baseFee == nil && txData.TxType() == gethcore.DynamicFeeTxType {
+		if baseFeeMicronibi == nil && txData.TxType() == gethcore.DynamicFeeTxType {
 			return ctx, errorsmod.Wrap(
 				gethcore.ErrTxTypeNotSupported,
 				"dynamic fee tx not supported",

app/evmante/interfaces.go

@@ -27,7 +27,7 @@ type EVMKeeper interface {
 
 	EVMState() evmkeeper.EvmState
 	EthChainID(ctx sdk.Context) *big.Int
-	GetBaseFee(ctx sdk.Context) *big.Int
+	BaseFeeMicronibiPerGas(ctx sdk.Context) *big.Int
 }
 
 type protoTxProvider interface {

e2e/evm/test/contract_send_nibi.test.ts

@@ -10,7 +10,7 @@
  * "e2e/evm/contracts/SendReceiveNibi.sol".
  */
 import { describe, expect, it } from "@jest/globals"
-import { toBigInt, Wallet } from "ethers"
+import { parseEther, toBigInt, Wallet } from "ethers"
 import { account, provider } from "./setup"
 import { deployContractSendNibi } from "./utils"
 
@@ -33,16 +33,24 @@ async function testSendNibi(
   const txCostWei = txCostMicronibi * tenPow12
   const expectedOwnerWei = ownerBalanceBefore - txCostWei
 
+  const ownerBalanceAfter = await provider.getBalance(account)
+  const recipientBalanceAfter = await provider.getBalance(recipient)
+
   console.debug(`DEBUG method ${method} %o:`, {
     ownerBalanceBefore,
     weiToSend,
-    gasUsed: receipt.gasUsed,
-    gasPrice: `${receipt.gasPrice.toString()} micronibi`,
     expectedOwnerWei,
+    ownerBalanceAfter,
+    recipientBalanceBefore,
+    recipientBalanceAfter,
+    gasUsed: receipt.gasUsed,
+    gasPrice: `${receipt.gasPrice.toString()}`,
+    to: receipt.to,
+    from: receipt.from,
   })
-
-  await expect(provider.getBalance(account)).resolves.toBe(expectedOwnerWei)
-  await expect(provider.getBalance(recipient)).resolves.toBe(weiToSend)
+  const deltaFromExpectation = ownerBalanceAfter - expectedOwnerWei
+  expect(deltaFromExpectation).toBeLessThan(parseEther("0.001"))
+  expect(recipientBalanceAfter).toBe(weiToSend)
 }
 
 describe("Send NIBI via smart contract", () => {

e2e/evm/test/native_transfer.test.ts

@@ -26,7 +26,7 @@ describe("native transfer", () => {
 
     // Assert balances with logging
     const tenPow12 = toBigInt(1e12)
-    const gasUsed = 50000n // 50k gas for the transaction
+    const gasUsed = transaction.gasLimit
     const txCostMicronibi = amountToSend / tenPow12 + gasUsed
     const txCostWei = txCostMicronibi * tenPow12
     const expectedSenderWei = senderBalanceBefore - txCostWei
@@ -35,8 +35,9 @@ describe("native transfer", () => {
       amountToSend,
       expectedSenderWei,
       senderBalanceAfter,
+      txResponse,
     })
-    expect(senderBalanceAfter).toEqual(expectedSenderWei)
     expect(recipientBalanceAfter).toEqual(amountToSend)
+    expect(senderBalanceAfter).toEqual(expectedSenderWei)
   }, 20e3)
 })

eth/rpc/backend/backend.go

@@ -60,7 +60,7 @@ func NewBackend(
 // TODO: feat(eth): Implement the cosmos JSON-RPC defined by Wallet Connect V2:
 // https://docs.walletconnect.com/2.0/json-rpc/cosmos.
 type CosmosBackend interface {
-	// TODO: GetAccounts()
-	// TODO: SignDirect()
-	// TODO: SignAmino()
+	// TODO: for Wallet Connect V2: GetAccounts()
+	// TODO: for Wallet Connect V2: SignDirect()
+	// TODO: for Wallet Connect V2: SignAmino()
 }

eth/rpc/backend/tx_info.go

@@ -253,7 +253,7 @@ func (b *Backend) GetTransactionReceipt(hash gethcommon.Hash) (*TransactionRecei
 			// tolerate the error for pruned node.
 			b.logger.Error("fetch basefee failed, node is pruned?", "height", res.Height, "error", err)
 		} else {
-			receipt.EffectiveGasPrice = dynamicTx.EffectiveGasPriceWei(baseFee)
+			receipt.EffectiveGasPrice = dynamicTx.EffectiveGasPriceWeiPerGas(baseFee)
 		}
 	}
 	return &receipt, nil

justfile

@@ -47,6 +47,33 @@ lint:
 localnet *PASS_FLAGS:
   make localnet FLAGS="{{PASS_FLAGS}}"
 
+# Clears the logs directory
+log-clear:
+  #!/usr/bin/env bash
+  rm logs/*
+
+# Runs "just localnet" with logging (logs/localnet.txt)
+log-localnet:
+  #!/usr/bin/env bash
+  mkdir -p logs
+  just localnet 2>&1 | tee -a logs/localnet.txt
+
+# Runs the EVM E2E test with logging (logs/e2e.txt)
+log-e2e:
+  #!/usr/bin/env bash
+  just test-e2e 2>&1 | tee -a ../../logs/e2e.txt
+
+# Runs the EVM E2E tests
+test-e2e:
+  #!/usr/bin/env bash
+  source contrib/bashlib.sh
+  log_info "Make sure the localnet is running! (just localnet)"
+
+  cd e2e/evm
+  nvm use
+  just test
+
+
 # Test: "localnet.sh" script
 test-localnet:
   #!/usr/bin/env bash

x/evm/const.go

@@ -12,7 +12,10 @@ import (
 
 // BASE_FEE_MICRONIBI is the global base fee value for the network. It has a
 // constant value of 1 unibi (micronibi) == 10^12 wei.
-var BASE_FEE_MICRONIBI = big.NewInt(1)
+var (
+	BASE_FEE_MICRONIBI = big.NewInt(1)
+	BASE_FEE_WEI       = NativeToWei(BASE_FEE_MICRONIBI)
+)
 
 const (
 	// ModuleName string name of module

x/evm/keeper/gas_fees.go

@@ -34,36 +34,42 @@ func (k *Keeper) GetEthIntrinsicGas(
 	)
 }
 
-// RefundGas transfers the leftover gas to the sender of the message, caped to
-// half of the total gas consumed in the transaction. Additionally, the function
-// sets the total gas consumed to the value returned by the EVM execution, thus
-// ignoring the previous intrinsic gas consumed during in the AnteHandler.
+// RefundGas transfers the leftover gas to the sender of the message.
 func (k *Keeper) RefundGas(
 	ctx sdk.Context,
-	msg core.Message,
+	msgFrom gethcommon.Address,
 	leftoverGas uint64,
-	denom string,
+	weiPerGas *big.Int,
 ) error {
 	// Return EVM tokens for remaining gas, exchanged at the original rate.
-	remaining := new(big.Int).Mul(new(big.Int).SetUint64(leftoverGas), msg.GasPrice())
+	leftoverWei := new(big.Int).Mul(
+		new(big.Int).SetUint64(leftoverGas),
+		weiPerGas,
+	)
+	leftoverMicronibi := evm.WeiToNative(leftoverWei)
 
-	switch remaining.Sign() {
+	switch leftoverMicronibi.Sign() {
 	case -1:
-		// negative refund errors
-		return errors.Wrapf(evm.ErrInvalidRefund, "refunded amount value cannot be negative %d", remaining.Int64())
+		// Should be impossible since leftoverGas is a uint64. Reaching this case
+		// would imply a critical error in the effective gas calculation.
+		return errors.Wrapf(evm.ErrInvalidRefund, "refunded amount value cannot be negative %d", leftoverMicronibi.Int64())
 	case 1:
-		// positive amount refund
-		refundedCoins := sdk.Coins{sdk.NewCoin(denom, sdkmath.NewIntFromBigInt(remaining))}
-
-		// refund to sender from the fee collector module account, which is the escrow account in charge of collecting tx fees
-
-		err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.FeeCollectorName, msg.From().Bytes(), refundedCoins)
+		refundedCoins := sdk.Coins{sdk.NewCoin(evm.EVMBankDenom, sdkmath.NewIntFromBigInt(leftoverMicronibi))}
+
+		// Refund to sender from the fee collector module account. This account
+		// manages the collection of gas fees.
+		err := k.bankKeeper.SendCoinsFromModuleToAccount(
+			ctx,
+			authtypes.FeeCollectorName, // sender
+			msgFrom.Bytes(),            // recipient
+			refundedCoins,
+		)
 		if err != nil {
 			err = errors.Wrapf(errortypes.ErrInsufficientFunds, "fee collector account failed to refund fees: %s", err.Error())
 			return errors.Wrapf(err, "failed to refund %d leftover gas (%s)", leftoverGas, refundedCoins.String())
 		}
 	default:
-		// no refund, consume gas and update the tx gas meter
+		// no refund
 	}
 
 	return nil