Scaffolding x/govplus module (#1011)

indexer/packages/v4-protos/src/codegen/dydxprotocol/govplus/genesis.ts

@@ -0,0 +1,42 @@
+import * as _m0 from "protobufjs/minimal";
+import { DeepPartial } from "../../helpers";
+/** GenesisState defines the govplus module's genesis state. */
+
+export interface GenesisState {}
+/** GenesisState defines the govplus module's genesis state. */
+
+export interface GenesisStateSDKType {}
+
+function createBaseGenesisState(): GenesisState {
+  return {};
+}
+
+export const GenesisState = {
+  encode(_: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseGenesisState();
+
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+
+      switch (tag >>> 3) {
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+
+    return message;
+  },
+
+  fromPartial(_: DeepPartial<GenesisState>): GenesisState {
+    const message = createBaseGenesisState();
+    return message;
+  }
+
+};

indexer/packages/v4-protos/src/codegen/dydxprotocol/govplus/query.rpc.Query.ts

@@ -0,0 +1,18 @@
+import { Rpc } from "../../helpers";
+import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate";
+/** Query defines the gRPC querier service. */
+
+export interface Query {}
+export class QueryClientImpl implements Query {
+  private readonly rpc: Rpc;
+
+  constructor(rpc: Rpc) {
+    this.rpc = rpc;
+  }
+
+}
+export const createRpcQueryExtension = (base: QueryClient) => {
+  const rpc = createProtobufRpcClient(base);
+  const queryService = new QueryClientImpl(rpc);
+  return {};
+};

indexer/packages/v4-protos/src/codegen/dydxprotocol/govplus/query.ts

@@ -0,0 +1 @@
+export {}

indexer/packages/v4-protos/src/codegen/dydxprotocol/govplus/tx.ts

@@ -0,0 +1 @@
+export {}

indexer/packages/v4-protos/src/codegen/dydxprotocol/rpc.query.ts

@@ -16,6 +16,7 @@ export const createRPCQueryClient = async ({
       delaymsg: (await import("./delaymsg/query.rpc.Query")).createRpcQueryExtension(client),
       epochs: (await import("./epochs/query.rpc.Query")).createRpcQueryExtension(client),
       feetiers: (await import("./feetiers/query.rpc.Query")).createRpcQueryExtension(client),
+      govplus: (await import("./govplus/query.rpc.Query")).createRpcQueryExtension(client),
       perpetuals: (await import("./perpetuals/query.rpc.Query")).createRpcQueryExtension(client),
       prices: (await import("./prices/query.rpc.Query")).createRpcQueryExtension(client),
       ratelimit: (await import("./ratelimit/query.rpc.Query")).createRpcQueryExtension(client),

indexer/packages/v4-protos/src/codegen/gogoproto/bundle.ts

@@ -1,3 +1,3 @@
-import * as _95 from "./gogo";
-export const gogoproto = { ..._95
+import * as _98 from "./gogo";
+export const gogoproto = { ..._98
 };

indexer/packages/v4-protos/src/codegen/google/bundle.ts

@@ -1,16 +1,16 @@
-import * as _96 from "./api/annotations";
-import * as _97 from "./api/http";
-import * as _98 from "./protobuf/descriptor";
-import * as _99 from "./protobuf/duration";
-import * as _100 from "./protobuf/timestamp";
-import * as _101 from "./protobuf/any";
+import * as _99 from "./api/annotations";
+import * as _100 from "./api/http";
+import * as _101 from "./protobuf/descriptor";
+import * as _102 from "./protobuf/duration";
+import * as _103 from "./protobuf/timestamp";
+import * as _104 from "./protobuf/any";
 export namespace google {
-  export const api = { ..._96,
-    ..._97
+  export const api = { ..._99,
+    ..._100
   };
-  export const protobuf = { ..._98,
-    ..._99,
-    ..._100,
-    ..._101
+  export const protobuf = { ..._101,
+    ..._102,
+    ..._103,
+    ..._104
   };
 }

proto/dydxprotocol/govplus/genesis.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+package dydxprotocol.govplus;
+
+option go_package = "github.com/dydxprotocol/v4-chain/protocol/x/govplus/types";
+
+// GenesisState defines the govplus module's genesis state.
+message GenesisState {}

proto/dydxprotocol/govplus/query.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+package dydxprotocol.govplus;
+
+option go_package = "github.com/dydxprotocol/v4-chain/protocol/x/govplus/types";
+
+// Query defines the gRPC querier service.
+service Query {}

proto/dydxprotocol/govplus/tx.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+package dydxprotocol.govplus;
+
+option go_package = "github.com/dydxprotocol/v4-chain/protocol/x/govplus/types";
+
+// Msg defines the Msg service.
+service Msg {}

protocol/app/app.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"encoding/json"
-	custommodule "github.com/dydxprotocol/v4-chain/protocol/app/module"
 	"io"
 	"math/big"
 	"net/http"
@@ -13,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	custommodule "github.com/dydxprotocol/v4-chain/protocol/app/module"
+
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	"cosmossdk.io/log"
@@ -144,6 +145,9 @@ import (
 	feetiersmodule "github.com/dydxprotocol/v4-chain/protocol/x/feetiers"
 	feetiersmodulekeeper "github.com/dydxprotocol/v4-chain/protocol/x/feetiers/keeper"
 	feetiersmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/feetiers/types"
+	govplusmodule "github.com/dydxprotocol/v4-chain/protocol/x/govplus"
+	govplusmodulekeeper "github.com/dydxprotocol/v4-chain/protocol/x/govplus/keeper"
+	govplusmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/govplus/types"
 	perpetualsmodule "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals"
 	perpetualsmodulekeeper "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals/keeper"
 	perpetualsmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals/types"
@@ -252,6 +256,7 @@ type App struct {
 	RatelimitKeeper       ratelimitmodulekeeper.Keeper
 	FeeGrantKeeper        feegrantkeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
+	GovPlusKeeper         govplusmodulekeeper.Keeper
 
 	PricesKeeper pricesmodulekeeper.Keeper
 
@@ -977,6 +982,16 @@ func New(
 		app.SubaccountsKeeper,
 	)
 
+	app.GovPlusKeeper = *govplusmodulekeeper.NewKeeper(
+		appCodec,
+		keys[govplusmoduletypes.StoreKey],
+		[]string{
+			lib.GovModuleAddress.String(),
+			delaymsgmoduletypes.ModuleAddress.String(),
+		},
+	)
+	govPlusModule := govplusmodule.NewAppModule(appCodec, app.GovPlusKeeper)
+
 	/****  Module Options ****/
 
 	// NOTE: we may consider parsing `appOpts` inside module constructors. For the moment
@@ -1039,6 +1054,7 @@ func New(
 		subaccountsModule,
 		clobModule,
 		sendingModule,
+		govPlusModule,
 		delayMsgModule,
 		epochsModule,
 		rateLimitModule,
@@ -1083,6 +1099,7 @@ func New(
 		vestmoduletypes.ModuleName,
 		rewardsmoduletypes.ModuleName,
 		sendingmoduletypes.ModuleName,
+		govplusmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
 	)
 
@@ -1121,6 +1138,7 @@ func New(
 		vestmoduletypes.ModuleName,
 		rewardsmoduletypes.ModuleName,
 		epochsmoduletypes.ModuleName,
+		govplusmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
 		blocktimemoduletypes.ModuleName, // Must be last
 	)
@@ -1162,6 +1180,7 @@ func New(
 		vestmoduletypes.ModuleName,
 		rewardsmoduletypes.ModuleName,
 		sendingmoduletypes.ModuleName,
+		govplusmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
 	)
 
@@ -1199,6 +1218,7 @@ func New(
 		vestmoduletypes.ModuleName,
 		rewardsmoduletypes.ModuleName,
 		sendingmoduletypes.ModuleName,
+		govplusmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
 
 		// Auth must be migrated after staking.

protocol/app/app_test.go

@@ -38,6 +38,7 @@ import (
 	delaymsgmodule "github.com/dydxprotocol/v4-chain/protocol/x/delaymsg"
 	epochsmodule "github.com/dydxprotocol/v4-chain/protocol/x/epochs"
 	feetiersmodule "github.com/dydxprotocol/v4-chain/protocol/x/feetiers"
+	govplusmodule "github.com/dydxprotocol/v4-chain/protocol/x/govplus"
 	perpetualsmodule "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals"
 	pricesmodule "github.com/dydxprotocol/v4-chain/protocol/x/prices"
 	ratelimitmodule "github.com/dydxprotocol/v4-chain/protocol/x/ratelimit"
@@ -213,6 +214,7 @@ func TestModuleBasics(t *testing.T) {
 		vestmodule.AppModuleBasic{},
 		rewardsmodule.AppModuleBasic{},
 		sendingmodule.AppModuleBasic{},
+		govplusmodule.AppModuleBasic{},
 		delaymsgmodule.AppModuleBasic{},
 		epochsmodule.AppModuleBasic{},
 		ratelimitmodule.AppModuleBasic{},

protocol/app/testdata/default_genesis_state.json

@@ -278,6 +278,7 @@
     },
     "constitution": ""
   },
+  "govplus": {},
   "ibc": {
     "client_genesis": {
       "clients": [],

protocol/app/upgrades/v4.0.0/constants.go

@@ -5,6 +5,7 @@ import (
 	circuittypes "cosmossdk.io/x/circuit/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
 	"github.com/dydxprotocol/v4-chain/protocol/app/upgrades"
+	govplustypes "github.com/dydxprotocol/v4-chain/protocol/x/govplus/types"
 )
 
 const (
@@ -15,6 +16,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName: UpgradeName,
 	StoreUpgrades: store.StoreUpgrades{
 		Added: []string{
+			govplustypes.StoreKey,
 			// Add circuittypes as per 0.47 to 0.50 upgrade handler
 			// https://github.com/cosmos/cosmos-sdk/blob/b7d9d4c8a9b6b8b61716d2023982d29bdc9839a6/simapp/upgrades.go#L21
 			circuittypes.ModuleName,

protocol/scripts/genesis/sample_pregenesis.json

@@ -788,6 +788,7 @@
       "starting_proposal_id": "1",
       "votes": []
     },
+    "govplus": {},
     "ibc": {
       "channel_genesis": {
         "ack_sequences": [],

protocol/testutil/constants/genesis.go

@@ -844,6 +844,7 @@ const GenesisState = `{
       "starting_proposal_id": "1",
       "votes": []
     },
+    "govplus": {},
     "ibc": {
       "channel_genesis": {
         "ack_sequences": [],

protocol/x/govplus/client/cli/query.go

@@ -0,0 +1,24 @@
+package cli
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/dydxprotocol/v4-chain/protocol/x/govplus/types"
+)
+
+// GetQueryCmd returns the cli query commands for this module
+func GetQueryCmd(queryRoute string) *cobra.Command {
+	// Group govplus queries under a subcommand
+	cmd := &cobra.Command{
+		Use:                        types.ModuleName,
+		Short:                      fmt.Sprintf("Querying commands for the %s module", types.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	return cmd
+}

protocol/x/govplus/client/cli/tx.go

@@ -0,0 +1,28 @@
+package cli
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/dydxprotocol/v4-chain/protocol/x/ratelimit/types"
+)
+
+var (
+	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
+)
+
+// GetTxCmd returns the transaction commands for this module
+func GetTxCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:                        types.ModuleName,
+		Short:                      fmt.Sprintf("%s transactions subcommands", types.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	return cmd
+}

protocol/x/govplus/genesis.go

@@ -0,0 +1,15 @@
+package govplus
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/dydxprotocol/v4-chain/protocol/x/govplus/keeper"
+	"github.com/dydxprotocol/v4-chain/protocol/x/govplus/types"
+)
+
+// InitGenesis initializes the govplus module's state from a provided genesis state.
+func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {}
+
+// ExportGenesis returns the govplus module's exported genesis.
+func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
+	return &types.GenesisState{}
+}