fix: unwire perp module for main branch #1830
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -22,17 +22,17 @@ | |
|
|
||
| ## ⚙️ — Documentation | ||
|
|
||
| - [Docs | Nibiru Chain](https://nibiru.fi/docs/): Conceptual and technical documentation can be found here. | ||
| - [Complete Golang reference docs](https://pkg.go.dev/github.com/NibiruChain/nibiru): (`pkg.go.dev`) For the blockchain implementation . | ||
| - ["X Module"](https://nibiru.fi/docs/dev/x/)-specific documentation | ||
|
|
||
| ## 💬 — Community | ||
|
|
||
| If you have questions or concerns, feel free to connect with a developer or community member in the [Nibiru Discord][social-discord]. We also have active communities on [Twitter][social-twitter] and [Telegram][social-telegram]. | ||
|
|
||
| <!-- Markdown versions of the social badges | ||
| [![description][discord-badge]][social-discord] | ||
| [![description][twitter-badge]][social-twitter] | ||
| [![description][telegram-badge]][social-telegram] | ||
| --> | ||
|
|
||
|
Comment on lines
22
to
38
There was a problem hiding this comment.
The operating system name should adhere to the standard naming convention. Here's the correction: - MacOS
+ macOS |
||
|
|
@@ -44,33 +44,30 @@ If you have questions or concerns, feel free to connect with a developer or comm | |
|
|
||
| ## 🧱 — Components of Nibiru | ||
|
|
||
| - **CosmWasm Smart Contracts**: Rust-based, Wasm smart contracts built enhanced security, performance, and interoperability. See our [CosmWasm sandbox monorepo (cw-nibiru)](https://github.com/NibiruChain/cw-nibiru/tree/main) for the protocol's core smart contracts. | ||
| - **Nibi-Oracle**: Nibiru accurately prices assets using a native, system of decentralized oracles, and communicates with other Cosmos layer-1 chains using the Inter-Blockchain Communication (IBC) (opens new window)protocol. | ||
| - **Nibi-Swap**: An automated market maker protocol for multichain assets. This application gives users access to swaps, pools, and bonded liquidity gauges. | ||
|
|
||
| | Module | Description | | ||
| | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ||
| | [wasm][code-x-wasm] | Implements the execution environment for [WebAssembly (WASM) smart contracts](https://nibiru.fi/docs/wasm/). | | ||
| | [devgas][code-x-devgas] | The `devgas` module of Nibiru Chain shares contract execution fees with smart contract developers. This aims to increase the adoption of Nibiru by offering CosmWasm smart contract developers a direct source of income based on usage. | | ||
| | [epochs][code-x-epochs] | The `epochs` module allows other modules to set hooks to be called to execute code automatically on a period basis. For example, "once a week, starting at UTC-time = x". `epochs` creates a generalized epoch interface. | | ||
| | [inflation][code-x-inflation] | Implements the [tokenomics](https://nibiru.fi/docs/learn/tokenomics.html) for Nibiru. | | ||
| | [common][code-x-common] | Holds helper and utility functions to be utilized by other `x/` modules. | | ||
| | [oracle][code-x-oracle] | Handles the posting of an up-to-date and accurate feed of exchange rates from the validators. | | ||
| | [spot][code-x-spot] | Responsible for creating, joining, and exiting liquidity pools. It also allows users to swap between two assets in an existing pool. It's a fully functional AMM. | | ||
|
|
||
| [code-x-common]: https://github.com/NibiruChain/nibiru/tree/main/x/common | ||
| [code-x-devgas]: https://nibiru.fi/docs/dev/x/nibiru-chain/devgas.html | ||
| [code-x-epochs]: https://github.com/NibiruChain/nibiru/tree/main/x/epochs | ||
| [code-x-inflation]: https://github.com/NibiruChain/nibiru/tree/main/x/inflation | ||
| [code-x-oracle]: https://github.com/NibiruChain/nibiru/tree/main/x/oracle | ||
| [code-x-spot]: https://github.com/NibiruChain/nibiru/tree/main/x/spot | ||
|
|
||
| Nibiru is built with the [Cosmos-SDK][cosmos-sdk-repo] on [Tendermint Core](https://tendermint.com/core/) consensus and communicates with other blockchain chains using the [Inter-Blockchain Communication (IBC)](https://github.com/cosmos/ibc) protocol. | ||
|
|
||
| --- | ||
|
|
||
| ## ⛓️ — Building: `make` commands | ||
|
|
||
|
|
@@ -94,10 +91,12 @@ Usage instructions for the `nibid` CLI are available at [docs.nibiru.fi/dev/cli] | |
| ### Running a Local Node | ||
|
|
||
| On a fresh clone of the repo, simply run: | ||
|
|
||
| ```bash | ||
| make localnet | ||
| ``` | ||
|
|
||
| and open another terminal. | ||
|
|
||
| ### Generate the protobufs | ||
|
|
||
|
|
@@ -131,19 +130,13 @@ Licensed under the [MIT License](./LICENSE.md). | |
|
|
||
| [license-badge]: https://img.shields.io/badge/License-MIT-blue.svg | ||
| [cosmos-sdk-repo]: https://github.com/cosmos/cosmos-sdk | ||
| [badge-go-linter]: https://github.com/NibiruChain/nibiru/actions/workflows/golangci-lint.yml/badge.svg?query=branch%3Amain | ||
| [workflow-go-linter]: https://github.com/NibiruChain/nibiru/actions/workflows/golangci-lint.yml?query=branch%3Amain | ||
| [badge-go-releaser]: https://github.com/NibiruChain/nibiru/actions/workflows/goreleaser.yml/badge.svg?query=branch%3Amain | ||
| [workflow-go-releaser]: https://github.com/NibiruChain/nibiru/actions/workflows/goreleaser.yml?query=branch%3Amain | ||
| [social-twitter]: https://twitter.com/NibiruChain | ||
| [social-discord]: https://discord.gg/nibirufi | ||
| [social-telegram]: https://t.me/nibiruchain | ||
| [discord-badge]: https://img.shields.io/badge/Discord-7289DA?&logo=discord&logoColor=white | ||
| [twitter-badge]: https://img.shields.io/badge/Twitter-1DA1F2?&logo=twitter&logoColor=white | ||
| [telegram-badge]: https://img.shields.io/badge/Telegram-2CA5E0?&logo=telegram&logoColor=white | ||
|
|
@@ -153,7 +146,7 @@ https://github.com/NibiruChain/nibiru/actions/workflows/goreleaser.yml?query=bra | |
|
|
||
| [](https://github.com/NibiruChain/nibiru/releases/latest) | ||
|
|
||
| [](https://goreportcard.com/report/github.com/NibiruChain/nibiru) | ||
|
|
||
| [](https://godoc.org/github.com/NibiruChain/nibiru) | ||
|
|
||
|
|
||
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,9 +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/spot" | ||
| spotkeeper "github.com/NibiruChain/nibiru/x/spot/keeper" | ||
|
|
@@ -172,7 +169,6 @@ type AppKeepers struct { | |
| // Nibiru keepers | ||
| // --------------- | ||
| EpochsKeeper epochskeeper.Keeper | ||
| SpotKeeper spotkeeper.Keeper | ||
| OracleKeeper oraclekeeper.Keeper | ||
| InflationKeeper inflationkeeper.Keeper | ||
|
|
@@ -215,7 +211,6 @@ func initStoreKeys() ( | |
| spottypes.StoreKey, | ||
| oracletypes.StoreKey, | ||
| epochstypes.StoreKey, | ||
| inflationtypes.StoreKey, | ||
| sudotypes.StoreKey, | ||
| wasmtypes.StoreKey, | ||
|
|
@@ -371,20 +366,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 +425,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, | ||
|
|
@@ -593,7 +581,6 @@ func (app *NibiruApp) initAppModules( | |
| spot.NewAppModule(appCodec, app.SpotKeeper, app.AccountKeeper, app.BankKeeper), | ||
| 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()), | ||
|
|
@@ -664,7 +651,6 @@ func orderedModuleNames() []string { | |
| epochstypes.ModuleName, | ||
| spottypes.ModuleName, | ||
| oracletypes.ModuleName, | ||
| inflationtypes.ModuleName, | ||
| sudotypes.ModuleName, | ||
|
|
||
|
|
@@ -779,7 +765,6 @@ func ModuleBasicManager() module.BasicManager { | |
| spot.AppModuleBasic{}, | ||
| oracle.AppModuleBasic{}, | ||
| epochs.AppModuleBasic{}, | ||
| inflation.AppModuleBasic{}, | ||
| sudo.AppModuleBasic{}, | ||
| wasm.AppModuleBasic{}, | ||
|
|
@@ -803,13 +788,6 @@ func ModuleAccPerms() map[string][]string { | |
| ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, | ||
| ibcfeetypes.ModuleName: {}, | ||
|
|
||
| epochstypes.ModuleName: {}, | ||
| sudotypes.ModuleName: {}, | ||
| common.TreasuryPoolModuleAccount: {}, | ||
|
|
@@ -818,7 +796,6 @@ func ModuleAccPerms() map[string][]string { | |
| } | ||
| } | ||
|
|
||
| func initParamsKeeper( | ||
| appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, | ||
| tkey storetypes.StoreKey, | ||
|
|
||
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 | ||
|
|
||
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 |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # This script is used in tandem with `contrib/docker/chaosnet.Dockerfile` to | ||
| # run nodes for Nibiru Chain networks inside docker containers. | ||
| # - See CHAOSNET.md for usage instructions. | ||
| set -e | ||
|
|
||
|
|
@@ -27,7 +27,6 @@ sed -i 's/enabled-unsafe-cors = false/enabled-unsafe-cors = true/' $HOME/.nibid/ | |
| sed -i "s/localhost:1317/0.0.0.0:$LCD_PORT/" $HOME/.nibid/config/app.toml | ||
| sed -i "s/localhost:9090/0.0.0.0:$GRPC_PORT/" $HOME/.nibid/config/app.toml | ||
|
|
||
| # ------------------------------------------------------------------------ | ||
| # Configure genesis params | ||
| # ------------------------------------------------------------------------ | ||
|
Comment on lines
27
to
32
There was a problem hiding this comment.
Consider quoting variables to prevent globbing and word splitting. This is a good practice to ensure that the script behaves as expected when dealing with values that may contain spaces or special characters. - nibid init $CHAIN_ID --chain-id $CHAIN_ID --home $HOME/.nibid --overwrite
+ nibid init "$CHAIN_ID" --chain-id "$CHAIN_ID" --home "$HOME/.nibid" --overwrite |
||
|
|
@@ -44,9 +43,7 @@ add_genesis_param() { | |
| mv $HOME/.nibid/config/tmp_genesis.json $HOME/.nibid/config/genesis.json | ||
| } | ||
|
|
||
| curr_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" | ||
|
There was a problem hiding this comment. The variable |
||
|
|
||
| # recover mnemonic | ||
| echo "$MNEMONIC" | nibid keys add validator --recover | ||
|
|
||
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 "Troubleshooting" section appears twice in the Table of Contents. Consider removing the duplicate entry to avoid confusion.