From 6ba6d2b42d3db686ff05d30728243327b7c4d90c Mon Sep 17 00:00:00 2001 From: matthiasmatt Date: Wed, 22 Nov 2023 10:56:18 +0100 Subject: [PATCH 1/4] fix: make gen_market set initial perp versions --- x/perp/v2/client/cli/gen_market.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/x/perp/v2/client/cli/gen_market.go b/x/perp/v2/client/cli/gen_market.go index ca22206fa..a7c3b4ded 100644 --- a/x/perp/v2/client/cli/gen_market.go +++ b/x/perp/v2/client/cli/gen_market.go @@ -80,6 +80,16 @@ func AddMarketGenesisCmd(defaultNodeHome string) *cobra.Command { perpGenState.Markets = append(perpGenState.Markets, market) perpGenState.Amms = append(perpGenState.Amms, amm) + var marketsLastVersion []types.GenesisMarketLastVersion + for _, market := range perpGenState.Markets { + marketsLastVersion = append(marketsLastVersion, types.GenesisMarketLastVersion{ + Pair: market.Pair, + Version: market.Version, + }) + } + + perpGenState.MarketLastVersions = marketsLastVersion + perpGenStateBz, err := clientCtx.Codec.MarshalJSON(perpGenState) if err != nil { return fmt.Errorf("failed to marshal market genesis state: %w", err) From 800f9fc39c0a03093edb385a1dad60aee5f64d79 Mon Sep 17 00:00:00 2001 From: matthiasmatt Date: Wed, 22 Nov 2023 10:58:48 +0100 Subject: [PATCH 2/4] chore: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d33874b..b669feeb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,6 +91,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#1606](https://github.com/NibiruChain/nibiru/pull/1606) - fix(perp): emit `MarketUpdatedEvent` in the absence of index price * [#1649](https://github.com/NibiruChain/nibiru/pull/1649) - fix(ledger): fix ledger for newer macos versions * [#1655](https://github.com/NibiruChain/nibiru/pull/1655) - fix(inflation): inflate NIBI correctly to strategic treasury account +* [#1677](https://github.com/NibiruChain/nibiru/pull/1677) - fix(perp): make Gen_market set initial perp versions ## [v0.21.10] From 436c9548f16b7cb12d5446dd1c2690568461e667 Mon Sep 17 00:00:00 2001 From: matthiasmatt Date: Wed, 22 Nov 2023 16:11:55 +0100 Subject: [PATCH 3/4] fix: add collateral to genesis --- x/perp/v2/types/genesis.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/perp/v2/types/genesis.go b/x/perp/v2/types/genesis.go index 6ad3e75e6..c143901c9 100644 --- a/x/perp/v2/types/genesis.go +++ b/x/perp/v2/types/genesis.go @@ -19,6 +19,7 @@ func DefaultGenesis() *GenesisState { Amms: []AMM{}, Positions: []GenesisPosition{}, ReserveSnapshots: []ReserveSnapshot{}, + CollateralDenom: TestingCollateralDenomNUSD, } } From 43f033510bc4b1be65324e2fab73587c8feeb1c6 Mon Sep 17 00:00:00 2001 From: matthiasmatt Date: Wed, 22 Nov 2023 16:17:17 +0100 Subject: [PATCH 4/4] fix: fix test --- x/perp/v2/types/genesis_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/perp/v2/types/genesis_test.go b/x/perp/v2/types/genesis_test.go index 5cb52191b..3d9405971 100644 --- a/x/perp/v2/types/genesis_test.go +++ b/x/perp/v2/types/genesis_test.go @@ -25,7 +25,7 @@ func TestDefaultGenesis(t *testing.T) { require.Empty(t, genesis.Amms) require.Empty(t, genesis.Positions) require.Empty(t, genesis.ReserveSnapshots) - require.Empty(t, genesis.CollateralDenom) + require.NotNil(t, genesis.CollateralDenom) } func TestGenesisValidate(t *testing.T) {