diff --git a/go.mod b/go.mod index 2157813cd..605ad75b7 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0-beta.3 + github.com/cosmos/cosmos-proto v1.0.0-alpha7 github.com/cosmos/cosmos-sdk v0.46.1 github.com/cosmos/ibc-go/v5 v5.0.0-rc0 github.com/gogo/protobuf v1.3.3 @@ -14,7 +15,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/ignite/modules v0.0.0-20220830145312-d006783a7a21 github.com/pkg/errors v0.9.1 - github.com/regen-network/cosmos-proto v0.3.1 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 @@ -25,7 +25,6 @@ require ( golang.org/x/tools v0.1.12 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc google.golang.org/grpc v1.48.0 - google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.3.1 ) @@ -73,7 +72,6 @@ require ( github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect github.com/confio/ics23/go v0.7.0 // indirect github.com/cosmos/btcutil v1.0.4 // indirect - github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.1 // indirect @@ -212,6 +210,7 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect + github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rs/cors v1.8.2 // indirect github.com/rs/zerolog v1.27.0 // indirect github.com/ryancurrah/gomodguard v1.2.4 // indirect @@ -270,6 +269,7 @@ require ( golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/api v0.84.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.3.3 // indirect diff --git a/pkg/types/monitoring.pb.go b/pkg/types/monitoring.pb.go index 5dbefe2b3..5e0df67ab 100644 --- a/pkg/types/monitoring.pb.go +++ b/pkg/types/monitoring.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/launch/chain.proto b/proto/launch/chain.proto index c6d142003..99d6a7ac6 100644 --- a/proto/launch/chain.proto +++ b/proto/launch/chain.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package tendermint.spn.launch; import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; option go_package = "github.com/tendermint/spn/x/launch/types"; @@ -27,7 +28,16 @@ message Chain { bool monitoringConnected = 14; - bytes metadata = 15; + // account balance is the balance given to approved accounts + // for this chain. If not set, the balances used will be those + // contained in the requests + repeated cosmos.base.v1beta1.Coin accountBalance = 15 [ + (gogoproto.nullable) = false, + (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + + bytes metadata = 16; } message InitialGenesis { diff --git a/proto/launch/tx.proto b/proto/launch/tx.proto index a1d6f6a4f..7c6be7431 100644 --- a/proto/launch/tx.proto +++ b/proto/launch/tx.proto @@ -29,15 +29,20 @@ service Msg { } message MsgCreateChain { - string coordinator = 1; - string genesisChainID = 2; - string sourceURL = 3; - string sourceHash = 4; - string genesisURL = 5; - string genesisHash = 6; - bool hasCampaign = 7; - uint64 campaignID = 8; - bytes metadata = 9; + string coordinator = 1; + string genesisChainID = 2; + string sourceURL = 3; + string sourceHash = 4; + string genesisURL = 5; + string genesisHash = 6; + bool hasCampaign = 7; + uint64 campaignID = 8; + repeated cosmos.base.v1beta1.Coin AccountBalance = 9 [ + (gogoproto.nullable) = false, + (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + bytes metadata = 10; } message MsgCreateChainResponse { @@ -45,11 +50,11 @@ message MsgCreateChainResponse { } message MsgEditChain { - string coordinator = 1; - uint64 launchID = 2; - bool setCampaignID = 3; - uint64 campaignID = 4; - bytes metadata = 5; + string coordinator = 1; + uint64 launchID = 2; + bool setCampaignID = 3; + uint64 campaignID = 4; + bytes metadata = 5; } message MsgEditChainResponse {} diff --git a/testutil/sample/launch.go b/testutil/sample/launch.go index 9c8abdcc0..32cca67cd 100644 --- a/testutil/sample/launch.go +++ b/testutil/sample/launch.go @@ -35,6 +35,7 @@ func Chain(r *rand.Rand, id, coordinatorID uint64) launch.Chain { SourceHash: String(r, 10), LaunchTriggered: false, InitialGenesis: launch.NewDefaultInitialGenesis(), + AccountBalance: Coins(r), Metadata: Metadata(r, 20), } } @@ -161,6 +162,7 @@ func MsgCreateChain(r *rand.Rand, coordAddress, genesisURL string, hasCampaign b genesisHash, hasCampaign, campaignID, + Coins(r), Metadata(r, 20), ) } diff --git a/x/campaign/keeper/keeper.go b/x/campaign/keeper/keeper.go index 10ce4377c..86da816fc 100644 --- a/x/campaign/keeper/keeper.go +++ b/x/campaign/keeper/keeper.go @@ -27,6 +27,7 @@ type LaunchKeeper interface { hasCampaign bool, campaignID uint64, isMainnet bool, + accountBalance sdk.Coins, metadata []byte, ) (uint64, error) } diff --git a/x/campaign/keeper/msg_initialize_mainnet.go b/x/campaign/keeper/msg_initialize_mainnet.go index bc98ff09b..7ffe28da0 100644 --- a/x/campaign/keeper/msg_initialize_mainnet.go +++ b/x/campaign/keeper/msg_initialize_mainnet.go @@ -53,6 +53,7 @@ func (k msgServer) InitializeMainnet(goCtx context.Context, msg *types.MsgInitia true, msg.CampaignID, true, + sdk.NewCoins(), // no enforced default for mainnet []byte{}, ) if err != nil { diff --git a/x/campaign/types/events.pb.go b/x/campaign/types/events.pb.go index 5cc98e904..00e6d8ad5 100644 --- a/x/campaign/types/events.pb.go +++ b/x/campaign/types/events.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/campaign/types/mainnet_account.pb.go b/x/campaign/types/mainnet_account.pb.go index 2c6ef763c..65dd9bf46 100644 --- a/x/campaign/types/mainnet_account.pb.go +++ b/x/campaign/types/mainnet_account.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/campaign/types/params.pb.go b/x/campaign/types/params.pb.go index efa16187d..6612bbd8c 100644 --- a/x/campaign/types/params.pb.go +++ b/x/campaign/types/params.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/campaign/types/query.pb.go b/x/campaign/types/query.pb.go index 531879bfc..59324c180 100644 --- a/x/campaign/types/query.pb.go +++ b/x/campaign/types/query.pb.go @@ -6,13 +6,13 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/campaign/types/query.pb.gw.go b/x/campaign/types/query.pb.gw.go index 4782e8508..259d200dc 100644 --- a/x/campaign/types/query.pb.gw.go +++ b/x/campaign/types/query.pb.gw.go @@ -1044,25 +1044,25 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Campaign_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"tendermint", "spn", "campaign", "campaignID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Campaign_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"tendermint", "spn", "campaign", "campaignID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_CampaignAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"tendermint", "spn", "campaign"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_CampaignAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"tendermint", "spn", "campaign"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_CampaignChains_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "campaign_chains", "campaignID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_CampaignChains_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "campaign_chains", "campaignID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_SpecialAllocationsBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "special_allocations_balance", "campaignID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_SpecialAllocationsBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "special_allocations_balance", "campaignID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MainnetAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "campaign", "mainnet_account", "campaignID", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MainnetAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "campaign", "mainnet_account", "campaignID", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MainnetAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "mainnet_account", "campaignID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MainnetAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "mainnet_account", "campaignID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MainnetAccountBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "campaign", "mainnet_account_balance", "campaignID", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MainnetAccountBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "campaign", "mainnet_account_balance", "campaignID", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MainnetAccountBalanceAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "mainnet_account_balance", "campaignID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MainnetAccountBalanceAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "campaign", "mainnet_account_balance", "campaignID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "campaign", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "campaign", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TotalShares_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "campaign", "total_shares"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_TotalShares_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "campaign", "total_shares"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/launch/client/cli/tx_create_chain.go b/x/launch/client/cli/tx_create_chain.go index 23671928e..97bc1118d 100644 --- a/x/launch/client/cli/tx_create_chain.go +++ b/x/launch/client/cli/tx_create_chain.go @@ -9,6 +9,8 @@ import ( "net/http" neturl "net/url" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" @@ -18,8 +20,9 @@ import ( ) const ( - flagGenesisURL = "genesis-url" - flagCampaignID = "campaign-id" + flagGenesisURL = "genesis-url" + flagCampaignID = "campaign-id" + flagAccountBalance = "account-balance" ) func CmdCreateChain() *cobra.Command { @@ -63,6 +66,19 @@ func CmdCreateChain() *cobra.Command { } metadataBytes := []byte(metadata) + balanceCoins := sdk.NewCoins() + balance, err := cmd.Flags().GetString(flagAccountBalance) + if err != nil { + return err + } + if balance != "" { + // parse coins argument + balanceCoins, err = sdk.ParseCoinsNormalized(balance) + if err != nil { + return err + } + } + msg := types.NewMsgCreateChain( clientCtx.GetFromAddress().String(), args[0], @@ -72,6 +88,7 @@ func CmdCreateChain() *cobra.Command { genesisHash, hasCampaign, campaignID, + balanceCoins, metadataBytes, ) if err := msg.ValidateBasic(); err != nil { @@ -84,6 +101,8 @@ func CmdCreateChain() *cobra.Command { cmd.Flags().String(flagGenesisURL, "", "URL for a custom genesis") cmd.Flags().Int64(flagCampaignID, -1, "The campaign id") cmd.Flags().String(flagMetadata, "", "Set metadata field for the chain") + cmd.Flags().String(flagAccountBalance, "", "Set the chain account coin balance") + flags.AddTxFlagsToCmd(cmd) return cmd diff --git a/x/launch/keeper/chain.go b/x/launch/keeper/chain.go index f81871b0a..d79709cfc 100644 --- a/x/launch/keeper/chain.go +++ b/x/launch/keeper/chain.go @@ -22,6 +22,7 @@ func (k Keeper) CreateNewChain( hasCampaign bool, campaignID uint64, isMainnet bool, + accountBalance sdk.Coins, metadata []byte, ) (uint64, error) { coord, found := k.profileKeeper.GetCoordinator(ctx, coordinatorID) @@ -40,6 +41,7 @@ func (k Keeper) CreateNewChain( IsMainnet: isMainnet, LaunchTriggered: false, LaunchTimestamp: 0, + AccountBalance: accountBalance, Metadata: metadata, } diff --git a/x/launch/keeper/chain_test.go b/x/launch/keeper/chain_test.go index d33d896d4..f4dd899de 100644 --- a/x/launch/keeper/chain_test.go +++ b/x/launch/keeper/chain_test.go @@ -46,6 +46,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { hasCampaign bool campaignID uint64 isMainnet bool + balance sdk.Coins metadata []byte wantedID uint64 valid bool @@ -58,6 +59,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { sourceHash: sample.String(r, 20), genesisURL: "", hasCampaign: false, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 0, valid: true, @@ -72,6 +74,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { hasCampaign: true, campaignID: campaignID, isMainnet: false, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 1, valid: true, @@ -86,6 +89,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { hasCampaign: true, campaignID: 0, isMainnet: true, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 2, valid: true, @@ -99,6 +103,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { genesisURL: sample.String(r, 30), genesisHash: sample.GenesisHash(r), hasCampaign: false, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 3, valid: true, @@ -113,6 +118,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { hasCampaign: true, campaignID: campaignID, isMainnet: false, + balance: sample.Coins(r), wantedID: 4, valid: true, }, @@ -124,6 +130,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { sourceHash: sample.String(r, 20), genesisURL: "", hasCampaign: false, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 0, valid: false, @@ -137,6 +144,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { genesisURL: "", hasCampaign: true, campaignID: 1000, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), isMainnet: false, valid: false, @@ -151,6 +159,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { hasCampaign: true, campaignID: campaignID, isMainnet: false, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), wantedID: 1, valid: false, @@ -164,6 +173,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { genesisURL: "", hasCampaign: false, campaignID: 0, + balance: sample.Coins(r), metadata: sample.Metadata(r, 20), isMainnet: true, valid: false, @@ -181,6 +191,7 @@ func TestKeeper_CreateNewChain(t *testing.T) { tc.hasCampaign, tc.campaignID, tc.isMainnet, + tc.balance, tc.metadata, ) diff --git a/x/launch/keeper/msg_create_chain.go b/x/launch/keeper/msg_create_chain.go index a338fc39e..d844e804d 100644 --- a/x/launch/keeper/msg_create_chain.go +++ b/x/launch/keeper/msg_create_chain.go @@ -32,6 +32,7 @@ func (k msgServer) CreateChain(goCtx context.Context, msg *types.MsgCreateChain) msg.HasCampaign, msg.CampaignID, false, + msg.AccountBalance, msg.Metadata, ) if err != nil { diff --git a/x/launch/keeper/request.go b/x/launch/keeper/request.go index 4ae20afb1..6ad018b3b 100644 --- a/x/launch/keeper/request.go +++ b/x/launch/keeper/request.go @@ -144,6 +144,9 @@ func ApplyRequest( switch requestContent := request.Content.Content.(type) { case *types.RequestContent_GenesisAccount: ga := requestContent.GenesisAccount + if !chain.AccountBalance.Empty() { + ga.Coins = chain.AccountBalance + } k.SetGenesisAccount(ctx, *ga) err = ctx.EventManager().EmitTypedEvent(&types.EventGenesisAccountAdded{ Address: ga.Address, @@ -154,6 +157,21 @@ func ApplyRequest( case *types.RequestContent_VestingAccount: va := requestContent.VestingAccount + if !chain.AccountBalance.Empty() { + switch opt := va.VestingOptions.Options.(type) { + case *types.VestingOptions_DelayedVesting: + dv := opt.DelayedVesting + va = &types.VestingAccount{ + Address: va.Address, + LaunchID: va.LaunchID, + VestingOptions: *types.NewDelayedVesting( + chain.AccountBalance, + chain.AccountBalance, + dv.EndTime, + ), + } + } + } k.SetVestingAccount(ctx, *va) err = ctx.EventManager().EmitTypedEvent(&types.EventVestingAccountAdded{ Address: va.Address, diff --git a/x/launch/types/chain.go b/x/launch/types/chain.go index 032ad0a60..cf01aa71b 100644 --- a/x/launch/types/chain.go +++ b/x/launch/types/chain.go @@ -22,5 +22,10 @@ func (m Chain) Validate() error { return errors.New("chain is a mainnet but not associated to a campaign") } + // Coins must be valid + if !m.AccountBalance.IsValid() { + return errors.New("default account balance sdk.Coins is not valid") + } + return nil } diff --git a/x/launch/types/chain.pb.go b/x/launch/types/chain.pb.go index 83e3089d3..a1d36677c 100644 --- a/x/launch/types/chain.pb.go +++ b/x/launch/types/chain.pb.go @@ -5,6 +5,8 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-sdk/types" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -38,7 +40,11 @@ type Chain struct { LaunchTimestamp int64 `protobuf:"varint,12,opt,name=launchTimestamp,proto3" json:"launchTimestamp,omitempty"` ConsumerRevisionHeight int64 `protobuf:"varint,13,opt,name=consumerRevisionHeight,proto3" json:"consumerRevisionHeight,omitempty"` MonitoringConnected bool `protobuf:"varint,14,opt,name=monitoringConnected,proto3" json:"monitoringConnected,omitempty"` - Metadata []byte `protobuf:"bytes,15,opt,name=metadata,proto3" json:"metadata,omitempty"` + // account balance is the balance given to approved accounts + // for this chain. If not set, the balances used will be those + // contained in the requests + AccountBalance github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,15,rep,name=accountBalance,proto3,casttype=github.com/cosmos/cosmos-sdk/types.Coin,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"accountBalance"` + Metadata []byte `protobuf:"bytes,16,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (m *Chain) Reset() { *m = Chain{} } @@ -172,6 +178,13 @@ func (m *Chain) GetMonitoringConnected() bool { return false } +func (m *Chain) GetAccountBalance() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.AccountBalance + } + return nil +} + func (m *Chain) GetMetadata() []byte { if m != nil { return m.Metadata @@ -181,7 +194,6 @@ func (m *Chain) GetMetadata() []byte { type InitialGenesis struct { // Types that are valid to be assigned to Source: - // // *InitialGenesis_DefaultInitialGenesis // *InitialGenesis_GenesisURL Source isInitialGenesis_Source `protobuf_oneof:"source"` @@ -366,40 +378,47 @@ func init() { func init() { proto.RegisterFile("launch/chain.proto", fileDescriptor_36e96f39bc2e1bde) } var fileDescriptor_36e96f39bc2e1bde = []byte{ - // 528 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0x4d, 0x8f, 0xd3, 0x30, - 0x10, 0x4d, 0xda, 0x6e, 0x69, 0xa7, 0xbb, 0x5d, 0x64, 0x28, 0x58, 0x2b, 0x14, 0x42, 0x05, 0x28, - 0x07, 0x94, 0xa0, 0x22, 0x71, 0xa7, 0xad, 0xb4, 0xad, 0x04, 0x17, 0x03, 0x17, 0x6e, 0xde, 0xc4, - 0x24, 0x96, 0x1a, 0x3b, 0xb2, 0x1d, 0x04, 0xff, 0x82, 0x3f, 0x85, 0xb4, 0xc7, 0x3d, 0x72, 0x40, - 0x08, 0xb5, 0x7f, 0x04, 0xc5, 0xa9, 0xfa, 0xa5, 0xf6, 0x36, 0x7e, 0xf3, 0xde, 0xcb, 0x78, 0xf2, - 0x0c, 0x68, 0x41, 0x4b, 0x11, 0x67, 0x51, 0x9c, 0x51, 0x2e, 0xc2, 0x42, 0x49, 0x23, 0xd1, 0xc0, - 0x30, 0x91, 0x30, 0x95, 0x73, 0x61, 0x42, 0x5d, 0x88, 0xb0, 0xa6, 0x5c, 0x3d, 0x4c, 0x65, 0x2a, - 0x2d, 0x23, 0xaa, 0xaa, 0x9a, 0x3c, 0xfc, 0xd3, 0x82, 0xb3, 0x49, 0x25, 0x46, 0x57, 0xd0, 0xa9, - 0x99, 0xf3, 0x29, 0x76, 0x7d, 0x37, 0x68, 0x91, 0xcd, 0x19, 0x3d, 0x87, 0x8b, 0x58, 0x4a, 0x95, - 0x70, 0x41, 0x8d, 0x54, 0xf3, 0x29, 0x6e, 0x58, 0xc2, 0x3e, 0x88, 0x5e, 0x42, 0x3f, 0x65, 0x82, - 0x69, 0xae, 0xad, 0xe3, 0x7c, 0x8a, 0x9b, 0xbe, 0x1b, 0x74, 0xc9, 0x01, 0x8a, 0x9e, 0x40, 0x37, - 0x56, 0x8c, 0x1a, 0x96, 0xbc, 0x33, 0xb8, 0xe5, 0xbb, 0x41, 0x93, 0x6c, 0x81, 0xaa, 0xab, 0x65, - 0xa9, 0x62, 0xf6, 0x99, 0xbc, 0xc7, 0x67, 0xd6, 0x60, 0x0b, 0x20, 0x0f, 0xa0, 0x3e, 0xcc, 0xa8, - 0xce, 0x70, 0xdb, 0xb6, 0x77, 0x10, 0xf4, 0x11, 0xfa, 0x5c, 0x70, 0xc3, 0xe9, 0xe2, 0xba, 0xfe, - 0x28, 0xbe, 0xe7, 0xbb, 0x41, 0x6f, 0xf4, 0x22, 0x3c, 0xba, 0x95, 0x70, 0xbe, 0x47, 0x1e, 0xb7, - 0x6e, 0xff, 0x3e, 0x75, 0xc8, 0x81, 0x05, 0xf2, 0xa1, 0x97, 0x51, 0x3d, 0xa1, 0x79, 0x41, 0x79, - 0x2a, 0x70, 0xc7, 0x77, 0x83, 0x0e, 0xd9, 0x85, 0xaa, 0xb1, 0xe2, 0x75, 0x3d, 0x9f, 0xe2, 0xae, - 0xdd, 0xce, 0x0e, 0x52, 0x5d, 0x8a, 0xeb, 0x0f, 0x94, 0x0b, 0xc1, 0x0c, 0x06, 0xab, 0xdf, 0x02, - 0x28, 0x80, 0xcb, 0x7a, 0x9c, 0x4f, 0x8a, 0xa7, 0x29, 0x53, 0x2c, 0xc1, 0x3d, 0xcb, 0x39, 0x84, - 0x77, 0x98, 0x3c, 0x67, 0xda, 0xd0, 0xbc, 0xc0, 0xe7, 0x76, 0x81, 0x87, 0x30, 0x7a, 0x0b, 0x8f, - 0x62, 0x29, 0x74, 0x99, 0x33, 0x45, 0xd8, 0x37, 0xae, 0xb9, 0x14, 0x33, 0xc6, 0xd3, 0xcc, 0xe0, - 0x0b, 0x2b, 0x38, 0xd1, 0x45, 0xaf, 0xe1, 0x41, 0x2e, 0x05, 0x37, 0x52, 0x71, 0x91, 0x4e, 0xa4, - 0x10, 0x2c, 0x36, 0x2c, 0xc1, 0x7d, 0x3b, 0xcf, 0xb1, 0x56, 0x15, 0x9c, 0x9c, 0x19, 0x9a, 0x50, - 0x43, 0xf1, 0xa5, 0xef, 0x06, 0xe7, 0x64, 0x73, 0x1e, 0xfe, 0x72, 0xa1, 0xbf, 0xbf, 0x62, 0x94, - 0xc0, 0x20, 0x61, 0x5f, 0x69, 0xb9, 0x30, 0xfb, 0x0d, 0x1b, 0xba, 0xde, 0xe8, 0xd5, 0x89, 0x1f, - 0x35, 0x3d, 0xa6, 0x99, 0x39, 0xe4, 0xb8, 0x19, 0x9a, 0x00, 0xac, 0x53, 0x57, 0xc5, 0xa8, 0x61, - 0xad, 0x9f, 0x9d, 0xb0, 0xbe, 0xde, 0x10, 0x67, 0x0e, 0xd9, 0x91, 0x8d, 0x3b, 0xd0, 0xae, 0xa3, - 0x35, 0x7c, 0x0c, 0x83, 0xa3, 0x03, 0x0c, 0x47, 0x00, 0x5b, 0x39, 0xba, 0x0f, 0xcd, 0x52, 0x2d, - 0xec, 0x4d, 0xba, 0xa4, 0x2a, 0x11, 0x82, 0x56, 0x56, 0x25, 0xb5, 0x61, 0x21, 0x5b, 0x8f, 0xc7, - 0xb7, 0x4b, 0xcf, 0xbd, 0x5b, 0x7a, 0xee, 0xbf, 0xa5, 0xe7, 0xfe, 0x5c, 0x79, 0xce, 0xdd, 0xca, - 0x73, 0x7e, 0xaf, 0x3c, 0xe7, 0x4b, 0x90, 0x72, 0x93, 0x95, 0x37, 0x61, 0x2c, 0xf3, 0x68, 0x3b, - 0x6b, 0xa4, 0x0b, 0x11, 0x7d, 0x8f, 0xd6, 0x4f, 0xdd, 0xfc, 0x28, 0x98, 0xbe, 0x69, 0xdb, 0xe7, - 0xfb, 0xe6, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x62, 0xe3, 0x5a, 0x01, 0x04, 0x00, 0x00, + // 626 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdf, 0x6e, 0xd3, 0x3e, + 0x14, 0x6e, 0xd6, 0x6e, 0xbf, 0xf6, 0x74, 0xeb, 0x26, 0xff, 0x18, 0x98, 0x09, 0x65, 0xa1, 0xe2, + 0x4f, 0x2e, 0x20, 0x61, 0x45, 0xe2, 0x9e, 0xb6, 0xd2, 0x5a, 0x09, 0x6e, 0x0c, 0xdc, 0xc0, 0x95, + 0xeb, 0x98, 0xc4, 0xa2, 0xb1, 0xab, 0xd8, 0x99, 0xe0, 0x2d, 0x78, 0x02, 0x1e, 0x80, 0xf7, 0x40, + 0xda, 0xe5, 0x2e, 0xb9, 0x1a, 0x68, 0x7b, 0x0b, 0x24, 0x24, 0x14, 0xa7, 0xac, 0x69, 0xd5, 0x49, + 0x5c, 0xe5, 0xf8, 0x3b, 0xdf, 0xf9, 0x72, 0x7c, 0xfc, 0xd9, 0x80, 0xa6, 0x34, 0x97, 0x2c, 0x09, + 0x59, 0x42, 0x85, 0x0c, 0x66, 0x99, 0x32, 0x0a, 0xed, 0x1b, 0x2e, 0x23, 0x9e, 0xa5, 0x42, 0x9a, + 0x40, 0xcf, 0x64, 0x50, 0x52, 0x0e, 0x6e, 0xc4, 0x2a, 0x56, 0x96, 0x11, 0x16, 0x51, 0x49, 0x3e, + 0x70, 0x99, 0xd2, 0xa9, 0xd2, 0xe1, 0x84, 0x6a, 0x1e, 0x9e, 0x1c, 0x4d, 0xb8, 0xa1, 0x47, 0x21, + 0x53, 0x7f, 0xc5, 0xba, 0xbf, 0x37, 0x61, 0x73, 0x50, 0x88, 0xa3, 0x03, 0x68, 0x96, 0x4a, 0xe3, + 0x21, 0x76, 0x3c, 0xc7, 0x6f, 0x90, 0xab, 0x35, 0xba, 0x07, 0x3b, 0x4c, 0xa9, 0x2c, 0x12, 0x92, + 0x1a, 0x95, 0x8d, 0x87, 0x78, 0xc3, 0x12, 0x96, 0x41, 0xf4, 0x00, 0x3a, 0x31, 0x97, 0x5c, 0x0b, + 0x6d, 0x15, 0xc7, 0x43, 0x5c, 0xf7, 0x1c, 0xbf, 0x45, 0x56, 0x50, 0x74, 0x07, 0x5a, 0x2c, 0xe3, + 0xd4, 0xf0, 0xe8, 0xb9, 0xc1, 0x0d, 0xcf, 0xf1, 0xeb, 0x64, 0x01, 0x14, 0x59, 0xad, 0xf2, 0x8c, + 0xf1, 0x37, 0xe4, 0x05, 0xde, 0xb4, 0x02, 0x0b, 0x00, 0xb9, 0x00, 0xe5, 0x62, 0x44, 0x75, 0x82, + 0xb7, 0x6c, 0xba, 0x82, 0xa0, 0x57, 0xd0, 0x11, 0x52, 0x18, 0x41, 0xa7, 0xc7, 0xe5, 0x4f, 0xf1, + 0x7f, 0x9e, 0xe3, 0xb7, 0x7b, 0xf7, 0x83, 0xb5, 0x53, 0x0b, 0xc6, 0x4b, 0xe4, 0x7e, 0xe3, 0xf4, + 0xfc, 0xb0, 0x46, 0x56, 0x24, 0x90, 0x07, 0xed, 0x84, 0xea, 0x01, 0x4d, 0x67, 0x54, 0xc4, 0x12, + 0x37, 0x3d, 0xc7, 0x6f, 0x92, 0x2a, 0x54, 0xb4, 0xc5, 0xe6, 0xf1, 0x78, 0x88, 0x5b, 0x76, 0x3a, + 0x15, 0xa4, 0xd8, 0x94, 0xd0, 0x2f, 0xa9, 0x90, 0x92, 0x1b, 0x0c, 0xb6, 0x7e, 0x01, 0x20, 0x1f, + 0x76, 0xcb, 0x76, 0x5e, 0x67, 0x22, 0x8e, 0x79, 0xc6, 0x23, 0xdc, 0xb6, 0x9c, 0x55, 0xb8, 0xc2, + 0x14, 0x29, 0xd7, 0x86, 0xa6, 0x33, 0xbc, 0x6d, 0x07, 0xb8, 0x0a, 0xa3, 0x67, 0x70, 0x93, 0x29, + 0xa9, 0xf3, 0x94, 0x67, 0x84, 0x9f, 0x08, 0x2d, 0x94, 0x1c, 0x71, 0x11, 0x27, 0x06, 0xef, 0xd8, + 0x82, 0x6b, 0xb2, 0xe8, 0x09, 0xfc, 0x9f, 0x2a, 0x29, 0x8c, 0xca, 0x84, 0x8c, 0x07, 0x4a, 0x4a, + 0xce, 0x0c, 0x8f, 0x70, 0xc7, 0xf6, 0xb3, 0x2e, 0x85, 0xbe, 0x38, 0xd0, 0xa1, 0x8c, 0xa9, 0x5c, + 0x9a, 0x3e, 0x9d, 0x52, 0xc9, 0x38, 0xde, 0xf5, 0xea, 0x7e, 0xbb, 0x77, 0x3b, 0x28, 0xcd, 0x17, + 0x14, 0xe6, 0x0b, 0xe6, 0xe6, 0x0b, 0x06, 0x4a, 0xc8, 0xfe, 0xbb, 0x62, 0xce, 0xbf, 0xce, 0x0f, + 0x1f, 0xc6, 0xc2, 0x24, 0xf9, 0x24, 0x60, 0x2a, 0x0d, 0xe7, 0x4e, 0x2d, 0x3f, 0x8f, 0x75, 0xf4, + 0x21, 0x34, 0x9f, 0x66, 0x5c, 0xdb, 0x82, 0xaf, 0x3f, 0x0e, 0xfd, 0x7f, 0xa4, 0x6a, 0xb2, 0xd2, + 0x4d, 0xe1, 0xec, 0x94, 0x1b, 0x1a, 0x51, 0x43, 0xf1, 0x9e, 0xe7, 0xf8, 0xdb, 0xe4, 0x6a, 0xdd, + 0xfd, 0xe6, 0x40, 0x67, 0xd9, 0x03, 0x28, 0x82, 0xfd, 0x88, 0xbf, 0xa7, 0xf9, 0xd4, 0x2c, 0x27, + 0xec, 0xad, 0x68, 0xf7, 0x1e, 0x5d, 0xe3, 0xa4, 0xe1, 0xba, 0x9a, 0x51, 0x8d, 0xac, 0x17, 0x43, + 0x03, 0x80, 0xf9, 0xb5, 0x28, 0x7c, 0xbe, 0x61, 0xa5, 0xef, 0x5e, 0x23, 0x7d, 0x7c, 0x45, 0x1c, + 0xd5, 0x48, 0xa5, 0xac, 0xdf, 0x84, 0xad, 0xd2, 0xfb, 0xdd, 0x5b, 0xb0, 0xbf, 0xb6, 0x81, 0x6e, + 0x0f, 0x60, 0x51, 0x8e, 0xf6, 0xa0, 0x9e, 0x67, 0x53, 0xbb, 0x93, 0x16, 0x29, 0x42, 0x84, 0xa0, + 0x91, 0x14, 0x57, 0x69, 0xc3, 0x42, 0x36, 0xee, 0xf7, 0x4f, 0x2f, 0x5c, 0xe7, 0xec, 0xc2, 0x75, + 0x7e, 0x5e, 0xb8, 0xce, 0xe7, 0x4b, 0xb7, 0x76, 0x76, 0xe9, 0xd6, 0xbe, 0x5f, 0xba, 0xb5, 0xb7, + 0xd5, 0x43, 0x58, 0xf4, 0x1a, 0xea, 0x99, 0x0c, 0x3f, 0x86, 0xf3, 0xb7, 0xca, 0x1e, 0xc5, 0x64, + 0xcb, 0xbe, 0x2f, 0x4f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x41, 0x1e, 0x19, 0x57, 0xc2, 0x04, + 0x00, 0x00, } func (m *Chain) Marshal() (dAtA []byte, err error) { @@ -427,7 +446,23 @@ func (m *Chain) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Metadata) i = encodeVarintChain(dAtA, i, uint64(len(m.Metadata))) i-- - dAtA[i] = 0x7a + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.AccountBalance) > 0 { + for iNdEx := len(m.AccountBalance) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.AccountBalance[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintChain(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x7a + } } if m.MonitoringConnected { i-- @@ -728,9 +763,15 @@ func (m *Chain) Size() (n int) { if m.MonitoringConnected { n += 2 } + if len(m.AccountBalance) > 0 { + for _, e := range m.AccountBalance { + l = e.Size() + n += 1 + l + sovChain(uint64(l)) + } + } l = len(m.Metadata) if l > 0 { - n += 1 + l + sovChain(uint64(l)) + n += 2 + l + sovChain(uint64(l)) } return n } @@ -1156,6 +1197,40 @@ func (m *Chain) Unmarshal(dAtA []byte) error { } m.MonitoringConnected = bool(v != 0) case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccountBalance", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthChain + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AccountBalance = append(m.AccountBalance, github_com_cosmos_cosmos_sdk_types.Coin{}) + if err := m.AccountBalance[len(m.AccountBalance)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 16: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType) } diff --git a/x/launch/types/chain_test.go b/x/launch/types/chain_test.go index bd6d93355..14200cf56 100644 --- a/x/launch/types/chain_test.go +++ b/x/launch/types/chain_test.go @@ -3,6 +3,8 @@ package types_test import ( "testing" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" "github.com/tendermint/spn/testutil/sample" @@ -19,6 +21,10 @@ func TestChain_Validate(t *testing.T) { mainnetWithoutCampaign := sample.Chain(r, 0, 0) mainnetWithoutCampaign.IsMainnet = true + invalidCoins := sample.Chain(r, 0, 0) + // add invalid coin amount + invalidCoins.AccountBalance = sdk.Coins{sdk.Coin{Denom: "invalid", Amount: sdk.NewInt(-1)}} + for _, tc := range []struct { desc string chain types.Chain @@ -44,6 +50,11 @@ func TestChain_Validate(t *testing.T) { chain: mainnetWithoutCampaign, valid: false, }, + { + desc: "should prevent chain with invalid coins structure", + chain: invalidCoins, + valid: false, + }, } { t.Run(tc.desc, func(t *testing.T) { err := tc.chain.Validate() diff --git a/x/launch/types/events.pb.go b/x/launch/types/events.pb.go index 746dd1b06..beb986ded 100644 --- a/x/launch/types/events.pb.go +++ b/x/launch/types/events.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/launch/types/genesis_account.pb.go b/x/launch/types/genesis_account.pb.go index aedd2d9c3..d3cbfb1e0 100644 --- a/x/launch/types/genesis_account.pb.go +++ b/x/launch/types/genesis_account.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/launch/types/genesis_validator.pb.go b/x/launch/types/genesis_validator.pb.go index d03980a46..810423465 100644 --- a/x/launch/types/genesis_validator.pb.go +++ b/x/launch/types/genesis_validator.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/launch/types/msg_create_chain.go b/x/launch/types/msg_create_chain.go index 3e39984fb..4f481b1a9 100644 --- a/x/launch/types/msg_create_chain.go +++ b/x/launch/types/msg_create_chain.go @@ -22,6 +22,7 @@ func NewMsgCreateChain( genesisHash string, hasCampaign bool, campaignID uint64, + accountBalance sdk.Coins, metadata []byte, ) *MsgCreateChain { return &MsgCreateChain{ @@ -33,6 +34,7 @@ func NewMsgCreateChain( GenesisHash: genesisHash, HasCampaign: hasCampaign, CampaignID: campaignID, + AccountBalance: accountBalance, Metadata: metadata, } } @@ -79,5 +81,10 @@ func (msg *MsgCreateChain) ValidateBasic() error { len(msg.Metadata), spntypes.MaxMetadataLength) } + // Coins must be valid + if !msg.AccountBalance.IsValid() { + return sdkerrors.Wrap(sdkerrortypes.ErrInvalidCoins, "default account balance sdk.Coins is not valid") + } + return nil } diff --git a/x/launch/types/msg_create_chain_test.go b/x/launch/types/msg_create_chain_test.go index 03ee112e8..bcee8e614 100644 --- a/x/launch/types/msg_create_chain_test.go +++ b/x/launch/types/msg_create_chain_test.go @@ -3,6 +3,8 @@ package types_test import ( "testing" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" spntypes "github.com/tendermint/spn/pkg/types" @@ -20,6 +22,9 @@ func TestMsgCreateChain_ValidateBasic(t *testing.T) { msgInvalidMetadataLen := sample.MsgCreateChain(r, sample.Address(r), "foo.com", false, 0) msgInvalidMetadataLen.Metadata = sample.Bytes(r, spntypes.MaxMetadataLength+1) + msgInvalidCoins := sample.MsgCreateChain(r, sample.Address(r), "foo.com", false, 0) + msgInvalidCoins.AccountBalance = sdk.Coins{sdk.Coin{Denom: "invalid", Amount: sdk.NewInt(-1)}} + for _, tc := range []struct { desc string msg types.MsgCreateChain @@ -55,6 +60,11 @@ func TestMsgCreateChain_ValidateBasic(t *testing.T) { msg: msgInvalidMetadataLen, valid: false, }, + { + desc: "should prevent chain with invalid coins structure", + msg: msgInvalidCoins, + valid: false, + }, } { t.Run(tc.desc, func(t *testing.T) { err := tc.msg.ValidateBasic() diff --git a/x/launch/types/query.pb.go b/x/launch/types/query.pb.go index 1253519bb..77cc2d4c0 100644 --- a/x/launch/types/query.pb.go +++ b/x/launch/types/query.pb.go @@ -6,11 +6,11 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/launch/types/query.pb.gw.go b/x/launch/types/query.pb.gw.go index 28f958881..4121ee6a8 100644 --- a/x/launch/types/query.pb.gw.go +++ b/x/launch/types/query.pb.gw.go @@ -1257,27 +1257,27 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Chain_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "chain", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Chain_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "chain", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ChainAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "launch", "chain"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ChainAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "launch", "chain"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GenesisAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "genesis_account", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GenesisAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "genesis_account", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GenesisAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "genesis_account", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GenesisAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "genesis_account", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_VestingAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "vesting_account", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_VestingAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "vesting_account", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_VestingAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "vesting_account", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_VestingAccountAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "vesting_account", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GenesisValidator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "genesis_validator", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GenesisValidator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "genesis_validator", "launchID", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GenesisValidatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "genesis_validator", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_GenesisValidatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "genesis_validator", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Request_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "request", "launchID", "requestID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Request_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "launch", "request", "launchID", "requestID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_RequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "request", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_RequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "launch", "request", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "launch", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "launch", "params"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/launch/types/request.pb.go b/x/launch/types/request.pb.go index a6307a890..6b3b4f95a 100644 --- a/x/launch/types/request.pb.go +++ b/x/launch/types/request.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/launch/types/tx.pb.go b/x/launch/types/tx.pb.go index 35f20ff98..02b2d83b3 100644 --- a/x/launch/types/tx.pb.go +++ b/x/launch/types/tx.pb.go @@ -6,12 +6,12 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -32,15 +32,16 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgCreateChain struct { - Coordinator string `protobuf:"bytes,1,opt,name=coordinator,proto3" json:"coordinator,omitempty"` - GenesisChainID string `protobuf:"bytes,2,opt,name=genesisChainID,proto3" json:"genesisChainID,omitempty"` - SourceURL string `protobuf:"bytes,3,opt,name=sourceURL,proto3" json:"sourceURL,omitempty"` - SourceHash string `protobuf:"bytes,4,opt,name=sourceHash,proto3" json:"sourceHash,omitempty"` - GenesisURL string `protobuf:"bytes,5,opt,name=genesisURL,proto3" json:"genesisURL,omitempty"` - GenesisHash string `protobuf:"bytes,6,opt,name=genesisHash,proto3" json:"genesisHash,omitempty"` - HasCampaign bool `protobuf:"varint,7,opt,name=hasCampaign,proto3" json:"hasCampaign,omitempty"` - CampaignID uint64 `protobuf:"varint,8,opt,name=campaignID,proto3" json:"campaignID,omitempty"` - Metadata []byte `protobuf:"bytes,9,opt,name=metadata,proto3" json:"metadata,omitempty"` + Coordinator string `protobuf:"bytes,1,opt,name=coordinator,proto3" json:"coordinator,omitempty"` + GenesisChainID string `protobuf:"bytes,2,opt,name=genesisChainID,proto3" json:"genesisChainID,omitempty"` + SourceURL string `protobuf:"bytes,3,opt,name=sourceURL,proto3" json:"sourceURL,omitempty"` + SourceHash string `protobuf:"bytes,4,opt,name=sourceHash,proto3" json:"sourceHash,omitempty"` + GenesisURL string `protobuf:"bytes,5,opt,name=genesisURL,proto3" json:"genesisURL,omitempty"` + GenesisHash string `protobuf:"bytes,6,opt,name=genesisHash,proto3" json:"genesisHash,omitempty"` + HasCampaign bool `protobuf:"varint,7,opt,name=hasCampaign,proto3" json:"hasCampaign,omitempty"` + CampaignID uint64 `protobuf:"varint,8,opt,name=campaignID,proto3" json:"campaignID,omitempty"` + AccountBalance github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,9,rep,name=AccountBalance,proto3,casttype=github.com/cosmos/cosmos-sdk/types.Coin,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"AccountBalance"` + Metadata []byte `protobuf:"bytes,10,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (m *MsgCreateChain) Reset() { *m = MsgCreateChain{} } @@ -132,6 +133,13 @@ func (m *MsgCreateChain) GetCampaignID() uint64 { return 0 } +func (m *MsgCreateChain) GetAccountBalance() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.AccountBalance + } + return nil +} + func (m *MsgCreateChain) GetMetadata() []byte { if m != nil { return m.Metadata @@ -1339,82 +1347,84 @@ func init() { func init() { proto.RegisterFile("launch/tx.proto", fileDescriptor_6adab5ffa522f022) } var fileDescriptor_6adab5ffa522f022 = []byte{ - // 1200 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xc6, 0x4e, 0x93, 0xbc, 0xa4, 0x69, 0x59, 0x42, 0xba, 0xd9, 0x46, 0x8e, 0xd9, 0x96, - 0xd6, 0x02, 0xc5, 0x6e, 0x5c, 0x8a, 0xa0, 0xb7, 0xfc, 0xa8, 0x4a, 0x44, 0x2d, 0xaa, 0x6d, 0xca, - 0x01, 0x84, 0xc2, 0x78, 0x77, 0xb2, 0x19, 0x61, 0xef, 0x98, 0x9d, 0xb1, 0x95, 0x0a, 0x89, 0x13, - 0x12, 0x12, 0x42, 0xa2, 0x37, 0xe0, 0xc0, 0x3f, 0xc0, 0x81, 0x13, 0x07, 0x4e, 0x9c, 0x7b, 0x42, - 0x15, 0x27, 0x4e, 0x05, 0x25, 0xff, 0x05, 0x27, 0xb4, 0x33, 0xb3, 0xeb, 0x5d, 0xc7, 0xbb, 0xb1, - 0x45, 0xc2, 0xc9, 0x9e, 0x37, 0xdf, 0x7b, 0xef, 0x7b, 0xdf, 0xbe, 0x7d, 0x33, 0x36, 0x5c, 0x6a, - 0xa1, 0xae, 0xef, 0x1c, 0xd4, 0xf8, 0x61, 0xb5, 0x13, 0x50, 0x4e, 0xf5, 0x57, 0x38, 0xf6, 0x5d, - 0x1c, 0xb4, 0x89, 0xcf, 0xab, 0xac, 0xe3, 0x57, 0xe5, 0xbe, 0xb9, 0xe8, 0x51, 0x8f, 0x0a, 0x44, - 0x2d, 0xfc, 0x26, 0xc1, 0x66, 0xc9, 0xa1, 0xac, 0x4d, 0x59, 0xad, 0x89, 0x18, 0xae, 0xf5, 0xd6, - 0x9b, 0x98, 0xa3, 0xf5, 0x9a, 0x43, 0x89, 0xaf, 0xf6, 0x97, 0xe5, 0xfe, 0x9e, 0x74, 0x94, 0x0b, - 0xb5, 0xa5, 0xab, 0xc4, 0xce, 0x01, 0x8a, 0xe1, 0x2b, 0xca, 0xd6, 0xc3, 0x8c, 0x13, 0xdf, 0xdb, - 0x43, 0x8e, 0x43, 0xbb, 0x3e, 0x8f, 0x92, 0xa9, 0x5d, 0x0f, 0xfb, 0x98, 0x11, 0xb6, 0xd7, 0x43, - 0x2d, 0xe2, 0x22, 0x4e, 0x03, 0xb9, 0x6f, 0xfd, 0x3a, 0x09, 0x0b, 0x0d, 0xe6, 0x6d, 0x05, 0x18, - 0x71, 0xbc, 0x15, 0x86, 0xd5, 0xcb, 0x30, 0xe7, 0x50, 0x1a, 0xb8, 0xc4, 0x0f, 0x71, 0x86, 0x56, - 0xd6, 0x2a, 0xb3, 0x76, 0xd2, 0xa4, 0xdf, 0x80, 0x05, 0x15, 0x4f, 0x78, 0xec, 0x6c, 0x1b, 0x93, - 0x02, 0x34, 0x60, 0xd5, 0x57, 0x60, 0x96, 0xd1, 0x6e, 0xe0, 0xe0, 0xc7, 0xf6, 0x03, 0xa3, 0x20, - 0x20, 0x7d, 0x83, 0x5e, 0x02, 0x90, 0x8b, 0x77, 0x11, 0x3b, 0x30, 0x8a, 0x62, 0x3b, 0x61, 0x09, - 0xf7, 0x55, 0xbc, 0xd0, 0x7d, 0x4a, 0xee, 0xf7, 0x2d, 0x21, 0x4f, 0xb5, 0x12, 0x01, 0x2e, 0x48, - 0x9e, 0x09, 0x53, 0x88, 0x38, 0x40, 0x6c, 0x0b, 0xb5, 0x3b, 0x88, 0x78, 0xbe, 0x31, 0x5d, 0xd6, - 0x2a, 0x33, 0x76, 0xd2, 0x14, 0xe6, 0x70, 0xd4, 0xf7, 0x9d, 0x6d, 0x63, 0xa6, 0xac, 0x55, 0x8a, - 0x76, 0xc2, 0xa2, 0x9b, 0x30, 0xd3, 0xc6, 0x1c, 0xb9, 0x88, 0x23, 0x63, 0xb6, 0xac, 0x55, 0xe6, - 0xed, 0x78, 0x6d, 0xbd, 0x09, 0x4b, 0x69, 0xe5, 0x6c, 0xcc, 0x3a, 0xd4, 0x67, 0x38, 0xf4, 0x92, - 0xb2, 0xef, 0x6c, 0x0b, 0xf9, 0x8a, 0x76, 0xbc, 0xb6, 0x7e, 0xd6, 0x60, 0xbe, 0xc1, 0xbc, 0x7b, - 0x2e, 0xe1, 0xa3, 0xca, 0x9d, 0x0c, 0x37, 0x99, 0x0e, 0xa7, 0x5f, 0x87, 0x8b, 0x0c, 0xf3, 0xad, - 0x7e, 0x0d, 0x05, 0x51, 0x64, 0xda, 0x38, 0x50, 0x66, 0x31, 0xb7, 0xcc, 0xa9, 0x81, 0x32, 0x97, - 0x60, 0x31, 0xc9, 0x37, 0x2a, 0xd2, 0xfa, 0x76, 0x12, 0xcc, 0x06, 0xf3, 0x1e, 0x77, 0x5c, 0xc4, - 0xf1, 0x03, 0xc9, 0xc7, 0xdf, 0xa7, 0x41, 0x1b, 0x71, 0x42, 0xff, 0x6b, 0x59, 0x27, 0x3b, 0xac, - 0x70, 0x7a, 0x87, 0x15, 0xf3, 0x3b, 0x6c, 0xea, 0x44, 0x87, 0x35, 0x60, 0x81, 0xf8, 0x84, 0x13, - 0xd4, 0xba, 0x2f, 0xc3, 0x8a, 0x26, 0x9a, 0xab, 0xbf, 0x56, 0x1d, 0xfa, 0x3e, 0x57, 0x77, 0x52, - 0x60, 0x7b, 0xc0, 0xd9, 0xba, 0x0e, 0x56, 0xb6, 0x20, 0x49, 0xdd, 0x42, 0x41, 0x6d, 0xfc, 0x59, - 0x17, 0x33, 0xbe, 0xe1, 0xba, 0x1b, 0xf2, 0x85, 0xd5, 0x0d, 0x98, 0x76, 0xc2, 0x66, 0x8a, 0xd5, - 0x8a, 0x96, 0xb9, 0x4a, 0xd5, 0x61, 0x1a, 0xb9, 0x6e, 0x80, 0x19, 0x93, 0x12, 0x6d, 0x1a, 0x7f, - 0xfc, 0xb2, 0xb6, 0xa8, 0xa6, 0xc6, 0x86, 0xdc, 0x79, 0xc4, 0x03, 0xe2, 0x7b, 0x76, 0x04, 0xd4, - 0xbf, 0xd1, 0x60, 0x2a, 0x1c, 0x38, 0xcc, 0x28, 0x96, 0x0b, 0x95, 0xb9, 0xfa, 0x72, 0x55, 0xe1, - 0xc3, 0x91, 0x54, 0x55, 0x23, 0xa9, 0xba, 0x45, 0x89, 0xbf, 0xf9, 0xd1, 0xb3, 0x17, 0xab, 0x13, - 0xff, 0xbc, 0x58, 0xbd, 0xe9, 0x11, 0x7e, 0xd0, 0x6d, 0x56, 0x1d, 0xda, 0x56, 0x23, 0x49, 0x7d, - 0xac, 0x31, 0xf7, 0xd3, 0x1a, 0x7f, 0xd2, 0xc1, 0x4c, 0x38, 0xfc, 0xf4, 0xd7, 0x6a, 0x65, 0x44, - 0x28, 0xb3, 0x25, 0x09, 0xeb, 0x13, 0x58, 0x19, 0x26, 0x48, 0xfc, 0x3a, 0xad, 0xc0, 0x6c, 0x20, - 0x37, 0xe3, 0xf7, 0xa9, 0x6f, 0xd0, 0x2d, 0x98, 0x47, 0x5d, 0x4e, 0x37, 0x3a, 0x9d, 0x80, 0xf6, - 0xb0, 0x2b, 0x04, 0x9a, 0xb1, 0x53, 0x36, 0xeb, 0x77, 0x0d, 0xae, 0xa6, 0x52, 0x7c, 0x20, 0x87, - 0xe5, 0xff, 0x2f, 0xfd, 0x3d, 0x98, 0xa6, 0x9d, 0xb0, 0x1f, 0x98, 0x68, 0xd7, 0xec, 0x5e, 0x53, - 0x0c, 0xdf, 0x97, 0xe0, 0xcd, 0x62, 0xf8, 0x1c, 0xec, 0xc8, 0xd7, 0xf2, 0xe0, 0x5a, 0x4e, 0x3d, - 0x67, 0xa8, 0xdc, 0x8f, 0x1a, 0x5c, 0xe9, 0x67, 0xb2, 0x71, 0x9b, 0xf6, 0x70, 0xa4, 0x5a, 0x7d, - 0x40, 0xb5, 0xbc, 0xfa, 0xcf, 0x49, 0x4f, 0xcb, 0x81, 0xd5, 0x0c, 0x7a, 0x67, 0x28, 0xc2, 0x6f, - 0x93, 0x62, 0xd4, 0x27, 0xe4, 0x8e, 0x4e, 0xd1, 0x33, 0xd7, 0xa0, 0x04, 0xd0, 0x43, 0xad, 0x8d, - 0xa4, 0x0c, 0x76, 0xc2, 0xa2, 0x2f, 0xc2, 0x94, 0x87, 0xfd, 0xdd, 0x43, 0xd1, 0x3d, 0xf3, 0xb6, - 0x5c, 0x88, 0xf9, 0x4e, 0x7d, 0xf6, 0xb0, 0xdb, 0x7c, 0x0f, 0x3f, 0x51, 0x13, 0x3c, 0x61, 0xd1, - 0xef, 0xc3, 0x02, 0xc3, 0xad, 0xfd, 0x6d, 0xdc, 0xc2, 0x9e, 0x98, 0x46, 0x6a, 0xd0, 0xe5, 0xbc, - 0xf8, 0xb2, 0xe1, 0x06, 0xdc, 0xf4, 0x3b, 0x50, 0xec, 0x60, 0x1c, 0x88, 0xa3, 0x74, 0xae, 0x7e, - 0x35, 0xa3, 0x77, 0x1f, 0x62, 0x1c, 0xa8, 0x00, 0x02, 0x6e, 0x35, 0xa1, 0x34, 0x5c, 0xbf, 0x33, - 0x7c, 0x48, 0xdf, 0x69, 0xb0, 0x3c, 0xd8, 0x0a, 0xe7, 0xf7, 0x9c, 0x5e, 0x87, 0xcb, 0xf1, 0x55, - 0x2a, 0xfd, 0xb4, 0x4e, 0xd8, 0x2d, 0x0c, 0xaf, 0x66, 0x12, 0x3b, 0x43, 0x01, 0xbe, 0xd7, 0xe0, - 0x72, 0x83, 0x79, 0x8f, 0x30, 0xe7, 0x2d, 0xac, 0xb2, 0xe9, 0xb7, 0xe0, 0x02, 0x23, 0x9e, 0x8f, - 0x4f, 0x2f, 0x5b, 0xe1, 0x72, 0xab, 0x4e, 0x91, 0x2c, 0x0c, 0x92, 0x34, 0x60, 0x1a, 0x49, 0x32, - 0xa2, 0x3b, 0x67, 0xec, 0x68, 0x69, 0x99, 0x60, 0x0c, 0x32, 0x8b, 0xcf, 0xc3, 0xa7, 0x92, 0xf6, - 0x6e, 0x40, 0x3c, 0x0f, 0x07, 0xf2, 0xdc, 0xd4, 0xef, 0x0e, 0xb9, 0x3d, 0xe4, 0x70, 0x1f, 0xe7, - 0xba, 0x14, 0xe0, 0x36, 0x22, 0x3e, 0xf1, 0xbd, 0x5d, 0xd2, 0xc6, 0xa2, 0x88, 0x82, 0x9d, 0x36, - 0x2a, 0xba, 0x29, 0x46, 0x31, 0x5d, 0x02, 0x97, 0xc4, 0xc3, 0xec, 0xe1, 0x80, 0x9f, 0x2f, 0x59, - 0x6b, 0x59, 0x8d, 0xde, 0x7e, 0xaa, 0x88, 0x45, 0xfd, 0x07, 0x80, 0x42, 0x83, 0x79, 0xba, 0x03, - 0x73, 0xc9, 0xab, 0x7b, 0xd6, 0x61, 0x92, 0xbe, 0xa7, 0x9a, 0x6b, 0x23, 0xc1, 0xe2, 0xd6, 0xfc, - 0x18, 0x66, 0xfb, 0xd7, 0xd5, 0x6b, 0xd9, 0xbe, 0x31, 0xc8, 0x7c, 0x63, 0x04, 0x50, 0x1c, 0xfe, - 0x2b, 0x0d, 0xae, 0x64, 0xdd, 0x22, 0xd7, 0xb3, 0x03, 0x65, 0xb8, 0x98, 0xef, 0x8c, 0xed, 0x12, - 0x33, 0xe9, 0xc2, 0x4b, 0x27, 0xaf, 0x65, 0x39, 0xb5, 0x9c, 0x00, 0x9b, 0xb7, 0xc7, 0x00, 0xc7, - 0x69, 0xbf, 0xd6, 0xc0, 0xc8, 0xbc, 0x9a, 0xd4, 0x47, 0x89, 0x98, 0xf6, 0x31, 0xef, 0x8e, 0xef, - 0x13, 0x93, 0xf9, 0x02, 0x16, 0x87, 0x1e, 0xf6, 0xd5, 0x53, 0x63, 0xa6, 0xf0, 0xe6, 0x5b, 0xe3, - 0xe1, 0xe3, 0xfc, 0x9f, 0xc3, 0xcb, 0xc3, 0xce, 0xd9, 0xb5, 0x91, 0x4a, 0x8a, 0xe0, 0xe6, 0x9d, - 0xb1, 0xe0, 0x71, 0xf2, 0x2f, 0x35, 0x58, 0xca, 0x38, 0x40, 0x6e, 0x8d, 0x58, 0x4f, 0x9f, 0xc3, - 0xdb, 0xe3, 0x7a, 0xc4, 0x34, 0x08, 0x5c, 0x4c, 0x4f, 0xf1, 0x9b, 0xd9, 0xa1, 0x52, 0x40, 0xb3, - 0x36, 0x22, 0x30, 0x99, 0x2a, 0x3d, 0x79, 0x73, 0x52, 0xa5, 0x80, 0x79, 0xa9, 0x86, 0x4e, 0x4e, - 0x7d, 0x1f, 0xe6, 0x53, 0x63, 0xf3, 0x46, 0x9e, 0x3e, 0x7d, 0x9c, 0x59, 0x1d, 0x0d, 0x17, 0xe5, - 0xd9, 0xdc, 0x7c, 0x76, 0x54, 0xd2, 0x9e, 0x1f, 0x95, 0xb4, 0xbf, 0x8f, 0x4a, 0xda, 0xd3, 0xe3, - 0xd2, 0xc4, 0xf3, 0xe3, 0xd2, 0xc4, 0x9f, 0xc7, 0xa5, 0x89, 0x0f, 0x93, 0xbf, 0x4c, 0xfa, 0x31, - 0x6b, 0xac, 0xe3, 0xd7, 0x0e, 0x6b, 0xd1, 0x7f, 0x3a, 0xe1, 0xef, 0x93, 0xe6, 0x05, 0xf1, 0xef, - 0xc8, 0xed, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xf4, 0x04, 0x0f, 0xea, 0x11, 0x00, 0x00, + // 1221 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0xc6, 0x4e, 0x93, 0xbc, 0xa4, 0x69, 0x59, 0x42, 0xbb, 0xd9, 0x46, 0x8e, 0xd9, 0x96, + 0xd6, 0x02, 0xc5, 0x6e, 0x5c, 0x8a, 0xa0, 0xb7, 0x38, 0xa9, 0x4a, 0x44, 0x2d, 0xaa, 0x6d, 0xca, + 0x01, 0x84, 0xc2, 0x78, 0x77, 0xb2, 0x59, 0x61, 0xcf, 0x98, 0x9d, 0xb1, 0x95, 0x0a, 0x89, 0x13, + 0x12, 0x12, 0x42, 0xa2, 0x37, 0xe0, 0x00, 0x1f, 0x80, 0x03, 0x27, 0xce, 0x9c, 0x7b, 0x42, 0x15, + 0x27, 0xb8, 0x14, 0x94, 0x7c, 0x0b, 0x4e, 0x68, 0x67, 0x66, 0xd7, 0xbb, 0xb6, 0xd7, 0xb1, 0x45, + 0x02, 0xa7, 0x64, 0xde, 0xfc, 0xde, 0x7b, 0xbf, 0xf7, 0x67, 0xde, 0xcc, 0x1a, 0x2e, 0x34, 0x51, + 0x87, 0x38, 0x07, 0x15, 0x7e, 0x58, 0x6e, 0x07, 0x94, 0x53, 0xfd, 0x25, 0x8e, 0x89, 0x8b, 0x83, + 0x96, 0x4f, 0x78, 0x99, 0xb5, 0x49, 0x59, 0xee, 0x9b, 0xcb, 0x1e, 0xf5, 0xa8, 0x40, 0x54, 0xc2, + 0xff, 0x24, 0xd8, 0x2c, 0x38, 0x94, 0xb5, 0x28, 0xab, 0x34, 0x10, 0xc3, 0x95, 0xee, 0x46, 0x03, + 0x73, 0xb4, 0x51, 0x71, 0xa8, 0x4f, 0xd4, 0xfe, 0x8a, 0xdc, 0xdf, 0x93, 0x8a, 0x72, 0xa1, 0xb6, + 0x74, 0xe5, 0xd8, 0x39, 0x40, 0x31, 0x7c, 0x55, 0xc9, 0xba, 0x98, 0x71, 0x9f, 0x78, 0x7b, 0xc8, + 0x71, 0x68, 0x87, 0xf0, 0xc8, 0x99, 0xda, 0xf5, 0x30, 0xc1, 0xcc, 0x67, 0x7b, 0x5d, 0xd4, 0xf4, + 0x5d, 0xc4, 0x69, 0x20, 0xf7, 0xad, 0x3f, 0x72, 0xb0, 0x54, 0x67, 0xde, 0x56, 0x80, 0x11, 0xc7, + 0x5b, 0xa1, 0x59, 0xbd, 0x08, 0x0b, 0x0e, 0xa5, 0x81, 0xeb, 0x93, 0x10, 0x67, 0x68, 0x45, 0xad, + 0x34, 0x6f, 0x27, 0x45, 0xfa, 0x75, 0x58, 0x52, 0xf6, 0x84, 0xc6, 0xce, 0xb6, 0x31, 0x2d, 0x40, + 0x7d, 0x52, 0x7d, 0x15, 0xe6, 0x19, 0xed, 0x04, 0x0e, 0x7e, 0x64, 0xdf, 0x37, 0x72, 0x02, 0xd2, + 0x13, 0xe8, 0x05, 0x00, 0xb9, 0x78, 0x1b, 0xb1, 0x03, 0x23, 0x2f, 0xb6, 0x13, 0x92, 0x70, 0x5f, + 0xd9, 0x0b, 0xd5, 0x67, 0xe4, 0x7e, 0x4f, 0x12, 0xf2, 0x54, 0x2b, 0x61, 0xe0, 0x9c, 0xe4, 0x99, + 0x10, 0x85, 0x88, 0x03, 0xc4, 0xb6, 0x50, 0xab, 0x8d, 0x7c, 0x8f, 0x18, 0xb3, 0x45, 0xad, 0x34, + 0x67, 0x27, 0x45, 0xa1, 0x0f, 0x47, 0xfd, 0xbf, 0xb3, 0x6d, 0xcc, 0x15, 0xb5, 0x52, 0xde, 0x4e, + 0x48, 0xf4, 0x1f, 0x34, 0x58, 0xda, 0x94, 0x09, 0xad, 0xa1, 0x26, 0x22, 0x0e, 0x36, 0xe6, 0x8b, + 0xb9, 0xd2, 0x42, 0x75, 0xa5, 0xac, 0x0a, 0x13, 0x56, 0xb1, 0xac, 0xaa, 0x58, 0xde, 0xa2, 0x3e, + 0xa9, 0x7d, 0xf0, 0xf4, 0xf9, 0xda, 0xd4, 0xdf, 0xcf, 0xd7, 0x6e, 0x78, 0x3e, 0x3f, 0xe8, 0x34, + 0xca, 0x0e, 0x6d, 0xa9, 0x2a, 0xaa, 0x3f, 0xeb, 0xcc, 0xfd, 0xb8, 0xc2, 0x1f, 0xb7, 0x31, 0x13, + 0x0a, 0x3f, 0xfe, 0xb9, 0x56, 0x1a, 0x13, 0xca, 0xec, 0x3e, 0x36, 0xba, 0x09, 0x73, 0x2d, 0xcc, + 0x91, 0x8b, 0x38, 0x32, 0xa0, 0xa8, 0x95, 0x16, 0xed, 0x78, 0x6d, 0xbd, 0x0e, 0x97, 0xd2, 0xa5, + 0xb5, 0x31, 0x6b, 0x53, 0xc2, 0x84, 0x96, 0xec, 0x8b, 0x9d, 0x6d, 0x51, 0xdf, 0xbc, 0x1d, 0xaf, + 0xad, 0x9f, 0x34, 0x58, 0xac, 0x33, 0xef, 0xae, 0xeb, 0xf3, 0x71, 0xfb, 0x21, 0x69, 0x6e, 0x3a, + 0x6d, 0x4e, 0xbf, 0x06, 0xe7, 0x19, 0xe6, 0x5b, 0xbd, 0x24, 0xe7, 0x44, 0x15, 0xd2, 0xc2, 0xbe, + 0x3a, 0xe4, 0x07, 0xea, 0x90, 0x0c, 0x73, 0xa6, 0x2f, 0xcc, 0x4b, 0xb0, 0x9c, 0xe4, 0x1b, 0x05, + 0x69, 0x7d, 0x3d, 0x0d, 0x66, 0x9d, 0x79, 0x8f, 0xda, 0x2e, 0xe2, 0xf8, 0xbe, 0xe4, 0x43, 0xf6, + 0x69, 0xd0, 0x42, 0xdc, 0xa7, 0xff, 0x36, 0xac, 0xc1, 0x23, 0x90, 0x3b, 0xf9, 0x08, 0xe4, 0x47, + 0x1f, 0x81, 0x99, 0x81, 0x23, 0x50, 0x87, 0x25, 0x9f, 0xf8, 0xdc, 0x47, 0xcd, 0x7b, 0xd2, 0xac, + 0xe8, 0xf2, 0x85, 0xea, 0x2b, 0xe5, 0xa1, 0x03, 0xa7, 0xbc, 0x93, 0x02, 0xdb, 0x7d, 0xca, 0xd6, + 0x35, 0xb0, 0xb2, 0x13, 0x92, 0xcc, 0x5b, 0x98, 0x50, 0x1b, 0x7f, 0xd2, 0xc1, 0x8c, 0x6f, 0xba, + 0xae, 0x6a, 0x39, 0xdd, 0x80, 0x59, 0x27, 0x6c, 0xa6, 0x38, 0x5b, 0xd1, 0x72, 0x64, 0xa6, 0xaa, + 0x30, 0x8b, 0x5c, 0x37, 0xc0, 0x8c, 0xc9, 0x14, 0xd5, 0x8c, 0xdf, 0x7e, 0x5e, 0x5f, 0x56, 0xa7, + 0x67, 0x53, 0xee, 0x3c, 0xe4, 0x81, 0x4f, 0x3c, 0x3b, 0x02, 0xea, 0x5f, 0x69, 0x30, 0x13, 0x4e, + 0x44, 0x66, 0xe4, 0xff, 0xd7, 0xd3, 0x26, 0x49, 0x58, 0x1f, 0xc1, 0xea, 0xb0, 0x84, 0xc4, 0xc7, + 0x69, 0x15, 0xe6, 0x03, 0xb9, 0x19, 0x9f, 0xa7, 0x9e, 0x40, 0xb7, 0x60, 0x11, 0x75, 0x38, 0xdd, + 0x6c, 0xb7, 0x03, 0xda, 0xc5, 0xae, 0x48, 0xd0, 0x9c, 0x9d, 0x92, 0x59, 0xbf, 0x6a, 0x70, 0x25, + 0xe5, 0xe2, 0x3d, 0x39, 0xcd, 0xff, 0xfb, 0xd4, 0xdf, 0x85, 0x59, 0xda, 0x0e, 0xfb, 0x81, 0x89, + 0x76, 0xcd, 0xee, 0x35, 0xc5, 0xf0, 0x5d, 0x09, 0xae, 0xe5, 0xc3, 0x3a, 0xd8, 0x91, 0xae, 0xe5, + 0xc1, 0xd5, 0x11, 0xf1, 0x9c, 0x62, 0xe6, 0xbe, 0xd7, 0xe0, 0x72, 0xcf, 0x93, 0x8d, 0x5b, 0xb4, + 0x8b, 0xa3, 0xac, 0x55, 0xfb, 0xb2, 0x36, 0x2a, 0xfe, 0x33, 0xca, 0xa7, 0xe5, 0xc0, 0x5a, 0x06, + 0xbd, 0x53, 0x4c, 0xc2, 0x2f, 0xd3, 0x62, 0xd4, 0x27, 0xd2, 0x1d, 0x5d, 0xf3, 0xa7, 0x9e, 0x83, + 0x02, 0x40, 0x17, 0x35, 0x37, 0x93, 0x69, 0xb0, 0x13, 0x12, 0x7d, 0x19, 0x66, 0x3c, 0x4c, 0x76, + 0x0f, 0x45, 0xf7, 0x2c, 0xda, 0x72, 0x21, 0xe6, 0x3b, 0x25, 0xec, 0x41, 0xa7, 0xf1, 0x0e, 0x7e, + 0xac, 0x26, 0x78, 0x42, 0xa2, 0xdf, 0x83, 0x25, 0x86, 0x9b, 0xfb, 0xdb, 0xb8, 0x89, 0x3d, 0x31, + 0x8d, 0xd4, 0xa0, 0x1b, 0x71, 0xf0, 0x65, 0xc3, 0xf5, 0xa9, 0xe9, 0xb7, 0x21, 0xdf, 0xc6, 0x38, + 0x10, 0x77, 0xfd, 0x42, 0xf5, 0x4a, 0x46, 0xef, 0x3e, 0xc0, 0x38, 0x50, 0x06, 0x04, 0xdc, 0x6a, + 0x40, 0x61, 0x78, 0xfe, 0x4e, 0xb1, 0x48, 0xdf, 0x68, 0xb0, 0xd2, 0xdf, 0x0a, 0x67, 0x57, 0xa7, + 0x57, 0xe1, 0x62, 0xfc, 0xd6, 0x4b, 0x57, 0x6b, 0x40, 0x6e, 0x61, 0x78, 0x39, 0x93, 0xd8, 0x29, + 0x26, 0xe0, 0x5b, 0x0d, 0x2e, 0xd6, 0x99, 0xf7, 0x10, 0x73, 0xde, 0xc4, 0xca, 0x9b, 0x7e, 0x13, + 0xce, 0x31, 0xdf, 0x23, 0xf8, 0xe4, 0xb0, 0x15, 0x6e, 0x64, 0xd4, 0x29, 0x92, 0xb9, 0x7e, 0x92, + 0x06, 0xcc, 0x22, 0x49, 0x46, 0x74, 0xe7, 0x9c, 0x1d, 0x2d, 0x2d, 0x13, 0x8c, 0x7e, 0x66, 0xf1, + 0x7d, 0xf8, 0x44, 0xd2, 0xde, 0x0d, 0x7c, 0xcf, 0xc3, 0x81, 0xbc, 0x37, 0xf5, 0x3b, 0x43, 0x5e, + 0x0f, 0x23, 0xb8, 0x4f, 0xf2, 0x5c, 0x0a, 0x70, 0x0b, 0xf9, 0xc4, 0x27, 0xde, 0xae, 0xdf, 0xc2, + 0x22, 0x88, 0x9c, 0x9d, 0x16, 0x2a, 0xba, 0x29, 0x46, 0x31, 0x5d, 0x1f, 0x2e, 0x88, 0x62, 0x76, + 0x71, 0xc0, 0xcf, 0x96, 0xac, 0xb5, 0xa2, 0x46, 0x6f, 0xcf, 0x55, 0xc4, 0xa2, 0xfa, 0x1d, 0x40, + 0xae, 0xce, 0x3c, 0xdd, 0x81, 0x85, 0xe4, 0xb7, 0x45, 0xd6, 0x65, 0x92, 0x7e, 0xa7, 0x9a, 0xeb, + 0x63, 0xc1, 0xe2, 0xd6, 0xfc, 0x10, 0xe6, 0x7b, 0xcf, 0xd5, 0xab, 0xd9, 0xba, 0x31, 0xc8, 0x7c, + 0x6d, 0x0c, 0x50, 0x6c, 0xfe, 0x0b, 0x0d, 0x2e, 0x67, 0xbd, 0x22, 0x37, 0xb2, 0x0d, 0x65, 0xa8, + 0x98, 0x6f, 0x4d, 0xac, 0x12, 0x33, 0xe9, 0xc0, 0x0b, 0x83, 0xcf, 0xb2, 0x11, 0xb1, 0x0c, 0x80, + 0xcd, 0x5b, 0x13, 0x80, 0x63, 0xb7, 0x5f, 0x6a, 0x60, 0x64, 0x3e, 0x4d, 0xaa, 0xe3, 0x58, 0x4c, + 0xeb, 0x98, 0x77, 0x26, 0xd7, 0x89, 0xc9, 0x7c, 0x06, 0xcb, 0x43, 0x2f, 0xfb, 0xf2, 0x89, 0x36, + 0x53, 0x78, 0xf3, 0x8d, 0xc9, 0xf0, 0xb1, 0xff, 0x4f, 0xe1, 0xc5, 0x61, 0xf7, 0xec, 0xfa, 0x58, + 0x21, 0x45, 0x70, 0xf3, 0xf6, 0x44, 0xf0, 0xd8, 0xf9, 0xe7, 0x1a, 0x5c, 0xca, 0xb8, 0x40, 0x6e, + 0x8e, 0x19, 0x4f, 0x8f, 0xc3, 0x9b, 0x93, 0x6a, 0xc4, 0x34, 0x7c, 0x38, 0x9f, 0x9e, 0xe2, 0x37, + 0xb2, 0x4d, 0xa5, 0x80, 0x66, 0x65, 0x4c, 0x60, 0xd2, 0x55, 0x7a, 0xf2, 0x8e, 0x70, 0x95, 0x02, + 0x8e, 0x72, 0x35, 0x74, 0x72, 0xea, 0xfb, 0xb0, 0x98, 0x1a, 0x9b, 0xd7, 0x47, 0xe5, 0xa7, 0x87, + 0x33, 0xcb, 0xe3, 0xe1, 0x22, 0x3f, 0xb5, 0xda, 0xd3, 0xa3, 0x82, 0xf6, 0xec, 0xa8, 0xa0, 0xfd, + 0x75, 0x54, 0xd0, 0x9e, 0x1c, 0x17, 0xa6, 0x9e, 0x1d, 0x17, 0xa6, 0x7e, 0x3f, 0x2e, 0x4c, 0xbd, + 0x9f, 0xfc, 0x32, 0xe9, 0xd9, 0xac, 0xb0, 0x36, 0xa9, 0x1c, 0x56, 0xa2, 0x1f, 0x9d, 0xc2, 0xef, + 0x93, 0xc6, 0x39, 0xf1, 0xf3, 0xcd, 0xad, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x47, 0x0c, 0x94, + 0x72, 0x8b, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1884,7 +1894,21 @@ func (m *MsgCreateChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Metadata) i = encodeVarintTx(dAtA, i, uint64(len(m.Metadata))) i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 + } + if len(m.AccountBalance) > 0 { + for iNdEx := len(m.AccountBalance) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.AccountBalance[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } } if m.CampaignID != 0 { i = encodeVarintTx(dAtA, i, uint64(m.CampaignID)) @@ -2844,6 +2868,12 @@ func (m *MsgCreateChain) Size() (n int) { if m.CampaignID != 0 { n += 1 + sovTx(uint64(m.CampaignID)) } + if len(m.AccountBalance) > 0 { + for _, e := range m.AccountBalance { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } l = len(m.Metadata) if l > 0 { n += 1 + l + sovTx(uint64(l)) @@ -3485,6 +3515,40 @@ func (m *MsgCreateChain) Unmarshal(dAtA []byte) error { } } case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccountBalance", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AccountBalance = append(m.AccountBalance, github_com_cosmos_cosmos_sdk_types.Coin{}) + if err := m.AccountBalance[len(m.AccountBalance)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType) } diff --git a/x/launch/types/vesting_account.pb.go b/x/launch/types/vesting_account.pb.go index 1fcb5b1bc..0e4ea99d9 100644 --- a/x/launch/types/vesting_account.pb.go +++ b/x/launch/types/vesting_account.pb.go @@ -5,11 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/monitoringc/keeper/msg_create_client_test.go b/x/monitoringc/keeper/msg_create_client_test.go index 5b6dcaf43..c04aab45a 100644 --- a/x/monitoringc/keeper/msg_create_client_test.go +++ b/x/monitoringc/keeper/msg_create_client_test.go @@ -59,6 +59,7 @@ func Test_msgServer_CreateClient(t *testing.T) { "", false, 0, + sample.Coins(r), sample.Metadata(r, 20), )) require.NoError(t, err) diff --git a/x/monitoringc/types/query.pb.gw.go b/x/monitoringc/types/query.pb.gw.go index e1f4a5939..ea021a4ea 100644 --- a/x/monitoringc/types/query.pb.gw.go +++ b/x/monitoringc/types/query.pb.gw.go @@ -691,19 +691,19 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_VerifiedClientIds_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "verified_client_ids", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_VerifiedClientIds_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "verified_client_ids", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ProviderClientID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "provider_client_id", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ProviderClientID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "provider_client_id", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ProviderClientIDAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "provider_client_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ProviderClientIDAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "provider_client_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LaunchIDFromChannelID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "launch_id_from_channel_id", "channelID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LaunchIDFromChannelID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "launch_id_from_channel_id", "channelID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LaunchIDFromChannelIDAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "launch_id_from_channel_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LaunchIDFromChannelIDAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "launch_id_from_channel_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MonitoringHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "monitoring_history", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MonitoringHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "monitoringc", "monitoring_history", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringc", "params"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/monitoringp/types/query.pb.gw.go b/x/monitoringp/types/query.pb.gw.go index 771fdf2b8..0ac000cce 100644 --- a/x/monitoringp/types/query.pb.gw.go +++ b/x/monitoringp/types/query.pb.gw.go @@ -328,13 +328,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_ConsumerClientID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "consumer_client_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ConsumerClientID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "consumer_client_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ConnectionChannelID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "connection_channel_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ConnectionChannelID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "connection_channel_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_MonitoringInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "monitoring_info"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MonitoringInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "monitoring_info"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "monitoringp", "params"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/participation/types/auction_used_allocations.pb.go b/x/participation/types/auction_used_allocations.pb.go index 52d850349..28233d3fe 100644 --- a/x/participation/types/auction_used_allocations.pb.go +++ b/x/participation/types/auction_used_allocations.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/participation/types/events.pb.go b/x/participation/types/events.pb.go index 38773230e..2b8b223b4 100644 --- a/x/participation/types/events.pb.go +++ b/x/participation/types/events.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/participation/types/params.pb.go b/x/participation/types/params.pb.go index bab7657b5..887bcbcd6 100644 --- a/x/participation/types/params.pb.go +++ b/x/participation/types/params.pb.go @@ -5,12 +5,12 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/regen-network/cosmos-proto" - _ "google.golang.org/protobuf/types/known/durationpb" io "io" math "math" math_bits "math/bits" diff --git a/x/participation/types/query.pb.go b/x/participation/types/query.pb.go index 156d68826..e8e230bf7 100644 --- a/x/participation/types/query.pb.go +++ b/x/participation/types/query.pb.go @@ -6,12 +6,12 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/participation/types/query.pb.gw.go b/x/participation/types/query.pb.gw.go index f75c1b7c8..740bad402 100644 --- a/x/participation/types/query.pb.gw.go +++ b/x/participation/types/query.pb.gw.go @@ -749,19 +749,19 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_UsedAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "used_allocations", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_UsedAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "used_allocations", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_UsedAllocationsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "participation", "used_allocations"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_UsedAllocationsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "participation", "used_allocations"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AuctionUsedAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "participation", "auction_used_allocations", "address", "auctionID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AuctionUsedAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"tendermint", "spn", "participation", "auction_used_allocations", "address", "auctionID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AuctionUsedAllocationsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "auction_used_allocations", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AuctionUsedAllocationsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "auction_used_allocations", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TotalAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "total_allocations", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_TotalAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "total_allocations", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AvailableAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "available_allocations", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AvailableAllocations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "participation", "available_allocations", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "participation", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "participation", "params"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/participation/types/used_allocations.pb.go b/x/participation/types/used_allocations.pb.go index ac04f8fc9..b68969ffa 100644 --- a/x/participation/types/used_allocations.pb.go +++ b/x/participation/types/used_allocations.pb.go @@ -5,10 +5,10 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/profile/types/coordinator.pb.go b/x/profile/types/coordinator.pb.go index c2e4baf77..f00744d6d 100644 --- a/x/profile/types/coordinator.pb.go +++ b/x/profile/types/coordinator.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/profile/types/events.pb.go b/x/profile/types/events.pb.go index ed344866c..d06eebdcc 100644 --- a/x/profile/types/events.pb.go +++ b/x/profile/types/events.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/profile/types/query.pb.gw.go b/x/profile/types/query.pb.gw.go index 4959c627b..efdf923a3 100644 --- a/x/profile/types/query.pb.gw.go +++ b/x/profile/types/query.pb.gw.go @@ -630,17 +630,17 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Validator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "validator", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Validator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "validator", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ValidatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "profile", "validator"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ValidatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "profile", "validator"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ValidatorByOperatorAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "validator_by_operator_address", "operatorAddress"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ValidatorByOperatorAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "validator_by_operator_address", "operatorAddress"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Coordinator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "coordinator", "coordinatorID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Coordinator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "coordinator", "coordinatorID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_CoordinatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "profile", "coordinator"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_CoordinatorAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "profile", "coordinator"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_CoordinatorByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "coordinator_by_address", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_CoordinatorByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "profile", "coordinator_by_address", "address"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( diff --git a/x/profile/types/tx.pb.go b/x/profile/types/tx.pb.go index c7ce81c95..2a64b5fb8 100644 --- a/x/profile/types/tx.pb.go +++ b/x/profile/types/tx.pb.go @@ -6,10 +6,10 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/profile/types/validator.pb.go b/x/profile/types/validator.pb.go index ebc25e22c..cdf697364 100644 --- a/x/profile/types/validator.pb.go +++ b/x/profile/types/validator.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/regen-network/cosmos-proto" io "io" math "math" math_bits "math/bits" diff --git a/x/reward/types/query.pb.gw.go b/x/reward/types/query.pb.gw.go index af753271f..69d9a6377 100644 --- a/x/reward/types/query.pb.gw.go +++ b/x/reward/types/query.pb.gw.go @@ -321,11 +321,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_RewardPool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "reward", "reward_pool", "launchID"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_RewardPool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"tendermint", "spn", "reward", "reward_pool", "launchID"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_RewardPoolAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "reward", "reward_pool"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_RewardPoolAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "reward", "reward_pool"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "reward", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"tendermint", "spn", "reward", "params"}, "", runtime.AssumeColonVerbOpt(false))) ) var (