From 24224f7386e7ee56781e7d254f9a48fab60a3bed Mon Sep 17 00:00:00 2001 From: antstalepresh <36045227+antstalepresh@users.noreply.github.com> Date: Fri, 18 Nov 2022 15:13:28 -0500 Subject: [PATCH] Feature/airdrop (#359) --- go.mod | 51 +- go.sum | 109 ++- .../v1beta1 => stride/claim}/claim.proto | 2 +- .../v1beta1 => stride/claim}/genesis.proto | 6 +- .../v1beta1 => stride/claim}/params.proto | 2 +- .../v1beta1 => stride/claim}/query.proto | 38 +- .../{claim/v1beta1 => stride/claim}/tx.proto | 2 +- proto/{ => stride}/vesting/tx.proto | 2 +- proto/{ => stride}/vesting/vesting.proto | 3 +- x/claim/client/cli/query.go | 37 +- x/claim/keeper/claim.go | 27 +- x/claim/keeper/grpc_query.go | 23 + x/claim/types/claim.pb.go | 70 +- x/claim/types/genesis.pb.go | 54 +- x/claim/types/params.pb.go | 71 +- x/claim/types/query.pb.go | 639 +++++++++++++++--- x/claim/types/query.pb.gw.go | 113 +++- x/claim/types/tx.pb.go | 143 ++-- x/claim/vesting/types/tx.pb.go | 36 +- x/claim/vesting/types/vesting.pb.go | 140 ++-- x/claim/vesting/types/vesting_account_test.go | 2 +- 21 files changed, 1123 insertions(+), 447 deletions(-) rename proto/{claim/v1beta1 => stride/claim}/claim.proto (96%) rename proto/{claim/v1beta1 => stride/claim}/genesis.proto (86%) rename proto/{claim/v1beta1 => stride/claim}/params.proto (96%) rename proto/{claim/v1beta1 => stride/claim}/query.proto (75%) rename proto/{claim/v1beta1 => stride/claim}/tx.proto (97%) rename proto/{ => stride}/vesting/tx.proto (88%) rename proto/{ => stride}/vesting/vesting.proto (97%) diff --git a/go.mod b/go.mod index 7a9b61162f..a922ecf5c8 100644 --- a/go.mod +++ b/go.mod @@ -4,21 +4,21 @@ go 1.18 require ( github.com/cosmos/cosmos-proto v1.0.0-alpha7 - github.com/cosmos/cosmos-sdk v0.45.10 - github.com/cosmos/ibc-go/v3 v3.4.0 + github.com/cosmos/cosmos-sdk v0.45.9 + github.com/cosmos/ibc-go/v3 v3.3.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/spf13/cast v1.5.0 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 - github.com/tendermint/tendermint v0.34.23 + github.com/tendermint/tendermint v0.34.21 github.com/tendermint/tm-db v0.6.7 google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a google.golang.org/grpc v1.50.1 - google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 + google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -32,7 +32,6 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/btcsuite/btcd v0.22.1 // indirect - github.com/cenkalti/backoff/v4 v4.1.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect @@ -59,7 +58,7 @@ require ( github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/snappy v0.0.4 // indirect + github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/gorilla/handlers v1.5.1 // indirect @@ -72,53 +71,53 @@ require ( github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect - github.com/improbable-eng/grpc-web v0.15.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/improbable-eng/grpc-web v0.14.1 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect - github.com/klauspost/compress v1.15.11 // indirect + github.com/klauspost/compress v1.15.9 // indirect github.com/lib/pq v1.10.6 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect - github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect + github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.12.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.34.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/rakyll/statik v0.1.7 // indirect - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // 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/sasha-s/go-deadlock v0.3.1 // indirect + github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect github.com/spf13/afero v1.8.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.13.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/spf13/viper v1.12.0 // indirect + github.com/subosito/gotenv v1.4.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/zondax/hid v0.9.0 // indirect go.etcd.io/bbolt v1.3.6 // indirect - golang.org/x/crypto v0.1.0 // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/net v0.1.0 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/term v0.1.0 // indirect - golang.org/x/text v0.4.0 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect + golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect ) diff --git a/go.sum b/go.sum index 11210536ca..d9281a3d00 100644 --- a/go.sum +++ b/go.sum @@ -62,7 +62,7 @@ github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -133,8 +133,6 @@ github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46f github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ= -github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -174,8 +172,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v3 v3.4.0 h1:ha3cqEG36pqMWqA1D+kxDWBTZXpeFMd/aZIQF7I0xro= -github.com/cosmos/ibc-go/v3 v3.4.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= +github.com/cosmos/ibc-go/v3 v3.3.0 h1:r8gYUvQreMQrf4R5RgedK9gcbjLk4uE2q6fuZGjf4n0= +github.com/cosmos/ibc-go/v3 v3.3.0/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= @@ -212,7 +210,7 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= @@ -324,8 +322,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -341,7 +339,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= @@ -436,11 +434,10 @@ github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= -github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= +github.com/improbable-eng/grpc-web v0.14.1 h1:NrN4PY71A6tAz2sKDvC5JCauENWp0ykG8Oq1H3cpFvw= +github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= @@ -474,8 +471,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= -github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -504,18 +501,16 @@ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -523,9 +518,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -582,7 +576,7 @@ github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= -github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -603,8 +597,8 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= @@ -656,15 +650,14 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= +github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= @@ -688,8 +681,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= -github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= +github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -711,8 +704,8 @@ github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -721,8 +714,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= -github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= @@ -741,21 +734,21 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= +github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tendermint v0.34.23 h1:JZYsdc59aOiT5efou+BHILJv8x6FlRyvlor84Xq9Tb0= -github.com/tendermint/tendermint v0.34.23/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI= +github.com/tendermint/tendermint v0.34.21 h1:UiGGnBFHVrZhoQVQ7EfwSOLuCtarqCSsRf8VrklqB7s= +github.com/tendermint/tendermint v0.34.21/go.mod h1:XDvfg6U7grcFTDx7VkzxnhazQ/bspGJAn4DZ6DcLLjQ= github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= @@ -826,8 +819,8 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -866,7 +859,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -911,12 +903,12 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -998,33 +990,33 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1083,7 +1075,6 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1175,8 +1166,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 h1:KR8+MyP7/qOlV+8Af01LtjL04bu7on42eVsxT4EyBQk= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1186,8 +1177,8 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= diff --git a/proto/claim/v1beta1/claim.proto b/proto/stride/claim/claim.proto similarity index 96% rename from proto/claim/v1beta1/claim.proto rename to proto/stride/claim/claim.proto index 654903fe07..f10cdb706d 100644 --- a/proto/claim/v1beta1/claim.proto +++ b/proto/stride/claim/claim.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package Stridelabs.stride.claim.v1beta1; +package stride.claim; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/claim/v1beta1/genesis.proto b/proto/stride/claim/genesis.proto similarity index 86% rename from proto/claim/v1beta1/genesis.proto rename to proto/stride/claim/genesis.proto index 07cd2794af..b0f13ba5d4 100644 --- a/proto/claim/v1beta1/genesis.proto +++ b/proto/stride/claim/genesis.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package Stridelabs.stride.claim.v1beta1; +package stride.claim; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/genesis.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -import "claim/v1beta1/claim.proto"; -import "claim/v1beta1/params.proto"; +import "stride/claim/claim.proto"; +import "stride/claim/params.proto"; option go_package = "github.com/Stride-Labs/stride/v3/x/claim/types"; diff --git a/proto/claim/v1beta1/params.proto b/proto/stride/claim/params.proto similarity index 96% rename from proto/claim/v1beta1/params.proto rename to proto/stride/claim/params.proto index eeddc96c7e..2b9808ef08 100644 --- a/proto/claim/v1beta1/params.proto +++ b/proto/stride/claim/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package Stridelabs.stride.claim.v1beta1; +package stride.claim; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/claim/v1beta1/query.proto b/proto/stride/claim/query.proto similarity index 75% rename from proto/claim/v1beta1/query.proto rename to proto/stride/claim/query.proto index e171b807e1..ad961d74db 100644 --- a/proto/claim/v1beta1/query.proto +++ b/proto/stride/claim/query.proto @@ -1,11 +1,12 @@ syntax = "proto3"; -package Stridelabs.stride.claim.v1beta1; +package stride.claim; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "claim/v1beta1/claim.proto"; -import "claim/v1beta1/params.proto"; +import "stride/claim/claim.proto"; +import "stride/claim/params.proto"; +import "stride/vesting/vesting.proto"; option go_package = "github.com/Stride-Labs/stride/v3/x/claim/types"; @@ -14,24 +15,29 @@ service Query { rpc DistributorAccountBalance(QueryDistributorAccountBalanceRequest) returns (QueryDistributorAccountBalanceResponse) { option (google.api.http).get = - "/claim/v1beta1/module_account_balance"; + "/claim/module_account_balance"; } rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/claim/v1beta1/params"; + option (google.api.http).get = "/claim/params"; } rpc ClaimRecord(QueryClaimRecordRequest) returns (QueryClaimRecordResponse) { option (google.api.http).get = - "/claim/v1beta1/claim_record/{address}"; + "/claim/claim_record/{address}"; } rpc ClaimableForAction(QueryClaimableForActionRequest) returns (QueryClaimableForActionResponse) { option (google.api.http).get = - "/claim/v1beta1/claimable_for_action/{address}/{action}"; + "/claim/claimable_for_action/{address}/{action}"; } rpc TotalClaimable(QueryTotalClaimableRequest) returns (QueryTotalClaimableResponse) { option (google.api.http).get = - "/claim/v1beta1/total_claimable/{address}"; + "/claim/total_claimable/{address}"; + } + rpc UserVestings(QueryUserVestingsRequest) + returns (QueryUserVestingsResponse) { + option (google.api.http).get = + "/claim/user_vestings/{address}"; } } @@ -96,4 +102,20 @@ message QueryTotalClaimableResponse { (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; +} + +message QueryUserVestingsRequest { + string address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; +} + +message QueryUserVestingsResponse { + repeated cosmos.base.v1beta1.Coin spendable_coins = 3 [ + (gogoproto.moretags) = "yaml:\"spendable_coins\"", + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + repeated stride.vesting.Period periods = 1 [ + (gogoproto.moretags) = "yaml:\"periods\"", + (gogoproto.nullable) = false + ]; } \ No newline at end of file diff --git a/proto/claim/v1beta1/tx.proto b/proto/stride/claim/tx.proto similarity index 97% rename from proto/claim/v1beta1/tx.proto rename to proto/stride/claim/tx.proto index 7b48185c88..5a880f9981 100644 --- a/proto/claim/v1beta1/tx.proto +++ b/proto/stride/claim/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package Stridelabs.stride.claim.v1beta1; +package stride.claim; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/vesting/tx.proto b/proto/stride/vesting/tx.proto similarity index 88% rename from proto/vesting/tx.proto rename to proto/stride/vesting/tx.proto index 0d6516ed61..f3e0881197 100644 --- a/proto/vesting/tx.proto +++ b/proto/stride/vesting/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package Stridelabs.stride.vesting; +package stride.vesting; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/vesting/vesting.proto b/proto/stride/vesting/vesting.proto similarity index 97% rename from proto/vesting/vesting.proto rename to proto/stride/vesting/vesting.proto index 4c6ded87c6..4c62a20967 100644 --- a/proto/vesting/vesting.proto +++ b/proto/stride/vesting/vesting.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package Stridelabs.stride.vesting; +package stride.vesting; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; @@ -40,6 +40,7 @@ message Period { int64 length = 2; repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; + int32 action_type = 4; } // StridePeriodicVestingAccount implements the VestingAccount interface. It diff --git a/x/claim/client/cli/query.go b/x/claim/client/cli/query.go index 6a78d4577b..bca5f7a1ad 100644 --- a/x/claim/client/cli/query.go +++ b/x/claim/client/cli/query.go @@ -29,6 +29,7 @@ func GetQueryCmd(queryRoute string) *cobra.Command { GetCmdQueryClaimRecord(), GetCmdQueryClaimableForAction(), GetCmdQueryTotalClaimable(), + GetCmdQueryUserVestings(), ) return claimQueryCmd @@ -185,7 +186,7 @@ func GetCmdQueryTotalClaimable() *cobra.Command { Long: strings.TrimSpace( fmt.Sprintf(`Query the total claimable amount remaining for an account. Example: -$ %s query claim total-claimable stride1h4astdfzjhcwahtfrh24qtvndzzh49xvqtfftk +$ %s query claim total-claimable stride stride1h4astdfzjhcwahtfrh24qtvndzzh49xvqtfftk `, version.AppName, ), @@ -210,3 +211,37 @@ $ %s query claim total-claimable stride1h4astdfzjhcwahtfrh24qtvndzzh49xvqtfftk flags.AddQueryFlagsToCmd(cmd) return cmd } + +// GetCmdQueryUserVestings implements the query user vestings command. +func GetCmdQueryUserVestings() *cobra.Command { + cmd := &cobra.Command{ + Use: "user-vestings [address]", + Args: cobra.ExactArgs(1), + Short: "Query user vestings.", + Long: strings.TrimSpace( + fmt.Sprintf(`Query user vestings for an account. +Example: +$ %s query claim user-vestings stride1h4astdfzjhcwahtfrh24qtvndzzh49xvqtfftk +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + // Query store + res, err := queryClient.UserVestings(context.Background(), &types.QueryUserVestingsRequest{ + Address: args[0], + }) + if err != nil { + return err + } + return clientCtx.PrintObjectLegacy(res) + }, + } + flags.AddQueryFlagsToCmd(cmd) + return cmd +} diff --git a/x/claim/keeper/claim.go b/x/claim/keeper/claim.go index bc310affef..fc05f3e397 100644 --- a/x/claim/keeper/claim.go +++ b/x/claim/keeper/claim.go @@ -388,6 +388,17 @@ func (k Keeper) GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress return claimableCoins, nil } +// GetUserVestings returns all vestings associated to the user account +func (k Keeper) GetUserVestings(ctx sdk.Context, addr sdk.AccAddress) (vestingtypes.Periods, sdk.Coins) { + acc := k.accountKeeper.GetAccount(ctx, addr) + strideVestingAcc, isStrideVestingAccount := acc.(*vestingtypes.StridePeriodicVestingAccount) + if !isStrideVestingAccount { + return vestingtypes.Periods{}, sdk.Coins{} + } else { + return strideVestingAcc.VestingPeriods, strideVestingAcc.GetVestedCoins(ctx.BlockTime()) + } +} + // GetClaimable returns claimable amount for a specific action done by an address func (k Keeper) GetUserTotalClaimable(ctx sdk.Context, addr sdk.AccAddress, airdropIdentifier string) (sdk.Coins, error) { claimRecord, err := k.GetClaimRecord(ctx, addr, airdropIdentifier) @@ -459,7 +470,7 @@ func (k Keeper) ClaimCoinsForAction(ctx sdk.Context, addr sdk.AccAddress, action } // Claims don't vest if action type is ActionFree or initial period of vesting is passed - if action != types.ActionFree && !isPassed { + if !isPassed { acc = k.accountKeeper.GetAccount(ctx, addr) strideVestingAcc, isStrideVestingAccount := acc.(*vestingtypes.StridePeriodicVestingAccount) // Check if vesting tokens already exist for this account. @@ -472,18 +483,20 @@ func (k Keeper) ClaimCoinsForAction(ctx sdk.Context, addr sdk.AccAddress, action periodLength := GetAirdropDurationForAction(action) vestingAcc := vestingtypes.NewStridePeriodicVestingAccount(baseAccount.(*authtypes.BaseAccount), claimableAmount, []vestingtypes.Period{{ - StartTime: ctx.BlockTime().Unix(), - Length: periodLength, - Amount: claimableAmount, + StartTime: ctx.BlockTime().Unix(), + Length: periodLength, + Amount: claimableAmount, + ActionType: int32(action), }}) k.accountKeeper.SetAccount(ctx, vestingAcc) } else { // Grant a new vesting to the existing stride vesting account periodLength := GetAirdropDurationForAction(action) strideVestingAcc.AddNewGrant(vestingtypes.Period{ - StartTime: ctx.BlockTime().Unix(), - Length: periodLength, - Amount: claimableAmount, + StartTime: ctx.BlockTime().Unix(), + Length: periodLength, + Amount: claimableAmount, + ActionType: int32(action), }) k.accountKeeper.SetAccount(ctx, strideVestingAcc) } diff --git a/x/claim/keeper/grpc_query.go b/x/claim/keeper/grpc_query.go index ce1dcbdf34..e16b53aca7 100644 --- a/x/claim/keeper/grpc_query.go +++ b/x/claim/keeper/grpc_query.go @@ -96,3 +96,26 @@ func (k Keeper) TotalClaimable( Coins: coins, }, err } + +// UserVestings returns all vestings for user +func (k Keeper) UserVestings( + goCtx context.Context, + req *types.QueryUserVestingsRequest, +) (*types.QueryUserVestingsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + addr, err := sdk.AccAddressFromBech32(req.Address) + if err != nil { + return nil, err + } + + vestings, spendableCoins := k.GetUserVestings(ctx, addr) + + return &types.QueryUserVestingsResponse{ + SpendableCoins: spendableCoins, + Periods: vestings, + }, err +} diff --git a/x/claim/types/claim.pb.go b/x/claim/types/claim.pb.go index 143bcf6d00..94217690d0 100644 --- a/x/claim/types/claim.pb.go +++ b/x/claim/types/claim.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: claim/v1beta1/claim.proto +// source: stride/claim/claim.proto package types @@ -51,7 +51,7 @@ func (x Action) String() string { } func (Action) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_14c07c0e7ea7a052, []int{0} + return fileDescriptor_b4747d999b9dc0da, []int{0} } // A Claim Records is the metadata of claim data per address @@ -71,7 +71,7 @@ func (m *ClaimRecord) Reset() { *m = ClaimRecord{} } func (m *ClaimRecord) String() string { return proto.CompactTextString(m) } func (*ClaimRecord) ProtoMessage() {} func (*ClaimRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_14c07c0e7ea7a052, []int{0} + return fileDescriptor_b4747d999b9dc0da, []int{0} } func (m *ClaimRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,41 +122,41 @@ func (m *ClaimRecord) GetActionCompleted() []bool { } func init() { - proto.RegisterEnum("Stridelabs.stride.claim.v1beta1.Action", Action_name, Action_value) - proto.RegisterType((*ClaimRecord)(nil), "Stridelabs.stride.claim.v1beta1.ClaimRecord") + proto.RegisterEnum("stride.claim.Action", Action_name, Action_value) + proto.RegisterType((*ClaimRecord)(nil), "stride.claim.ClaimRecord") } -func init() { proto.RegisterFile("claim/v1beta1/claim.proto", fileDescriptor_14c07c0e7ea7a052) } +func init() { proto.RegisterFile("stride/claim/claim.proto", fileDescriptor_b4747d999b9dc0da) } -var fileDescriptor_14c07c0e7ea7a052 = []byte{ - // 421 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xc1, 0x6e, 0xd4, 0x30, - 0x10, 0x86, 0x93, 0x6d, 0xb5, 0x80, 0x11, 0x65, 0x6b, 0x40, 0x4d, 0x17, 0xe1, 0x94, 0x1c, 0x50, - 0x05, 0x34, 0x56, 0xc5, 0x8d, 0x0b, 0x62, 0x5b, 0x2a, 0x21, 0xad, 0x38, 0xa4, 0x07, 0x24, 0x2e, - 0x95, 0x13, 0x0f, 0xa9, 0xb5, 0x49, 0x1c, 0x6c, 0x17, 0xe8, 0x1b, 0x70, 0xe4, 0x1d, 0xb8, 0xf1, - 0x24, 0x3d, 0xf6, 0x88, 0x38, 0x44, 0x68, 0xf7, 0x0d, 0xf2, 0x04, 0xa8, 0x99, 0xec, 0x82, 0xe0, - 0x94, 0x99, 0xff, 0xff, 0xf2, 0xdb, 0x23, 0x0f, 0xd9, 0xce, 0x0a, 0xa1, 0x4a, 0xfe, 0x71, 0x3f, - 0x05, 0x27, 0xf6, 0x79, 0xd7, 0xc5, 0xb5, 0xd1, 0x4e, 0xd3, 0xf0, 0xd8, 0x19, 0x25, 0xa1, 0x10, - 0xa9, 0x8d, 0x6d, 0x57, 0xc6, 0x68, 0xf7, 0xf0, 0xf8, 0x6e, 0xae, 0x73, 0xdd, 0xb1, 0xfc, 0xaa, - 0xc2, 0xdf, 0xc6, 0x2c, 0xd3, 0xb6, 0xd4, 0x96, 0xa7, 0xc2, 0xc2, 0x9f, 0x5c, 0xad, 0xaa, 0xde, - 0x7f, 0xb8, 0xf2, 0xab, 0xd9, 0xca, 0xcf, 0xa1, 0x02, 0xab, 0x2c, 0x22, 0xd1, 0xf7, 0x01, 0xb9, - 0x79, 0x70, 0x75, 0x54, 0x02, 0x99, 0x36, 0x92, 0x4e, 0x09, 0x15, 0xca, 0x48, 0xa3, 0xeb, 0x13, - 0x25, 0xa1, 0x72, 0xea, 0xbd, 0x02, 0x13, 0xf8, 0x3b, 0xfe, 0xee, 0x8d, 0xc9, 0x83, 0xb6, 0x09, - 0xb7, 0xcf, 0x45, 0x59, 0x3c, 0x8f, 0xfe, 0x67, 0xa2, 0x64, 0xb3, 0x17, 0x5f, 0xaf, 0x34, 0xfa, - 0x94, 0x5c, 0x13, 0x52, 0x1a, 0xb0, 0x36, 0x18, 0x74, 0x11, 0xb4, 0x6d, 0xc2, 0x8d, 0x3e, 0x02, - 0x8d, 0x28, 0x59, 0x22, 0xf4, 0x2d, 0x19, 0x7e, 0x02, 0x95, 0x9f, 0xba, 0x60, 0xad, 0x83, 0x5f, - 0x5c, 0x34, 0xa1, 0xf7, 0xb3, 0x09, 0x1f, 0xe5, 0xca, 0x9d, 0x9e, 0xa5, 0x71, 0xa6, 0x4b, 0xde, - 0x4f, 0x84, 0x9f, 0x3d, 0x2b, 0x67, 0xdc, 0x9d, 0xd7, 0x60, 0xe3, 0x43, 0xc8, 0xda, 0x26, 0xbc, - 0x85, 0xd1, 0x98, 0x12, 0x25, 0x7d, 0x1c, 0x3d, 0x22, 0x23, 0x91, 0x39, 0xa5, 0xab, 0x93, 0x4c, - 0x97, 0x75, 0x01, 0x0e, 0x64, 0xb0, 0xbe, 0xb3, 0xb6, 0x7b, 0x7d, 0x72, 0xbf, 0x6d, 0xc2, 0xad, - 0xfe, 0x3e, 0xff, 0x10, 0x51, 0x72, 0x1b, 0xa5, 0x83, 0xa5, 0xf2, 0xf8, 0x0d, 0x19, 0xbe, 0xec, - 0x24, 0xba, 0x41, 0x08, 0x56, 0x47, 0x06, 0x60, 0xe4, 0xd1, 0x7b, 0x64, 0x13, 0xfb, 0xa9, 0xfa, - 0x70, 0xa6, 0xe4, 0xb1, 0x13, 0x33, 0x18, 0xf9, 0x74, 0x8b, 0xdc, 0x41, 0xf9, 0x10, 0x0a, 0xc8, - 0x85, 0x03, 0x34, 0x06, 0xe3, 0xf5, 0x2f, 0xdf, 0x98, 0x37, 0x79, 0x75, 0x31, 0x67, 0xfe, 0xe5, - 0x9c, 0xf9, 0xbf, 0xe6, 0xcc, 0xff, 0xba, 0x60, 0xde, 0xe5, 0x82, 0x79, 0x3f, 0x16, 0xcc, 0x7b, - 0xf7, 0xe4, 0xaf, 0x91, 0x71, 0x37, 0xf6, 0xa6, 0x22, 0xb5, 0x1c, 0x97, 0x83, 0x7f, 0xc6, 0xed, - 0xc1, 0xd9, 0xd3, 0x61, 0xf7, 0x94, 0xcf, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x35, 0x29, 0xfd, - 0x51, 0x61, 0x02, 0x00, 0x00, +var fileDescriptor_b4747d999b9dc0da = []byte{ + // 417 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xc1, 0x6a, 0x14, 0x31, + 0x18, 0xc7, 0x67, 0xb6, 0x65, 0xd5, 0xa8, 0x75, 0x1b, 0x95, 0x8e, 0x2b, 0x66, 0xea, 0x1c, 0xa4, + 0x88, 0x9d, 0x50, 0x7a, 0xf3, 0x22, 0x6e, 0x4b, 0x51, 0x58, 0x3c, 0x4c, 0x0f, 0x82, 0x97, 0x92, + 0x49, 0x3e, 0xa7, 0x61, 0x77, 0x26, 0x6b, 0x92, 0x56, 0xfb, 0x06, 0x1e, 0x7d, 0x07, 0x6f, 0x3e, + 0x49, 0x8f, 0x3d, 0x8a, 0x87, 0x41, 0x76, 0xdf, 0x60, 0x9e, 0x40, 0x9a, 0x64, 0x17, 0xd1, 0x4b, + 0xf2, 0xe5, 0xff, 0xfb, 0xf3, 0x4f, 0x3e, 0xf2, 0xa1, 0xc4, 0x58, 0x2d, 0x05, 0x50, 0x3e, 0x65, + 0xb2, 0xf6, 0x6b, 0x3e, 0xd3, 0xca, 0x2a, 0x7c, 0xc7, 0x93, 0xdc, 0x69, 0xc3, 0x07, 0x95, 0xaa, + 0x94, 0x03, 0xf4, 0xba, 0xf2, 0x9e, 0x21, 0xe1, 0xca, 0xd4, 0xca, 0xd0, 0x92, 0x19, 0xa0, 0xe7, + 0x7b, 0x25, 0x58, 0xb6, 0x47, 0xb9, 0x92, 0x4d, 0xe0, 0x4f, 0x57, 0xbc, 0x99, 0xac, 0x78, 0x05, + 0x0d, 0x18, 0x69, 0xbc, 0x25, 0xfb, 0xd1, 0x43, 0xb7, 0x0f, 0xae, 0xaf, 0x28, 0x80, 0x2b, 0x2d, + 0xf0, 0x18, 0x61, 0x26, 0xb5, 0xd0, 0x6a, 0x76, 0x22, 0x05, 0x34, 0x56, 0x7e, 0x94, 0xa0, 0x93, + 0x78, 0x3b, 0xde, 0xb9, 0x35, 0x7a, 0xd2, 0xb5, 0xe9, 0xa3, 0x0b, 0x56, 0x4f, 0x5f, 0x66, 0xff, + 0x7b, 0xb2, 0x62, 0x33, 0x88, 0x6f, 0x57, 0x1a, 0x7e, 0x81, 0x6e, 0x30, 0x21, 0x34, 0x18, 0x93, + 0xf4, 0x5c, 0x04, 0xee, 0xda, 0x74, 0x23, 0x44, 0x78, 0x90, 0x15, 0x4b, 0x0b, 0x7e, 0x8f, 0xfa, + 0x9f, 0x41, 0x56, 0xa7, 0x36, 0x59, 0x73, 0xe6, 0x57, 0x97, 0x6d, 0x1a, 0xfd, 0x6a, 0xd3, 0x67, + 0x95, 0xb4, 0xa7, 0x67, 0x65, 0xce, 0x55, 0x4d, 0x43, 0x47, 0x7e, 0xdb, 0x35, 0x62, 0x42, 0xed, + 0xc5, 0x0c, 0x4c, 0x7e, 0x08, 0xbc, 0x6b, 0xd3, 0xbb, 0x3e, 0xda, 0xa7, 0x64, 0x45, 0x88, 0xc3, + 0x47, 0x68, 0xc0, 0xb8, 0x95, 0xaa, 0x39, 0xe1, 0xaa, 0x9e, 0x4d, 0xc1, 0x82, 0x48, 0xd6, 0xb7, + 0xd7, 0x76, 0x6e, 0x8e, 0x1e, 0x77, 0x6d, 0xba, 0x15, 0xde, 0xf3, 0x8f, 0x23, 0x2b, 0xee, 0x79, + 0xe9, 0x60, 0xa9, 0x3c, 0x7f, 0x87, 0xfa, 0xaf, 0x9d, 0x84, 0x37, 0x10, 0xf2, 0xd5, 0x91, 0x06, + 0x18, 0x44, 0xf8, 0x21, 0xda, 0xf4, 0xe7, 0xb1, 0xfc, 0x74, 0x26, 0xc5, 0xb1, 0x65, 0x13, 0x18, + 0xc4, 0x78, 0x0b, 0xdd, 0xf7, 0xf2, 0x21, 0x4c, 0xa1, 0x62, 0x16, 0x3c, 0xe8, 0x0d, 0xd7, 0xbf, + 0x7e, 0x27, 0xd1, 0xe8, 0xcd, 0xe5, 0x9c, 0xc4, 0x57, 0x73, 0x12, 0xff, 0x9e, 0x93, 0xf8, 0xdb, + 0x82, 0x44, 0x57, 0x0b, 0x12, 0xfd, 0x5c, 0x90, 0xe8, 0x43, 0xfe, 0x57, 0xcb, 0xc7, 0x6e, 0x10, + 0x76, 0xc7, 0xac, 0x34, 0x34, 0x8c, 0xcb, 0xf9, 0x3e, 0xfd, 0x12, 0x66, 0xc6, 0xb5, 0x5f, 0xf6, + 0xdd, 0x6f, 0xee, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x3b, 0x56, 0xf7, 0x50, 0x02, 0x00, + 0x00, } func (m *ClaimRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/genesis.pb.go b/x/claim/types/genesis.pb.go index 8bcdc11486..4fa685058e 100644 --- a/x/claim/types/genesis.pb.go +++ b/x/claim/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: claim/v1beta1/genesis.proto +// source: stride/claim/genesis.proto package types @@ -39,7 +39,7 @@ func (m *GenesisState) Reset() { *m = GenesisState{} } func (m *GenesisState) String() string { return proto.CompactTextString(m) } func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_cf4a9b016e59a7d2, []int{0} + return fileDescriptor_ecf5648202726596, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,34 +83,34 @@ func (m *GenesisState) GetClaimRecords() []ClaimRecord { } func init() { - proto.RegisterType((*GenesisState)(nil), "Stridelabs.stride.claim.v1beta1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "stride.claim.GenesisState") } -func init() { proto.RegisterFile("claim/v1beta1/genesis.proto", fileDescriptor_cf4a9b016e59a7d2) } +func init() { proto.RegisterFile("stride/claim/genesis.proto", fileDescriptor_ecf5648202726596) } -var fileDescriptor_cf4a9b016e59a7d2 = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4f, 0x02, 0x31, - 0x18, 0x86, 0xef, 0x34, 0x61, 0x38, 0x60, 0x21, 0x98, 0xe0, 0x69, 0x7a, 0x78, 0x8b, 0x24, 0x6a, - 0x1b, 0x70, 0x73, 0xc4, 0x18, 0x17, 0x07, 0x03, 0x89, 0x83, 0x8b, 0x69, 0x8f, 0x7a, 0x36, 0x5e, - 0xf9, 0x2e, 0xd7, 0x62, 0xe4, 0x5f, 0xf8, 0xb3, 0x18, 0xd9, 0x74, 0x22, 0x06, 0xfe, 0x81, 0xbf, - 0xc0, 0xd0, 0x56, 0xcc, 0x19, 0x13, 0xb6, 0x7e, 0x79, 0x9f, 0xef, 0x7d, 0xbf, 0xbe, 0xc1, 0x41, - 0x92, 0x51, 0x21, 0xc9, 0x4b, 0x97, 0x71, 0x4d, 0xbb, 0x24, 0xe5, 0x63, 0xae, 0x84, 0xc2, 0x79, - 0x01, 0x1a, 0x1a, 0xd1, 0x50, 0x17, 0x62, 0xc4, 0x33, 0xca, 0x14, 0x56, 0xe6, 0x89, 0x0d, 0x8e, - 0x1d, 0x1e, 0x36, 0x53, 0x48, 0xc1, 0xb0, 0x64, 0xfd, 0xb2, 0x6b, 0x21, 0x4a, 0x40, 0x49, 0x50, - 0x84, 0x51, 0xc5, 0x37, 0xce, 0x09, 0x88, 0xb1, 0xd3, 0x8f, 0x36, 0xfa, 0xf8, 0xf9, 0xff, 0xe4, - 0x10, 0xa5, 0x00, 0x69, 0xc6, 0x89, 0x99, 0xd8, 0xe4, 0x91, 0x8c, 0x26, 0x05, 0xd5, 0x02, 0x7e, - 0x2c, 0xa2, 0xbf, 0xba, 0x16, 0x92, 0x2b, 0x4d, 0x65, 0xee, 0x80, 0xfd, 0xf2, 0xbf, 0xec, 0xd9, - 0x56, 0x0a, 0xcb, 0x52, 0x4e, 0x0b, 0x2a, 0x5d, 0x6e, 0xfc, 0xee, 0x07, 0xb5, 0x6b, 0x7b, 0xc9, - 0x50, 0x53, 0xcd, 0x1b, 0x77, 0x41, 0xc5, 0x02, 0x2d, 0xbf, 0xed, 0x77, 0xaa, 0xbd, 0x63, 0xbc, - 0xa5, 0x13, 0x7c, 0x6b, 0xf0, 0xfe, 0xde, 0x6c, 0x11, 0x79, 0x5f, 0x8b, 0xa8, 0x3e, 0xa5, 0x32, - 0xbb, 0x88, 0xad, 0x49, 0x3c, 0x70, 0x6e, 0x0d, 0x08, 0xea, 0x66, 0xed, 0xa1, 0xe0, 0x09, 0x14, - 0x23, 0xd5, 0xda, 0x69, 0xef, 0x76, 0xaa, 0xbd, 0xd3, 0xad, 0xf6, 0x97, 0xeb, 0x69, 0x60, 0x96, - 0xfa, 0x87, 0x2e, 0xa3, 0x69, 0x33, 0x4a, 0x86, 0xf1, 0xa0, 0x96, 0xfc, 0xa2, 0xaa, 0x7f, 0x35, - 0x5b, 0x22, 0x7f, 0xbe, 0x44, 0xfe, 0xe7, 0x12, 0xf9, 0x6f, 0x2b, 0xe4, 0xcd, 0x57, 0xc8, 0xfb, - 0x58, 0x21, 0xef, 0xfe, 0x24, 0x15, 0xfa, 0x69, 0xc2, 0x70, 0x02, 0x92, 0xd8, 0xf4, 0xb3, 0x1b, - 0xca, 0x14, 0xb1, 0xf1, 0xe4, 0xd5, 0x96, 0x47, 0xf4, 0x34, 0xe7, 0x8a, 0x55, 0x4c, 0x4f, 0xe7, - 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x7d, 0x87, 0x40, 0x38, 0x02, 0x00, 0x00, +var fileDescriptor_ecf5648202726596 = []byte{ + // 326 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x31, 0x4f, 0x02, 0x31, + 0x14, 0xc7, 0xef, 0x34, 0x61, 0x38, 0x60, 0x21, 0x98, 0xc0, 0xc5, 0x14, 0xbc, 0x89, 0xc5, 0x6b, + 0x80, 0xcd, 0x11, 0x06, 0x1d, 0x1c, 0x0c, 0x6c, 0xc6, 0xc4, 0xf4, 0x4a, 0xad, 0x8d, 0x94, 0x77, + 0x69, 0x0b, 0x91, 0x6f, 0xe1, 0x57, 0xf1, 0x5b, 0x30, 0x32, 0x3a, 0x11, 0xc3, 0x7d, 0x03, 0x3f, + 0x81, 0xa1, 0xad, 0xe8, 0xb9, 0xbc, 0xdc, 0xe5, 0xf7, 0x7b, 0xff, 0xd7, 0xf7, 0xa2, 0x58, 0x1b, + 0x25, 0x66, 0x0c, 0xd3, 0x39, 0x11, 0x12, 0x73, 0xb6, 0x60, 0x5a, 0xe8, 0x34, 0x57, 0x60, 0xa0, + 0x51, 0x73, 0x2c, 0xb5, 0x2c, 0x6e, 0x72, 0xe0, 0x60, 0x01, 0x3e, 0x7c, 0x39, 0x27, 0x46, 0x14, + 0xb4, 0x04, 0x8d, 0x33, 0xa2, 0x19, 0x5e, 0xf5, 0x33, 0x66, 0x48, 0x1f, 0x53, 0x10, 0x0b, 0xcf, + 0x2f, 0x8e, 0x7c, 0xf1, 0x72, 0xe4, 0xa5, 0x31, 0x31, 0xe2, 0x00, 0x7c, 0xce, 0xb0, 0xfd, 0xcb, + 0x96, 0x4f, 0x78, 0xb6, 0x54, 0xc4, 0x08, 0xf8, 0x89, 0xe8, 0xfc, 0xe7, 0x46, 0x48, 0xa6, 0x0d, + 0x91, 0xb9, 0x17, 0x5a, 0xa5, 0x1d, 0x6c, 0xf5, 0xa4, 0x5d, 0x22, 0x39, 0x51, 0x44, 0xfa, 0xa9, + 0xc9, 0x7b, 0x18, 0xd5, 0xae, 0xdd, 0x3b, 0xa6, 0x86, 0x18, 0xd6, 0x18, 0x47, 0x15, 0x27, 0xb4, + 0xc2, 0x6e, 0xd8, 0xab, 0x0e, 0x9a, 0xe9, 0xdf, 0xf5, 0xd3, 0x3b, 0xcb, 0x46, 0x67, 0x9b, 0x5d, + 0x27, 0xf8, 0xda, 0x75, 0xea, 0x6b, 0x22, 0xe7, 0x57, 0x89, 0xeb, 0x48, 0x26, 0xbe, 0xb5, 0xf1, + 0x10, 0xd5, 0xad, 0xfe, 0xa8, 0x18, 0x05, 0x35, 0xd3, 0xad, 0x93, 0xee, 0x69, 0xaf, 0x3a, 0x68, + 0x97, 0xb3, 0xc6, 0x87, 0x3a, 0xb1, 0xc6, 0xe8, 0xdc, 0x07, 0x36, 0x5d, 0x60, 0xa9, 0x3b, 0x99, + 0xd4, 0xe8, 0xaf, 0xaa, 0x47, 0x37, 0x9b, 0x3d, 0x0a, 0xb7, 0x7b, 0x14, 0x7e, 0xee, 0x51, 0xf8, + 0x56, 0xa0, 0x60, 0x5b, 0xa0, 0xe0, 0xa3, 0x40, 0xc1, 0x7d, 0xca, 0x85, 0x79, 0x5e, 0x66, 0x29, + 0x05, 0x89, 0xa7, 0x76, 0xd4, 0xe5, 0x2d, 0xc9, 0x34, 0xf6, 0xfb, 0xaf, 0x86, 0xf8, 0xd5, 0x1f, + 0xc1, 0xac, 0x73, 0xa6, 0xb3, 0x8a, 0x3d, 0xc2, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xfd, + 0x29, 0x69, 0xff, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/params.pb.go b/x/claim/types/params.pb.go index 2beecda310..24e645de58 100644 --- a/x/claim/types/params.pb.go +++ b/x/claim/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: claim/v1beta1/params.proto +// source: stride/claim/params.proto package types @@ -37,7 +37,7 @@ func (m *Params) Reset() { *m = Params{} } func (m *Params) String() string { return proto.CompactTextString(m) } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_9d53416573264e2f, []int{0} + return fileDescriptor_dd7ac871d3875dc3, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -89,7 +89,7 @@ func (m *Airdrop) Reset() { *m = Airdrop{} } func (m *Airdrop) String() string { return proto.CompactTextString(m) } func (*Airdrop) ProtoMessage() {} func (*Airdrop) Descriptor() ([]byte, []int) { - return fileDescriptor_9d53416573264e2f, []int{1} + return fileDescriptor_dd7ac871d3875dc3, []int{1} } func (m *Airdrop) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -154,42 +154,41 @@ func (m *Airdrop) GetDistributorAddress() string { } func init() { - proto.RegisterType((*Params)(nil), "Stridelabs.stride.claim.v1beta1.Params") - proto.RegisterType((*Airdrop)(nil), "Stridelabs.stride.claim.v1beta1.Airdrop") + proto.RegisterType((*Params)(nil), "stride.claim.Params") + proto.RegisterType((*Airdrop)(nil), "stride.claim.Airdrop") } -func init() { proto.RegisterFile("claim/v1beta1/params.proto", fileDescriptor_9d53416573264e2f) } +func init() { proto.RegisterFile("stride/claim/params.proto", fileDescriptor_dd7ac871d3875dc3) } -var fileDescriptor_9d53416573264e2f = []byte{ - // 434 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3f, 0x6f, 0x13, 0x31, - 0x14, 0x8f, 0x09, 0x14, 0x70, 0x06, 0xc0, 0x20, 0x71, 0x3d, 0x89, 0xbb, 0xe8, 0x24, 0xa4, 0x48, - 0x80, 0xad, 0x96, 0x8d, 0x2d, 0x51, 0x18, 0x90, 0x2a, 0x84, 0x52, 0x26, 0x96, 0x93, 0xaf, 0x76, - 0x0f, 0x4b, 0x71, 0x7c, 0xb2, 0x1d, 0x44, 0x3e, 0x01, 0x6b, 0x47, 0x3e, 0x00, 0x1f, 0xa6, 0x63, - 0x47, 0xa6, 0x03, 0x25, 0x1b, 0x63, 0x3f, 0x01, 0xf2, 0x9f, 0x6b, 0x21, 0x19, 0xba, 0xf9, 0x7e, - 0x7f, 0xde, 0x7b, 0xbf, 0xf7, 0x0e, 0xa6, 0x27, 0x73, 0x2a, 0x24, 0xf9, 0x72, 0x50, 0x71, 0x4b, - 0x0f, 0x48, 0x43, 0x35, 0x95, 0x06, 0x37, 0x5a, 0x59, 0x85, 0xf2, 0x63, 0xab, 0x05, 0xe3, 0x73, - 0x5a, 0x19, 0x6c, 0xfc, 0x13, 0x7b, 0x35, 0x8e, 0xea, 0xf4, 0x49, 0xad, 0x6a, 0xe5, 0xb5, 0xc4, - 0xbd, 0x82, 0x2d, 0xcd, 0x6a, 0xa5, 0xea, 0x39, 0x27, 0xfe, 0xab, 0x5a, 0x9e, 0x12, 0xb6, 0xd4, - 0xd4, 0x0a, 0xb5, 0x88, 0x7c, 0xbe, 0xcd, 0x5b, 0x21, 0xb9, 0xb1, 0x54, 0x36, 0x41, 0x50, 0xbc, - 0x87, 0x7b, 0x1f, 0xfc, 0x1c, 0x68, 0x0a, 0xef, 0x51, 0xa1, 0x99, 0x56, 0x8d, 0x49, 0xc0, 0xb0, - 0x3f, 0x1a, 0x1c, 0x8e, 0xf0, 0x0d, 0x43, 0xe1, 0x71, 0x30, 0xcc, 0xae, 0x9c, 0xc5, 0x8f, 0x3e, - 0xbc, 0x1b, 0x51, 0x74, 0x04, 0x51, 0xc4, 0x4b, 0xc1, 0xf8, 0xc2, 0x8a, 0x53, 0xc1, 0x75, 0x02, - 0x86, 0x60, 0x74, 0x7f, 0xf2, 0xec, 0xb2, 0xcd, 0xf7, 0x57, 0x54, 0xce, 0xdf, 0x14, 0xbb, 0x9a, - 0x62, 0xf6, 0x28, 0x82, 0xef, 0xae, 0x30, 0xa4, 0xae, 0xab, 0x19, 0x4b, 0xb5, 0x2d, 0x5d, 0x94, - 0xe4, 0xd6, 0x10, 0x8c, 0x06, 0x87, 0x29, 0x0e, 0x39, 0x71, 0x97, 0x13, 0x7f, 0xec, 0x72, 0x4e, - 0x9e, 0x9f, 0xb7, 0x79, 0x6f, 0xb7, 0xdb, 0x75, 0x8d, 0xe2, 0xec, 0x57, 0x0e, 0x66, 0x0f, 0x23, - 0x71, 0xec, 0x70, 0xe7, 0x46, 0xdf, 0x00, 0xec, 0xc0, 0xb2, 0x5b, 0x6b, 0xd2, 0xf7, 0xfd, 0xf6, - 0x77, 0xfa, 0x4d, 0xa3, 0x60, 0x32, 0x76, 0xed, 0xfe, 0xb4, 0x79, 0xba, 0x6d, 0x7d, 0xa9, 0xa4, - 0xb0, 0x5c, 0x36, 0x76, 0x75, 0xd9, 0xe6, 0x4f, 0xff, 0x1f, 0xa6, 0xd3, 0x14, 0xdf, 0xdd, 0x28, - 0x0f, 0x22, 0xdc, 0xd5, 0x44, 0x39, 0x1c, 0xf8, 0xbd, 0x97, 0x8c, 0x2f, 0x94, 0x4c, 0x6e, 0xbb, - 0x0d, 0xce, 0xa0, 0x87, 0xa6, 0x0e, 0x41, 0x04, 0x3e, 0x66, 0xc2, 0x5d, 0xa8, 0x5a, 0x5a, 0xa5, - 0x4b, 0xca, 0x98, 0xe6, 0xc6, 0x24, 0x77, 0xbc, 0x10, 0xfd, 0x43, 0x8d, 0x03, 0x33, 0x79, 0x7b, - 0xbe, 0xce, 0xc0, 0xc5, 0x3a, 0x03, 0xbf, 0xd7, 0x19, 0x38, 0xdb, 0x64, 0xbd, 0x8b, 0x4d, 0xd6, - 0xfb, 0xb9, 0xc9, 0x7a, 0x9f, 0x5e, 0xd4, 0xc2, 0x7e, 0x5e, 0x56, 0xf8, 0x44, 0x49, 0x12, 0xce, - 0xff, 0xea, 0x88, 0x56, 0x86, 0x84, 0xfb, 0x93, 0xaf, 0x24, 0xfc, 0xc4, 0x76, 0xd5, 0x70, 0x53, - 0xed, 0xf9, 0xfc, 0xaf, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x12, 0xc4, 0x7d, 0xda, 0x02, - 0x00, 0x00, +var fileDescriptor_dd7ac871d3875dc3 = []byte{ + // 424 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xb1, 0x6e, 0xd4, 0x30, + 0x18, 0xc7, 0xcf, 0x1c, 0x14, 0xf0, 0x21, 0x01, 0x06, 0x44, 0xee, 0x24, 0x92, 0x53, 0x24, 0xa4, + 0x1b, 0xc0, 0x16, 0xed, 0x06, 0xd3, 0x45, 0x1d, 0x40, 0xea, 0x80, 0x52, 0x26, 0x96, 0xc8, 0xa9, + 0xdd, 0x60, 0xe9, 0x7c, 0x8e, 0x6c, 0x07, 0x71, 0x4f, 0xc0, 0xda, 0x91, 0x07, 0xe0, 0x61, 0x3a, + 0x76, 0x64, 0x0a, 0xe8, 0x6e, 0x63, 0xec, 0x13, 0x20, 0x3b, 0x4e, 0x5b, 0xee, 0xb6, 0xe4, 0xff, + 0xfb, 0xfb, 0xfb, 0x7f, 0xdf, 0x67, 0xc3, 0xb1, 0xb1, 0x5a, 0x30, 0x4e, 0x4e, 0x16, 0x54, 0x48, + 0x52, 0x53, 0x4d, 0xa5, 0xc1, 0xb5, 0x56, 0x56, 0xa1, 0x07, 0x1d, 0xc2, 0x1e, 0x4d, 0x9e, 0x56, + 0xaa, 0x52, 0x1e, 0x10, 0xf7, 0xd5, 0x79, 0x26, 0x71, 0xa5, 0x54, 0xb5, 0xe0, 0xc4, 0xff, 0x95, + 0xcd, 0x29, 0x61, 0x8d, 0xa6, 0x56, 0xa8, 0x65, 0xe0, 0xc9, 0x36, 0xb7, 0x42, 0x72, 0x63, 0xa9, + 0xac, 0x3b, 0x43, 0xfa, 0x0e, 0xee, 0x7d, 0xf4, 0xa1, 0xe8, 0x0d, 0xbc, 0x47, 0x85, 0x66, 0x5a, + 0xd5, 0x26, 0x02, 0xd3, 0xe1, 0x6c, 0xb4, 0xff, 0x0c, 0xdf, 0xec, 0x00, 0xcf, 0x3b, 0x9a, 0x5f, + 0xd9, 0xd2, 0x9f, 0x43, 0x78, 0x37, 0xa8, 0xe8, 0x08, 0xa2, 0xa0, 0x17, 0x82, 0xf1, 0xa5, 0x15, + 0xa7, 0x82, 0xeb, 0x08, 0x4c, 0xc1, 0xec, 0x7e, 0xf6, 0xe2, 0xb2, 0x4d, 0xc6, 0x2b, 0x2a, 0x17, + 0x6f, 0xd3, 0x5d, 0x4f, 0x9a, 0x3f, 0x0e, 0xe2, 0x87, 0x2b, 0x0d, 0xa9, 0xeb, 0x6a, 0xc6, 0x52, + 0x6d, 0x0b, 0xd7, 0x77, 0x74, 0x6b, 0x0a, 0x66, 0xa3, 0xfd, 0x09, 0xee, 0x86, 0xc2, 0xfd, 0x50, + 0xf8, 0x53, 0x3f, 0x54, 0xf6, 0xf2, 0xbc, 0x4d, 0x06, 0xbb, 0x69, 0xd7, 0x35, 0xd2, 0xb3, 0xdf, + 0x09, 0xc8, 0x1f, 0x05, 0x70, 0xec, 0x74, 0x77, 0x1a, 0x7d, 0x07, 0xb0, 0x17, 0x8b, 0x7e, 0x87, + 0xd1, 0xd0, 0xe7, 0x8d, 0x77, 0xf2, 0x0e, 0x83, 0x21, 0x9b, 0xbb, 0xb8, 0xbf, 0x6d, 0x32, 0xd9, + 0x3e, 0xfa, 0x4a, 0x49, 0x61, 0xb9, 0xac, 0xed, 0xea, 0xb2, 0x4d, 0x9e, 0xff, 0xdf, 0x4c, 0xef, + 0x49, 0x7f, 0xb8, 0x56, 0x1e, 0x06, 0xb9, 0xaf, 0x89, 0x12, 0x38, 0xf2, 0xfb, 0x2e, 0x18, 0x5f, + 0x2a, 0x19, 0xdd, 0x76, 0x1b, 0xcc, 0xa1, 0x97, 0x0e, 0x9d, 0x82, 0x08, 0x7c, 0xc2, 0x84, 0xbb, + 0x99, 0xb2, 0xb1, 0x4a, 0x17, 0x94, 0x31, 0xcd, 0x8d, 0x89, 0xee, 0x78, 0x23, 0xba, 0x81, 0xe6, + 0x1d, 0xc9, 0xde, 0x9f, 0xaf, 0x63, 0x70, 0xb1, 0x8e, 0xc1, 0x9f, 0x75, 0x0c, 0xce, 0x36, 0xf1, + 0xe0, 0x62, 0x13, 0x0f, 0x7e, 0x6d, 0xe2, 0xc1, 0x67, 0x5c, 0x09, 0xfb, 0xa5, 0x29, 0xf1, 0x89, + 0x92, 0xe4, 0xd8, 0xdf, 0xf5, 0xeb, 0x23, 0x5a, 0x1a, 0x12, 0x1e, 0xe5, 0xd7, 0x03, 0xf2, 0x2d, + 0xbc, 0x4c, 0xbb, 0xaa, 0xb9, 0x29, 0xf7, 0xfc, 0x0a, 0x0e, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, + 0xfd, 0xe0, 0x08, 0x3e, 0xb6, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/query.pb.go b/x/claim/types/query.pb.go index 941c4398ba..b63f3e51c6 100644 --- a/x/claim/types/query.pb.go +++ b/x/claim/types/query.pb.go @@ -1,11 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: claim/v1beta1/query.proto +// source: stride/claim/query.proto package types import ( context "context" fmt "fmt" + types1 "github.com/Stride-Labs/stride/v3/x/claim/vesting/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" @@ -40,7 +41,7 @@ func (m *QueryDistributorAccountBalanceRequest) Reset() { *m = QueryDist func (m *QueryDistributorAccountBalanceRequest) String() string { return proto.CompactTextString(m) } func (*QueryDistributorAccountBalanceRequest) ProtoMessage() {} func (*QueryDistributorAccountBalanceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{0} + return fileDescriptor_baa87682a02846df, []int{0} } func (m *QueryDistributorAccountBalanceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -88,7 +89,7 @@ func (m *QueryDistributorAccountBalanceResponse) Reset() { func (m *QueryDistributorAccountBalanceResponse) String() string { return proto.CompactTextString(m) } func (*QueryDistributorAccountBalanceResponse) ProtoMessage() {} func (*QueryDistributorAccountBalanceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{1} + return fileDescriptor_baa87682a02846df, []int{1} } func (m *QueryDistributorAccountBalanceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -132,7 +133,7 @@ func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{2} + return fileDescriptor_baa87682a02846df, []int{2} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +172,7 @@ func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{3} + return fileDescriptor_baa87682a02846df, []int{3} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,7 +217,7 @@ func (m *QueryClaimRecordRequest) Reset() { *m = QueryClaimRecordRequest func (m *QueryClaimRecordRequest) String() string { return proto.CompactTextString(m) } func (*QueryClaimRecordRequest) ProtoMessage() {} func (*QueryClaimRecordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{4} + return fileDescriptor_baa87682a02846df, []int{4} } func (m *QueryClaimRecordRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -267,7 +268,7 @@ func (m *QueryClaimRecordResponse) Reset() { *m = QueryClaimRecordRespon func (m *QueryClaimRecordResponse) String() string { return proto.CompactTextString(m) } func (*QueryClaimRecordResponse) ProtoMessage() {} func (*QueryClaimRecordResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{5} + return fileDescriptor_baa87682a02846df, []int{5} } func (m *QueryClaimRecordResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -306,14 +307,14 @@ func (m *QueryClaimRecordResponse) GetClaimRecord() ClaimRecord { type QueryClaimableForActionRequest struct { AirdropIdentifier string `protobuf:"bytes,1,opt,name=airdrop_identifier,json=airdropIdentifier,proto3" json:"airdrop_identifier,omitempty" yaml:"airdrop_identifier"` Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address"` - Action Action `protobuf:"varint,3,opt,name=action,proto3,enum=Stridelabs.stride.claim.v1beta1.Action" json:"action,omitempty" yaml:"action"` + Action Action `protobuf:"varint,3,opt,name=action,proto3,enum=stride.claim.Action" json:"action,omitempty" yaml:"action"` } func (m *QueryClaimableForActionRequest) Reset() { *m = QueryClaimableForActionRequest{} } func (m *QueryClaimableForActionRequest) String() string { return proto.CompactTextString(m) } func (*QueryClaimableForActionRequest) ProtoMessage() {} func (*QueryClaimableForActionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{6} + return fileDescriptor_baa87682a02846df, []int{6} } func (m *QueryClaimableForActionRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -371,7 +372,7 @@ func (m *QueryClaimableForActionResponse) Reset() { *m = QueryClaimableF func (m *QueryClaimableForActionResponse) String() string { return proto.CompactTextString(m) } func (*QueryClaimableForActionResponse) ProtoMessage() {} func (*QueryClaimableForActionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{7} + return fileDescriptor_baa87682a02846df, []int{7} } func (m *QueryClaimableForActionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -416,7 +417,7 @@ func (m *QueryTotalClaimableRequest) Reset() { *m = QueryTotalClaimableR func (m *QueryTotalClaimableRequest) String() string { return proto.CompactTextString(m) } func (*QueryTotalClaimableRequest) ProtoMessage() {} func (*QueryTotalClaimableRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{8} + return fileDescriptor_baa87682a02846df, []int{8} } func (m *QueryTotalClaimableRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,7 +468,7 @@ func (m *QueryTotalClaimableResponse) Reset() { *m = QueryTotalClaimable func (m *QueryTotalClaimableResponse) String() string { return proto.CompactTextString(m) } func (*QueryTotalClaimableResponse) ProtoMessage() {} func (*QueryTotalClaimableResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_45c620aecc0f41bd, []int{9} + return fileDescriptor_baa87682a02846df, []int{9} } func (m *QueryTotalClaimableResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -503,74 +504,179 @@ func (m *QueryTotalClaimableResponse) GetCoins() github_com_cosmos_cosmos_sdk_ty return nil } +type QueryUserVestingsRequest struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty" yaml:"address"` +} + +func (m *QueryUserVestingsRequest) Reset() { *m = QueryUserVestingsRequest{} } +func (m *QueryUserVestingsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryUserVestingsRequest) ProtoMessage() {} +func (*QueryUserVestingsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_baa87682a02846df, []int{10} +} +func (m *QueryUserVestingsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryUserVestingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryUserVestingsRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryUserVestingsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryUserVestingsRequest.Merge(m, src) +} +func (m *QueryUserVestingsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryUserVestingsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryUserVestingsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryUserVestingsRequest proto.InternalMessageInfo + +func (m *QueryUserVestingsRequest) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +type QueryUserVestingsResponse struct { + SpendableCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=spendable_coins,json=spendableCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"spendable_coins" yaml:"spendable_coins"` + Periods []types1.Period `protobuf:"bytes,1,rep,name=periods,proto3" json:"periods" yaml:"periods"` +} + +func (m *QueryUserVestingsResponse) Reset() { *m = QueryUserVestingsResponse{} } +func (m *QueryUserVestingsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryUserVestingsResponse) ProtoMessage() {} +func (*QueryUserVestingsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_baa87682a02846df, []int{11} +} +func (m *QueryUserVestingsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryUserVestingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryUserVestingsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryUserVestingsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryUserVestingsResponse.Merge(m, src) +} +func (m *QueryUserVestingsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryUserVestingsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryUserVestingsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryUserVestingsResponse proto.InternalMessageInfo + +func (m *QueryUserVestingsResponse) GetSpendableCoins() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.SpendableCoins + } + return nil +} + +func (m *QueryUserVestingsResponse) GetPeriods() []types1.Period { + if m != nil { + return m.Periods + } + return nil +} + func init() { - proto.RegisterType((*QueryDistributorAccountBalanceRequest)(nil), "Stridelabs.stride.claim.v1beta1.QueryDistributorAccountBalanceRequest") - proto.RegisterType((*QueryDistributorAccountBalanceResponse)(nil), "Stridelabs.stride.claim.v1beta1.QueryDistributorAccountBalanceResponse") - proto.RegisterType((*QueryParamsRequest)(nil), "Stridelabs.stride.claim.v1beta1.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "Stridelabs.stride.claim.v1beta1.QueryParamsResponse") - proto.RegisterType((*QueryClaimRecordRequest)(nil), "Stridelabs.stride.claim.v1beta1.QueryClaimRecordRequest") - proto.RegisterType((*QueryClaimRecordResponse)(nil), "Stridelabs.stride.claim.v1beta1.QueryClaimRecordResponse") - proto.RegisterType((*QueryClaimableForActionRequest)(nil), "Stridelabs.stride.claim.v1beta1.QueryClaimableForActionRequest") - proto.RegisterType((*QueryClaimableForActionResponse)(nil), "Stridelabs.stride.claim.v1beta1.QueryClaimableForActionResponse") - proto.RegisterType((*QueryTotalClaimableRequest)(nil), "Stridelabs.stride.claim.v1beta1.QueryTotalClaimableRequest") - proto.RegisterType((*QueryTotalClaimableResponse)(nil), "Stridelabs.stride.claim.v1beta1.QueryTotalClaimableResponse") -} - -func init() { proto.RegisterFile("claim/v1beta1/query.proto", fileDescriptor_45c620aecc0f41bd) } - -var fileDescriptor_45c620aecc0f41bd = []byte{ - // 810 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x4f, 0x1b, 0x39, - 0x1c, 0x8d, 0x61, 0x09, 0x5a, 0x87, 0x45, 0xc2, 0xb0, 0x22, 0x19, 0x96, 0x19, 0x64, 0x89, 0x25, - 0xda, 0x85, 0x99, 0x05, 0x56, 0x2b, 0xf6, 0x8f, 0x76, 0xd9, 0xb0, 0xb0, 0xaa, 0xc4, 0xa1, 0x9d, - 0x56, 0x3d, 0x54, 0x95, 0x22, 0xcf, 0x8c, 0x49, 0x47, 0x9d, 0x8c, 0xc3, 0x78, 0x52, 0x15, 0x21, - 0x2e, 0x3d, 0xf5, 0x88, 0xfa, 0x47, 0xea, 0x67, 0xe8, 0xad, 0x1f, 0xa0, 0x77, 0x8e, 0x48, 0x3d, - 0xb4, 0x52, 0xab, 0xb4, 0x82, 0x7e, 0x80, 0x2a, 0x9f, 0xa0, 0x1a, 0xdb, 0x90, 0x84, 0x84, 0x26, - 0x50, 0x55, 0xe5, 0x94, 0x91, 0xfd, 0xfb, 0x3d, 0xbf, 0xf7, 0x6c, 0x3f, 0x07, 0xe6, 0xdc, 0x80, - 0xf8, 0x65, 0xeb, 0xce, 0xbc, 0x43, 0x63, 0x32, 0x6f, 0x6d, 0x56, 0x69, 0xb4, 0x65, 0x56, 0x22, - 0x16, 0x33, 0x64, 0x5c, 0x8d, 0x23, 0xdf, 0xa3, 0x01, 0x71, 0xb8, 0xc9, 0xc5, 0xa7, 0x29, 0x8a, - 0x4d, 0x55, 0xac, 0x8d, 0x95, 0x58, 0x89, 0x89, 0x5a, 0x2b, 0xf9, 0x92, 0x6d, 0xda, 0x0f, 0x25, - 0xc6, 0x4a, 0x01, 0xb5, 0x48, 0xc5, 0xb7, 0x48, 0x18, 0xb2, 0x98, 0xc4, 0x3e, 0x0b, 0xb9, 0x9a, - 0xd5, 0x5d, 0xc6, 0xcb, 0x8c, 0x5b, 0x0e, 0xe1, 0xf4, 0x78, 0x55, 0x97, 0xf9, 0xa1, 0x9a, 0x3f, - 0xc1, 0x47, 0x2e, 0x28, 0xa7, 0xb4, 0xd6, 0xa9, 0x0a, 0x89, 0x48, 0x59, 0xc1, 0xe2, 0x2a, 0x9c, - 0xbe, 0x92, 0x50, 0xff, 0xcf, 0x4f, 0x98, 0x3a, 0xd5, 0x98, 0x45, 0xff, 0xba, 0x2e, 0xab, 0x86, - 0x71, 0x81, 0x04, 0x24, 0x74, 0xa9, 0x4d, 0x37, 0xab, 0x94, 0xc7, 0x68, 0x1d, 0x22, 0xe2, 0x47, - 0x5e, 0xc4, 0x2a, 0x45, 0xdf, 0xa3, 0x61, 0xec, 0x6f, 0xf8, 0x34, 0xca, 0x82, 0x29, 0x90, 0xff, - 0xb6, 0x30, 0x59, 0xaf, 0x19, 0xb9, 0x2d, 0x52, 0x0e, 0xfe, 0xc0, 0xed, 0x35, 0xd8, 0x1e, 0x51, - 0x83, 0x97, 0x1a, 0x63, 0x6f, 0x00, 0xfc, 0xb1, 0xdb, 0xba, 0xbc, 0xc2, 0x42, 0x4e, 0xd1, 0x33, - 0x00, 0x27, 0xbc, 0x46, 0x55, 0x91, 0xc8, 0xb2, 0xa2, 0x23, 0xeb, 0xb2, 0x60, 0xaa, 0x3f, 0x9f, - 0x59, 0xc8, 0x99, 0xd2, 0x1f, 0x33, 0xf1, 0xe7, 0xc8, 0x68, 0x73, 0x85, 0xf9, 0x61, 0xe1, 0xfa, - 0x5e, 0xcd, 0x48, 0xd5, 0x6b, 0x06, 0x96, 0x0c, 0x3f, 0x81, 0x85, 0x9f, 0xbe, 0x35, 0xf2, 0x25, - 0x3f, 0xbe, 0x55, 0x75, 0x4c, 0x97, 0x95, 0x2d, 0x65, 0xb9, 0xfc, 0x99, 0xe3, 0xde, 0x6d, 0x2b, - 0xde, 0xaa, 0x50, 0x2e, 0x60, 0xb9, 0x9d, 0xf3, 0x4e, 0xe3, 0x8e, 0xc7, 0x20, 0x12, 0xea, 0x2e, - 0x0b, 0xab, 0x95, 0x85, 0xf8, 0x26, 0x1c, 0x6d, 0x19, 0x55, 0x02, 0x57, 0x61, 0x5a, 0x6e, 0x89, - 0x70, 0x33, 0xb3, 0x30, 0x63, 0x76, 0x39, 0x3f, 0xa6, 0x04, 0x28, 0x7c, 0x93, 0x08, 0xb3, 0x55, - 0x33, 0x7e, 0x0c, 0xe0, 0xb8, 0x80, 0x5f, 0x49, 0x6a, 0x6d, 0xea, 0xb2, 0xc8, 0xfb, 0x22, 0x9b, - 0x87, 0x66, 0xe1, 0x20, 0xf1, 0xbc, 0x88, 0x72, 0x9e, 0xed, 0x13, 0x10, 0xa8, 0x5e, 0x33, 0x86, - 0x15, 0x84, 0x9c, 0xc0, 0xf6, 0x51, 0x09, 0xbe, 0x0f, 0x60, 0xb6, 0x9d, 0x97, 0xd2, 0x1e, 0xc0, - 0x21, 0x21, 0xad, 0x18, 0x89, 0x71, 0xe5, 0xc0, 0x6c, 0x57, 0x07, 0x9a, 0xb0, 0x0a, 0x13, 0x6a, - 0x7f, 0x47, 0x25, 0x83, 0x66, 0x3c, 0x6c, 0x67, 0xdc, 0x46, 0x25, 0xfe, 0x00, 0xa0, 0xde, 0xa0, - 0x42, 0x9c, 0x80, 0xae, 0x25, 0x5b, 0x97, 0x5c, 0xb3, 0x0b, 0xe0, 0x14, 0xb2, 0x61, 0x9a, 0x08, - 0x32, 0xd9, 0xfe, 0x29, 0x90, 0x1f, 0xee, 0xe1, 0x20, 0x48, 0xee, 0x85, 0x91, 0x7a, 0xcd, 0xf8, - 0x4e, 0xa1, 0x8a, 0x11, 0x6c, 0x2b, 0x24, 0xfc, 0x08, 0x40, 0xe3, 0x54, 0xc9, 0x6a, 0x13, 0x36, - 0xe1, 0x40, 0x12, 0x24, 0xbc, 0xfb, 0x55, 0x5a, 0x56, 0x56, 0x0f, 0x29, 0xab, 0x93, 0xae, 0xb3, - 0x5d, 0x1a, 0xb9, 0x12, 0x7e, 0x02, 0xa0, 0x26, 0x68, 0x5d, 0x63, 0x31, 0x09, 0x8e, 0xb9, 0x5d, - 0x84, 0xf3, 0xba, 0x0b, 0xe0, 0x44, 0x47, 0x6a, 0x5f, 0xcd, 0xad, 0x85, 0xbd, 0x41, 0x38, 0x20, - 0x28, 0xa1, 0xd7, 0x00, 0xe6, 0x4e, 0x8d, 0x4c, 0xb4, 0xd6, 0xf5, 0xc0, 0xf4, 0x94, 0xf5, 0xda, - 0xff, 0x9f, 0x8d, 0x23, 0xbd, 0xc2, 0x73, 0xf7, 0x5e, 0xbc, 0x7f, 0xd8, 0x37, 0x83, 0xa6, 0xad, - 0xd6, 0x27, 0xa8, 0xcc, 0xbc, 0x6a, 0x40, 0x4f, 0xc6, 0x2f, 0x7a, 0x00, 0x60, 0x5a, 0x66, 0x1b, - 0x5a, 0xec, 0x8d, 0x42, 0x4b, 0xc0, 0x6a, 0xbf, 0x9e, 0xad, 0x49, 0x91, 0x9c, 0x14, 0x24, 0xc7, - 0xd1, 0xf7, 0x56, 0xa7, 0x77, 0x32, 0x79, 0x7f, 0x32, 0x4d, 0x71, 0x83, 0x96, 0x7a, 0x5b, 0xa4, - 0x3d, 0x85, 0xb5, 0xdf, 0xcf, 0xd1, 0xd9, 0xc5, 0xc8, 0xe6, 0xb0, 0xb3, 0xb6, 0xd5, 0x11, 0xde, - 0x41, 0x2f, 0x01, 0x44, 0xed, 0x17, 0x1e, 0xfd, 0x73, 0x06, 0x02, 0x9d, 0xd2, 0x51, 0x5b, 0x3e, - 0x3f, 0x80, 0x12, 0xf2, 0xb7, 0x10, 0xb2, 0x84, 0x7e, 0xeb, 0x24, 0x24, 0x69, 0x29, 0x6e, 0x88, - 0x77, 0x39, 0x69, 0x6a, 0x08, 0xb2, 0xb6, 0xe5, 0xc8, 0x0e, 0x7a, 0x0e, 0xe0, 0x70, 0xeb, 0xc5, - 0x44, 0x7f, 0xf6, 0x46, 0xaa, 0x63, 0xd2, 0x68, 0x7f, 0x9d, 0xaf, 0x59, 0xa9, 0xf9, 0x45, 0xa8, - 0xf9, 0x09, 0xe5, 0x4f, 0xa8, 0x89, 0x93, 0xf2, 0xe2, 0xb1, 0xa6, 0x86, 0x90, 0xc2, 0xea, 0xde, - 0x81, 0x0e, 0xf6, 0x0f, 0x74, 0xf0, 0xee, 0x40, 0x07, 0xbb, 0x87, 0x7a, 0x6a, 0xff, 0x50, 0x4f, - 0xbd, 0x3a, 0xd4, 0x53, 0x37, 0x7e, 0x6e, 0x4a, 0x05, 0xc9, 0x69, 0x6e, 0x9d, 0x38, 0xdc, 0x92, - 0xa4, 0xac, 0xbb, 0x6a, 0x09, 0x11, 0x0f, 0x4e, 0x5a, 0xfc, 0x7b, 0x5b, 0xfc, 0x18, 0x00, 0x00, - 0xff, 0xff, 0x7f, 0xaa, 0x38, 0x61, 0x86, 0x0a, 0x00, 0x00, + proto.RegisterType((*QueryDistributorAccountBalanceRequest)(nil), "stride.claim.QueryDistributorAccountBalanceRequest") + proto.RegisterType((*QueryDistributorAccountBalanceResponse)(nil), "stride.claim.QueryDistributorAccountBalanceResponse") + proto.RegisterType((*QueryParamsRequest)(nil), "stride.claim.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "stride.claim.QueryParamsResponse") + proto.RegisterType((*QueryClaimRecordRequest)(nil), "stride.claim.QueryClaimRecordRequest") + proto.RegisterType((*QueryClaimRecordResponse)(nil), "stride.claim.QueryClaimRecordResponse") + proto.RegisterType((*QueryClaimableForActionRequest)(nil), "stride.claim.QueryClaimableForActionRequest") + proto.RegisterType((*QueryClaimableForActionResponse)(nil), "stride.claim.QueryClaimableForActionResponse") + proto.RegisterType((*QueryTotalClaimableRequest)(nil), "stride.claim.QueryTotalClaimableRequest") + proto.RegisterType((*QueryTotalClaimableResponse)(nil), "stride.claim.QueryTotalClaimableResponse") + proto.RegisterType((*QueryUserVestingsRequest)(nil), "stride.claim.QueryUserVestingsRequest") + proto.RegisterType((*QueryUserVestingsResponse)(nil), "stride.claim.QueryUserVestingsResponse") +} + +func init() { proto.RegisterFile("stride/claim/query.proto", fileDescriptor_baa87682a02846df) } + +var fileDescriptor_baa87682a02846df = []byte{ + // 924 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x41, 0x6f, 0xdc, 0x44, + 0x14, 0xce, 0x34, 0x74, 0x2b, 0x26, 0x69, 0xaa, 0x4e, 0x43, 0xd8, 0x75, 0x5a, 0x7b, 0x19, 0x29, + 0x61, 0x91, 0x1a, 0x9b, 0x26, 0x88, 0x03, 0x17, 0xc0, 0x45, 0x28, 0x45, 0x3d, 0x14, 0x03, 0x95, + 0xe0, 0xb2, 0x1a, 0xdb, 0xd3, 0xc5, 0x62, 0xd7, 0xe3, 0x78, 0xec, 0x8a, 0xa8, 0xea, 0x05, 0x0e, + 0xdc, 0xa0, 0x12, 0x20, 0xf1, 0x17, 0x40, 0xe2, 0xc0, 0xbf, 0xe8, 0xb1, 0x12, 0x17, 0x0e, 0xb0, + 0xa0, 0x84, 0x1b, 0xb7, 0x1c, 0x38, 0x23, 0xcf, 0x3c, 0x67, 0xed, 0xc4, 0xdb, 0x4d, 0x0e, 0xa8, + 0xb9, 0x64, 0xb3, 0xf3, 0xbe, 0xf7, 0xde, 0xf7, 0xbd, 0x37, 0xf3, 0xde, 0xe2, 0xb6, 0xcc, 0xd2, + 0x28, 0xe4, 0x4e, 0x30, 0x64, 0xd1, 0xc8, 0xd9, 0xc9, 0x79, 0xba, 0x6b, 0x27, 0xa9, 0xc8, 0x04, + 0x59, 0xd4, 0x16, 0x5b, 0x59, 0x8c, 0xe5, 0x81, 0x18, 0x08, 0x65, 0x70, 0x8a, 0xff, 0x34, 0xc6, + 0xb8, 0x3a, 0x10, 0x62, 0x30, 0xe4, 0x0e, 0x4b, 0x22, 0x87, 0xc5, 0xb1, 0xc8, 0x58, 0x16, 0x89, + 0x58, 0x82, 0xd5, 0x0c, 0x84, 0x1c, 0x09, 0xe9, 0xf8, 0x4c, 0x72, 0xe7, 0xfe, 0x0d, 0x9f, 0x67, + 0xec, 0x86, 0x13, 0x88, 0x28, 0x06, 0x7b, 0x3d, 0xb7, 0xfa, 0x0b, 0x96, 0x4e, 0xcd, 0x92, 0xb0, + 0x94, 0x8d, 0xca, 0xa0, 0x57, 0xc1, 0x74, 0x9f, 0xcb, 0x2c, 0x8a, 0x07, 0xe5, 0xa7, 0xb6, 0xd2, + 0x1c, 0xaf, 0xbd, 0x5f, 0x68, 0x78, 0x27, 0x2a, 0x60, 0x7e, 0x9e, 0x89, 0xf4, 0xed, 0x20, 0x10, + 0x79, 0x9c, 0xb9, 0x6c, 0xc8, 0xe2, 0x80, 0x7b, 0x7c, 0x27, 0xe7, 0x32, 0x23, 0xb7, 0x31, 0x61, + 0x51, 0x1a, 0xa6, 0x22, 0xe9, 0x47, 0x21, 0x8f, 0xb3, 0xe8, 0x5e, 0xc4, 0xd3, 0x36, 0xea, 0xa2, + 0xde, 0xf3, 0xee, 0xb5, 0x83, 0xb1, 0xd5, 0xd9, 0x65, 0xa3, 0xe1, 0x1b, 0xf4, 0x38, 0x86, 0x7a, + 0x97, 0xe1, 0xf0, 0xd6, 0xe4, 0xec, 0x77, 0x84, 0xd7, 0x67, 0xe5, 0x95, 0x89, 0x88, 0x25, 0x27, + 0xbf, 0x20, 0xbc, 0x1a, 0x4e, 0x50, 0x7d, 0xa6, 0x61, 0x7d, 0x5f, 0xe3, 0xda, 0xa8, 0x3b, 0xdf, + 0x5b, 0xd8, 0xec, 0xd8, 0xba, 0x76, 0x76, 0x51, 0x3b, 0x1b, 0x6a, 0x67, 0xdf, 0x14, 0x51, 0xec, + 0xde, 0x7d, 0x3c, 0xb6, 0xe6, 0x0e, 0xc6, 0x16, 0xd5, 0x0c, 0x9f, 0x12, 0x8b, 0xfe, 0xf4, 0xa7, + 0xd5, 0x1b, 0x44, 0xd9, 0xa7, 0xb9, 0x6f, 0x07, 0x62, 0xe4, 0x40, 0x3b, 0xf4, 0xc7, 0x86, 0x0c, + 0x3f, 0x73, 0xb2, 0xdd, 0x84, 0x4b, 0x15, 0x56, 0x7a, 0x9d, 0x70, 0x1a, 0x77, 0xba, 0x8c, 0x89, + 0x52, 0x77, 0x47, 0x35, 0x02, 0x4a, 0x48, 0x6f, 0xe1, 0x2b, 0xb5, 0x53, 0x10, 0xb8, 0x89, 0x5b, + 0xba, 0x61, 0xaa, 0x9a, 0x0b, 0x9b, 0xcb, 0x76, 0xf5, 0x22, 0xd9, 0x1a, 0xed, 0x3e, 0x57, 0xa8, + 0xf0, 0x00, 0x49, 0xbf, 0x47, 0xf8, 0x45, 0x15, 0xeb, 0x66, 0x81, 0xf1, 0x78, 0x20, 0xd2, 0xf0, + 0x7f, 0xe9, 0x14, 0xb9, 0x8e, 0x2f, 0xb0, 0x30, 0x4c, 0xb9, 0x94, 0xed, 0x73, 0x2a, 0x04, 0x39, + 0x18, 0x5b, 0x4b, 0x10, 0x42, 0x1b, 0xa8, 0x57, 0x42, 0x68, 0x8e, 0xdb, 0xc7, 0x69, 0x81, 0xce, + 0x8f, 0xf1, 0xa2, 0x52, 0xd4, 0x4f, 0xd5, 0x39, 0xa8, 0xed, 0xd4, 0xd5, 0x56, 0x1c, 0xdd, 0x55, + 0x68, 0xdc, 0x15, 0x9d, 0xad, 0xea, 0x4c, 0xbd, 0x85, 0x60, 0x82, 0xa4, 0x7f, 0x20, 0x6c, 0x4e, + 0xf2, 0x32, 0x7f, 0xc8, 0xdf, 0x2d, 0x7a, 0x52, 0xbc, 0xad, 0x33, 0x50, 0x15, 0xf2, 0x26, 0x6e, + 0x31, 0x45, 0xa6, 0x3d, 0xdf, 0x45, 0xbd, 0xa5, 0xa3, 0x1d, 0xd6, 0x44, 0xdd, 0xcb, 0x07, 0x63, + 0xeb, 0x22, 0x84, 0x50, 0x27, 0xd4, 0x03, 0x37, 0xfa, 0x1d, 0xc2, 0xd6, 0x54, 0x7d, 0x50, 0xde, + 0x1d, 0x7c, 0xbe, 0x18, 0x15, 0x72, 0xf6, 0x83, 0x78, 0x0b, 0xea, 0xba, 0x08, 0x75, 0x2d, 0xbc, + 0x4e, 0x77, 0xf5, 0x75, 0x26, 0xfa, 0x03, 0xc2, 0x86, 0xa2, 0xf5, 0xa1, 0xc8, 0xd8, 0xf0, 0x90, + 0xdb, 0x59, 0xb8, 0x88, 0x8f, 0x10, 0x5e, 0x6d, 0xa4, 0xf6, 0xec, 0xaa, 0xb5, 0x0d, 0x6f, 0xe3, + 0x23, 0xc9, 0xd3, 0xbb, 0x7a, 0x08, 0x97, 0xa3, 0xa1, 0x2a, 0x0e, 0xcd, 0x16, 0xf7, 0x2f, 0xc2, + 0x9d, 0x86, 0x50, 0x20, 0xed, 0x6b, 0x84, 0x2f, 0xc9, 0x84, 0xc7, 0x61, 0x21, 0xb8, 0xaf, 0x55, + 0xce, 0xcf, 0x52, 0xf9, 0x1e, 0xa8, 0x5c, 0xd1, 0x39, 0x8f, 0xf8, 0x9f, 0x4e, 0xef, 0xd2, 0xa1, + 0xb7, 0xfa, 0x4e, 0xb6, 0xf1, 0x85, 0x84, 0xa7, 0x91, 0x08, 0xcb, 0x6a, 0xaf, 0x94, 0xf7, 0xbf, + 0xdc, 0x45, 0x77, 0x94, 0xd9, 0x5d, 0x01, 0x12, 0x20, 0x1c, 0x9c, 0xa8, 0x57, 0xba, 0x6f, 0xfe, + 0xd3, 0xc2, 0xe7, 0x95, 0x70, 0xf2, 0x33, 0xc2, 0x9d, 0xa9, 0xbb, 0x83, 0x6c, 0xd5, 0x1f, 0xd8, + 0x89, 0x36, 0x9c, 0xf1, 0xda, 0xe9, 0x9c, 0x74, 0xb5, 0xe9, 0xda, 0x17, 0xbf, 0xfe, 0xfd, 0xed, + 0x39, 0x8b, 0x5c, 0x83, 0xdd, 0x3b, 0x12, 0x61, 0x3e, 0xe4, 0x47, 0x37, 0x0b, 0x09, 0x71, 0x4b, + 0x0f, 0x72, 0xd2, 0x6d, 0x48, 0x53, 0xdb, 0x13, 0xc6, 0x4b, 0x4f, 0x41, 0x40, 0xd6, 0x17, 0x54, + 0xd6, 0x4b, 0xe4, 0x62, 0x6d, 0xe3, 0x93, 0x2f, 0x11, 0x5e, 0xa8, 0x4c, 0x50, 0xb2, 0xd6, 0x10, + 0xe9, 0xf8, 0xc6, 0x30, 0xd6, 0x67, 0xc1, 0xa6, 0x68, 0xad, 0x4e, 0x64, 0xe7, 0x01, 0xdc, 0xce, + 0x87, 0xe4, 0x47, 0x84, 0xc9, 0xf1, 0x41, 0x45, 0xae, 0x4f, 0xcb, 0xd2, 0x34, 0xaf, 0x8d, 0x8d, + 0x13, 0xa2, 0x81, 0xda, 0xeb, 0x8a, 0xda, 0xab, 0xc4, 0xae, 0x52, 0x53, 0x17, 0xf8, 0x9e, 0xda, + 0xf3, 0x05, 0x78, 0x42, 0xd1, 0x79, 0xa0, 0x4f, 0x1e, 0x92, 0x6f, 0x10, 0x5e, 0xaa, 0x8f, 0x08, + 0xd2, 0x6b, 0xc8, 0xdc, 0x38, 0xe0, 0x8c, 0x57, 0x4e, 0x80, 0x04, 0x7e, 0x3d, 0xc5, 0x8f, 0x92, + 0x2e, 0xf0, 0xcb, 0x0a, 0x58, 0xff, 0x90, 0x65, 0xa5, 0x7a, 0x5f, 0x21, 0xbc, 0x58, 0x7d, 0xd7, + 0xa4, 0xa9, 0x3b, 0x0d, 0x33, 0xc4, 0x78, 0x79, 0x26, 0x0e, 0xb8, 0xac, 0x2b, 0x2e, 0x5d, 0x62, + 0x02, 0x97, 0x5c, 0xf2, 0xb4, 0x0f, 0x4f, 0x51, 0x4e, 0x98, 0xb8, 0xdb, 0x8f, 0xf7, 0x4c, 0xf4, + 0x64, 0xcf, 0x44, 0x7f, 0xed, 0x99, 0xe8, 0xd1, 0xbe, 0x39, 0xf7, 0x64, 0xdf, 0x9c, 0xfb, 0x6d, + 0xdf, 0x9c, 0xfb, 0xc4, 0xae, 0xcc, 0x82, 0x0f, 0x54, 0xd2, 0x8d, 0xdb, 0xcc, 0x97, 0x4e, 0xf9, + 0x53, 0x73, 0xcb, 0xf9, 0xbc, 0xd4, 0x59, 0xcc, 0x05, 0xbf, 0xa5, 0x7e, 0x6c, 0x6e, 0xfd, 0x17, + 0x00, 0x00, 0xff, 0xff, 0x1a, 0x23, 0x65, 0xdc, 0x3d, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -590,6 +696,7 @@ type QueryClient interface { ClaimRecord(ctx context.Context, in *QueryClaimRecordRequest, opts ...grpc.CallOption) (*QueryClaimRecordResponse, error) ClaimableForAction(ctx context.Context, in *QueryClaimableForActionRequest, opts ...grpc.CallOption) (*QueryClaimableForActionResponse, error) TotalClaimable(ctx context.Context, in *QueryTotalClaimableRequest, opts ...grpc.CallOption) (*QueryTotalClaimableResponse, error) + UserVestings(ctx context.Context, in *QueryUserVestingsRequest, opts ...grpc.CallOption) (*QueryUserVestingsResponse, error) } type queryClient struct { @@ -602,7 +709,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) DistributorAccountBalance(ctx context.Context, in *QueryDistributorAccountBalanceRequest, opts ...grpc.CallOption) (*QueryDistributorAccountBalanceResponse, error) { out := new(QueryDistributorAccountBalanceResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Query/DistributorAccountBalance", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Query/DistributorAccountBalance", in, out, opts...) if err != nil { return nil, err } @@ -611,7 +718,7 @@ func (c *queryClient) DistributorAccountBalance(ctx context.Context, in *QueryDi func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -620,7 +727,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) ClaimRecord(ctx context.Context, in *QueryClaimRecordRequest, opts ...grpc.CallOption) (*QueryClaimRecordResponse, error) { out := new(QueryClaimRecordResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Query/ClaimRecord", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Query/ClaimRecord", in, out, opts...) if err != nil { return nil, err } @@ -629,7 +736,7 @@ func (c *queryClient) ClaimRecord(ctx context.Context, in *QueryClaimRecordReque func (c *queryClient) ClaimableForAction(ctx context.Context, in *QueryClaimableForActionRequest, opts ...grpc.CallOption) (*QueryClaimableForActionResponse, error) { out := new(QueryClaimableForActionResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Query/ClaimableForAction", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Query/ClaimableForAction", in, out, opts...) if err != nil { return nil, err } @@ -638,7 +745,16 @@ func (c *queryClient) ClaimableForAction(ctx context.Context, in *QueryClaimable func (c *queryClient) TotalClaimable(ctx context.Context, in *QueryTotalClaimableRequest, opts ...grpc.CallOption) (*QueryTotalClaimableResponse, error) { out := new(QueryTotalClaimableResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Query/TotalClaimable", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Query/TotalClaimable", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) UserVestings(ctx context.Context, in *QueryUserVestingsRequest, opts ...grpc.CallOption) (*QueryUserVestingsResponse, error) { + out := new(QueryUserVestingsResponse) + err := c.cc.Invoke(ctx, "/stride.claim.Query/UserVestings", in, out, opts...) if err != nil { return nil, err } @@ -652,6 +768,7 @@ type QueryServer interface { ClaimRecord(context.Context, *QueryClaimRecordRequest) (*QueryClaimRecordResponse, error) ClaimableForAction(context.Context, *QueryClaimableForActionRequest) (*QueryClaimableForActionResponse, error) TotalClaimable(context.Context, *QueryTotalClaimableRequest) (*QueryTotalClaimableResponse, error) + UserVestings(context.Context, *QueryUserVestingsRequest) (*QueryUserVestingsResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -673,6 +790,9 @@ func (*UnimplementedQueryServer) ClaimableForAction(ctx context.Context, req *Qu func (*UnimplementedQueryServer) TotalClaimable(ctx context.Context, req *QueryTotalClaimableRequest) (*QueryTotalClaimableResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TotalClaimable not implemented") } +func (*UnimplementedQueryServer) UserVestings(ctx context.Context, req *QueryUserVestingsRequest) (*QueryUserVestingsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UserVestings not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -688,7 +808,7 @@ func _Query_DistributorAccountBalance_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Query/DistributorAccountBalance", + FullMethod: "/stride.claim.Query/DistributorAccountBalance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).DistributorAccountBalance(ctx, req.(*QueryDistributorAccountBalanceRequest)) @@ -706,7 +826,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Query/Params", + FullMethod: "/stride.claim.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -724,7 +844,7 @@ func _Query_ClaimRecord_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Query/ClaimRecord", + FullMethod: "/stride.claim.Query/ClaimRecord", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ClaimRecord(ctx, req.(*QueryClaimRecordRequest)) @@ -742,7 +862,7 @@ func _Query_ClaimableForAction_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Query/ClaimableForAction", + FullMethod: "/stride.claim.Query/ClaimableForAction", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ClaimableForAction(ctx, req.(*QueryClaimableForActionRequest)) @@ -760,7 +880,7 @@ func _Query_TotalClaimable_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Query/TotalClaimable", + FullMethod: "/stride.claim.Query/TotalClaimable", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).TotalClaimable(ctx, req.(*QueryTotalClaimableRequest)) @@ -768,8 +888,26 @@ func _Query_TotalClaimable_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } +func _Query_UserVestings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryUserVestingsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).UserVestings(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/stride.claim.Query/UserVestings", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).UserVestings(ctx, req.(*QueryUserVestingsRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "Stridelabs.stride.claim.v1beta1.Query", + ServiceName: "stride.claim.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -792,9 +930,13 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "TotalClaimable", Handler: _Query_TotalClaimable_Handler, }, + { + MethodName: "UserVestings", + Handler: _Query_UserVestings_Handler, + }, }, Streams: []grpc.StreamDesc{}, - Metadata: "claim/v1beta1/query.proto", + Metadata: "stride/claim/query.proto", } func (m *QueryDistributorAccountBalanceRequest) Marshal() (dAtA []byte, err error) { @@ -1143,6 +1285,87 @@ func (m *QueryTotalClaimableResponse) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } +func (m *QueryUserVestingsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryUserVestingsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryUserVestingsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryUserVestingsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryUserVestingsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryUserVestingsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.SpendableCoins) > 0 { + for iNdEx := len(m.SpendableCoins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.SpendableCoins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + if len(m.Periods) > 0 { + for iNdEx := len(m.Periods) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Periods[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -1297,6 +1520,40 @@ func (m *QueryTotalClaimableResponse) Size() (n int) { return n } +func (m *QueryUserVestingsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryUserVestingsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Periods) > 0 { + for _, e := range m.Periods { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if len(m.SpendableCoins) > 0 { + for _, e := range m.SpendableCoins { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -2214,6 +2471,206 @@ func (m *QueryTotalClaimableResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryUserVestingsRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryUserVestingsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryUserVestingsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryUserVestingsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryUserVestingsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryUserVestingsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Periods", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Periods = append(m.Periods, types1.Period{}) + if err := m.Periods[len(m.Periods)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SpendableCoins", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SpendableCoins = append(m.SpendableCoins, types.Coin{}) + if err := m.SpendableCoins[len(m.SpendableCoins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/claim/types/query.pb.gw.go b/x/claim/types/query.pb.gw.go index cd3df4e487..b7d6c869d1 100644 --- a/x/claim/types/query.pb.gw.go +++ b/x/claim/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: claim/v1beta1/query.proto +// source: stride/claim/query.proto /* Package types is a reverse proxy. @@ -331,6 +331,60 @@ func local_request_Query_TotalClaimable_0(ctx context.Context, marshaler runtime } +func request_Query_UserVestings_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryUserVestingsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + msg, err := client.UserVestings(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_UserVestings_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryUserVestingsRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["address"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + } + + protoReq.Address, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + } + + msg, err := server.UserVestings(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -452,6 +506,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_UserVestings_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_UserVestings_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_UserVestings_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -593,19 +670,41 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_UserVestings_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_UserVestings_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_UserVestings_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } var ( - pattern_Query_DistributorAccountBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"claim", "v1beta1", "module_account_balance"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DistributorAccountBalance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"claim", "module_account_balance"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"claim", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"claim", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ClaimRecord_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"claim", "v1beta1", "claim_record", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ClaimRecord_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"claim", "claim_record", "address"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ClaimableForAction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"claim", "v1beta1", "claimable_for_action", "address", "action"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ClaimableForAction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 1, 0, 4, 1, 5, 3}, []string{"claim", "claimable_for_action", "address", "action"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_TotalClaimable_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"claim", "v1beta1", "total_claimable", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_TotalClaimable_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"claim", "total_claimable", "address"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_UserVestings_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"claim", "user_vestings", "address"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( @@ -618,4 +717,6 @@ var ( forward_Query_ClaimableForAction_0 = runtime.ForwardResponseMessage forward_Query_TotalClaimable_0 = runtime.ForwardResponseMessage + + forward_Query_UserVestings_0 = runtime.ForwardResponseMessage ) diff --git a/x/claim/types/tx.pb.go b/x/claim/types/tx.pb.go index 2b83ae35db..64794196f8 100644 --- a/x/claim/types/tx.pb.go +++ b/x/claim/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: claim/v1beta1/tx.proto +// source: stride/claim/tx.proto package types @@ -41,7 +41,7 @@ func (m *MsgSetAirdropAllocations) Reset() { *m = MsgSetAirdropAllocatio func (m *MsgSetAirdropAllocations) String() string { return proto.CompactTextString(m) } func (*MsgSetAirdropAllocations) ProtoMessage() {} func (*MsgSetAirdropAllocations) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{0} + return fileDescriptor_9d435242bf328977, []int{0} } func (m *MsgSetAirdropAllocations) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -98,7 +98,7 @@ func (m *MsgSetAirdropAllocationsResponse) Reset() { *m = MsgSetAirdropA func (m *MsgSetAirdropAllocationsResponse) String() string { return proto.CompactTextString(m) } func (*MsgSetAirdropAllocationsResponse) ProtoMessage() {} func (*MsgSetAirdropAllocationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{1} + return fileDescriptor_9d435242bf328977, []int{1} } func (m *MsgSetAirdropAllocationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -136,7 +136,7 @@ func (m *MsgClaimFreeAmount) Reset() { *m = MsgClaimFreeAmount{} } func (m *MsgClaimFreeAmount) String() string { return proto.CompactTextString(m) } func (*MsgClaimFreeAmount) ProtoMessage() {} func (*MsgClaimFreeAmount) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{2} + return fileDescriptor_9d435242bf328977, []int{2} } func (m *MsgClaimFreeAmount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,7 +187,7 @@ func (m *MsgClaimFreeAmountResponse) Reset() { *m = MsgClaimFreeAmountRe func (m *MsgClaimFreeAmountResponse) String() string { return proto.CompactTextString(m) } func (*MsgClaimFreeAmountResponse) ProtoMessage() {} func (*MsgClaimFreeAmountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{3} + return fileDescriptor_9d435242bf328977, []int{3} } func (m *MsgClaimFreeAmountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -235,7 +235,7 @@ func (m *MsgCreateAirdrop) Reset() { *m = MsgCreateAirdrop{} } func (m *MsgCreateAirdrop) String() string { return proto.CompactTextString(m) } func (*MsgCreateAirdrop) ProtoMessage() {} func (*MsgCreateAirdrop) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{4} + return fileDescriptor_9d435242bf328977, []int{4} } func (m *MsgCreateAirdrop) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -306,7 +306,7 @@ func (m *MsgCreateAirdropResponse) Reset() { *m = MsgCreateAirdropRespon func (m *MsgCreateAirdropResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateAirdropResponse) ProtoMessage() {} func (*MsgCreateAirdropResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{5} + return fileDescriptor_9d435242bf328977, []int{5} } func (m *MsgCreateAirdropResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,7 +344,7 @@ func (m *MsgDeleteAirdrop) Reset() { *m = MsgDeleteAirdrop{} } func (m *MsgDeleteAirdrop) String() string { return proto.CompactTextString(m) } func (*MsgDeleteAirdrop) ProtoMessage() {} func (*MsgDeleteAirdrop) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{6} + return fileDescriptor_9d435242bf328977, []int{6} } func (m *MsgDeleteAirdrop) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -394,7 +394,7 @@ func (m *MsgDeleteAirdropResponse) Reset() { *m = MsgDeleteAirdropRespon func (m *MsgDeleteAirdropResponse) String() string { return proto.CompactTextString(m) } func (*MsgDeleteAirdropResponse) ProtoMessage() {} func (*MsgDeleteAirdropResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2477aa15a389ceb5, []int{7} + return fileDescriptor_9d435242bf328977, []int{7} } func (m *MsgDeleteAirdropResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -424,59 +424,58 @@ func (m *MsgDeleteAirdropResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgDeleteAirdropResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgSetAirdropAllocations)(nil), "Stridelabs.stride.claim.v1beta1.MsgSetAirdropAllocations") - proto.RegisterType((*MsgSetAirdropAllocationsResponse)(nil), "Stridelabs.stride.claim.v1beta1.MsgSetAirdropAllocationsResponse") - proto.RegisterType((*MsgClaimFreeAmount)(nil), "Stridelabs.stride.claim.v1beta1.MsgClaimFreeAmount") - proto.RegisterType((*MsgClaimFreeAmountResponse)(nil), "Stridelabs.stride.claim.v1beta1.MsgClaimFreeAmountResponse") - proto.RegisterType((*MsgCreateAirdrop)(nil), "Stridelabs.stride.claim.v1beta1.MsgCreateAirdrop") - proto.RegisterType((*MsgCreateAirdropResponse)(nil), "Stridelabs.stride.claim.v1beta1.MsgCreateAirdropResponse") - proto.RegisterType((*MsgDeleteAirdrop)(nil), "Stridelabs.stride.claim.v1beta1.MsgDeleteAirdrop") - proto.RegisterType((*MsgDeleteAirdropResponse)(nil), "Stridelabs.stride.claim.v1beta1.MsgDeleteAirdropResponse") -} - -func init() { proto.RegisterFile("claim/v1beta1/tx.proto", fileDescriptor_2477aa15a389ceb5) } - -var fileDescriptor_2477aa15a389ceb5 = []byte{ - // 618 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0x8e, 0x49, 0x0a, 0xe4, 0xaa, 0x16, 0x38, 0x15, 0xe4, 0x5a, 0xd4, 0x8e, 0x3c, 0xa0, 0x48, - 0xa8, 0x36, 0x6d, 0xa7, 0xc2, 0x42, 0xd2, 0x82, 0x84, 0xd4, 0x2e, 0x6e, 0xa7, 0x2e, 0xd5, 0xd9, - 0x3e, 0xdc, 0x13, 0xb6, 0x2f, 0xba, 0xbb, 0x94, 0x76, 0x60, 0xe2, 0x0f, 0x74, 0xe1, 0x07, 0x30, - 0xb0, 0xf0, 0x4b, 0x3a, 0x76, 0x44, 0x0c, 0x01, 0x25, 0xff, 0xa0, 0x13, 0x23, 0xba, 0x3b, 0xc7, - 0x4d, 0xd2, 0x56, 0x84, 0xaa, 0x53, 0xee, 0xde, 0xbd, 0xef, 0x7b, 0xef, 0xbe, 0xfb, 0x5e, 0x0c, - 0x9e, 0x44, 0x29, 0x22, 0x99, 0x7f, 0xb8, 0x12, 0x62, 0x81, 0x56, 0x7c, 0x71, 0xe4, 0x75, 0x18, - 0x15, 0x14, 0x3a, 0x3b, 0x82, 0x91, 0x18, 0xa7, 0x28, 0xe4, 0x1e, 0x57, 0x4b, 0x4f, 0x65, 0x7a, - 0x45, 0xa6, 0xb5, 0x90, 0xd0, 0x84, 0xaa, 0x5c, 0x5f, 0xae, 0x34, 0xcc, 0xb2, 0x23, 0xca, 0x33, - 0xca, 0xfd, 0x10, 0x71, 0x5c, 0x92, 0x46, 0x94, 0xe4, 0xfa, 0xdc, 0xfd, 0x63, 0x00, 0x73, 0x9b, - 0x27, 0x3b, 0x58, 0xb4, 0x08, 0x8b, 0x19, 0xed, 0xb4, 0xd2, 0x94, 0x46, 0x48, 0x10, 0x9a, 0x73, - 0xf8, 0x14, 0xd4, 0x91, 0xde, 0x52, 0x66, 0x1a, 0x0d, 0xa3, 0x59, 0x0f, 0x2e, 0x02, 0x70, 0x0b, - 0x40, 0xa4, 0x31, 0xfb, 0x24, 0xc6, 0xb9, 0x20, 0xef, 0x09, 0x66, 0xe6, 0x1d, 0x99, 0xd6, 0x5e, - 0x3a, 0xef, 0x39, 0x8b, 0xc7, 0x28, 0x4b, 0x5f, 0xba, 0x97, 0x73, 0xdc, 0xe0, 0x51, 0x11, 0x7c, - 0x57, 0xc6, 0xe0, 0x02, 0x98, 0xe9, 0x72, 0xcc, 0xb8, 0x59, 0x6d, 0x54, 0x9b, 0xf5, 0x40, 0x6f, - 0xe0, 0x1e, 0xb8, 0xf7, 0x11, 0x93, 0xe4, 0x40, 0x70, 0xb3, 0x26, 0xe3, 0xed, 0xd7, 0xa7, 0x3d, - 0xa7, 0xf2, 0xb3, 0xe7, 0x3c, 0x4b, 0x88, 0x38, 0xe8, 0x86, 0x5e, 0x44, 0x33, 0xbf, 0xb8, 0xa2, - 0xfe, 0x59, 0xe6, 0xf1, 0x07, 0x5f, 0x1c, 0x77, 0x30, 0xf7, 0x36, 0x71, 0x74, 0xde, 0x73, 0xe6, - 0x75, 0x1b, 0x05, 0x8d, 0x1b, 0x0c, 0x09, 0x5d, 0x17, 0x34, 0xae, 0xbb, 0x79, 0x80, 0x79, 0x87, - 0xe6, 0x1c, 0xbb, 0x87, 0x00, 0x6e, 0xf3, 0x64, 0x43, 0x0a, 0xfd, 0x96, 0x61, 0xdc, 0xca, 0x68, - 0x37, 0x17, 0x10, 0x82, 0x9a, 0x6c, 0xaf, 0x90, 0x44, 0xad, 0x6f, 0x57, 0x0d, 0xf7, 0xc4, 0x00, - 0xd6, 0xe5, 0xc2, 0xc3, 0xb6, 0x20, 0x03, 0xf3, 0xea, 0xf1, 0x71, 0xbc, 0x8f, 0xd4, 0x89, 0x52, - 0x6d, 0x76, 0x75, 0xd1, 0xd3, 0x22, 0x78, 0xf2, 0xb9, 0x87, 0xce, 0xf0, 0x36, 0x28, 0xc9, 0xdb, - 0x2f, 0xa4, 0x70, 0xdf, 0x7f, 0x39, 0xcd, 0x29, 0x84, 0x93, 0x00, 0x1e, 0xcc, 0x15, 0x25, 0x74, - 0x6d, 0xf7, 0x9b, 0x01, 0x1e, 0xca, 0x96, 0x18, 0x46, 0x02, 0x17, 0x92, 0xc1, 0x06, 0x98, 0x8d, - 0x89, 0xb4, 0x63, 0xd8, 0xbd, 0xf0, 0xc8, 0x68, 0x08, 0xda, 0x00, 0x4c, 0xea, 0x11, 0x8c, 0x44, - 0xe0, 0x12, 0x00, 0x5c, 0x20, 0x26, 0xf6, 0x05, 0xc9, 0xb0, 0x59, 0x6d, 0x18, 0xcd, 0x5a, 0x50, - 0x57, 0x91, 0x5d, 0x92, 0x61, 0x68, 0x81, 0xfb, 0x71, 0x97, 0xa9, 0x57, 0x31, 0x6b, 0xea, 0xb0, - 0xdc, 0x4b, 0xcb, 0xc4, 0x38, 0xa7, 0x99, 0x39, 0xa3, 0x58, 0xf5, 0xc6, 0xb5, 0x94, 0xa1, 0xc7, - 0xda, 0x2c, 0x9f, 0x73, 0x57, 0x5d, 0x61, 0x13, 0xa7, 0xf8, 0x16, 0xaf, 0x50, 0x54, 0x1c, 0x63, - 0x1d, 0x56, 0x5c, 0xfd, 0x5a, 0x03, 0xd5, 0x6d, 0x9e, 0xc0, 0x2f, 0x06, 0x78, 0x7c, 0xf5, 0x90, - 0xad, 0x7b, 0xff, 0x98, 0x6c, 0xef, 0x3a, 0x97, 0x5a, 0xad, 0x1b, 0x43, 0x4b, 0x27, 0x7d, 0x36, - 0xc0, 0x83, 0x49, 0x7b, 0xaf, 0x4d, 0x43, 0x3b, 0x01, 0xb2, 0x5e, 0xdd, 0x00, 0x54, 0x76, 0xf1, - 0x09, 0xcc, 0x8d, 0xfb, 0x6a, 0x65, 0x2a, 0xb6, 0x51, 0x88, 0xb5, 0xfe, 0xdf, 0x90, 0xd1, 0xf2, - 0xe3, 0x9e, 0x98, 0xaa, 0xfc, 0x18, 0x64, 0xba, 0xf2, 0x57, 0x7a, 0xa4, 0xfd, 0xe6, 0xb4, 0x6f, - 0x1b, 0x67, 0x7d, 0xdb, 0xf8, 0xdd, 0xb7, 0x8d, 0x93, 0x81, 0x5d, 0x39, 0x1b, 0xd8, 0x95, 0x1f, - 0x03, 0xbb, 0xb2, 0xf7, 0x7c, 0x64, 0x58, 0x35, 0xfd, 0xf2, 0x16, 0x0a, 0xb9, 0xaf, 0xf9, 0xfd, - 0x23, 0x5f, 0x7f, 0x2c, 0xd4, 0xd4, 0x86, 0x77, 0xd5, 0x3f, 0xfa, 0xda, 0xdf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x26, 0xb8, 0x69, 0x2c, 0x42, 0x06, 0x00, 0x00, + proto.RegisterType((*MsgSetAirdropAllocations)(nil), "stride.claim.MsgSetAirdropAllocations") + proto.RegisterType((*MsgSetAirdropAllocationsResponse)(nil), "stride.claim.MsgSetAirdropAllocationsResponse") + proto.RegisterType((*MsgClaimFreeAmount)(nil), "stride.claim.MsgClaimFreeAmount") + proto.RegisterType((*MsgClaimFreeAmountResponse)(nil), "stride.claim.MsgClaimFreeAmountResponse") + proto.RegisterType((*MsgCreateAirdrop)(nil), "stride.claim.MsgCreateAirdrop") + proto.RegisterType((*MsgCreateAirdropResponse)(nil), "stride.claim.MsgCreateAirdropResponse") + proto.RegisterType((*MsgDeleteAirdrop)(nil), "stride.claim.MsgDeleteAirdrop") + proto.RegisterType((*MsgDeleteAirdropResponse)(nil), "stride.claim.MsgDeleteAirdropResponse") +} + +func init() { proto.RegisterFile("stride/claim/tx.proto", fileDescriptor_9d435242bf328977) } + +var fileDescriptor_9d435242bf328977 = []byte{ + // 605 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbd, 0x6e, 0xdb, 0x3c, + 0x14, 0xb5, 0x3e, 0x3b, 0x5f, 0x6b, 0xa6, 0x49, 0x5b, 0x22, 0x01, 0x14, 0xa1, 0x91, 0x05, 0x0d, + 0x86, 0x97, 0x50, 0x4d, 0xb2, 0x75, 0xaa, 0x9d, 0xa0, 0x68, 0x81, 0x78, 0x51, 0x02, 0x14, 0x08, + 0x50, 0x18, 0xfa, 0x61, 0x15, 0xa2, 0x96, 0x68, 0x90, 0xb4, 0x9b, 0x3c, 0x41, 0xd7, 0xbc, 0x44, + 0x97, 0x3e, 0x49, 0xc6, 0x8c, 0x45, 0x07, 0xb7, 0xb0, 0xdf, 0x20, 0x53, 0xc7, 0x82, 0xa4, 0xec, + 0xc8, 0x3f, 0x69, 0x33, 0x64, 0x92, 0x78, 0xee, 0xe5, 0xb9, 0x97, 0xe7, 0x1e, 0x12, 0x6c, 0x72, + 0xc1, 0x48, 0x8c, 0xbd, 0xa8, 0x1b, 0x90, 0xd4, 0x13, 0xe7, 0xa8, 0xc7, 0xa8, 0xa0, 0xf0, 0x89, + 0x86, 0x91, 0x82, 0xad, 0x8d, 0x84, 0x26, 0x54, 0x05, 0x3c, 0xf9, 0xa7, 0x73, 0x2c, 0x3b, 0xa2, + 0x3c, 0xa5, 0xdc, 0x0b, 0x03, 0x8e, 0xbd, 0xc1, 0x6e, 0x88, 0x45, 0xb0, 0xeb, 0x45, 0x94, 0x64, + 0x3a, 0xee, 0xfe, 0x36, 0x80, 0xd9, 0xe6, 0xc9, 0x31, 0x16, 0x4d, 0xc2, 0x62, 0x46, 0x7b, 0xcd, + 0x6e, 0x97, 0x46, 0x81, 0x20, 0x34, 0xe3, 0xf0, 0x05, 0xa8, 0x06, 0x7a, 0x49, 0x99, 0x69, 0x38, + 0x46, 0xa3, 0xea, 0xdf, 0x02, 0xf0, 0x08, 0xc0, 0x40, 0xef, 0xe9, 0x90, 0x18, 0x67, 0x82, 0x7c, + 0x24, 0x98, 0x99, 0xff, 0xc9, 0xb4, 0xd6, 0xf6, 0xcd, 0xb0, 0xb6, 0x75, 0x11, 0xa4, 0xdd, 0x57, + 0xee, 0x62, 0x8e, 0xeb, 0x3f, 0xcf, 0xc1, 0x77, 0x53, 0x0c, 0x6e, 0x80, 0x95, 0x3e, 0xc7, 0x8c, + 0x9b, 0x65, 0xa7, 0xdc, 0xa8, 0xfa, 0x7a, 0x01, 0x4f, 0xc1, 0xa3, 0xcf, 0x98, 0x24, 0x67, 0x82, + 0x9b, 0x15, 0x89, 0xb7, 0x5e, 0x5f, 0x0d, 0x6b, 0xa5, 0x1f, 0xc3, 0x5a, 0x3d, 0x21, 0xe2, 0xac, + 0x1f, 0xa2, 0x88, 0xa6, 0x5e, 0x7e, 0x44, 0xfd, 0xd9, 0xe1, 0xf1, 0x27, 0x4f, 0x5c, 0xf4, 0x30, + 0x47, 0x87, 0x38, 0xba, 0x19, 0xd6, 0xd6, 0x75, 0x1b, 0x39, 0x8d, 0xeb, 0x4f, 0x08, 0x5d, 0x17, + 0x38, 0x77, 0x9d, 0xdc, 0xc7, 0xbc, 0x47, 0x33, 0x8e, 0xdd, 0x01, 0x80, 0x6d, 0x9e, 0x1c, 0x48, + 0x81, 0xdf, 0x30, 0x8c, 0x9b, 0x29, 0xed, 0x67, 0x02, 0x42, 0x50, 0x91, 0xed, 0xe5, 0x92, 0xa8, + 0xff, 0x87, 0x55, 0xc3, 0xbd, 0x34, 0x80, 0xb5, 0x58, 0x78, 0xd2, 0x16, 0x64, 0x60, 0x5d, 0x0d, + 0x1d, 0xc7, 0x9d, 0x40, 0x45, 0x94, 0x6a, 0xab, 0x7b, 0x5b, 0x48, 0x8b, 0x80, 0xe4, 0xb8, 0x51, + 0x3e, 0x6e, 0x74, 0x40, 0x49, 0xd6, 0x7a, 0x29, 0x85, 0xfb, 0xf6, 0xb3, 0xd6, 0xb8, 0x87, 0x70, + 0x72, 0x03, 0xf7, 0xd7, 0xf2, 0x12, 0xba, 0xb6, 0xfb, 0xd5, 0x00, 0xcf, 0x64, 0x4b, 0x0c, 0x07, + 0x02, 0xe7, 0x92, 0x41, 0x07, 0xac, 0xc6, 0x44, 0xda, 0x30, 0xec, 0xdf, 0x7a, 0xa4, 0x08, 0x41, + 0x1b, 0x80, 0x79, 0x3d, 0xfc, 0x02, 0x02, 0xb7, 0x01, 0xe0, 0x22, 0x60, 0xa2, 0x23, 0x48, 0x8a, + 0xcd, 0xb2, 0x63, 0x34, 0x2a, 0x7e, 0x55, 0x21, 0x27, 0x24, 0xc5, 0xd0, 0x02, 0x8f, 0xe3, 0x3e, + 0x53, 0x53, 0x31, 0x2b, 0x2a, 0x38, 0x5d, 0x4b, 0xcb, 0xc4, 0x38, 0xa3, 0xa9, 0xb9, 0xa2, 0x58, + 0xf5, 0xc2, 0xb5, 0x94, 0xa1, 0x67, 0xda, 0x9c, 0x8e, 0xf3, 0x44, 0x1d, 0xe1, 0x10, 0x77, 0xf1, + 0x03, 0x1e, 0x21, 0xaf, 0x38, 0xc3, 0x3a, 0xa9, 0xb8, 0xf7, 0xa5, 0x0c, 0xca, 0x6d, 0x9e, 0x40, + 0x0a, 0x36, 0x97, 0xdf, 0xb1, 0x3a, 0x2a, 0xde, 0x62, 0x74, 0x97, 0x23, 0x2d, 0x74, 0xbf, 0xbc, + 0xa9, 0x45, 0x3e, 0x80, 0xa7, 0xf3, 0xb6, 0x75, 0x16, 0x28, 0xe6, 0x32, 0xac, 0xc6, 0xbf, 0x32, + 0xa6, 0xf4, 0xef, 0xc1, 0xda, 0xac, 0x13, 0xec, 0xc5, 0xad, 0xc5, 0xb8, 0x55, 0xff, 0x7b, 0xbc, + 0x48, 0x3c, 0x3b, 0x9f, 0x45, 0xe2, 0x99, 0xf8, 0x12, 0xe2, 0xa5, 0x93, 0x68, 0xbd, 0xbd, 0x1a, + 0xd9, 0xc6, 0xf5, 0xc8, 0x36, 0x7e, 0x8d, 0x6c, 0xe3, 0x72, 0x6c, 0x97, 0xae, 0xc7, 0x76, 0xe9, + 0xfb, 0xd8, 0x2e, 0x9d, 0xa2, 0xc2, 0x95, 0x38, 0x56, 0x5c, 0x3b, 0x47, 0x41, 0xc8, 0xbd, 0xfc, + 0xd5, 0x1d, 0xec, 0x7b, 0xe7, 0x93, 0xa7, 0x57, 0x5e, 0x8f, 0xf0, 0x7f, 0xf5, 0x74, 0xee, 0xff, + 0x09, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x69, 0xc1, 0xa7, 0x97, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -507,7 +506,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) SetAirdropAllocations(ctx context.Context, in *MsgSetAirdropAllocations, opts ...grpc.CallOption) (*MsgSetAirdropAllocationsResponse, error) { out := new(MsgSetAirdropAllocationsResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Msg/SetAirdropAllocations", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Msg/SetAirdropAllocations", in, out, opts...) if err != nil { return nil, err } @@ -516,7 +515,7 @@ func (c *msgClient) SetAirdropAllocations(ctx context.Context, in *MsgSetAirdrop func (c *msgClient) ClaimFreeAmount(ctx context.Context, in *MsgClaimFreeAmount, opts ...grpc.CallOption) (*MsgClaimFreeAmountResponse, error) { out := new(MsgClaimFreeAmountResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Msg/ClaimFreeAmount", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Msg/ClaimFreeAmount", in, out, opts...) if err != nil { return nil, err } @@ -525,7 +524,7 @@ func (c *msgClient) ClaimFreeAmount(ctx context.Context, in *MsgClaimFreeAmount, func (c *msgClient) CreateAirdrop(ctx context.Context, in *MsgCreateAirdrop, opts ...grpc.CallOption) (*MsgCreateAirdropResponse, error) { out := new(MsgCreateAirdropResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Msg/CreateAirdrop", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Msg/CreateAirdrop", in, out, opts...) if err != nil { return nil, err } @@ -534,7 +533,7 @@ func (c *msgClient) CreateAirdrop(ctx context.Context, in *MsgCreateAirdrop, opt func (c *msgClient) DeleteAirdrop(ctx context.Context, in *MsgDeleteAirdrop, opts ...grpc.CallOption) (*MsgDeleteAirdropResponse, error) { out := new(MsgDeleteAirdropResponse) - err := c.cc.Invoke(ctx, "/Stridelabs.stride.claim.v1beta1.Msg/DeleteAirdrop", in, out, opts...) + err := c.cc.Invoke(ctx, "/stride.claim.Msg/DeleteAirdrop", in, out, opts...) if err != nil { return nil, err } @@ -580,7 +579,7 @@ func _Msg_SetAirdropAllocations_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Msg/SetAirdropAllocations", + FullMethod: "/stride.claim.Msg/SetAirdropAllocations", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SetAirdropAllocations(ctx, req.(*MsgSetAirdropAllocations)) @@ -598,7 +597,7 @@ func _Msg_ClaimFreeAmount_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Msg/ClaimFreeAmount", + FullMethod: "/stride.claim.Msg/ClaimFreeAmount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).ClaimFreeAmount(ctx, req.(*MsgClaimFreeAmount)) @@ -616,7 +615,7 @@ func _Msg_CreateAirdrop_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Msg/CreateAirdrop", + FullMethod: "/stride.claim.Msg/CreateAirdrop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).CreateAirdrop(ctx, req.(*MsgCreateAirdrop)) @@ -634,7 +633,7 @@ func _Msg_DeleteAirdrop_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Stridelabs.stride.claim.v1beta1.Msg/DeleteAirdrop", + FullMethod: "/stride.claim.Msg/DeleteAirdrop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).DeleteAirdrop(ctx, req.(*MsgDeleteAirdrop)) @@ -643,7 +642,7 @@ func _Msg_DeleteAirdrop_Handler(srv interface{}, ctx context.Context, dec func(i } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "Stridelabs.stride.claim.v1beta1.Msg", + ServiceName: "stride.claim.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -664,7 +663,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "claim/v1beta1/tx.proto", + Metadata: "stride/claim/tx.proto", } func (m *MsgSetAirdropAllocations) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/vesting/types/tx.pb.go b/x/claim/vesting/types/tx.pb.go index a1b9ac0b5c..db61c60cee 100644 --- a/x/claim/vesting/types/tx.pb.go +++ b/x/claim/vesting/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: vesting/tx.proto +// source: stride/vesting/tx.proto package types @@ -26,22 +26,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -func init() { proto.RegisterFile("vesting/tx.proto", fileDescriptor_16f610ff571f6d68) } +func init() { proto.RegisterFile("stride/vesting/tx.proto", fileDescriptor_5ebed07aad5e90bd) } -var fileDescriptor_16f610ff571f6d68 = []byte{ - // 189 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x28, 0x4b, 0x2d, 0x2e, - 0xc9, 0xcc, 0x4b, 0xd7, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x0c, 0x2e, - 0x29, 0xca, 0x4c, 0x49, 0xcd, 0x49, 0x4c, 0x2a, 0xd6, 0x2b, 0x06, 0x33, 0xf5, 0xa0, 0x6a, 0xa4, - 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xaa, 0xf4, 0x41, 0x2c, 0x88, 0x06, 0x29, 0xb9, 0xe4, 0xfc, - 0xe2, 0xdc, 0xfc, 0x62, 0xfd, 0xa4, 0xc4, 0xe2, 0x54, 0xfd, 0x32, 0xc3, 0xa4, 0xd4, 0x92, 0x44, - 0x43, 0xfd, 0xe4, 0xfc, 0xcc, 0x3c, 0x34, 0xf9, 0xc4, 0xd2, 0x92, 0x0c, 0xb8, 0x3c, 0x88, 0x03, - 0x91, 0x37, 0x62, 0xe5, 0x62, 0xf6, 0x2d, 0x4e, 0x77, 0xf2, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, - 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, - 0xc6, 0x63, 0x39, 0x86, 0x28, 0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0x7d, 0x88, 0xe3, 0x74, 0x7d, 0x12, 0x93, 0x8a, 0xf5, 0x21, 0xae, 0xd3, 0xaf, 0xd0, 0x4f, 0xce, - 0x49, 0xcc, 0xcc, 0xd5, 0x87, 0xfb, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x6c, 0xb8, 0x31, - 0x20, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x67, 0x0a, 0x4d, 0xe1, 0x00, 0x00, 0x00, +var fileDescriptor_5ebed07aad5e90bd = []byte{ + // 185 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x2e, 0x29, 0xca, + 0x4c, 0x49, 0xd5, 0x2f, 0x4b, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, 0xd7, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, + 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x83, 0x48, 0xe8, 0x41, 0x25, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, + 0xc1, 0x52, 0xfa, 0x20, 0x16, 0x44, 0x95, 0x94, 0x5c, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0xb1, 0x7e, + 0x52, 0x62, 0x71, 0xaa, 0x7e, 0x99, 0x61, 0x52, 0x6a, 0x49, 0xa2, 0xa1, 0x7e, 0x72, 0x7e, 0x66, + 0x1e, 0x9a, 0x7c, 0x62, 0x69, 0x49, 0x06, 0x5c, 0x1e, 0xc4, 0x81, 0xc8, 0x1b, 0xb1, 0x72, 0x31, + 0xfb, 0x16, 0xa7, 0x3b, 0x05, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, + 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, + 0x59, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x30, 0xd8, 0x45, 0xba, + 0x3e, 0x89, 0x49, 0xc5, 0xfa, 0x30, 0x67, 0x1b, 0xeb, 0x57, 0xe8, 0x27, 0xe7, 0x24, 0x66, 0xe6, + 0x22, 0x7c, 0x50, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x36, 0xdf, 0x18, 0x10, 0x00, 0x00, 0xff, + 0xff, 0x40, 0x21, 0x2e, 0x87, 0xe0, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -79,9 +79,9 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) { } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "Stridelabs.stride.vesting.Msg", + ServiceName: "stride.vesting.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{}, - Metadata: "vesting/tx.proto", + Metadata: "stride/vesting/tx.proto", } diff --git a/x/claim/vesting/types/vesting.pb.go b/x/claim/vesting/types/vesting.pb.go index 2cb99110a7..21a1a45068 100644 --- a/x/claim/vesting/types/vesting.pb.go +++ b/x/claim/vesting/types/vesting.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: vesting/vesting.proto +// source: stride/vesting/vesting.proto package types @@ -39,7 +39,7 @@ type BaseVestingAccount struct { func (m *BaseVestingAccount) Reset() { *m = BaseVestingAccount{} } func (*BaseVestingAccount) ProtoMessage() {} func (*BaseVestingAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_50dbe096578ec44c, []int{0} + return fileDescriptor_41f0278a453c26b3, []int{0} } func (m *BaseVestingAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -70,15 +70,16 @@ var xxx_messageInfo_BaseVestingAccount proto.InternalMessageInfo // Period defines a length of time and amount of coins that will vest. type Period struct { - StartTime int64 `protobuf:"varint,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` - Length int64 `protobuf:"varint,2,opt,name=length,proto3" json:"length,omitempty"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` + StartTime int64 `protobuf:"varint,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + Length int64 `protobuf:"varint,2,opt,name=length,proto3" json:"length,omitempty"` + Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` + ActionType int32 `protobuf:"varint,4,opt,name=action_type,json=actionType,proto3" json:"action_type,omitempty"` } func (m *Period) Reset() { *m = Period{} } func (*Period) ProtoMessage() {} func (*Period) Descriptor() ([]byte, []int) { - return fileDescriptor_50dbe096578ec44c, []int{1} + return fileDescriptor_41f0278a453c26b3, []int{1} } func (m *Period) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -128,6 +129,13 @@ func (m *Period) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { return nil } +func (m *Period) GetActionType() int32 { + if m != nil { + return m.ActionType + } + return 0 +} + // StridePeriodicVestingAccount implements the VestingAccount interface. It // periodically vests by unlocking coins during each specified period. type StridePeriodicVestingAccount struct { @@ -138,7 +146,7 @@ type StridePeriodicVestingAccount struct { func (m *StridePeriodicVestingAccount) Reset() { *m = StridePeriodicVestingAccount{} } func (*StridePeriodicVestingAccount) ProtoMessage() {} func (*StridePeriodicVestingAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_50dbe096578ec44c, []int{2} + return fileDescriptor_41f0278a453c26b3, []int{2} } func (m *StridePeriodicVestingAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,51 +176,52 @@ func (m *StridePeriodicVestingAccount) XXX_DiscardUnknown() { var xxx_messageInfo_StridePeriodicVestingAccount proto.InternalMessageInfo func init() { - proto.RegisterType((*BaseVestingAccount)(nil), "Stridelabs.stride.vesting.BaseVestingAccount") - proto.RegisterType((*Period)(nil), "Stridelabs.stride.vesting.Period") - proto.RegisterType((*StridePeriodicVestingAccount)(nil), "Stridelabs.stride.vesting.StridePeriodicVestingAccount") -} - -func init() { proto.RegisterFile("vesting/vesting.proto", fileDescriptor_50dbe096578ec44c) } - -var fileDescriptor_50dbe096578ec44c = []byte{ - // 567 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xf6, 0x35, 0x21, 0x94, 0x0b, 0x34, 0xc5, 0xb4, 0xc5, 0xad, 0xc0, 0x0e, 0x9e, 0xb2, 0xc4, - 0xa6, 0xed, 0x96, 0x0d, 0x23, 0x21, 0x55, 0x14, 0x09, 0x19, 0xc4, 0xc0, 0x12, 0x9d, 0xed, 0xc3, - 0x39, 0xb0, 0x7d, 0x91, 0xef, 0x52, 0xd1, 0x7f, 0x80, 0xc4, 0x02, 0x12, 0x03, 0x63, 0xe7, 0xfe, - 0x92, 0x8e, 0x11, 0x13, 0x53, 0x40, 0xc9, 0x3f, 0xe8, 0xca, 0x82, 0x7c, 0x77, 0x4e, 0xc0, 0x15, - 0x44, 0xed, 0x64, 0xdf, 0xbd, 0xf7, 0x7d, 0xef, 0x7b, 0xef, 0xee, 0x3b, 0xb8, 0x79, 0x84, 0x19, - 0x27, 0x59, 0xec, 0xaa, 0xaf, 0x33, 0xcc, 0x29, 0xa7, 0xfa, 0xf6, 0x0b, 0x9e, 0x93, 0x08, 0x27, - 0x28, 0x60, 0x0e, 0x13, 0xbf, 0x8e, 0x4a, 0xd8, 0xd9, 0x88, 0x69, 0x4c, 0x45, 0x96, 0x5b, 0xfc, - 0x49, 0xc0, 0x8e, 0x19, 0x52, 0x96, 0x52, 0xe6, 0x06, 0x88, 0x61, 0xf7, 0x68, 0x37, 0xc0, 0x1c, - 0xed, 0xba, 0x21, 0x25, 0x59, 0x25, 0x8e, 0x46, 0x7c, 0x30, 0x8f, 0x17, 0x0b, 0x19, 0xb7, 0xbf, - 0xd5, 0xa1, 0xee, 0x21, 0x86, 0x5f, 0xc9, 0x2a, 0x8f, 0xc2, 0x90, 0x8e, 0x32, 0xae, 0x1f, 0xc0, - 0x9b, 0x05, 0x63, 0x1f, 0xc9, 0xb5, 0x01, 0xda, 0xa0, 0xd3, 0xdc, 0x6b, 0x3b, 0x92, 0xcd, 0x11, - 0x04, 0x8a, 0xcd, 0x29, 0xe0, 0x0a, 0xe7, 0xd5, 0xc7, 0x13, 0x0b, 0xf8, 0xcd, 0x60, 0xb1, 0xa5, - 0x7f, 0x06, 0x70, 0x9d, 0xe6, 0x24, 0x26, 0x19, 0x4a, 0xfa, 0xaa, 0x19, 0x63, 0xa5, 0x5d, 0xeb, - 0x34, 0xf7, 0xb6, 0x4b, 0xbe, 0x22, 0x7f, 0xce, 0xf7, 0x98, 0x92, 0xcc, 0x7b, 0x7a, 0x36, 0xb1, - 0xb4, 0xf3, 0x89, 0x75, 0xf7, 0x18, 0xa5, 0x49, 0xcf, 0xae, 0x12, 0xd8, 0xa7, 0x3f, 0xac, 0x4e, - 0x4c, 0xf8, 0x60, 0x14, 0x38, 0x21, 0x4d, 0x5d, 0xd5, 0xa5, 0xfc, 0x74, 0x59, 0xf4, 0xce, 0xe5, - 0xc7, 0x43, 0xcc, 0x04, 0x17, 0xf3, 0x5b, 0x25, 0x5c, 0x75, 0xa9, 0x7f, 0x04, 0x70, 0x2d, 0xc2, - 0x09, 0x8e, 0x11, 0xc7, 0x51, 0xff, 0x4d, 0x8e, 0xb1, 0x51, 0x5b, 0xa6, 0xe8, 0x40, 0x29, 0xda, - 0x94, 0x8a, 0xfe, 0x86, 0x5f, 0x4e, 0xcf, 0xad, 0x39, 0xf8, 0x49, 0x8e, 0xb1, 0xfe, 0x05, 0xc0, - 0xdb, 0x0b, 0xba, 0x72, 0x44, 0xf5, 0x65, 0x82, 0x0e, 0x95, 0x20, 0xa3, 0x2a, 0xe8, 0x4a, 0x33, - 0x5a, 0x9f, 0xe3, 0xcb, 0x21, 0x39, 0x70, 0x15, 0x67, 0x51, 0x9f, 0x93, 0x14, 0x1b, 0xd7, 0xda, - 0xa0, 0x53, 0xf3, 0xee, 0x9c, 0x4f, 0xac, 0x96, 0xac, 0x56, 0x46, 0x6c, 0xff, 0x3a, 0xce, 0xa2, - 0x97, 0x24, 0xc5, 0xbd, 0xd5, 0x0f, 0x27, 0x96, 0xf6, 0xf5, 0xc4, 0xd2, 0xec, 0x53, 0x00, 0x1b, - 0xcf, 0x71, 0x4e, 0x68, 0xa4, 0xdf, 0x87, 0x90, 0x71, 0x94, 0x73, 0x49, 0x53, 0x5c, 0xa3, 0x9a, - 0x7f, 0x43, 0xec, 0x14, 0x18, 0x7d, 0x0b, 0x36, 0x12, 0x9c, 0xc5, 0x7c, 0x60, 0xac, 0x88, 0x90, - 0x5a, 0xe9, 0x21, 0x6c, 0xa0, 0x54, 0xdc, 0xbc, 0xa5, 0xe7, 0xf2, 0xb0, 0x18, 0xc3, 0xa5, 0x5a, - 0x55, 0xd4, 0xbd, 0xba, 0x10, 0xfb, 0x0b, 0xc0, 0x7b, 0xd2, 0x75, 0x52, 0x32, 0x09, 0x2b, 0x5e, - 0xc0, 0x70, 0x43, 0x78, 0x41, 0x8d, 0xb5, 0xe2, 0x89, 0xae, 0xf3, 0x4f, 0xcb, 0x3a, 0x17, 0x8d, - 0xa5, 0x0c, 0xa2, 0x07, 0x17, 0x2d, 0xf7, 0x16, 0xb6, 0xca, 0x0a, 0x43, 0x21, 0x84, 0xa9, 0xde, - 0x1f, 0xfc, 0xa7, 0x82, 0x94, 0xec, 0x99, 0xea, 0x2a, 0x6c, 0xc9, 0xc3, 0xa9, 0xf0, 0xd8, 0xfe, - 0x9a, 0xda, 0x91, 0xe9, 0x6c, 0x71, 0x54, 0xde, 0xb3, 0xb3, 0xa9, 0x09, 0xc6, 0x53, 0x13, 0xfc, - 0x9c, 0x9a, 0xe0, 0xd3, 0xcc, 0xd4, 0xc6, 0x33, 0x53, 0xfb, 0x3e, 0x33, 0xb5, 0xd7, 0xfb, 0x7f, - 0xcc, 0x53, 0x0a, 0xe8, 0x1e, 0xa2, 0x80, 0xb9, 0x52, 0x81, 0xfb, 0xde, 0x0d, 0x13, 0x44, 0xd2, - 0xf2, 0xfd, 0x92, 0x03, 0x0e, 0x1a, 0xe2, 0x55, 0xd9, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc1, - 0xeb, 0x7f, 0xdd, 0xdf, 0x04, 0x00, 0x00, + proto.RegisterType((*BaseVestingAccount)(nil), "stride.vesting.BaseVestingAccount") + proto.RegisterType((*Period)(nil), "stride.vesting.Period") + proto.RegisterType((*StridePeriodicVestingAccount)(nil), "stride.vesting.StridePeriodicVestingAccount") +} + +func init() { proto.RegisterFile("stride/vesting/vesting.proto", fileDescriptor_41f0278a453c26b3) } + +var fileDescriptor_41f0278a453c26b3 = []byte{ + // 589 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xd3, 0x3e, + 0x1c, 0x8d, 0xd7, 0xae, 0xff, 0xfd, 0x5d, 0x58, 0x47, 0x18, 0x25, 0x4c, 0x23, 0xa9, 0x72, 0xea, + 0x65, 0x09, 0xdb, 0x24, 0x0e, 0xbd, 0x11, 0x24, 0xa4, 0x89, 0x1d, 0xa6, 0x30, 0x71, 0xd8, 0x25, + 0x72, 0x12, 0x93, 0x5a, 0x34, 0x71, 0x15, 0xbb, 0x13, 0xfd, 0x06, 0x48, 0x5c, 0x40, 0xe2, 0xc0, + 0x71, 0x67, 0x3e, 0xc9, 0x24, 0x2e, 0x15, 0x27, 0x4e, 0x05, 0xb5, 0xe2, 0x0b, 0xec, 0x13, 0xa0, + 0xd8, 0x4e, 0xcb, 0xb2, 0x43, 0x35, 0x4e, 0x89, 0xfd, 0xf3, 0x7b, 0x7e, 0xbf, 0x67, 0x3f, 0xc3, + 0x5d, 0xc6, 0x73, 0x12, 0x63, 0xf7, 0x1c, 0x33, 0x4e, 0xb2, 0xa4, 0xfc, 0x3a, 0xc3, 0x9c, 0x72, + 0xaa, 0x6f, 0xca, 0xaa, 0xa3, 0x66, 0x77, 0xb6, 0x13, 0x9a, 0x50, 0x51, 0x72, 0x8b, 0x3f, 0xb9, + 0x6a, 0xc7, 0x8c, 0x28, 0x4b, 0x29, 0x73, 0x43, 0xc4, 0xb0, 0x7b, 0xbe, 0x1f, 0x62, 0x8e, 0xf6, + 0xdd, 0x88, 0x92, 0xac, 0x52, 0x47, 0x23, 0xde, 0x5f, 0xd4, 0x8b, 0x81, 0xac, 0xdb, 0xdf, 0xeb, + 0x50, 0xf7, 0x10, 0xc3, 0xaf, 0xe5, 0x2e, 0xcf, 0xa2, 0x88, 0x8e, 0x32, 0xae, 0x1f, 0xc1, 0x3b, + 0x05, 0x63, 0x80, 0xe4, 0xd8, 0x00, 0x1d, 0xd0, 0x6d, 0x1e, 0x74, 0x1c, 0xc9, 0xe6, 0x08, 0x02, + 0xc5, 0xe6, 0x14, 0x70, 0x85, 0xf3, 0xea, 0x93, 0xa9, 0x05, 0xfc, 0x66, 0xb8, 0x9c, 0xd2, 0x3f, + 0x01, 0xb8, 0x45, 0x73, 0x92, 0x90, 0x0c, 0x0d, 0x02, 0xd5, 0x8c, 0xb1, 0xd6, 0xa9, 0x75, 0x9b, + 0x07, 0x8f, 0x4a, 0xbe, 0x62, 0xfd, 0x82, 0xef, 0x39, 0x25, 0x99, 0xf7, 0xf2, 0x72, 0x6a, 0x69, + 0x57, 0x53, 0xeb, 0xe1, 0x18, 0xa5, 0x83, 0x9e, 0x5d, 0x25, 0xb0, 0xbf, 0xfe, 0xb4, 0xba, 0x09, + 0xe1, 0xfd, 0x51, 0xe8, 0x44, 0x34, 0x75, 0x55, 0x97, 0xf2, 0xb3, 0xc7, 0xe2, 0xb7, 0x2e, 0x1f, + 0x0f, 0x31, 0x13, 0x5c, 0xcc, 0x6f, 0x95, 0x70, 0xd5, 0xa5, 0xfe, 0x01, 0xc0, 0xcd, 0x18, 0x0f, + 0x70, 0x82, 0x38, 0x8e, 0x83, 0x37, 0x39, 0xc6, 0x46, 0x6d, 0x95, 0xa2, 0x23, 0xa5, 0xe8, 0x81, + 0x54, 0x74, 0x1d, 0x7e, 0x3b, 0x3d, 0x77, 0x17, 0xe0, 0x17, 0x39, 0xc6, 0xfa, 0x67, 0x00, 0xef, + 0x2d, 0xe9, 0x4a, 0x8b, 0xea, 0xab, 0x04, 0x1d, 0x2b, 0x41, 0x46, 0x55, 0xd0, 0x3f, 0x79, 0xb4, + 0xb5, 0xc0, 0x97, 0x26, 0x39, 0x70, 0x03, 0x67, 0x71, 0xc0, 0x49, 0x8a, 0x8d, 0xf5, 0x0e, 0xe8, + 0xd6, 0xbc, 0xfb, 0x57, 0x53, 0xab, 0x25, 0x77, 0x2b, 0x2b, 0xb6, 0xff, 0x1f, 0xce, 0xe2, 0x53, + 0x92, 0xe2, 0xde, 0xc6, 0xfb, 0x0b, 0x4b, 0xfb, 0x72, 0x61, 0x69, 0xf6, 0x37, 0x00, 0x1b, 0x27, + 0x38, 0x27, 0x34, 0xd6, 0x1f, 0x43, 0xc8, 0x38, 0xca, 0xb9, 0xa4, 0x29, 0xae, 0x51, 0xcd, 0xff, + 0x5f, 0xcc, 0x14, 0x18, 0xbd, 0x0d, 0x1b, 0x03, 0x9c, 0x25, 0xbc, 0x6f, 0xac, 0x89, 0x92, 0x1a, + 0xe9, 0x11, 0x6c, 0xa0, 0x54, 0xdc, 0xbc, 0x95, 0xe7, 0xf2, 0xa4, 0xb0, 0xe1, 0x56, 0xad, 0x2a, + 0x6a, 0xdd, 0x82, 0x4d, 0x14, 0x71, 0x42, 0xb3, 0xa0, 0xa8, 0x1a, 0xf5, 0x0e, 0xe8, 0xae, 0xfb, + 0x50, 0x4e, 0x9d, 0x8e, 0x87, 0xb8, 0x57, 0x17, 0xdd, 0xfc, 0x06, 0x70, 0xf7, 0x95, 0xc8, 0xa2, + 0xec, 0x89, 0x44, 0x95, 0xb0, 0x9c, 0xc1, 0x6d, 0x11, 0x16, 0xe5, 0x7b, 0x25, 0x34, 0xb6, 0x73, + 0x3d, 0xc8, 0xce, 0xcd, 0xb8, 0xa9, 0xd8, 0xe8, 0xe1, 0xcd, 0x20, 0x06, 0xb0, 0x55, 0xd2, 0x0e, + 0xc5, 0xee, 0x4c, 0x39, 0xd2, 0xae, 0xd2, 0x4a, 0x71, 0x9e, 0xa9, 0x6e, 0x45, 0x5b, 0x9e, 0x53, + 0x05, 0x6c, 0xfb, 0x9b, 0x6a, 0x46, 0x2e, 0x67, 0xcb, 0x53, 0xf3, 0x4e, 0x2e, 0x67, 0x26, 0x98, + 0xcc, 0x4c, 0xf0, 0x6b, 0x66, 0x82, 0x8f, 0x73, 0x53, 0x9b, 0xcc, 0x4d, 0xed, 0xc7, 0xdc, 0xd4, + 0xce, 0x9e, 0xfe, 0x65, 0xad, 0x74, 0x62, 0xef, 0x18, 0x85, 0xcc, 0x2d, 0xdf, 0xaf, 0x43, 0xf7, + 0x9d, 0x1b, 0x0d, 0x10, 0x49, 0x17, 0x4f, 0x99, 0xb0, 0x3b, 0x6c, 0x88, 0x37, 0xe6, 0xf0, 0x4f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x83, 0xf7, 0x88, 0xe9, 0x04, 0x00, 0x00, } func (m *BaseVestingAccount) Marshal() (dAtA []byte, err error) { @@ -317,6 +326,11 @@ func (m *Period) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.ActionType != 0 { + i = encodeVarintVesting(dAtA, i, uint64(m.ActionType)) + i-- + dAtA[i] = 0x20 + } if len(m.Amount) > 0 { for iNdEx := len(m.Amount) - 1; iNdEx >= 0; iNdEx-- { { @@ -456,6 +470,9 @@ func (m *Period) Size() (n int) { n += 1 + l + sovVesting(uint64(l)) } } + if m.ActionType != 0 { + n += 1 + sovVesting(uint64(m.ActionType)) + } return n } @@ -792,6 +809,25 @@ func (m *Period) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ActionType", wireType) + } + m.ActionType = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowVesting + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ActionType |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipVesting(dAtA[iNdEx:]) diff --git a/x/claim/vesting/types/vesting_account_test.go b/x/claim/vesting/types/vesting_account_test.go index 984c3ef0be..0362aafb10 100644 --- a/x/claim/vesting/types/vesting_account_test.go +++ b/x/claim/vesting/types/vesting_account_test.go @@ -243,7 +243,7 @@ func TestTrackUndelegationPeriodicVestingAcc(t *testing.T) { func TestStridePeriodicVestingAccountMarshal(t *testing.T) { baseAcc, coins := initBaseAccount() now := tmtime.Now() - acc := types.NewStridePeriodicVestingAccount(baseAcc, coins, types.Periods{types.Period{now.Unix(), 3600, coins}}) + acc := types.NewStridePeriodicVestingAccount(baseAcc, coins, types.Periods{types.Period{now.Unix(), 3600, coins, 0}}) bz, err := app.AccountKeeper.MarshalAccount(acc) require.Nil(t, err)