feat(evm): keeper collections and grpc query impls for EthAccount, NibiruAccount

CHANGELOG.md

@@ -58,7 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1855](https://github.com/NibiruChain/nibiru/pull/1855) - feat(eth-pubsub): Implement in-memory EventBus for real-time topic management and event distribution
 - [#1856](https://github.com/NibiruChain/nibiru/pull/1856) - feat(eth-rpc): Conversion types and functions between Ethereum txs and blocks and Tendermint ones.
 - [#1861](https://github.com/NibiruChain/nibiru/pull/1861) - feat(eth-rpc): RPC backend, Ethereum tracer, KV indexer, and RPC APIs
-- [#1869](https://github.com/NibiruChain/nibiru/pull/1869) - feat(eth): Module and start of keeper tests
+- [#1869](https://github.com/NibiruChain/nibiru/pull/1869) - feat(eth): Module and start of keeper tests 
+- [#1873](https://github.com/NibiruChain/nibiru/pull/1873) - feat(evm): keeper collections and grpc query impls for EthAccount, NibiruAccount
 
 #### Dapp modules: perp, spot, oracle, etc
 

app/ante.go

@@ -30,26 +30,8 @@ type AnteHandlerOptions struct {
 // numbers, checks signatures and account numbers, and deducts fees from the
 // first signer.
 func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) {
-	if options.AccountKeeper == nil {
-		return nil, AnteHandlerError("account keeper")
-	}
-	if options.BankKeeper == nil {
-		return nil, AnteHandlerError("bank keeper")
-	}
-	if options.SignModeHandler == nil {
-		return nil, AnteHandlerError("sign mode handler")
-	}
-	if options.SigGasConsumer == nil {
-		options.SigGasConsumer = sdkante.DefaultSigVerificationGasConsumer
-	}
-	if options.WasmConfig == nil {
-		return nil, AnteHandlerError("wasm config")
-	}
-	if options.DevGasKeeper == nil {
-		return nil, AnteHandlerError("devgas keeper")
-	}
-	if options.IBCKeeper == nil {
-		return nil, AnteHandlerError("ibc keeper")
+	if err := options.ValidateAndClean(); err != nil {
+		return nil, err
 	}
 
 	anteDecorators := []sdk.AnteDecorator{
@@ -80,6 +62,31 @@ func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) {
 	return sdk.ChainAnteDecorators(anteDecorators...), nil
 }
 
+func (opts *AnteHandlerOptions) ValidateAndClean() error {
+	if opts.AccountKeeper == nil {
+		return AnteHandlerError("account keeper")
+	}
+	if opts.BankKeeper == nil {
+		return AnteHandlerError("bank keeper")
+	}
+	if opts.SignModeHandler == nil {
+		return AnteHandlerError("sign mode handler")
+	}
+	if opts.SigGasConsumer == nil {
+		opts.SigGasConsumer = sdkante.DefaultSigVerificationGasConsumer
+	}
+	if opts.WasmConfig == nil {
+		return AnteHandlerError("wasm config")
+	}
+	if opts.DevGasKeeper == nil {
+		return AnteHandlerError("devgas keeper")
+	}
+	if opts.IBCKeeper == nil {
+		return AnteHandlerError("ibc keeper")
+	}
+	return nil
+}
+
 func AnteHandlerError(shortDesc string) error {
 	return sdkerrors.Wrapf(errors.ErrLogic, "%s is required for AnteHandler", shortDesc)
 }

app/ante/fixed_gas_test.go

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

app/ante/testutil_test.go

@@ -39,7 +39,7 @@ func (suite *AnteTestSuite) SetupTest() {
 	// Set up base app and ctx
 	testapp.EnsureNibiruPrefix()
 	encodingConfig := app.MakeEncodingConfig()
-	suite.app = testapp.NewNibiruTestApp(app.NewDefaultGenesisState(encodingConfig.Marshaler))
+	suite.app = testapp.NewNibiruTestApp(app.NewDefaultGenesisState(encodingConfig.Codec))
 	chainId := "test-chain-id"
 	ctx := suite.app.NewContext(true, tmproto.Header{
 		Height:  1,

app/app.go

@@ -130,7 +130,7 @@ func NewNibiruApp(
 	appOpts servertypes.AppOptions,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *NibiruApp {
-	appCodec := encodingConfig.Marshaler
+	appCodec := encodingConfig.Codec
 	legacyAmino := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig

app/appconst/appconst.go

@@ -32,7 +32,7 @@ func init() {
 	GoArch = runtime.GOARCH
 }
 
-func Version() string {
+func RuntimeVersion() string {
 	return fmt.Sprintf(
 		"Version %s (%s)\nCompiled at %s using Go %s (%s)",
 		AppVersion,

app/codec/codec.go

@@ -11,7 +11,7 @@ import (
 // This is provided for compatibility between protobuf and amino implementations.
 type EncodingConfig struct {
 	InterfaceRegistry types.InterfaceRegistry
-	Marshaler         codec.Codec
+	Codec             codec.Codec
 	TxConfig          client.TxConfig
 	Amino             *codec.LegacyAmino
 }
@@ -25,7 +25,7 @@ func MakeEncodingConfig() EncodingConfig {
 
 	return EncodingConfig{
 		InterfaceRegistry: interfaceRegistry,
-		Marshaler:         marshaler,
+		Codec:             marshaler,
 		TxConfig:          txCfg,
 		Amino:             amino,
 	}

app/ibc_test.go

@@ -34,7 +34,7 @@ func SetupNibiruTestingApp() (
 
 	// Create genesis state
 	encCdc := app.MakeEncodingConfig()
-	genesisState := app.NewDefaultGenesisState(encCdc.Marshaler)
+	genesisState := app.NewDefaultGenesisState(encCdc.Codec)
 	testapp.SetDefaultSudoGenesis(genesisState)
 
 	return nibiruApp, genesisState

app/keepers.go

@@ -105,6 +105,7 @@ import (
 	// ---------------------------------------------------------------
 	// Nibiru Custom Modules
 
+	"github.com/NibiruChain/nibiru/eth"
 	"github.com/NibiruChain/nibiru/x/common"
 	"github.com/NibiruChain/nibiru/x/devgas/v1"
 	devgaskeeper "github.com/NibiruChain/nibiru/x/devgas/v1/keeper"
@@ -280,11 +281,12 @@ func (app *NibiruApp) InitKeepers(
 	// seal capability keeper after scoping modules
 	// app.capabilityKeeper.Seal()
 
-	// add keepers
+	// TODO: chore(upgrade): Potential breaking change on AccountKeeper dur
+	// to ProtoBaseAccount replacement.
 	app.AccountKeeper = authkeeper.NewAccountKeeper(
 		appCodec,
 		keys[authtypes.StoreKey],
-		authtypes.ProtoBaseAccount,
+		eth.ProtoBaseAccount,
 		maccPerms,
 		sdk.GetConfig().GetBech32AccountAddrPrefix(),
 		govModuleAddr,
@@ -396,6 +398,8 @@ func (app *NibiruApp) InitKeepers(
 		keys[evm.StoreKey],
 		tkeys[evm.TransientKey],
 		authtypes.NewModuleAddress(govtypes.ModuleName),
+		app.AccountKeeper,
+		app.BankKeeper,
 	)
 
 	// ---------------------------------- IBC keepers

app/modules_test.go

@@ -25,14 +25,14 @@ func (s *TestSuite) SetupSuite() {
 }
 
 func (s *TestSuite) DefaultGenesisCopy() app.GenesisState {
-	return app.NewDefaultGenesisState(s.encCfg.Marshaler)
+	return app.NewDefaultGenesisState(s.encCfg.Codec)
 }
 
 func (s *TestSuite) TestGenesis() {
 	getDefaultStakingGenesis := func() *stakingtypes.GenesisState {
 		genStaking := new(stakingtypes.GenesisState)
-		s.encCfg.Marshaler.MustUnmarshalJSON(
-			app.StakingModule{}.DefaultGenesis(s.encCfg.Marshaler),
+		s.encCfg.Codec.MustUnmarshalJSON(
+			app.StakingModule{}.DefaultGenesis(s.encCfg.Codec),
 			genStaking,
 		)
 		return genStaking
@@ -61,9 +61,9 @@ func (s *TestSuite) TestGenesis() {
 		},
 	} {
 		s.T().Run(tc.name, func(t *testing.T) {
-			genStakingJson := s.encCfg.Marshaler.MustMarshalJSON(tc.gen)
+			genStakingJson := s.encCfg.Codec.MustMarshalJSON(tc.gen)
 			err := app.StakingModule{}.ValidateGenesis(
-				s.encCfg.Marshaler,
+				s.encCfg.Codec,
 				s.encCfg.TxConfig,
 				genStakingJson,
 			)

cmd/nibid/cmd/decode_base64_test.go

@@ -31,7 +31,7 @@ func TestBase64Decode(t *testing.T) {
 			cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
 			require.NoError(t, err)
 
-			appCodec := app.MakeEncodingConfig().Marshaler
+			appCodec := app.MakeEncodingConfig().Codec
 			err = genutiltest.ExecInitCmd(
 				testModuleBasicManager, home, appCodec)
 			require.NoError(t, err)

cmd/nibid/cmd/genaccounts_test.go

@@ -41,7 +41,7 @@ func TestAddGenesisAccountCmd(t *testing.T) {
 			cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
 			require.NoError(t, err)
 
-			appCodec := app.MakeEncodingConfig().Marshaler
+			appCodec := app.MakeEncodingConfig().Codec
 			err = genutiltest.ExecInitCmd(
 				testModuleBasicManager, home, appCodec)
 			require.NoError(t, err)

cmd/nibid/cmd/root.go

@@ -39,7 +39,7 @@ func NewRootCmd() (*cobra.Command, app.EncodingConfig) {
 	app.SetPrefixes(appconst.AccountAddressPrefix)
 
 	initClientCtx := client.Context{}.
-		WithCodec(encodingConfig.Marshaler).
+		WithCodec(encodingConfig.Codec).
 		WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
 		WithTxConfig(encodingConfig.TxConfig).
 		WithLegacyAmino(encodingConfig.Amino).

cmd/nibid/cmd/testnet_test.go

@@ -25,12 +25,12 @@ func Test_TestnetCmd(t *testing.T) {
 	cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
 	require.NoError(t, err)
 
-	err = genutiltest.ExecInitCmd(app.ModuleBasics, home, encodingConfig.Marshaler)
+	err = genutiltest.ExecInitCmd(app.ModuleBasics, home, encodingConfig.Codec)
 	require.NoError(t, err)
 
 	serverCtx := server.NewContext(viper.New(), cfg, logger)
 	clientCtx := client.Context{}.
-		WithCodec(encodingConfig.Marshaler).
+		WithCodec(encodingConfig.Codec).
 		WithHomeDir(home).
 		WithTxConfig(encodingConfig.TxConfig)
 
@@ -49,6 +49,6 @@ func Test_TestnetCmd(t *testing.T) {
 	appState, _, err := genutiltypes.GenesisStateFromGenFile(genFile)
 	require.NoError(t, err)
 
-	bankGenState := banktypes.GetGenesisStateFromAppState(encodingConfig.Marshaler, appState)
+	bankGenState := banktypes.GetGenesisStateFromAppState(encodingConfig.Codec, appState)
 	require.NotEmpty(t, bankGenState.Supply.String())
 }

eth/chain_id.go

@@ -6,8 +6,6 @@ import (
 	"math/big"
 	"regexp"
 	"strings"
-
-	errorsmod "cosmossdk.io/errors"
 )
 
 var (
@@ -24,7 +22,8 @@ var (
 		regexEpoch))
 )
 
-// IsValidChainID returns false if the given chain identifier is incorrectly formatted.
+// IsValidChainID returns false if the given chain identifier is incorrectly
+// formatted.
 func IsValidChainID(chainID string) bool {
 	if len(chainID) > 48 {
 		return false
@@ -39,18 +38,21 @@ func IsValidChainID(chainID string) bool {
 func ParseChainID(chainID string) (*big.Int, error) {
 	chainID = strings.TrimSpace(chainID)
 	if len(chainID) > 48 {
-		return nil, errorsmod.Wrapf(ErrInvalidChainID, "chain-id '%s' cannot exceed 48 chars", chainID)
+		return nil, ErrInvalidChainID.Wrapf(
+			`chain-id input "%s" cannot exceed 48 chars`, chainID)
 	}
 
 	matches := nibiruEvmChainId.FindStringSubmatch(chainID)
 	if matches == nil || len(matches) != 4 || matches[1] == "" {
-		return nil, errorsmod.Wrapf(ErrInvalidChainID, "%s: %v", chainID, matches)
+		return nil, ErrInvalidChainID.Wrapf(
+			`chain-id input "%s", matches "%v"`, chainID, matches)
 	}
 
 	// verify that the chain-id entered is a base 10 integer
 	chainIDInt, ok := new(big.Int).SetString(matches[2], 10)
 	if !ok {
-		return nil, errorsmod.Wrapf(ErrInvalidChainID, "epoch %s must be base-10 integer format", matches[2])
+		return nil, ErrInvalidChainID.Wrapf(
+			`epoch "%s" must be base-10 integer format`, matches[2])
 	}
 
 	return chainIDInt, nil