fix: unwire spot module for main branch #1831
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,13 +110,6 @@ import ( | |
| oracle "github.com/NibiruChain/nibiru/x/oracle" | ||
| oraclekeeper "github.com/NibiruChain/nibiru/x/oracle/keeper" | ||
| oracletypes "github.com/NibiruChain/nibiru/x/oracle/types" | ||
|
|
||
| "github.com/NibiruChain/nibiru/x/sudo" | ||
| "github.com/NibiruChain/nibiru/x/sudo/keeper" | ||
|
|
@@ -172,8 +165,6 @@ type AppKeepers struct { | |
| // Nibiru keepers | ||
| // --------------- | ||
| EpochsKeeper epochskeeper.Keeper | ||
| OracleKeeper oraclekeeper.Keeper | ||
| InflationKeeper inflationkeeper.Keeper | ||
| SudoKeeper keeper.Keeper | ||
|
|
@@ -212,10 +203,8 @@ func initStoreKeys() ( | |
| ibcexported.StoreKey, | ||
|
|
||
| // nibiru x/ keys | ||
| oracletypes.StoreKey, | ||
| epochstypes.StoreKey, | ||
| inflationtypes.StoreKey, | ||
| sudotypes.StoreKey, | ||
| wasmtypes.StoreKey, | ||
|
|
@@ -353,10 +342,6 @@ func (app *NibiruApp) InitKeepers( | |
|
|
||
| // ---------------------------------- Nibiru Chain x/ keepers | ||
|
|
||
| app.SudoKeeper = keeper.NewKeeper( | ||
| appCodec, keys[sudotypes.StoreKey], | ||
| ) | ||
|
|
@@ -371,20 +356,13 @@ func (app *NibiruApp) InitKeepers( | |
| appCodec, keys[epochstypes.StoreKey], | ||
| ) | ||
|
|
||
| app.InflationKeeper = inflationkeeper.NewKeeper( | ||
| appCodec, keys[inflationtypes.StoreKey], app.GetSubspace(inflationtypes.ModuleName), | ||
| app.AccountKeeper, app.BankKeeper, app.DistrKeeper, app.stakingKeeper, app.SudoKeeper, authtypes.FeeCollectorName, | ||
| ) | ||
|
|
||
| app.EpochsKeeper.SetHooks( | ||
| epochstypes.NewMultiEpochHooks( | ||
| app.InflationKeeper.Hooks(), | ||
| app.OracleKeeper.Hooks(), | ||
| ), | ||
|
|
@@ -437,8 +415,8 @@ func (app *NibiruApp) InitKeepers( | |
| // NOTE: This keeper depends on all of pointers to the the Keepers to which | ||
| // it binds. Thus, it must be instantiated after those keepers have been | ||
| // assigned. | ||
| // For example, if there are bindings for the x/inflation module, then the app | ||
| // passed to GetWasmOpts must already have a non-nil InflationKeeper. | ||
| supportedFeatures := strings.Join(wasmdapp.AllCapabilities(), ",") | ||
| app.WasmKeeper = wasmkeeper.NewKeeper( | ||
| appCodec, | ||
|
|
@@ -590,10 +568,8 @@ func (app *NibiruApp) initAppModules( | |
| authzmodule.NewAppModule(appCodec, app.authzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), | ||
|
|
||
| // Nibiru modules | ||
| oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper), | ||
| epochs.NewAppModule(appCodec, app.EpochsKeeper), | ||
| inflation.NewAppModule(app.InflationKeeper, app.AccountKeeper, *app.stakingKeeper), | ||
| sudo.NewAppModule(appCodec, app.SudoKeeper), | ||
| genmsg.NewAppModule(app.MsgServiceRouter()), | ||
|
|
@@ -662,9 +638,7 @@ func orderedModuleNames() []string { | |
| // -------------------------------------------------------------------- | ||
| // Native x/ Modules | ||
| epochstypes.ModuleName, | ||
| oracletypes.ModuleName, | ||
| inflationtypes.ModuleName, | ||
| sudotypes.ModuleName, | ||
|
|
||
|
|
@@ -776,10 +750,8 @@ func ModuleBasicManager() module.BasicManager { | |
| ibctransfer.AppModuleBasic{}, | ||
| ibctm.AppModuleBasic{}, | ||
| // native x/ | ||
| oracle.AppModuleBasic{}, | ||
| epochs.AppModuleBasic{}, | ||
| inflation.AppModuleBasic{}, | ||
| sudo.AppModuleBasic{}, | ||
| wasm.AppModuleBasic{}, | ||
|
|
@@ -798,18 +770,10 @@ func ModuleAccPerms() map[string][]string { | |
| stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking}, | ||
| stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking}, | ||
| govtypes.ModuleName: {authtypes.Burner}, | ||
| oracletypes.ModuleName: {}, | ||
| ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, | ||
| ibcfeetypes.ModuleName: {}, | ||
|
|
||
| epochstypes.ModuleName: {}, | ||
| sudotypes.ModuleName: {}, | ||
| common.TreasuryPoolModuleAccount: {}, | ||
|
|
@@ -818,7 +782,6 @@ func ModuleAccPerms() map[string][]string { | |
| } | ||
| } | ||
|
|
||
| func initParamsKeeper( | ||
| appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, | ||
| tkey storetypes.StoreKey, | ||
|
|
@@ -833,7 +796,6 @@ func initParamsKeeper( | |
| paramsKeeper.Subspace(govtypes.ModuleName) | ||
| paramsKeeper.Subspace(crisistypes.ModuleName) | ||
| // Nibiru core params keepers | x/ | ||
| paramsKeeper.Subspace(epochstypes.ModuleName) | ||
| paramsKeeper.Subspace(inflationtypes.ModuleName) | ||
| // ibc params keepers | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,6 @@ import ( | |
|
|
||
| "github.com/NibiruChain/nibiru/app" | ||
| oraclecli "github.com/NibiruChain/nibiru/x/oracle/client/cli" | ||
| ) | ||
|
|
||
| // NewRootCmd creates a new root command for nibid. It is called once in the | ||
|
|
@@ -156,7 +155,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig app.EncodingConfig) { | |
| genesisCommand( | ||
| encodingConfig, | ||
| oraclecli.AddGenesisPricefeederDelegationCmd(app.DefaultNodeHome), | ||
| cli.AddSudoRootAccountCmd(app.DefaultNodeHome), | ||
| ), | ||
| queryCommand(), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,6 @@ RUN apk --no-cache add \ | |
| COPY --from=builder /nibiru/build/nibid /usr/local/bin/nibid | ||
|
|
||
| COPY ./contrib/scripts/chaosnet.sh ./ | ||
| RUN chmod +x ./chaosnet.sh | ||
| ARG MNEMONIC | ||
| ARG CHAIN_ID | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The phrase "For the blockchain implementation." should not have a space before the period. Consider revising to maintain grammatical correctness.
Committable suggestion