-
Notifications
You must be signed in to change notification settings - Fork 201
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into refactor/perp/position-liquidated-events
- Loading branch information
Showing
5 changed files
with
215 additions
and
6 deletions.
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
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 |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| flag "github.com/spf13/pflag" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client" | ||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/server" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/x/genutil" | ||
| genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" | ||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/NibiruChain/nibiru/x/oracle/types" | ||
| ) | ||
|
|
||
| const ( | ||
| FlagValidator = "validator" | ||
| FlagPricefeeder = "pricefeeder" | ||
| ) | ||
|
|
||
| func AddGenesisPricefeederDelegationCmd(defaultNodeHome string) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "add-genesis-pricefeeder-delegation", | ||
| Short: "Add a pricefeeder delegation to genesis.json.", | ||
| Long: `Add a pricefeeder delegation to genesis.json.`, | ||
| Args: cobra.ExactArgs(0), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| clientCtx := client.GetClientContextFromCmd(cmd) | ||
| serverCtx := server.GetServerContextFromCmd(cmd) | ||
| config := serverCtx.Config | ||
| config.SetRoot(clientCtx.HomeDir) | ||
| genFile := config.GenesisFile() | ||
|
|
||
| genState, genDoc, err := genutiltypes.GenesisStateFromGenFile(genFile) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| valAddr, err := cmd.Flags().GetString(FlagValidator) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = sdk.ValAddressFromBech32(valAddr) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| pricefeederAddr, err := cmd.Flags().GetString(FlagPricefeeder) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = sdk.AccAddressFromBech32(pricefeederAddr) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| oracleGenState := types.GetGenesisStateFromAppState(clientCtx.Codec, genState) | ||
| oracleGenState.FeederDelegations = append(oracleGenState.FeederDelegations, types.FeederDelegation{ | ||
| FeederAddress: pricefeederAddr, | ||
| ValidatorAddress: valAddr, | ||
| }) | ||
|
|
||
| oracleGenStateBz, err := clientCtx.Codec.MarshalJSON(oracleGenState) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to marshal market genesis state: %w", err) | ||
| } | ||
|
|
||
| genState[types.ModuleName] = oracleGenStateBz | ||
|
|
||
| appStateJSON, err := json.Marshal(genState) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to marshal application genesis state: %w", err) | ||
| } | ||
|
|
||
| genDoc.AppState = appStateJSON | ||
| return genutil.ExportGenesisFile(genDoc, genFile) | ||
| }, | ||
| } | ||
|
|
||
| cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory") | ||
|
|
||
| flagSet := flag.NewFlagSet("flags-add-genesis-pricefeeder-delegation", flag.ContinueOnError) | ||
|
|
||
| flagSet.String(FlagValidator, "", "validator address") | ||
| _ = cmd.MarkFlagRequired(FlagValidator) | ||
|
|
||
| flagSet.String(FlagPricefeeder, "", "pricefeeder address") | ||
| _ = cmd.MarkFlagRequired(FlagPricefeeder) | ||
|
|
||
| cmd.Flags().AddFlagSet(flagSet) | ||
|
|
||
| return cmd | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package cli_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" | ||
|
|
||
| "github.com/NibiruChain/nibiru/app" | ||
| "github.com/NibiruChain/nibiru/x/oracle/client/cli" | ||
|
|
||
| "github.com/cometbft/cometbft/libs/log" | ||
| "github.com/cosmos/cosmos-sdk/client" | ||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/server" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| "github.com/cosmos/cosmos-sdk/x/genutil" | ||
| genutiltest "github.com/cosmos/cosmos-sdk/x/genutil/client/testutil" | ||
| "github.com/spf13/viper" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // Tests "add-genesis-perp-market", a command that adds a market to genesis.json | ||
| func TestAddGenesisPricefeederDelegation(t *testing.T) { | ||
| app.SetPrefixes(app.AccountAddressPrefix) | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| validator string | ||
| pricefeeder string | ||
|
|
||
| expectErr bool | ||
| }{ | ||
| { | ||
| name: "valid", | ||
| validator: "nibivaloper1zaavvzxez0elundtn32qnk9lkm8kmcszuwx9jz", | ||
| pricefeeder: "nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl", | ||
| expectErr: false, | ||
| }, | ||
| { | ||
| name: "invalid pricefeeder", | ||
| validator: "nibivaloper1zaavvzxez0elundtn32qnk9lkm8kmcszuwx9jz", | ||
| pricefeeder: "nibi1foobar", | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "empty pricefeeder", | ||
| validator: "nibivaloper1zaavvzxez0elundtn32qnk9lkm8kmcszuwx9jz", | ||
| pricefeeder: "", | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "invalid validator", | ||
| validator: "nibivaloper1foobar", | ||
| pricefeeder: "nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl", | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "empty validator", | ||
| validator: "", | ||
| pricefeeder: "nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl", | ||
| expectErr: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tests { | ||
| tc := tc | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| logger := log.NewNopLogger() | ||
|
|
||
| home := t.TempDir() | ||
| cfg, err := genutiltest.CreateDefaultTendermintConfig(home) | ||
| require.NoError(t, err) | ||
|
|
||
| testModuleBasicManager := module.NewBasicManager(genutil.AppModuleBasic{}) | ||
| appCodec := moduletestutil.MakeTestEncodingConfig().Codec | ||
| err = genutiltest.ExecInitCmd(testModuleBasicManager, home, appCodec) | ||
| require.NoError(t, err) | ||
|
|
||
| serverCtx := server.NewContext(viper.New(), cfg, logger) | ||
| clientCtx := client.Context{}.WithCodec(appCodec).WithHomeDir(home) | ||
|
|
||
| ctx := context.Background() | ||
| ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx) | ||
| ctx = context.WithValue(ctx, server.ServerContextKey, serverCtx) | ||
|
|
||
| cmd := cli.AddGenesisPricefeederDelegationCmd(home) | ||
| cmd.SetArgs([]string{ | ||
| fmt.Sprintf("--%s=%s", cli.FlagValidator, tc.validator), | ||
| fmt.Sprintf("--%s=%s", cli.FlagPricefeeder, tc.pricefeeder), | ||
| fmt.Sprintf("--%s=home", flags.FlagHome), | ||
| }) | ||
|
|
||
| if tc.expectErr { | ||
| require.Error(t, cmd.ExecuteContext(ctx)) | ||
| } else { | ||
| require.NoError(t, cmd.ExecuteContext(ctx)) | ||
| } | ||
| }) | ||
| } | ||
| } |