diff --git a/app/app.go b/app/app.go index 4dac86a0..1b3f86e4 100644 --- a/app/app.go +++ b/app/app.go @@ -13,6 +13,7 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" + auctionkeeper "git.vdb.to/cerc-io/laconic2d/x/auction/keeper" bondkeeper "git.vdb.to/cerc-io/laconic2d/x/bond/keeper" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" @@ -33,6 +34,7 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" _ "cosmossdk.io/api/cosmos/tx/config/v1" // import for side-effects + _ "git.vdb.to/cerc-io/laconic2d/x/auction/module" // import for side-effects _ "git.vdb.to/cerc-io/laconic2d/x/bond/module" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/auth" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects @@ -72,8 +74,8 @@ type LaconicApp struct { ConsensusParamsKeeper consensuskeeper.Keeper // laconic keepers - // AuctionKeeper auctionkeeper.Keeper - BondKeeper bondkeeper.Keeper + AuctionKeeper auctionkeeper.Keeper + BondKeeper bondkeeper.Keeper // RegistryKeeper registrykeeper.Keeper // RegistryRecordKeeper registrykeeper.RecordKeeper @@ -135,6 +137,7 @@ func NewLaconicApp( &app.StakingKeeper, &app.DistrKeeper, &app.ConsensusParamsKeeper, + &app.AuctionKeeper, &app.BondKeeper, ); err != nil { return nil, err diff --git a/app/app.yaml b/app/app.yaml index 1a7cc815..71bce538 100644 --- a/app/app.yaml +++ b/app/app.yaml @@ -7,10 +7,10 @@ modules: # there is nothing left over in the validator fee pool, so as to keep the CanWithdrawInvariant invariant. # NOTE: staking module is required if HistoricalEntries param > 0 begin_blockers: [distribution, staking] - end_blockers: [staking] + end_blockers: [staking, auction] # NOTE: The genutils module must occur after staking so that pools are properly initialized with tokens from genesis accounts. # NOTE: The genutils module must also occur after auth so that it can access the params from auth. - init_genesis: [auth, bank, distribution, staking, genutil, bond] + init_genesis: [auth, bank, distribution, staking, genutil, auction, bond] override_store_keys: - module_name: auth kv_store_key: acc @@ -25,6 +25,8 @@ modules: permissions: [burner, staking] - account: not_bonded_tokens_pool permissions: [burner, staking] + - account: auction + - account: auction_burn - account: bond - name: bank config: @@ -49,3 +51,6 @@ modules: - name: bond config: "@type": cerc.bond.module.v1.Module + - name: auction + config: + "@type": cerc.auction.module.v1.Module