Merge branch 'main' into refactor/airplane-notes-and-cleanup

.nvmrc

@@ -0,0 +1 @@
+lts/jod

CHANGELOG.md

@@ -43,14 +43,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Nibiru EVM
 
 - [#2119](https://github.com/NibiruChain/nibiru/pull/2119) - fix(evm): Guarantee
-that gas consumed during any send operation of the "NibiruBankKeeper" depends
-only on the "bankkeeper.BaseKeeper"'s gas consumption.
-- [#2120](https://github.com/NibiruChain/nibiru/pull/2120) - fix: Use canonical hexadecimal strings for Eip155 address encoding 
+  that gas consumed during any send operation of the "NibiruBankKeeper" depends
+  only on the "bankkeeper.BaseKeeper"'s gas consumption.
+- [#2120](https://github.com/NibiruChain/nibiru/pull/2120) - fix: Use canonical hexadecimal strings for Eip155 address encoding
 - [#2122](https://github.com/NibiruChain/nibiru/pull/2122) - test(evm): more bank extension tests and EVM ABCI integration tests to prevent regressions
 - [#2124](https://github.com/NibiruChain/nibiru/pull/2124) - refactor(evm):
-Remove unnecessary argument in the `VerifyFee` function, which returns the token
-payment required based on the effective fee from the tx data. Improve
-documentation.
+  Remove unnecessary argument in the `VerifyFee` function, which returns the token
+  payment required based on the effective fee from the tx data. Improve
+  documentation.
+- [#2125](https://github.com/NibiruChain/nibiru/pull/2125) - feat(evm-precompile):Emit EVM events created to reflect the ABCI events that occur outside the EVM to make sure that block explorers and indexers can find indexed ABCI event information.
+- [#2127](https://github.com/NibiruChain/nibiru/pull/2127) - fix(vesting): disabled built in auth/vesting module functionality
+- [#2129](https://github.com/NibiruChain/nibiru/pull/2129) - fix(evm): issue with infinite recursion in erc20 funtoken contracts
+- [#2130](https://github.com/NibiruChain/nibiru/pull/2130) - fix(evm): proper nonce management in statedb
+- [#2134](https://github.com/NibiruChain/nibiru/pull/2134) - fix(evm): query of NIBI should use bank state, not the StateDB
+- [#2139](https://github.com/NibiruChain/nibiru/pull/2139) - fix(evm): erc20 born funtoken: properly burn bank coins after converting coin back to erc20
+- [#2140](https://github.com/NibiruChain/nibiru/pull/2140) - fix(bank): bank keeper extension now charges gas for the bank operations
+- [#2141](https://github.com/NibiruChain/nibiru/pull/2141) - refactor: simplify account retrieval operation in `nibid q evm account`.
+- [#2142](https://github.com/NibiruChain/nibiru/pull/2142) - fix(bank): add additional missing methods to the NibiruBankKeeper
+- [#2144](https://github.com/NibiruChain/nibiru/pull/2144) - feat(token-registry): Implement strongly typed Nibiru Token Registry and generation command
+- [#2145](https://github.com/NibiruChain/nibiru/pull/2145) - chore(token-registry): add xNIBI Astrovault LST to registry
+- [#2147](https://github.com/NibiruChain/nibiru/pull/2147) - fix(simapp): manually add x/vesting Cosmos-SDK module types to the codec in simulation tests since they are expected by default
+- [#2151](https://github.com/NibiruChain/nibiru/pull/2151) - feat(evm): randao support for evm
+- [#2152](https://github.com/NibiruChain/nibiru/pull/2152) - fix(precompile): consume gas for precompile calls regardless of error
 
 #### Nibiru EVM | Before Audit 2 - 2024-12-06
 
@@ -68,45 +82,45 @@ preparation for a second audit starting in November 2024.
   and the [related comments from @Unique-Divine and @berndartmueller](https://github.com/NibiruChain/nibiru/issues/2059#issuecomment-2408625724).
 - [#2084](https://github.com/NibiruChain/nibiru/pull/2084) - feat(evm-forge): foundry support and template for Nibiru EVM development
 - [#2086](https://github.com/NibiruChain/nibiru/pull/2086) - fix(evm-precomples):
-Fix state consistency in precompile execution by ensuring proper journaling of
-state changes in the StateDB. This pull request makes sure that state is
-committed as expected, fixes the `StateDB.Commit` to follow its guidelines more
-closely, and solves for a critical state inconsistency producible from the
-FunToken.sol precompiled contract. It also aligns the precompiles to use
-consistent setup and dynamic gas calculations, addressing the following tickets.
+  Fix state consistency in precompile execution by ensuring proper journaling of
+  state changes in the StateDB. This pull request makes sure that state is
+  committed as expected, fixes the `StateDB.Commit` to follow its guidelines more
+  closely, and solves for a critical state inconsistency producible from the
+  FunToken.sol precompiled contract. It also aligns the precompiles to use
+  consistent setup and dynamic gas calculations, addressing the following tickets.
   - <https://github.com/NibiruChain/nibiru/issues/2083>
   - <https://github.com/code-423n4/2024-10-nibiru-zenith/issues/43>
   - <https://github.com/code-423n4/2024-10-nibiru-zenith/issues/47>
 - [#2088](https://github.com/NibiruChain/nibiru/pull/2088) - refactor(evm): remove outdated comment and improper error message text
 - [#2089](https://github.com/NibiruChain/nibiru/pull/2089) - better handling of gas consumption within erc20 contract execution
 - [#2090](https://github.com/NibiruChain/nibiru/pull/2090) - fix(evm): Account
-for (1) ERC20 transfers with tokens that return false success values instead of
-throwing an error and (2) ERC20 transfers with other operations that don't bring
-about the expected resulting balance for the transfer recipient.
+  for (1) ERC20 transfers with tokens that return false success values instead of
+  throwing an error and (2) ERC20 transfers with other operations that don't bring
+  about the expected resulting balance for the transfer recipient.
 - [#2091](https://github.com/NibiruChain/nibiru/pull/2091) - feat(evm): add fun token creation fee validation
 - [#2093](https://github.com/NibiruChain/nibiru/pull/2093) - feat(evm): gas usage in precompiles: limits, local gas meters
 - [#2092](https://github.com/NibiruChain/nibiru/pull/2092) - feat(evm): add validation for wasm multi message execution
 - [#2094](https://github.com/NibiruChain/nibiru/pull/2094) - fix(evm): Following
-from the changs in #2086, this pull request implements a new `JournalChange`
-struct that saves a deep copy of the state multi store before each
-state-modifying, Nibiru-specific precompiled contract is called (`OnRunStart`).
-Additionally, we commit the `StateDB` there as well. This guarantees that the
-non-EVM and EVM state will be in sync even if there are complex, multi-step
-Ethereum transactions, such as in the case of an EthereumTx that influences the
-`StateDB`, then calls a precompile that also changes non-EVM state, and then EVM
-reverts inside of a try-catch.
+  from the changs in #2086, this pull request implements a new `JournalChange`
+  struct that saves a deep copy of the state multi store before each
+  state-modifying, Nibiru-specific precompiled contract is called (`OnRunStart`).
+  Additionally, we commit the `StateDB` there as well. This guarantees that the
+  non-EVM and EVM state will be in sync even if there are complex, multi-step
+  Ethereum transactions, such as in the case of an EthereumTx that influences the
+  `StateDB`, then calls a precompile that also changes non-EVM state, and then EVM
+  reverts inside of a try-catch.
 - [#2095](https://github.com/NibiruChain/nibiru/pull/2095) - fix(evm): This
-change records NIBI (ether) transfers on the `StateDB` during precompiled
-contract calls using the `NibiruBankKeeper`, which is struct extension of
-the `bankkeeper.BaseKeeper` that is used throughout Nibiru.
-The `NibiruBankKeeper` holds a reference to the current EVM `StateDB` and records
-balance changes in wei as journal changes automatically. This guarantees that
-commits and reversions of the `StateDB` do not misalign with the state of the
-Bank module. This code change uses the `NibiruBankKeeper` on all modules that
-depend on x/bank, such as the EVM and Wasm modules.
+  change records NIBI (ether) transfers on the `StateDB` during precompiled
+  contract calls using the `NibiruBankKeeper`, which is struct extension of
+  the `bankkeeper.BaseKeeper` that is used throughout Nibiru.
+  The `NibiruBankKeeper` holds a reference to the current EVM `StateDB` and records
+  balance changes in wei as journal changes automatically. This guarantees that
+  commits and reversions of the `StateDB` do not misalign with the state of the
+  Bank module. This code change uses the `NibiruBankKeeper` on all modules that
+  depend on x/bank, such as the EVM and Wasm modules.
 - [#2097](https://github.com/NibiruChain/nibiru/pull/2097) - feat(evm): Add new query to get dated price from the oracle precompile
 - [#2098](https://github.com/NibiruChain/nibiru/pull/2098) - test(evm): statedb
-tests for race conditions within funtoken precompile
+  tests for race conditions within funtoken precompile
 - [#2100](https://github.com/NibiruChain/nibiru/pull/2100) - refactor: cleanup statedb and precompile sections
 - [#2101](https://github.com/NibiruChain/nibiru/pull/2101) - fix(evm): tx receipt proper marshalling
 - [#2105](https://github.com/NibiruChain/nibiru/pull/2105) - test(evm): precompile call with revert
@@ -118,11 +132,11 @@ tests for race conditions within funtoken precompile
 - [#2114](https://github.com/NibiruChain/nibiru/pull/2114) - fix(evm): make gas cost zero in conditional bank keeper flow
 - [#2116](https://github.com/NibiruChain/nibiru/pull/2116) - fix(precompile-funtoken.go): Fixes a bug where the err != nil check is missing in the bankBalance precompile method
 - [#2117](https://github.com/NibiruChain/nibiru/pull/2117) - fix(oracle): The
-timestamps resulting from ctx.WithBlock* don't actually correspond to the block
-header information from specified blocks in the chain's history, so the oracle
-exchange rates need a way to correctly retrieve this information. This change
-fixes that discrepancy, giving the expected block timestamp for the EVM's oracle
-precompiled contract. The change also simplifies and corrects the code in x/oracle.
+  timestamps resulting from ctx.WithBlock\* don't actually correspond to the block
+  header information from specified blocks in the chain's history, so the oracle
+  exchange rates need a way to correctly retrieve this information. This change
+  fixes that discrepancy, giving the expected block timestamp for the EVM's oracle
+  precompiled contract. The change also simplifies and corrects the code in x/oracle.
 
 #### Nibiru EVM | Before Audit 1 - 2024-10-18
 
@@ -202,6 +216,7 @@ precompiled contract. The change also simplifies and corrects the code in x/orac
 - [#2060](https://github.com/NibiruChain/nibiru/pull/2060) - fix(evm-precompiles): add assertNumArgs validation
 - [#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
+- [#2135](https://github.com/NibiruChain/nibiru/pull/2135) - feat(evm): add precompile for calling bank to evm from evm
 
 ### State Machine Breaking (Other)
 

app/ante/fixed_gas_test.go

@@ -197,7 +197,7 @@ func (suite *AnteTestSuite) TestOraclePostPriceTransactionsHaveFixedPrice() {
 					Amount:      sdk.NewCoins(sdk.NewInt64Coin(appconst.BondDenom, 200)),
 				},
 			},
-			expectedGas: 38175,
+			expectedGas: 67193,
 			expectedErr: nil,
 		},
 	}

app/keepers.go

@@ -32,8 +32,6 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
-	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
@@ -633,7 +631,6 @@ func (app *NibiruApp) initAppModules(
 			encodingConfig.TxConfig,
 		),
 		auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),
-		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)),
 		capability.NewAppModule(appCodec, *app.capabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
@@ -715,7 +712,6 @@ func orderedModuleNames() []string {
 		authz.ModuleName,
 		feegrant.ModuleName,
 		paramstypes.ModuleName,
-		vestingtypes.ModuleName,
 
 		// --------------------------------------------------------------------
 		// Native x/ Modules
@@ -831,7 +827,6 @@ func ModuleBasicManager() module.BasicManager {
 		evidence.AppModuleBasic{},
 		authzmodule.AppModuleBasic{},
 		groupmodule.AppModuleBasic{},
-		vesting.AppModuleBasic{},
 		// ibc 'AppModuleBasic's
 		ibc.AppModuleBasic{},
 		ibctransfer.AppModuleBasic{},

contrib/bashlib.sh

@@ -29,26 +29,26 @@ export COLOR_BRIGHT_WHITE="\033[97m"
 
 # log_debug: Simple wrapper for `echo` with a DEBUG prefix.
 log_debug() {
-  echo "${COLOR_CYAN}DEBUG${COLOR_RESET}" "$@"
+  echo -e "${COLOR_CYAN}DEBUG${COLOR_RESET}" "$@"
 }
 
 # log_error: ERROR messages in red, output to stderr.
 log_error() {
-  echo "❌ ${COLOR_RED}ERROR:${COLOR_RESET}" "$@" >&2
+  echo -e "❌ ${COLOR_RED}ERROR:${COLOR_RESET}" "$@" >&2
 }
 
 log_success() {
-  echo "${COLOR_GREEN}✅ SUCCESS:${COLOR_RESET}" "$@"
+  echo -e "${COLOR_GREEN}✅ SUCCESS:${COLOR_RESET}" "$@"
 }
 
 # log_warning: WARNING messages represent non-critical issues that might not
 # require immediate action but should be noted as points of concern or failure.
 log_warning() {
-  echo "${COLOR_YELLOW}WARNING${COLOR_RESET}" "$@" >&2
+  echo -e "${COLOR_YELLOW}WARNING${COLOR_RESET}" "$@" >&2
 }
 
 log_info() {
-  echo "${COLOR_MAGENTA}INFO${COLOR_RESET}" "$@"
+  echo -e "${COLOR_MAGENTA}INFO${COLOR_RESET}" "$@"
 }
 
 # —————————————————————————————————————————————————

eth/rpc/backend/backend_suite_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	gethcore "github.com/ethereum/go-ethereum/core/types"
@@ -115,13 +116,12 @@ func (s *BackendSuite) SendNibiViaEthTransfer(
 	amount *big.Int,
 	waitForNextBlock bool,
 ) gethcommon.Hash {
-	nonce, err := s.backend.GetTransactionCount(s.fundedAccEthAddr, rpc.EthPendingBlockNumber)
-	s.Require().NoError(err)
+	nonce := s.getCurrentNonce(s.fundedAccEthAddr)
 	return SendTransaction(
 		s,
 		&gethcore.LegacyTx{
 			To:       &to,
-			Nonce:    uint64(*nonce),
+			Nonce:    uint64(nonce),
 			Value:    amount,
 			Gas:      params.TxGas,
 			GasPrice: big.NewInt(1),
@@ -135,20 +135,20 @@ func (s *BackendSuite) DeployTestContract(waitForNextBlock bool) (gethcommon.Has
 	packedArgs, err := embeds.SmartContract_TestERC20.ABI.Pack("")
 	s.Require().NoError(err)
 	bytecodeForCall := append(embeds.SmartContract_TestERC20.Bytecode, packedArgs...)
-	nonce, err := s.backend.GetTransactionCount(s.fundedAccEthAddr, rpc.EthPendingBlockNumber)
+	nonce := s.getCurrentNonce(s.fundedAccEthAddr)
 	s.Require().NoError(err)
 
 	txHash := SendTransaction(
 		s,
 		&gethcore.LegacyTx{
-			Nonce:    uint64(*nonce),
+			Nonce:    uint64(nonce),
 			Data:     bytecodeForCall,
 			Gas:      1500_000,
 			GasPrice: big.NewInt(1),
 		},
 		waitForNextBlock,
 	)
-	contractAddr := crypto.CreateAddress(s.fundedAccEthAddr, (uint64)(*nonce))
+	contractAddr := crypto.CreateAddress(s.fundedAccEthAddr, nonce)
 	return txHash, contractAddr
 }
 
@@ -188,3 +188,73 @@ func WaitForReceipt(s *BackendSuite, txHash gethcommon.Hash) (*big.Int, *gethcom
 		}
 	}
 }
+
+// getCurrentNonce returns the current nonce of the funded account
+func (s *BackendSuite) getCurrentNonce(address gethcommon.Address) uint64 {
+	bn, err := s.backend.BlockNumber()
+	s.Require().NoError(err)
+	currentHeight := rpc.BlockNumber(bn)
+
+	nonce, err := s.backend.GetTransactionCount(address, currentHeight)
+	s.Require().NoError(err)
+
+	return uint64(*nonce)
+}
+
+// broadcastSDKTx broadcasts the given SDK transaction and returns the response
+func (s *BackendSuite) broadcastSDKTx(sdkTx sdk.Tx) *sdk.TxResponse {
+	txBytes, err := s.backend.ClientCtx().TxConfig.TxEncoder()(sdkTx)
+	s.Require().NoError(err)
+
+	syncCtx := s.backend.ClientCtx().WithBroadcastMode(flags.BroadcastSync)
+	rsp, err := syncCtx.BroadcastTx(txBytes)
+	s.Require().NoError(err)
+	return rsp
+}
+
+// buildContractCreationTx builds a contract creation transaction
+func (s *BackendSuite) buildContractCreationTx(nonce uint64) gethcore.Transaction {
+	packedArgs, err := embeds.SmartContract_TestERC20.ABI.Pack("")
+	s.Require().NoError(err)
+	bytecodeForCall := append(embeds.SmartContract_TestERC20.Bytecode, packedArgs...)
+
+	creationTx := &gethcore.LegacyTx{
+		Nonce:    nonce,
+		Data:     bytecodeForCall,
+		Gas:      1_500_000,
+		GasPrice: big.NewInt(1),
+	}
+
+	signer := gethcore.LatestSignerForChainID(s.ethChainID)
+	signedTx, err := gethcore.SignNewTx(s.fundedAccPrivateKey, signer, creationTx)
+	s.Require().NoError(err)
+
+	return *signedTx
+}
+
+// buildContractCallTx builds a contract call transaction
+func (s *BackendSuite) buildContractCallTx(nonce uint64, contractAddr gethcommon.Address) gethcore.Transaction {
+	// recipient := crypto.CreateAddress(s.fundedAccEthAddr, 29381)
+	transferAmount := big.NewInt(100)
+
+	packedArgs, err := embeds.SmartContract_TestERC20.ABI.Pack(
+		"transfer",
+		recipient,
+		transferAmount,
+	)
+	s.Require().NoError(err)
+
+	transferTx := &gethcore.LegacyTx{
+		Nonce:    nonce,
+		Data:     packedArgs,
+		Gas:      100_000,
+		GasPrice: big.NewInt(1),
+		To:       &contractAddr,
+	}
+
+	signer := gethcore.LatestSignerForChainID(s.ethChainID)
+	signedTx, err := gethcore.SignNewTx(s.fundedAccPrivateKey, signer, transferTx)
+	s.Require().NoError(err)
+
+	return *signedTx
+}

eth/rpc/backend/call_tx.go

@@ -9,6 +9,7 @@ import (
 	"math/big"
 
 	errorsmod "cosmossdk.io/errors"
+	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
@@ -338,3 +339,7 @@ func (b *Backend) GasPrice() (*hexutil.Big, error) {
 
 	return (*hexutil.Big)(result), nil
 }
+
+func (b *Backend) ClientCtx() client.Context {
+	return b.clientCtx
+}