feat: added update collateral to genesis export and loads for test an…

…d network migration

proto/nibiru/perp/v2/genesis.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package nibiru.perp.v2;
 
-import "gogoproto/gogo.proto";
-import "google/api/annotations.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "google/api/annotations.proto";
+import "gogoproto/gogo.proto";
 import "nibiru/perp/v2/state.proto";
 
 option go_package = "github.com/NibiruChain/nibiru/x/perp/v2/types";
@@ -23,15 +23,18 @@ message GenesisState {
       [ (gogoproto.nullable) = false ];
 
   uint64 dnr_epoch = 6;
-
+ 
   message TraderVolume {
     string trader = 1;
     uint64 epoch = 2;
     string volume = 3 [
       (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
       (gogoproto.nullable) = false
     ];
+
+    // For testing purpose, we allow the collateral to be set at genesis
   }
+  Collateral collateral = 11;
 
   repeated TraderVolume trader_volumes = 7 [ (gogoproto.nullable) = false ];
 

x/common/testutil/genesis/perp_genesis.go

@@ -122,6 +122,7 @@ func AddPerpV2Genesis(gen app.GenesisState) app.GenesisState {
 		Amms:               ammsv2,
 		Positions:          []perpv2types.GenesisPosition{},
 		ReserveSnapshots:   []perpv2types.ReserveSnapshot{},
+		Collateral:         &perpv2types.DefaultTestingCollateralNotForProd,
 	}
 
 	gen[perpv2types.ModuleName] = app.MakeEncodingConfig().Marshaler.

x/perp/v2/client/cli/cli_test.go

@@ -90,7 +90,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 				sdk.NewCoins(
 					sdk.NewInt64Coin(denoms.NIBI, 10e6),
 					sdk.NewInt64Coin(denoms.USDC, 1e3*common.TO_MICRO),
-					sdk.NewInt64Coin(denoms.NUSD, 5e3*common.TO_MICRO),
+					sdk.NewInt64Coin(types.DefaultTestingCollateralNotForProd.GetTFDenom(), 5e3*common.TO_MICRO),
 				),
 				val,
 				denoms.NIBI,
@@ -486,14 +486,14 @@ func (s *IntegrationTestSuite) TestRemoveMargin() {
 	s.T().Log("removing margin on user 0....")
 	_, err = s.network.ExecTxCmd(cli.RemoveMarginCmd(), s.users[0], []string{
 		asset.Registry.Pair(denoms.BTC, denoms.NUSD).String(),
-		fmt.Sprintf("%s%s", "10000000", denoms.NUSD),
+		fmt.Sprintf("%s%s", "10000000", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 	})
 	s.Contains(err.Error(), types.ErrBadDebt.Error())
 
 	s.T().Log("removing margin on user 0....")
 	_, err = s.network.ExecTxCmd(cli.RemoveMarginCmd(), s.users[0], []string{
 		asset.Registry.Pair(denoms.BTC, denoms.NUSD).String(),
-		fmt.Sprintf("%s%s", "1", denoms.NUSD),
+		fmt.Sprintf("%s%s", "1", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 	})
 	s.NoError(err)
 	s.NoError(s.network.WaitForNextBlock())
@@ -524,7 +524,7 @@ func (s *IntegrationTestSuite) TestX_AddMargin() {
 			name: "PASS: add margin to correct position",
 			args: []string{
 				asset.Registry.Pair(denoms.ETH, denoms.NUSD).String(),
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectedCode:   0,
 			expectedMargin: sdk.NewDec(1_010_000),
@@ -534,7 +534,7 @@ func (s *IntegrationTestSuite) TestX_AddMargin() {
 			name: "fail: position not found",
 			args: []string{
 				asset.Registry.Pair(denoms.BTC, denoms.NUSD).String(),
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectedCode: types.ErrPositionNotFound.ABCICode(),
 			expectFail:   false,
@@ -559,7 +559,7 @@ func (s *IntegrationTestSuite) TestX_AddMargin() {
 			name: "fail: invalid pair",
 			args: []string{
 				"alisdhjal;dhao;sdh",
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectFail: true,
 		},
@@ -626,7 +626,7 @@ func (s *IntegrationTestSuite) TestX_RemoveMargin() {
 			name: "PASS: remove margin to correct position",
 			args: []string{
 				asset.Registry.Pair(denoms.ETH, denoms.NUSD).String(),
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectedCode:   0,
 			expectedMargin: sdk.NewDec(990_000),
@@ -636,7 +636,7 @@ func (s *IntegrationTestSuite) TestX_RemoveMargin() {
 			name: "fail: position not found",
 			args: []string{
 				asset.Registry.Pair(denoms.BTC, denoms.NUSD).String(),
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectedCode: types.ErrPositionNotFound.ABCICode(),
 			expectFail:   false,
@@ -661,7 +661,7 @@ func (s *IntegrationTestSuite) TestX_RemoveMargin() {
 			name: "fail: invalid pair",
 			args: []string{
 				"alisdhjal;dhao;sdh",
-				fmt.Sprintf("10000%s", denoms.NUSD),
+				fmt.Sprintf("10000%s", types.DefaultTestingCollateralNotForProd.GetTFDenom()),
 			},
 			expectFail: true,
 		},
@@ -704,7 +704,7 @@ func (s *IntegrationTestSuite) TestDonateToEcosystemFund() {
 	out, err := s.network.ExecTxCmd(
 		cli.DonateToEcosystemFundCmd(),
 		sdk.MustAccAddressFromBech32("nibi1w89pf5yq8ntjg89048qmtaz929fdxup0a57d8m"),
-		[]string{"100unusd"},
+		[]string{"100" + types.DefaultTestingCollateralNotForProd.GetTFDenom()},
 	)
 	s.NoError(err)
 	s.Require().EqualValues(abcitypes.CodeTypeOK, out.Code)
@@ -724,11 +724,11 @@ func (s *IntegrationTestSuite) TestDonateToEcosystemFund() {
 		testutilcli.ExecQuery(
 			s.network.Validators[0].ClientCtx,
 			bankcli.GetBalancesCmd(),
-			[]string{moduleAccountAddrPerpEF, "--denom", "unusd"},
+			[]string{moduleAccountAddrPerpEF, "--denom", types.DefaultTestingCollateralNotForProd.GetTFDenom()},
 			resp,
 		),
 	)
-	s.Require().EqualValues(sdk.NewInt64Coin("unusd", 100), *resp)
+	s.Require().EqualValues(sdk.NewInt64Coin(types.DefaultTestingCollateralNotForProd.GetTFDenom(), 100), *resp)
 }
 
 func (s *IntegrationTestSuite) TestQueryModuleAccount() {

x/perp/v2/module/genesis.go

@@ -70,6 +70,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 			customDiscount.Discount.Fee,
 		)
 	}
+
+	if genState.Collateral != nil {
+		k.Admin.UpdateCollateral(ctx, *&genState.Collateral.Denom, *&genState.Collateral.ContractAddress)
+	}
 }
 
 // ExportGenesis returns the capability module's exported genesis.
@@ -134,5 +138,10 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 			},
 		})
 	}
+
+	collateral, err := k.Collateral.Get(ctx)
+	if err != nil {
+		genesis.Collateral = &collateral
+	}
 	return genesis
 }

x/perp/v2/module/genesis_test.go

@@ -68,6 +68,7 @@ func RunTestGenesis(t *testing.T, tc TestCase) {
 	pair := asset.Registry.Pair(denoms.BTC, denoms.NUSD)
 
 	// create some params
+	app.PerpKeeperV2.Admin.UpdateCollateral(ctx, "unusd", types.DefaultTestingCollateralNotForProd.ContractAddress)
 	app.PerpKeeperV2.SaveMarket(ctx, *mock.TestMarket())
 	app.PerpKeeperV2.MarketLastVersion.Insert(ctx, pair, types.MarketLastVersion{Version: 1})
 	app.PerpKeeperV2.SaveAMM(ctx, *mock.TestAMMDefault())
@@ -118,6 +119,7 @@ func RunTestGenesis(t *testing.T, tc TestCase) {
 	require.Equal(t, genState.CustomDiscounts, genStateAfterInit.CustomDiscounts)
 	require.Equal(t, genState.GlobalDiscount, genStateAfterInit.GlobalDiscount)
 	require.Equal(t, genState.TraderVolumes, genStateAfterInit.TraderVolumes)
+	require.Equal(t, genState.Collateral, genStateAfterInit.Collateral)
 }
 
 func TestNewAppModuleBasic(t *testing.T) {

x/perp/v2/types/genesis_test.go

@@ -25,6 +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.Collateral)
 }
 
 func TestGenesisValidate(t *testing.T) {