From 9369869e7f738618e573ab73c7889a80fc6f15e0 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 24 Oct 2024 16:41:49 -0400 Subject: [PATCH 01/18] add crosschain decoders --- app/modules.go | 1 + x/crosschain/simulation/decoders.go | 16 ++++++++++++++++ x/crosschain/simulation/simap.go | 15 --------------- 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 x/crosschain/simulation/decoders.go delete mode 100644 x/crosschain/simulation/simap.go diff --git a/app/modules.go b/app/modules.go index 6f164a9409..aa7b9361e4 100644 --- a/app/modules.go +++ b/app/modules.go @@ -178,5 +178,6 @@ func simulationModules( evm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + crosschainmodule.NewAppModule(appCodec, app.CrosschainKeeper), } } diff --git a/x/crosschain/simulation/decoders.go b/x/crosschain/simulation/decoders.go new file mode 100644 index 0000000000..d75634a2ff --- /dev/null +++ b/x/crosschain/simulation/decoders.go @@ -0,0 +1,16 @@ +package simulation + +import ( + "bytes" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/types/kv" +) + +func NewDecodes(cdc codec.Codec) func(kvA, kvB kv.Pair) string { + return func(kvA, kvB kv.Pair) string { + switch { + case bytes.Equal(kvA.Key[:1], []byte{0x00}): + + } +} diff --git a/x/crosschain/simulation/simap.go b/x/crosschain/simulation/simap.go deleted file mode 100644 index 92c437c0d1..0000000000 --- a/x/crosschain/simulation/simap.go +++ /dev/null @@ -1,15 +0,0 @@ -package simulation - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" -) - -// FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) - if err != nil { - panic(err) - } - return simtypes.FindAccount(accs, creator) -} From 873153d302860d875fefb4baf39d23b8f972452e Mon Sep 17 00:00:00 2001 From: Tanmay Date: Mon, 28 Oct 2024 17:16:30 -0400 Subject: [PATCH 02/18] decoders test --- Makefile | 2 +- app/modules.go | 1 + server/start.go | 16 +- tests/simulation/sim/sim_state.go | 26 ++ tests/simulation/sim_test.go | 2 + testutil/keeper/mocks/crosschain/account.go | 20 + testutil/keeper/mocks/crosschain/bank.go | 20 + testutil/sample/crosschain.go | 24 + .../cctx_orchestrator_validate_inbound.go | 1 - .../keeper/msg_server_vote_inbound_tx.go | 8 +- x/crosschain/module_simulation.go | 20 +- x/crosschain/simulation/decoders.go | 48 +- x/crosschain/simulation/decoders_test.go | 59 +++ x/crosschain/simulation/genesis.go | 11 + x/crosschain/simulation/operations.go | 425 ++++++++++++++++++ x/crosschain/types/expected_keepers.go | 2 + x/observer/abci.go | 2 +- .../keeper/msg_server_disable_cctx_flags.go | 1 - x/observer/module_simulation.go | 16 +- x/observer/simulation/simap.go | 15 - 20 files changed, 670 insertions(+), 49 deletions(-) create mode 100644 x/crosschain/simulation/decoders_test.go create mode 100644 x/crosschain/simulation/genesis.go create mode 100644 x/crosschain/simulation/operations.go delete mode 100644 x/observer/simulation/simap.go diff --git a/Makefile b/Makefile index 1e87c984e9..556b68350c 100644 --- a/Makefile +++ b/Makefile @@ -390,7 +390,7 @@ test-sim-nondeterminism: $(call run-sim-test,"non-determinism test",TestAppStateDeterminism,100,200,2h) test-sim-fullappsimulation: - $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,2h) + $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,10,200,2h) test-sim-multi-seed-long: runsim @echo "Running long multi-seed application simulation." diff --git a/app/modules.go b/app/modules.go index aa7b9361e4..71e8ab5b4c 100644 --- a/app/modules.go +++ b/app/modules.go @@ -179,5 +179,6 @@ func simulationModules( authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), crosschainmodule.NewAppModule(appCodec, app.CrosschainKeeper), + observermodule.NewAppModule(appCodec, *app.ObserverKeeper), } } diff --git a/server/start.go b/server/start.go index 09bb9215c0..478a71fc72 100644 --- a/server/start.go +++ b/server/start.go @@ -175,7 +175,7 @@ which accepts a path for the resulting pprof file. cmd.Flags(). String(server.FlagMinGasPrices, "", "Minimum gas prices to accept for transactions; Any fee in a tx must meet this minimum (e.g. 0.01photon;0.0001stake)") - //nolint:lll + //nolint:lll cmd.Flags(). IntSlice(server.FlagUnsafeSkipUpgrades, []int{}, "Skip a set of upgrade heights to continue the old binary") cmd.Flags(). @@ -192,7 +192,7 @@ which accepts a path for the resulting pprof file. cmd.Flags(). Uint64(server.FlagPruningInterval, 0, "Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom')") - //nolint:lll + //nolint:lll cmd.Flags().Uint(server.FlagInvCheckPeriod, 0, "Assert registered invariants every N blocks") cmd.Flags(). Uint64(server.FlagMinRetainBlocks, 0, "Minimum block height offset during ABCI commit to prune Tendermint blocks") @@ -220,11 +220,11 @@ which accepts a path for the resulting pprof file. cmd.Flags(). Uint64(srvflags.JSONRPCGasCap, config.DefaultGasCap, "Sets a cap on gas that can be used in eth_call/estimateGas unit is aphoton (0=infinite)") - //nolint:lll + //nolint:lll cmd.Flags(). Float64(srvflags.JSONRPCTxFeeCap, config.DefaultTxFeeCap, "Sets a cap on transaction fee that can be sent via the RPC APIs (1 = default 1 photon)") - //nolint:lll + //nolint:lll cmd.Flags(). Int32(srvflags.JSONRPCFilterCap, config.DefaultFilterCap, "Sets the global cap for total number of filters that can be created") cmd.Flags(). @@ -236,7 +236,7 @@ which accepts a path for the resulting pprof file. cmd.Flags(). Bool(srvflags.JSONRPCAllowUnprotectedTxs, config.DefaultAllowUnprotectedTxs, "Allow for unprotected (non EIP155 signed) transactions to be submitted via the node's RPC when the global parameter is disabled") - //nolint:lll + //nolint:lll cmd.Flags(). Int32(srvflags.JSONRPCLogsCap, config.DefaultLogsCap, "Sets the max number of results can be returned from single `eth_getLogs` query") cmd.Flags(). @@ -244,18 +244,18 @@ which accepts a path for the resulting pprof file. cmd.Flags(). Int(srvflags.JSONRPCMaxOpenConnections, config.DefaultMaxOpenConnections, "Sets the maximum number of simultaneous connections for the server listener") - //nolint:lll + //nolint:lll cmd.Flags().Bool(srvflags.JSONRPCEnableIndexer, false, "Enable the custom tx indexer for json-rpc") cmd.Flags().Bool(srvflags.JSONRPCEnableMetrics, false, "Define if EVM rpc metrics server should be enabled") cmd.Flags(). String(srvflags.EVMTracer, config.DefaultEVMTracer, "the EVM tracer type to collect execution traces from the EVM transaction execution (json|struct|access_list|markdown)") - //nolint:lll + //nolint:lll cmd.Flags(). Uint64(srvflags.EVMMaxTxGasWanted, config.DefaultMaxTxGasWanted, "the gas wanted for each eth tx returned in ante handler in check tx mode") - //nolint:lll + //nolint:lll cmd.Flags().String(srvflags.TLSCertPath, "", "the cert.pem file path for the server TLS configuration") cmd.Flags().String(srvflags.TLSKeyPath, "", "the key.pem file path for the server TLS configuration") diff --git a/tests/simulation/sim/sim_state.go b/tests/simulation/sim/sim_state.go index c8df9f4f31..38bb893bb5 100644 --- a/tests/simulation/sim/sim_state.go +++ b/tests/simulation/sim/sim_state.go @@ -20,6 +20,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + "github.com/zeta-chain/node/testutil/sample" + observertypes "github.com/zeta-chain/node/x/observer/types" zetaapp "github.com/zeta-chain/node/app" ) @@ -166,10 +168,34 @@ func AppStateFn( // we should replace the EvmDenom with BondDenom evmState.Params.EvmDenom = stakingState.Params.BondDenom + observers := []string{} + for _, validator := range stakingState.Validators { + accAddress, err := observertypes.GetAccAddressFromOperatorAddress(validator.OperatorAddress) + if err != nil { + panic(err) + } + observers = append(observers, accAddress.String()) + } + observers = observers[:5] + + // update the observer genesis state + observerStateBz, ok := rawState[observertypes.ModuleName] + if !ok { + panic("observer genesis state is missing") + } + observerState := new(observertypes.GenesisState) + cdc.MustUnmarshalJSON(observerStateBz, observerState) + observerState.Observers.ObserverList = observers + observerState.CrosschainFlags.IsInboundEnabled = true + observerState.CrosschainFlags.IsOutboundEnabled = true + tss := sample.Tss() + observerState.Tss = &tss + // change appState back rawState[evmtypes.ModuleName] = cdc.MustMarshalJSON(evmState) rawState[stakingtypes.ModuleName] = cdc.MustMarshalJSON(stakingState) rawState[banktypes.ModuleName] = cdc.MustMarshalJSON(bankState) + rawState[observertypes.ModuleName] = cdc.MustMarshalJSON(observerState) // replace appstate appState, err = json.Marshal(rawState) diff --git a/tests/simulation/sim_test.go b/tests/simulation/sim_test.go index 957e92081a..d196ec1929 100644 --- a/tests/simulation/sim_test.go +++ b/tests/simulation/sim_test.go @@ -183,6 +183,8 @@ func TestFullAppSimulation(t *testing.T) { simApp, err := simutils.NewSimApp(logger, db, appOptions, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) require.NoError(t, err) + //config.ExportStatsPath = os.TempDir() + "/stats.json" + // define a new write syncer to write the stats to a file blockedAddresses := simApp.ModuleAccountAddrs() _, _, simerr := simulation.SimulateFromSeed( t, diff --git a/testutil/keeper/mocks/crosschain/account.go b/testutil/keeper/mocks/crosschain/account.go index fbd7c0377b..3ff30725e6 100644 --- a/testutil/keeper/mocks/crosschain/account.go +++ b/testutil/keeper/mocks/crosschain/account.go @@ -14,6 +14,26 @@ type CrosschainAccountKeeper struct { mock.Mock } +// GetAccount provides a mock function with given fields: ctx, addr +func (_m *CrosschainAccountKeeper) GetAccount(ctx types.Context, addr types.AccAddress) authtypes.AccountI { + ret := _m.Called(ctx, addr) + + if len(ret) == 0 { + panic("no return value specified for GetAccount") + } + + var r0 authtypes.AccountI + if rf, ok := ret.Get(0).(func(types.Context, types.AccAddress) authtypes.AccountI); ok { + r0 = rf(ctx, addr) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(authtypes.AccountI) + } + } + + return r0 +} + // GetModuleAccount provides a mock function with given fields: ctx, name func (_m *CrosschainAccountKeeper) GetModuleAccount(ctx types.Context, name string) authtypes.ModuleAccountI { ret := _m.Called(ctx, name) diff --git a/testutil/keeper/mocks/crosschain/bank.go b/testutil/keeper/mocks/crosschain/bank.go index 90f4e17e29..7e6a3ae058 100644 --- a/testutil/keeper/mocks/crosschain/bank.go +++ b/testutil/keeper/mocks/crosschain/bank.go @@ -49,6 +49,26 @@ func (_m *CrosschainBankKeeper) MintCoins(ctx types.Context, moduleName string, return r0 } +// SpendableCoins provides a mock function with given fields: ctx, addr +func (_m *CrosschainBankKeeper) SpendableCoins(ctx types.Context, addr types.AccAddress) types.Coins { + ret := _m.Called(ctx, addr) + + if len(ret) == 0 { + panic("no return value specified for SpendableCoins") + } + + var r0 types.Coins + if rf, ok := ret.Get(0).(func(types.Context, types.AccAddress) types.Coins); ok { + r0 = rf(ctx, addr) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(types.Coins) + } + } + + return r0 +} + // NewCrosschainBankKeeper creates a new instance of CrosschainBankKeeper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewCrosschainBankKeeper(t interface { diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 25733e1fef..827b3e4d7a 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -217,6 +217,30 @@ func CrossChainTx(t *testing.T, index string) *types.CrossChainTx { } } +func RandomCCTX(r *rand.Rand) types.CrossChainTx { + index := StringRandom(r, 32) + status := &types.Status{ + Status: types.CctxStatus_PendingInbound, + StatusMessage: "", + ErrorMessage: "", + LastUpdateTimestamp: 0, + IsAbortRefunded: false, + CreatedTimestamp: 0, + } + + return types.CrossChainTx{ + Creator: AccAddress(), + Index: GetCctxIndexFromString(index), + ZetaFees: math.NewUint(uint64(r.Int63())), + RelayedMessage: StringRandom(r, 32), + CctxStatus: status, + InboundParams: InboundParams(r), + OutboundParams: []*types.OutboundParams{OutboundParams(r), OutboundParams(r)}, + ProtocolContractVersion: types.ProtocolContractVersion_V1, + RevertOptions: types.NewEmptyRevertOptions(), + } +} + // CustomCctxsInBlockRange create 1 cctx per block in block range [lowBlock, highBlock] (inclusive) func CustomCctxsInBlockRange( t *testing.T, diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go index 826e21eca5..4cbe2db629 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go @@ -20,7 +20,6 @@ func (k Keeper) ValidateInbound( if !tssFound { return nil, types.ErrCannotFindTSSKeys } - err := k.CheckIfTSSMigrationTransfer(ctx, msg) if err != nil { return nil, err diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx.go b/x/crosschain/keeper/msg_server_vote_inbound_tx.go index a34e75c026..5b4a471438 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx.go @@ -74,6 +74,7 @@ func (k msgServer) VoteInbound( msg.InboundHash, ) if err != nil { + //fmt.Println("Error in voting on inbound ballot", err) return nil, sdkerrors.Wrap(err, voteInboundID) } @@ -81,6 +82,7 @@ func (k msgServer) VoteInbound( // This may happen if the same inbound is observed twice where msg.Digest gives a different index // This check prevents double spending if isNew { + //fmt.Println("\nNew Ballot") if k.IsFinalizedInbound(tmpCtx, msg.InboundHash, msg.SenderChainId, msg.EventIndex) { return nil, sdkerrors.Wrapf( types.ErrObservedTxAlreadyFinalized, @@ -93,6 +95,10 @@ func (k msgServer) VoteInbound( } } commit() + + //if !finalized && !isNew { + // fmt.Println("\nNot Finalized Ballot") + //} // If the ballot is not finalized return nil here to add vote to commit state if !finalized { return &types.MsgVoteInboundResponse{}, nil @@ -102,9 +108,9 @@ func (k msgServer) VoteInbound( if err != nil { return nil, sdkerrors.Wrap(err, voteInboundID) } - // Save the inbound CCTX to the store. This is called irrespective of the status of the CCTX or the outcome of the process function. k.SaveObservedInboundInformation(ctx, cctx, msg.EventIndex) + //fmt.Println("Saved Inbound successfully :", cctx.Index) return &types.MsgVoteInboundResponse{}, nil } diff --git a/x/crosschain/module_simulation.go b/x/crosschain/module_simulation.go index 38ff067fbf..12bda63b6e 100644 --- a/x/crosschain/module_simulation.go +++ b/x/crosschain/module_simulation.go @@ -4,18 +4,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/zeta-chain/node/x/crosschain/simulation" "github.com/zeta-chain/node/x/crosschain/types" ) // GenerateGenesisState creates a randomized GenState of the module func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - accs := make([]string, len(simState.Accounts)) - for i, acc := range simState.Accounts { - accs[i] = acc.Address.String() - } - crosschainGenesis := types.GenesisState{} - simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&crosschainGenesis) + simulation.RandomizedGenState(simState) } // ProposalContents doesn't return any content functions for governance proposals @@ -28,11 +24,13 @@ func (AppModule) ProposalMsgs(_ module.SimulationState) []simtypes.WeightedPropo } // RegisterStoreDecoder registers a decoder -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} +func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { + sdr[types.StoreKey] = simulation.NewDecodeStore(am.cdc) +} // WeightedOperations returns the all the gov module operations with their respective weights. -func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { - operations := make([]simtypes.WeightedOperation, 0) - - return operations +func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { + return simulation.WeightedOperations( + simState.AppParams, simState.Cdc, am.keeper, + ) } diff --git a/x/crosschain/simulation/decoders.go b/x/crosschain/simulation/decoders.go index d75634a2ff..122d8e90ed 100644 --- a/x/crosschain/simulation/decoders.go +++ b/x/crosschain/simulation/decoders.go @@ -2,15 +2,59 @@ package simulation import ( "bytes" + "fmt" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/crosschain/types" ) -func NewDecodes(cdc codec.Codec) func(kvA, kvB kv.Pair) string { +func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { - case bytes.Equal(kvA.Key[:1], []byte{0x00}): + case bytes.Equal(kvA.Key, types.KeyPrefix(types.CCTXKey)): + var cctxA, cctxB types.CrossChainTx + cdc.MustUnmarshal(kvA.Value, &cctxA) + cdc.MustUnmarshal(kvB.Value, &cctxB) + return fmt.Sprintf("%v\n%v", cctxA, cctxB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.LastBlockHeightKey)): + var lastBlockHeightA, lastBlockHeightB types.LastBlockHeight + cdc.MustUnmarshal(kvA.Value, &lastBlockHeightA) + cdc.MustUnmarshal(kvB.Value, &lastBlockHeightB) + return fmt.Sprintf("%v\n%v", lastBlockHeightA, lastBlockHeightB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.FinalizedInboundsKey)): + var finalizedInboundsA, finalizedInboundsB []byte + finalizedInboundsA = kvA.Value + finalizedInboundsB = kvB.Value + return fmt.Sprintf("%v\n%v", finalizedInboundsA, finalizedInboundsB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.GasPriceKey)): + var gasPriceA, gasPriceB types.GasPrice + cdc.MustUnmarshal(kvA.Value, &gasPriceA) + cdc.MustUnmarshal(kvB.Value, &gasPriceB) + return fmt.Sprintf("%v\n%v", gasPriceA, gasPriceB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.OutboundTrackerKeyPrefix)): + var outboundTrackerA, outboundTrackerB types.OutboundTracker + cdc.MustUnmarshal(kvA.Value, &outboundTrackerA) + cdc.MustUnmarshal(kvB.Value, &outboundTrackerB) + return fmt.Sprintf("%v\n%v", outboundTrackerA, outboundTrackerB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.InboundTrackerKeyPrefix)): + var inboundTrackerA, inboundTrackerB types.InboundTracker + cdc.MustUnmarshal(kvA.Value, &inboundTrackerA) + cdc.MustUnmarshal(kvB.Value, &inboundTrackerB) + return fmt.Sprintf("%v\n%v", inboundTrackerA, inboundTrackerB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.ZetaAccountingKey)): + var zetaAccountingA, zetaAccountingB types.ZetaAccounting + cdc.MustUnmarshal(kvA.Value, &zetaAccountingA) + cdc.MustUnmarshal(kvB.Value, &zetaAccountingB) + return fmt.Sprintf("%v\n%v", zetaAccountingA, zetaAccountingB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.RateLimiterFlagsKey)): + var rateLimiterFlagsA, rateLimiterFlagsB types.RateLimiterFlags + cdc.MustUnmarshal(kvA.Value, &rateLimiterFlagsA) + cdc.MustUnmarshal(kvB.Value, &rateLimiterFlagsB) + return fmt.Sprintf("%v\n%v", rateLimiterFlagsA, rateLimiterFlagsB) + default: + panic(fmt.Sprintf("invalid crosschain key prefix %X", kvA.Key[:1])) + } } } diff --git a/x/crosschain/simulation/decoders_test.go b/x/crosschain/simulation/decoders_test.go new file mode 100644 index 0000000000..e95434c930 --- /dev/null +++ b/x/crosschain/simulation/decoders_test.go @@ -0,0 +1,59 @@ +package simulation_test + +import ( + "fmt" + "testing" + + "github.com/cosmos/cosmos-sdk/types/kv" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/simulation" + "github.com/zeta-chain/node/x/crosschain/types" +) + +func TestDecodeStore(t *testing.T) { + k, _, _, _ := keepertest.CrosschainKeeper(t) + cdc := k.GetCodec() + dec := simulation.NewDecodeStore(cdc) + cctx := sample.CrossChainTx(t, "sample") + lastBlockHeight := sample.LastBlockHeight(t, "sample") + gasPrice := sample.GasPrice(t, "sample") + outboundTracker := sample.OutboundTracker(t, "sample") + inboundTracker := sample.InboundTracker(t, "sample") + zetaAccounting := sample.ZetaAccounting(t, "sample") + rateLimiterFlags := sample.RateLimiterFlags() + + kvPairs := kv.Pairs{ + Pairs: []kv.Pair{ + {Key: types.KeyPrefix(types.CCTXKey), Value: cdc.MustMarshal(cctx)}, + {Key: types.KeyPrefix(types.LastBlockHeightKey), Value: cdc.MustMarshal(lastBlockHeight)}, + {Key: types.KeyPrefix(types.GasPriceKey), Value: cdc.MustMarshal(gasPrice)}, + {Key: types.KeyPrefix(types.OutboundTrackerKeyPrefix), Value: cdc.MustMarshal(&outboundTracker)}, + {Key: types.KeyPrefix(types.InboundTrackerKeyPrefix), Value: cdc.MustMarshal(&inboundTracker)}, + {Key: types.KeyPrefix(types.ZetaAccountingKey), Value: cdc.MustMarshal(&zetaAccounting)}, + {Key: types.KeyPrefix(types.RateLimiterFlagsKey), Value: cdc.MustMarshal(&rateLimiterFlags)}, + {Key: types.KeyPrefix(types.FinalizedInboundsKey), Value: []byte{1}}, + }, + } + + tests := []struct { + name string + expectedLog string + }{ + {"CrossChainTx", ""}, + {"LastBlockHeight", ""}, + {"GasPrice", ""}, + {"OutboundTracker", ""}, + {"InboundTracker", ""}, + {"ZetaAccounting", ""}, + {"RateLimiterFlags", ""}, + {"FinalizedInbounds", ""}, + } + + for i, tt := range tests { + i, tt := i, tt + t.Run(tt.name, func(t *testing.T) { + fmt.Println(dec(kvPairs.Pairs[i], kvPairs.Pairs[i])) + }) + } +} diff --git a/x/crosschain/simulation/genesis.go b/x/crosschain/simulation/genesis.go new file mode 100644 index 0000000000..3dd6d87572 --- /dev/null +++ b/x/crosschain/simulation/genesis.go @@ -0,0 +1,11 @@ +package simulation + +import ( + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/crosschain/types" +) + +func RandomizedGenState(simState *module.SimulationState) { + crosschainGenesis := types.DefaultGenesis() + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(crosschainGenesis) +} diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go new file mode 100644 index 0000000000..48a8155bf0 --- /dev/null +++ b/x/crosschain/simulation/operations.go @@ -0,0 +1,425 @@ +package simulation + +import ( + "fmt" + "math" + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" +) + +const ( + DefaultWeightMsgAddOutboundTracker = 50 + DefaultWeightAddInboundTracker = 50 + DefaultWeightRemoveOutboundTracker = 5 + DefaultWeightVoteGasPrice = 100 + DefaultWeightVoteOutbound = 50 + DefaultWeightVoteInbound = 10 + DefaultWeightWhitelistERC20 = 1 + DefaultWeightMigrateTssFunds = 1 + DefaultWeightUpdateTssAddress = 1 + DefaultWeightAbortStuckCCTX = 10 + DefaultWeightUpdateRateLimiterFlags = 1 + + OpWeightMsgAddOutboundTracker = "op_weight_msg_add_outbound_tracker" + OpWeightAddInboundTracker = "op_weight_msg_add_inbound_tracker" + OpWeightRemoveOutboundTracker = "op_weight_msg_remove_outbound_tracker" + OpWeightVoteGasPrice = "op_weight_msg_vote_gas_price" + OpWeightVoteOutbound = "op_weight_msg_vote_outbound" + OpWeightVoteInbound = "op_weight_msg_vote_inbound" + OpWeightWhitelistERC20 = "op_weight_msg_whitelist_erc20" + OpWeightMigrateTssFunds = "op_weight_msg_migrate_tss_funds" + OpWeightUpdateTssAddress = "op_weight_msg_update_tss_address" + OpWeightAbortStuckCCTX = "op_weight_msg_abort_stuck_cctx" + OpWeightUpdateRateLimiterFlags = "op_weight_msg_update_rate_limiter_flags" +) + +func WeightedOperations( + appParams simtypes.AppParams, cdc codec.JSONCodec, k keeper.Keeper) simulation.WeightedOperations { + var ( + weightMsgAddOutboundTracker int + weightAddInboundTracker int + weightRemoveOutboundTracker int + weightVoteGasPrice int + weightVoteOutbound int + weightVoteInbound int + weightWhitelistERC20 int + weightMigrateTssFunds int + weightUpdateTssAddress int + weightAbortStuckCCTX int + weightUpdateRateLimiterFlags int + ) + + appParams.GetOrGenerate(cdc, OpWeightMsgAddOutboundTracker, &weightMsgAddOutboundTracker, nil, + func(_ *rand.Rand) { + weightMsgAddOutboundTracker = DefaultWeightMsgAddOutboundTracker + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightAddInboundTracker, &weightAddInboundTracker, nil, + func(_ *rand.Rand) { + weightAddInboundTracker = DefaultWeightAddInboundTracker + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightRemoveOutboundTracker, &weightRemoveOutboundTracker, nil, + func(_ *rand.Rand) { + weightRemoveOutboundTracker = DefaultWeightRemoveOutboundTracker + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightVoteGasPrice, &weightVoteGasPrice, nil, + func(_ *rand.Rand) { + weightVoteGasPrice = DefaultWeightVoteGasPrice + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightVoteOutbound, &weightVoteOutbound, nil, + func(_ *rand.Rand) { + weightVoteOutbound = DefaultWeightVoteOutbound + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightVoteInbound, &weightVoteInbound, nil, + func(_ *rand.Rand) { + weightVoteInbound = DefaultWeightVoteInbound + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightWhitelistERC20, &weightWhitelistERC20, nil, + func(_ *rand.Rand) { + weightWhitelistERC20 = DefaultWeightWhitelistERC20 + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightMigrateTssFunds, &weightMigrateTssFunds, nil, + func(_ *rand.Rand) { + weightMigrateTssFunds = DefaultWeightMigrateTssFunds + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightUpdateTssAddress, &weightUpdateTssAddress, nil, + func(_ *rand.Rand) { + weightUpdateTssAddress = DefaultWeightUpdateTssAddress + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightAbortStuckCCTX, &weightAbortStuckCCTX, nil, + func(_ *rand.Rand) { + weightAbortStuckCCTX = DefaultWeightAbortStuckCCTX + }, + ) + + appParams.GetOrGenerate(cdc, OpWeightUpdateRateLimiterFlags, &weightUpdateRateLimiterFlags, nil, + func(_ *rand.Rand) { + weightUpdateRateLimiterFlags = DefaultWeightUpdateRateLimiterFlags + }, + ) + + return simulation.WeightedOperations{ + //simulation.NewWeightedOperation( + // weightVoteGasPrice, + // SimulateMsgVoteGasPrice(k), + //), + simulation.NewWeightedOperation( + weightVoteInbound, + SimulateVoteInbound(k), + ), + } +} + +func operationSimulateVoteInbound(k keeper.Keeper, msg types.MsgVoteInbound, simAccount simtypes.Account) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + + account := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) + spendable := k.GetBankKeeper().SpendableCoins(ctx, account.GetAddress()) + + txCtx := simulation.OperationInput{ + R: r, + App: app, + TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + Cdc: nil, + Msg: &msg, + MsgType: msg.Type(), + Context: ctx, + SimAccount: simAccount, + AccountKeeper: k.GetAuthKeeper(), + Bankkeeper: k.GetBankKeeper(), + ModuleName: types.ModuleName, + CoinsSpentInMsg: spendable, + } + + return GenAndDeliverTxWithRandFees(txCtx) + } +} + +func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { + // The states are: + // column 1: All observers vote + // column 2: 90% vote + // column 3: 75% vote + // column 4: 40% vote + // column 5: 15% vote + // column 6: noone votes + // All columns sum to 100 for simplicity, but this is arbitrary and + // feel free to change. + numVotesTransitionMatrix, _ := simulation.CreateTransitionMatrix([][]int{ + {20, 10, 0, 0, 0, 0}, + {55, 50, 20, 10, 0, 0}, + {25, 25, 30, 25, 30, 15}, + {0, 15, 30, 25, 30, 30}, + {0, 0, 20, 30, 30, 30}, + {0, 0, 0, 10, 10, 25}, + }) + + statePercentageArray := []float64{1, .9, .75, .4, .15, 0} + curNumVotesState := 1 + + return func( + r *rand.Rand, + app *baseapp.BaseApp, + ctx sdk.Context, + accs []simtypes.Account, + chainID string, + ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + + //var ( + // randomChainSender = GetRandomChainID(r, supportedChains) + // randomChainReceiver = GetRandomChainID(r, supportedChains) + // sender = sample.EthAddress() + // receiver = sample.EthAddress() + // amount = r.Uint64() + // coinType = coin.CoinType_Gas + // hash = sample.Hash().String() + // gasLimit = r.Uint64() + //) + // TODO : randomize these values + to, from := int64(101), int64(101) + msg := sample.InboundVote(0, from, to) + + simAccount, firstVoter, err := GetRandomAccountAndObserver(r, ctx, k, accs) + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, authz.InboundVoter.String(), "unable to get random account and observer"), nil, nil + } + + txGen := moduletestutil.MakeTestEncodingConfig().TxConfig + account := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) + firstMsg := msg + firstMsg.Creator = firstVoter + + tx, err := simtestutil.GenSignedMockTx( + r, + txGen, + []sdk.Msg{&firstMsg}, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)}, + simtestutil.DefaultGenTxGas, + chainID, + []uint64{account.GetAccountNumber()}, + []uint64{account.GetSequence()}, + simAccount.PrivKey, + ) + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to generate mock tx"), nil, err + } + + // We can return error here as we we can guarantee that the first vote will be successful. Since we query the observer set before adding votes + _, _, err = app.SimDeliver(txGen.TxEncoder(), tx) + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to deliver tx"), nil, err + } + + opMsg := simtypes.NewOperationMsg(&msg, true, "", nil) + + // Add subsequent votes + observerSet, found := k.GetObserverKeeper().GetObserverSet(ctx) + if !found { + return simtypes.NoOpMsg(types.ModuleName, authz.InboundVoter.String(), "observer set not found"), nil, nil + } + + // 1) Schedule operations for votes + // 1.1) first pick a number of people to vote. + curNumVotesState = numVotesTransitionMatrix.NextState(r, curNumVotesState) + numVotes := int(math.Ceil(float64(len(observerSet.ObserverList)) * statePercentageArray[curNumVotesState])) + + // 1.2) select who votes and when + whoVotes := r.Perm(len(observerSet.ObserverList)) + // didntVote := whoVotes[numVotes:] + whoVotes = whoVotes[:numVotes] + //ballotMaturityPeriod := 20 + var fops []simtypes.FutureOperation + + //fmt.Printf("\nScheduling %d votes for ballot : %s at height : %d", numVotes, msg.Digest(), ctx.BlockHeight()+1) + //if numVotes > 3 { + // fmt.Printf("More than 3 votes : %s", msg.Digest()) + //} + for _, observerIdx := range whoVotes { + observerAddress := observerSet.ObserverList[observerIdx] + if observerAddress == firstVoter { + continue + } + observerAccount, err := GetObserverAccount(observerAddress, accs) + if err != nil { + panic(err) + } + // 1.3) schedule the vote + votingMsg := msg + votingMsg.Creator = observerAddress + fops = append(fops, simtypes.FutureOperation{ + BlockHeight: int(ctx.BlockHeight() + 1), + Op: operationSimulateVoteInbound(k, votingMsg, observerAccount), + }) + } + //fmt.Println("\nActual votes : ", len(fops)) + + return opMsg, fops, nil + } +} + +func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + + simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "unable to get random account and observer"), nil, err + } + + supportedChains := k.GetObserverKeeper().GetSupportedChains(ctx) + if len(supportedChains) == 0 { + return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "no supported chains found"), nil, nil + } + randomChainID := GetRandomChainID(r, supportedChains) + + msg := types.MsgVoteGasPrice{ + Creator: randomObserver, + ChainId: randomChainID, + Price: r.Uint64(), + PriorityFee: r.Uint64(), + BlockNumber: r.Uint64(), + Supply: fmt.Sprintf("%d", r.Int63()), + } + + txCtx := simulation.OperationInput{ + R: r, + App: app, + TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + Cdc: nil, + Msg: &msg, + MsgType: msg.Type(), + Context: ctx, + SimAccount: simAccount, + AccountKeeper: k.GetAuthKeeper(), + Bankkeeper: k.GetBankKeeper(), + ModuleName: types.ModuleName, + } + + return simulation.GenAndDeliverTxWithRandFees(txCtx) + } +} + +func GetRandomObserver(r *rand.Rand, observerList []string) string { + idx := r.Intn(len(observerList)) + return observerList[idx] +} + +func GetRandomChainID(r *rand.Rand, chains []chains.Chain) int64 { + idx := r.Intn(len(chains)) + return chains[idx].ChainId +} + +func GetRandomAccountAndObserver(r *rand.Rand, ctx sdk.Context, k keeper.Keeper, accounts []simtypes.Account) (simtypes.Account, string, error) { + observers, found := k.GetObserverKeeper().GetObserverSet(ctx) + if !found { + return simtypes.Account{}, "", fmt.Errorf("observer set not found") + } + + if len(observers.ObserverList) == 0 { + return simtypes.Account{}, "", fmt.Errorf("no observers present in observer set found") + } + + randomObserver := GetRandomObserver(r, observers.ObserverList) + + // TODO : use GetObserverAccount + operatorAddress, err := observerTypes.GetOperatorAddressFromAccAddress(randomObserver) + if err != nil { + return simtypes.Account{}, "", fmt.Errorf("validator not found for observer ") + } + + simAccount, found := simtypes.FindAccount(accounts, operatorAddress) + if !found { + return simtypes.Account{}, "", fmt.Errorf("operator account not found") + } + return simAccount, randomObserver, nil +} + +func GetObserverAccount(observerAddress string, accounts []simtypes.Account) (simtypes.Account, error) { + operatorAddress, err := observerTypes.GetOperatorAddressFromAccAddress(observerAddress) + if err != nil { + return simtypes.Account{}, fmt.Errorf("validator not found for observer ") + } + + simAccount, found := simtypes.FindAccount(accounts, operatorAddress) + if !found { + return simtypes.Account{}, fmt.Errorf("operator account not found") + } + return simAccount, nil +} + +// GenAndDeliverTxWithRandFees generates a transaction with a random fee and delivers it. +func GenAndDeliverTxWithRandFees(txCtx simulation.OperationInput) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address) + spendable := txCtx.Bankkeeper.SpendableCoins(txCtx.Context, account.GetAddress()) + + var fees sdk.Coins + var err error + + coins, hasNeg := spendable.SafeSub(txCtx.CoinsSpentInMsg...) + if hasNeg { + return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "message doesn't leave room for fees"), nil, err + } + + fees, err = simtypes.RandomFees(txCtx.R, txCtx.Context, coins) + if err != nil { + return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to generate fees"), nil, err + } + return GenAndDeliverTx(txCtx, fees) +} + +// GenAndDeliverTx generates a transactions and delivers it. +func GenAndDeliverTx(txCtx simulation.OperationInput, fees sdk.Coins) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { + account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address) + tx, err := simtestutil.GenSignedMockTx( + txCtx.R, + txCtx.TxGen, + []sdk.Msg{txCtx.Msg}, + fees, + simtestutil.DefaultGenTxGas, + txCtx.Context.ChainID(), + []uint64{account.GetAccountNumber()}, + []uint64{account.GetSequence()}, + txCtx.SimAccount.PrivKey, + ) + if err != nil { + return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to generate mock tx"), nil, err + } + + _, _, err = txCtx.App.SimDeliver(txCtx.TxGen.TxEncoder(), tx) + if err != nil { + return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to deliver tx"), nil, nil + } + + return simtypes.NewOperationMsg(txCtx.Msg, true, "", txCtx.Cdc), nil, nil +} diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go index 0f496c13d3..2fee9cb31a 100644 --- a/x/crosschain/types/expected_keepers.go +++ b/x/crosschain/types/expected_keepers.go @@ -24,12 +24,14 @@ type StakingKeeper interface { // AccountKeeper defines the expected account keeper (noalias) type AccountKeeper interface { GetModuleAccount(ctx sdk.Context, name string) types.ModuleAccountI + GetAccount(ctx sdk.Context, addr sdk.AccAddress) types.AccountI } // BankKeeper defines the expected interface needed to retrieve account balances. type BankKeeper interface { BurnCoins(ctx sdk.Context, name string, amt sdk.Coins) error MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins } type ObserverKeeper interface { diff --git a/x/observer/abci.go b/x/observer/abci.go index 3f56252329..6d3315134f 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -33,7 +33,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { } // #nosec G115 always in range - k.DisableInboundOnly(ctx) + //k.DisableInboundOnly(ctx) k.SetKeygen(ctx, types.Keygen{BlockNumber: math.MaxInt64}) // #nosec G115 always positive k.SetLastObserverCount( diff --git a/x/observer/keeper/msg_server_disable_cctx_flags.go b/x/observer/keeper/msg_server_disable_cctx_flags.go index bd5a0a9f17..70a77849cb 100644 --- a/x/observer/keeper/msg_server_disable_cctx_flags.go +++ b/x/observer/keeper/msg_server_disable_cctx_flags.go @@ -37,7 +37,6 @@ func (k msgServer) DisableCCTX( if msg.DisableOutbound { flags.IsOutboundEnabled = false } - k.SetCrosschainFlags(ctx, flags) err = ctx.EventManager().EmitTypedEvents(&types.EventCCTXDisabled{ diff --git a/x/observer/module_simulation.go b/x/observer/module_simulation.go index 555532c090..c9f1dbf069 100644 --- a/x/observer/module_simulation.go +++ b/x/observer/module_simulation.go @@ -6,8 +6,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - - "github.com/zeta-chain/node/x/observer/types" ) const ( @@ -18,12 +16,14 @@ const ( // GenerateGenesisState creates a randomized GenState of the module func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - accs := make([]string, len(simState.Accounts)) - for i, acc := range simState.Accounts { - accs[i] = acc.Address.String() - } - observerGenesis := types.GenesisState{} - simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&observerGenesis) + //observers := make([]string, len(simState.Accounts)) + //for _, account := range simState.Accounts { + // observers = append(observers, account.Address.String()) + //} + //observerGenesis := types.DefaultGenesis() + //observerGenesis.Observers = types.ObserverSet{ObserverList: observers} + //simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(observerGenesis) + } // ProposalContents doesn't return any content functions for governance proposals diff --git a/x/observer/simulation/simap.go b/x/observer/simulation/simap.go deleted file mode 100644 index 92c437c0d1..0000000000 --- a/x/observer/simulation/simap.go +++ /dev/null @@ -1,15 +0,0 @@ -package simulation - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" -) - -// FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) - if err != nil { - panic(err) - } - return simtypes.FindAccount(accs, creator) -} From 422d03b4d22d0cd566c9a0500d3df63a496267b9 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 31 Oct 2024 10:49:24 -0400 Subject: [PATCH 03/18] add oeprations --- Makefile | 2 +- tests/simulation/sim/sim_state.go | 14 ++++++++- x/crosschain/simulation/genesis.go | 2 ++ x/crosschain/simulation/operations.go | 42 +++++++++++++++------------ 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 556b68350c..591785d8ed 100644 --- a/Makefile +++ b/Makefile @@ -390,7 +390,7 @@ test-sim-nondeterminism: $(call run-sim-test,"non-determinism test",TestAppStateDeterminism,100,200,2h) test-sim-fullappsimulation: - $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,10,200,2h) + $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,10,50,2h) test-sim-multi-seed-long: runsim @echo "Running long multi-seed application simulation." diff --git a/tests/simulation/sim/sim_state.go b/tests/simulation/sim/sim_state.go index 38bb893bb5..a66ee75df4 100644 --- a/tests/simulation/sim/sim_state.go +++ b/tests/simulation/sim/sim_state.go @@ -176,7 +176,19 @@ func AppStateFn( } observers = append(observers, accAddress.String()) } - observers = observers[:5] + + // Shuffle the observers list + r.Shuffle(len(observers), func(i, j int) { + observers[i], observers[j] = observers[j], observers[i] + }) + + numObservers := r.Intn(11) + 5 + if numObservers > len(observers) { + numObservers = len(observers) + } + observers = observers[:numObservers] + + fmt.Println("Added random observers: ", len(observers)) // update the observer genesis state observerStateBz, ok := rawState[observertypes.ModuleName] diff --git a/x/crosschain/simulation/genesis.go b/x/crosschain/simulation/genesis.go index 3dd6d87572..ccb49be702 100644 --- a/x/crosschain/simulation/genesis.go +++ b/x/crosschain/simulation/genesis.go @@ -6,6 +6,8 @@ import ( ) func RandomizedGenState(simState *module.SimulationState) { + // We do not have any params that we need to randomize for this module + // The default state is empty which is sufficient for now , this can be modified later weh we add operations that need existing state data to be processed crosschainGenesis := types.DefaultGenesis() simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(crosschainGenesis) } diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index 48a8155bf0..4e2275a7cf 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -129,10 +129,10 @@ func WeightedOperations( ) return simulation.WeightedOperations{ - //simulation.NewWeightedOperation( - // weightVoteGasPrice, - // SimulateMsgVoteGasPrice(k), - //), + simulation.NewWeightedOperation( + weightVoteGasPrice, + SimulateMsgVoteGasPrice(k), + ), simulation.NewWeightedOperation( weightVoteInbound, SimulateVoteInbound(k), @@ -140,13 +140,16 @@ func WeightedOperations( } } +// operationSimulateVoteInbound generates a MsgVoteInbound with a random vote and delivers it. func operationSimulateVoteInbound(k keeper.Keeper, msg types.MsgVoteInbound, simAccount simtypes.Account) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - account := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) - spendable := k.GetBankKeeper().SpendableCoins(ctx, account.GetAddress()) + // Fetch the account from the auth keeper which can then be used to fetch spendable coins + authAccount := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) + spendable := k.GetBankKeeper().SpendableCoins(ctx, authAccount.GetAddress()) + // Generate a transaction with a random fee and deliver it txCtx := simulation.OperationInput{ R: r, App: app, @@ -175,7 +178,6 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // column 5: 15% vote // column 6: noone votes // All columns sum to 100 for simplicity, but this is arbitrary and - // feel free to change. numVotesTransitionMatrix, _ := simulation.CreateTransitionMatrix([][]int{ {20, 10, 0, 0, 0, 0}, {55, 50, 20, 10, 0, 0}, @@ -282,7 +284,6 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { Op: operationSimulateVoteInbound(k, votingMsg, observerAccount), }) } - //fmt.Println("\nActual votes : ", len(fops)) return opMsg, fops, nil } @@ -296,6 +297,8 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { if err != nil { return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "unable to get random account and observer"), nil, err } + authAccount := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) + spendable := k.GetBankKeeper().SpendableCoins(ctx, authAccount.GetAddress()) supportedChains := k.GetObserverKeeper().GetSupportedChains(ctx) if len(supportedChains) == 0 { @@ -313,17 +316,18 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { } txCtx := simulation.OperationInput{ - R: r, - App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, - Cdc: nil, - Msg: &msg, - MsgType: msg.Type(), - Context: ctx, - SimAccount: simAccount, - AccountKeeper: k.GetAuthKeeper(), - Bankkeeper: k.GetBankKeeper(), - ModuleName: types.ModuleName, + R: r, + App: app, + TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + Cdc: nil, + Msg: &msg, + MsgType: msg.Type(), + Context: ctx, + SimAccount: simAccount, + AccountKeeper: k.GetAuthKeeper(), + Bankkeeper: k.GetBankKeeper(), + ModuleName: types.ModuleName, + CoinsSpentInMsg: spendable, } return simulation.GenAndDeliverTxWithRandFees(txCtx) From 39d9863b148f4e76b5c9ea06d66eb8dd9b9a6f46 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 31 Oct 2024 18:46:14 -0400 Subject: [PATCH 04/18] add fungible deploy contracts --- app/modules.go | 2 + tests/simulation/sim/sim_state.go | 34 ++++++++++- x/authority/module_simulation.go | 53 +++++++++++++++++ x/crosschain/simulation/operations.go | 4 +- x/fungible/keeper/keeper.go | 8 ++- x/fungible/module.go | 4 +- x/fungible/module_simulation.go | 21 +++---- x/fungible/simulation/decoders.go | 29 +++++++++ x/fungible/simulation/genesis.go | 13 ++++ x/fungible/simulation/operations.go | 85 +++++++++++++++++++++++++++ x/fungible/simulation/simap.go | 15 ----- x/fungible/types/expected_keepers.go | 3 + 12 files changed, 235 insertions(+), 36 deletions(-) create mode 100644 x/authority/module_simulation.go create mode 100644 x/fungible/simulation/decoders.go create mode 100644 x/fungible/simulation/genesis.go create mode 100644 x/fungible/simulation/operations.go delete mode 100644 x/fungible/simulation/simap.go diff --git a/app/modules.go b/app/modules.go index 71e8ab5b4c..5ca7d49a00 100644 --- a/app/modules.go +++ b/app/modules.go @@ -178,7 +178,9 @@ func simulationModules( evm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + authoritymodule.NewAppModule(appCodec, app.AuthorityKeeper), crosschainmodule.NewAppModule(appCodec, app.CrosschainKeeper), observermodule.NewAppModule(appCodec, *app.ObserverKeeper), + fungiblemodule.NewAppModule(appCodec, app.FungibleKeeper), } } diff --git a/tests/simulation/sim/sim_state.go b/tests/simulation/sim/sim_state.go index a66ee75df4..3a5e044ea4 100644 --- a/tests/simulation/sim/sim_state.go +++ b/tests/simulation/sim/sim_state.go @@ -20,10 +20,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + zetaapp "github.com/zeta-chain/node/app" "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" observertypes "github.com/zeta-chain/node/x/observer/types" - - zetaapp "github.com/zeta-chain/node/app" ) // Simulation parameter constants @@ -187,7 +187,6 @@ func AppStateFn( numObservers = len(observers) } observers = observers[:numObservers] - fmt.Println("Added random observers: ", len(observers)) // update the observer genesis state @@ -203,11 +202,40 @@ func AppStateFn( tss := sample.Tss() observerState.Tss = &tss + authorityStateBz, ok := rawState[authoritytypes.ModuleName] + if !ok { + panic("authority genesis state is missing") + } + authorityState := new(authoritytypes.GenesisState) + cdc.MustUnmarshalJSON(authorityStateBz, authorityState) + randomAccount := accs[r.Intn(len(accs))] + + fmt.Println("Adding random account to all policies: ", randomAccount.Address.String()) + + policies := authoritytypes.Policies{ + Items: []*authoritytypes.Policy{ + { + Address: randomAccount.Address.String(), + PolicyType: authoritytypes.PolicyType_groupEmergency, + }, + { + Address: randomAccount.Address.String(), + PolicyType: authoritytypes.PolicyType_groupAdmin, + }, + { + Address: randomAccount.Address.String(), + PolicyType: authoritytypes.PolicyType_groupOperational, + }, + }, + } + authorityState.Policies = policies + // change appState back rawState[evmtypes.ModuleName] = cdc.MustMarshalJSON(evmState) rawState[stakingtypes.ModuleName] = cdc.MustMarshalJSON(stakingState) rawState[banktypes.ModuleName] = cdc.MustMarshalJSON(bankState) rawState[observertypes.ModuleName] = cdc.MustMarshalJSON(observerState) + rawState[authoritytypes.ModuleName] = cdc.MustMarshalJSON(authorityState) // replace appstate appState, err = json.Marshal(rawState) diff --git a/x/authority/module_simulation.go b/x/authority/module_simulation.go new file mode 100644 index 0000000000..7c39d378bf --- /dev/null +++ b/x/authority/module_simulation.go @@ -0,0 +1,53 @@ +package authority + +import ( + "math/rand" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" +) + +const ( + // #nosec G101 not a hardcoded credential + opWeightMsgUpdateClientParams = "op_weight_msg_update_client_params" + defaultWeightMsgUpdateClientParams int = 100 +) + +// GenerateGenesisState creates a randomized GenState of the module +func (AppModule) GenerateGenesisState(simState *module.SimulationState) { + //observers := make([]string, len(simState.Accounts)) + //for _, account := range simState.Accounts { + // observers = append(observers, account.Address.String()) + //} + //observerGenesis := types.DefaultGenesis() + //observerGenesis.Observers = types.ObserverSet{ObserverList: observers} + //simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(observerGenesis) + +} + +// ProposalContents doesn't return any content functions for governance proposals +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { + return nil +} + +func (AppModule) ProposalMsgs(_ module.SimulationState) []simtypes.WeightedProposalMsg { + return nil +} + +// RegisterStoreDecoder registers a decoder +func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} + +// WeightedOperations returns the all the gov module operations with their respective weights. +func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { + operations := make([]simtypes.WeightedOperation, 0) + + var weightMsgUpdateClientParams int + simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgUpdateClientParams, &weightMsgUpdateClientParams, nil, + func(_ *rand.Rand) { + weightMsgUpdateClientParams = defaultWeightMsgUpdateClientParams + }, + ) + + return operations +} diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index 4e2275a7cf..b790ff89af 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -26,7 +26,7 @@ const ( DefaultWeightRemoveOutboundTracker = 5 DefaultWeightVoteGasPrice = 100 DefaultWeightVoteOutbound = 50 - DefaultWeightVoteInbound = 10 + DefaultWeightVoteInbound = 100 DefaultWeightWhitelistERC20 = 1 DefaultWeightMigrateTssFunds = 1 DefaultWeightUpdateTssAddress = 1 @@ -330,7 +330,7 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { CoinsSpentInMsg: spendable, } - return simulation.GenAndDeliverTxWithRandFees(txCtx) + return GenAndDeliverTxWithRandFees(txCtx) } } diff --git a/x/fungible/keeper/keeper.go b/x/fungible/keeper/keeper.go index ce1e9d5fdc..6e4af7f194 100644 --- a/x/fungible/keeper/keeper.go +++ b/x/fungible/keeper/keeper.go @@ -13,7 +13,7 @@ import ( type ( Keeper struct { - cdc codec.BinaryCodec + cdc codec.Codec storeKey storetypes.StoreKey memKey storetypes.StoreKey authKeeper types.AccountKeeper @@ -25,7 +25,7 @@ type ( ) func NewKeeper( - cdc codec.BinaryCodec, + cdc codec.Codec, storeKey, memKey storetypes.StoreKey, authKeeper types.AccountKeeper, @@ -54,6 +54,10 @@ func (k Keeper) GetAuthKeeper() types.AccountKeeper { return k.authKeeper } +func (k Keeper) GetCodec() codec.Codec { + return k.cdc +} + func (k Keeper) GetEVMKeeper() types.EVMKeeper { return k.evmKeeper } diff --git a/x/fungible/module.go b/x/fungible/module.go index fcec27c9d4..8e87fdbd43 100644 --- a/x/fungible/module.go +++ b/x/fungible/module.go @@ -31,10 +31,10 @@ var ( // AppModuleBasic implements the AppModuleBasic interface for the fungible module. type AppModuleBasic struct { - cdc codec.BinaryCodec + cdc codec.Codec } -func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { +func NewAppModuleBasic(cdc codec.Codec) AppModuleBasic { return AppModuleBasic{cdc: cdc} } diff --git a/x/fungible/module_simulation.go b/x/fungible/module_simulation.go index e502102502..41b9df9831 100644 --- a/x/fungible/module_simulation.go +++ b/x/fungible/module_simulation.go @@ -4,18 +4,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - + "github.com/zeta-chain/node/x/fungible/simulation" "github.com/zeta-chain/node/x/fungible/types" ) // GenerateGenesisState creates a randomized GenState of the module func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - accs := make([]string, len(simState.Accounts)) - for i, acc := range simState.Accounts { - accs[i] = acc.Address.String() - } - fungibleGenesis := types.GenesisState{} - simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&fungibleGenesis) + simulation.RandomizedGenState(simState) } // ProposalContents doesn't return any content functions for governance proposals @@ -28,11 +23,13 @@ func (AppModule) ProposalMsgs(_ module.SimulationState) []simtypes.WeightedPropo } // RegisterStoreDecoder registers a decoder -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} +func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { + sdr[types.StoreKey] = simulation.NewDecodeStore(am.cdc) +} // WeightedOperations returns the all the gov module operations with their respective weights. -func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { - operations := make([]simtypes.WeightedOperation, 0) - - return operations +func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { + return simulation.WeightedOperations( + simState.AppParams, simState.Cdc, am.keeper, + ) } diff --git a/x/fungible/simulation/decoders.go b/x/fungible/simulation/decoders.go new file mode 100644 index 0000000000..37dd35e5d4 --- /dev/null +++ b/x/fungible/simulation/decoders.go @@ -0,0 +1,29 @@ +package simulation + +import ( + "bytes" + "fmt" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/fungible/types" +) + +func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { + return func(kvA, kvB kv.Pair) string { + switch { + case bytes.Equal(kvA.Key, types.KeyPrefix(types.SystemContractKey)): + var systemContractA, systemContractB types.SystemContract + cdc.MustUnmarshal(kvA.Value, &systemContractA) + cdc.MustUnmarshal(kvB.Value, &systemContractB) + return fmt.Sprintf("%v\n%v", systemContractA, systemContractB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.ForeignCoinsKeyPrefix)): + var foreignCoinsA, foreignCoinsB types.ForeignCoins + cdc.MustUnmarshal(kvA.Value, &foreignCoinsA) + cdc.MustUnmarshal(kvB.Value, &foreignCoinsB) + return fmt.Sprintf("%v\n%v", foreignCoinsA, foreignCoinsB) + default: + panic(fmt.Sprintf("invalid funcgible key prefix %X", kvA.Key[:1])) + } + } +} diff --git a/x/fungible/simulation/genesis.go b/x/fungible/simulation/genesis.go new file mode 100644 index 0000000000..b67fa87137 --- /dev/null +++ b/x/fungible/simulation/genesis.go @@ -0,0 +1,13 @@ +package simulation + +import ( + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/fungible/types" +) + +func RandomizedGenState(simState *module.SimulationState) { + // We do not have any params that we need to randomize for this module + // The default state is empty which is sufficient for now , this can be modified later weh we add operations that need existing state data to be processed + fungibleGenesis := types.DefaultGenesis() + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(fungibleGenesis) +} diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go new file mode 100644 index 0000000000..f65128657e --- /dev/null +++ b/x/fungible/simulation/operations.go @@ -0,0 +1,85 @@ +package simulation + +import ( + "fmt" + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" +) + +const ( + OpWeightMsgDeploySystemContracts = "op_weight_msg_deploy_system_contracts" + DefaultWeightMsgDeploySystemContracts = 100 +) + +var ( + RunOnce = false +) + +func WeightedOperations( + appParams simtypes.AppParams, cdc codec.JSONCodec, k keeper.Keeper) simulation.WeightedOperations { + var weightMsgDeploySystemContracts int + + appParams.GetOrGenerate(cdc, OpWeightMsgDeploySystemContracts, &weightMsgDeploySystemContracts, nil, + func(r *rand.Rand) { + weightMsgDeploySystemContracts = DefaultWeightMsgDeploySystemContracts + }) + + return simulation.WeightedOperations{ + simulation.NewWeightedOperation( + weightMsgDeploySystemContracts, + SimulateMsgDeploySystemContracts(k), + ), + } +} + +func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + if RunOnce { + return simtypes.OperationMsg{}, nil, nil + } + + policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) + if !found { + fmt.Println("Policies not found") + } + + admin := policies.Items[0].Address + address, err := observerTypes.GetOperatorAddressFromAccAddress(admin) + if err != nil { + panic(err) + } + simAccount, found := simtypes.FindAccount(accounts, address) + if !found { + panic("admin account not found") + } + + msg := types.MsgDeploySystemContracts{Creator: admin} + + txCtx := simulation.OperationInput{ + R: r, + App: app, + TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + Cdc: nil, + Msg: &msg, + MsgType: msg.Type(), + Context: ctx, + SimAccount: simAccount, + AccountKeeper: k.GetAuthKeeper(), + Bankkeeper: k.GetBankKeeper(), + ModuleName: types.ModuleName, + } + + RunOnce = true + return simulation.GenAndDeliverTxWithRandFees(txCtx) + } +} diff --git a/x/fungible/simulation/simap.go b/x/fungible/simulation/simap.go deleted file mode 100644 index 92c437c0d1..0000000000 --- a/x/fungible/simulation/simap.go +++ /dev/null @@ -1,15 +0,0 @@ -package simulation - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" -) - -// FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) - if err != nil { - panic(err) - } - return simtypes.FindAccount(accs, creator) -} diff --git a/x/fungible/types/expected_keepers.go b/x/fungible/types/expected_keepers.go index c8dc02f013..fe8edf21ce 100644 --- a/x/fungible/types/expected_keepers.go +++ b/x/fungible/types/expected_keepers.go @@ -11,6 +11,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/zeta-chain/ethermint/x/evm/statedb" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" "github.com/zeta-chain/node/pkg/chains" ) @@ -33,6 +34,7 @@ type BankKeeper interface { amt sdk.Coins, ) error MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins } type ObserverKeeper interface { @@ -61,4 +63,5 @@ type EVMKeeper interface { type AuthorityKeeper interface { CheckAuthorization(ctx sdk.Context, msg sdk.Msg) error GetAdditionalChainList(ctx sdk.Context) (list []chains.Chain) + GetPolicies(ctx sdk.Context) (val authoritytypes.Policies, found bool) } From 84d20898bbc0496f32c3cd9dd3ea65ffe358905d Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 31 Oct 2024 20:19:58 -0400 Subject: [PATCH 05/18] add fungible deploy contracts --- x/fungible/simulation/operations.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index f65128657e..c11fc9bdc2 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -21,7 +21,7 @@ const ( ) var ( - RunOnce = false + DeployedSystemContracts = false ) func WeightedOperations( @@ -44,7 +44,7 @@ func WeightedOperations( func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - if RunOnce { + if DeployedSystemContracts { return simtypes.OperationMsg{}, nil, nil } @@ -79,7 +79,7 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { ModuleName: types.ModuleName, } - RunOnce = true + DeployedSystemContracts = true return simulation.GenAndDeliverTxWithRandFees(txCtx) } } From 5d6891773974fb91100812df629465abbdc0ac0e Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 5 Nov 2024 14:48:57 -0500 Subject: [PATCH 06/18] add simulation for observer module --- Makefile | 2 +- app/app.go | 4 +- app/modules.go | 2 +- contrib/docker-scripts/start.sh | 3 + precompiles/bank/bank.go | 4 +- precompiles/bank/method_test.go | 2 +- testutil/keeper/crosschain.go | 2 + testutil/keeper/emissions.go | 2 + testutil/keeper/fungible.go | 8 +- testutil/keeper/ibccrosschain.go | 2 + testutil/keeper/mocks/fungible/authority.go | 32 ++++- testutil/keeper/mocks/fungible/bank.go | 20 +++ testutil/keeper/mocks/observer/authority.go | 28 +++++ testutil/keeper/observer.go | 10 ++ testutil/sample/observer.go | 1 + ...ctx_orchestrator_validate_outbound_test.go | 2 +- .../keeper/msg_server_vote_inbound_tx.go | 1 - x/crosschain/simulation/decoders_test.go | 19 +-- x/crosschain/simulation/operations.go | 6 +- x/fungible/keeper/deposits_test.go | 22 ++-- x/fungible/keeper/evm_test.go | 94 +++++++-------- x/fungible/keeper/gas_coin_and_pool_test.go | 20 +-- x/fungible/keeper/gas_price_test.go | 26 ++-- x/fungible/keeper/gas_stability_pool.go | 2 +- x/fungible/keeper/gas_stability_pool_test.go | 10 +- .../keeper/grpc_query_code_hash_test.go | 4 +- .../grpc_query_gas_stability_pool_test.go | 4 +- x/fungible/keeper/keeper.go | 2 +- ..._server_deploy_fungible_coin_zrc20_test.go | 10 +- .../msg_server_deploy_system_contract_test.go | 14 +-- .../msg_server_remove_foreign_coin_test.go | 6 +- ...sg_server_update_contract_bytecode_test.go | 8 +- ...msg_server_update_gateway_contract_test.go | 11 +- .../msg_server_update_system_contract_test.go | 12 +- ...g_server_update_zrc20_withdraw_fee_test.go | 8 +- x/fungible/keeper/system_contract_test.go | 114 +++++++++--------- x/fungible/keeper/v2_deposits_test.go | 13 +- x/fungible/keeper/zeta_test.go | 2 +- .../keeper/zevm_message_passing_test.go | 18 +-- .../keeper/zrc20_cosmos_coin_mapping_test.go | 8 +- x/fungible/keeper/zrc20_methods_test.go | 4 +- x/fungible/module.go | 2 +- x/fungible/simulation/decoders.go | 2 +- x/fungible/simulation/decoders_test.go | 43 +++++++ x/fungible/simulation/operations.go | 3 +- x/observer/abci.go | 2 +- x/observer/keeper/keeper.go | 20 ++- x/observer/keeper/tss.go | 1 + x/observer/module.go | 4 +- x/observer/module_simulation.go | 27 ++--- x/observer/simulation/decoders.go | 95 +++++++++++++++ x/observer/simulation/decoders_test.go | 88 ++++++++++++++ x/observer/simulation/genesis.go | 12 ++ x/observer/simulation/operations.go | 90 ++++++++++++++ x/observer/types/expected_keepers.go | 11 ++ x/observer/types/keys.go | 24 ++-- 56 files changed, 724 insertions(+), 262 deletions(-) create mode 100644 x/fungible/simulation/decoders_test.go create mode 100644 x/observer/simulation/decoders.go create mode 100644 x/observer/simulation/decoders_test.go create mode 100644 x/observer/simulation/genesis.go create mode 100644 x/observer/simulation/operations.go diff --git a/Makefile b/Makefile index 591785d8ed..1e87c984e9 100644 --- a/Makefile +++ b/Makefile @@ -390,7 +390,7 @@ test-sim-nondeterminism: $(call run-sim-test,"non-determinism test",TestAppStateDeterminism,100,200,2h) test-sim-fullappsimulation: - $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,10,50,2h) + $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,2h) test-sim-multi-seed-long: runsim @echo "Running long multi-seed application simulation." diff --git a/app/app.go b/app/app.go index 1e64321f21..61d79f09ea 100644 --- a/app/app.go +++ b/app/app.go @@ -446,7 +446,7 @@ func New( // app.IBCKeeper.ChannelKeeper, // app.IBCKeeper.ChannelKeeper, // &app.IBCKeeper.PortKeeper, - // app.AccountKeeper, + // app.GetAuthKeeper, // app.BankKeeper, // scopedTransferKeeper, //) @@ -483,6 +483,8 @@ func New( app.SlashingKeeper, app.AuthorityKeeper, app.LightclientKeeper, + app.BankKeeper, + app.AccountKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) diff --git a/app/modules.go b/app/modules.go index 5ca7d49a00..f8152ed4ff 100644 --- a/app/modules.go +++ b/app/modules.go @@ -146,7 +146,7 @@ func simulationModules( //gov.NewAppModule( // appCodec, // &app.GovKeeper, - // app.AccountKeeper, + // app.GetAuthKeeper, // app.BankKeeper, // app.GetSubspace(govtypes.ModuleName), //), diff --git a/contrib/docker-scripts/start.sh b/contrib/docker-scripts/start.sh index 6d79effa57..88e2dcfc1f 100644 --- a/contrib/docker-scripts/start.sh +++ b/contrib/docker-scripts/start.sh @@ -333,3 +333,6 @@ else logt "Start Network" start_network fi + + +129464826329163654981708 - 128304687134120426209500 = 1164123194043 \ No newline at end of file diff --git a/precompiles/bank/bank.go b/precompiles/bank/bank.go index 51a559edd3..266235ff6e 100644 --- a/precompiles/bank/bank.go +++ b/precompiles/bank/bank.go @@ -66,8 +66,8 @@ func NewIBankContract( kvGasConfig storetypes.GasConfig, ) *Contract { accAddress := sdk.AccAddress(ContractAddress.Bytes()) - if fungibleKeeper.GetAuthKeeper().GetAccount(ctx, accAddress) == nil { - fungibleKeeper.GetAuthKeeper().SetAccount(ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + if fungibleKeeper.GetAccountKeeper().GetAccount(ctx, accAddress) == nil { + fungibleKeeper.GetAccountKeeper().SetAccount(ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) } // Instantiate the ZRC20 ABI only one time. diff --git a/precompiles/bank/method_test.go b/precompiles/bank/method_test.go index e416187490..fe96437ada 100644 --- a/precompiles/bank/method_test.go +++ b/precompiles/bank/method_test.go @@ -513,7 +513,7 @@ func setupChain(t *testing.T) testSuite { // Make sure the account store is initialized. // This is completely needed for accounts to be created in the state. - fungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + fungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) // Deploy system contracts in order to deploy a ZRC20 token. deploySystemContracts(t, ctx, fungibleKeeper, *sdkKeepers.EvmKeeper) diff --git a/testutil/keeper/crosschain.go b/testutil/keeper/crosschain.go index 8418bbdaaf..d0f7d0220c 100644 --- a/testutil/keeper/crosschain.go +++ b/testutil/keeper/crosschain.go @@ -129,6 +129,8 @@ func CrosschainKeeperWithMocks( sdkKeepers.SlashingKeeper, authorityKeeperTmp, lightclientKeeperTmp, + sdkKeepers.BankKeeper, + sdkKeepers.AuthKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) diff --git a/testutil/keeper/emissions.go b/testutil/keeper/emissions.go index b2ce7a004c..bfbe2813d9 100644 --- a/testutil/keeper/emissions.go +++ b/testutil/keeper/emissions.go @@ -54,6 +54,8 @@ func EmissionKeeperWithMockOptions( sdkKeepers.StakingKeeper, sdkKeepers.SlashingKeeper, authorityKeeper, + sdkKeepers.BankKeeper, + sdkKeepers.AuthKeeper, initLightclientKeeper(cdc, stateStore, authorityKeeper), ) diff --git a/testutil/keeper/fungible.go b/testutil/keeper/fungible.go index aa0e975c97..78398c0016 100644 --- a/testutil/keeper/fungible.go +++ b/testutil/keeper/fungible.go @@ -53,7 +53,7 @@ var ( func initFungibleKeeper( cdc codec.Codec, ss store.CommitMultiStore, - authKeeper types.AccountKeeper, + accountKeeper types.AccountKeeper, bankKeepr types.BankKeeper, evmKeeper types.EVMKeeper, observerKeeper types.ObserverKeeper, @@ -68,7 +68,7 @@ func initFungibleKeeper( cdc, storeKey, memKey, - authKeeper, + accountKeeper, evmKeeper, bankKeepr, observerKeeper, @@ -116,6 +116,8 @@ func FungibleKeeperWithMocks( sdkKeepers.SlashingKeeper, authorityKeeperTmp, lightclientKeeperTmp, + sdkKeepers.BankKeeper, + sdkKeepers.AuthKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) @@ -205,7 +207,7 @@ func GetFungibleAuthorityMock(t testing.TB, keeper *keeper.Keeper) *fungiblemock } func GetFungibleAccountMock(t testing.TB, keeper *keeper.Keeper) *fungiblemocks.FungibleAccountKeeper { - fak, ok := keeper.GetAuthKeeper().(*fungiblemocks.FungibleAccountKeeper) + fak, ok := keeper.GetAccountKeeper().(*fungiblemocks.FungibleAccountKeeper) require.True(t, ok) return fak } diff --git a/testutil/keeper/ibccrosschain.go b/testutil/keeper/ibccrosschain.go index 95cf7559e7..5bd222141d 100644 --- a/testutil/keeper/ibccrosschain.go +++ b/testutil/keeper/ibccrosschain.go @@ -77,6 +77,8 @@ func IBCCrosschainKeeperWithMocks( sdkKeepers.StakingKeeper, sdkKeepers.SlashingKeeper, authorityKeeper, + sdkKeepers.BankKeeper, + sdkKeepers.AuthKeeper, lightclientKeeper, ) fungibleKeeper := initFungibleKeeper( diff --git a/testutil/keeper/mocks/fungible/authority.go b/testutil/keeper/mocks/fungible/authority.go index 214834ac86..ccf891e5f7 100644 --- a/testutil/keeper/mocks/fungible/authority.go +++ b/testutil/keeper/mocks/fungible/authority.go @@ -3,8 +3,10 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" chains "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + + mock "github.com/stretchr/testify/mock" types "github.com/cosmos/cosmos-sdk/types" ) @@ -52,6 +54,34 @@ func (_m *FungibleAuthorityKeeper) GetAdditionalChainList(ctx types.Context) []c return r0 } +// GetPolicies provides a mock function with given fields: ctx +func (_m *FungibleAuthorityKeeper) GetPolicies(ctx types.Context) (authoritytypes.Policies, bool) { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for GetPolicies") + } + + var r0 authoritytypes.Policies + var r1 bool + if rf, ok := ret.Get(0).(func(types.Context) (authoritytypes.Policies, bool)); ok { + return rf(ctx) + } + if rf, ok := ret.Get(0).(func(types.Context) authoritytypes.Policies); ok { + r0 = rf(ctx) + } else { + r0 = ret.Get(0).(authoritytypes.Policies) + } + + if rf, ok := ret.Get(1).(func(types.Context) bool); ok { + r1 = rf(ctx) + } else { + r1 = ret.Get(1).(bool) + } + + return r0, r1 +} + // NewFungibleAuthorityKeeper creates a new instance of FungibleAuthorityKeeper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewFungibleAuthorityKeeper(t interface { diff --git a/testutil/keeper/mocks/fungible/bank.go b/testutil/keeper/mocks/fungible/bank.go index db14226310..d83a49e876 100644 --- a/testutil/keeper/mocks/fungible/bank.go +++ b/testutil/keeper/mocks/fungible/bank.go @@ -49,6 +49,26 @@ func (_m *FungibleBankKeeper) SendCoinsFromModuleToAccount(ctx types.Context, se return r0 } +// SpendableCoins provides a mock function with given fields: ctx, addr +func (_m *FungibleBankKeeper) SpendableCoins(ctx types.Context, addr types.AccAddress) types.Coins { + ret := _m.Called(ctx, addr) + + if len(ret) == 0 { + panic("no return value specified for SpendableCoins") + } + + var r0 types.Coins + if rf, ok := ret.Get(0).(func(types.Context, types.AccAddress) types.Coins); ok { + r0 = rf(ctx, addr) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(types.Coins) + } + } + + return r0 +} + // NewFungibleBankKeeper creates a new instance of FungibleBankKeeper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewFungibleBankKeeper(t interface { diff --git a/testutil/keeper/mocks/observer/authority.go b/testutil/keeper/mocks/observer/authority.go index 24a105fb4d..0bfc08f9fe 100644 --- a/testutil/keeper/mocks/observer/authority.go +++ b/testutil/keeper/mocks/observer/authority.go @@ -54,6 +54,34 @@ func (_m *ObserverAuthorityKeeper) GetAdditionalChainList(ctx types.Context) []c return r0 } +// GetPolicies provides a mock function with given fields: ctx +func (_m *ObserverAuthorityKeeper) GetPolicies(ctx types.Context) (authoritytypes.Policies, bool) { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for GetPolicies") + } + + var r0 authoritytypes.Policies + var r1 bool + if rf, ok := ret.Get(0).(func(types.Context) (authoritytypes.Policies, bool)); ok { + return rf(ctx) + } + if rf, ok := ret.Get(0).(func(types.Context) authoritytypes.Policies); ok { + r0 = rf(ctx) + } else { + r0 = ret.Get(0).(authoritytypes.Policies) + } + + if rf, ok := ret.Get(1).(func(types.Context) bool); ok { + r1 = rf(ctx) + } else { + r1 = ret.Get(1).(bool) + } + + return r0, r1 +} + // SetPolicies provides a mock function with given fields: ctx, policies func (_m *ObserverAuthorityKeeper) SetPolicies(ctx types.Context, policies authoritytypes.Policies) { _m.Called(ctx, policies) diff --git a/testutil/keeper/observer.go b/testutil/keeper/observer.go index d84f722b0c..39b6796c7f 100644 --- a/testutil/keeper/observer.go +++ b/testutil/keeper/observer.go @@ -10,7 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -47,6 +49,8 @@ func initObserverKeeper( stakingKeeper stakingkeeper.Keeper, slashingKeeper slashingkeeper.Keeper, authorityKeeper types.AuthorityKeeper, + bankKeeper bankkeeper.Keeper, + authKeeper authkeeper.AccountKeeper, lightclientKeeper types.LightclientKeeper, ) *keeper.Keeper { storeKey := sdk.NewKVStoreKey(types.StoreKey) @@ -62,6 +66,8 @@ func initObserverKeeper( slashingKeeper, authorityKeeper, lightclientKeeper, + bankKeeper, + authKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) } @@ -103,6 +109,8 @@ func ObserverKeeperWithMocks( var slashingKeeper types.SlashingKeeper = sdkKeepers.SlashingKeeper var authorityKeeper types.AuthorityKeeper = authorityKeeperTmp var lightclientKeeper types.LightclientKeeper = lightclientKeeperTmp + var bankKeeper types.BankKeeper = sdkKeepers.BankKeeper + var authKeeper types.AccountKeeper = sdkKeepers.AuthKeeper if mockOptions.UseStakingMock { stakingKeeper = observermocks.NewObserverStakingKeeper(t) } @@ -124,6 +132,8 @@ func ObserverKeeperWithMocks( slashingKeeper, authorityKeeper, lightclientKeeper, + bankKeeper, + authKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) diff --git a/testutil/sample/observer.go b/testutil/sample/observer.go index 8d0877ce9b..3cea9c2e88 100644 --- a/testutil/sample/observer.go +++ b/testutil/sample/observer.go @@ -119,6 +119,7 @@ func ChainParamsList() (cpl types.ChainParamsList) { return } +// TODO rename to TSS func Tss() types.TSS { _, pubKey, _ := testdata.KeyTestPubAddr() spk, err := cosmos.Bech32ifyPubKey(cosmos.Bech32PubKeyTypeAccPub, pubKey) diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go index 501848b3a0..c153f726a3 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go @@ -188,7 +188,7 @@ func TestKeeper_ValidateFailedOutbound(t *testing.T) { t.Run("successfully revert failed outbound if original sender is a contract", func(t *testing.T) { k, ctx, sdkk, zk := keepertest.CrosschainKeeper(t) - _ = zk.FungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + _ = zk.FungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) cctx := GetERC20Cctx(t, sample.EthAddress(), chains.Goerli, "", big.NewInt(42)) cctx.InboundParams.CoinType = coin.CoinType_Zeta diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx.go b/x/crosschain/keeper/msg_server_vote_inbound_tx.go index 5b4a471438..594473b51f 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx.go @@ -74,7 +74,6 @@ func (k msgServer) VoteInbound( msg.InboundHash, ) if err != nil { - //fmt.Println("Error in voting on inbound ballot", err) return nil, sdkerrors.Wrap(err, voteInboundID) } diff --git a/x/crosschain/simulation/decoders_test.go b/x/crosschain/simulation/decoders_test.go index e95434c930..9765aca43d 100644 --- a/x/crosschain/simulation/decoders_test.go +++ b/x/crosschain/simulation/decoders_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/stretchr/testify/require" keepertest "github.com/zeta-chain/node/testutil/keeper" "github.com/zeta-chain/node/testutil/sample" "github.com/zeta-chain/node/x/crosschain/simulation" @@ -40,20 +41,20 @@ func TestDecodeStore(t *testing.T) { name string expectedLog string }{ - {"CrossChainTx", ""}, - {"LastBlockHeight", ""}, - {"GasPrice", ""}, - {"OutboundTracker", ""}, - {"InboundTracker", ""}, - {"ZetaAccounting", ""}, - {"RateLimiterFlags", ""}, - {"FinalizedInbounds", ""}, + {"CrossChainTx", fmt.Sprintf("%v\n%v", *cctx, *cctx)}, + {"LastBlockHeight", fmt.Sprintf("%v\n%v", *lastBlockHeight, *lastBlockHeight)}, + {"GasPrice", fmt.Sprintf("%v\n%v", *gasPrice, *gasPrice)}, + {"OutboundTracker", fmt.Sprintf("%v\n%v", outboundTracker, outboundTracker)}, + {"InboundTracker", fmt.Sprintf("%v\n%v", inboundTracker, inboundTracker)}, + {"ZetaAccounting", fmt.Sprintf("%v\n%v", zetaAccounting, zetaAccounting)}, + {"RateLimiterFlags", fmt.Sprintf("%v\n%v", rateLimiterFlags, rateLimiterFlags)}, + {"FinalizedInbounds", fmt.Sprintf("%v\n%v", []byte{1}, []byte{1})}, } for i, tt := range tests { i, tt := i, tt t.Run(tt.name, func(t *testing.T) { - fmt.Println(dec(kvPairs.Pairs[i], kvPairs.Pairs[i])) + require.Equal(t, tt.expectedLog, dec(kvPairs.Pairs[i], kvPairs.Pairs[i])) }) } } diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index b790ff89af..947883c0e0 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -293,6 +293,10 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + if ctx.BlockHeight() <= 1 { + return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "block height less than 1"), nil, nil + } + simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) if err != nil { return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "unable to get random account and observer"), nil, err @@ -330,7 +334,7 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { CoinsSpentInMsg: spendable, } - return GenAndDeliverTxWithRandFees(txCtx) + return simulation.GenAndDeliverTxWithRandFees(txCtx) } } diff --git a/x/fungible/keeper/deposits_test.go b/x/fungible/keeper/deposits_test.go index 3958ae191e..5a2bc133e8 100644 --- a/x/fungible/keeper/deposits_test.go +++ b/x/fungible/keeper/deposits_test.go @@ -24,7 +24,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit gas coin for transfers", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -57,7 +57,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit non-gas coin for transfers", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -91,7 +91,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if trying to call a contract with data to a EOC", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -121,7 +121,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit coin for transfers with liquidity cap not reached", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -169,7 +169,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if coin paused", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -203,7 +203,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if liquidity cap reached", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -246,7 +246,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if gas coin not found", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -273,7 +273,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if zrc20 not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -302,7 +302,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should return contract call if receiver is a contract", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -342,7 +342,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if call contract fails", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -379,7 +379,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit using V2", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId diff --git a/x/fungible/keeper/evm_test.go b/x/fungible/keeper/evm_test.go index 7c0ef0bf00..864f724d82 100644 --- a/x/fungible/keeper/evm_test.go +++ b/x/fungible/keeper/evm_test.go @@ -223,7 +223,7 @@ func assertExampleBarValue( func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("should error if chain not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -243,7 +243,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -265,7 +265,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -288,7 +288,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("can deploy the zrc20 contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -344,7 +344,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("can deploy the zrc20 contract without a gateway address", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -408,7 +408,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) wzeta, uniswapV2Factory, uniswapV2Router, _, _ := deploySystemContractsWithMockEvmKeeper( @@ -428,7 +428,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -441,7 +441,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -454,7 +454,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -465,7 +465,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { t.Run("can deploy the system contracts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // deploy the system contracts wzeta, uniswapV2Factory, uniswapV2Router, _, systemContract := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -493,7 +493,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { t.Run("can deposit into wzeta", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -523,7 +523,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -549,7 +549,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should deposit and call the contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -602,7 +602,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should return a revert error when the underlying contract call revert", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -633,7 +633,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should revert if the underlying contract doesn't exist", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -658,7 +658,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { func TestKeeper_CallEVMWithData(t *testing.T) { t.Run("should return a revert error when the contract call revert", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // Deploy example contract, err := k.DeployContract(ctx, contracts.ExampleMetaData) @@ -955,7 +955,7 @@ func TestKeeper_CallEVMWithData(t *testing.T) { func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if pack ctor args fails", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) addr, err := k.DeployContract(ctx, zrc20.ZRC20MetaData, "") require.ErrorIs(t, err, types.ErrABIGet) require.Empty(t, addr) @@ -963,7 +963,7 @@ func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if metadata bin empty", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) metadata := &bind.MetaData{ ABI: wzeta.WETH9MetaData.ABI, Bin: "", @@ -975,7 +975,7 @@ func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if metadata cant be decoded", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) metadata := &bind.MetaData{ ABI: wzeta.WETH9MetaData.ABI, Bin: "0x1", @@ -998,7 +998,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1014,7 +1014,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1031,7 +1031,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1055,7 +1055,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1071,7 +1071,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1088,7 +1088,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1112,7 +1112,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1128,7 +1128,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1145,7 +1145,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1169,7 +1169,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1185,7 +1185,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1202,7 +1202,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1226,7 +1226,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1242,7 +1242,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1259,7 +1259,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1283,7 +1283,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1299,7 +1299,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1316,7 +1316,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1339,7 +1339,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1362,7 +1362,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1389,7 +1389,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1416,7 +1416,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1447,7 +1447,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should call on receive on connector which calls onZetaMessage on sample DAPP", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -1498,7 +1498,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should error if system contract not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) require.NoError(t, err) @@ -1514,7 +1514,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should error in contract call reverts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) @@ -1533,7 +1533,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should call on revert on connector which calls onZetaRevert on sample DAPP", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -1582,7 +1582,7 @@ func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should error if system contract not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) require.NoError(t, err) @@ -1599,7 +1599,7 @@ func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should error in contract call reverts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) diff --git a/x/fungible/keeper/gas_coin_and_pool_test.go b/x/fungible/keeper/gas_coin_and_pool_test.go index 186828c8b4..7327d1c11b 100644 --- a/x/fungible/keeper/gas_coin_and_pool_test.go +++ b/x/fungible/keeper/gas_coin_and_pool_test.go @@ -155,7 +155,7 @@ func setupZRC20Pool( func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { t.Run("can setup a new chain gas coin", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -172,7 +172,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -194,7 +194,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { }) bankMock := keepertest.GetFungibleBankMock(t, k) bankMock.On("MintCoins", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(errors.New("err")) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -216,7 +216,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -244,7 +244,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -275,7 +275,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -307,7 +307,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -340,7 +340,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -380,7 +380,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -423,7 +423,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) diff --git a/x/fungible/keeper/gas_price_test.go b/x/fungible/keeper/gas_price_test.go index e48392eb45..43ca4cbeff 100644 --- a/x/fungible/keeper/gas_price_test.go +++ b/x/fungible/keeper/gas_price_test.go @@ -16,7 +16,7 @@ import ( func TestKeeper_SetGasPrice(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, _, _, system := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -50,7 +50,7 @@ func TestKeeper_SetGasPrice(t *testing.T) { func TestKeeper_SetGasPriceContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.SetGasPrice(ctx, big.NewInt(1), big.NewInt(42)) require.ErrorIs(t, err, types.ErrContractNotFound) @@ -58,7 +58,7 @@ func TestKeeper_SetGasPriceContractNotFound(t *testing.T) { func TestKeeper_SetNilGasPrice(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.SetGasPrice(ctx, big.NewInt(1), nil) require.ErrorIs(t, err, types.ErrNilGasPrice) @@ -66,7 +66,7 @@ func TestKeeper_SetNilGasPrice(t *testing.T) { func TestKeeper_SetGasPriceContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) k.SetSystemContract(ctx, types.SystemContract{}) @@ -79,7 +79,7 @@ func TestKeeper_SetGasPriceReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -91,7 +91,7 @@ func TestKeeper_SetGasPriceReverts(t *testing.T) { func TestKeeper_SetGasCoin(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -105,7 +105,7 @@ func TestKeeper_SetGasCoin(t *testing.T) { func TestKeeper_SetGasCoinContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() err := k.SetGasCoin(ctx, big.NewInt(1), gas) @@ -114,7 +114,7 @@ func TestKeeper_SetGasCoinContractNotFound(t *testing.T) { func TestKeeper_SetGasCoinContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -128,7 +128,7 @@ func TestKeeper_SetGasCoinReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -140,7 +140,7 @@ func TestKeeper_SetGasCoinReverts(t *testing.T) { func TestKeeper_SetGasZetaPool(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() _, _, _, _, system := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -175,7 +175,7 @@ func TestKeeper_SetGasZetaPool(t *testing.T) { func TestKeeper_SetGasZetaPoolContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() err := k.SetGasZetaPool(ctx, big.NewInt(1), zrc20) @@ -184,7 +184,7 @@ func TestKeeper_SetGasZetaPoolContractNotFound(t *testing.T) { func TestKeeper_SetGasZetaPoolContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -198,7 +198,7 @@ func TestKeeper_SetGasZetaPoolReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) diff --git a/x/fungible/keeper/gas_stability_pool.go b/x/fungible/keeper/gas_stability_pool.go index 2a68d68582..4091d9bded 100644 --- a/x/fungible/keeper/gas_stability_pool.go +++ b/x/fungible/keeper/gas_stability_pool.go @@ -12,7 +12,7 @@ import ( func (k Keeper) EnsureGasStabilityPoolAccountCreated(ctx sdk.Context) { address := types.GasStabilityPoolAddress() - ak := k.GetAuthKeeper() + ak := k.GetAccountKeeper() accExists := ak.HasAccount(ctx, address) if !accExists { ak.SetAccount(ctx, ak.NewAccountWithAddress(ctx, address)) diff --git a/x/fungible/keeper/gas_stability_pool_test.go b/x/fungible/keeper/gas_stability_pool_test.go index 7105991a65..3506f5dd85 100644 --- a/x/fungible/keeper/gas_stability_pool_test.go +++ b/x/fungible/keeper/gas_stability_pool_test.go @@ -15,18 +15,18 @@ func TestKeeper_EnsureGasStabilityPoolAccountCreated(t *testing.T) { k, ctx, _, _ := testkeeper.FungibleKeeper(t) // account doesn't exist - acc := k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc := k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.Nil(t, acc) // create the account k.EnsureGasStabilityPoolAccountCreated(ctx) - acc = k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc = k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.NotNil(t, acc) require.Equal(t, types.GasStabilityPoolAddress(), acc.GetAddress()) // can call the method again without side effects k.EnsureGasStabilityPoolAccountCreated(ctx) - acc2 := k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc2 := k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.NotNil(t, acc2) require.True(t, acc.GetAddress().Equals(acc2.GetAddress())) require.Equal(t, acc.GetAccountNumber(), acc2.GetAccountNumber()) @@ -37,7 +37,7 @@ func TestKeeper_EnsureGasStabilityPoolAccountCreated(t *testing.T) { func TestKeeper_FundGasStabilityPool(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := testkeeper.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -54,7 +54,7 @@ func TestKeeper_FundGasStabilityPool(t *testing.T) { t.Run("can fund the gas stability pool and withdraw", func(t *testing.T) { k, ctx, sdkk, _ := testkeeper.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) diff --git a/x/fungible/keeper/grpc_query_code_hash_test.go b/x/fungible/keeper/grpc_query_code_hash_test.go index 452bbe3e39..d18504ae54 100644 --- a/x/fungible/keeper/grpc_query_code_hash_test.go +++ b/x/fungible/keeper/grpc_query_code_hash_test.go @@ -21,7 +21,7 @@ func TestKeeper_CodeHash(t *testing.T) { t.Run("should return code hash", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) acc := sdkk.EvmKeeper.GetAccount(ctx, wzeta) @@ -57,7 +57,7 @@ func TestKeeper_CodeHash(t *testing.T) { t.Run("should return error if account is not a contract", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.CodeHash(ctx, &types.QueryCodeHashRequest{ Address: types.ModuleAddressEVM.Hex(), diff --git a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go index 08723fa4af..95e6317375 100644 --- a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go +++ b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go @@ -52,7 +52,7 @@ func TestKeeper_GasStabilityPoolBalance(t *testing.T) { t.Run("should return balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) chainID := 5 - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) setupGasCoin(t, ctx, k, sdkk.EvmKeeper, int64(chainID), "foobar", "foobar") @@ -107,7 +107,7 @@ func TestKeeper_GasStabilityPoolBalanceAll(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseObserverMock: true, }) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) observerMock := keepertest.GetFungibleObserverMock(t, k) chainID := 5 diff --git a/x/fungible/keeper/keeper.go b/x/fungible/keeper/keeper.go index 6e4af7f194..6d0f4a44bb 100644 --- a/x/fungible/keeper/keeper.go +++ b/x/fungible/keeper/keeper.go @@ -50,7 +50,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } -func (k Keeper) GetAuthKeeper() types.AccountKeeper { +func (k Keeper) GetAccountKeeper() types.AccountKeeper { return k.authKeeper } diff --git a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go index c849736883..07beedc52f 100644 --- a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go +++ b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go @@ -23,7 +23,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() chainID := getValidChainID(t) @@ -101,7 +101,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -129,7 +129,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() chainID := getValidChainID(t) @@ -156,7 +156,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -185,7 +185,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_deploy_system_contract_test.go b/x/fungible/keeper/msg_server_deploy_system_contract_test.go index dd06a187c9..634978992e 100644 --- a/x/fungible/keeper/msg_server_deploy_system_contract_test.go +++ b/x/fungible/keeper/msg_server_deploy_system_contract_test.go @@ -24,7 +24,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -47,7 +47,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) nonadmin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -64,7 +64,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -83,7 +83,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -105,7 +105,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -128,7 +128,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -153,7 +153,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go index 9b147ec8ff..eee8edcb96 100644 --- a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go +++ b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go @@ -20,7 +20,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() @@ -49,7 +49,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) admin := sample.AccAddress() @@ -72,7 +72,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go index a863b24a82..42a6bdc1e8 100644 --- a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go +++ b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go @@ -34,7 +34,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() msgServer := keeper.NewMsgServerImpl(*k) @@ -166,7 +166,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() msgServer := keeper.NewMsgServerImpl(*k) @@ -267,7 +267,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -288,7 +288,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_gateway_contract_test.go b/x/fungible/keeper/msg_server_update_gateway_contract_test.go index b1ab5a7fbf..7ce8b02b01 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract_test.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract_test.go @@ -1,10 +1,11 @@ package keeper_test import ( + "testing" + "github.com/ethereum/go-ethereum/common" "github.com/zeta-chain/node/pkg/chains" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "testing" "github.com/stretchr/testify/require" keepertest "github.com/zeta-chain/node/testutil/keeper" @@ -24,7 +25,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -100,7 +101,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -137,7 +138,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -160,7 +161,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_system_contract_test.go b/x/fungible/keeper/msg_server_update_system_contract_test.go index 0b996ece24..c3b7ce4334 100644 --- a/x/fungible/keeper/msg_server_update_system_contract_test.go +++ b/x/fungible/keeper/msg_server_update_system_contract_test.go @@ -27,7 +27,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -105,7 +105,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -156,7 +156,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -181,7 +181,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -204,11 +204,11 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { UseAuthorityMock: true, UseEVMMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go index b7c3ecfb85..17933ea8ba 100644 --- a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go +++ b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go @@ -27,7 +27,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { msgServer := keeper.NewMsgServerImpl(*k) chainID := getValidChainID(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // set coin admin admin := sample.AccAddress() @@ -163,7 +163,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // setup admin := sample.AccAddress() @@ -190,7 +190,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) // setup @@ -240,7 +240,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { UseEVMMock: true, UseAuthorityMock: true, }) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) msgServer := keeper.NewMsgServerImpl(*k) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) diff --git a/x/fungible/keeper/system_contract_test.go b/x/fungible/keeper/system_contract_test.go index 2f599a9a02..9371a10854 100644 --- a/x/fungible/keeper/system_contract_test.go +++ b/x/fungible/keeper/system_contract_test.go @@ -31,7 +31,7 @@ func TestKeeper_GetSystemContract(t *testing.T) { func TestKeeper_GetSystemContractAddress(t *testing.T) { t.Run("should fail to get system contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetSystemContractAddress(ctx) require.Error(t, err) @@ -40,7 +40,7 @@ func TestKeeper_GetSystemContractAddress(t *testing.T) { t.Run("should get system contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, _, _, systemContract := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetSystemContractAddress(ctx) @@ -52,7 +52,7 @@ func TestKeeper_GetSystemContractAddress(t *testing.T) { func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should fail to get wzeta contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetWZetaContractAddress(ctx) require.Error(t, err) @@ -61,7 +61,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should get wzeta contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetWZetaContractAddress(ctx) @@ -71,7 +71,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -88,7 +88,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -103,7 +103,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -119,7 +119,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { "should fail to get uniswapfactory contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetUniswapV2FactoryAddress(ctx) require.Error(t, err) @@ -129,7 +129,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { t.Run("should get uniswapfactory contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, factory, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetUniswapV2FactoryAddress(ctx) @@ -139,7 +139,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { t.Run("should fail in factory not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -156,7 +156,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -171,7 +171,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -185,7 +185,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should fail to get uniswaprouter contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetUniswapV2Router02Address(ctx) require.Error(t, err) @@ -194,7 +194,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should get uniswaprouter contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, router, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetUniswapV2Router02Address(ctx) @@ -204,7 +204,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should fail in router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -221,7 +221,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -236,7 +236,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -250,7 +250,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { func TestKeeper_CallWZetaDeposit(t *testing.T) { t.Run("should fail to deposit if system contracts are not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // mint tokens addr := sample.Bech32AccAddress() @@ -268,7 +268,7 @@ func TestKeeper_CallWZetaDeposit(t *testing.T) { t.Run("should deposit if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // mint tokens addr := sample.Bech32AccAddress() @@ -294,7 +294,7 @@ func TestKeeper_CallWZetaDeposit(t *testing.T) { func TestKeeper_QueryWZetaBalanceOf(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.QueryWZetaBalanceOf(ctx, sample.EthAddress()) @@ -305,7 +305,7 @@ func TestKeeper_QueryWZetaBalanceOf(t *testing.T) { func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -315,7 +315,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should query if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -332,7 +332,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should fail if gas coin not setup", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -350,7 +350,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -365,7 +365,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -379,7 +379,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactETHForToken( @@ -395,7 +395,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap exact eth for 1 token @@ -428,7 +428,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if missing zeta balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap 1 token fails because of missing wrapped balance @@ -451,7 +451,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -472,7 +472,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -495,7 +495,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactETHForToken( @@ -505,7 +505,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap exact 1 token @@ -538,7 +538,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if missing zeta balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap 1 token fails because of missing wrapped balance @@ -562,7 +562,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -583,7 +583,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -606,7 +606,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForETH( @@ -622,7 +622,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -671,7 +671,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if missing tokens balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -700,7 +700,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -720,7 +720,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -742,7 +742,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -759,7 +759,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -806,7 +806,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if missing tokens balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap fails because of missing balance @@ -835,7 +835,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -870,7 +870,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -908,7 +908,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -918,7 +918,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -932,7 +932,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -948,7 +948,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -958,7 +958,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -972,7 +972,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -988,7 +988,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -1003,7 +1003,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -1022,7 +1022,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -1046,7 +1046,7 @@ func TestKeeper_CallZRC20Burn(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -1062,7 +1062,7 @@ func TestKeeper_CallZRC20Approve(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -1085,7 +1085,7 @@ func TestKeeper_CallZRC20Deposit(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) diff --git a/x/fungible/keeper/v2_deposits_test.go b/x/fungible/keeper/v2_deposits_test.go index 7b13eeef89..9bb303eedc 100644 --- a/x/fungible/keeper/v2_deposits_test.go +++ b/x/fungible/keeper/v2_deposits_test.go @@ -1,6 +1,9 @@ package keeper_test import ( + "math/big" + "testing" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" @@ -11,8 +14,6 @@ import ( "github.com/zeta-chain/node/testutil/sample" fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" "github.com/zeta-chain/node/x/fungible/types" - "math/big" - "testing" ) // getTestDAppNoMessageIndex queries the no message index of the test dapp v2 contract @@ -120,7 +121,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process no-call deposit", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId receiver := sample.EthAddress() @@ -154,7 +155,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process no-call deposit, message should be ignored", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId receiver := sample.EthAddress() @@ -188,7 +189,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process deposit and call", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId @@ -224,7 +225,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process deposit and call with no message", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId diff --git a/x/fungible/keeper/zeta_test.go b/x/fungible/keeper/zeta_test.go index 62e41700c1..3c5b33b1a8 100644 --- a/x/fungible/keeper/zeta_test.go +++ b/x/fungible/keeper/zeta_test.go @@ -17,7 +17,7 @@ import ( func TestKeeper_MintZetaToEVMAccount(t *testing.T) { t.Run("should mint the token in the specified balance", func(t *testing.T) { k, ctx, sdkk, _ := testkeeper.FungibleKeeper(t) - k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) acc := sample.Bech32AccAddress() bal := sdkk.BankKeeper.GetBalance(ctx, acc, config.BaseDenom) diff --git a/x/fungible/keeper/zevm_message_passing_test.go b/x/fungible/keeper/zevm_message_passing_test.go index f68fec1f62..1bcc05f257 100644 --- a/x/fungible/keeper/zevm_message_passing_test.go +++ b/x/fungible/keeper/zevm_message_passing_test.go @@ -21,7 +21,7 @@ import ( func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("successfully call ZETADepositAndCallContract on connector contract ", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -70,7 +70,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("successfully deposit coin if account is not a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) zetaTxSender := sample.EthAddress() @@ -103,7 +103,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("automatically deposit coin if account not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) zetaTxSender := sample.EthAddress() zetaTxReceiver := sample.EthAddress() @@ -128,7 +128,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("fail ZETADepositAndCallContract if Deposit Fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{UseBankMock: true}) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) bankMock := keepertest.GetFungibleBankMock(t, k) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -164,7 +164,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("successfully call ZETARevertAndCallContract if receiver is a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -215,7 +215,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("successfully deposit coin if account is not a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) zetaTxSender := sample.EthAddress() @@ -250,7 +250,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("automatically deposit coin if account not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) zetaTxSender := sample.EthAddress() zetaTxReceiver := sample.EthAddress() @@ -277,7 +277,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("fail ZETARevertAndCallContract if Deposit Fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{UseBankMock: true}) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) bankMock := keepertest.GetFungibleBankMock(t, k) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -313,7 +313,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("fail ZETARevertAndCallContract if ZevmOnRevert fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) require.NoError(t, err) diff --git a/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go b/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go index 16803a917c..a3792ee6eb 100644 --- a/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go +++ b/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go @@ -31,7 +31,7 @@ func Test_LockZRC20(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(locker.Bytes()) - ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit 1000 ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, owner, depositTotal) @@ -155,7 +155,7 @@ func Test_UnlockZRC20(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(locker.Bytes()) - ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit 1000 ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, owner, depositTotal) @@ -226,7 +226,7 @@ func Test_CheckZRC20Allowance(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(spender.Bytes()) - ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, fungibletypes.ModuleAddressEVM, depositTotal) @@ -349,7 +349,7 @@ func setupChain(t *testing.T) testSuite { // Make sure the account store is initialized. // This is completely needed for accounts to be created in the state. - fungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + fungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) // Deploy system contracts in order to deploy a ZRC20 token. deploySystemContracts(t, ctx, fungibleKeeper, sdkKeepers.EvmKeeper) diff --git a/x/fungible/keeper/zrc20_methods_test.go b/x/fungible/keeper/zrc20_methods_test.go index 7b124f3050..c0a8e18ffa 100644 --- a/x/fungible/keeper/zrc20_methods_test.go +++ b/x/fungible/keeper/zrc20_methods_test.go @@ -151,7 +151,7 @@ func Test_ZRC20Transfer(t *testing.T) { // Make sure sample.EthAddress() exists as an ethermint account in state. accAddress := sdk.AccAddress(sample.EthAddress().Bytes()) - ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) t.Run("should fail when ZRC20ABI is nil", func(t *testing.T) { _, err := ts.fungibleKeeper.ZRC20Transfer( @@ -230,7 +230,7 @@ func Test_ZRC20TransferFrom(t *testing.T) { // Make sure sample.EthAddress() exists as an ethermint account in state. accAddress := sdk.AccAddress(sample.EthAddress().Bytes()) - ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) t.Run("should fail when ZRC20ABI is nil", func(t *testing.T) { _, err := ts.fungibleKeeper.ZRC20TransferFrom( diff --git a/x/fungible/module.go b/x/fungible/module.go index 8e87fdbd43..521ae9a036 100644 --- a/x/fungible/module.go +++ b/x/fungible/module.go @@ -138,7 +138,7 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.Ra InitGenesis(ctx, am.keeper, genState) // ensure fungible module account is set on genesis - if acc := am.keeper.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName); acc == nil { + if acc := am.keeper.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName); acc == nil { // NOTE: shouldn't occur panic("the fungible module account has not been set") } diff --git a/x/fungible/simulation/decoders.go b/x/fungible/simulation/decoders.go index 37dd35e5d4..892c09a60d 100644 --- a/x/fungible/simulation/decoders.go +++ b/x/fungible/simulation/decoders.go @@ -23,7 +23,7 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { cdc.MustUnmarshal(kvB.Value, &foreignCoinsB) return fmt.Sprintf("%v\n%v", foreignCoinsA, foreignCoinsB) default: - panic(fmt.Sprintf("invalid funcgible key prefix %X", kvA.Key[:1])) + panic(fmt.Sprintf("invalid fungible key prefix %X", kvA.Key[:1])) } } } diff --git a/x/fungible/simulation/decoders_test.go b/x/fungible/simulation/decoders_test.go new file mode 100644 index 0000000000..c2e4cdfd44 --- /dev/null +++ b/x/fungible/simulation/decoders_test.go @@ -0,0 +1,43 @@ +package simulation_test + +import ( + "fmt" + "testing" + + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/stretchr/testify/require" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/simulation" + "github.com/zeta-chain/node/x/fungible/types" +) + +func TestDecodeStore(t *testing.T) { + k, _, _, _ := keepertest.FungibleKeeper(t) + cdc := k.GetCodec() + dec := simulation.NewDecodeStore(cdc) + systemContract := sample.SystemContract() + foreignCoins := sample.ForeignCoins(t, sample.EthAddress().String()) + + kvPairs := kv.Pairs{ + Pairs: []kv.Pair{ + {Key: []byte(types.SystemContractKey), Value: cdc.MustMarshal(systemContract)}, + {Key: []byte(types.ForeignCoinsKeyPrefix), Value: cdc.MustMarshal(&foreignCoins)}, + }, + } + + tests := []struct { + name string + expectedLog string + }{ + {"SystemContract", fmt.Sprintf("%v\n%v", *systemContract, *systemContract)}, + {"ForeignCoins", fmt.Sprintf("%v\n%v", foreignCoins, foreignCoins)}, + } + + for i, tt := range tests { + i, tt := i, tt + t.Run(tt.name, func(t *testing.T) { + require.Equal(t, tt.expectedLog, dec(kvPairs.Pairs[i], kvPairs.Pairs[i])) + }) + } +} diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index c11fc9bdc2..7fcdcee0a9 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -60,6 +60,7 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { } simAccount, found := simtypes.FindAccount(accounts, address) if !found { + // TODO : remove panic panic("admin account not found") } @@ -74,7 +75,7 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, - AccountKeeper: k.GetAuthKeeper(), + AccountKeeper: k.GetAccountKeeper(), Bankkeeper: k.GetBankKeeper(), ModuleName: types.ModuleName, } diff --git a/x/observer/abci.go b/x/observer/abci.go index 6d3315134f..3f56252329 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -33,7 +33,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { } // #nosec G115 always in range - //k.DisableInboundOnly(ctx) + k.DisableInboundOnly(ctx) k.SetKeygen(ctx, types.Keygen{BlockNumber: math.MaxInt64}) // #nosec G115 always positive k.SetLastObserverCount( diff --git a/x/observer/keeper/keeper.go b/x/observer/keeper/keeper.go index ad7fa984c9..b9fdc0f97d 100644 --- a/x/observer/keeper/keeper.go +++ b/x/observer/keeper/keeper.go @@ -13,25 +13,29 @@ import ( type ( Keeper struct { - cdc codec.BinaryCodec + cdc codec.Codec storeKey storetypes.StoreKey memKey storetypes.StoreKey stakingKeeper types.StakingKeeper slashingKeeper types.SlashingKeeper authorityKeeper types.AuthorityKeeper lightclientKeeper types.LightclientKeeper + bankKeeper types.BankKeeper + authKeeper types.AccountKeeper authority string } ) func NewKeeper( - cdc codec.BinaryCodec, + cdc codec.Codec, storeKey, memKey storetypes.StoreKey, stakingKeeper types.StakingKeeper, slashinKeeper types.SlashingKeeper, authorityKeeper types.AuthorityKeeper, lightclientKeeper types.LightclientKeeper, + bankKeeper types.BankKeeper, + authKeeper types.AccountKeeper, authority string, ) *Keeper { if _, err := sdk.AccAddressFromBech32(authority); err != nil { @@ -46,6 +50,8 @@ func NewKeeper( slashingKeeper: slashinKeeper, authorityKeeper: authorityKeeper, lightclientKeeper: lightclientKeeper, + bankKeeper: bankKeeper, + authKeeper: authKeeper, authority: authority, } } @@ -62,6 +68,14 @@ func (k Keeper) GetAuthorityKeeper() types.AuthorityKeeper { return k.authorityKeeper } +func (k Keeper) GetBankKeeper() types.BankKeeper { + return k.bankKeeper +} + +func (k Keeper) GetAuthKeeper() types.AccountKeeper { + return k.authKeeper +} + func (k Keeper) GetLightclientKeeper() types.LightclientKeeper { return k.lightclientKeeper } @@ -74,7 +88,7 @@ func (k Keeper) StoreKey() storetypes.StoreKey { return k.storeKey } -func (k Keeper) Codec() codec.BinaryCodec { +func (k Keeper) Codec() codec.Codec { return k.cdc } diff --git a/x/observer/keeper/tss.go b/x/observer/keeper/tss.go index 92db492352..97de7e8d0f 100644 --- a/x/observer/keeper/tss.go +++ b/x/observer/keeper/tss.go @@ -66,6 +66,7 @@ func (k Keeper) RemoveTSS(ctx sdk.Context) { store.Delete([]byte{0}) } +// TODO define a type for a list of TSS isntead of using []types.TSS // GetAllTSS returns all tss historical information from the store func (k Keeper) GetAllTSS(ctx sdk.Context) (list []types.TSS) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.TSSHistoryKey)) diff --git a/x/observer/module.go b/x/observer/module.go index 41724bc8b1..1136be6ecd 100644 --- a/x/observer/module.go +++ b/x/observer/module.go @@ -31,10 +31,10 @@ var ( // AppModuleBasic implements the AppModuleBasic interface for the observer module. type AppModuleBasic struct { - cdc codec.BinaryCodec + cdc codec.Codec } -func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { +func NewAppModuleBasic(cdc codec.Codec) AppModuleBasic { return AppModuleBasic{cdc: cdc} } diff --git a/x/observer/module_simulation.go b/x/observer/module_simulation.go index c9f1dbf069..d97cecc626 100644 --- a/x/observer/module_simulation.go +++ b/x/observer/module_simulation.go @@ -1,11 +1,11 @@ package observer import ( - "math/rand" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/zeta-chain/node/x/observer/simulation" + "github.com/zeta-chain/node/x/observer/types" ) const ( @@ -16,13 +16,7 @@ const ( // GenerateGenesisState creates a randomized GenState of the module func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - //observers := make([]string, len(simState.Accounts)) - //for _, account := range simState.Accounts { - // observers = append(observers, account.Address.String()) - //} - //observerGenesis := types.DefaultGenesis() - //observerGenesis.Observers = types.ObserverSet{ObserverList: observers} - //simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(observerGenesis) + simulation.RandomizedGenState(simState) } @@ -36,18 +30,13 @@ func (AppModule) ProposalMsgs(_ module.SimulationState) []simtypes.WeightedPropo } // RegisterStoreDecoder registers a decoder -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} +func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { + sdr[types.StoreKey] = simulation.NewDecodeStore(am.cdc) +} // WeightedOperations returns the all the gov module operations with their respective weights. func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { - operations := make([]simtypes.WeightedOperation, 0) - - var weightMsgUpdateClientParams int - simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgUpdateClientParams, &weightMsgUpdateClientParams, nil, - func(_ *rand.Rand) { - weightMsgUpdateClientParams = defaultWeightMsgUpdateClientParams - }, + return simulation.WeightedOperations( + simState.AppParams, simState.Cdc, am.keeper, ) - - return operations } diff --git a/x/observer/simulation/decoders.go b/x/observer/simulation/decoders.go new file mode 100644 index 0000000000..45b64bdb7c --- /dev/null +++ b/x/observer/simulation/decoders.go @@ -0,0 +1,95 @@ +package simulation + +import ( + "bytes" + "fmt" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/observer/types" +) + +func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { + return func(kvA, kvB kv.Pair) string { + switch { + case bytes.Equal(kvA.Key, types.KeyPrefix(types.CrosschainFlagsKey)): + var crosschainFlagsA, crosschainFlagsB types.CrosschainFlags + cdc.MustUnmarshal(kvA.Value, &crosschainFlagsA) + cdc.MustUnmarshal(kvB.Value, &crosschainFlagsB) + return fmt.Sprintf("%v\n%v", crosschainFlagsA, crosschainFlagsB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.LastBlockObserverCountKey)): + var lastBlockObserverCountA, lastBlockObserverCountB types.LastObserverCount + cdc.MustUnmarshal(kvA.Value, &lastBlockObserverCountA) + cdc.MustUnmarshal(kvB.Value, &lastBlockObserverCountB) + return fmt.Sprintf("%v\n%v", lastBlockObserverCountA, lastBlockObserverCountB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.NodeAccountKey)): + var nodeAccountA, nodeAccountB types.NodeAccount + cdc.MustUnmarshal(kvA.Value, &nodeAccountA) + cdc.MustUnmarshal(kvB.Value, &nodeAccountB) + return fmt.Sprintf("%v\n%v", nodeAccountA, nodeAccountB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.KeygenKey)): + var keygenA, keygenB types.Keygen + cdc.MustUnmarshal(kvA.Value, &keygenA) + cdc.MustUnmarshal(kvB.Value, &keygenB) + return fmt.Sprintf("%v\n%v", keygenA, keygenB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.BallotListKey)): + var ballotListA, ballotListB types.BallotListForHeight + cdc.MustUnmarshal(kvA.Value, &ballotListA) + cdc.MustUnmarshal(kvB.Value, &ballotListB) + return fmt.Sprintf("%v\n%v", ballotListA, ballotListB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.VoterKey)): + var voterA, voterB types.Ballot + cdc.MustUnmarshal(kvA.Value, &voterA) + cdc.MustUnmarshal(kvB.Value, &voterB) + return fmt.Sprintf("%v\n%v", voterA, voterB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.TSSKey)): + var tssA, tssB types.TSS + cdc.MustUnmarshal(kvA.Value, &tssA) + cdc.MustUnmarshal(kvB.Value, &tssB) + return fmt.Sprintf("%v\n%v", tssA, tssB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.ObserverSetKey)): + var observerSetA, observerSetB types.ObserverSet + cdc.MustUnmarshal(kvA.Value, &observerSetA) + cdc.MustUnmarshal(kvB.Value, &observerSetB) + return fmt.Sprintf("%v\n%v", observerSetA, observerSetB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.AllChainParamsKey)): + var allChainParamsA, allChainParamsB types.ChainParamsList + cdc.MustUnmarshal(kvA.Value, &allChainParamsA) + cdc.MustUnmarshal(kvB.Value, &allChainParamsB) + return fmt.Sprintf("%v\n%v", allChainParamsA, allChainParamsB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.TSSHistoryKey)): + var tssHistoryA, tssHistoryB []types.TSS + return fmt.Sprintf("%v\n%v", tssHistoryA, tssHistoryB) + //cdc.MustUnmarshal(kvA.Value, &tssHistoryA) + //cdc.MustUnmarshal(kvB.Value, &tssHistoryB) + //return fmt.Sprintf("%v\n%v", tssHistoryA, tssHistoryB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.TssFundMigratorKey)): + var tssFundMigratorA, tssFundMigratorB types.TssFundMigratorInfo + cdc.MustUnmarshal(kvA.Value, &tssFundMigratorA) + cdc.MustUnmarshal(kvB.Value, &tssFundMigratorB) + return fmt.Sprintf("%v\n%v", tssFundMigratorA, tssFundMigratorB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.PendingNoncesKeyPrefix)): + var pendingNoncesA, pendingNoncesB types.PendingNonces + cdc.MustUnmarshal(kvA.Value, &pendingNoncesA) + cdc.MustUnmarshal(kvB.Value, &pendingNoncesB) + return fmt.Sprintf("%v\n%v", pendingNoncesA, pendingNoncesB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.ChainNoncesKey)): + var chainNoncesA, chainNoncesB types.ChainNonces + cdc.MustUnmarshal(kvA.Value, &chainNoncesA) + cdc.MustUnmarshal(kvB.Value, &chainNoncesB) + return fmt.Sprintf("%v\n%v", chainNoncesA, chainNoncesB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.NonceToCctxKeyPrefix)): + var nonceToCctxA, nonceToCctxB types.NonceToCctx + cdc.MustUnmarshal(kvA.Value, &nonceToCctxA) + cdc.MustUnmarshal(kvB.Value, &nonceToCctxB) + return fmt.Sprintf("%v\n%v", nonceToCctxA, nonceToCctxB) + case bytes.Equal(kvA.Key, types.KeyPrefix(types.ParamsKey)): + var paramsA, paramsB types.Params + cdc.MustUnmarshal(kvA.Value, ¶msA) + cdc.MustUnmarshal(kvB.Value, ¶msB) + return fmt.Sprintf("%v\n%v", paramsA, paramsB) + default: + panic(fmt.Sprintf("invalid observer key prefix %X", kvA.Key)) + } + } +} diff --git a/x/observer/simulation/decoders_test.go b/x/observer/simulation/decoders_test.go new file mode 100644 index 0000000000..4bf230779f --- /dev/null +++ b/x/observer/simulation/decoders_test.go @@ -0,0 +1,88 @@ +package simulation_test + +import ( + "fmt" + "testing" + + "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/simulation" + "github.com/zeta-chain/node/x/observer/types" +) + +func TestNewDecodeStore(t *testing.T) { + k, _, _, _ := keepertest.ObserverKeeper(t) + cdc := k.Codec() + dec := simulation.NewDecodeStore(cdc) + crosschainFlags := sample.CrosschainFlags() + lastBlockObserverCount := sample.LastObserverCount(10) + nodeAccount := sample.NodeAccount() + keygen := sample.Keygen(t) + + ballotList := types.BallotListForHeight{ + Height: 10, + BallotsIndexList: []string{sample.ZetaIndex(t)}, + } + + ballot := sample.Ballot(t, "sample") + tss := sample.Tss() + observerSet := sample.ObserverSet(10) + chainParamsList := sample.ChainParamsList() + //tssHistory := sample.TssList(10) + tssFundMigrator := sample.TssFundsMigrator(chains.Ethereum.ChainId) + pendingNonce := sample.PendingNoncesList(t, "index", 10)[0] + chainNonces := sample.ChainNonces(chains.Ethereum.ChainId) + nonceToCctx := sample.NonceToCCTX(t, "index") + params := types.Params{BallotMaturityBlocks: 100} + + kvPairs := kv.Pairs{ + Pairs: []kv.Pair{ + {Key: types.KeyPrefix(types.CrosschainFlagsKey), Value: cdc.MustMarshal(crosschainFlags)}, + {Key: types.KeyPrefix(types.LastBlockObserverCountKey), Value: cdc.MustMarshal(lastBlockObserverCount)}, + {Key: types.KeyPrefix(types.NodeAccountKey), Value: cdc.MustMarshal(nodeAccount)}, + {Key: types.KeyPrefix(types.KeygenKey), Value: cdc.MustMarshal(keygen)}, + {Key: types.KeyPrefix(types.BallotListKey), Value: cdc.MustMarshal(&ballotList)}, + {Key: types.KeyPrefix(types.VoterKey), Value: cdc.MustMarshal(ballot)}, + {Key: types.KeyPrefix(types.TSSKey), Value: cdc.MustMarshal(&tss)}, + {Key: types.KeyPrefix(types.ObserverSetKey), Value: cdc.MustMarshal(&observerSet)}, + {Key: types.KeyPrefix(types.AllChainParamsKey), Value: cdc.MustMarshal(&chainParamsList)}, + //{Key: types.KeyPrefix(types.TSSHistoryKey), Value: cdc.MustMarshal(tssHistory)}, + {Key: types.KeyPrefix(types.TssFundMigratorKey), Value: cdc.MustMarshal(&tssFundMigrator)}, + {Key: types.KeyPrefix(types.PendingNoncesKeyPrefix), Value: cdc.MustMarshal(&pendingNonce)}, + {Key: types.KeyPrefix(types.ChainNoncesKey), Value: cdc.MustMarshal(&chainNonces)}, + {Key: types.KeyPrefix(types.NonceToCctxKeyPrefix), Value: cdc.MustMarshal(&nonceToCctx)}, + {Key: types.KeyPrefix(types.ParamsKey), Value: cdc.MustMarshal(¶ms)}, + }, + } + + tests := []struct { + name string + expectedLog string + }{ + {"CrosschainFlags", fmt.Sprintf("%v\n%v", *crosschainFlags, *crosschainFlags)}, + {"LastBlockObserverCount", fmt.Sprintf("%v\n%v", *lastBlockObserverCount, *lastBlockObserverCount)}, + {"NodeAccount", fmt.Sprintf("%v\n%v", *nodeAccount, *nodeAccount)}, + {"Keygen", fmt.Sprintf("%v\n%v", *keygen, *keygen)}, + {"BallotList", fmt.Sprintf("%v\n%v", ballotList, ballotList)}, + {"Ballot", fmt.Sprintf("%v\n%v", *ballot, *ballot)}, + {"TSS", fmt.Sprintf("%v\n%v", tss, tss)}, + {"ObserverSet", fmt.Sprintf("%v\n%v", observerSet, observerSet)}, + {"ChainParamsList", fmt.Sprintf("%v\n%v", chainParamsList, chainParamsList)}, + //{"TSSHistory", fmt.Sprintf("%v\n%v", tssHistory, tssHistory)}, + {"TssFundMigrator", fmt.Sprintf("%v\n%v", tssFundMigrator, tssFundMigrator)}, + {"PendingNonces", fmt.Sprintf("%v\n%v", pendingNonce, pendingNonce)}, + {"ChainNonces", fmt.Sprintf("%v\n%v", chainNonces, chainNonces)}, + {"NonceToCctx", fmt.Sprintf("%v\n%v", nonceToCctx, nonceToCctx)}, + {"Params", fmt.Sprintf("%v\n%v", params, params)}, + } + + for i, tt := range tests { + i, tt := i, tt + t.Run(tt.name, func(t *testing.T) { + require.Equal(t, tt.expectedLog, dec(kvPairs.Pairs[i], kvPairs.Pairs[i])) + }) + } +} diff --git a/x/observer/simulation/genesis.go b/x/observer/simulation/genesis.go new file mode 100644 index 0000000000..8d5812d8af --- /dev/null +++ b/x/observer/simulation/genesis.go @@ -0,0 +1,12 @@ +package simulation + +import ( + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/observer/types" +) + +func RandomizedGenState(simState *module.SimulationState) { + // We do not have any params that we need to randomize for this module + observerGenesis := types.DefaultGenesis() + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(observerGenesis) +} diff --git a/x/observer/simulation/operations.go b/x/observer/simulation/operations.go new file mode 100644 index 0000000000..4c07e744d6 --- /dev/null +++ b/x/observer/simulation/operations.go @@ -0,0 +1,90 @@ +package simulation + +import ( + "fmt" + "math/rand" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" +) + +const ( + OpWeightMsgTypeMsgEnableCCTX = "op_weight_msg_enable_crosschain_flags" + DefaultWeightMsgTypeMsgEnableCCTX = 650 +) + +// WeightedOperations for observer module +func WeightedOperations( + appParams simtypes.AppParams, cdc codec.JSONCodec, k keeper.Keeper, +) simulation.WeightedOperations { + var weightMsgTypeMsgEnableCCTX int + + appParams.GetOrGenerate(cdc, OpWeightMsgTypeMsgEnableCCTX, &weightMsgTypeMsgEnableCCTX, nil, + func(r *rand.Rand) { + weightMsgTypeMsgEnableCCTX = DefaultWeightMsgTypeMsgEnableCCTX + }) + + return simulation.WeightedOperations{ + simulation.NewWeightedOperation( + weightMsgTypeMsgEnableCCTX, + SimulateMsgTypeMsgEnableCCTX(k), + ), + } +} + +func SimulateMsgTypeMsgEnableCCTX(k keeper.Keeper) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + + policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) + if !found { + fmt.Println("Policies not found") + } + + // TODO setup simutils package + admin := policies.Items[0].Address + address, err := types.GetOperatorAddressFromAccAddress(admin) + if err != nil { + panic(err) + } + simAccount, found := simtypes.FindAccount(accounts, address) + if !found { + // TODO : remove panic + panic("admin account not found") + } + + msg := types.MsgEnableCCTX{ + Creator: simAccount.Address.String(), + EnableInbound: true, + EnableOutbound: false, + } + + err = msg.ValidateBasic() + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), err.Error()), nil, err + } + + txCtx := simulation.OperationInput{ + R: r, + App: app, + TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + Cdc: nil, + Msg: &msg, + MsgType: msg.Type(), + Context: ctx, + SimAccount: simAccount, + AccountKeeper: k.GetAuthKeeper(), + Bankkeeper: k.GetBankKeeper(), + ModuleName: types.ModuleName, + } + + return simulation.GenAndDeliverTxWithRandFees(txCtx) + } + +} diff --git a/x/observer/types/expected_keepers.go b/x/observer/types/expected_keepers.go index 2cf2b9ac75..2788187c94 100644 --- a/x/observer/types/expected_keepers.go +++ b/x/observer/types/expected_keepers.go @@ -2,6 +2,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -38,6 +39,7 @@ type AuthorityKeeper interface { // SetPolicies is solely used for the migration of policies from observer to authority SetPolicies(ctx sdk.Context, policies authoritytypes.Policies) + GetPolicies(ctx sdk.Context) (val authoritytypes.Policies, found bool) } type LightclientKeeper interface { @@ -57,3 +59,12 @@ type LightclientKeeper interface { parentHash []byte, ) } + +type BankKeeper interface { + SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins +} + +// AccountKeeper defines the expected account keeper used for simulations (noalias) +type AccountKeeper interface { + GetAccount(ctx sdk.Context, addr sdk.AccAddress) types.AccountI +} diff --git a/x/observer/types/keys.go b/x/observer/types/keys.go index 539eab83c0..bb2cdbe8e9 100644 --- a/x/observer/types/keys.go +++ b/x/observer/types/keys.go @@ -51,11 +51,12 @@ func ChainNoncesKeyPrefix(chainID int64) []byte { const ( BlameKey = "Blame-" - // TODO change identifier for VoterKey to something more descriptive + // TODO change identifier for VoterKey to BallotKey VoterKey = "Voter-value-" // AllChainParamsKey is the ke prefix for all chain params // NOTE: CoreParams is old name for AllChainParams we keep it as key value for backward compatibility + // TODO rename to ChainParamsListKey AllChainParamsKey = "CoreParams" ObserverSetKey = "ObserverSet-value-" @@ -64,20 +65,29 @@ const ( // NOTE: PermissionFlags is old name for CrosschainFlags we keep it as key value for backward compatibility CrosschainFlagsKey = "PermissionFlags-value-" + // TODO rename to LastObserverCountKey LastBlockObserverCountKey = "ObserverCount-value-" NodeAccountKey = "NodeAccount-value-" KeygenKey = "Keygen-value-" - BlockHeaderKey = "BlockHeader-value-" - BlockHeaderStateKey = "BlockHeaderState-value-" - BallotListKey = "BallotList-value-" - TSSKey = "TSS-value-" - TSSHistoryKey = "TSS-History-value-" + // TODO remove unsed keys + BlockHeaderKey = "BlockHeader-value-" + BlockHeaderStateKey = "BlockHeaderState-value-" + + // TODO rename to BallotListForHeightKey + BallotListKey = "BallotList-value-" + TSSKey = "TSS-value-" + TSSHistoryKey = "TSS-History-value-" + + // TODO rename to TssFundMigratorInfoKey TssFundMigratorKey = "FundsMigrator-value-" + // TODO Rename to PendingNoncesListKey PendingNoncesKeyPrefix = "PendingNonces-value-" ChainNoncesKey = "ChainNonces-value-" - NonceToCctxKeyPrefix = "NonceToCctx-value-" + + // TODO rename to NonceToCctxListKey + NonceToCctxKeyPrefix = "NonceToCctx-value-" ParamsKey = "Params-value-" ) From c4dfcd76b2121400615e35eee62cb326424f7f1d Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 5 Nov 2024 17:58:33 -0500 Subject: [PATCH 07/18] add comments for crosschain operations --- app/app.go | 2 +- app/modules.go | 3 +- contrib/docker-scripts/start.sh | 5 +- precompiles/bank/bank.go | 4 +- precompiles/bank/method_test.go | 2 +- tests/simulation/sim/sim_state.go | 17 +-- tests/simulation/sim_test.go | 3 +- testutil/keeper/fungible.go | 6 +- testutil/sample/crosschain.go | 24 ---- testutil/sample/observer.go | 1 + x/authority/module_simulation.go | 53 -------- ...ctx_orchestrator_validate_outbound_test.go | 2 +- .../keeper/msg_server_vote_inbound_tx.go | 6 +- .../keeper/msg_server_vote_inbound_tx_test.go | 4 +- x/crosschain/simulation/decoders.go | 1 + x/crosschain/simulation/genesis.go | 4 +- x/crosschain/simulation/operations.go | 89 +++++++++----- x/fungible/keeper/deposits_test.go | 22 ++-- x/fungible/keeper/evm_test.go | 94 +++++++-------- x/fungible/keeper/gas_coin_and_pool_test.go | 20 +-- x/fungible/keeper/gas_price_test.go | 26 ++-- x/fungible/keeper/gas_stability_pool.go | 2 +- x/fungible/keeper/gas_stability_pool_test.go | 10 +- .../keeper/grpc_query_code_hash_test.go | 4 +- .../grpc_query_gas_stability_pool_test.go | 4 +- x/fungible/keeper/keeper.go | 2 +- ..._server_deploy_fungible_coin_zrc20_test.go | 10 +- .../msg_server_deploy_system_contract_test.go | 14 +-- .../msg_server_remove_foreign_coin_test.go | 6 +- ...sg_server_update_contract_bytecode_test.go | 8 +- ...msg_server_update_gateway_contract_test.go | 8 +- .../msg_server_update_system_contract_test.go | 12 +- ...g_server_update_zrc20_withdraw_fee_test.go | 8 +- x/fungible/keeper/system_contract_test.go | 114 +++++++++--------- x/fungible/keeper/v2_deposits_test.go | 8 +- x/fungible/keeper/zeta_test.go | 2 +- .../keeper/zevm_message_passing_test.go | 18 +-- .../keeper/zrc20_cosmos_coin_mapping_test.go | 8 +- x/fungible/keeper/zrc20_methods_test.go | 4 +- x/fungible/module.go | 2 +- x/fungible/simulation/operations.go | 2 +- 41 files changed, 292 insertions(+), 342 deletions(-) delete mode 100644 x/authority/module_simulation.go diff --git a/app/app.go b/app/app.go index 61d79f09ea..eb4a59b774 100644 --- a/app/app.go +++ b/app/app.go @@ -446,7 +446,7 @@ func New( // app.IBCKeeper.ChannelKeeper, // app.IBCKeeper.ChannelKeeper, // &app.IBCKeeper.PortKeeper, - // app.GetAuthKeeper, + // app.AccountKeeper, // app.BankKeeper, // scopedTransferKeeper, //) diff --git a/app/modules.go b/app/modules.go index f8152ed4ff..0feeb7cb9a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -146,7 +146,7 @@ func simulationModules( //gov.NewAppModule( // appCodec, // &app.GovKeeper, - // app.GetAuthKeeper, + // app.AccountKeeper, // app.BankKeeper, // app.GetSubspace(govtypes.ModuleName), //), @@ -178,7 +178,6 @@ func simulationModules( evm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - authoritymodule.NewAppModule(appCodec, app.AuthorityKeeper), crosschainmodule.NewAppModule(appCodec, app.CrosschainKeeper), observermodule.NewAppModule(appCodec, *app.ObserverKeeper), fungiblemodule.NewAppModule(appCodec, app.FungibleKeeper), diff --git a/contrib/docker-scripts/start.sh b/contrib/docker-scripts/start.sh index 88e2dcfc1f..bb151a49fe 100644 --- a/contrib/docker-scripts/start.sh +++ b/contrib/docker-scripts/start.sh @@ -332,7 +332,4 @@ else logt "Start Network" start_network -fi - - -129464826329163654981708 - 128304687134120426209500 = 1164123194043 \ No newline at end of file +fi \ No newline at end of file diff --git a/precompiles/bank/bank.go b/precompiles/bank/bank.go index 266235ff6e..51a559edd3 100644 --- a/precompiles/bank/bank.go +++ b/precompiles/bank/bank.go @@ -66,8 +66,8 @@ func NewIBankContract( kvGasConfig storetypes.GasConfig, ) *Contract { accAddress := sdk.AccAddress(ContractAddress.Bytes()) - if fungibleKeeper.GetAccountKeeper().GetAccount(ctx, accAddress) == nil { - fungibleKeeper.GetAccountKeeper().SetAccount(ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + if fungibleKeeper.GetAuthKeeper().GetAccount(ctx, accAddress) == nil { + fungibleKeeper.GetAuthKeeper().SetAccount(ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) } // Instantiate the ZRC20 ABI only one time. diff --git a/precompiles/bank/method_test.go b/precompiles/bank/method_test.go index fe96437ada..e416187490 100644 --- a/precompiles/bank/method_test.go +++ b/precompiles/bank/method_test.go @@ -513,7 +513,7 @@ func setupChain(t *testing.T) testSuite { // Make sure the account store is initialized. // This is completely needed for accounts to be created in the state. - fungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + fungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) // Deploy system contracts in order to deploy a ZRC20 token. deploySystemContracts(t, ctx, fungibleKeeper, *sdkKeepers.EvmKeeper) diff --git a/tests/simulation/sim/sim_state.go b/tests/simulation/sim/sim_state.go index 3a5e044ea4..499b988aee 100644 --- a/tests/simulation/sim/sim_state.go +++ b/tests/simulation/sim/sim_state.go @@ -35,6 +35,7 @@ const ( // AppStateFn returns the initial application state using a genesis or the simulation parameters. // It panics if the user provides files for both of them. // If a file is not given for the genesis or the sim params, it creates a randomized one. +// All modifications to the genesis state should be done in this function. func AppStateFn( cdc codec.Codec, simManager *module.SimulationManager, @@ -168,11 +169,13 @@ func AppStateFn( // we should replace the EvmDenom with BondDenom evmState.Params.EvmDenom = stakingState.Params.BondDenom - observers := []string{} + observers := make([]string, 0) + // Get all the operator addresses of the validators. + // The observer set can be a subset of the validator set for _, validator := range stakingState.Validators { accAddress, err := observertypes.GetAccAddressFromOperatorAddress(validator.OperatorAddress) if err != nil { - panic(err) + continue } observers = append(observers, accAddress.String()) } @@ -182,12 +185,12 @@ func AppStateFn( observers[i], observers[j] = observers[j], observers[i] }) + // Pick a random number of observers to add to the observer set numObservers := r.Intn(11) + 5 if numObservers > len(observers) { numObservers = len(observers) } observers = observers[:numObservers] - fmt.Println("Added random observers: ", len(observers)) // update the observer genesis state observerStateBz, ok := rawState[observertypes.ModuleName] @@ -202,16 +205,16 @@ func AppStateFn( tss := sample.Tss() observerState.Tss = &tss + // Pick a random account to be the admin of all policies + randomAccount := accs[r.Intn(len(accs))] authorityStateBz, ok := rawState[authoritytypes.ModuleName] if !ok { panic("authority genesis state is missing") } + + // update the authority genesis state authorityState := new(authoritytypes.GenesisState) cdc.MustUnmarshalJSON(authorityStateBz, authorityState) - randomAccount := accs[r.Intn(len(accs))] - - fmt.Println("Adding random account to all policies: ", randomAccount.Address.String()) - policies := authoritytypes.Policies{ Items: []*authoritytypes.Policy{ { diff --git a/tests/simulation/sim_test.go b/tests/simulation/sim_test.go index d196ec1929..18d803cc5f 100644 --- a/tests/simulation/sim_test.go +++ b/tests/simulation/sim_test.go @@ -183,8 +183,7 @@ func TestFullAppSimulation(t *testing.T) { simApp, err := simutils.NewSimApp(logger, db, appOptions, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) require.NoError(t, err) - //config.ExportStatsPath = os.TempDir() + "/stats.json" - // define a new write syncer to write the stats to a file + // Run randomized simulation blockedAddresses := simApp.ModuleAccountAddrs() _, _, simerr := simulation.SimulateFromSeed( t, diff --git a/testutil/keeper/fungible.go b/testutil/keeper/fungible.go index 78398c0016..5b51d08934 100644 --- a/testutil/keeper/fungible.go +++ b/testutil/keeper/fungible.go @@ -53,7 +53,7 @@ var ( func initFungibleKeeper( cdc codec.Codec, ss store.CommitMultiStore, - accountKeeper types.AccountKeeper, + authKeeper types.AccountKeeper, bankKeepr types.BankKeeper, evmKeeper types.EVMKeeper, observerKeeper types.ObserverKeeper, @@ -68,7 +68,7 @@ func initFungibleKeeper( cdc, storeKey, memKey, - accountKeeper, + authKeeper, evmKeeper, bankKeepr, observerKeeper, @@ -207,7 +207,7 @@ func GetFungibleAuthorityMock(t testing.TB, keeper *keeper.Keeper) *fungiblemock } func GetFungibleAccountMock(t testing.TB, keeper *keeper.Keeper) *fungiblemocks.FungibleAccountKeeper { - fak, ok := keeper.GetAccountKeeper().(*fungiblemocks.FungibleAccountKeeper) + fak, ok := keeper.GetAuthKeeper().(*fungiblemocks.FungibleAccountKeeper) require.True(t, ok) return fak } diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 827b3e4d7a..25733e1fef 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -217,30 +217,6 @@ func CrossChainTx(t *testing.T, index string) *types.CrossChainTx { } } -func RandomCCTX(r *rand.Rand) types.CrossChainTx { - index := StringRandom(r, 32) - status := &types.Status{ - Status: types.CctxStatus_PendingInbound, - StatusMessage: "", - ErrorMessage: "", - LastUpdateTimestamp: 0, - IsAbortRefunded: false, - CreatedTimestamp: 0, - } - - return types.CrossChainTx{ - Creator: AccAddress(), - Index: GetCctxIndexFromString(index), - ZetaFees: math.NewUint(uint64(r.Int63())), - RelayedMessage: StringRandom(r, 32), - CctxStatus: status, - InboundParams: InboundParams(r), - OutboundParams: []*types.OutboundParams{OutboundParams(r), OutboundParams(r)}, - ProtocolContractVersion: types.ProtocolContractVersion_V1, - RevertOptions: types.NewEmptyRevertOptions(), - } -} - // CustomCctxsInBlockRange create 1 cctx per block in block range [lowBlock, highBlock] (inclusive) func CustomCctxsInBlockRange( t *testing.T, diff --git a/testutil/sample/observer.go b/testutil/sample/observer.go index 3cea9c2e88..38513c8ff6 100644 --- a/testutil/sample/observer.go +++ b/testutil/sample/observer.go @@ -120,6 +120,7 @@ func ChainParamsList() (cpl types.ChainParamsList) { } // TODO rename to TSS +// https://github.com/zeta-chain/node/issues/3098 func Tss() types.TSS { _, pubKey, _ := testdata.KeyTestPubAddr() spk, err := cosmos.Bech32ifyPubKey(cosmos.Bech32PubKeyTypeAccPub, pubKey) diff --git a/x/authority/module_simulation.go b/x/authority/module_simulation.go deleted file mode 100644 index 7c39d378bf..0000000000 --- a/x/authority/module_simulation.go +++ /dev/null @@ -1,53 +0,0 @@ -package authority - -import ( - "math/rand" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - simtypes "github.com/cosmos/cosmos-sdk/types/simulation" -) - -const ( - // #nosec G101 not a hardcoded credential - opWeightMsgUpdateClientParams = "op_weight_msg_update_client_params" - defaultWeightMsgUpdateClientParams int = 100 -) - -// GenerateGenesisState creates a randomized GenState of the module -func (AppModule) GenerateGenesisState(simState *module.SimulationState) { - //observers := make([]string, len(simState.Accounts)) - //for _, account := range simState.Accounts { - // observers = append(observers, account.Address.String()) - //} - //observerGenesis := types.DefaultGenesis() - //observerGenesis.Observers = types.ObserverSet{ObserverList: observers} - //simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(observerGenesis) - -} - -// ProposalContents doesn't return any content functions for governance proposals -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { - return nil -} - -func (AppModule) ProposalMsgs(_ module.SimulationState) []simtypes.WeightedProposalMsg { - return nil -} - -// RegisterStoreDecoder registers a decoder -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} - -// WeightedOperations returns the all the gov module operations with their respective weights. -func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { - operations := make([]simtypes.WeightedOperation, 0) - - var weightMsgUpdateClientParams int - simState.AppParams.GetOrGenerate(simState.Cdc, opWeightMsgUpdateClientParams, &weightMsgUpdateClientParams, nil, - func(_ *rand.Rand) { - weightMsgUpdateClientParams = defaultWeightMsgUpdateClientParams - }, - ) - - return operations -} diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go index c153f726a3..501848b3a0 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go @@ -188,7 +188,7 @@ func TestKeeper_ValidateFailedOutbound(t *testing.T) { t.Run("successfully revert failed outbound if original sender is a contract", func(t *testing.T) { k, ctx, sdkk, zk := keepertest.CrosschainKeeper(t) - _ = zk.FungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + _ = zk.FungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) cctx := GetERC20Cctx(t, sample.EthAddress(), chains.Goerli, "", big.NewInt(42)) cctx.InboundParams.CoinType = coin.CoinType_Zeta diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx.go b/x/crosschain/keeper/msg_server_vote_inbound_tx.go index 594473b51f..263b7b23bc 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx.go @@ -81,7 +81,6 @@ func (k msgServer) VoteInbound( // This may happen if the same inbound is observed twice where msg.Digest gives a different index // This check prevents double spending if isNew { - //fmt.Println("\nNew Ballot") if k.IsFinalizedInbound(tmpCtx, msg.InboundHash, msg.SenderChainId, msg.EventIndex) { return nil, sdkerrors.Wrapf( types.ErrObservedTxAlreadyFinalized, @@ -95,9 +94,6 @@ func (k msgServer) VoteInbound( } commit() - //if !finalized && !isNew { - // fmt.Println("\nNot Finalized Ballot") - //} // If the ballot is not finalized return nil here to add vote to commit state if !finalized { return &types.MsgVoteInboundResponse{}, nil @@ -109,7 +105,7 @@ func (k msgServer) VoteInbound( } // Save the inbound CCTX to the store. This is called irrespective of the status of the CCTX or the outcome of the process function. k.SaveObservedInboundInformation(ctx, cctx, msg.EventIndex) - //fmt.Println("Saved Inbound successfully :", cctx.Index) + return &types.MsgVoteInboundResponse{}, nil } diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go index 5aa70be3bd..4f12536a8d 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go @@ -50,6 +50,8 @@ func TestKeeper_VoteInbound(t *testing.T) { k, ctx, sdkk, zk := keepertest.CrosschainKeeper(t) msgServer := keeper.NewMsgServerImpl(*k) validatorList := setObservers(t, k, ctx, zk) + + // https://github.com/zeta-chain/node/issues/3101 to, from := int64(1337), int64(101) supportedChains := zk.ObserverKeeper.GetSupportedChains(ctx) for _, chain := range supportedChains { @@ -60,9 +62,9 @@ func TestKeeper_VoteInbound(t *testing.T) { to = chain.ChainId } } - zk.ObserverKeeper.SetTSS(ctx, sample.Tss()) msg := sample.InboundVote(0, from, to) + zk.ObserverKeeper.SetTSS(ctx, sample.Tss()) err := sdkk.EvmKeeper.SetAccount(ctx, ethcommon.HexToAddress(msg.Receiver), statedb.Account{ Nonce: 0, diff --git a/x/crosschain/simulation/decoders.go b/x/crosschain/simulation/decoders.go index 122d8e90ed..e65f294946 100644 --- a/x/crosschain/simulation/decoders.go +++ b/x/crosschain/simulation/decoders.go @@ -9,6 +9,7 @@ import ( "github.com/zeta-chain/node/x/crosschain/types" ) +// TODO Add comments in this pr to explain the purpose of the function func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { diff --git a/x/crosschain/simulation/genesis.go b/x/crosschain/simulation/genesis.go index ccb49be702..47977fbc2e 100644 --- a/x/crosschain/simulation/genesis.go +++ b/x/crosschain/simulation/genesis.go @@ -6,8 +6,8 @@ import ( ) func RandomizedGenState(simState *module.SimulationState) { - // We do not have any params that we need to randomize for this module - // The default state is empty which is sufficient for now , this can be modified later weh we add operations that need existing state data to be processed + // Randomization is primarily done for params present in the application state + // We do not need to randomize the genesis state for the crosschain module for now. crosschainGenesis := types.DefaultGenesis() simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(crosschainGenesis) } diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index 947883c0e0..f5648efdc8 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -20,6 +20,12 @@ import ( observerTypes "github.com/zeta-chain/node/x/observer/types" ) +// Simulation operation weights constants +// Operation weights are used by the simulation program to simulate the weight of different operations. +// This decides what percentage of a certain type of operation is part of a block. +// Based on the weights assigned in the cosmos sdk modules , 100 seems to the max weight used , and therefore guarantees that at least one operation of that type is present in a block. +// TODO Add more details to comment based on what the number represents in terms of percentage of operations in a block +// https://github.com/zeta-chain/node/issues/3100 const ( DefaultWeightMsgAddOutboundTracker = 50 DefaultWeightAddInboundTracker = 50 @@ -165,6 +171,10 @@ func operationSimulateVoteInbound(k keeper.Keeper, msg types.MsgVoteInbound, sim CoinsSpentInMsg: spendable, } + // Generate and deliver the transaction using the function defined by us instead of using the default function provided by the cosmos-sdk + // The main difference between the two functions is that the one defined by us does not error out if the vote fails. + // We need this behaviour as the votes are assigned to future operations, i.e., they are scheduled to be executed in a future block. We do not know at the time of scheduling if the vote will be successful or not. + // There might be multiple reasons for a vote to fail , like the observer not being present in the observer set, the observer not being an observer, etc. return GenAndDeliverTxWithRandFees(txCtx) } } @@ -177,7 +187,7 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // column 4: 40% vote // column 5: 15% vote // column 6: noone votes - // All columns sum to 100 for simplicity, but this is arbitrary and + // All columns sum to 100 for simplicity, but this is arbitrary and can be changed numVotesTransitionMatrix, _ := simulation.CreateTransitionMatrix([][]int{ {20, 10, 0, 0, 0, 0}, {55, 50, 20, 10, 0, 0}, @@ -198,20 +208,24 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - //var ( - // randomChainSender = GetRandomChainID(r, supportedChains) - // randomChainReceiver = GetRandomChainID(r, supportedChains) - // sender = sample.EthAddress() - // receiver = sample.EthAddress() - // amount = r.Uint64() - // coinType = coin.CoinType_Gas - // hash = sample.Hash().String() - // gasLimit = r.Uint64() - //) // TODO : randomize these values - to, from := int64(101), int64(101) - msg := sample.InboundVote(0, from, to) + // Right now we use a constant value for cctx creation , this is the same as the one used in unit tests for the successful condition. + // TestKeeper_VoteInbound/successfully vote on evm deposit + // But this can improved by adding more randomization + //https://github.com/zeta-chain/node/issues/3101 + to, from := int64(1337), int64(101) + supportedChains := k.GetObserverKeeper().GetSupportedChains(ctx) + for _, chain := range supportedChains { + if chains.IsEVMChain(chain.ChainId, []chains.Chain{}) { + from = chain.ChainId + } + if chains.IsZetaChain(chain.ChainId, []chains.Chain{}) { + to = chain.ChainId + } + } + msg := sample.InboundVote(0, from, to) + // Pick a random observer to create the ballot simAccount, firstVoter, err := GetRandomAccountAndObserver(r, ctx, k, accs) if err != nil { return simtypes.NoOpMsg(types.ModuleName, authz.InboundVoter.String(), "unable to get random account and observer"), nil, nil @@ -222,6 +236,11 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { firstMsg := msg firstMsg.Creator = firstVoter + err = firstMsg.ValidateBasic() + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to validate first inbound vote"), nil, err + } + tx, err := simtestutil.GenSignedMockTx( r, txGen, @@ -237,7 +256,8 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to generate mock tx"), nil, err } - // We can return error here as we we can guarantee that the first vote will be successful. Since we query the observer set before adding votes + // We can return error here as we can guarantee that the first vote will be successful. + // Since we query the observer set before adding votes _, _, err = app.SimDeliver(txGen.TxEncoder(), tx) if err != nil { return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to deliver tx"), nil, err @@ -256,17 +276,13 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { curNumVotesState = numVotesTransitionMatrix.NextState(r, curNumVotesState) numVotes := int(math.Ceil(float64(len(observerSet.ObserverList)) * statePercentageArray[curNumVotesState])) - // 1.2) select who votes and when + // 1.2) select who votes whoVotes := r.Perm(len(observerSet.ObserverList)) // didntVote := whoVotes[numVotes:] whoVotes = whoVotes[:numVotes] - //ballotMaturityPeriod := 20 + var fops []simtypes.FutureOperation - //fmt.Printf("\nScheduling %d votes for ballot : %s at height : %d", numVotes, msg.Digest(), ctx.BlockHeight()+1) - //if numVotes > 3 { - // fmt.Printf("More than 3 votes : %s", msg.Digest()) - //} for _, observerIdx := range whoVotes { observerAddress := observerSet.ObserverList[observerIdx] if observerAddress == firstVoter { @@ -279,24 +295,33 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // 1.3) schedule the vote votingMsg := msg votingMsg.Creator = observerAddress + + e := votingMsg.ValidateBasic() + if e != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to validate voting msg"), nil, err + } + fops = append(fops, simtypes.FutureOperation{ + // Submit all subsequent votes in the next block BlockHeight: int(ctx.BlockHeight() + 1), Op: operationSimulateVoteInbound(k, votingMsg, observerAccount), }) } - return opMsg, fops, nil } } +// SimulateMsgVoteGasPrice generates a MsgVoteGasPrice and delivers it func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { + // System contracts are deployed on the first block , so we cannot vote on gas prices before that if ctx.BlockHeight() <= 1 { return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "block height less than 1"), nil, nil } + // Get a random account and observer simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) if err != nil { return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "unable to get random account and observer"), nil, err @@ -310,6 +335,8 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { } randomChainID := GetRandomChainID(r, supportedChains) + // Vote for random gas price. Gas prices do not use a ballot system, so we can vote directly without having to schedule future operations. + // The random nature of the price might create weird gas prices for the chain, but it is fine for now. We can remove the randomness if needed msg := types.MsgVoteGasPrice{ Creator: randomObserver, ChainId: randomChainID, @@ -319,6 +346,11 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { Supply: fmt.Sprintf("%d", r.Int63()), } + err = msg.ValidateBasic() + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "unable to validate vote gas price msg"), nil, err + } + txCtx := simulation.OperationInput{ R: r, App: app, @@ -348,6 +380,7 @@ func GetRandomChainID(r *rand.Rand, chains []chains.Chain) int64 { return chains[idx].ChainId } +// GetRandomAccountAndObserver returns a random account and the associated observer address func GetRandomAccountAndObserver(r *rand.Rand, ctx sdk.Context, k keeper.Keeper, accounts []simtypes.Account) (simtypes.Account, string, error) { observers, found := k.GetObserverKeeper().GetObserverSet(ctx) if !found { @@ -360,19 +393,14 @@ func GetRandomAccountAndObserver(r *rand.Rand, ctx sdk.Context, k keeper.Keeper, randomObserver := GetRandomObserver(r, observers.ObserverList) - // TODO : use GetObserverAccount - operatorAddress, err := observerTypes.GetOperatorAddressFromAccAddress(randomObserver) + simAccount, err := GetObserverAccount(randomObserver, accounts) if err != nil { - return simtypes.Account{}, "", fmt.Errorf("validator not found for observer ") - } - - simAccount, found := simtypes.FindAccount(accounts, operatorAddress) - if !found { - return simtypes.Account{}, "", fmt.Errorf("operator account not found") + return simtypes.Account{}, "", err } return simAccount, randomObserver, nil } +// GetObserverAccount returns the account associated with the observer address from the list of accounts provided func GetObserverAccount(observerAddress string, accounts []simtypes.Account) (simtypes.Account, error) { operatorAddress, err := observerTypes.GetOperatorAddressFromAccAddress(observerAddress) if err != nil { @@ -406,7 +434,8 @@ func GenAndDeliverTxWithRandFees(txCtx simulation.OperationInput) (simtypes.Oper return GenAndDeliverTx(txCtx, fees) } -// GenAndDeliverTx generates a transactions and delivers it. +// GenAndDeliverTx generates a transactions and delivers it with the provided fees. +// This function does not return an error if the transaction fails to deliver. func GenAndDeliverTx(txCtx simulation.OperationInput, fees sdk.Coins) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address) tx, err := simtestutil.GenSignedMockTx( diff --git a/x/fungible/keeper/deposits_test.go b/x/fungible/keeper/deposits_test.go index 5a2bc133e8..3958ae191e 100644 --- a/x/fungible/keeper/deposits_test.go +++ b/x/fungible/keeper/deposits_test.go @@ -24,7 +24,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit gas coin for transfers", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -57,7 +57,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit non-gas coin for transfers", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -91,7 +91,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if trying to call a contract with data to a EOC", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -121,7 +121,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit coin for transfers with liquidity cap not reached", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -169,7 +169,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if coin paused", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -203,7 +203,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if liquidity cap reached", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -246,7 +246,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if gas coin not found", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -273,7 +273,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if zrc20 not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -302,7 +302,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should return contract call if receiver is a contract", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -342,7 +342,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("should fail if call contract fails", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId @@ -379,7 +379,7 @@ func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { t.Run("can deposit using V2", func(t *testing.T) { // setup gas coin k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainList := chains.DefaultChainsList() chain := chainList[0].ChainId diff --git a/x/fungible/keeper/evm_test.go b/x/fungible/keeper/evm_test.go index 864f724d82..7c0ef0bf00 100644 --- a/x/fungible/keeper/evm_test.go +++ b/x/fungible/keeper/evm_test.go @@ -223,7 +223,7 @@ func assertExampleBarValue( func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("should error if chain not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -243,7 +243,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -265,7 +265,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -288,7 +288,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("can deploy the zrc20 contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -344,7 +344,7 @@ func TestKeeper_DeployZRC20Contract(t *testing.T) { t.Run("can deploy the zrc20 contract without a gateway address", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -408,7 +408,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) wzeta, uniswapV2Factory, uniswapV2Router, _, _ := deploySystemContractsWithMockEvmKeeper( @@ -428,7 +428,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -441,7 +441,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -454,7 +454,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockFailedContractDeployment(ctx, t, k) @@ -465,7 +465,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { t.Run("can deploy the system contracts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // deploy the system contracts wzeta, uniswapV2Factory, uniswapV2Router, _, systemContract := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -493,7 +493,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { t.Run("can deposit into wzeta", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -523,7 +523,7 @@ func TestKeeper_DeploySystemContracts(t *testing.T) { func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -549,7 +549,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should deposit and call the contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -602,7 +602,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should return a revert error when the underlying contract call revert", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -633,7 +633,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { t.Run("should revert if the underlying contract doesn't exist", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -658,7 +658,7 @@ func TestKeeper_DepositZRC20AndCallContract(t *testing.T) { func TestKeeper_CallEVMWithData(t *testing.T) { t.Run("should return a revert error when the contract call revert", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // Deploy example contract, err := k.DeployContract(ctx, contracts.ExampleMetaData) @@ -955,7 +955,7 @@ func TestKeeper_CallEVMWithData(t *testing.T) { func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if pack ctor args fails", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) addr, err := k.DeployContract(ctx, zrc20.ZRC20MetaData, "") require.ErrorIs(t, err, types.ErrABIGet) require.Empty(t, addr) @@ -963,7 +963,7 @@ func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if metadata bin empty", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) metadata := &bind.MetaData{ ABI: wzeta.WETH9MetaData.ABI, Bin: "", @@ -975,7 +975,7 @@ func TestKeeper_DeployContract(t *testing.T) { t.Run("should error if metadata cant be decoded", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) metadata := &bind.MetaData{ ABI: wzeta.WETH9MetaData.ABI, Bin: "0x1", @@ -998,7 +998,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1014,7 +1014,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1031,7 +1031,7 @@ func TestKeeper_QueryProtocolFlatFee(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1055,7 +1055,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1071,7 +1071,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1088,7 +1088,7 @@ func TestKeeper_QueryGasLimit(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1112,7 +1112,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1128,7 +1128,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1145,7 +1145,7 @@ func TestKeeper_QueryChainIDFromContract(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1169,7 +1169,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1185,7 +1185,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1202,7 +1202,7 @@ func TestKeeper_TotalSupplyZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1226,7 +1226,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1242,7 +1242,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1259,7 +1259,7 @@ func TestKeeper_BalanceOfZRC4(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1283,7 +1283,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1299,7 +1299,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1316,7 +1316,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1339,7 +1339,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1362,7 +1362,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1389,7 +1389,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1416,7 +1416,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) mockEVMKeeper.On("WithChainID", mock.Anything).Maybe().Return(ctx) @@ -1447,7 +1447,7 @@ func TestKeeper_QueryZRC20Data(t *testing.T) { func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should call on receive on connector which calls onZetaMessage on sample DAPP", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -1498,7 +1498,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should error if system contract not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) require.NoError(t, err) @@ -1514,7 +1514,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { t.Run("should error in contract call reverts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) @@ -1533,7 +1533,7 @@ func TestKeeper_CallOnReceiveZevmConnector(t *testing.T) { func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should call on revert on connector which calls onZetaRevert on sample DAPP", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -1582,7 +1582,7 @@ func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should error if system contract not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) require.NoError(t, err) @@ -1599,7 +1599,7 @@ func TestKeeper_CallOnRevertZevmConnector(t *testing.T) { t.Run("should error in contract call reverts", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) diff --git a/x/fungible/keeper/gas_coin_and_pool_test.go b/x/fungible/keeper/gas_coin_and_pool_test.go index 7327d1c11b..186828c8b4 100644 --- a/x/fungible/keeper/gas_coin_and_pool_test.go +++ b/x/fungible/keeper/gas_coin_and_pool_test.go @@ -155,7 +155,7 @@ func setupZRC20Pool( func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { t.Run("can setup a new chain gas coin", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -172,7 +172,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -194,7 +194,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { }) bankMock := keepertest.GetFungibleBankMock(t, k) bankMock.On("MintCoins", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(errors.New("err")) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -216,7 +216,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -244,7 +244,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -275,7 +275,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -307,7 +307,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -340,7 +340,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -380,7 +380,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) @@ -423,7 +423,7 @@ func TestKeeper_SetupChainGasCoinAndPool(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) diff --git a/x/fungible/keeper/gas_price_test.go b/x/fungible/keeper/gas_price_test.go index 43ca4cbeff..e48392eb45 100644 --- a/x/fungible/keeper/gas_price_test.go +++ b/x/fungible/keeper/gas_price_test.go @@ -16,7 +16,7 @@ import ( func TestKeeper_SetGasPrice(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, _, _, system := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -50,7 +50,7 @@ func TestKeeper_SetGasPrice(t *testing.T) { func TestKeeper_SetGasPriceContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.SetGasPrice(ctx, big.NewInt(1), big.NewInt(42)) require.ErrorIs(t, err, types.ErrContractNotFound) @@ -58,7 +58,7 @@ func TestKeeper_SetGasPriceContractNotFound(t *testing.T) { func TestKeeper_SetNilGasPrice(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.SetGasPrice(ctx, big.NewInt(1), nil) require.ErrorIs(t, err, types.ErrNilGasPrice) @@ -66,7 +66,7 @@ func TestKeeper_SetNilGasPrice(t *testing.T) { func TestKeeper_SetGasPriceContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) k.SetSystemContract(ctx, types.SystemContract{}) @@ -79,7 +79,7 @@ func TestKeeper_SetGasPriceReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -91,7 +91,7 @@ func TestKeeper_SetGasPriceReverts(t *testing.T) { func TestKeeper_SetGasCoin(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -105,7 +105,7 @@ func TestKeeper_SetGasCoin(t *testing.T) { func TestKeeper_SetGasCoinContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() err := k.SetGasCoin(ctx, big.NewInt(1), gas) @@ -114,7 +114,7 @@ func TestKeeper_SetGasCoinContractNotFound(t *testing.T) { func TestKeeper_SetGasCoinContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) gas := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -128,7 +128,7 @@ func TestKeeper_SetGasCoinReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -140,7 +140,7 @@ func TestKeeper_SetGasCoinReverts(t *testing.T) { func TestKeeper_SetGasZetaPool(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() _, _, _, _, system := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -175,7 +175,7 @@ func TestKeeper_SetGasZetaPool(t *testing.T) { func TestKeeper_SetGasZetaPoolContractNotFound(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() err := k.SetGasZetaPool(ctx, big.NewInt(1), zrc20) @@ -184,7 +184,7 @@ func TestKeeper_SetGasZetaPoolContractNotFound(t *testing.T) { func TestKeeper_SetGasZetaPoolContractIs0x0(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) zrc20 := sample.EthAddress() deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -198,7 +198,7 @@ func TestKeeper_SetGasZetaPoolReverts(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) diff --git a/x/fungible/keeper/gas_stability_pool.go b/x/fungible/keeper/gas_stability_pool.go index 4091d9bded..2a68d68582 100644 --- a/x/fungible/keeper/gas_stability_pool.go +++ b/x/fungible/keeper/gas_stability_pool.go @@ -12,7 +12,7 @@ import ( func (k Keeper) EnsureGasStabilityPoolAccountCreated(ctx sdk.Context) { address := types.GasStabilityPoolAddress() - ak := k.GetAccountKeeper() + ak := k.GetAuthKeeper() accExists := ak.HasAccount(ctx, address) if !accExists { ak.SetAccount(ctx, ak.NewAccountWithAddress(ctx, address)) diff --git a/x/fungible/keeper/gas_stability_pool_test.go b/x/fungible/keeper/gas_stability_pool_test.go index 3506f5dd85..7105991a65 100644 --- a/x/fungible/keeper/gas_stability_pool_test.go +++ b/x/fungible/keeper/gas_stability_pool_test.go @@ -15,18 +15,18 @@ func TestKeeper_EnsureGasStabilityPoolAccountCreated(t *testing.T) { k, ctx, _, _ := testkeeper.FungibleKeeper(t) // account doesn't exist - acc := k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc := k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.Nil(t, acc) // create the account k.EnsureGasStabilityPoolAccountCreated(ctx) - acc = k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc = k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.NotNil(t, acc) require.Equal(t, types.GasStabilityPoolAddress(), acc.GetAddress()) // can call the method again without side effects k.EnsureGasStabilityPoolAccountCreated(ctx) - acc2 := k.GetAccountKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) + acc2 := k.GetAuthKeeper().GetAccount(ctx, types.GasStabilityPoolAddress()) require.NotNil(t, acc2) require.True(t, acc.GetAddress().Equals(acc2.GetAddress())) require.Equal(t, acc.GetAccountNumber(), acc2.GetAccountNumber()) @@ -37,7 +37,7 @@ func TestKeeper_EnsureGasStabilityPoolAccountCreated(t *testing.T) { func TestKeeper_FundGasStabilityPool(t *testing.T) { t.Run("should error if system contracts not deployed", func(t *testing.T) { k, ctx, _, _ := testkeeper.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) @@ -54,7 +54,7 @@ func TestKeeper_FundGasStabilityPool(t *testing.T) { t.Run("can fund the gas stability pool and withdraw", func(t *testing.T) { k, ctx, sdkk, _ := testkeeper.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) diff --git a/x/fungible/keeper/grpc_query_code_hash_test.go b/x/fungible/keeper/grpc_query_code_hash_test.go index d18504ae54..452bbe3e39 100644 --- a/x/fungible/keeper/grpc_query_code_hash_test.go +++ b/x/fungible/keeper/grpc_query_code_hash_test.go @@ -21,7 +21,7 @@ func TestKeeper_CodeHash(t *testing.T) { t.Run("should return code hash", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) acc := sdkk.EvmKeeper.GetAccount(ctx, wzeta) @@ -57,7 +57,7 @@ func TestKeeper_CodeHash(t *testing.T) { t.Run("should return error if account is not a contract", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.CodeHash(ctx, &types.QueryCodeHashRequest{ Address: types.ModuleAddressEVM.Hex(), diff --git a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go index 95e6317375..08723fa4af 100644 --- a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go +++ b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go @@ -52,7 +52,7 @@ func TestKeeper_GasStabilityPoolBalance(t *testing.T) { t.Run("should return balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) chainID := 5 - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) setupGasCoin(t, ctx, k, sdkk.EvmKeeper, int64(chainID), "foobar", "foobar") @@ -107,7 +107,7 @@ func TestKeeper_GasStabilityPoolBalanceAll(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseObserverMock: true, }) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) observerMock := keepertest.GetFungibleObserverMock(t, k) chainID := 5 diff --git a/x/fungible/keeper/keeper.go b/x/fungible/keeper/keeper.go index 6d0f4a44bb..6e4af7f194 100644 --- a/x/fungible/keeper/keeper.go +++ b/x/fungible/keeper/keeper.go @@ -50,7 +50,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } -func (k Keeper) GetAccountKeeper() types.AccountKeeper { +func (k Keeper) GetAuthKeeper() types.AccountKeeper { return k.authKeeper } diff --git a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go index 07beedc52f..c849736883 100644 --- a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go +++ b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go @@ -23,7 +23,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() chainID := getValidChainID(t) @@ -101,7 +101,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -129,7 +129,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() chainID := getValidChainID(t) @@ -156,7 +156,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -185,7 +185,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_deploy_system_contract_test.go b/x/fungible/keeper/msg_server_deploy_system_contract_test.go index 634978992e..dd06a187c9 100644 --- a/x/fungible/keeper/msg_server_deploy_system_contract_test.go +++ b/x/fungible/keeper/msg_server_deploy_system_contract_test.go @@ -24,7 +24,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -47,7 +47,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) nonadmin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -64,7 +64,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -83,7 +83,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -105,7 +105,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -128,7 +128,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -153,7 +153,7 @@ func TestMsgServer_DeploySystemContracts(t *testing.T) { UseEVMMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go index eee8edcb96..9b147ec8ff 100644 --- a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go +++ b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go @@ -20,7 +20,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() @@ -49,7 +49,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) admin := sample.AccAddress() @@ -72,7 +72,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go index 42a6bdc1e8..a863b24a82 100644 --- a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go +++ b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go @@ -34,7 +34,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() msgServer := keeper.NewMsgServerImpl(*k) @@ -166,7 +166,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{ UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() msgServer := keeper.NewMsgServerImpl(*k) @@ -267,7 +267,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -288,7 +288,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_gateway_contract_test.go b/x/fungible/keeper/msg_server_update_gateway_contract_test.go index 7ce8b02b01..ba838b3674 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract_test.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract_test.go @@ -25,7 +25,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -101,7 +101,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -138,7 +138,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -161,7 +161,7 @@ func TestKeeper_UpdateGatewayContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_system_contract_test.go b/x/fungible/keeper/msg_server_update_system_contract_test.go index c3b7ce4334..0b996ece24 100644 --- a/x/fungible/keeper/msg_server_update_system_contract_test.go +++ b/x/fungible/keeper/msg_server_update_system_contract_test.go @@ -27,7 +27,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -105,7 +105,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -156,7 +156,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -181,7 +181,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) @@ -204,11 +204,11 @@ func TestKeeper_UpdateSystemContract(t *testing.T) { UseAuthorityMock: true, UseEVMMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) admin := sample.AccAddress() authorityMock := keepertest.GetFungibleAuthorityMock(t, k) diff --git a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go index 17933ea8ba..b7c3ecfb85 100644 --- a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go +++ b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go @@ -27,7 +27,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { msgServer := keeper.NewMsgServerImpl(*k) chainID := getValidChainID(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // set coin admin admin := sample.AccAddress() @@ -163,7 +163,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // setup admin := sample.AccAddress() @@ -190,7 +190,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { UseAuthorityMock: true, }) msgServer := keeper.NewMsgServerImpl(*k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) // setup @@ -240,7 +240,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { UseEVMMock: true, UseAuthorityMock: true, }) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) msgServer := keeper.NewMsgServerImpl(*k) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) diff --git a/x/fungible/keeper/system_contract_test.go b/x/fungible/keeper/system_contract_test.go index 9371a10854..2f599a9a02 100644 --- a/x/fungible/keeper/system_contract_test.go +++ b/x/fungible/keeper/system_contract_test.go @@ -31,7 +31,7 @@ func TestKeeper_GetSystemContract(t *testing.T) { func TestKeeper_GetSystemContractAddress(t *testing.T) { t.Run("should fail to get system contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetSystemContractAddress(ctx) require.Error(t, err) @@ -40,7 +40,7 @@ func TestKeeper_GetSystemContractAddress(t *testing.T) { t.Run("should get system contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, _, _, systemContract := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetSystemContractAddress(ctx) @@ -52,7 +52,7 @@ func TestKeeper_GetSystemContractAddress(t *testing.T) { func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should fail to get wzeta contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetWZetaContractAddress(ctx) require.Error(t, err) @@ -61,7 +61,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should get wzeta contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) wzeta, _, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetWZetaContractAddress(ctx) @@ -71,7 +71,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -88,7 +88,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -103,7 +103,7 @@ func TestKeeper_GetWZetaContractAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -119,7 +119,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { "should fail to get uniswapfactory contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetUniswapV2FactoryAddress(ctx) require.Error(t, err) @@ -129,7 +129,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { t.Run("should get uniswapfactory contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, factory, _, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetUniswapV2FactoryAddress(ctx) @@ -139,7 +139,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { t.Run("should fail in factory not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -156,7 +156,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -171,7 +171,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -185,7 +185,7 @@ func TestKeeper_GetUniswapV2FactoryAddress(t *testing.T) { func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should fail to get uniswaprouter contract address if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, err := k.GetUniswapV2Router02Address(ctx) require.Error(t, err) @@ -194,7 +194,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should get uniswaprouter contract address if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) _, _, router, _, _ := deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) found, err := k.GetUniswapV2Router02Address(ctx) @@ -204,7 +204,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { t.Run("should fail in router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -221,7 +221,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -236,7 +236,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -250,7 +250,7 @@ func TestKeeper_GetUniswapV2Router02Address(t *testing.T) { func TestKeeper_CallWZetaDeposit(t *testing.T) { t.Run("should fail to deposit if system contracts are not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // mint tokens addr := sample.Bech32AccAddress() @@ -268,7 +268,7 @@ func TestKeeper_CallWZetaDeposit(t *testing.T) { t.Run("should deposit if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // mint tokens addr := sample.Bech32AccAddress() @@ -294,7 +294,7 @@ func TestKeeper_CallWZetaDeposit(t *testing.T) { func TestKeeper_QueryWZetaBalanceOf(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.QueryWZetaBalanceOf(ctx, sample.EthAddress()) @@ -305,7 +305,7 @@ func TestKeeper_QueryWZetaBalanceOf(t *testing.T) { func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -315,7 +315,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should query if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -332,7 +332,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { t.Run("should fail if gas coin not setup", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) _, err := k.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chainID)) @@ -350,7 +350,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -365,7 +365,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -379,7 +379,7 @@ func TestKeeper_QuerySystemContractGasCoinZRC20(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactETHForToken( @@ -395,7 +395,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap exact eth for 1 token @@ -428,7 +428,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if missing zeta balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap 1 token fails because of missing wrapped balance @@ -451,7 +451,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -472,7 +472,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -495,7 +495,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactETHForToken(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactETHForToken( @@ -505,7 +505,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap exact 1 token @@ -538,7 +538,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if missing zeta balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap 1 token fails because of missing wrapped balance @@ -562,7 +562,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -583,7 +583,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -606,7 +606,7 @@ func TestKeeper_CallUniswapV2RouterSwapEthForExactToken(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForETH( @@ -622,7 +622,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -671,7 +671,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if missing tokens balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -700,7 +700,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -720,7 +720,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -742,7 +742,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForETH(t *testing.T) { func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if system contracts are not deployed", func(t *testing.T) { k, ctx, _, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -759,7 +759,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should swap if system contracts are deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // fail if no system contract @@ -806,7 +806,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if missing tokens balance", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := getValidChainID(t) // deploy system contracts and swap fails because of missing balance @@ -835,7 +835,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -870,7 +870,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) // fail if no system contract _, err := k.CallUniswapV2RouterSwapExactTokensForTokens( @@ -908,7 +908,7 @@ func TestKeeper_CallUniswapV2RouterSwapExactTokensForTokens(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -918,7 +918,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -932,7 +932,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -948,7 +948,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4AmountsIn(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -958,7 +958,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -972,7 +972,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -988,7 +988,7 @@ func TestKeeper_QueryUniswapV2RouterGetZetaAmountsIn(t *testing.T) { func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if no amounts out", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -1003,7 +1003,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if wzeta not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: false, @@ -1022,7 +1022,7 @@ func TestKeeper_QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(t *testing.T) { t.Run("should fail if router not deployed", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsConfigurable(t, ctx, k, sdkk.EvmKeeper, &SystemContractDeployConfig{ DeployWZeta: true, @@ -1046,7 +1046,7 @@ func TestKeeper_CallZRC20Burn(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -1062,7 +1062,7 @@ func TestKeeper_CallZRC20Approve(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) @@ -1085,7 +1085,7 @@ func TestKeeper_CallZRC20Deposit(t *testing.T) { UseEVMMock: true, }) mockEVMKeeper := keepertest.GetFungibleEVMMock(t, k) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContractsWithMockEvmKeeper(t, ctx, k, mockEVMKeeper) diff --git a/x/fungible/keeper/v2_deposits_test.go b/x/fungible/keeper/v2_deposits_test.go index 9bb303eedc..d53251c609 100644 --- a/x/fungible/keeper/v2_deposits_test.go +++ b/x/fungible/keeper/v2_deposits_test.go @@ -121,7 +121,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process no-call deposit", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId receiver := sample.EthAddress() @@ -155,7 +155,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process no-call deposit, message should be ignored", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId receiver := sample.EthAddress() @@ -189,7 +189,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process deposit and call", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId @@ -225,7 +225,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) { t.Run("should process deposit and call with no message", func(t *testing.T) { // ARRANGE k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) chainID := chains.DefaultChainsList()[0].ChainId diff --git a/x/fungible/keeper/zeta_test.go b/x/fungible/keeper/zeta_test.go index 3c5b33b1a8..62e41700c1 100644 --- a/x/fungible/keeper/zeta_test.go +++ b/x/fungible/keeper/zeta_test.go @@ -17,7 +17,7 @@ import ( func TestKeeper_MintZetaToEVMAccount(t *testing.T) { t.Run("should mint the token in the specified balance", func(t *testing.T) { k, ctx, sdkk, _ := testkeeper.FungibleKeeper(t) - k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) acc := sample.Bech32AccAddress() bal := sdkk.BankKeeper.GetBalance(ctx, acc, config.BaseDenom) diff --git a/x/fungible/keeper/zevm_message_passing_test.go b/x/fungible/keeper/zevm_message_passing_test.go index 1bcc05f257..f68fec1f62 100644 --- a/x/fungible/keeper/zevm_message_passing_test.go +++ b/x/fungible/keeper/zevm_message_passing_test.go @@ -21,7 +21,7 @@ import ( func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("successfully call ZETADepositAndCallContract on connector contract ", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -70,7 +70,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("successfully deposit coin if account is not a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) zetaTxSender := sample.EthAddress() @@ -103,7 +103,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("automatically deposit coin if account not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) zetaTxSender := sample.EthAddress() zetaTxReceiver := sample.EthAddress() @@ -128,7 +128,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { t.Run("fail ZETADepositAndCallContract if Deposit Fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{UseBankMock: true}) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) bankMock := keepertest.GetFungibleBankMock(t, k) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -164,7 +164,7 @@ func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("successfully call ZETARevertAndCallContract if receiver is a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) dAppContract, err := k.DeployContract(ctx, contracts.DappMetaData) @@ -215,7 +215,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("successfully deposit coin if account is not a contract", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) zetaTxSender := sample.EthAddress() @@ -250,7 +250,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("automatically deposit coin if account not found", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) zetaTxSender := sample.EthAddress() zetaTxReceiver := sample.EthAddress() @@ -277,7 +277,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("fail ZETARevertAndCallContract if Deposit Fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeperWithMocks(t, keepertest.FungibleMockOptions{UseBankMock: true}) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) bankMock := keepertest.GetFungibleBankMock(t, k) deploySystemContracts(t, ctx, k, sdkk.EvmKeeper) @@ -313,7 +313,7 @@ func TestKeeper_ZEVMRevertAndCallContract(t *testing.T) { t.Run("fail ZETARevertAndCallContract if ZevmOnRevert fails", func(t *testing.T) { k, ctx, sdkk, _ := keepertest.FungibleKeeper(t) - _ = k.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName) + _ = k.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName) dAppContract, err := k.DeployContract(ctx, contracts.DappReverterMetaData) require.NoError(t, err) diff --git a/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go b/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go index a3792ee6eb..16803a917c 100644 --- a/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go +++ b/x/fungible/keeper/zrc20_cosmos_coin_mapping_test.go @@ -31,7 +31,7 @@ func Test_LockZRC20(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(locker.Bytes()) - ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit 1000 ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, owner, depositTotal) @@ -155,7 +155,7 @@ func Test_UnlockZRC20(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(locker.Bytes()) - ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit 1000 ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, owner, depositTotal) @@ -226,7 +226,7 @@ func Test_CheckZRC20Allowance(t *testing.T) { // Make sure locker account exists in state. accAddress := sdk.AccAddress(spender.Bytes()) - ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) // Deposit ZRC20 tokens into the fungible. ts.fungibleKeeper.DepositZRC20(ts.ctx, ts.zrc20Address, fungibletypes.ModuleAddressEVM, depositTotal) @@ -349,7 +349,7 @@ func setupChain(t *testing.T) testSuite { // Make sure the account store is initialized. // This is completely needed for accounts to be created in the state. - fungibleKeeper.GetAccountKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) + fungibleKeeper.GetAuthKeeper().GetModuleAccount(ctx, fungibletypes.ModuleName) // Deploy system contracts in order to deploy a ZRC20 token. deploySystemContracts(t, ctx, fungibleKeeper, sdkKeepers.EvmKeeper) diff --git a/x/fungible/keeper/zrc20_methods_test.go b/x/fungible/keeper/zrc20_methods_test.go index c0a8e18ffa..7b124f3050 100644 --- a/x/fungible/keeper/zrc20_methods_test.go +++ b/x/fungible/keeper/zrc20_methods_test.go @@ -151,7 +151,7 @@ func Test_ZRC20Transfer(t *testing.T) { // Make sure sample.EthAddress() exists as an ethermint account in state. accAddress := sdk.AccAddress(sample.EthAddress().Bytes()) - ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) t.Run("should fail when ZRC20ABI is nil", func(t *testing.T) { _, err := ts.fungibleKeeper.ZRC20Transfer( @@ -230,7 +230,7 @@ func Test_ZRC20TransferFrom(t *testing.T) { // Make sure sample.EthAddress() exists as an ethermint account in state. accAddress := sdk.AccAddress(sample.EthAddress().Bytes()) - ts.fungibleKeeper.GetAccountKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) + ts.fungibleKeeper.GetAuthKeeper().SetAccount(ts.ctx, authtypes.NewBaseAccount(accAddress, nil, 0, 0)) t.Run("should fail when ZRC20ABI is nil", func(t *testing.T) { _, err := ts.fungibleKeeper.ZRC20TransferFrom( diff --git a/x/fungible/module.go b/x/fungible/module.go index 521ae9a036..8e87fdbd43 100644 --- a/x/fungible/module.go +++ b/x/fungible/module.go @@ -138,7 +138,7 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.Ra InitGenesis(ctx, am.keeper, genState) // ensure fungible module account is set on genesis - if acc := am.keeper.GetAccountKeeper().GetModuleAccount(ctx, types.ModuleName); acc == nil { + if acc := am.keeper.GetAuthKeeper().GetModuleAccount(ctx, types.ModuleName); acc == nil { // NOTE: shouldn't occur panic("the fungible module account has not been set") } diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index 7fcdcee0a9..b0c7fff40d 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -75,7 +75,7 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, - AccountKeeper: k.GetAccountKeeper(), + AccountKeeper: k.GetAuthKeeper(), Bankkeeper: k.GetBankKeeper(), ModuleName: types.ModuleName, } From fa1234f4d6e468c17c4b6e75e125d343988d5aed Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 5 Nov 2024 18:17:55 -0500 Subject: [PATCH 08/18] add comments for observer and fungible operations --- x/fungible/simulation/decoders.go | 1 + x/fungible/simulation/genesis.go | 1 - x/fungible/simulation/operations.go | 18 +++++++++++++----- x/observer/simulation/decoders.go | 1 + x/observer/simulation/operations.go | 19 +++++++++++++------ x/observer/types/keys.go | 1 + 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/x/fungible/simulation/decoders.go b/x/fungible/simulation/decoders.go index 892c09a60d..80e7546808 100644 --- a/x/fungible/simulation/decoders.go +++ b/x/fungible/simulation/decoders.go @@ -9,6 +9,7 @@ import ( "github.com/zeta-chain/node/x/fungible/types" ) +// TODO Add comments in this pr to explain the purpose of the function func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { diff --git a/x/fungible/simulation/genesis.go b/x/fungible/simulation/genesis.go index b67fa87137..87b947e9ec 100644 --- a/x/fungible/simulation/genesis.go +++ b/x/fungible/simulation/genesis.go @@ -7,7 +7,6 @@ import ( func RandomizedGenState(simState *module.SimulationState) { // We do not have any params that we need to randomize for this module - // The default state is empty which is sufficient for now , this can be modified later weh we add operations that need existing state data to be processed fungibleGenesis := types.DefaultGenesis() simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(fungibleGenesis) } diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index b0c7fff40d..6222394226 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -1,7 +1,6 @@ package simulation import ( - "fmt" "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" @@ -15,11 +14,19 @@ import ( observerTypes "github.com/zeta-chain/node/x/observer/types" ) +// Simulation operation weights constants +// Operation weights are used by the simulation program to simulate the weight of different operations. +// This decides what percentage of a certain type of operation is part of a block. +// Based on the weights assigned in the cosmos sdk modules , 100 seems to the max weight used , and therefore guarantees that at least one operation of that type is present in a block. +// TODO Add more details to comment based on what the number represents in terms of percentage of operations in a block +// https://github.com/zeta-chain/node/issues/3100 const ( OpWeightMsgDeploySystemContracts = "op_weight_msg_deploy_system_contracts" DefaultWeightMsgDeploySystemContracts = 100 ) +// DeployedSystemContracts Use a flag to ensure that the system contracts are deployed only once +// https://github.com/zeta-chain/node/issues/3102 var ( DeployedSystemContracts = false ) @@ -41,6 +48,7 @@ func WeightedOperations( } } +// SimulateMsgDeploySystemContracts deploy system contracts.It is run only once in first block. func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { @@ -50,18 +58,18 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { - fmt.Println("Policies not found") + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "policies not found"), nil, nil } admin := policies.Items[0].Address + address, err := observerTypes.GetOperatorAddressFromAccAddress(admin) if err != nil { - panic(err) + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "unable to get operator address"), nil, err } simAccount, found := simtypes.FindAccount(accounts, address) if !found { - // TODO : remove panic - panic("admin account not found") + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "sim account for admin address not found"), nil, nil } msg := types.MsgDeploySystemContracts{Creator: admin} diff --git a/x/observer/simulation/decoders.go b/x/observer/simulation/decoders.go index 45b64bdb7c..7d2bf71aeb 100644 --- a/x/observer/simulation/decoders.go +++ b/x/observer/simulation/decoders.go @@ -9,6 +9,7 @@ import ( "github.com/zeta-chain/node/x/observer/types" ) +// TODO Add comments in this pr to explain the purpose of the function func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { diff --git a/x/observer/simulation/operations.go b/x/observer/simulation/operations.go index 4c07e744d6..fa2b6cf14e 100644 --- a/x/observer/simulation/operations.go +++ b/x/observer/simulation/operations.go @@ -1,7 +1,6 @@ package simulation import ( - "fmt" "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" @@ -14,8 +13,17 @@ import ( "github.com/zeta-chain/node/x/observer/types" ) +// Simulation operation weights constants +// Operation weights are used by the simulation program to simulate the weight of different operations. +// This decides what percentage of a certain type of operation is part of a block. +// Based on the weights assigned in the cosmos sdk modules , 100 seems to the max weight used , and therefore guarantees that at least one operation of that type is present in a block. +// TODO Add more details to comment based on what the number represents in terms of percentage of operations in a block +// https://github.com/zeta-chain/node/issues/3100 const ( - OpWeightMsgTypeMsgEnableCCTX = "op_weight_msg_enable_crosschain_flags" + OpWeightMsgTypeMsgEnableCCTX = "op_weight_msg_enable_crosschain_flags" + // DefaultWeightMsgTypeMsgEnableCCTX We ues a hight weight for this operation + // to ensure that it is present in the block more number of time than any operation that changes the validator state + // Arrived at this number based on the weights used in the cosmos sdk staking module and through some trial and error DefaultWeightMsgTypeMsgEnableCCTX = 650 ) @@ -38,16 +46,16 @@ func WeightedOperations( } } +// SimulateMsgTypeMsgEnableCCTX generates a MsgEnableCCTX and delivers it. func SimulateMsgTypeMsgEnableCCTX(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { - fmt.Println("Policies not found") + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEnableCCTX, "policies not found"), nil, nil } - // TODO setup simutils package admin := policies.Items[0].Address address, err := types.GetOperatorAddressFromAccAddress(admin) if err != nil { @@ -55,8 +63,7 @@ func SimulateMsgTypeMsgEnableCCTX(k keeper.Keeper) simtypes.Operation { } simAccount, found := simtypes.FindAccount(accounts, address) if !found { - // TODO : remove panic - panic("admin account not found") + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEnableCCTX, "admin account not found"), nil, nil } msg := types.MsgEnableCCTX{ diff --git a/x/observer/types/keys.go b/x/observer/types/keys.go index bb2cdbe8e9..573c38e524 100644 --- a/x/observer/types/keys.go +++ b/x/observer/types/keys.go @@ -49,6 +49,7 @@ func ChainNoncesKeyPrefix(chainID int64) []byte { return []byte(strconv.FormatInt(chainID, 10)) } +// Address TODOS for name changes: https://github.com/zeta-chain/node/issues/3098 const ( BlameKey = "Blame-" // TODO change identifier for VoterKey to BallotKey From 9f976c070ababe9483ea3e5b17ac369ae8d55899 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Wed, 6 Nov 2024 19:42:46 -0500 Subject: [PATCH 09/18] generate files --- changelog.md | 5 +- simulation/state.go | 1 + x/crosschain/module_simulation.go | 2 +- x/crosschain/simulation/decoders.go | 5 +- x/crosschain/simulation/genesis.go | 1 + x/crosschain/simulation/operations.go | 83 +++++++++++++++++++-------- x/fungible/module_simulation.go | 1 + x/fungible/simulation/decoders.go | 4 +- x/fungible/simulation/genesis.go | 1 + x/fungible/simulation/operations.go | 29 ++++++++-- x/fungible/types/expected_keepers.go | 2 +- x/observer/module_simulation.go | 8 +-- x/observer/simulation/decoders.go | 4 +- x/observer/simulation/genesis.go | 1 + x/observer/simulation/operations.go | 13 +++-- x/observer/types/keys.go | 2 +- 16 files changed, 109 insertions(+), 53 deletions(-) diff --git a/changelog.md b/changelog.md index d60a7fdfba..8c7a0f2721 100644 --- a/changelog.md +++ b/changelog.md @@ -8,10 +8,7 @@ ### Tests * [3075](https://github.com/zeta-chain/node/pull/3075) - ton: withdraw concurrent, deposit & revert. - -### Refactor - -### Tests +* [3095](https://github.com/zeta-chain/node/pull/3095) - initialize simulation tests for custom zetachain modules ### Fixes * [3041](https://github.com/zeta-chain/node/pull/3041) - replace libp2p public DHT with private gossip peer discovery and connection gater for inbound connections diff --git a/simulation/state.go b/simulation/state.go index b80cdf5570..c5700a365f 100644 --- a/simulation/state.go +++ b/simulation/state.go @@ -20,6 +20,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + zetaapp "github.com/zeta-chain/node/app" "github.com/zeta-chain/node/testutil/sample" authoritytypes "github.com/zeta-chain/node/x/authority/types" diff --git a/x/crosschain/module_simulation.go b/x/crosschain/module_simulation.go index 12bda63b6e..a24f5d0020 100644 --- a/x/crosschain/module_simulation.go +++ b/x/crosschain/module_simulation.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/zeta-chain/node/x/crosschain/simulation" + "github.com/zeta-chain/node/x/crosschain/simulation" "github.com/zeta-chain/node/x/crosschain/types" ) diff --git a/x/crosschain/simulation/decoders.go b/x/crosschain/simulation/decoders.go index e65f294946..dd2c6c4e07 100644 --- a/x/crosschain/simulation/decoders.go +++ b/x/crosschain/simulation/decoders.go @@ -6,10 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/crosschain/types" ) -// TODO Add comments in this pr to explain the purpose of the function +// NewDecodeStore returns a decoder function closure that unmarshals the KVPair's +// Value to the corresponding crosschain types. func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { @@ -55,7 +57,6 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return fmt.Sprintf("%v\n%v", rateLimiterFlagsA, rateLimiterFlagsB) default: panic(fmt.Sprintf("invalid crosschain key prefix %X", kvA.Key[:1])) - } } } diff --git a/x/crosschain/simulation/genesis.go b/x/crosschain/simulation/genesis.go index 47977fbc2e..1e1cab4fcd 100644 --- a/x/crosschain/simulation/genesis.go +++ b/x/crosschain/simulation/genesis.go @@ -2,6 +2,7 @@ package simulation import ( "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/crosschain/types" ) diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index c13354d3dd..7c082f3644 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -12,6 +12,7 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/pkg/authz" "github.com/zeta-chain/node/pkg/chains" "github.com/zeta-chain/node/testutil/sample" @@ -39,17 +40,17 @@ const ( DefaultWeightAbortStuckCCTX = 10 DefaultWeightUpdateRateLimiterFlags = 1 - OpWeightMsgAddOutboundTracker = "op_weight_msg_add_outbound_tracker" - OpWeightAddInboundTracker = "op_weight_msg_add_inbound_tracker" - OpWeightRemoveOutboundTracker = "op_weight_msg_remove_outbound_tracker" - OpWeightVoteGasPrice = "op_weight_msg_vote_gas_price" - OpWeightVoteOutbound = "op_weight_msg_vote_outbound" - OpWeightVoteInbound = "op_weight_msg_vote_inbound" - OpWeightWhitelistERC20 = "op_weight_msg_whitelist_erc20" - OpWeightMigrateTssFunds = "op_weight_msg_migrate_tss_funds" - OpWeightUpdateTssAddress = "op_weight_msg_update_tss_address" - OpWeightAbortStuckCCTX = "op_weight_msg_abort_stuck_cctx" - OpWeightUpdateRateLimiterFlags = "op_weight_msg_update_rate_limiter_flags" + OpWeightMsgAddOutboundTracker = "op_weight_msg_add_outbound_tracker" // #nosec G101 not a hardcoded credential + OpWeightAddInboundTracker = "op_weight_msg_add_inbound_tracker" // #nosec G101 not a hardcoded credential + OpWeightRemoveOutboundTracker = "op_weight_msg_remove_outbound_tracker" // #nosec G101 not a hardcoded credential + OpWeightVoteGasPrice = "op_weight_msg_vote_gas_price" // #nosec G101 not a hardcoded credential + OpWeightVoteOutbound = "op_weight_msg_vote_outbound" // #nosec G101 not a hardcoded credential + OpWeightVoteInbound = "op_weight_msg_vote_inbound" // #nosec G101 not a hardcoded credential + OpWeightWhitelistERC20 = "op_weight_msg_whitelist_erc20" // #nosec G101 not a hardcoded credential + OpWeightMigrateTssFunds = "op_weight_msg_migrate_tss_funds" // #nosec G101 not a hardcoded credential + OpWeightUpdateTssAddress = "op_weight_msg_update_tss_address" // #nosec G101 not a hardcoded credential + OpWeightAbortStuckCCTX = "op_weight_msg_abort_stuck_cctx" // #nosec G101 not a hardcoded credential + OpWeightUpdateRateLimiterFlags = "op_weight_msg_update_rate_limiter_flags" // #nosec G101 not a hardcoded credential ) func WeightedOperations( @@ -147,10 +148,13 @@ func WeightedOperations( } // operationSimulateVoteInbound generates a MsgVoteInbound with a random vote and delivers it. -func operationSimulateVoteInbound(k keeper.Keeper, msg types.MsgVoteInbound, simAccount simtypes.Account) simtypes.Operation { - return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, +func operationSimulateVoteInbound( + k keeper.Keeper, + msg types.MsgVoteInbound, + simAccount simtypes.Account, +) simtypes.Operation { + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, _ []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - // Fetch the account from the auth keeper which can then be used to fetch spendable coins authAccount := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) spendable := k.GetBankKeeper().SpendableCoins(ctx, authAccount.GetAddress()) @@ -207,7 +211,6 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - // TODO : randomize these values // Right now we use a constant value for cctx creation , this is the same as the one used in unit tests for the successful condition. // TestKeeper_VoteInbound/successfully vote on evm deposit @@ -228,7 +231,11 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // Pick a random observer to create the ballot simAccount, firstVoter, err := GetRandomAccountAndObserver(r, ctx, k, accs) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, authz.InboundVoter.String(), "unable to get random account and observer"), nil, nil + return simtypes.NoOpMsg( + types.ModuleName, + authz.InboundVoter.String(), + "unable to get random account and observer", + ), nil, nil } txGen := moduletestutil.MakeTestEncodingConfig().TxConfig @@ -285,12 +292,21 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { for _, observerIdx := range whoVotes { observerAddress := observerSet.ObserverList[observerIdx] + // firstVoter has already voted. if observerAddress == firstVoter { continue } observerAccount, err := GetObserverAccount(observerAddress, accs) if err != nil { - panic(err) + // This condition is highly unlikely, but if it happens, we can retun an error. + // The most likely reason + //for this to happen is that the entire observer set has been removed.If that happens we should adjust the number of observers + //added to the observer set when starting the simulation. + return simtypes.NoOpMsg( + types.ModuleName, + authz.InboundVoter.String(), + "observer account not found", + ), nil, err } // 1.3) schedule the vote votingMsg := msg @@ -302,7 +318,8 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { } fops = append(fops, simtypes.FutureOperation{ - // Submit all subsequent votes in the next block + // Submit all subsequent votes in the next block. + // We can consider adding a random block height between 1 and ballot maturity blocks in the future. BlockHeight: int(ctx.BlockHeight() + 1), Op: operationSimulateVoteInbound(k, votingMsg, observerAccount), }) @@ -313,19 +330,27 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // SimulateMsgVoteGasPrice generates a MsgVoteGasPrice and delivers it func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { - return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { // Get a random account and observer simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "unable to get random account and observer"), nil, err + return simtypes.NoOpMsg( + types.ModuleName, + authz.GasPriceVoter.String(), + "unable to get random account and observer", + ), nil, err } authAccount := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) spendable := k.GetBankKeeper().SpendableCoins(ctx, authAccount.GetAddress()) supportedChains := k.GetObserverKeeper().GetSupportedChains(ctx) if len(supportedChains) == 0 { - return simtypes.NoOpMsg(types.ModuleName, authz.GasPriceVoter.String(), "no supported chains found"), nil, nil + return simtypes.NoOpMsg( + types.ModuleName, + authz.GasPriceVoter.String(), + "no supported chains found", + ), nil, nil } randomChainID := GetRandomChainID(r, supportedChains) @@ -380,7 +405,12 @@ func GetRandomChainID(r *rand.Rand, chains []chains.Chain) int64 { } // GetRandomAccountAndObserver returns a random account and the associated observer address -func GetRandomAccountAndObserver(r *rand.Rand, ctx sdk.Context, k keeper.Keeper, accounts []simtypes.Account) (simtypes.Account, string, error) { +func GetRandomAccountAndObserver( + r *rand.Rand, + ctx sdk.Context, + k keeper.Keeper, + accounts []simtypes.Account, +) (simtypes.Account, string, error) { observers, found := k.GetObserverKeeper().GetObserverSet(ctx) if !found { return simtypes.Account{}, "", fmt.Errorf("observer set not found") @@ -414,7 +444,9 @@ func GetObserverAccount(observerAddress string, accounts []simtypes.Account) (si } // GenAndDeliverTxWithRandFees generates a transaction with a random fee and delivers it. -func GenAndDeliverTxWithRandFees(txCtx simulation.OperationInput) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { +func GenAndDeliverTxWithRandFees( + txCtx simulation.OperationInput, +) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address) spendable := txCtx.Bankkeeper.SpendableCoins(txCtx.Context, account.GetAddress()) @@ -435,7 +467,10 @@ func GenAndDeliverTxWithRandFees(txCtx simulation.OperationInput) (simtypes.Oper // GenAndDeliverTx generates a transactions and delivers it with the provided fees. // This function does not return an error if the transaction fails to deliver. -func GenAndDeliverTx(txCtx simulation.OperationInput, fees sdk.Coins) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { +func GenAndDeliverTx( + txCtx simulation.OperationInput, + fees sdk.Coins, +) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address) tx, err := simtestutil.GenSignedMockTx( txCtx.R, diff --git a/x/fungible/module_simulation.go b/x/fungible/module_simulation.go index 41b9df9831..b40476d9bd 100644 --- a/x/fungible/module_simulation.go +++ b/x/fungible/module_simulation.go @@ -4,6 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/zeta-chain/node/x/fungible/simulation" "github.com/zeta-chain/node/x/fungible/types" ) diff --git a/x/fungible/simulation/decoders.go b/x/fungible/simulation/decoders.go index 80e7546808..b8486dd8bb 100644 --- a/x/fungible/simulation/decoders.go +++ b/x/fungible/simulation/decoders.go @@ -6,10 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/fungible/types" ) -// TODO Add comments in this pr to explain the purpose of the function +// NewDecodeStore returns a decoder function closure that unmarshals the KVPair's +// Value to the corresponding fungible types. func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { diff --git a/x/fungible/simulation/genesis.go b/x/fungible/simulation/genesis.go index 87b947e9ec..044fe27ae1 100644 --- a/x/fungible/simulation/genesis.go +++ b/x/fungible/simulation/genesis.go @@ -2,6 +2,7 @@ package simulation import ( "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/fungible/types" ) diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index 6222394226..b5c441a6ba 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -9,6 +9,7 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/x/fungible/keeper" "github.com/zeta-chain/node/x/fungible/types" observerTypes "github.com/zeta-chain/node/x/observer/types" @@ -21,6 +22,7 @@ import ( // TODO Add more details to comment based on what the number represents in terms of percentage of operations in a block // https://github.com/zeta-chain/node/issues/3100 const ( + // #nosec G101 not a hardcoded credential OpWeightMsgDeploySystemContracts = "op_weight_msg_deploy_system_contracts" DefaultWeightMsgDeploySystemContracts = 100 ) @@ -36,7 +38,7 @@ func WeightedOperations( var weightMsgDeploySystemContracts int appParams.GetOrGenerate(cdc, OpWeightMsgDeploySystemContracts, &weightMsgDeploySystemContracts, nil, - func(r *rand.Rand) { + func(_ *rand.Rand) { weightMsgDeploySystemContracts = DefaultWeightMsgDeploySystemContracts }) @@ -50,7 +52,7 @@ func WeightedOperations( // SimulateMsgDeploySystemContracts deploy system contracts.It is run only once in first block. func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { - return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { if DeployedSystemContracts { return simtypes.OperationMsg{}, nil, nil @@ -58,22 +60,39 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "policies not found"), nil, nil + return simtypes.NoOpMsg( + types.ModuleName, + types.TypeMsgDeploySystemContracts, + "policies not found", + ), nil, nil } admin := policies.Items[0].Address address, err := observerTypes.GetOperatorAddressFromAccAddress(admin) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "unable to get operator address"), nil, err + return simtypes.NoOpMsg( + types.ModuleName, + types.TypeMsgDeploySystemContracts, + "unable to get operator address", + ), nil, err } simAccount, found := simtypes.FindAccount(accounts, address) if !found { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgDeploySystemContracts, "sim account for admin address not found"), nil, nil + return simtypes.NoOpMsg( + types.ModuleName, + types.TypeMsgDeploySystemContracts, + "sim account for admin address not found", + ), nil, nil } msg := types.MsgDeploySystemContracts{Creator: admin} + err = msg.ValidateBasic() + if err != nil { + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "failed to validate basic msg"), nil, err + } + txCtx := simulation.OperationInput{ R: r, App: app, diff --git a/x/fungible/types/expected_keepers.go b/x/fungible/types/expected_keepers.go index dd5d5d30ec..a0ee828878 100644 --- a/x/fungible/types/expected_keepers.go +++ b/x/fungible/types/expected_keepers.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/zeta-chain/ethermint/x/evm/statedb" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - authoritytypes "github.com/zeta-chain/node/x/authority/types" "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/observer/module_simulation.go b/x/observer/module_simulation.go index d97cecc626..919fdafef9 100644 --- a/x/observer/module_simulation.go +++ b/x/observer/module_simulation.go @@ -4,20 +4,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/zeta-chain/node/x/observer/simulation" "github.com/zeta-chain/node/x/observer/types" ) -const ( - // #nosec G101 not a hardcoded credential - opWeightMsgUpdateClientParams = "op_weight_msg_update_client_params" - defaultWeightMsgUpdateClientParams int = 100 -) - // GenerateGenesisState creates a randomized GenState of the module func (AppModule) GenerateGenesisState(simState *module.SimulationState) { simulation.RandomizedGenState(simState) - } // ProposalContents doesn't return any content functions for governance proposals diff --git a/x/observer/simulation/decoders.go b/x/observer/simulation/decoders.go index 7d2bf71aeb..871e608a36 100644 --- a/x/observer/simulation/decoders.go +++ b/x/observer/simulation/decoders.go @@ -6,10 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/zeta-chain/node/x/observer/types" ) -// TODO Add comments in this pr to explain the purpose of the function +// NewDecodeStore returns a decoder function closure that unmarshals the KVPair's +// Value to the corresponding observer types. func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { switch { diff --git a/x/observer/simulation/genesis.go b/x/observer/simulation/genesis.go index 8d5812d8af..f9dc10ff1c 100644 --- a/x/observer/simulation/genesis.go +++ b/x/observer/simulation/genesis.go @@ -2,6 +2,7 @@ package simulation import ( "github.com/cosmos/cosmos-sdk/types/module" + "github.com/zeta-chain/node/x/observer/types" ) diff --git a/x/observer/simulation/operations.go b/x/observer/simulation/operations.go index fa2b6cf14e..3f676524eb 100644 --- a/x/observer/simulation/operations.go +++ b/x/observer/simulation/operations.go @@ -9,6 +9,7 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/zeta-chain/node/x/observer/keeper" "github.com/zeta-chain/node/x/observer/types" ) @@ -20,9 +21,11 @@ import ( // TODO Add more details to comment based on what the number represents in terms of percentage of operations in a block // https://github.com/zeta-chain/node/issues/3100 const ( + // #nosec G101 not a hardcoded credential OpWeightMsgTypeMsgEnableCCTX = "op_weight_msg_enable_crosschain_flags" - // DefaultWeightMsgTypeMsgEnableCCTX We ues a hight weight for this operation - // to ensure that it is present in the block more number of time than any operation that changes the validator state + // DefaultWeightMsgTypeMsgEnableCCTX We ues a high weight for this operation + // to ensure that it is present in the block more number of times than any operation that changes the validator set + // Arrived at this number based on the weights used in the cosmos sdk staking module and through some trial and error DefaultWeightMsgTypeMsgEnableCCTX = 650 ) @@ -34,7 +37,7 @@ func WeightedOperations( var weightMsgTypeMsgEnableCCTX int appParams.GetOrGenerate(cdc, OpWeightMsgTypeMsgEnableCCTX, &weightMsgTypeMsgEnableCCTX, nil, - func(r *rand.Rand) { + func(_ *rand.Rand) { weightMsgTypeMsgEnableCCTX = DefaultWeightMsgTypeMsgEnableCCTX }) @@ -48,9 +51,8 @@ func WeightedOperations( // SimulateMsgTypeMsgEnableCCTX generates a MsgEnableCCTX and delivers it. func SimulateMsgTypeMsgEnableCCTX(k keeper.Keeper) simtypes.Operation { - return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string, + return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEnableCCTX, "policies not found"), nil, nil @@ -93,5 +95,4 @@ func SimulateMsgTypeMsgEnableCCTX(k keeper.Keeper) simtypes.Operation { return simulation.GenAndDeliverTxWithRandFees(txCtx) } - } diff --git a/x/observer/types/keys.go b/x/observer/types/keys.go index 573c38e524..25889cf63c 100644 --- a/x/observer/types/keys.go +++ b/x/observer/types/keys.go @@ -71,7 +71,7 @@ const ( NodeAccountKey = "NodeAccount-value-" KeygenKey = "Keygen-value-" - // TODO remove unsed keys + // TODO remove unused keys BlockHeaderKey = "BlockHeader-value-" BlockHeaderStateKey = "BlockHeaderState-value-" From bacd4b2b1f769b60de59a05a313136fac1aa98cb Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 7 Nov 2024 15:13:30 -0500 Subject: [PATCH 10/18] debug import export test --- Makefile | 2 +- simulation/simulation_test.go | 178 ++++++++++++++++++++++++++-------- x/crosschain/keeper/cctx.go | 6 +- x/fungible/types/genesis.go | 5 +- x/observer/abci.go | 2 +- x/observer/types/genesis.go | 2 +- 6 files changed, 148 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index f39e4f27ff..806c090050 100644 --- a/Makefile +++ b/Makefile @@ -404,7 +404,7 @@ test-sim-fullappsimulation: $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,30m) test-sim-import-export: - $(call run-sim-test,"test-import-export",TestAppImportExport,100,200,30m) + $(call run-sim-test,"test-import-export",TestAppImportExport,10,20,30m) test-sim-after-import: $(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,100,200,30m) diff --git a/simulation/simulation_test.go b/simulation/simulation_test.go index 3f39c77fa1..f7465e59d0 100644 --- a/simulation/simulation_test.go +++ b/simulation/simulation_test.go @@ -1,6 +1,7 @@ package simulation_test import ( + "bytes" "encoding/json" "fmt" "math/rand" @@ -10,29 +11,22 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" - evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/node/app" - zetasimulation "github.com/zeta-chain/node/simulation" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" + "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" cosmossimutils "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/kv" cosmossim "github.com/cosmos/cosmos-sdk/types/simulation" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/simulation" cosmossimcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" + "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/app" + zetasimulation "github.com/zeta-chain/node/simulation" ) // AppChainID hardcoded chainID for simulation @@ -314,7 +308,6 @@ func TestAppImportExport(t *testing.T) { exported, err := simApp.ExportAppStateAndValidators(false, []string{}, []string{}) require.NoError(t, err) - t.Log("importing genesis") newDB, newDir, _, _, err := cosmossimutils.SetupSimulation( config, SimDBBackend+"_new", @@ -360,41 +353,73 @@ func TestAppImportExport(t *testing.T) { ctxSimApp := simApp.NewContext(true, tmproto.Header{ Height: simApp.LastBlockHeight(), ChainID: SimAppChainID, - }).WithChainID(SimAppChainID) + }) + ctxNewSimApp := newSimApp.NewContext(true, tmproto.Header{ Height: simApp.LastBlockHeight(), ChainID: SimAppChainID, - }).WithChainID(SimAppChainID) + }) // Use genesis state from the first app to initialize the second app newSimApp.ModuleManager().InitGenesis(ctxNewSimApp, newSimApp.AppCodec(), genesisState) newSimApp.StoreConsensusParams(ctxNewSimApp, exported.ConsensusParams) t.Log("comparing stores") + // The ordering of the keys is not important, we compare the same prefix for both simulations storeKeysPrefixes := []StoreKeysPrefixes{ {simApp.GetKey(authtypes.StoreKey), newSimApp.GetKey(authtypes.StoreKey), [][]byte{}}, - { - simApp.GetKey(stakingtypes.StoreKey), newSimApp.GetKey(stakingtypes.StoreKey), - [][]byte{ - stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, - stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, - }, - }, - {simApp.GetKey(slashingtypes.StoreKey), newSimApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, - {simApp.GetKey(distrtypes.StoreKey), newSimApp.GetKey(distrtypes.StoreKey), [][]byte{}}, - {simApp.GetKey(banktypes.StoreKey), newSimApp.GetKey(banktypes.StoreKey), [][]byte{banktypes.BalancesPrefix}}, - {simApp.GetKey(paramtypes.StoreKey), newSimApp.GetKey(paramtypes.StoreKey), [][]byte{}}, - {simApp.GetKey(govtypes.StoreKey), newSimApp.GetKey(govtypes.StoreKey), [][]byte{}}, - {simApp.GetKey(evidencetypes.StoreKey), newSimApp.GetKey(evidencetypes.StoreKey), [][]byte{}}, - {simApp.GetKey(evmtypes.StoreKey), newSimApp.GetKey(evmtypes.StoreKey), [][]byte{}}, + //{ + // simApp.GetKey(stakingtypes.StoreKey), newSimApp.GetKey(stakingtypes.StoreKey), + // [][]byte{ + // stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, + // stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, + // }, + //}, + //{simApp.GetKey(slashingtypes.StoreKey), newSimApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(distrtypes.StoreKey), newSimApp.GetKey(distrtypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(banktypes.StoreKey), newSimApp.GetKey(banktypes.StoreKey), [][]byte{banktypes.BalancesPrefix}}, + //{simApp.GetKey(paramtypes.StoreKey), newSimApp.GetKey(paramtypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(govtypes.StoreKey), newSimApp.GetKey(govtypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(evidencetypes.StoreKey), newSimApp.GetKey(evidencetypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(evmtypes.StoreKey), newSimApp.GetKey(evmtypes.StoreKey), [][]byte{}}, + //{simApp.GetKey(crosschaintypes.StoreKey), newSimApp.GetKey(crosschaintypes.StoreKey), [][]byte{ + // //crosschaintypes.KeyPrefix(crosschaintypes.CCTXKey), + // //crosschaintypes.KeyPrefix(crosschaintypes.LastBlockHeightKey), + // //crosschaintypes.KeyPrefix(crosschaintypes.FinalizedInboundsKey), + // //crosschaintypes.KeyPrefix(crosschaintypes.GasPriceKey), + // //crosschaintypes.KeyPrefix(crosschaintypes.OutboundTrackerKeyPrefix), + // //crosschaintypes.KeyPrefix(crosschaintypes.InboundTrackerKeyPrefix), + // //crosschaintypes.KeyPrefix(crosschaintypes.ZetaAccountingKey), + // //crosschaintypes.KeyPrefix(crosschaintypes.RateLimiterFlagsKey), + //}}, + + //{simApp.GetKey(observertypes.StoreKey), newSimApp.GetKey(observertypes.StoreKey), [][]byte{ + // //observertypes.KeyPrefix(observertypes.BlameKey), + // //observertypes.KeyPrefix(observertypes.VoterKey), + // //observertypes.KeyPrefix(observertypes.CrosschainFlagsKey), + // //observertypes.KeyPrefix(observertypes.LastBlockObserverCountKey), + // //observertypes.KeyPrefix(observertypes.NodeAccountKey), + // //observertypes.KeyPrefix(observertypes.KeygenKey), + // observertypes.KeyPrefix(observertypes.BallotListKey), + // //observertypes.KeyPrefix(observertypes.TSSKey), + // //observertypes.KeyPrefix(observertypes.ObserverSetKey), + // //observertypes.KeyPrefix(observertypes.AllChainParamsKey), + // //observertypes.KeyPrefix(observertypes.TSSHistoryKey), + // //observertypes.KeyPrefix(observertypes.TssFundMigratorKey), + // //observertypes.KeyPrefix(observertypes.PendingNoncesKeyPrefix), + // //observertypes.KeyPrefix(observertypes.ChainNoncesKey), + // //observertypes.KeyPrefix(observertypes.NonceToCctxKeyPrefix), + // //observertypes.KeyPrefix(observertypes.ParamsKey), + //}}, + //{simApp.GetKey(fungibletypes.StoreKey), newSimApp.GetKey(fungibletypes.StoreKey), [][]byte{}}, } for _, skp := range storeKeysPrefixes { storeA := ctxSimApp.KVStore(skp.A) storeB := ctxNewSimApp.KVStore(skp.B) - failedKVAs, failedKVBs := sdk.DiffKVStores(storeA, storeB, skp.Prefixes) + failedKVAs, failedKVBs := DiffKVStores(storeA, storeB, skp.Prefixes, simApp.AppCodec()) require.Equal(t, len(failedKVAs), len(failedKVBs), "unequal sets of key-values to compare") t.Logf("compared %d different key/value pairs between %s and %s\n", len(failedKVAs), skp.A, skp.B) @@ -402,16 +427,87 @@ func TestAppImportExport(t *testing.T) { t, 0, len(failedKVAs), - cosmossimutils.GetSimulationLog( - skp.A.Name(), - simApp.SimulationManager().StoreDecoders, - failedKVAs, - failedKVBs, - ), + //cosmossimutils.GetSimulationLog( + // skp.A.Name(), + // simApp.SimulationManager().StoreDecoders, + // failedKVAs, + // failedKVBs, + //), ) } } +// DiffKVStores compares two KVstores and returns all the key/value pairs +// that differ from one another. It also skips value comparison for a set of provided prefixes. +func DiffKVStores(a sdk.KVStore, b sdk.KVStore, prefixesToSkip [][]byte, cdc codec.Codec) (kvAs, kvBs []kv.Pair) { + iterA := a.Iterator(nil, nil) + + defer iterA.Close() + + iterB := b.Iterator(nil, nil) + + defer iterB.Close() + + for { + if !iterA.Valid() && !iterB.Valid() { + return kvAs, kvBs + } + + var kvA, kvB kv.Pair + if iterA.Valid() { + kvA = kv.Pair{Key: iterA.Key(), Value: iterA.Value()} + + iterA.Next() + } + + if iterB.Valid() { + kvB = kv.Pair{Key: iterB.Key(), Value: iterB.Value()} + } + + compareValue := true + + unknowprefix := false + for _, prefix := range prefixesToSkip { + // Skip value comparison if we matched a prefix + if bytes.HasPrefix(kvA.Key, prefix) { + compareValue = false + break + } + unknowprefix = true + } + + if !compareValue { + // We're skipping this key due to an exclusion prefix. If it's present in B, iterate past it. If it's + // absent don't iterate. + if bytes.Equal(kvA.Key, kvB.Key) { + iterB.Next() + } + continue + } + + // always iterate B when comparing + iterB.Next() + + if !bytes.Equal(kvA.Value, kvB.Value) { + fmt.Println("Value mismatch", unknowprefix) + fmt.Println("A", string(kvA.Key)) + fmt.Println("B", string(kvB.Key)) + fmt.Println("A", string(kvA.Value)) + fmt.Println("B", string(kvB.Value)) + fmt.Println("-------------------------------------------------------------") + } + + if !bytes.Equal(kvA.Key, kvB.Key) { + fmt.Println("Key mismatch", unknowprefix) + } + + if !bytes.Equal(kvA.Key, kvB.Key) || !bytes.Equal(kvA.Value, kvB.Value) { + kvAs = append(kvAs, kvA) + kvBs = append(kvBs, kvB) + } + } +} + func TestAppSimulationAfterImport(t *testing.T) { config := zetasimulation.NewConfigFromFlags() @@ -517,11 +613,13 @@ func TestAppSimulationAfterImport(t *testing.T) { ) require.NoError(t, err) + t.Log("Adding app state to new app") newSimApp.InitChain(abci.RequestInitChain{ ChainId: SimAppChainID, AppStateBytes: exported.AppState, }) + t.Log("Simulating new simulation") stopEarly, simParams, simErr = simulation.SimulateFromSeed( t, os.Stdout, diff --git a/x/crosschain/keeper/cctx.go b/x/crosschain/keeper/cctx.go index f2234362f0..0ac1bb3c0e 100644 --- a/x/crosschain/keeper/cctx.go +++ b/x/crosschain/keeper/cctx.go @@ -58,9 +58,9 @@ func (k Keeper) SetCctxAndNonceToCctxAndInboundHashToCctx( func (k Keeper) SetCrossChainTx(ctx sdk.Context, cctx types.CrossChainTx) { // only set the update timestamp if the block height is >0 to allow // for a genesis import - if cctx.CctxStatus != nil && ctx.BlockHeight() > 0 { - cctx.CctxStatus.LastUpdateTimestamp = ctx.BlockHeader().Time.Unix() - } + //if cctx.CctxStatus != nil && ctx.BlockHeight() > 0 { + // cctx.CctxStatus.LastUpdateTimestamp = ctx.BlockHeader().Time.Unix() + //} p := types.KeyPrefix(fmt.Sprintf("%s", types.CCTXKey)) store := prefix.NewStore(ctx.KVStore(k.storeKey), p) b := k.cdc.MustMarshal(&cctx) diff --git a/x/fungible/types/genesis.go b/x/fungible/types/genesis.go index 859a19b3de..a8c4f7bbd9 100644 --- a/x/fungible/types/genesis.go +++ b/x/fungible/types/genesis.go @@ -8,7 +8,10 @@ import ( func DefaultGenesis() *GenesisState { return &GenesisState{ ForeignCoinsList: []ForeignCoins{}, - SystemContract: nil, + SystemContract: &SystemContract{ + SystemContract: "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921", + ConnectorZevm: "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67", + }, } } diff --git a/x/observer/abci.go b/x/observer/abci.go index 3f56252329..6d3315134f 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -33,7 +33,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { } // #nosec G115 always in range - k.DisableInboundOnly(ctx) + //k.DisableInboundOnly(ctx) k.SetKeygen(ctx, types.Keygen{BlockNumber: math.MaxInt64}) // #nosec G115 always positive k.SetLastObserverCount( diff --git a/x/observer/types/genesis.go b/x/observer/types/genesis.go index 2ce645bb88..db45ec348b 100644 --- a/x/observer/types/genesis.go +++ b/x/observer/types/genesis.go @@ -14,7 +14,7 @@ func DefaultGenesis() *GenesisState { Observers: ObserverSet{}, NodeAccountList: []*NodeAccount{}, CrosschainFlags: &CrosschainFlags{IsInboundEnabled: true, IsOutboundEnabled: true}, - Keygen: nil, + Keygen: &Keygen{}, LastObserverCount: nil, ChainNonces: []ChainNonces{}, } From 2b0509a7925c839ea310b831a19426ec98baf848 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 7 Nov 2024 16:42:20 -0500 Subject: [PATCH 11/18] fix import export tests --- Makefile | 2 +- simulation/simulation_test.go | 190 ++++++++------------------ simulation/state.go | 66 ++------- x/crosschain/keeper/cctx.go | 6 +- x/crosschain/simulation/operations.go | 30 ++-- x/observer/abci.go | 2 +- 6 files changed, 87 insertions(+), 209 deletions(-) diff --git a/Makefile b/Makefile index 806c090050..f39e4f27ff 100644 --- a/Makefile +++ b/Makefile @@ -404,7 +404,7 @@ test-sim-fullappsimulation: $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,30m) test-sim-import-export: - $(call run-sim-test,"test-import-export",TestAppImportExport,10,20,30m) + $(call run-sim-test,"test-import-export",TestAppImportExport,100,200,30m) test-sim-after-import: $(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,100,200,30m) diff --git a/simulation/simulation_test.go b/simulation/simulation_test.go index f7465e59d0..283aef32d9 100644 --- a/simulation/simulation_test.go +++ b/simulation/simulation_test.go @@ -1,7 +1,6 @@ package simulation_test import ( - "bytes" "encoding/json" "fmt" "math/rand" @@ -13,20 +12,28 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" cosmossimutils "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/kv" cosmossim "github.com/cosmos/cosmos-sdk/types/simulation" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/simulation" cosmossimcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" + evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "github.com/zeta-chain/node/app" zetasimulation "github.com/zeta-chain/node/simulation" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // AppChainID hardcoded chainID for simulation @@ -36,9 +43,9 @@ func init() { } type StoreKeysPrefixes struct { - A storetypes.StoreKey - B storetypes.StoreKey - Prefixes [][]byte + A storetypes.StoreKey + B storetypes.StoreKey + SkipPrefixes [][]byte } const ( @@ -130,6 +137,7 @@ func TestAppStateDeterminism(t *testing.T) { simApp.AppCodec(), simApp.SimulationManager(), simApp.BasicManager().DefaultGenesis(simApp.AppCodec()), + nil, ), cosmossim.RandomAccounts, cosmossimutils.SimulationOperations(simApp, simApp.AppCodec(), config), @@ -219,6 +227,7 @@ func TestFullAppSimulation(t *testing.T) { simApp.AppCodec(), simApp.SimulationManager(), simApp.BasicManager().DefaultGenesis(simApp.AppCodec()), + nil, ), cosmossim.RandomAccounts, cosmossimutils.SimulationOperations(simApp, simApp.AppCodec(), config), @@ -289,6 +298,7 @@ func TestAppImportExport(t *testing.T) { simApp.AppCodec(), simApp.SimulationManager(), simApp.BasicManager().DefaultGenesis(simApp.AppCodec()), + nil, ), cosmossim.RandomAccounts, cosmossimutils.SimulationOperations(simApp, simApp.AppCodec(), config), @@ -368,58 +378,40 @@ func TestAppImportExport(t *testing.T) { // The ordering of the keys is not important, we compare the same prefix for both simulations storeKeysPrefixes := []StoreKeysPrefixes{ - {simApp.GetKey(authtypes.StoreKey), newSimApp.GetKey(authtypes.StoreKey), [][]byte{}}, - //{ - // simApp.GetKey(stakingtypes.StoreKey), newSimApp.GetKey(stakingtypes.StoreKey), - // [][]byte{ - // stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, - // stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, - // }, - //}, - //{simApp.GetKey(slashingtypes.StoreKey), newSimApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(distrtypes.StoreKey), newSimApp.GetKey(distrtypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(banktypes.StoreKey), newSimApp.GetKey(banktypes.StoreKey), [][]byte{banktypes.BalancesPrefix}}, - //{simApp.GetKey(paramtypes.StoreKey), newSimApp.GetKey(paramtypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(govtypes.StoreKey), newSimApp.GetKey(govtypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(evidencetypes.StoreKey), newSimApp.GetKey(evidencetypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(evmtypes.StoreKey), newSimApp.GetKey(evmtypes.StoreKey), [][]byte{}}, - //{simApp.GetKey(crosschaintypes.StoreKey), newSimApp.GetKey(crosschaintypes.StoreKey), [][]byte{ - // //crosschaintypes.KeyPrefix(crosschaintypes.CCTXKey), - // //crosschaintypes.KeyPrefix(crosschaintypes.LastBlockHeightKey), - // //crosschaintypes.KeyPrefix(crosschaintypes.FinalizedInboundsKey), - // //crosschaintypes.KeyPrefix(crosschaintypes.GasPriceKey), - // //crosschaintypes.KeyPrefix(crosschaintypes.OutboundTrackerKeyPrefix), - // //crosschaintypes.KeyPrefix(crosschaintypes.InboundTrackerKeyPrefix), - // //crosschaintypes.KeyPrefix(crosschaintypes.ZetaAccountingKey), - // //crosschaintypes.KeyPrefix(crosschaintypes.RateLimiterFlagsKey), - //}}, - - //{simApp.GetKey(observertypes.StoreKey), newSimApp.GetKey(observertypes.StoreKey), [][]byte{ - // //observertypes.KeyPrefix(observertypes.BlameKey), - // //observertypes.KeyPrefix(observertypes.VoterKey), - // //observertypes.KeyPrefix(observertypes.CrosschainFlagsKey), - // //observertypes.KeyPrefix(observertypes.LastBlockObserverCountKey), - // //observertypes.KeyPrefix(observertypes.NodeAccountKey), - // //observertypes.KeyPrefix(observertypes.KeygenKey), - // observertypes.KeyPrefix(observertypes.BallotListKey), - // //observertypes.KeyPrefix(observertypes.TSSKey), - // //observertypes.KeyPrefix(observertypes.ObserverSetKey), - // //observertypes.KeyPrefix(observertypes.AllChainParamsKey), - // //observertypes.KeyPrefix(observertypes.TSSHistoryKey), - // //observertypes.KeyPrefix(observertypes.TssFundMigratorKey), - // //observertypes.KeyPrefix(observertypes.PendingNoncesKeyPrefix), - // //observertypes.KeyPrefix(observertypes.ChainNoncesKey), - // //observertypes.KeyPrefix(observertypes.NonceToCctxKeyPrefix), - // //observertypes.KeyPrefix(observertypes.ParamsKey), - //}}, - //{simApp.GetKey(fungibletypes.StoreKey), newSimApp.GetKey(fungibletypes.StoreKey), [][]byte{}}, + // Interaction with EVM module , such as deploying contracts or interting with with them such as setting gas price causes the state for the auth module to change on export . + // We will need to explore this further to find a definitive answer + //{simApp.GetKey(authtypes.StoreKey), newSimApp.GetKey(authtypes.StoreKey), [][]byte{}}, + { + simApp.GetKey(stakingtypes.StoreKey), newSimApp.GetKey(stakingtypes.StoreKey), + [][]byte{ + stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, + stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, + }, + }, + {simApp.GetKey(slashingtypes.StoreKey), newSimApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, + {simApp.GetKey(distrtypes.StoreKey), newSimApp.GetKey(distrtypes.StoreKey), [][]byte{}}, + {simApp.GetKey(banktypes.StoreKey), newSimApp.GetKey(banktypes.StoreKey), [][]byte{banktypes.BalancesPrefix}}, + {simApp.GetKey(paramtypes.StoreKey), newSimApp.GetKey(paramtypes.StoreKey), [][]byte{}}, + {simApp.GetKey(govtypes.StoreKey), newSimApp.GetKey(govtypes.StoreKey), [][]byte{}}, + {simApp.GetKey(evidencetypes.StoreKey), newSimApp.GetKey(evidencetypes.StoreKey), [][]byte{}}, + {simApp.GetKey(evmtypes.StoreKey), newSimApp.GetKey(evmtypes.StoreKey), [][]byte{}}, + {simApp.GetKey(crosschaintypes.StoreKey), newSimApp.GetKey(crosschaintypes.StoreKey), [][]byte{ + // We update the timestamp for cctx when importing the genesis state which results in a different value + crosschaintypes.KeyPrefix(crosschaintypes.CCTXKey), + }}, + + {simApp.GetKey(observertypes.StoreKey), newSimApp.GetKey(observertypes.StoreKey), [][]byte{ + // The order of ballots when importing is not preserved which causes the value to be different. + observertypes.KeyPrefix(observertypes.BallotListKey), + }}, + {simApp.GetKey(fungibletypes.StoreKey), newSimApp.GetKey(fungibletypes.StoreKey), [][]byte{}}, } for _, skp := range storeKeysPrefixes { storeA := ctxSimApp.KVStore(skp.A) storeB := ctxNewSimApp.KVStore(skp.B) - failedKVAs, failedKVBs := DiffKVStores(storeA, storeB, skp.Prefixes, simApp.AppCodec()) + failedKVAs, failedKVBs := sdk.DiffKVStores(storeA, storeB, skp.SkipPrefixes) require.Equal(t, len(failedKVAs), len(failedKVBs), "unequal sets of key-values to compare") t.Logf("compared %d different key/value pairs between %s and %s\n", len(failedKVAs), skp.A, skp.B) @@ -427,87 +419,16 @@ func TestAppImportExport(t *testing.T) { t, 0, len(failedKVAs), - //cosmossimutils.GetSimulationLog( - // skp.A.Name(), - // simApp.SimulationManager().StoreDecoders, - // failedKVAs, - // failedKVBs, - //), + cosmossimutils.GetSimulationLog( + skp.A.Name(), + simApp.SimulationManager().StoreDecoders, + failedKVAs, + failedKVBs, + ), ) } } -// DiffKVStores compares two KVstores and returns all the key/value pairs -// that differ from one another. It also skips value comparison for a set of provided prefixes. -func DiffKVStores(a sdk.KVStore, b sdk.KVStore, prefixesToSkip [][]byte, cdc codec.Codec) (kvAs, kvBs []kv.Pair) { - iterA := a.Iterator(nil, nil) - - defer iterA.Close() - - iterB := b.Iterator(nil, nil) - - defer iterB.Close() - - for { - if !iterA.Valid() && !iterB.Valid() { - return kvAs, kvBs - } - - var kvA, kvB kv.Pair - if iterA.Valid() { - kvA = kv.Pair{Key: iterA.Key(), Value: iterA.Value()} - - iterA.Next() - } - - if iterB.Valid() { - kvB = kv.Pair{Key: iterB.Key(), Value: iterB.Value()} - } - - compareValue := true - - unknowprefix := false - for _, prefix := range prefixesToSkip { - // Skip value comparison if we matched a prefix - if bytes.HasPrefix(kvA.Key, prefix) { - compareValue = false - break - } - unknowprefix = true - } - - if !compareValue { - // We're skipping this key due to an exclusion prefix. If it's present in B, iterate past it. If it's - // absent don't iterate. - if bytes.Equal(kvA.Key, kvB.Key) { - iterB.Next() - } - continue - } - - // always iterate B when comparing - iterB.Next() - - if !bytes.Equal(kvA.Value, kvB.Value) { - fmt.Println("Value mismatch", unknowprefix) - fmt.Println("A", string(kvA.Key)) - fmt.Println("B", string(kvB.Key)) - fmt.Println("A", string(kvA.Value)) - fmt.Println("B", string(kvB.Value)) - fmt.Println("-------------------------------------------------------------") - } - - if !bytes.Equal(kvA.Key, kvB.Key) { - fmt.Println("Key mismatch", unknowprefix) - } - - if !bytes.Equal(kvA.Key, kvB.Key) || !bytes.Equal(kvA.Value, kvB.Value) { - kvAs = append(kvAs, kvA) - kvBs = append(kvBs, kvB) - } - } -} - func TestAppSimulationAfterImport(t *testing.T) { config := zetasimulation.NewConfigFromFlags() @@ -558,6 +479,7 @@ func TestAppSimulationAfterImport(t *testing.T) { simApp.AppCodec(), simApp.SimulationManager(), simApp.BasicManager().DefaultGenesis(simApp.AppCodec()), + nil, ), cosmossim.RandomAccounts, cosmossimutils.SimulationOperations(simApp, simApp.AppCodec(), config), @@ -619,15 +541,15 @@ func TestAppSimulationAfterImport(t *testing.T) { AppStateBytes: exported.AppState, }) - t.Log("Simulating new simulation") stopEarly, simParams, simErr = simulation.SimulateFromSeed( t, os.Stdout, newSimApp.BaseApp, zetasimulation.AppStateFn( - simApp.AppCodec(), - simApp.SimulationManager(), - simApp.BasicManager().DefaultGenesis(simApp.AppCodec()), + nil, + nil, + nil, + exported.AppState, ), cosmossim.RandomAccounts, cosmossimutils.SimulationOperations(newSimApp, newSimApp.AppCodec(), config), diff --git a/simulation/state.go b/simulation/state.go index c5700a365f..3365b8e54a 100644 --- a/simulation/state.go +++ b/simulation/state.go @@ -41,6 +41,7 @@ func AppStateFn( cdc codec.Codec, simManager *module.SimulationManager, genesisState map[string]json.RawMessage, + exportedState json.RawMessage, ) simtypes.AppStateFn { return func(r *rand.Rand, accs []simtypes.Account, config simtypes.Config, ) (appState json.RawMessage, simAccs []simtypes.Account, chainID string, genesisTimestamp time.Time) { @@ -51,60 +52,23 @@ func AppStateFn( } chainID = config.ChainID - switch { - case config.ParamsFile != "" && config.GenesisFile != "": - panic("cannot provide both a genesis file and a params file") - case config.GenesisFile != "": - // override the default chain-id from simapp to set it later to the config - genesisDoc, accounts, err := AppStateFromGenesisFileFn(r, cdc, config.GenesisFile) - if err != nil { - panic(err) - } - - if FlagGenesisTimeValue == 0 { - // use genesis timestamp if no custom timestamp is provided (i.e no random timestamp) - genesisTimestamp = genesisDoc.GenesisTime - } - - appState = genesisDoc.AppState - chainID = genesisDoc.ChainID - simAccs = accounts - - case config.ParamsFile != "": - appParams := make(simtypes.AppParams) - bz, err := os.ReadFile(config.ParamsFile) - if err != nil { - panic(err) - } - - err = json.Unmarshal(bz, &appParams) - if err != nil { - panic(err) - } - appState, simAccs = AppStateRandomizedFn( - simManager, - r, - cdc, - accs, - genesisTimestamp, - appParams, - genesisState, - ) - - default: - appParams := make(simtypes.AppParams) - appState, simAccs = AppStateRandomizedFn( - simManager, - r, - cdc, - accs, - genesisTimestamp, - appParams, - genesisState, - ) + // If exported state is provided then use it + if exportedState != nil { + return exportedState, accs, chainID, genesisTimestamp } + appParams := make(simtypes.AppParams) + appState, simAccs = AppStateRandomizedFn( + simManager, + r, + cdc, + accs, + genesisTimestamp, + appParams, + genesisState, + ) + rawState := make(map[string]json.RawMessage) err := json.Unmarshal(appState, &rawState) if err != nil { diff --git a/x/crosschain/keeper/cctx.go b/x/crosschain/keeper/cctx.go index 0ac1bb3c0e..f2234362f0 100644 --- a/x/crosschain/keeper/cctx.go +++ b/x/crosschain/keeper/cctx.go @@ -58,9 +58,9 @@ func (k Keeper) SetCctxAndNonceToCctxAndInboundHashToCctx( func (k Keeper) SetCrossChainTx(ctx sdk.Context, cctx types.CrossChainTx) { // only set the update timestamp if the block height is >0 to allow // for a genesis import - //if cctx.CctxStatus != nil && ctx.BlockHeight() > 0 { - // cctx.CctxStatus.LastUpdateTimestamp = ctx.BlockHeader().Time.Unix() - //} + if cctx.CctxStatus != nil && ctx.BlockHeight() > 0 { + cctx.CctxStatus.LastUpdateTimestamp = ctx.BlockHeader().Time.Unix() + } p := types.KeyPrefix(fmt.Sprintf("%s", types.CCTXKey)) store := prefix.NewStore(ctx.KVStore(k.storeKey), p) b := k.cdc.MustMarshal(&cctx) diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index 7c082f3644..e98f0dc732 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -51,6 +51,7 @@ const ( OpWeightUpdateTssAddress = "op_weight_msg_update_tss_address" // #nosec G101 not a hardcoded credential OpWeightAbortStuckCCTX = "op_weight_msg_abort_stuck_cctx" // #nosec G101 not a hardcoded credential OpWeightUpdateRateLimiterFlags = "op_weight_msg_update_rate_limiter_flags" // #nosec G101 not a hardcoded credential + ) func WeightedOperations( @@ -228,14 +229,12 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { } } msg := sample.InboundVote(0, from, to) + // Pick a random observer to create the ballot + // If this returns and error it is likely that the entire observer set has been removed simAccount, firstVoter, err := GetRandomAccountAndObserver(r, ctx, k, accs) if err != nil { - return simtypes.NoOpMsg( - types.ModuleName, - authz.InboundVoter.String(), - "unable to get random account and observer", - ), nil, nil + return simtypes.OperationMsg{}, nil, nil } txGen := moduletestutil.MakeTestEncodingConfig().TxConfig @@ -298,15 +297,7 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { } observerAccount, err := GetObserverAccount(observerAddress, accs) if err != nil { - // This condition is highly unlikely, but if it happens, we can retun an error. - // The most likely reason - //for this to happen is that the entire observer set has been removed.If that happens we should adjust the number of observers - //added to the observer set when starting the simulation. - return simtypes.NoOpMsg( - types.ModuleName, - authz.InboundVoter.String(), - "observer account not found", - ), nil, err + continue } // 1.3) schedule the vote votingMsg := msg @@ -333,13 +324,10 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { // Get a random account and observer + // If this returns and error it is likely that the entire observer set has been removed simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) if err != nil { - return simtypes.NoOpMsg( - types.ModuleName, - authz.GasPriceVoter.String(), - "unable to get random account and observer", - ), nil, err + return simtypes.OperationMsg{}, nil, nil } authAccount := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) spendable := k.GetBankKeeper().SpendableCoins(ctx, authAccount.GetAddress()) @@ -430,6 +418,10 @@ func GetRandomAccountAndObserver( } // GetObserverAccount returns the account associated with the observer address from the list of accounts provided +// GetObserverAccount can fail if all the observers are removed from the observer set ,this can happen +//if the other modules create transactions which affect the validator +//and triggers any of the staking hooks defined in the observer modules + func GetObserverAccount(observerAddress string, accounts []simtypes.Account) (simtypes.Account, error) { operatorAddress, err := observerTypes.GetOperatorAddressFromAccAddress(observerAddress) if err != nil { diff --git a/x/observer/abci.go b/x/observer/abci.go index 6d3315134f..3f56252329 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -33,7 +33,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { } // #nosec G115 always in range - //k.DisableInboundOnly(ctx) + k.DisableInboundOnly(ctx) k.SetKeygen(ctx, types.Keygen{BlockNumber: math.MaxInt64}) // #nosec G115 always positive k.SetLastObserverCount( From d03ed5f49968c8c93a00c68989f0e081637e48bb Mon Sep 17 00:00:00 2001 From: Tanmay Date: Thu, 7 Nov 2024 16:47:07 -0500 Subject: [PATCH 12/18] fix import export tests --- simulation/simulation_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/simulation/simulation_test.go b/simulation/simulation_test.go index 283aef32d9..e0220f3f5f 100644 --- a/simulation/simulation_test.go +++ b/simulation/simulation_test.go @@ -505,8 +505,6 @@ func TestAppSimulationAfterImport(t *testing.T) { exported, err := simApp.ExportAppStateAndValidators(true, []string{}, []string{}) require.NoError(t, err) - t.Log("importing genesis") - newDB, newDir, _, _, err := cosmossimutils.SetupSimulation( config, SimDBBackend+"_new", @@ -535,7 +533,7 @@ func TestAppSimulationAfterImport(t *testing.T) { ) require.NoError(t, err) - t.Log("Adding app state to new app") + t.Log("Importing genesis into the new app") newSimApp.InitChain(abci.RequestInitChain{ ChainId: SimAppChainID, AppStateBytes: exported.AppState, From 70702119f1e14b901403fb1d9cef70f94ae75b0d Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 11:46:39 -0500 Subject: [PATCH 13/18] fix app determinism test --- Makefile | 2 +- simulation/simulation_test.go | 6 ++++-- simulation/state.go | 9 +++++++-- testutil/sample/crosschain.go | 24 ++++++++++++++++++++++++ testutil/sample/sample.go | 5 +++++ x/crosschain/simulation/operations.go | 4 ++-- x/fungible/simulation/operations.go | 6 +++--- x/observer/simulation/operations.go | 2 +- 8 files changed, 47 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f39e4f27ff..e6a75d3eff 100644 --- a/Makefile +++ b/Makefile @@ -404,7 +404,7 @@ test-sim-fullappsimulation: $(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,30m) test-sim-import-export: - $(call run-sim-test,"test-import-export",TestAppImportExport,100,200,30m) + $(call run-sim-test,"test-import-export",TestAppImportExport,50,100,30m) test-sim-after-import: $(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,100,200,30m) diff --git a/simulation/simulation_test.go b/simulation/simulation_test.go index e0220f3f5f..907ff48648 100644 --- a/simulation/simulation_test.go +++ b/simulation/simulation_test.go @@ -82,7 +82,7 @@ func TestAppStateDeterminism(t *testing.T) { config.DBBackend = SimDBBackend config.BlockMaxGas = SimBlockMaxGas - numSeeds := 3 + numSeeds := 2 numTimesToRunPerSeed := 5 // We will be overriding the random seed and just run a single simulation on the provided seed value @@ -378,7 +378,9 @@ func TestAppImportExport(t *testing.T) { // The ordering of the keys is not important, we compare the same prefix for both simulations storeKeysPrefixes := []StoreKeysPrefixes{ - // Interaction with EVM module , such as deploying contracts or interting with with them such as setting gas price causes the state for the auth module to change on export . + // Interaction with EVM module, + //such as deploying contracts or interacting with them such as setting gas price, + // causes the state for the auth module to change on export.The order of keys within the store is modified. // We will need to explore this further to find a definitive answer //{simApp.GetKey(authtypes.StoreKey), newSimApp.GetKey(authtypes.StoreKey), [][]byte{}}, { diff --git a/simulation/state.go b/simulation/state.go index 3365b8e54a..0174155d00 100644 --- a/simulation/state.go +++ b/simulation/state.go @@ -22,7 +22,6 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" zetaapp "github.com/zeta-chain/node/app" - "github.com/zeta-chain/node/testutil/sample" authoritytypes "github.com/zeta-chain/node/x/authority/types" observertypes "github.com/zeta-chain/node/x/observer/types" ) @@ -167,7 +166,13 @@ func AppStateFn( observerState.Observers.ObserverList = observers observerState.CrosschainFlags.IsInboundEnabled = true observerState.CrosschainFlags.IsOutboundEnabled = true - tss := sample.Tss() + tss := observertypes.TSS{ + TssPubkey: "cosmospub1addwnpepq27ldhn924mtwylm2r0vja3fcv3nv6gme0e2jnr96l0fkkqw6guscgqfsk0", + KeyGenZetaHeight: 100, + FinalizedZetaHeight: 110, + TssParticipantList: []string{}, + OperatorAddressList: observers, + } observerState.Tss = &tss // Pick a random account to be the admin of all policies diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 25733e1fef..069b89cd7a 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -11,6 +11,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" @@ -274,6 +275,7 @@ func ZetaAccounting(t *testing.T, index string) types.ZetaAccounting { } } +// InboundVote creates a sample inbound vote message func InboundVote(coinType coin.CoinType, from, to int64) types.MsgVoteInbound { return types.MsgVoteInbound{ Creator: "", @@ -295,6 +297,28 @@ func InboundVote(coinType coin.CoinType, from, to int64) types.MsgVoteInbound { } } +// InboundVoteSim creates a simulated inbound vote message. This function uses the provided source of randomness to generate +func InboundVoteSim(coinType coin.CoinType, from, to int64, r *rand.Rand) types.MsgVoteInbound { + return types.MsgVoteInbound{ + Creator: "", + Sender: "0x388C818CA8B9251b393131C08a736A67ccB19297", + SenderChainId: from, + Receiver: "0x388C818CA8B9251b393131C08a736A67ccB19297", + ReceiverChain: to, + Amount: math.NewUint(r.Uint64()), + Message: base64.StdEncoding.EncodeToString(RandomBytes(r)), + InboundBlockHeight: r.Uint64(), + CallOptions: &types.CallOptions{ + GasLimit: 1000000000, + }, + InboundHash: ethcommon.BytesToHash(RandomBytes(r)).String(), + CoinType: coinType, + TxOrigin: "0x388C818CA8B9251b393131C08a736A67ccB19297", + Asset: "", + EventIndex: r.Uint64(), + } +} + func ZRC20Withdrawal(to []byte, value *big.Int) *zrc20.ZRC20Withdrawal { return &zrc20.ZRC20Withdrawal{ From: EthAddress(), diff --git a/testutil/sample/sample.go b/testutil/sample/sample.go index 365d1c7e85..a4999f6b42 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -61,6 +61,11 @@ func Bytes() []byte { return []byte("sample") } +func RandomBytes(r *rand.Rand) []byte { + s := StringRandom(r, 10) + return []byte(s) +} + // String returns a sample string func String() string { return "sample" diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index e98f0dc732..02c8bb83df 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -228,7 +228,7 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { to = chain.ChainId } } - msg := sample.InboundVote(0, from, to) + msg := sample.InboundVoteSim(0, from, to, r) // Pick a random observer to create the ballot // If this returns and error it is likely that the entire observer set has been removed @@ -239,6 +239,7 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { txGen := moduletestutil.MakeTestEncodingConfig().TxConfig account := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) + //spendable := k.GetBankKeeper().SpendableCoins(ctx, account.GetAddress()) firstMsg := msg firstMsg.Creator = firstVoter @@ -409,7 +410,6 @@ func GetRandomAccountAndObserver( } randomObserver := GetRandomObserver(r, observers.ObserverList) - simAccount, err := GetObserverAccount(randomObserver, accounts) if err != nil { return simtypes.Account{}, "", err diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index b5c441a6ba..fbd9e99ed1 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -54,9 +54,9 @@ func WeightedOperations( func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - if DeployedSystemContracts { - return simtypes.OperationMsg{}, nil, nil - } + //if DeployedSystemContracts { + // return simtypes.OperationMsg{}, nil, nil + //} policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { diff --git a/x/observer/simulation/operations.go b/x/observer/simulation/operations.go index 3f676524eb..dadc02523c 100644 --- a/x/observer/simulation/operations.go +++ b/x/observer/simulation/operations.go @@ -27,7 +27,7 @@ const ( // to ensure that it is present in the block more number of times than any operation that changes the validator set // Arrived at this number based on the weights used in the cosmos sdk staking module and through some trial and error - DefaultWeightMsgTypeMsgEnableCCTX = 650 + DefaultWeightMsgTypeMsgEnableCCTX = 2650 ) // WeightedOperations for observer module From cda3f220ffb682fa27a06fc88357017b928b4de4 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 12:05:02 -0500 Subject: [PATCH 14/18] update codecov.yml --- codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index da90e44bd9..092dd4baa4 100644 --- a/codecov.yml +++ b/codecov.yml @@ -52,7 +52,7 @@ ignore: - "x/**/events.go" - "x/**/migrator.go" - "x/**/module_simulation.go" - - "x/**/simulation/**/*" + - "x/**/simulation/*.go" - "**/*.proto" - "**/*.md" - "**/*.yml" From 9172df702b7ac62bc4e754c21cc818e611a5a23e Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 12:21:44 -0500 Subject: [PATCH 15/18] reduce weight for DeployedSystemContracts operation --- x/crosschain/simulation/operations.go | 6 ++---- x/fungible/simulation/operations.go | 11 +---------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/x/crosschain/simulation/operations.go b/x/crosschain/simulation/operations.go index 02c8bb83df..f8ade5e974 100644 --- a/x/crosschain/simulation/operations.go +++ b/x/crosschain/simulation/operations.go @@ -231,7 +231,7 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { msg := sample.InboundVoteSim(0, from, to, r) // Pick a random observer to create the ballot - // If this returns and error it is likely that the entire observer set has been removed + // If this returns an error, it is likely that the entire observer set has been removed simAccount, firstVoter, err := GetRandomAccountAndObserver(r, ctx, k, accs) if err != nil { return simtypes.OperationMsg{}, nil, nil @@ -239,7 +239,6 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { txGen := moduletestutil.MakeTestEncodingConfig().TxConfig account := k.GetAuthKeeper().GetAccount(ctx, simAccount.Address) - //spendable := k.GetBankKeeper().SpendableCoins(ctx, account.GetAddress()) firstMsg := msg firstMsg.Creator = firstVoter @@ -285,7 +284,6 @@ func SimulateVoteInbound(k keeper.Keeper) simtypes.Operation { // 1.2) select who votes whoVotes := r.Perm(len(observerSet.ObserverList)) - // didntVote := whoVotes[numVotes:] whoVotes = whoVotes[:numVotes] var fops []simtypes.FutureOperation @@ -325,7 +323,7 @@ func SimulateMsgVoteGasPrice(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { // Get a random account and observer - // If this returns and error it is likely that the entire observer set has been removed + // If this returns an error, it is likely that the entire observer set has been removed simAccount, randomObserver, err := GetRandomAccountAndObserver(r, ctx, k, accounts) if err != nil { return simtypes.OperationMsg{}, nil, nil diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index fbd9e99ed1..6e41745333 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -24,15 +24,11 @@ import ( const ( // #nosec G101 not a hardcoded credential OpWeightMsgDeploySystemContracts = "op_weight_msg_deploy_system_contracts" - DefaultWeightMsgDeploySystemContracts = 100 + DefaultWeightMsgDeploySystemContracts = 10 ) // DeployedSystemContracts Use a flag to ensure that the system contracts are deployed only once // https://github.com/zeta-chain/node/issues/3102 -var ( - DeployedSystemContracts = false -) - func WeightedOperations( appParams simtypes.AppParams, cdc codec.JSONCodec, k keeper.Keeper) simulation.WeightedOperations { var weightMsgDeploySystemContracts int @@ -54,10 +50,6 @@ func WeightedOperations( func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, _ string, ) (OperationMsg simtypes.OperationMsg, futureOps []simtypes.FutureOperation, err error) { - //if DeployedSystemContracts { - // return simtypes.OperationMsg{}, nil, nil - //} - policies, found := k.GetAuthorityKeeper().GetPolicies(ctx) if !found { return simtypes.NoOpMsg( @@ -107,7 +99,6 @@ func SimulateMsgDeploySystemContracts(k keeper.Keeper) simtypes.Operation { ModuleName: types.ModuleName, } - DeployedSystemContracts = true return simulation.GenAndDeliverTxWithRandFees(txCtx) } } From 8526eab5a9ac027c24c91519492a5a42b8e9df7d Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 12:58:22 -0500 Subject: [PATCH 16/18] add new function to generate eth address from provided randomness --- simulation/state.go | 17 +++++++++++++++++ testutil/sample/crosschain.go | 9 +++++---- testutil/sample/crypto.go | 5 +++++ x/fungible/simulation/operations.go | 2 +- x/fungible/types/genesis.go | 5 +---- x/observer/simulation/operations.go | 2 +- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/simulation/state.go b/simulation/state.go index 0174155d00..69d71d0010 100644 --- a/simulation/state.go +++ b/simulation/state.go @@ -20,6 +20,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + "github.com/zeta-chain/node/testutil/sample" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" zetaapp "github.com/zeta-chain/node/app" authoritytypes "github.com/zeta-chain/node/x/authority/types" @@ -203,12 +205,27 @@ func AppStateFn( } authorityState.Policies = policies + //Update the fungible genesis state + fungibleStateBz, ok := rawState[fungibletypes.ModuleName] + if !ok { + panic("fungible genesis state is missing") + } + fungibleState := new(fungibletypes.GenesisState) + cdc.MustUnmarshalJSON(fungibleStateBz, fungibleState) + // TOODO generate ethereum address from r + fungibleState.SystemContract = &fungibletypes.SystemContract{ + SystemContract: sample.EthAddressRandom(r).String(), + ConnectorZevm: sample.EthAddressRandom(r).String(), + Gateway: sample.EthAddressRandom(r).String(), + } + // change appState back rawState[evmtypes.ModuleName] = cdc.MustMarshalJSON(evmState) rawState[stakingtypes.ModuleName] = cdc.MustMarshalJSON(stakingState) rawState[banktypes.ModuleName] = cdc.MustMarshalJSON(bankState) rawState[observertypes.ModuleName] = cdc.MustMarshalJSON(observerState) rawState[authoritytypes.ModuleName] = cdc.MustMarshalJSON(authorityState) + rawState[fungibletypes.ModuleName] = cdc.MustMarshalJSON(fungibleState) // replace appstate appState, err = json.Marshal(rawState) diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 069b89cd7a..b6af0f9012 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -299,11 +299,12 @@ func InboundVote(coinType coin.CoinType, from, to int64) types.MsgVoteInbound { // InboundVoteSim creates a simulated inbound vote message. This function uses the provided source of randomness to generate func InboundVoteSim(coinType coin.CoinType, from, to int64, r *rand.Rand) types.MsgVoteInbound { + EthAddress() return types.MsgVoteInbound{ Creator: "", - Sender: "0x388C818CA8B9251b393131C08a736A67ccB19297", + Sender: EthAddressRandom(r).String(), SenderChainId: from, - Receiver: "0x388C818CA8B9251b393131C08a736A67ccB19297", + Receiver: EthAddressRandom(r).String(), ReceiverChain: to, Amount: math.NewUint(r.Uint64()), Message: base64.StdEncoding.EncodeToString(RandomBytes(r)), @@ -313,8 +314,8 @@ func InboundVoteSim(coinType coin.CoinType, from, to int64, r *rand.Rand) types. }, InboundHash: ethcommon.BytesToHash(RandomBytes(r)).String(), CoinType: coinType, - TxOrigin: "0x388C818CA8B9251b393131C08a736A67ccB19297", - Asset: "", + TxOrigin: EthAddressRandom(r).String(), + Asset: StringRandom(r, 32), EventIndex: r.Uint64(), } } diff --git a/testutil/sample/crypto.go b/testutil/sample/crypto.go index 7cc565936a..62a82c7fac 100644 --- a/testutil/sample/crypto.go +++ b/testutil/sample/crypto.go @@ -60,6 +60,11 @@ func EthAddress() ethcommon.Address { return ethcommon.BytesToAddress(sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address()).Bytes()) } +func EthAddressRandom(r *rand.Rand) ethcommon.Address { + return ethcommon.BytesToAddress(sdk.AccAddress(PubKey(r).Address()).Bytes()) + +} + // BtcAddressP2WPKH returns a sample btc P2WPKH address func BtcAddressP2WPKH(t *testing.T, net *chaincfg.Params) string { privateKey, err := btcec.NewPrivateKey() diff --git a/x/fungible/simulation/operations.go b/x/fungible/simulation/operations.go index 6e41745333..4e82e172d9 100644 --- a/x/fungible/simulation/operations.go +++ b/x/fungible/simulation/operations.go @@ -24,7 +24,7 @@ import ( const ( // #nosec G101 not a hardcoded credential OpWeightMsgDeploySystemContracts = "op_weight_msg_deploy_system_contracts" - DefaultWeightMsgDeploySystemContracts = 10 + DefaultWeightMsgDeploySystemContracts = 5 ) // DeployedSystemContracts Use a flag to ensure that the system contracts are deployed only once diff --git a/x/fungible/types/genesis.go b/x/fungible/types/genesis.go index a8c4f7bbd9..20831ea7c4 100644 --- a/x/fungible/types/genesis.go +++ b/x/fungible/types/genesis.go @@ -8,10 +8,7 @@ import ( func DefaultGenesis() *GenesisState { return &GenesisState{ ForeignCoinsList: []ForeignCoins{}, - SystemContract: &SystemContract{ - SystemContract: "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921", - ConnectorZevm: "0x239e96c8f17C85c30100AC26F635Ea15f23E9c67", - }, + SystemContract: &SystemContract{}, } } diff --git a/x/observer/simulation/operations.go b/x/observer/simulation/operations.go index dadc02523c..14b92c5e59 100644 --- a/x/observer/simulation/operations.go +++ b/x/observer/simulation/operations.go @@ -27,7 +27,7 @@ const ( // to ensure that it is present in the block more number of times than any operation that changes the validator set // Arrived at this number based on the weights used in the cosmos sdk staking module and through some trial and error - DefaultWeightMsgTypeMsgEnableCCTX = 2650 + DefaultWeightMsgTypeMsgEnableCCTX = 3650 ) // WeightedOperations for observer module From ea92069a34529612387904753abcadf0d531160e Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 13:43:57 -0500 Subject: [PATCH 17/18] Update x/fungible/simulation/decoders.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- x/fungible/simulation/decoders.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/x/fungible/simulation/decoders.go b/x/fungible/simulation/decoders.go index b8486dd8bb..3f229a5d67 100644 --- a/x/fungible/simulation/decoders.go +++ b/x/fungible/simulation/decoders.go @@ -14,19 +14,30 @@ import ( // Value to the corresponding fungible types. func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { return func(kvA, kvB kv.Pair) string { + if !bytes.Equal(kvA.Key[:1], kvB.Key[:1]) { + return fmt.Sprintf("key prefixes do not match. A: %X, B: %X", kvA.Key[:1], kvB.Key[:1]) + } switch { case bytes.Equal(kvA.Key, types.KeyPrefix(types.SystemContractKey)): var systemContractA, systemContractB types.SystemContract - cdc.MustUnmarshal(kvA.Value, &systemContractA) - cdc.MustUnmarshal(kvB.Value, &systemContractB) + if err := cdc.Unmarshal(kvA.Value, &systemContractA); err != nil { + return fmt.Sprintf("failed to unmarshal A: %v", err) + } + if err := cdc.Unmarshal(kvB.Value, &systemContractB); err != nil { + return fmt.Sprintf("failed to unmarshal B: %v", err) + } return fmt.Sprintf("%v\n%v", systemContractA, systemContractB) case bytes.Equal(kvA.Key, types.KeyPrefix(types.ForeignCoinsKeyPrefix)): var foreignCoinsA, foreignCoinsB types.ForeignCoins - cdc.MustUnmarshal(kvA.Value, &foreignCoinsA) - cdc.MustUnmarshal(kvB.Value, &foreignCoinsB) + if err := cdc.Unmarshal(kvA.Value, &foreignCoinsA); err != nil { + return fmt.Sprintf("failed to unmarshal A: %v", err) + } + if err := cdc.Unmarshal(kvB.Value, &foreignCoinsB); err != nil { + return fmt.Sprintf("failed to unmarshal B: %v", err) + } return fmt.Sprintf("%v\n%v", foreignCoinsA, foreignCoinsB) default: - panic(fmt.Sprintf("invalid fungible key prefix %X", kvA.Key[:1])) + return fmt.Sprintf("invalid fungible key prefix %X", kvA.Key[:1]) } } } From 977a22c744de69e3bfe0dd918bee39d76149ad8a Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 8 Nov 2024 13:46:16 -0500 Subject: [PATCH 18/18] Update testutil/sample/sample.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- testutil/sample/sample.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testutil/sample/sample.go b/testutil/sample/sample.go index a4999f6b42..edf705b5fd 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -62,8 +62,9 @@ func Bytes() []byte { } func RandomBytes(r *rand.Rand) []byte { - s := StringRandom(r, 10) - return []byte(s) + b := make([]byte, 10) + _, _ = r.Read(b) + return b } // String returns a sample string