From c94225b879c511615e94a3a1fc97c3c157699a45 Mon Sep 17 00:00:00 2001 From: mike <142298428+mikebraver@users.noreply.github.com> Date: Thu, 25 Jul 2024 02:39:21 +0800 Subject: [PATCH] fix: fix the dependency and test errors --- go.mod | 92 +- go.sum | 181 +- .../exocore/feedistribute/distribution.proto | 97 +- proto/exocore/feedistribute/params.proto | 8 + proto/exocore/reward/types.proto | 1 + testutil/keeper/feedistribute.go | 56 +- x/feedistribution/keeper/allocation.go | 66 +- x/feedistribution/keeper/keeper.go | 30 +- x/feedistribution/keeper/msg_update_params.go | 2 +- x/feedistribution/keeper/params.go | 5 +- x/feedistribution/types/distribution.pb.go | 1765 ++--------------- x/feedistribution/types/expected_keepers.go | 14 +- x/feedistribution/types/params.pb.go | 91 +- x/reward/types/types.go | 9 +- x/reward/types/types.pb.go | 85 +- 15 files changed, 544 insertions(+), 1958 deletions(-) diff --git a/go.mod b/go.mod index fe8bdcf35..937b37927 100644 --- a/go.mod +++ b/go.mod @@ -9,13 +9,14 @@ require ( cosmossdk.io/tools/rosetta v0.2.1 github.com/agiledragon/gomonkey/v2 v2.11.0 github.com/armon/go-metrics v0.4.1 - github.com/cometbft/cometbft v0.37.7 + github.com/bufbuild/buf v1.7.0 + github.com/cometbft/cometbft v0.37.4 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/btcutil v1.0.5 github.com/cosmos/cosmos-proto v1.0.0-beta.3 github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/gogoproto v1.5.0 + github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/ethereum/go-ethereum v1.13.5-0.20231027145059-2d7dba024d76 github.com/evmos/evmos/v14 v14.0.0-rc4 @@ -29,28 +30,30 @@ require ( github.com/prysmaticlabs/prysm/v4 v4.2.1 github.com/rakyll/statik v0.1.7 github.com/smartystreets/goconvey v1.6.4 - github.com/spf13/cast v1.6.0 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cast v1.5.1 + github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.18.1 + github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.uber.org/mock v0.4.0 - golang.org/x/crypto v0.24.0 + golang.org/x/crypto v0.21.0 golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 + golang.org/x/tools v0.19.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 google.golang.org/grpc v1.60.1 + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 ) require ( - cosmossdk.io/api v0.7.0 + cosmossdk.io/api v0.3.1 github.com/btcsuite/btcd v0.23.3 // indirect github.com/btcsuite/btcd/btcutil v1.1.3 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -59,7 +62,7 @@ require ( github.com/rs/cors v1.11.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/zondax/hid v0.9.2 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.23.0 // indirect ) require ( @@ -67,16 +70,16 @@ require ( cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.5 // indirect - cloud.google.com/go/storage v1.35.1 // indirect - cosmossdk.io/collections v0.4.0 // indirect - cosmossdk.io/core v0.10.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect + cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/log v1.3.0 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/aws/aws-sdk-go v1.44.224 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -84,6 +87,8 @@ require ( github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect + github.com/bufbuild/connect-go v1.0.0 // indirect + github.com/bufbuild/protocompile v0.4.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -91,17 +96,17 @@ require ( github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/cockroachdb/errors v1.10.0 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect - github.com/cosmos/cosmos-db v1.0.0 // indirect + github.com/containerd/containerd v1.6.8 // indirect + github.com/containerd/typeurl v1.0.2 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.1 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/deckarep/golang-set v1.8.0 // indirect @@ -111,15 +116,20 @@ require ( github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect + github.com/docker/distribution v2.8.1+incompatible // indirect + github.com/docker/docker v20.10.24+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.1-0.20231206184617-48ba0b76bc88 // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-chi/chi/v5 v5.0.7 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -130,6 +140,8 @@ require ( github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/gofrs/flock v0.8.1 // indirect + github.com/gofrs/uuid v4.3.0+incompatible // indirect github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect @@ -153,7 +165,6 @@ require ( github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect - github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e // indirect @@ -163,11 +174,15 @@ require ( github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect + github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect + github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect + github.com/jhump/protoreflect v1.15.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/klauspost/compress v1.17.2 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/klauspost/pgzip v1.2.5 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect @@ -185,12 +200,19 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/moby/buildkit v0.10.4 // indirect + github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0-rc2 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect + github.com/pkg/profile v1.6.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect @@ -201,18 +223,17 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rjeczalik/notify v0.9.3 // indirect - github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/zerolog v1.31.0 // indirect - github.com/sagikazarmark/locafero v0.4.0 // indirect - github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect - github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/afero v1.10.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/status-im/keycard-go v0.2.0 // indirect - github.com/subosito/gotenv v1.6.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/supranational/blst v0.3.11 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -228,18 +249,19 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.3.7 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3 // indirect go.opentelemetry.io/otel v1.19.0 // indirect go.opentelemetry.io/otel/metric v1.19.0 // indirect go.opentelemetry.io/otel/trace v1.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/oauth2 v0.15.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.22.1-0.20240620150659-cb3016b76f3e // indirect - google.golang.org/api v0.153.0 // indirect + go.uber.org/zap v1.26.0 // indirect + golang.org/x/mod v0.16.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/api v0.149.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect @@ -247,7 +269,7 @@ require ( gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.7 // indirect - pgregory.net/rapid v1.1.0 // indirect + pgregory.net/rapid v0.5.5 // indirect ) replace ( diff --git a/go.sum b/go.sum index 07e367757..f76a79984 100644 --- a/go.sum +++ b/go.sum @@ -460,8 +460,8 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= -cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w= -cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= @@ -519,14 +519,8 @@ cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= -cosmossdk.io/api v0.7.0 h1:QsEMIWuv9xWDbF2HZnW4Lpu1/SejCztPu0LQx7t6MN4= -cosmossdk.io/api v0.7.0/go.mod h1:kJFAEMLN57y0viszHDPLMmieF0471o5QAwwApa+270M= -cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= -cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= -cosmossdk.io/core v0.10.0 h1:NP28Ol9YyRODmZLJg2ko/mUl40hMegeMzhJnG+XPkcY= -cosmossdk.io/core v0.10.0/go.mod h1:MygXNld9DvMgYY4yE76DM/mdZpgfeyRjy6FPjEEehlY= cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= @@ -551,8 +545,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= -github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/ExocoreNetwork/evmos/v14 v14.1.1-0.20240408040728-a6f685cfebb9 h1:/jL9TiINGniPOG2bRfLmyCFSwMy/vFZ1Ta0OoE+xJaE= github.com/ExocoreNetwork/evmos/v14 v14.1.1-0.20240408040728-a6f685cfebb9/go.mod h1:Hi3CAMxAE+H7Fs7sSHsHKb4DZIURk+trop+mMrjlZqw= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= @@ -644,6 +636,10 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= +github.com/bufbuild/buf v1.7.0 h1:uWRjhIXcrWkzIkA5TqXGyJbF51VW54QJsQZ3nwaes5Q= +github.com/bufbuild/buf v1.7.0/go.mod h1:Go40fMAF46PnPLC7jJgTQhAI95pmC0+VtxFKVC0qLq0= +github.com/bufbuild/connect-go v1.0.0 h1:htSflKUT8y1jxhoPhPYTZMrsY3ipUXjjrbcZR5O2cVo= +github.com/bufbuild/connect-go v1.0.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= @@ -698,6 +694,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -705,23 +703,23 @@ github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+ github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= -github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.7 h1:pwC0PNfGcbKbAKyK/sWm+LwuiYmT00C3bF2nEnnjJ/k= -github.com/cometbft/cometbft v0.37.7/go.mod h1:gFGCFXNGDci6tMLemANPGTfU+j4+oH63PjeLe0iIjJk= +github.com/cometbft/cometbft v0.37.4 h1:xyvvEqlyfK8MgNIIKVJaMsuIp03wxOcFmVkT26+Ikpg= +github.com/cometbft/cometbft v0.37.4/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= +github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= +github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= +github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -730,8 +728,6 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0E= -github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U= github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -753,24 +749,24 @@ github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5s github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7wiiY35fv3ctT+k4M= github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U= github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= @@ -795,6 +791,10 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= +github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= +github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -832,6 +832,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/evmos/cosmos-sdk v0.47.5-evmos.2 h1:fyhM0NYw/FnP4ZBXzQ7k+G4fXhfdU07MONoYrGlOCpc= github.com/evmos/cosmos-sdk v0.47.5-evmos.2/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= github.com/evmos/go-ethereum v1.10.26-evmos-rc2 h1:tYghk1ZZ8X4/OQ4YI9hvtm8aSN8OSqO0g9vo/sCMdBo= @@ -848,12 +850,12 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= -github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= @@ -866,6 +868,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= +github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= @@ -927,6 +931,10 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= +github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= @@ -1134,8 +1142,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= -github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -1170,8 +1176,12 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a h1:d4+I1YEKVmWZrgkt6jpXBnLgV2ZjO0YxEtLDdfIZfH4= +github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a/go.mod h1:Zi/ZFkEqFHTm7qkjyNJjaWH4LQA9LQhGJyF0lTYGpxw= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f h1:BNuUg9k2EiJmlMwjoef3e8vZLHplbVw6DrjGFjLL+Yo= +github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f/go.mod h1:qr2b5kx4HbFS7/g4uYO5qv9ei8303JMsC7ESbYiqr2Q= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -1217,6 +1227,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= +github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= 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= @@ -1293,6 +1305,10 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/moby/buildkit v0.10.4 h1:FvC+buO8isGpUFZ1abdSLdGHZVqg9sqI4BbFL8tlzP4= +github.com/moby/buildkit v0.10.4/go.mod h1:Yajz9vt1Zw5q9Pp4pdb3TCSUXJBIroIQGQ3TTs/sLug= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1302,6 +1318,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -1363,8 +1381,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 h1:W04oB3d0J01W5jgYRGKsV8LCM6g9EkCvPkZcmFuy0OE= @@ -1377,17 +1395,20 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM= +github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -1446,15 +1467,14 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1462,10 +1482,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= -github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= -github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= -github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= 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= @@ -1485,8 +1501,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -1494,23 +1508,25 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= -github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= -github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= 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.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= 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= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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.18.1 h1:rmuU42rScKWlhhJDyXZRKJQHXFX02chSVW1IvkPGiVM= -github.com/spf13/viper v1.18.1/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1534,8 +1550,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= -github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= @@ -1572,8 +1588,8 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -1610,6 +1626,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3 h1:syAz40OyelLZo42+3U68Phisvrx4qh+4wpdZw7eUUdY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.3/go.mod h1:Dts42MGkzZne2yCru741+bFiTMWkIj/LLRizad7b9tw= go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= @@ -1625,7 +1643,11 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= @@ -1637,6 +1659,8 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= @@ -1656,11 +1680,12 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= @@ -1700,8 +1725,8 @@ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1753,6 +1778,7 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/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.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1774,8 +1800,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -1805,8 +1831,8 @@ golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= -golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= -golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1823,8 +1849,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1893,6 +1919,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/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-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/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-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1925,6 +1952,7 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1936,8 +1964,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1948,8 +1976,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= 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= @@ -1966,16 +1994,16 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= 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= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2044,8 +2072,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.22.1-0.20240620150659-cb3016b76f3e h1:Cht5EwNRmW9EgQ7ihPmgIswaQW4jR1cPbmzGCNl2++8= -golang.org/x/tools v0.22.1-0.20240620150659-cb3016b76f3e/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= 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= @@ -2119,8 +2147,8 @@ google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= -google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4= -google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2315,6 +2343,7 @@ google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwS google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2328,6 +2357,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= 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.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= @@ -2419,7 +2449,6 @@ nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/proto/exocore/feedistribute/distribution.proto b/proto/exocore/feedistribute/distribution.proto index 3518f0303..f27a6bdb0 100644 --- a/proto/exocore/feedistribute/distribution.proto +++ b/proto/exocore/feedistribute/distribution.proto @@ -13,34 +13,9 @@ import "amino/amino.proto"; message Params { option (amino.name) = "cosmos-sdk/x/distribution/Params"; - string community_tax = 1 [ - (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (amino.dont_omitempty) = true, - (gogoproto.nullable) = false - ]; - - // Deprecated: The base_proposer_reward field is deprecated and is no longer used - // in the x/distribution module's reward mechanism. - string base_proposer_reward = 2 [ - (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (gogoproto.nullable) = false, - (amino.dont_omitempty) = true, - deprecated = true - ]; - - // Deprecated: The bonus_proposer_reward field is deprecated and is no longer used - // in the x/distribution module's reward mechanism. - string bonus_proposer_reward = 3 [ - (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (gogoproto.nullable) = false, - (amino.dont_omitempty) = true, - deprecated = true - ]; + string community_tax = 1; - bool withdraw_addr_enabled = 4; + bool withdraw_addr_enabled = 2; } // ValidatorHistoricalRewards represents historical rewards for a validator. @@ -96,24 +71,6 @@ message ValidatorOutstandingRewards { ]; } -// ValidatorSlashEvent represents a validator slash event. -// Height is implicit within the store key. -// This is needed to calculate appropriate amount of staking tokens -// for delegations which are withdrawn after a slash has occurred. -message ValidatorSlashEvent { - uint64 validator_period = 1; - string fraction = 2 [ - (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (gogoproto.nullable) = false - ]; -} - -// ValidatorSlashEvents is a collection of ValidatorSlashEvent messages. -message ValidatorSlashEvents { - repeated ValidatorSlashEvent validator_slash_events = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; -} - // FeePool is the global fee pool for distribution. // It holds decimal coins. Once whole those coins can be burned or distributed to the community pool. message FeePool { @@ -151,52 +108,4 @@ message CommunityPoolSpendProposal { (amino.encoding) = "legacy_coins", (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; -} - -// DelegatorStartingInfo represents the starting info for a delegator reward -// period. It tracks the previous validator period, the delegation's amount of -// staking token, and the creation height (to check later on if any slashes have -// occurred). NOTE: Even though validators are slashed to whole staking tokens, -// the delegators within the validator may be left with less than a full token, -// thus sdk.Dec is used. -message DelegatorStartingInfo { - uint64 previous_period = 1; - string stake = 2 [ - (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (gogoproto.nullable) = false, - (amino.dont_omitempty) = true - ]; - uint64 height = 3 - [(gogoproto.jsontag) = "creation_height", (amino.field_name) = "creation_height", (amino.dont_omitempty) = true]; -} - -// DelegationDelegatorReward represents the properties -// of a delegator's delegation reward. -message DelegationDelegatorReward { - option (gogoproto.goproto_getters) = false; - - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; - - repeated cosmos.base.v1beta1.DecCoin reward = 2 [ - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.nullable) = false, - (amino.dont_omitempty) = true - ]; -} - -// CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal -// with a deposit -// -// Deprecated: Do not use. -message CommunityPoolSpendProposalWithDeposit { - option deprecated = true; - option (gogoproto.goproto_getters) = false; - option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; - - string title = 1; - string description = 2; - string recipient = 3; - string amount = 4; - string deposit = 5; -} +} \ No newline at end of file diff --git a/proto/exocore/feedistribute/params.proto b/proto/exocore/feedistribute/params.proto index 00d5dfe02..b616f92c0 100644 --- a/proto/exocore/feedistribute/params.proto +++ b/proto/exocore/feedistribute/params.proto @@ -3,6 +3,8 @@ package exocore.feedistribute; import "amino/amino.proto"; import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; option go_package = "github.com/ExocoreNetwork/exocore/x/feedistribution/types"; @@ -13,4 +15,10 @@ message Params { uint64 period = 1; // epoch_identifier for fee distribution string epoch_identifier = 2; + string community_tax = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, + (gogoproto.nullable) = false + ]; } \ No newline at end of file diff --git a/proto/exocore/reward/types.proto b/proto/exocore/reward/types.proto index 88e028167..b399da3c5 100644 --- a/proto/exocore/reward/types.proto +++ b/proto/exocore/reward/types.proto @@ -20,6 +20,7 @@ message Pool { ]; // earnings_addr is the earnings address. string earnings_addr = 3; + string Validator = 4; } string name = 1; repeated Reward rewards = 2 [ (gogoproto.nullable) = false ]; diff --git a/testutil/keeper/feedistribute.go b/testutil/keeper/feedistribute.go index e2a1af3bf..e9d4847c7 100644 --- a/testutil/keeper/feedistribute.go +++ b/testutil/keeper/feedistribute.go @@ -1,52 +1,58 @@ package keeper import ( - "testing" - - "cosmossdk.io/log" - "cosmossdk.io/store" - "cosmossdk.io/store/metrics" - storetypes "cosmossdk.io/store/types" + distrkeeper "github.com/ExocoreNetwork/exocore/x/feedistribution/keeper" + "github.com/ExocoreNetwork/exocore/x/feedistribution/types" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/runtime" + "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + "github.com/cosmos/cosmos-sdk/x/auth" + accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/stretchr/testify/require" - - "github.com/ExocoreNetwork/exocore/x/feedistribution/keeper" - "github.com/ExocoreNetwork/exocore/x/feedistribution/types" + "github.com/cosmos/cosmos-sdk/x/bank" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cosmos/cosmos-sdk/x/distribution" + "testing" ) -func FeedistributeKeeper(t testing.TB) (keeper.Keeper, sdk.Context) { +func FeedistributeKeeper(t testing.TB) (distrkeeper.Keeper, sdk.Context) { storeKey := storetypes.NewKVStoreKey(types.StoreKey) - db := dbm.NewMemDB() - stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) + db := tmdb.NewMemDB() + stateStore := store.NewCommitMultiStore(db) stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db) - require.NoError(t, stateStore.LoadLatestVersion()) registry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(registry) - authority := authtypes.NewModuleAddress(govtypes.ModuleName) - - k := keeper.NewKeeper( + encCfg := moduletestutil.MakeTestEncodingConfig(auth.AppModule{}, bank.AppModule{}, distribution.AppModule{}) + key := sdk.NewKVStoreKey(banktypes.StoreKey) + blockedAddresses := map[string]bool{ + accountkeeper.AccountKeeper{}.GetAuthority(): false, + } + authority := authtypes.NewModuleAddress(types.ModuleName) + bankkeeper := bankkeeper.NewBaseKeeper( + encCfg.Codec, key, accountkeeper.AccountKeeper{}, + blockedAddresses, authority.String(), + ) + k := distrkeeper.NewKeeper( cdc, - runtime.NewKVStoreService(storeKey), log.NewNopLogger(), authority.String(), - nil, + storeKey, + bankkeeper, ) ctx := sdk.NewContext(stateStore, cmtproto.Header{}, false, log.NewNopLogger()) // Initialize params - if err := k.SetParams(ctx, types.DefaultParams()); err != nil { - panic(err) - } + k.SetParams(ctx, types.DefaultParams()) return k, ctx } diff --git a/x/feedistribution/keeper/allocation.go b/x/feedistribution/keeper/allocation.go index c042e761a..b2fd3d77c 100644 --- a/x/feedistribution/keeper/allocation.go +++ b/x/feedistribution/keeper/allocation.go @@ -1,17 +1,15 @@ package keeper import ( - "cosmossdk.io/collections" "cosmossdk.io/math" - "errors" + "fmt" "github.com/ExocoreNetwork/exocore/x/feedistribution/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) -// Based on the epoch, AllocateTokens performs reward and fee distribution to all validators based -// on the F1 fee distribution specification. +// Based on the epoch, AllocateTokens performs reward and fee distribution to all validators. func (k Keeper) AllocateTokens(ctx sdk.Context, totalPreviousPower int64) error { feeCollector := k.authKeeper.GetModuleAccount(ctx, k.feeCollectorName) feesCollectedInt := k.bankKeeper.GetAllBalances(ctx, feeCollector.GetAddress()) @@ -20,16 +18,13 @@ func (k Keeper) AllocateTokens(ctx sdk.Context, totalPreviousPower int64) error if err := k.bankKeeper.SendCoinsFromModuleToModule(ctx, k.feeCollectorName, types.ModuleName, feesCollectedInt); err != nil { return err } - feePool, err := k.FeePool.Get(ctx) - if err != nil { - return err - } + feePool := k.FeePool if totalPreviousPower == 0 { - if err := k.FeePool.Set(ctx, types.FeePool{CommunityPool: feePool.CommunityPool.Add(feesCollected...)}); err != nil { - return err + k.FeePool = types.FeePool{ + CommunityPool: feePool.CommunityPool.Add(feesCollected...), } } - // calculate fraction allocated to validators + // calculate fraction allocated to exocore validators remaining := feesCollected communityTax, err := k.GetCommunityTax(ctx) if err != nil { @@ -60,12 +55,9 @@ func (k Keeper) AllocateTokens(ctx sdk.Context, totalPreviousPower int64) error return err } - if err := k.FeePool.Set(ctx, types.FeePool{DecimalPool: feePool.DecimalPool.Add(re...)}); err != nil { - return err - } + k.FeePool = types.FeePool{DecimalPool: feePool.DecimalPool.Add(re...)} return nil - } // AllocateTokensToValidator allocate tokens to a particular validator, @@ -75,11 +67,7 @@ func (k Keeper) AllocateTokensToValidator(ctx sdk.Context, val stakingtypes.Vali rate := val.GetCommission() commission := tokens.MulDec(rate) shared := tokens.Sub(commission) - valBz := val.GetOperator().Bytes() - //valBz, err := k.StakingKeeper.Validator() Valida GetExocoreValidator().StringToBytes(val.GetOperator()) - //if err != nil { - // return err - //} + valBz := val.GetOperator().String() // update current commission ctx.EventManager().EmitEvent(sdk.NewEvent( @@ -87,27 +75,19 @@ func (k Keeper) AllocateTokensToValidator(ctx sdk.Context, val stakingtypes.Vali sdk.NewAttribute(sdk.AttributeKeyAmount, commission.String()), sdk.NewAttribute(types.EventTypeCommission, val.GetOperator().String()), )) - currentCommission, err := k.ValidatorsAccumulatedCommission.Get(ctx, valBz) - if err != nil && !errors.Is(err, collections.ErrNotFound) { - return err - } - currentCommission.Commission = currentCommission.Commission.Add(commission...) - err = k.ValidatorsAccumulatedCommission.Set(ctx, valBz, currentCommission) - if err != nil { - return err + if currentCommission, ok := k.ValidatorsAccumulatedCommission[valBz]; ok { + currentCommission.Commission = currentCommission.Commission.Add(commission...) + k.ValidatorsAccumulatedCommission[valBz] = currentCommission + } else { + fmt.Sprintf("currentCommission %s didn't exist", currentCommission) + // No need to return here } // update current rewards - currentRewards, err := k.ValidatorCurrentRewards.Get(ctx, valBz) // if the rewards do not exist it's fine, we will just add to zero. - if err != nil && !errors.Is(err, collections.ErrNotFound) { - return err - } - - currentRewards.Rewards = currentRewards.Rewards.Add(shared...) - err = k.ValidatorCurrentRewards.Set(ctx, valBz, currentRewards) - if err != nil { - return err + if currentRewards, ok := k.ValidatorCurrentRewards[valBz]; ok { + currentRewards.Rewards = currentRewards.Rewards.Add(shared...) + k.ValidatorCurrentRewards[valBz] = currentRewards } // update outstanding rewards @@ -117,11 +97,11 @@ func (k Keeper) AllocateTokensToValidator(ctx sdk.Context, val stakingtypes.Vali sdk.NewAttribute(types.AttributeKeyValidator, val.GetOperator().String()), )) - outstanding, err := k.ValidatorOutstandingRewards.Get(ctx, valBz) - if err != nil && !errors.Is(err, collections.ErrNotFound) { - return err + if outstanding, ok := k.ValidatorOutstandingRewards[valBz]; ok { + outstanding.Rewards = outstanding.Rewards.Add(tokens...) + k.ValidatorOutstandingRewards[valBz] = outstanding + } else { + fmt.Sprintf("ValidatorOutstandingRewards for %s didn't exist", valBz) } - - outstanding.Rewards = outstanding.Rewards.Add(tokens...) - return k.ValidatorOutstandingRewards.Set(ctx, valBz, outstanding) + return nil } diff --git a/x/feedistribution/keeper/keeper.go b/x/feedistribution/keeper/keeper.go index 8aa0acfa2..031685763 100644 --- a/x/feedistribution/keeper/keeper.go +++ b/x/feedistribution/keeper/keeper.go @@ -1,12 +1,10 @@ package keeper import ( - collections "cosmossdk.io/collections" - "cosmossdk.io/core/store" - "cosmossdk.io/log" "fmt" stakingkeeper "github.com/ExocoreNetwork/exocore/x/dogfood/keeper" "github.com/ExocoreNetwork/exocore/x/feedistribution/types" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -14,11 +12,9 @@ import ( type ( Keeper struct { - cdc codec.BinaryCodec - storeService store.KVStoreService - storeKey storetypes.StoreKey - logger log.Logger - + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + logger log.Logger // the address capable of executing a MsgUpdateParams message. Typically, this // should be the x/gov module account. authority string @@ -29,20 +25,19 @@ type ( feeCollectorName string // FeePool stores decimal tokens that cannot be yet distributed. - FeePool collections.Item[types.FeePool] + FeePool types.FeePool StakingKeeper stakingkeeper.Keeper // ValidatorsAccumulatedCommission key: valAddr | value: ValidatorAccumulatedCommission - ValidatorsAccumulatedCommission collections.Map[sdk.ValAddress, types.ValidatorAccumulatedCommission] + ValidatorsAccumulatedCommission map[string]types.ValidatorAccumulatedCommission // ValidatorCurrentRewards key: valAddr | value: ValidatorCurrentRewards - ValidatorCurrentRewards collections.Map[sdk.ValAddress, types.ValidatorCurrentRewards] + ValidatorCurrentRewards map[string]types.ValidatorCurrentRewards // ValidatorOutstandingRewards key: valAddr | value: ValidatorOustandingRewards - ValidatorOutstandingRewards collections.Map[sdk.ValAddress, types.ValidatorOutstandingRewards] + ValidatorOutstandingRewards map[string]types.ValidatorOutstandingRewards } ) func NewKeeper( cdc codec.BinaryCodec, - storeService store.KVStoreService, logger log.Logger, authority string, storeKey storetypes.StoreKey, @@ -53,11 +48,10 @@ func NewKeeper( } return Keeper{ - cdc: cdc, - storeService: storeService, - authority: authority, - storeKey: storeKey, - logger: logger, + cdc: cdc, + authority: authority, + storeKey: storeKey, + logger: logger, bankKeeper: bankKeeper, } diff --git a/x/feedistribution/keeper/msg_update_params.go b/x/feedistribution/keeper/msg_update_params.go index f359cd802..4522f67a1 100644 --- a/x/feedistribution/keeper/msg_update_params.go +++ b/x/feedistribution/keeper/msg_update_params.go @@ -2,8 +2,8 @@ package keeper import ( "context" - errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ExocoreNetwork/exocore/x/feedistribution/types" diff --git a/x/feedistribution/keeper/params.go b/x/feedistribution/keeper/params.go index b89c52f7d..e80253971 100644 --- a/x/feedistribution/keeper/params.go +++ b/x/feedistribution/keeper/params.go @@ -2,9 +2,8 @@ package keeper import ( "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ExocoreNetwork/exocore/x/feedistribution/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // GetParams get all parameters as types.Params @@ -27,5 +26,7 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { // GetCommunityTax returns the current distribution community tax. func (k Keeper) GetCommunityTax(ctx sdk.Context) (math.LegacyDec, error) { + params := k.GetParams(ctx) + return params.CommunityTax, nil } diff --git a/x/feedistribution/types/distribution.pb.go b/x/feedistribution/types/distribution.pb.go index 3c38cbc01..0b4a8d9e4 100644 --- a/x/feedistribution/types/distribution.pb.go +++ b/x/feedistribution/types/distribution.pb.go @@ -4,7 +4,6 @@ package types import ( - cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -30,14 +29,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the set of params for the distribution module. type Params struct { - CommunityTax cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"community_tax"` - // Deprecated: The base_proposer_reward field is deprecated and is no longer used - // in the x/distribution module's reward mechanism. - BaseProposerReward cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=base_proposer_reward,json=baseProposerReward,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"base_proposer_reward"` // Deprecated: Do not use. - // Deprecated: The bonus_proposer_reward field is deprecated and is no longer used - // in the x/distribution module's reward mechanism. - BonusProposerReward cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=bonus_proposer_reward,json=bonusProposerReward,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"bonus_proposer_reward"` // Deprecated: Do not use. - WithdrawAddrEnabled bool `protobuf:"varint,4,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty"` + CommunityTax string `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3" json:"community_tax,omitempty"` + WithdrawAddrEnabled bool `protobuf:"varint,2,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -73,6 +66,13 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo +func (m *Params) GetCommunityTax() string { + if m != nil { + return m.CommunityTax + } + return "" +} + func (m *Params) GetWithdrawAddrEnabled() bool { if m != nil { return m.WithdrawAddrEnabled @@ -292,100 +292,6 @@ func (m *ValidatorOutstandingRewards) GetRewards() github_com_cosmos_cosmos_sdk_ return nil } -// ValidatorSlashEvent represents a validator slash event. -// Height is implicit within the store key. -// This is needed to calculate appropriate amount of staking tokens -// for delegations which are withdrawn after a slash has occurred. -type ValidatorSlashEvent struct { - ValidatorPeriod uint64 `protobuf:"varint,1,opt,name=validator_period,json=validatorPeriod,proto3" json:"validator_period,omitempty"` - Fraction cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=fraction,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"fraction"` -} - -func (m *ValidatorSlashEvent) Reset() { *m = ValidatorSlashEvent{} } -func (m *ValidatorSlashEvent) String() string { return proto.CompactTextString(m) } -func (*ValidatorSlashEvent) ProtoMessage() {} -func (*ValidatorSlashEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{5} -} -func (m *ValidatorSlashEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ValidatorSlashEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ValidatorSlashEvent.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 *ValidatorSlashEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ValidatorSlashEvent.Merge(m, src) -} -func (m *ValidatorSlashEvent) XXX_Size() int { - return m.Size() -} -func (m *ValidatorSlashEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ValidatorSlashEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ValidatorSlashEvent proto.InternalMessageInfo - -func (m *ValidatorSlashEvent) GetValidatorPeriod() uint64 { - if m != nil { - return m.ValidatorPeriod - } - return 0 -} - -// ValidatorSlashEvents is a collection of ValidatorSlashEvent messages. -type ValidatorSlashEvents struct { - ValidatorSlashEvents []ValidatorSlashEvent `protobuf:"bytes,1,rep,name=validator_slash_events,json=validatorSlashEvents,proto3" json:"validator_slash_events"` -} - -func (m *ValidatorSlashEvents) Reset() { *m = ValidatorSlashEvents{} } -func (m *ValidatorSlashEvents) String() string { return proto.CompactTextString(m) } -func (*ValidatorSlashEvents) ProtoMessage() {} -func (*ValidatorSlashEvents) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{6} -} -func (m *ValidatorSlashEvents) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ValidatorSlashEvents) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ValidatorSlashEvents.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 *ValidatorSlashEvents) XXX_Merge(src proto.Message) { - xxx_messageInfo_ValidatorSlashEvents.Merge(m, src) -} -func (m *ValidatorSlashEvents) XXX_Size() int { - return m.Size() -} -func (m *ValidatorSlashEvents) XXX_DiscardUnknown() { - xxx_messageInfo_ValidatorSlashEvents.DiscardUnknown(m) -} - -var xxx_messageInfo_ValidatorSlashEvents proto.InternalMessageInfo - -func (m *ValidatorSlashEvents) GetValidatorSlashEvents() []ValidatorSlashEvent { - if m != nil { - return m.ValidatorSlashEvents - } - return nil -} - // FeePool is the global fee pool for distribution. // It holds decimal coins. Once whole those coins can be burned or distributed to the community pool. type FeePool struct { @@ -397,7 +303,7 @@ func (m *FeePool) Reset() { *m = FeePool{} } func (m *FeePool) String() string { return proto.CompactTextString(m) } func (*FeePool) ProtoMessage() {} func (*FeePool) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{7} + return fileDescriptor_8c68eaf9fb42b594, []int{5} } func (m *FeePool) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -462,7 +368,7 @@ func (m *CommunityPoolSpendProposal) Reset() { *m = CommunityPoolSpendPr func (m *CommunityPoolSpendProposal) String() string { return proto.CompactTextString(m) } func (*CommunityPoolSpendProposal) ProtoMessage() {} func (*CommunityPoolSpendProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{8} + return fileDescriptor_8c68eaf9fb42b594, []int{6} } func (m *CommunityPoolSpendProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -491,165 +397,14 @@ func (m *CommunityPoolSpendProposal) XXX_DiscardUnknown() { var xxx_messageInfo_CommunityPoolSpendProposal proto.InternalMessageInfo -// DelegatorStartingInfo represents the starting info for a delegator reward -// period. It tracks the previous validator period, the delegation's amount of -// staking token, and the creation height (to check later on if any slashes have -// occurred). NOTE: Even though validators are slashed to whole staking tokens, -// the delegators within the validator may be left with less than a full token, -// thus sdk.Dec is used. -type DelegatorStartingInfo struct { - PreviousPeriod uint64 `protobuf:"varint,1,opt,name=previous_period,json=previousPeriod,proto3" json:"previous_period,omitempty"` - Stake cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=stake,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"stake"` - Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"creation_height"` -} - -func (m *DelegatorStartingInfo) Reset() { *m = DelegatorStartingInfo{} } -func (m *DelegatorStartingInfo) String() string { return proto.CompactTextString(m) } -func (*DelegatorStartingInfo) ProtoMessage() {} -func (*DelegatorStartingInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{9} -} -func (m *DelegatorStartingInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DelegatorStartingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DelegatorStartingInfo.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 *DelegatorStartingInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_DelegatorStartingInfo.Merge(m, src) -} -func (m *DelegatorStartingInfo) XXX_Size() int { - return m.Size() -} -func (m *DelegatorStartingInfo) XXX_DiscardUnknown() { - xxx_messageInfo_DelegatorStartingInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_DelegatorStartingInfo proto.InternalMessageInfo - -func (m *DelegatorStartingInfo) GetPreviousPeriod() uint64 { - if m != nil { - return m.PreviousPeriod - } - return 0 -} - -func (m *DelegatorStartingInfo) GetHeight() uint64 { - if m != nil { - return m.Height - } - return 0 -} - -// DelegationDelegatorReward represents the properties -// of a delegator's delegation reward. -type DelegationDelegatorReward struct { - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Reward github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=reward,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"reward"` -} - -func (m *DelegationDelegatorReward) Reset() { *m = DelegationDelegatorReward{} } -func (m *DelegationDelegatorReward) String() string { return proto.CompactTextString(m) } -func (*DelegationDelegatorReward) ProtoMessage() {} -func (*DelegationDelegatorReward) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{10} -} -func (m *DelegationDelegatorReward) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DelegationDelegatorReward) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DelegationDelegatorReward.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 *DelegationDelegatorReward) XXX_Merge(src proto.Message) { - xxx_messageInfo_DelegationDelegatorReward.Merge(m, src) -} -func (m *DelegationDelegatorReward) XXX_Size() int { - return m.Size() -} -func (m *DelegationDelegatorReward) XXX_DiscardUnknown() { - xxx_messageInfo_DelegationDelegatorReward.DiscardUnknown(m) -} - -var xxx_messageInfo_DelegationDelegatorReward proto.InternalMessageInfo - -// CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal -// with a deposit -// -// Deprecated: Do not use. -// -// Deprecated: Do not use. -type CommunityPoolSpendProposalWithDeposit struct { - Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` - Recipient string `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty"` - Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` - Deposit string `protobuf:"bytes,5,opt,name=deposit,proto3" json:"deposit,omitempty"` -} - -func (m *CommunityPoolSpendProposalWithDeposit) Reset() { *m = CommunityPoolSpendProposalWithDeposit{} } -func (m *CommunityPoolSpendProposalWithDeposit) String() string { return proto.CompactTextString(m) } -func (*CommunityPoolSpendProposalWithDeposit) ProtoMessage() {} -func (*CommunityPoolSpendProposalWithDeposit) Descriptor() ([]byte, []int) { - return fileDescriptor_8c68eaf9fb42b594, []int{11} -} -func (m *CommunityPoolSpendProposalWithDeposit) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CommunityPoolSpendProposalWithDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.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 *CommunityPoolSpendProposalWithDeposit) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.Merge(m, src) -} -func (m *CommunityPoolSpendProposalWithDeposit) XXX_Size() int { - return m.Size() -} -func (m *CommunityPoolSpendProposalWithDeposit) XXX_DiscardUnknown() { - xxx_messageInfo_CommunityPoolSpendProposalWithDeposit.DiscardUnknown(m) -} - -var xxx_messageInfo_CommunityPoolSpendProposalWithDeposit proto.InternalMessageInfo - func init() { proto.RegisterType((*Params)(nil), "exocore.feedistribute.Params") proto.RegisterType((*ValidatorHistoricalRewards)(nil), "exocore.feedistribute.ValidatorHistoricalRewards") proto.RegisterType((*ValidatorCurrentRewards)(nil), "exocore.feedistribute.ValidatorCurrentRewards") proto.RegisterType((*ValidatorAccumulatedCommission)(nil), "exocore.feedistribute.ValidatorAccumulatedCommission") proto.RegisterType((*ValidatorOutstandingRewards)(nil), "exocore.feedistribute.ValidatorOutstandingRewards") - proto.RegisterType((*ValidatorSlashEvent)(nil), "exocore.feedistribute.ValidatorSlashEvent") - proto.RegisterType((*ValidatorSlashEvents)(nil), "exocore.feedistribute.ValidatorSlashEvents") proto.RegisterType((*FeePool)(nil), "exocore.feedistribute.FeePool") proto.RegisterType((*CommunityPoolSpendProposal)(nil), "exocore.feedistribute.CommunityPoolSpendProposal") - proto.RegisterType((*DelegatorStartingInfo)(nil), "exocore.feedistribute.DelegatorStartingInfo") - proto.RegisterType((*DelegationDelegatorReward)(nil), "exocore.feedistribute.DelegationDelegatorReward") - proto.RegisterType((*CommunityPoolSpendProposalWithDeposit)(nil), "exocore.feedistribute.CommunityPoolSpendProposalWithDeposit") } func init() { @@ -657,74 +412,52 @@ func init() { } var fileDescriptor_8c68eaf9fb42b594 = []byte{ - // 1068 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xf7, 0xa4, 0xa9, 0xd3, 0x4c, 0xd2, 0xe4, 0xdb, 0xcd, 0x8f, 0x3a, 0x6e, 0xbf, 0x76, 0x58, - 0x51, 0x61, 0x02, 0xf1, 0x2a, 0xad, 0x84, 0x20, 0xb7, 0xe6, 0x47, 0x05, 0x52, 0x29, 0xd1, 0x06, - 0x51, 0x09, 0x0e, 0xab, 0xf1, 0xee, 0x8b, 0x3d, 0x64, 0x77, 0x66, 0x35, 0x33, 0x76, 0x92, 0x13, - 0x48, 0x5c, 0x2a, 0x0e, 0xc0, 0x0d, 0xd4, 0x53, 0x05, 0x97, 0x8a, 0x53, 0x0e, 0xf9, 0x23, 0x2a, - 0x4e, 0x55, 0x05, 0x08, 0x71, 0x08, 0x90, 0x1c, 0x82, 0xf8, 0x2b, 0xd0, 0xec, 0x8c, 0xd7, 0x4e, - 0x09, 0x52, 0x08, 0x8a, 0xb8, 0x58, 0x9e, 0xf7, 0x66, 0xdf, 0xe7, 0xf3, 0x79, 0xf3, 0xde, 0x9b, - 0xc1, 0x35, 0xd8, 0xe6, 0x21, 0x17, 0xe0, 0x6d, 0x00, 0x44, 0x54, 0x2a, 0x41, 0x1b, 0x6d, 0x05, - 0x5e, 0xfe, 0x97, 0x72, 0x56, 0x4f, 0x05, 0x57, 0xdc, 0x99, 0xb2, 0x3b, 0xeb, 0xc7, 0x76, 0x96, - 0x27, 0x9b, 0xbc, 0xc9, 0xb3, 0x1d, 0x9e, 0xfe, 0x67, 0x36, 0x97, 0x2b, 0x21, 0x97, 0x09, 0x97, - 0x5e, 0x83, 0x48, 0xf0, 0x3a, 0x0b, 0x0d, 0x50, 0x64, 0xc1, 0x0b, 0x39, 0xb5, 0xc1, 0xca, 0x33, - 0xc6, 0x1f, 0x98, 0x0f, 0xcd, 0xc2, 0xba, 0xae, 0x90, 0x84, 0x32, 0xee, 0x65, 0xbf, 0xc6, 0xe4, - 0x3e, 0xbc, 0x80, 0x8b, 0x6b, 0x44, 0x90, 0x44, 0x3a, 0x1f, 0xe0, 0xcb, 0x21, 0x4f, 0x92, 0x36, - 0xa3, 0x6a, 0x27, 0x50, 0x64, 0xbb, 0x84, 0x66, 0x51, 0x6d, 0x78, 0xe9, 0xb5, 0x27, 0xfb, 0xd5, - 0xc2, 0xcf, 0xfb, 0xd5, 0x6b, 0x26, 0x94, 0x8c, 0x36, 0xeb, 0x94, 0x7b, 0x09, 0x51, 0xad, 0xfa, - 0x5d, 0x68, 0x92, 0x70, 0x67, 0x05, 0xc2, 0x67, 0x7b, 0xf3, 0xd8, 0x22, 0xad, 0x40, 0xf8, 0xf8, - 0x68, 0x77, 0x0e, 0xf9, 0xa3, 0x79, 0xb0, 0x77, 0xc9, 0xb6, 0xf3, 0x21, 0x9e, 0xd4, 0x84, 0x35, - 0xab, 0x94, 0x4b, 0x10, 0x81, 0x80, 0x2d, 0x22, 0xa2, 0xd2, 0x40, 0x86, 0xf1, 0xfa, 0xd9, 0x30, - 0x4a, 0xc8, 0x77, 0x74, 0xd4, 0x35, 0x1b, 0xd4, 0xcf, 0x62, 0x3a, 0x31, 0x9e, 0x6a, 0x70, 0xd6, - 0x96, 0x7f, 0x01, 0xbb, 0xf0, 0x2f, 0xc1, 0x26, 0xb2, 0xb0, 0xcf, 0xa1, 0xdd, 0xc4, 0x53, 0x5b, - 0x54, 0xb5, 0x22, 0x41, 0xb6, 0x02, 0x12, 0x45, 0x22, 0x00, 0x46, 0x1a, 0x31, 0x44, 0xa5, 0xc1, - 0x59, 0x54, 0xbb, 0xe4, 0x4f, 0x74, 0x9d, 0xb7, 0xa3, 0x48, 0xac, 0x1a, 0xd7, 0xe2, 0x8d, 0x4f, - 0x8f, 0x76, 0xe7, 0x66, 0x0d, 0xc0, 0xbc, 0x8c, 0x36, 0xbd, 0xed, 0x63, 0x65, 0xe1, 0x99, 0x13, - 0x71, 0x7f, 0x44, 0xb8, 0xfc, 0x1e, 0x89, 0x69, 0x44, 0x14, 0x17, 0x6f, 0x52, 0xa9, 0xb8, 0xa0, - 0x21, 0x89, 0x0d, 0xb0, 0x74, 0x3e, 0x43, 0xf8, 0x6a, 0xd8, 0x4e, 0xda, 0x31, 0x51, 0xb4, 0x03, - 0x56, 0x64, 0x20, 0x88, 0xa2, 0xbc, 0x84, 0x66, 0x2f, 0xd4, 0x46, 0x6e, 0x5e, 0xaf, 0x5b, 0x11, - 0x3a, 0x4b, 0x75, 0x5b, 0x2c, 0x5a, 0xd1, 0x32, 0xa7, 0xcc, 0x24, 0xe2, 0xdb, 0x5f, 0xaa, 0xaf, - 0x34, 0xa9, 0x6a, 0xb5, 0x1b, 0xf5, 0x90, 0x27, 0xb6, 0x5e, 0xbc, 0x3e, 0x6a, 0x6a, 0x27, 0x05, - 0xd9, 0xfd, 0x46, 0x9a, 0xb3, 0x9d, 0xea, 0xc1, 0x1a, 0x32, 0xbe, 0x06, 0x75, 0x5e, 0xc2, 0xe3, - 0x02, 0x36, 0x40, 0x00, 0x0b, 0x21, 0x08, 0x79, 0x9b, 0xa9, 0xec, 0x7c, 0x2f, 0xfb, 0x63, 0xb9, - 0x79, 0x59, 0x5b, 0xdd, 0x6f, 0x10, 0xbe, 0x9a, 0x0b, 0x5b, 0x6e, 0x0b, 0x01, 0x4c, 0x75, 0x55, - 0xa5, 0x78, 0xc8, 0x28, 0x91, 0xe7, 0x2c, 0xa2, 0x0b, 0xe3, 0x4c, 0xe3, 0x62, 0x0a, 0x82, 0x72, - 0x53, 0x8d, 0x83, 0xbe, 0x5d, 0xb9, 0x5f, 0x21, 0x5c, 0xc9, 0x59, 0xde, 0x0e, 0xad, 0x66, 0x88, - 0x96, 0x79, 0x92, 0x50, 0x29, 0x29, 0x67, 0x4e, 0x07, 0xe3, 0x30, 0x5f, 0x9d, 0x33, 0xdf, 0x3e, - 0x24, 0xf7, 0x73, 0x84, 0xaf, 0xe5, 0xd4, 0xde, 0x69, 0x2b, 0xa9, 0x08, 0x8b, 0x28, 0x6b, 0xfe, - 0x67, 0x49, 0xd4, 0x8c, 0x26, 0x72, 0x46, 0xeb, 0x31, 0x91, 0xad, 0xd5, 0x0e, 0x30, 0xe5, 0xbc, - 0x8c, 0xff, 0xd7, 0xe9, 0x9a, 0x03, 0x9b, 0x66, 0x94, 0xa5, 0x79, 0x3c, 0xb7, 0xaf, 0x65, 0x66, - 0xe7, 0x6d, 0x7c, 0x69, 0x43, 0x90, 0x50, 0x77, 0x80, 0x9d, 0x0b, 0x0b, 0xff, 0xb8, 0x55, 0xfd, - 0x3c, 0x84, 0xfb, 0x09, 0xc2, 0x93, 0x27, 0x30, 0x92, 0xce, 0x26, 0x9e, 0xee, 0x51, 0x92, 0xda, - 0x11, 0x40, 0xe6, 0xb1, 0xb9, 0x9a, 0xab, 0x9f, 0x38, 0x8f, 0xeb, 0x27, 0x04, 0x5b, 0x1a, 0xd6, - 0x0c, 0x4d, 0x2a, 0x26, 0x3b, 0x27, 0x80, 0xb9, 0x1f, 0x0f, 0xe0, 0xa1, 0x3b, 0x00, 0x6b, 0x9c, - 0xc7, 0xce, 0x47, 0x78, 0xac, 0x37, 0x61, 0x53, 0xce, 0xe3, 0x53, 0x1d, 0xce, 0xe2, 0x59, 0x0f, - 0xa7, 0x84, 0xfc, 0xde, 0x44, 0xcf, 0x08, 0x28, 0x3c, 0x1a, 0x41, 0x48, 0x13, 0x12, 0x1b, 0xf8, - 0x81, 0x53, 0xc0, 0xdf, 0x3a, 0x03, 0xbc, 0x3f, 0x62, 0x61, 0x34, 0xaa, 0xfb, 0xe5, 0x00, 0x2e, - 0x2f, 0xf7, 0xf3, 0x58, 0x4f, 0x81, 0x45, 0x66, 0x8c, 0x92, 0xd8, 0x99, 0xc4, 0x17, 0x15, 0x55, - 0x31, 0x98, 0xfb, 0xc6, 0x37, 0x0b, 0x67, 0x16, 0x8f, 0x44, 0x20, 0x43, 0x41, 0xd3, 0x5e, 0x3d, - 0xf8, 0xfd, 0x26, 0xe7, 0x3a, 0x1e, 0x16, 0x10, 0xd2, 0x94, 0x02, 0x53, 0x66, 0xb4, 0xfb, 0x3d, - 0x83, 0xb3, 0x83, 0x8b, 0x24, 0xc9, 0x46, 0xd0, 0x60, 0x26, 0x72, 0xe6, 0x44, 0x91, 0x99, 0xc2, - 0x3b, 0x56, 0x61, 0xed, 0x14, 0x0a, 0x33, 0x79, 0x0f, 0x8f, 0x76, 0xe7, 0x46, 0xe3, 0xac, 0x00, - 0x83, 0xb0, 0xd7, 0x0b, 0x16, 0x70, 0xb1, 0xf6, 0xe0, 0x51, 0xb5, 0xf0, 0xfb, 0xa3, 0x6a, 0xe1, - 0xbb, 0xbd, 0xf9, 0xb2, 0x45, 0x6d, 0xf2, 0x4e, 0x1f, 0x28, 0x53, 0x9a, 0x33, 0x72, 0xbf, 0x47, - 0x78, 0x6a, 0x05, 0x74, 0x24, 0x5d, 0x35, 0x8a, 0x08, 0x45, 0x59, 0xf3, 0x2d, 0xb6, 0x91, 0x8d, - 0xd2, 0x54, 0x40, 0x87, 0x72, 0x7d, 0x8d, 0xf5, 0x77, 0xcd, 0x58, 0xd7, 0x6c, 0x9b, 0xe6, 0x2e, - 0xbe, 0x28, 0x15, 0xd9, 0x04, 0xdb, 0x31, 0x67, 0xbd, 0xad, 0x4d, 0x10, 0x67, 0x05, 0x17, 0x5b, - 0x40, 0x9b, 0x2d, 0x93, 0xd0, 0xc1, 0xa5, 0x57, 0xff, 0xd8, 0xaf, 0x8e, 0x87, 0x02, 0xf4, 0x78, - 0x67, 0x81, 0x71, 0x7d, 0x7d, 0xb4, 0x3b, 0xf7, 0xbc, 0xcd, 0x26, 0xc0, 0x2c, 0xdc, 0xdf, 0x10, - 0x9e, 0xb1, 0xb2, 0x28, 0x67, 0xb9, 0x40, 0x7b, 0x61, 0xde, 0xc3, 0x57, 0x7a, 0xed, 0xa7, 0x6f, - 0x4c, 0x90, 0xd2, 0xbe, 0x35, 0x5e, 0x78, 0xb6, 0x37, 0xff, 0x7f, 0x4b, 0xad, 0x37, 0x79, 0xcd, - 0x96, 0x75, 0x25, 0xf4, 0x80, 0xeb, 0x4d, 0x13, 0x6b, 0x77, 0x18, 0x2e, 0xe6, 0x8f, 0x89, 0xf3, - 0x1c, 0x75, 0x16, 0x65, 0x71, 0x50, 0x1f, 0xaf, 0xfb, 0x03, 0xc2, 0x37, 0xfe, 0xbe, 0xa8, 0xef, - 0x53, 0xd5, 0x5a, 0x81, 0x94, 0x4b, 0xaa, 0xce, 0xa9, 0xbe, 0xa7, 0xfb, 0xea, 0x5b, 0xbb, 0xec, - 0xca, 0x29, 0xe1, 0xa1, 0xc8, 0x00, 0x97, 0x2e, 0x66, 0x8e, 0xee, 0x72, 0xf1, 0xc5, 0x07, 0xa7, - 0x28, 0xc9, 0xa5, 0xfb, 0x8f, 0x0f, 0x2a, 0xe8, 0xc9, 0x41, 0x05, 0x3d, 0x3d, 0xa8, 0xa0, 0x5f, - 0x0f, 0x2a, 0xe8, 0x8b, 0xc3, 0x4a, 0xe1, 0xe9, 0x61, 0xa5, 0xf0, 0xd3, 0x61, 0xa5, 0xf0, 0xfe, - 0x1b, 0x7d, 0x59, 0x5b, 0x35, 0x43, 0xf2, 0x1e, 0xa8, 0x2d, 0x2e, 0x36, 0xbd, 0xee, 0x6b, 0x77, - 0xfb, 0xd8, 0x7b, 0x57, 0xbf, 0x66, 0xb2, 0x64, 0x36, 0x8a, 0xd9, 0x83, 0xf3, 0xd6, 0x9f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x14, 0x6a, 0x7c, 0xe6, 0x17, 0x0b, 0x00, 0x00, + // 709 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0x4b, 0x4f, 0x14, 0x4b, + 0x14, 0x9e, 0x1a, 0xb8, 0xc3, 0xa5, 0x78, 0xdc, 0xdc, 0x16, 0x64, 0x18, 0x49, 0xcf, 0x64, 0x8c, + 0x71, 0x82, 0x61, 0x3a, 0xc0, 0x46, 0xd9, 0xc1, 0x08, 0x71, 0xa5, 0xa4, 0x35, 0x9a, 0xb8, 0xe9, + 0xd4, 0x54, 0x1d, 0x86, 0x0a, 0xdd, 0x5d, 0x9d, 0xaa, 0xea, 0x79, 0xac, 0x74, 0x49, 0x5c, 0xa8, + 0x3b, 0x8d, 0x2b, 0x12, 0x37, 0xc4, 0x15, 0x0b, 0x7f, 0x04, 0x71, 0xc5, 0xca, 0xb8, 0x52, 0x33, + 0x2c, 0xf0, 0x67, 0x98, 0x7e, 0xcc, 0x83, 0xc4, 0x05, 0x21, 0x21, 0x6e, 0x26, 0x7d, 0xbe, 0x73, + 0x7a, 0xbe, 0xef, 0x3b, 0xd5, 0xe7, 0x14, 0xae, 0x40, 0x5b, 0x50, 0x21, 0xc1, 0xda, 0x01, 0x60, + 0x5c, 0x69, 0xc9, 0xeb, 0xa1, 0x06, 0xab, 0xff, 0xc8, 0x85, 0x5f, 0x0d, 0xa4, 0xd0, 0xc2, 0x98, + 0x4d, 0x2b, 0xab, 0xe7, 0x2a, 0x0b, 0x33, 0x0d, 0xd1, 0x10, 0x71, 0x85, 0x15, 0x3d, 0x25, 0xc5, + 0x05, 0x93, 0x0a, 0xe5, 0x09, 0x65, 0xd5, 0x89, 0x02, 0xab, 0xb9, 0x5c, 0x07, 0x4d, 0x96, 0x2d, + 0x2a, 0x78, 0xfa, 0x67, 0x85, 0xf9, 0x24, 0xef, 0x24, 0x2f, 0x26, 0x41, 0x9a, 0xfa, 0x9f, 0x78, + 0xdc, 0x17, 0x56, 0xfc, 0x9b, 0x40, 0xe5, 0x7d, 0x84, 0x73, 0xdb, 0x44, 0x12, 0x4f, 0x19, 0x37, + 0xf1, 0x14, 0x15, 0x9e, 0x17, 0xfa, 0x5c, 0x77, 0x1c, 0x4d, 0xda, 0x79, 0x54, 0x42, 0x95, 0x71, + 0x7b, 0xb2, 0x0f, 0x3e, 0x21, 0x6d, 0x63, 0x05, 0xcf, 0xb6, 0xb8, 0xde, 0x65, 0x92, 0xb4, 0x1c, + 0xc2, 0x98, 0x74, 0xc0, 0x27, 0x75, 0x17, 0x58, 0x3e, 0x5b, 0x42, 0x95, 0x7f, 0xed, 0x6b, 0xbd, + 0xe4, 0x3a, 0x63, 0x72, 0x33, 0x49, 0xad, 0xdd, 0x7a, 0x75, 0x76, 0xb4, 0x58, 0x4a, 0x94, 0x2c, + 0x29, 0xb6, 0x67, 0xb5, 0xcf, 0x35, 0xc1, 0x4a, 0xf8, 0xcb, 0x5f, 0x11, 0x2e, 0x3c, 0x25, 0x2e, + 0x67, 0x44, 0x0b, 0xf9, 0x80, 0x2b, 0x2d, 0x24, 0xa7, 0xc4, 0xb5, 0xa1, 0x45, 0x24, 0x53, 0xc6, + 0x6b, 0x84, 0xe7, 0x68, 0xe8, 0x85, 0x2e, 0xd1, 0xbc, 0x09, 0x8e, 0x8c, 0x61, 0x47, 0x12, 0xcd, + 0x45, 0x1e, 0x95, 0x46, 0x2a, 0x13, 0x2b, 0x0b, 0xd5, 0xd4, 0x6d, 0xd4, 0x9a, 0x6a, 0xda, 0x9a, + 0xea, 0x7d, 0xa0, 0x35, 0xc1, 0xfd, 0x8d, 0xbb, 0xc7, 0xdf, 0x8b, 0x99, 0x4f, 0x3f, 0x8a, 0x77, + 0x1a, 0x5c, 0xef, 0x86, 0xf5, 0x2a, 0x15, 0x5e, 0xda, 0x1d, 0x6b, 0x48, 0x9a, 0xee, 0x04, 0xa0, + 0x7a, 0xef, 0xa8, 0xc3, 0xb3, 0xa3, 0x45, 0x64, 0xcf, 0x0e, 0x68, 0x13, 0x31, 0x76, 0x44, 0x6a, + 0xdc, 0xc6, 0xff, 0x49, 0xd8, 0x01, 0x09, 0x3e, 0x05, 0x87, 0x8a, 0xd0, 0xd7, 0x71, 0x13, 0xa6, + 0xec, 0xe9, 0x3e, 0x5c, 0x8b, 0xd0, 0xf2, 0x47, 0x84, 0xe7, 0xfa, 0xc6, 0x6a, 0xa1, 0x94, 0xe0, + 0xeb, 0x9e, 0xab, 0x00, 0x8f, 0x25, 0x4e, 0xd4, 0x15, 0x9b, 0xe8, 0xd1, 0x18, 0xd7, 0x71, 0x2e, + 0x00, 0xc9, 0x45, 0x72, 0x64, 0xa3, 0x76, 0x1a, 0x95, 0xdf, 0x23, 0x6c, 0xf6, 0x55, 0xae, 0xd3, + 0xd4, 0x33, 0xb0, 0x9a, 0xf0, 0x3c, 0xae, 0x14, 0x17, 0xbe, 0xd1, 0xc4, 0x98, 0xf6, 0xa3, 0x2b, + 0xd6, 0x3b, 0xc4, 0x54, 0x7e, 0x83, 0xf0, 0x8d, 0xbe, 0xb4, 0x47, 0xa1, 0x56, 0x9a, 0xf8, 0x8c, + 0xfb, 0x8d, 0xbf, 0xd6, 0xc4, 0xf2, 0xcb, 0x2c, 0x1e, 0xdb, 0x02, 0xd8, 0x16, 0xc2, 0x35, 0x5e, + 0xe0, 0xe9, 0xc1, 0xdc, 0x04, 0x42, 0xb8, 0x17, 0x12, 0xb1, 0x76, 0x59, 0x11, 0x79, 0x64, 0x0f, + 0xe6, 0x34, 0x16, 0xa0, 0xf1, 0x24, 0x03, 0xca, 0x3d, 0xe2, 0x26, 0xf4, 0xd9, 0x0b, 0xd0, 0xaf, + 0x5e, 0x82, 0xde, 0x9e, 0x48, 0x69, 0x22, 0xd6, 0xf2, 0xbb, 0x2c, 0x2e, 0xd4, 0x86, 0x75, 0x3c, + 0x0e, 0xc0, 0x67, 0xdb, 0x52, 0x04, 0x42, 0x11, 0xd7, 0x98, 0xc1, 0xff, 0x68, 0xae, 0x5d, 0x48, + 0xb7, 0x48, 0x12, 0x18, 0x25, 0x3c, 0xc1, 0x40, 0x51, 0xc9, 0x83, 0x68, 0xf2, 0xe3, 0x2f, 0x70, + 0xdc, 0x1e, 0x86, 0x8c, 0x05, 0x3c, 0x2e, 0x81, 0xf2, 0x80, 0x83, 0xaf, 0xf3, 0x23, 0x71, 0x7e, + 0x00, 0x18, 0x1d, 0x9c, 0x23, 0x5e, 0x3c, 0x6a, 0xa3, 0xb1, 0xc9, 0xf9, 0x3f, 0x9a, 0x8c, 0x1d, + 0x6e, 0xa5, 0x0e, 0x2b, 0x17, 0x70, 0x18, 0xdb, 0xfb, 0x70, 0x76, 0xb4, 0x38, 0xe9, 0x42, 0x83, + 0xd0, 0x8e, 0x43, 0x07, 0x67, 0x9e, 0x12, 0xae, 0x55, 0xf6, 0x0f, 0x8a, 0x99, 0x5f, 0x07, 0xc5, + 0xcc, 0x97, 0xcf, 0x4b, 0x85, 0x94, 0xb5, 0x21, 0x9a, 0x43, 0xa4, 0xbe, 0x8e, 0x34, 0xa3, 0x8d, + 0x67, 0x87, 0x5d, 0x13, 0x1d, 0x77, 0x4d, 0x74, 0xd2, 0x35, 0xd1, 0xcf, 0xae, 0x89, 0xde, 0x9e, + 0x9a, 0x99, 0x93, 0x53, 0x33, 0xf3, 0xed, 0xd4, 0xcc, 0x3c, 0xbf, 0x37, 0xa4, 0x67, 0x33, 0xd9, + 0xfb, 0x0f, 0x41, 0xb7, 0x84, 0xdc, 0xb3, 0x7a, 0x17, 0x46, 0xfb, 0xdc, 0x95, 0x11, 0xad, 0xc8, + 0x58, 0x66, 0x3d, 0x17, 0xef, 0xec, 0xd5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x45, 0x73, + 0x66, 0x5a, 0x06, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -746,13 +479,7 @@ func (this *Params) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.CommunityTax.Equal(that1.CommunityTax) { - return false - } - if !this.BaseProposerReward.Equal(that1.BaseProposerReward) { - return false - } - if !this.BonusProposerReward.Equal(that1.BonusProposerReward) { + if this.CommunityTax != that1.CommunityTax { return false } if this.WithdrawAddrEnabled != that1.WithdrawAddrEnabled { @@ -882,62 +609,6 @@ func (this *ValidatorOutstandingRewards) Equal(that interface{}) bool { } return true } -func (this *ValidatorSlashEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ValidatorSlashEvent) - if !ok { - that2, ok := that.(ValidatorSlashEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ValidatorPeriod != that1.ValidatorPeriod { - return false - } - if !this.Fraction.Equal(that1.Fraction) { - return false - } - return true -} -func (this *ValidatorSlashEvents) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ValidatorSlashEvents) - if !ok { - that2, ok := that.(ValidatorSlashEvents) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.ValidatorSlashEvents) != len(that1.ValidatorSlashEvents) { - return false - } - for i := range this.ValidatorSlashEvents { - if !this.ValidatorSlashEvents[i].Equal(&that1.ValidatorSlashEvents[i]) { - return false - } - } - return true -} func (this *FeePool) Equal(that interface{}) bool { if that == nil { return this == nil @@ -975,165 +646,44 @@ func (this *FeePool) Equal(that interface{}) bool { } return true } -func (this *DelegatorStartingInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil +func (m *Params) 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 +} - that1, ok := that.(*DelegatorStartingInfo) - if !ok { - that2, ok := that.(DelegatorStartingInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.PreviousPeriod != that1.PreviousPeriod { - return false - } - if !this.Stake.Equal(that1.Stake) { - return false - } - if this.Height != that1.Height { - return false - } - return true +func (m *Params) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (this *DelegationDelegatorReward) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - that1, ok := that.(*DelegationDelegatorReward) - if !ok { - that2, ok := that.(DelegationDelegatorReward) - if ok { - that1 = &that2 +func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.WithdrawAddrEnabled { + i-- + if m.WithdrawAddrEnabled { + dAtA[i] = 1 } else { - return false + dAtA[i] = 0 } + i-- + dAtA[i] = 0x10 } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ValidatorAddress != that1.ValidatorAddress { - return false - } - if len(this.Reward) != len(that1.Reward) { - return false - } - for i := range this.Reward { - if !this.Reward[i].Equal(&that1.Reward[i]) { - return false - } + if len(m.CommunityTax) > 0 { + i -= len(m.CommunityTax) + copy(dAtA[i:], m.CommunityTax) + i = encodeVarintDistribution(dAtA, i, uint64(len(m.CommunityTax))) + i-- + dAtA[i] = 0xa } - return true -} -func (this *CommunityPoolSpendProposalWithDeposit) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CommunityPoolSpendProposalWithDeposit) - if !ok { - that2, ok := that.(CommunityPoolSpendProposalWithDeposit) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Title != that1.Title { - return false - } - if this.Description != that1.Description { - return false - } - if this.Recipient != that1.Recipient { - return false - } - if this.Amount != that1.Amount { - return false - } - if this.Deposit != that1.Deposit { - return false - } - return true -} -func (m *Params) 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 *Params) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.WithdrawAddrEnabled { - i-- - if m.WithdrawAddrEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } - { - size := m.BonusProposerReward.Size() - i -= size - if _, err := m.BonusProposerReward.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - { - size := m.BaseProposerReward.Size() - i -= size - if _, err := m.BaseProposerReward.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size := m.CommunityTax.Size() - i -= size - if _, err := m.CommunityTax.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil + return len(dAtA) - i, nil } func (m *ValidatorHistoricalRewards) Marshal() (dAtA []byte, err error) { @@ -1294,81 +844,6 @@ func (m *ValidatorOutstandingRewards) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *ValidatorSlashEvent) 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 *ValidatorSlashEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ValidatorSlashEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size := m.Fraction.Size() - i -= size - if _, err := m.Fraction.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if m.ValidatorPeriod != 0 { - i = encodeVarintDistribution(dAtA, i, uint64(m.ValidatorPeriod)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *ValidatorSlashEvents) 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 *ValidatorSlashEvents) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ValidatorSlashEvents) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ValidatorSlashEvents) > 0 { - for iNdEx := len(m.ValidatorSlashEvents) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ValidatorSlashEvents[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *FeePool) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1478,151 +953,6 @@ func (m *CommunityPoolSpendProposal) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *DelegatorStartingInfo) 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 *DelegatorStartingInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DelegatorStartingInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Height != 0 { - i = encodeVarintDistribution(dAtA, i, uint64(m.Height)) - i-- - dAtA[i] = 0x18 - } - { - size := m.Stake.Size() - i -= size - if _, err := m.Stake.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if m.PreviousPeriod != 0 { - i = encodeVarintDistribution(dAtA, i, uint64(m.PreviousPeriod)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *DelegationDelegatorReward) 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 *DelegationDelegatorReward) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DelegationDelegatorReward) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Reward) > 0 { - for iNdEx := len(m.Reward) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Reward[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDistribution(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.ValidatorAddress) > 0 { - i -= len(m.ValidatorAddress) - copy(dAtA[i:], m.ValidatorAddress) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.ValidatorAddress))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *CommunityPoolSpendProposalWithDeposit) 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 *CommunityPoolSpendProposalWithDeposit) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CommunityPoolSpendProposalWithDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Deposit) > 0 { - i -= len(m.Deposit) - copy(dAtA[i:], m.Deposit) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.Deposit))) - i-- - dAtA[i] = 0x2a - } - if len(m.Amount) > 0 { - i -= len(m.Amount) - copy(dAtA[i:], m.Amount) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.Amount))) - i-- - dAtA[i] = 0x22 - } - if len(m.Recipient) > 0 { - i -= len(m.Recipient) - copy(dAtA[i:], m.Recipient) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.Recipient))) - i-- - dAtA[i] = 0x1a - } - if len(m.Description) > 0 { - i -= len(m.Description) - copy(dAtA[i:], m.Description) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.Description))) - i-- - dAtA[i] = 0x12 - } - if len(m.Title) > 0 { - i -= len(m.Title) - copy(dAtA[i:], m.Title) - i = encodeVarintDistribution(dAtA, i, uint64(len(m.Title))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintDistribution(dAtA []byte, offset int, v uint64) int { offset -= sovDistribution(v) base := offset @@ -1640,12 +970,10 @@ func (m *Params) Size() (n int) { } var l int _ = l - l = m.CommunityTax.Size() - n += 1 + l + sovDistribution(uint64(l)) - l = m.BaseProposerReward.Size() - n += 1 + l + sovDistribution(uint64(l)) - l = m.BonusProposerReward.Size() - n += 1 + l + sovDistribution(uint64(l)) + l = len(m.CommunityTax) + if l > 0 { + n += 1 + l + sovDistribution(uint64(l)) + } if m.WithdrawAddrEnabled { n += 2 } @@ -1718,35 +1046,6 @@ func (m *ValidatorOutstandingRewards) Size() (n int) { return n } -func (m *ValidatorSlashEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ValidatorPeriod != 0 { - n += 1 + sovDistribution(uint64(m.ValidatorPeriod)) - } - l = m.Fraction.Size() - n += 1 + l + sovDistribution(uint64(l)) - return n -} - -func (m *ValidatorSlashEvents) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.ValidatorSlashEvents) > 0 { - for _, e := range m.ValidatorSlashEvents { - l = e.Size() - n += 1 + l + sovDistribution(uint64(l)) - } - } - return n -} - func (m *FeePool) Size() (n int) { if m == nil { return 0 @@ -1795,73 +1094,8 @@ func (m *CommunityPoolSpendProposal) Size() (n int) { return n } -func (m *DelegatorStartingInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.PreviousPeriod != 0 { - n += 1 + sovDistribution(uint64(m.PreviousPeriod)) - } - l = m.Stake.Size() - n += 1 + l + sovDistribution(uint64(l)) - if m.Height != 0 { - n += 1 + sovDistribution(uint64(m.Height)) - } - return n -} - -func (m *DelegationDelegatorReward) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ValidatorAddress) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - if len(m.Reward) > 0 { - for _, e := range m.Reward { - l = e.Size() - n += 1 + l + sovDistribution(uint64(l)) - } - } - return n -} - -func (m *CommunityPoolSpendProposalWithDeposit) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Title) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - l = len(m.Description) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - l = len(m.Recipient) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - l = len(m.Amount) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - l = len(m.Deposit) - if l > 0 { - n += 1 + l + sovDistribution(uint64(l)) - } - return n -} - -func sovDistribution(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 +func sovDistribution(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 } func sozDistribution(x uint64) (n int) { return sovDistribution(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -1925,79 +1159,9 @@ func (m *Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.CommunityTax.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.CommunityTax = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseProposerReward", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.BaseProposerReward.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BonusProposerReward", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.BonusProposerReward.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field WithdrawAddrEnabled", wireType) } @@ -2118,466 +1282,8 @@ func (m *ValidatorHistoricalRewards) Unmarshal(dAtA []byte) error { m.ReferenceCount |= uint32(b&0x7F) << shift if b < 0x80 { break - } - } - default: - iNdEx = preIndex - skippy, err := skipDistribution(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDistribution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ValidatorCurrentRewards) 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 ErrIntOverflowDistribution - } - 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: ValidatorCurrentRewards: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ValidatorCurrentRewards: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Rewards", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDistribution - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Rewards = append(m.Rewards, types.DecCoin{}) - if err := m.Rewards[len(m.Rewards)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Period", wireType) - } - m.Period = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Period |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDistribution(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDistribution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ValidatorAccumulatedCommission) 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 ErrIntOverflowDistribution - } - 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: ValidatorAccumulatedCommission: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ValidatorAccumulatedCommission: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Commission", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDistribution - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Commission = append(m.Commission, types.DecCoin{}) - if err := m.Commission[len(m.Commission)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDistribution(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDistribution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ValidatorOutstandingRewards) 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 ErrIntOverflowDistribution - } - 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: ValidatorOutstandingRewards: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ValidatorOutstandingRewards: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Rewards", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDistribution - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Rewards = append(m.Rewards, types.DecCoin{}) - if err := m.Rewards[len(m.Rewards)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDistribution(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDistribution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ValidatorSlashEvent) 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 ErrIntOverflowDistribution - } - 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: ValidatorSlashEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ValidatorSlashEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorPeriod", wireType) - } - m.ValidatorPeriod = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ValidatorPeriod |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fraction", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Fraction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDistribution(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDistribution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ValidatorSlashEvents) 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 ErrIntOverflowDistribution - } - 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: ValidatorSlashEvents: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ValidatorSlashEvents: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSlashEvents", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDistribution - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ValidatorSlashEvents = append(m.ValidatorSlashEvents, ValidatorSlashEvent{}) - if err := m.ValidatorSlashEvents[len(m.ValidatorSlashEvents)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + } } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDistribution(dAtA[iNdEx:]) @@ -2599,7 +1305,7 @@ func (m *ValidatorSlashEvents) Unmarshal(dAtA []byte) error { } return nil } -func (m *FeePool) Unmarshal(dAtA []byte) error { +func (m *ValidatorCurrentRewards) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2622,15 +1328,15 @@ func (m *FeePool) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: FeePool: wiretype end group for non-group") + return fmt.Errorf("proto: ValidatorCurrentRewards: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: FeePool: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ValidatorCurrentRewards: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CommunityPool", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Rewards", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2657,16 +1363,16 @@ func (m *FeePool) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CommunityPool = append(m.CommunityPool, types.DecCoin{}) - if err := m.CommunityPool[len(m.CommunityPool)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Rewards = append(m.Rewards, types.DecCoin{}) + if err := m.Rewards[len(m.Rewards)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DecimalPool", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Period", wireType) } - var msglen int + m.Period = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDistribution @@ -2676,26 +1382,11 @@ func (m *FeePool) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.Period |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthDistribution - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DecimalPool = append(m.DecimalPool, types.DecCoin{}) - if err := m.DecimalPool[len(m.DecimalPool)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDistribution(dAtA[iNdEx:]) @@ -2717,7 +1408,7 @@ func (m *FeePool) Unmarshal(dAtA []byte) error { } return nil } -func (m *CommunityPoolSpendProposal) Unmarshal(dAtA []byte) error { +func (m *ValidatorAccumulatedCommission) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2740,111 +1431,15 @@ func (m *CommunityPoolSpendProposal) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CommunityPoolSpendProposal: wiretype end group for non-group") + return fmt.Errorf("proto: ValidatorAccumulatedCommission: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CommunityPoolSpendProposal: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ValidatorAccumulatedCommission: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Title", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Title = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Description = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Recipient", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Recipient = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Commission", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2871,8 +1466,8 @@ func (m *CommunityPoolSpendProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = append(m.Amount, types.Coin{}) - if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Commission = append(m.Commission, types.DecCoin{}) + if err := m.Commission[len(m.Commission)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2897,7 +1492,7 @@ func (m *CommunityPoolSpendProposal) Unmarshal(dAtA []byte) error { } return nil } -func (m *DelegatorStartingInfo) Unmarshal(dAtA []byte) error { +func (m *ValidatorOutstandingRewards) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2920,36 +1515,17 @@ func (m *DelegatorStartingInfo) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DelegatorStartingInfo: wiretype end group for non-group") + return fmt.Errorf("proto: ValidatorOutstandingRewards: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DelegatorStartingInfo: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ValidatorOutstandingRewards: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PreviousPeriod", wireType) - } - m.PreviousPeriod = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PreviousPeriod |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Stake", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Rewards", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDistribution @@ -2959,45 +1535,26 @@ func (m *DelegatorStartingInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthDistribution } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthDistribution } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Stake.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Rewards = append(m.Rewards, types.DecCoin{}) + if err := m.Rewards[len(m.Rewards)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - m.Height = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Height |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipDistribution(dAtA[iNdEx:]) @@ -3019,7 +1576,7 @@ func (m *DelegatorStartingInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error { +func (m *FeePool) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3042,17 +1599,17 @@ func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DelegationDelegatorReward: wiretype end group for non-group") + return fmt.Errorf("proto: FeePool: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DelegationDelegatorReward: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: FeePool: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CommunityPool", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDistribution @@ -3062,27 +1619,29 @@ func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthDistribution } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthDistribution } if postIndex > l { return io.ErrUnexpectedEOF } - m.ValidatorAddress = string(dAtA[iNdEx:postIndex]) + m.CommunityPool = append(m.CommunityPool, types.DecCoin{}) + if err := m.CommunityPool[len(m.CommunityPool)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Reward", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DecimalPool", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3109,8 +1668,8 @@ func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Reward = append(m.Reward, types.DecCoin{}) - if err := m.Reward[len(m.Reward)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.DecimalPool = append(m.DecimalPool, types.DecCoin{}) + if err := m.DecimalPool[len(m.DecimalPool)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3135,7 +1694,7 @@ func (m *DelegationDelegatorReward) Unmarshal(dAtA []byte) error { } return nil } -func (m *CommunityPoolSpendProposalWithDeposit) Unmarshal(dAtA []byte) error { +func (m *CommunityPoolSpendProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3158,10 +1717,10 @@ func (m *CommunityPoolSpendProposalWithDeposit) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CommunityPoolSpendProposalWithDeposit: wiretype end group for non-group") + return fmt.Errorf("proto: CommunityPoolSpendProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CommunityPoolSpendProposalWithDeposit: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CommunityPoolSpendProposal: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3264,7 +1823,7 @@ func (m *CommunityPoolSpendProposalWithDeposit) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDistribution @@ -3274,55 +1833,25 @@ func (m *CommunityPoolSpendProposalWithDeposit) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthDistribution } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthDistribution } if postIndex > l { return io.ErrUnexpectedEOF } - m.Amount = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Deposit", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDistribution - } - 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 ErrInvalidLengthDistribution - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDistribution - } - if postIndex > l { - return io.ErrUnexpectedEOF + m.Amount = append(m.Amount, types.Coin{}) + if err := m.Amount[len(m.Amount)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.Deposit = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/feedistribution/types/expected_keepers.go b/x/feedistribution/types/expected_keepers.go index 860ae8c35..75c055b6f 100644 --- a/x/feedistribution/types/expected_keepers.go +++ b/x/feedistribution/types/expected_keepers.go @@ -27,17 +27,17 @@ type AccountKeeper interface { // BankKeeper defines the expected interface for the Bank module. type BankKeeper interface { - MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error - GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins + MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins - SpendableCoins(ctx context.Context, addr sdk.AccAddress) sdk.Coins + SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins - SendCoinsFromModuleToModule(ctx context.Context, senderModule, recipientModule string, amt sdk.Coins) error - SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error - SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error + SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error BlockedAddr(addr sdk.AccAddress) bool - IsSendEnabledDenom(ctx context.Context, denom string) bool + IsSendEnabledDenom(ctx sdk.Context, denom string) bool } // ParamSubspace defines the expected Subspace interface for parameters. diff --git a/x/feedistribution/types/params.pb.go b/x/feedistribution/types/params.pb.go index 63521f6bb..64007003f 100644 --- a/x/feedistribution/types/params.pb.go +++ b/x/feedistribution/types/params.pb.go @@ -4,7 +4,10 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -29,7 +32,8 @@ type Params struct { // period is the amount of past periods, based on the epochs per period param Period uint64 `protobuf:"varint,1,opt,name=period,proto3" json:"period,omitempty"` // epoch_identifier for fee distribution - EpochIdentifier string `protobuf:"bytes,2,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty"` + EpochIdentifier string `protobuf:"bytes,2,opt,name=epoch_identifier,json=epochIdentifier,proto3" json:"epoch_identifier,omitempty"` + CommunityTax cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=community_tax,json=communityTax,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"community_tax"` } func (m *Params) Reset() { *m = Params{} } @@ -88,22 +92,29 @@ func init() { } var fileDescriptor_2ff10781d3e27dd7 = []byte{ - // 233 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xad, 0xc8, 0x4f, - 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x4b, 0x4d, 0x4d, 0xc9, 0x2c, 0x2e, 0x29, 0xca, 0x4c, 0x2a, 0x2d, - 0x49, 0xd5, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, - 0x85, 0xaa, 0xd1, 0x43, 0x51, 0x23, 0x25, 0x98, 0x98, 0x9b, 0x99, 0x97, 0xaf, 0x0f, 0x26, 0x21, - 0x2a, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x4c, 0x7d, 0x10, 0x0b, 0x22, 0xaa, 0x54, 0xc4, - 0xc5, 0x16, 0x00, 0x36, 0x4f, 0x48, 0x8c, 0x8b, 0xad, 0x20, 0xb5, 0x28, 0x33, 0x3f, 0x45, 0x82, - 0x51, 0x81, 0x51, 0x83, 0x25, 0x08, 0xca, 0x13, 0xd2, 0xe4, 0x12, 0x48, 0x2d, 0xc8, 0x4f, 0xce, - 0x88, 0xcf, 0x4c, 0x49, 0xcd, 0x2b, 0xc9, 0x4c, 0xcb, 0x4c, 0x2d, 0x92, 0x60, 0x52, 0x60, 0xd4, - 0xe0, 0x0c, 0xe2, 0x07, 0x8b, 0x7b, 0xc2, 0x85, 0xad, 0x54, 0xbb, 0x9e, 0x6f, 0xd0, 0x52, 0x80, - 0xb9, 0xba, 0x02, 0xc5, 0xdd, 0x99, 0xf9, 0x79, 0xfa, 0x10, 0x9b, 0x9c, 0x82, 0x4f, 0x3c, 0x92, - 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, - 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x32, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0xdf, 0x15, 0x62, 0x8c, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0xb6, 0x3e, 0x6e, - 0x53, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xfe, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, - 0xff, 0xb7, 0x32, 0x5c, 0xe0, 0x35, 0x01, 0x00, 0x00, + // 344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x50, 0xc1, 0x4a, 0xc3, 0x40, + 0x14, 0xcc, 0xaa, 0x14, 0x0c, 0x8a, 0x1a, 0x54, 0x6a, 0x85, 0xb4, 0x14, 0x84, 0x5a, 0x30, 0x4b, + 0x11, 0x04, 0x3d, 0x96, 0x7a, 0x10, 0x44, 0xa4, 0x7a, 0xd2, 0x43, 0xd9, 0x6c, 0x5e, 0xd3, 0xa5, + 0x24, 0x2f, 0x64, 0xb7, 0x9a, 0xfe, 0x82, 0x27, 0x3f, 0xc3, 0x63, 0x0f, 0x7e, 0x44, 0x6f, 0x16, + 0x4f, 0xe2, 0xa1, 0x48, 0x7b, 0xe8, 0x6f, 0x48, 0xb3, 0xb1, 0xd0, 0x83, 0x97, 0xe5, 0xbd, 0x99, + 0xd9, 0xd9, 0xd9, 0x31, 0xcb, 0x90, 0x20, 0xc7, 0x18, 0x68, 0x1b, 0xc0, 0x13, 0x52, 0xc5, 0xc2, + 0xed, 0x29, 0xa0, 0x11, 0x8b, 0x59, 0x20, 0x9d, 0x28, 0x46, 0x85, 0xd6, 0x5e, 0xa6, 0x71, 0x96, + 0x34, 0x85, 0x1d, 0x16, 0x88, 0x10, 0x69, 0x7a, 0x6a, 0x65, 0x61, 0xd7, 0x47, 0x1f, 0xd3, 0x91, + 0xce, 0xa7, 0x0c, 0xb5, 0x39, 0xca, 0x00, 0x25, 0x75, 0x99, 0x04, 0xfa, 0x54, 0x73, 0x41, 0xb1, + 0x1a, 0xe5, 0x28, 0xc2, 0x8c, 0x3f, 0xd0, 0x7c, 0x4b, 0x5f, 0xd4, 0x8b, 0xa6, 0xca, 0x1f, 0xc4, + 0xcc, 0xdd, 0xa6, 0x59, 0xac, 0x7d, 0x33, 0x17, 0x41, 0x2c, 0xd0, 0xcb, 0x93, 0x12, 0xa9, 0xac, + 0x35, 0xb3, 0xcd, 0x3a, 0x36, 0xb7, 0x21, 0x42, 0xde, 0x69, 0x09, 0x0f, 0x42, 0x25, 0xda, 0x02, + 0xe2, 0xfc, 0x4a, 0x89, 0x54, 0xd6, 0x9b, 0x5b, 0x29, 0x7e, 0xb5, 0x80, 0xad, 0x47, 0x73, 0x93, + 0x63, 0x10, 0xf4, 0x42, 0xa1, 0xfa, 0x2d, 0xc5, 0x92, 0xfc, 0xea, 0x5c, 0x57, 0x3f, 0x1b, 0x8e, + 0x8b, 0xc6, 0xf7, 0xb8, 0x78, 0xa8, 0x9f, 0x96, 0x5e, 0xd7, 0x11, 0x48, 0x03, 0xa6, 0x3a, 0xce, + 0x35, 0xf8, 0x8c, 0xf7, 0x1b, 0xc0, 0x3f, 0xdf, 0x4f, 0xcc, 0x2c, 0x59, 0x03, 0xf8, 0xdb, 0x6c, + 0x50, 0x25, 0xcd, 0x8d, 0x85, 0xd9, 0x3d, 0x4b, 0x2e, 0x8e, 0x5e, 0x66, 0x83, 0x6a, 0xe9, 0xaf, + 0xce, 0x64, 0xa9, 0x50, 0x81, 0x21, 0xd5, 0xdf, 0xa8, 0xdf, 0x0d, 0x27, 0x36, 0x19, 0x4d, 0x6c, + 0xf2, 0x33, 0xb1, 0xc9, 0xeb, 0xd4, 0x36, 0x46, 0x53, 0xdb, 0xf8, 0x9a, 0xda, 0xc6, 0xc3, 0xb9, + 0x2f, 0x54, 0xa7, 0xe7, 0x3a, 0x1c, 0x03, 0x7a, 0xa9, 0x6d, 0x6e, 0x40, 0x3d, 0x63, 0xdc, 0xa5, + 0xff, 0xbb, 0xaa, 0x7e, 0x04, 0xd2, 0xcd, 0xa5, 0x6d, 0x9d, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, + 0xf9, 0xb8, 0x4a, 0x5d, 0xce, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -126,6 +137,16 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size := m.CommunityTax.Size() + i -= size + if _, err := m.CommunityTax.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintParams(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a if len(m.EpochIdentifier) > 0 { i -= len(m.EpochIdentifier) copy(dAtA[i:], m.EpochIdentifier) @@ -165,6 +186,8 @@ func (m *Params) Size() (n int) { if l > 0 { n += 1 + l + sovParams(uint64(l)) } + l = m.CommunityTax.Size() + n += 1 + l + sovParams(uint64(l)) return n } @@ -254,6 +277,40 @@ func (m *Params) Unmarshal(dAtA []byte) error { } m.EpochIdentifier = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CommunityTax", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + 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 ErrInvalidLengthParams + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.CommunityTax.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) diff --git a/x/reward/types/types.go b/x/reward/types/types.go index 5a198c0b1..5102f01ac 100644 --- a/x/reward/types/types.go +++ b/x/reward/types/types.go @@ -2,6 +2,7 @@ package types import ( "fmt" + "github.com/ExocoreNetwork/exocore/utils" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -18,12 +19,16 @@ func NewPool(name string) Pool { func (m Pool) ValidateBasic() error { validatorDic := make(map[string]bool) for _, reward := range m.Rewards { - validatorAddr := reward.Validator.String() + validatorAddr := reward.Validator if validatorDic[validatorAddr] { return fmt.Errorf("duplicate validator %s in pool %s", validatorAddr, m.Name) } - if err := sdk.VerifyAddressFormat(reward.Validator); err != nil { + validator, err := utils.GetExocoreAddressFromBech32(reward.Validator) + if err != nil { + return err + } + if err := sdk.VerifyAddressFormat(validator); err != nil { return fmt.Errorf("invalid validator %s in pool %s", validatorAddr, m.Name) } diff --git a/x/reward/types/types.pb.go b/x/reward/types/types.pb.go index ad1685b4d..080a8e386 100644 --- a/x/reward/types/types.pb.go +++ b/x/reward/types/types.pb.go @@ -70,6 +70,7 @@ type Pool_Reward struct { Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` // earnings_addr is the earnings address. EarningsAddr string `protobuf:"bytes,3,opt,name=earnings_addr,json=earningsAddr,proto3" json:"earnings_addr,omitempty"` + Validator string `protobuf:"bytes,4,opt,name=Validator,proto3" json:"Validator,omitempty"` } func (m *Pool_Reward) Reset() { *m = Pool_Reward{} } @@ -113,27 +114,28 @@ func init() { func init() { proto.RegisterFile("exocore/reward/types.proto", fileDescriptor_620cd6dbeff3c5e2) } var fileDescriptor_620cd6dbeff3c5e2 = []byte{ - // 309 bytes of a gzipped FileDescriptorProto + // 327 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x51, 0xbd, 0x4e, 0xf3, 0x30, - 0x14, 0x8d, 0xbf, 0xf6, 0x2b, 0xc2, 0xfc, 0x0c, 0x16, 0x43, 0x09, 0x92, 0x5b, 0xc1, 0xd2, 0x05, - 0xbb, 0x85, 0x91, 0x89, 0x22, 0xd6, 0x0a, 0x65, 0x64, 0x41, 0x4e, 0x6c, 0x85, 0xa8, 0x24, 0xb7, - 0xb2, 0x03, 0x2d, 0x6f, 0xd1, 0xe7, 0xe0, 0x49, 0x32, 0x76, 0x64, 0xe2, 0x27, 0xd9, 0x78, 0x0a, - 0xe4, 0x38, 0x91, 0xe8, 0xe4, 0xa3, 0x7b, 0x7d, 0xce, 0x3d, 0xe7, 0x5e, 0xec, 0xab, 0x15, 0x44, - 0xa0, 0x15, 0xd7, 0x6a, 0x29, 0xb4, 0xe4, 0xf9, 0xeb, 0x42, 0x19, 0xb6, 0xd0, 0x90, 0x03, 0x39, - 0x6c, 0x7a, 0xcc, 0xf5, 0x7c, 0x1a, 0x81, 0x49, 0xc1, 0xf0, 0x50, 0x18, 0xc5, 0x5f, 0x26, 0xa1, - 0xca, 0xc5, 0x84, 0x47, 0x90, 0x64, 0xee, 0xbf, 0x7f, 0x14, 0x43, 0x0c, 0x35, 0xe4, 0x16, 0xb9, - 0xea, 0xe9, 0x0f, 0xc2, 0xdd, 0x3b, 0x80, 0x27, 0x42, 0x70, 0x37, 0x13, 0xa9, 0xea, 0xa3, 0x21, - 0x1a, 0xed, 0x06, 0x35, 0x26, 0x57, 0x78, 0xc7, 0x89, 0x9b, 0xfe, 0xbf, 0x61, 0x67, 0xb4, 0x77, - 0x71, 0xc2, 0xb6, 0x87, 0x32, 0x4b, 0x65, 0x41, 0x8d, 0xa7, 0xdd, 0xe2, 0x63, 0xe0, 0x05, 0x2d, - 0xc3, 0x5f, 0x23, 0xdc, 0x73, 0x1d, 0x22, 0xf0, 0x7f, 0x6b, 0xa4, 0x55, 0x39, 0x66, 0xce, 0x2a, - 0xb3, 0x56, 0x59, 0x63, 0x95, 0xdd, 0x40, 0x92, 0x4d, 0xc7, 0x56, 0xe3, 0xed, 0x73, 0x30, 0x8a, - 0x93, 0xfc, 0xf1, 0x39, 0x64, 0x11, 0xa4, 0xbc, 0xc9, 0xe5, 0x9e, 0x73, 0x23, 0xe7, 0xcd, 0x1a, - 0x2c, 0xc1, 0x04, 0x4e, 0x99, 0x9c, 0xe1, 0x03, 0x25, 0x74, 0x96, 0x64, 0xb1, 0x79, 0x10, 0x52, - 0xea, 0x7e, 0xa7, 0xce, 0xb1, 0xdf, 0x16, 0xaf, 0xa5, 0xd4, 0xd3, 0x59, 0xf1, 0x4d, 0xbd, 0xa2, - 0xa4, 0x68, 0x53, 0x52, 0xf4, 0x55, 0x52, 0xb4, 0xae, 0xa8, 0xb7, 0xa9, 0xa8, 0xf7, 0x5e, 0x51, - 0xef, 0x7e, 0xfc, 0x67, 0xe6, 0xad, 0x8b, 0x39, 0x53, 0xf9, 0x12, 0xf4, 0x9c, 0xb7, 0x67, 0x58, - 0x6d, 0x1d, 0x22, 0xec, 0xd5, 0x3b, 0xbc, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xe7, 0x75, - 0xd8, 0xa7, 0x01, 0x00, 0x00, + 0x14, 0x4d, 0xda, 0x7c, 0xfd, 0x54, 0xf3, 0x33, 0x58, 0x0c, 0x21, 0x20, 0xb7, 0x82, 0xa5, 0x0b, + 0x76, 0x0b, 0x23, 0x13, 0x45, 0xac, 0x15, 0xca, 0xc0, 0xc0, 0x82, 0x9c, 0xd8, 0x0a, 0x51, 0xdb, + 0xdc, 0xca, 0x0e, 0xb4, 0xbc, 0x01, 0x23, 0xcf, 0xc1, 0xc0, 0x73, 0x74, 0xec, 0xc8, 0xc4, 0x4f, + 0xf3, 0x22, 0x28, 0x76, 0x22, 0xe8, 0xe4, 0xa3, 0x7b, 0xef, 0x39, 0x3e, 0xf7, 0x5c, 0x14, 0xc8, + 0x05, 0xc4, 0xa0, 0x24, 0x53, 0x72, 0xce, 0x95, 0x60, 0xf9, 0xd3, 0x4c, 0x6a, 0x3a, 0x53, 0x90, + 0x03, 0xde, 0xad, 0x7a, 0xd4, 0xf6, 0x02, 0x12, 0x83, 0x9e, 0x82, 0x66, 0x11, 0xd7, 0x92, 0x3d, + 0x0e, 0x22, 0x99, 0xf3, 0x01, 0x8b, 0x21, 0xcd, 0xec, 0x7c, 0xb0, 0x97, 0x40, 0x02, 0x06, 0xb2, + 0x12, 0xd9, 0xea, 0xd1, 0x73, 0x03, 0x79, 0xd7, 0x00, 0x13, 0x8c, 0x91, 0x97, 0xf1, 0xa9, 0xf4, + 0xdd, 0xae, 0xdb, 0x6b, 0x87, 0x06, 0xe3, 0x73, 0xf4, 0xdf, 0x8a, 0x6b, 0xbf, 0xd1, 0x6d, 0xf6, + 0xb6, 0x4e, 0x0f, 0xe8, 0xe6, 0xa7, 0xb4, 0xa4, 0xd2, 0xd0, 0xe0, 0xa1, 0xb7, 0xfc, 0xe8, 0x38, + 0x61, 0xcd, 0x08, 0xde, 0x5c, 0xd4, 0xb2, 0x1d, 0xcc, 0xd1, 0xbf, 0xd2, 0x48, 0xad, 0xb2, 0x4f, + 0xad, 0x55, 0x5a, 0x5a, 0xa5, 0x95, 0x55, 0x7a, 0x09, 0x69, 0x36, 0xec, 0x97, 0x1a, 0xaf, 0x9f, + 0x9d, 0x5e, 0x92, 0xe6, 0xf7, 0x0f, 0x11, 0x8d, 0x61, 0xca, 0xaa, 0xbd, 0xec, 0x73, 0xa2, 0xc5, + 0xb8, 0x8a, 0xa1, 0x24, 0xe8, 0xd0, 0x2a, 0xe3, 0x63, 0xb4, 0x23, 0xb9, 0xca, 0xd2, 0x2c, 0xd1, + 0x77, 0x5c, 0x08, 0xe5, 0x37, 0xcd, 0x1e, 0xdb, 0x75, 0xf1, 0x42, 0x08, 0x85, 0x0f, 0x51, 0xfb, + 0x86, 0x4f, 0x52, 0xc1, 0x73, 0x50, 0xbe, 0x67, 0x06, 0x7e, 0x0b, 0xc3, 0xd1, 0xf2, 0x9b, 0x38, + 0xcb, 0x35, 0x71, 0x57, 0x6b, 0xe2, 0x7e, 0xad, 0x89, 0xfb, 0x52, 0x10, 0x67, 0x55, 0x10, 0xe7, + 0xbd, 0x20, 0xce, 0x6d, 0xff, 0x8f, 0xa3, 0x2b, 0x1b, 0xc2, 0x48, 0xe6, 0x73, 0x50, 0x63, 0x56, + 0x1f, 0x69, 0xb1, 0x71, 0xa6, 0xa8, 0x65, 0x12, 0x3e, 0xfb, 0x09, 0x00, 0x00, 0xff, 0xff, 0x89, + 0x81, 0x42, 0xa2, 0xc5, 0x01, 0x00, 0x00, } func (m *Pool) Marshal() (dAtA []byte, err error) { @@ -200,6 +202,13 @@ func (m *Pool_Reward) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Validator) > 0 { + i -= len(m.Validator) + copy(dAtA[i:], m.Validator) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Validator))) + i-- + dAtA[i] = 0x22 + } if len(m.EarningsAddr) > 0 { i -= len(m.EarningsAddr) copy(dAtA[i:], m.EarningsAddr) @@ -270,6 +279,10 @@ func (m *Pool_Reward) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = len(m.Validator) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -490,6 +503,38 @@ func (m *Pool_Reward) Unmarshal(dAtA []byte) error { } m.EarningsAddr = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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 ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Validator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:])