diff --git a/Makefile b/Makefile index 6851dc9ea..8b653f442 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ all: lint build test-unit ### Build flags ### ############################################################################### -LD_FLAGS = -X github.com/forbole/juno/v4/cmd.Version=$(VERSION) \ - -X github.com/forbole/juno/v4/cmd.Commit=$(COMMIT) +LD_FLAGS = -X github.com/forbole/juno/v5/cmd.Version=$(VERSION) \ + -X github.com/forbole/juno/v5/cmd.Commit=$(COMMIT) BUILD_FLAGS := -ldflags '$(LD_FLAGS)' ifeq ($(LINK_STATICALLY),true) diff --git a/cmd/bdjuno/main.go b/cmd/bdjuno/main.go index bf0ae8b1b..543283a21 100644 --- a/cmd/bdjuno/main.go +++ b/cmd/bdjuno/main.go @@ -2,11 +2,11 @@ package main import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/forbole/juno/v4/cmd" - initcmd "github.com/forbole/juno/v4/cmd/init" - parsetypes "github.com/forbole/juno/v4/cmd/parse/types" - startcmd "github.com/forbole/juno/v4/cmd/start" - "github.com/forbole/juno/v4/modules/messages" + "github.com/forbole/juno/v5/cmd" + initcmd "github.com/forbole/juno/v5/cmd/init" + parsetypes "github.com/forbole/juno/v5/cmd/parse/types" + startcmd "github.com/forbole/juno/v5/cmd/start" + "github.com/forbole/juno/v5/modules/messages" "github.com/cosmos/cosmos-sdk/simapp" migratecmd "github.com/forbole/bdjuno/v4/cmd/migrate" @@ -14,9 +14,9 @@ import ( "github.com/forbole/bdjuno/v4/types/config" + humansaiapp "github.com/MonCatCat/humans/app" "github.com/forbole/bdjuno/v4/database" "github.com/forbole/bdjuno/v4/modules" - humansaiapp "github.com/MonCatCat/humans/app" ) func main() { diff --git a/cmd/migrate/cmd.go b/cmd/migrate/cmd.go index 9ab61e008..06810e3a6 100644 --- a/cmd/migrate/cmd.go +++ b/cmd/migrate/cmd.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" v3 "github.com/forbole/bdjuno/v4/cmd/migrate/v3" diff --git a/cmd/migrate/v3/migrate.go b/cmd/migrate/v3/migrate.go index 89e26cbe6..c32361c39 100644 --- a/cmd/migrate/v3/migrate.go +++ b/cmd/migrate/v3/migrate.go @@ -6,12 +6,12 @@ import ( "github.com/forbole/bdjuno/v4/modules/actions" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "gopkg.in/yaml.v3" - junov4 "github.com/forbole/juno/v4/cmd/migrate/v4" - "github.com/forbole/juno/v4/types/config" + junov4 "github.com/forbole/juno/v5/cmd/migrate/v4" + "github.com/forbole/juno/v5/types/config" ) // RunMigration runs the migrations from v2 to v3 diff --git a/cmd/migrate/v3/types.go b/cmd/migrate/v3/types.go index 98b84a28e..01d44c815 100644 --- a/cmd/migrate/v3/types.go +++ b/cmd/migrate/v3/types.go @@ -1,7 +1,7 @@ package v3 import ( - v3 "github.com/forbole/juno/v4/cmd/migrate/v3" + v3 "github.com/forbole/juno/v5/cmd/migrate/v3" "github.com/forbole/bdjuno/v4/modules/actions" ) diff --git a/cmd/migrate/v3/utils.go b/cmd/migrate/v3/utils.go index b3b47a460..37fc66f09 100644 --- a/cmd/migrate/v3/utils.go +++ b/cmd/migrate/v3/utils.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/types/config" "gopkg.in/yaml.v3" ) diff --git a/cmd/parse/auth/cmd.go b/cmd/parse/auth/cmd.go index 8d4c3baa4..f91f6ced6 100644 --- a/cmd/parse/auth/cmd.go +++ b/cmd/parse/auth/cmd.go @@ -1,7 +1,7 @@ package auth import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/auth/vesting.go b/cmd/parse/auth/vesting.go index d24ded4bd..a3e6253db 100644 --- a/cmd/parse/auth/vesting.go +++ b/cmd/parse/auth/vesting.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/bank/cmd.go b/cmd/parse/bank/cmd.go index 90afb8e09..94d3ae68b 100644 --- a/cmd/parse/bank/cmd.go +++ b/cmd/parse/bank/cmd.go @@ -1,7 +1,7 @@ package bank import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/bank/supply.go b/cmd/parse/bank/supply.go index def846b62..dab2d8fc9 100644 --- a/cmd/parse/bank/supply.go +++ b/cmd/parse/bank/supply.go @@ -5,8 +5,8 @@ import ( modulestypes "github.com/forbole/bdjuno/v4/modules/types" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/distribution/cmd.go b/cmd/parse/distribution/cmd.go index a7fd698b8..086a9fe99 100644 --- a/cmd/parse/distribution/cmd.go +++ b/cmd/parse/distribution/cmd.go @@ -1,7 +1,7 @@ package distribution import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/distribution/communitypool.go b/cmd/parse/distribution/communitypool.go index 1e0b60a33..e898df353 100644 --- a/cmd/parse/distribution/communitypool.go +++ b/cmd/parse/distribution/communitypool.go @@ -3,8 +3,8 @@ package distribution import ( "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/feegrant/allowance.go b/cmd/parse/feegrant/allowance.go index 780ecae68..0bbe11aa9 100644 --- a/cmd/parse/feegrant/allowance.go +++ b/cmd/parse/feegrant/allowance.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/forbole/bdjuno/v4/modules/feegrant" "github.com/forbole/bdjuno/v4/utils" diff --git a/cmd/parse/feegrant/cmd.go b/cmd/parse/feegrant/cmd.go index 9f45e9767..d08909c4f 100644 --- a/cmd/parse/feegrant/cmd.go +++ b/cmd/parse/feegrant/cmd.go @@ -1,7 +1,7 @@ package feegrant import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/gov/cmd.go b/cmd/parse/gov/cmd.go index 8e7e3ea2e..f86d8ca1e 100644 --- a/cmd/parse/gov/cmd.go +++ b/cmd/parse/gov/cmd.go @@ -1,7 +1,7 @@ package gov import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/gov/proposal.go b/cmd/parse/gov/proposal.go index 2dbc714d7..c07f005f5 100644 --- a/cmd/parse/gov/proposal.go +++ b/cmd/parse/gov/proposal.go @@ -18,9 +18,9 @@ import ( "github.com/forbole/bdjuno/v4/modules/slashing" "github.com/forbole/bdjuno/v4/modules/staking" "github.com/forbole/bdjuno/v4/utils" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/parser" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/parser" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" ) diff --git a/cmd/parse/mint/cmd.go b/cmd/parse/mint/cmd.go index 2bcc991aa..5c45f1faf 100644 --- a/cmd/parse/mint/cmd.go +++ b/cmd/parse/mint/cmd.go @@ -1,7 +1,7 @@ package mint import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/mint/inflation.go b/cmd/parse/mint/inflation.go index 213f5ab6c..b2d514fc5 100644 --- a/cmd/parse/mint/inflation.go +++ b/cmd/parse/mint/inflation.go @@ -3,8 +3,8 @@ package mint import ( "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/parse.go b/cmd/parse/parse.go index 802dc738d..7234763c4 100644 --- a/cmd/parse/parse.go +++ b/cmd/parse/parse.go @@ -1,7 +1,7 @@ package parse import ( - parse "github.com/forbole/juno/v4/cmd/parse/types" + parse "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" parseauth "github.com/forbole/bdjuno/v4/cmd/parse/auth" @@ -12,9 +12,9 @@ import ( parsemint "github.com/forbole/bdjuno/v4/cmd/parse/mint" parsepricefeed "github.com/forbole/bdjuno/v4/cmd/parse/pricefeed" parsestaking "github.com/forbole/bdjuno/v4/cmd/parse/staking" - parseblocks "github.com/forbole/juno/v4/cmd/parse/blocks" - parsegenesis "github.com/forbole/juno/v4/cmd/parse/genesis" - parsetransaction "github.com/forbole/juno/v4/cmd/parse/transactions" + parseblocks "github.com/forbole/juno/v5/cmd/parse/blocks" + parsegenesis "github.com/forbole/juno/v5/cmd/parse/genesis" + parsetransaction "github.com/forbole/juno/v5/cmd/parse/transactions" ) // NewParseCmd returns the Cobra command allowing to parse some chain data without having to re-sync the whole database diff --git a/cmd/parse/pricefeed/cmd.go b/cmd/parse/pricefeed/cmd.go index a45262969..51e705cf7 100644 --- a/cmd/parse/pricefeed/cmd.go +++ b/cmd/parse/pricefeed/cmd.go @@ -1,7 +1,7 @@ package pricefeed import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/pricefeed/price.go b/cmd/parse/pricefeed/price.go index 9d7228f14..209f0fd1e 100644 --- a/cmd/parse/pricefeed/price.go +++ b/cmd/parse/pricefeed/price.go @@ -3,8 +3,8 @@ package pricefeed import ( "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/pricefeed/pricehistory.go b/cmd/parse/pricefeed/pricehistory.go index 112990f96..d0b0f57fb 100644 --- a/cmd/parse/pricefeed/pricehistory.go +++ b/cmd/parse/pricefeed/pricehistory.go @@ -3,8 +3,8 @@ package pricefeed import ( "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/staking/cmd.go b/cmd/parse/staking/cmd.go index b74bee7f4..7f0792f18 100644 --- a/cmd/parse/staking/cmd.go +++ b/cmd/parse/staking/cmd.go @@ -1,7 +1,7 @@ package staking import ( - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/staking/staking.go b/cmd/parse/staking/staking.go index cbfc9834b..1a89d208e 100644 --- a/cmd/parse/staking/staking.go +++ b/cmd/parse/staking/staking.go @@ -3,8 +3,8 @@ package staking import ( "fmt" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/cmd/parse/staking/validators.go b/cmd/parse/staking/validators.go index b6ecb770f..eb5560cf3 100644 --- a/cmd/parse/staking/validators.go +++ b/cmd/parse/staking/validators.go @@ -5,8 +5,8 @@ import ( modulestypes "github.com/forbole/bdjuno/v4/modules/types" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" - "github.com/forbole/juno/v4/types/config" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" + "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v4/database" diff --git a/database/database.go b/database/database.go index 8b48f624a..da5d4bc10 100644 --- a/database/database.go +++ b/database/database.go @@ -3,8 +3,8 @@ package database import ( "fmt" - db "github.com/forbole/juno/v4/database" - "github.com/forbole/juno/v4/database/postgresql" + db "github.com/forbole/juno/v5/database" + "github.com/forbole/juno/v5/database/postgresql" "github.com/jmoiron/sqlx" ) diff --git a/database/database_test.go b/database/database_test.go index d72ca03bd..bed4b4179 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - dbconfig "github.com/forbole/juno/v4/database/config" - "github.com/forbole/juno/v4/logging" + dbconfig "github.com/forbole/juno/v5/database/config" + "github.com/forbole/juno/v5/logging" - junodb "github.com/forbole/juno/v4/database" + junodb "github.com/forbole/juno/v5/database" "github.com/forbole/bdjuno/v4/database" "github.com/forbole/bdjuno/v4/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" tmversion "github.com/cometbft/cometbft/proto/tendermint/version" tmctypes "github.com/cometbft/cometbft/rpc/core/types" diff --git a/database/gov.go b/database/gov.go index af50592d0..53cc1dc94 100644 --- a/database/gov.go +++ b/database/gov.go @@ -164,7 +164,7 @@ INSERT INTO proposal( return fmt.Errorf("error while wrapping proposal proto content: %s", err) } - contentBz, err := db.EncodingConfig.Codec.MarshalJSON(anyContent) + contentBz, err := db.Cdc.MarshalJSON(anyContent) if err != nil { return fmt.Errorf("error while marshaling proposal content: %s", err) } @@ -217,13 +217,13 @@ func (db *Db) GetProposal(id uint64) (types.Proposal, error) { row := rows[0] var contentAny codectypes.Any - err = db.EncodingConfig.Codec.UnmarshalJSON([]byte(row.Content), &contentAny) + err = db.Cdc.UnmarshalJSON([]byte(row.Content), &contentAny) if err != nil { return types.Proposal{}, err } var content govtypesv1beta1.Content - err = db.EncodingConfig.Codec.UnpackAny(&contentAny, &content) + err = db.Cdc.UnpackAny(&contentAny, &content) if err != nil { return types.Proposal{}, err } diff --git a/go.mod b/go.mod index 50445e04a..0de2d6025 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( cosmossdk.io/math v1.0.0-rc.0 github.com/MonCatCat/humans v1.0.1-0.20230525075000-24685564a008 // branch bdjuno-v1.0.0 - github.com/cometbft/cometbft v0.37.1 - github.com/cosmos/cosmos-sdk v0.46.11 - github.com/forbole/juno/v4 v4.1.1-0.20230503093602-557aa8d187e0 + github.com/cometbft/cometbft v0.38.2 + github.com/cosmos/cosmos-sdk v0.46.13 + github.com/forbole/juno/v5 v5.0.0-20240102103911-6ff1d9ec9a0f github.com/go-co-op/gocron v1.18.0 github.com/gogo/protobuf v1.3.3 github.com/jmoiron/sqlx v1.3.5 @@ -18,21 +18,21 @@ require ( github.com/rs/zerolog v1.29.1 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.2 - github.com/tendermint/tendermint v0.34.27 // indirect - google.golang.org/grpc v1.54.0 + github.com/tendermint/tendermint v0.34.28 // indirect + google.golang.org/grpc v1.58.3 gopkg.in/yaml.v3 v3.0.1 ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect + cloud.google.com/go v0.110.6 // indirect + cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.12.0 // indirect - cloud.google.com/go/storage v1.28.1 // indirect + cloud.google.com/go/iam v1.1.1 // indirect + cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/99designs/keyring v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect + github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/VictoriaMetrics/fastcache v1.6.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -45,25 +45,26 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.7 // indirect + github.com/cosmos/gogoproto v1.4.11 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.5 // indirect - github.com/cosmos/ibc-go/v6 v6.1.0 // indirect + github.com/cosmos/iavl v0.19.6 // indirect + github.com/cosmos/ibc-go/v6 v6.2.1 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + 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.4.1-0.20201116162257-a2a8dda75c91 // indirect github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect - github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/ethereum/go-ethereum v1.10.26 // indirect @@ -72,7 +73,7 @@ require ( github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // 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.5.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -84,9 +85,10 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.5.9 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -112,12 +114,12 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect - github.com/klauspost/compress v1.15.11 // indirect + github.com/klauspost/compress v1.16.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect @@ -125,10 +127,10 @@ require ( github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/nxadm/tail v1.4.8 // indirect + github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect @@ -151,7 +153,8 @@ require ( github.com/spf13/viper v1.15.0 // indirect github.com/status-im/keycard-go v0.2.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect + github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tendermint/tm-db v0.6.7 // indirect github.com/tidwall/btree v1.5.0 // indirect @@ -167,19 +170,21 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.5.0 // indirect - golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.110.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -190,5 +195,5 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 github.com/cosmos/cosmos-sdk => github.com/humansdotai/cosmos-sdk v0.1.3 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27 + github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28 ) diff --git a/go.sum b/go.sum index ebe79c3d0..494ea5b77 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= +cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -70,8 +70,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -111,13 +111,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= -cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= +cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= +cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -175,8 +174,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= 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 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= -cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= +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/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -197,8 +196,8 @@ filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmG filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= -github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +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/MonCatCat/humans v1.0.1-0.20230525075000-24685564a008 h1:CIRwvmX5/gqmYN2zQ08RUbjjpyacTIONMcn4a31cZOc= github.com/MonCatCat/humans v1.0.1-0.20230525075000-24685564a008/go.mod h1:O7IbvSSS1DUWrIqIFarEGE+1yfOMm+ORkx4NrJVAink= @@ -266,11 +265,12 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH 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/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= -github.com/cometbft/cometbft v0.34.27 h1:ri6BvmwjWR0gurYjywcBqRe4bbwc3QVs9KRcCzgh/J0= -github.com/cometbft/cometbft v0.34.27/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw= -github.com/cometbft/cometbft v0.37.1 h1:KLxkQTK2hICXYq21U2hn1W5hOVYUdQgDQ1uB+90xPIg= -github.com/cometbft/cometbft v0.37.1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +github.com/cometbft/cometbft v0.34.28 h1:gwryf55P1SWMUP4nOXpRVI2D0yPoYEzN+IBqmRBOsDc= +github.com/cometbft/cometbft v0.34.28/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= +github.com/cometbft/cometbft v0.38.2 h1:io0JCh5EPxINKN5ZMI5hCdpW3QVZRy+o8qWe3mlJa/8= +github.com/cometbft/cometbft v0.38.2/go.mod h1:PIi48BpzwlHqtV3mzwPyQgOyOnU94BNBimLS2ebBHOg= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= +github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= 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/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -284,14 +284,14 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960Bvc github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.7 h1:RzYKVnsEC7UIkDnhTIkqEB7LnIQbsySvmNEqPCiPevk= -github.com/cosmos/gogoproto v1.4.7/go.mod h1:gxGePp9qedovvl/StQL2BIJ6qlIBn1+9YxR0IulGBKA= +github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= +github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= -github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v6 v6.1.0 h1:o7oXws2vKkKfOFzJI+oNylRn44PCNt5wzHd/zKQKbvQ= -github.com/cosmos/ibc-go/v6 v6.1.0/go.mod h1:CY3zh2HLfetRiW8LY6kVHMATe90Wj/UOoY8T6cuB0is= +github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= +github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/ibc-go/v6 v6.2.1 h1:NiaDXTRhKwf3n9kELD4VRIe5zby1yk1jBvaz9tXTQ6k= +github.com/cosmos/ibc-go/v6 v6.2.1/go.mod h1:XLsARy4Y7+GtAqzMcxNdlQf6lx+ti1e8KcMGv5NIK7A= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= @@ -311,15 +311,14 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= -github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= @@ -330,8 +329,8 @@ github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf h1:Yt+4K30SdjOkRoRRm3v github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac h1:opbrjaN/L8gg6Xh5D04Tem+8xVcz6ajZlGCs49mQgyg= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= @@ -357,12 +356,13 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= -github.com/forbole/juno/v4 v4.1.1-0.20230503093602-557aa8d187e0 h1:DolFhVYPrrhY7tUiPN9xQhyUqbLKQR+hHs6GZvTrVAc= -github.com/forbole/juno/v4 v4.1.1-0.20230503093602-557aa8d187e0/go.mod h1:ybagBMD+85UJHViJKD5urm6usca5OgpsTXg5GW45R9U= +github.com/forbole/juno/v5 v5.0.0-20240102103911-6ff1d9ec9a0f h1:Tf0S7XDZiPGjrPRvyAKWaQs1ogXkQQCrBdpra82+jOc= +github.com/forbole/juno/v5 v5.0.0-20240102103911-6ff1d9ec9a0f/go.mod h1:zpEvg1FzhPn2qxbhVAW75D0Q0Eg1ieoM4DPsdZDefFA= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= 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.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= @@ -383,8 +383,8 @@ github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= @@ -394,6 +394,7 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= 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= @@ -483,10 +484,13 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -504,8 +508,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= @@ -587,8 +591,9 @@ github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNr github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -616,8 +621,9 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= @@ -650,15 +656,21 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae h1:FatpGJD2jmJfhZiFDElaC0QhZUDQnxUeAwTGkfAHN3I= +github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -666,10 +678,11 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= 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= @@ -773,15 +786,17 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= 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/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= +github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= +github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= @@ -848,8 +863,9 @@ 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.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -860,8 +876,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE= -golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA= +golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -918,7 +934,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -929,7 +944,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/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= @@ -942,8 +959,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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= @@ -969,8 +986,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= 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= @@ -985,8 +1002,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= 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= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1023,15 +1040,14 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1071,14 +1087,16 @@ 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-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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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= @@ -1088,9 +1106,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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= @@ -1139,6 +1158,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1206,8 +1226,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1322,8 +1342,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1360,8 +1384,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= 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= @@ -1378,8 +1402,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ 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= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/modules/actions/config.go b/modules/actions/config.go index 2930cbcc4..1ba56a2a0 100644 --- a/modules/actions/config.go +++ b/modules/actions/config.go @@ -1,7 +1,7 @@ package actions import ( - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" "gopkg.in/yaml.v3" ) diff --git a/modules/actions/module.go b/modules/actions/module.go index 7726ad665..4854ccdda 100644 --- a/modules/actions/module.go +++ b/modules/actions/module.go @@ -2,11 +2,11 @@ package actions import ( "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/forbole/juno/v4/modules" - "github.com/forbole/juno/v4/node" - "github.com/forbole/juno/v4/node/builder" - nodeconfig "github.com/forbole/juno/v4/node/config" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/modules" + "github.com/forbole/juno/v5/node" + "github.com/forbole/juno/v5/node/builder" + nodeconfig "github.com/forbole/juno/v5/node/config" + "github.com/forbole/juno/v5/types/config" modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) diff --git a/modules/actions/types/handler.go b/modules/actions/types/handler.go index b16518e73..a57c8d332 100644 --- a/modules/actions/types/handler.go +++ b/modules/actions/types/handler.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/forbole/juno/v4/node" + "github.com/forbole/juno/v5/node" modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) diff --git a/modules/auth/handle_msg.go b/modules/auth/handle_msg.go index 3b481a44c..55cc9364e 100644 --- a/modules/auth/handle_msg.go +++ b/modules/auth/handle_msg.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" "github.com/gogo/protobuf/proto" "github.com/rs/zerolog/log" @@ -18,7 +18,7 @@ import ( // HandleMsg implements modules.MessageModule func (m *Module) HandleMsg(_ int, msg sdk.Msg, tx *juno.Tx) error { - addresses, err := m.messagesParser(m.cdc, msg) + addresses, err := m.messagesParser(tx) if err != nil { log.Error().Str("module", "auth").Err(err). Str("operation", "refresh account"). diff --git a/modules/auth/module.go b/modules/auth/module.go index c0855a511..32bb89a99 100644 --- a/modules/auth/module.go +++ b/modules/auth/module.go @@ -5,8 +5,8 @@ import ( "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" - "github.com/forbole/juno/v4/modules/messages" + "github.com/forbole/juno/v5/modules" + "github.com/forbole/juno/v5/modules/messages" ) var ( diff --git a/modules/bank/module.go b/modules/bank/module.go index 83544c316..bf1e6c148 100644 --- a/modules/bank/module.go +++ b/modules/bank/module.go @@ -6,9 +6,9 @@ import ( "github.com/forbole/bdjuno/v4/database" "github.com/forbole/bdjuno/v4/modules/bank/source" - junomessages "github.com/forbole/juno/v4/modules/messages" + junomessages "github.com/forbole/juno/v5/modules/messages" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/bank/source/local/source.go b/modules/bank/source/local/source.go index 79190bf0f..25c346a7d 100644 --- a/modules/bank/source/local/source.go +++ b/modules/bank/source/local/source.go @@ -1,98 +1,98 @@ package local -// import ( -// "fmt" - -// "github.com/cosmos/cosmos-sdk/types/query" -// banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/forbole/juno/v4/node/local" - -// "github.com/forbole/bdjuno/v4/modules/bank/source" -// "github.com/forbole/bdjuno/v4/types" -// ) - -// var ( -// _ source.Source = &Source{} -// ) - -// // Source represents the implementation of the bank keeper that works on a local node -// type Source struct { -// *local.Source -// q banktypes.QueryServer -// } - -// // NewSource builds a new Source instance -// func NewSource(source *local.Source, bk banktypes.QueryServer) *Source { -// return &Source{ -// Source: source, -// q: bk, -// } -// } - -// // GetBalances implements keeper.Source -// func (s Source) GetBalances(addresses []string, height int64) ([]types.AccountBalance, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// var balances []types.AccountBalance -// for _, address := range addresses { -// res, err := s.q.AllBalances(sdk.WrapSDKContext(ctx), &banktypes.QueryAllBalancesRequest{Address: address}) -// if err != nil { -// return nil, err -// } - -// balances = append(balances, types.NewAccountBalance(address, res.Balances, height)) -// } - -// return balances, nil -// } - -// // GetSupply implements bankkeeper.Source -// func (s Source) GetSupply(height int64) (sdk.Coins, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// var coins []sdk.Coin -// var nextKey []byte -// var stop = false -// for !stop { -// res, err := s.q.TotalSupply( -// sdk.WrapSDKContext(ctx), -// &banktypes.QueryTotalSupplyRequest{ -// Pagination: &query.PageRequest{ -// Key: nextKey, -// Limit: 100, // Query 100 supplies at time -// }, -// }) -// if err != nil { -// return nil, fmt.Errorf("error while getting total supply: %s", err) -// } - -// nextKey = res.Pagination.NextKey -// stop = len(res.Pagination.NextKey) == 0 -// coins = append(coins, res.Supply...) -// } - -// return coins, nil -// } - -// // GetAccountBalances implements bankkeeper.Source -// func (s Source) GetAccountBalance(address string, height int64) ([]sdk.Coin, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// balRes, err := s.q.AllBalances(sdk.WrapSDKContext(ctx), &banktypes.QueryAllBalancesRequest{Address: address}) -// if err != nil { -// return nil, fmt.Errorf("error while getting all balances: %s", err) -// } - -// return balRes.Balances, nil -// } +import ( + "fmt" + + "github.com/cosmos/cosmos-sdk/types/query" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/forbole/juno/v5/node/local" + + "github.com/forbole/bdjuno/v4/modules/bank/source" + "github.com/forbole/bdjuno/v4/types" +) + +var ( + _ source.Source = &Source{} +) + +// Source represents the implementation of the bank keeper that works on a local node +type Source struct { + *local.Source + q banktypes.QueryServer +} + +// NewSource builds a new Source instance +func NewSource(source *local.Source, bk banktypes.QueryServer) *Source { + return &Source{ + Source: source, + q: bk, + } +} + +// GetBalances implements keeper.Source +func (s Source) GetBalances(addresses []string, height int64) ([]types.AccountBalance, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + var balances []types.AccountBalance + for _, address := range addresses { + res, err := s.q.AllBalances(sdk.WrapSDKContext(ctx), &banktypes.QueryAllBalancesRequest{Address: address}) + if err != nil { + return nil, err + } + + balances = append(balances, types.NewAccountBalance(address, res.Balances, height)) + } + + return balances, nil +} + +// GetSupply implements bankkeeper.Source +func (s Source) GetSupply(height int64) (sdk.Coins, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + var coins []sdk.Coin + var nextKey []byte + var stop = false + for !stop { + res, err := s.q.TotalSupply( + sdk.WrapSDKContext(ctx), + &banktypes.QueryTotalSupplyRequest{ + Pagination: &query.PageRequest{ + Key: nextKey, + Limit: 100, // Query 100 supplies at time + }, + }) + if err != nil { + return nil, fmt.Errorf("error while getting total supply: %s", err) + } + + nextKey = res.Pagination.NextKey + stop = len(res.Pagination.NextKey) == 0 + coins = append(coins, res.Supply...) + } + + return coins, nil +} + +// GetAccountBalances implements bankkeeper.Source +func (s Source) GetAccountBalance(address string, height int64) ([]sdk.Coin, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + balRes, err := s.q.AllBalances(sdk.WrapSDKContext(ctx), &banktypes.QueryAllBalancesRequest{Address: address}) + if err != nil { + return nil, fmt.Errorf("error while getting all balances: %s", err) + } + + return balRes.Balances, nil +} diff --git a/modules/bank/source/remote/source.go b/modules/bank/source/remote/source.go index f359d8604..c2ede4d67 100644 --- a/modules/bank/source/remote/source.go +++ b/modules/bank/source/remote/source.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" bankkeeper "github.com/forbole/bdjuno/v4/modules/bank/source" "github.com/forbole/bdjuno/v4/types" diff --git a/modules/consensus/handle_block.go b/modules/consensus/handle_block.go index 5512e8a64..f77c7a60e 100644 --- a/modules/consensus/handle_block.go +++ b/modules/consensus/handle_block.go @@ -3,7 +3,7 @@ package consensus import ( "fmt" - "github.com/forbole/juno/v4/types" + "github.com/forbole/juno/v5/types" "github.com/rs/zerolog/log" diff --git a/modules/consensus/module.go b/modules/consensus/module.go index df96853c7..2fccc9eb3 100644 --- a/modules/consensus/module.go +++ b/modules/consensus/module.go @@ -3,7 +3,7 @@ package consensus import ( "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/daily_refetch/handle_periodic_operations.go b/modules/daily_refetch/handle_periodic_operations.go index 83be18edc..ae8f5c307 100644 --- a/modules/daily_refetch/handle_periodic_operations.go +++ b/modules/daily_refetch/handle_periodic_operations.go @@ -4,13 +4,13 @@ import ( "fmt" "time" - "github.com/forbole/juno/v4/parser" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/parser" + "github.com/forbole/juno/v5/types/config" "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v5/cmd/parse/types" ) func (m *Module) RegisterPeriodicOperations(scheduler *gocron.Scheduler) error { diff --git a/modules/daily_refetch/module.go b/modules/daily_refetch/module.go index 7918a8b20..a9673f431 100644 --- a/modules/daily_refetch/module.go +++ b/modules/daily_refetch/module.go @@ -1,11 +1,11 @@ package daily_refetch import ( - "github.com/forbole/juno/v4/node" + "github.com/forbole/juno/v5/node" bdjunodb "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/distribution/handle_msg.go b/modules/distribution/handle_msg.go index b425a1115..0de58ffe1 100644 --- a/modules/distribution/handle_msg.go +++ b/modules/distribution/handle_msg.go @@ -2,7 +2,7 @@ package distribution import ( sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" ) diff --git a/modules/distribution/module.go b/modules/distribution/module.go index af439ba71..88ec8ef1a 100644 --- a/modules/distribution/module.go +++ b/modules/distribution/module.go @@ -5,7 +5,7 @@ import ( distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" "github.com/forbole/bdjuno/v4/database" ) diff --git a/modules/distribution/source/local/source.go b/modules/distribution/source/local/source.go index 5b7ea5b7d..42ccd311b 100644 --- a/modules/distribution/source/local/source.go +++ b/modules/distribution/source/local/source.go @@ -1,112 +1,112 @@ package local -// import ( -// "fmt" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" -// "github.com/forbole/juno/v4/node/local" - -// distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" -// ) - -// var ( -// _ distrsource.Source = &Source{} -// ) - -// // Source implements distrsource.Source reading the data from a local node -// type Source struct { -// *local.Source -// q distrtypes.QueryServer -// } - -// func NewSource(source *local.Source, keeper distrtypes.QueryServer) *Source { -// return &Source{ -// Source: source, -// q: keeper, -// } -// } - -// // ValidatorCommission implements distrsource.Source -// func (s Source) ValidatorCommission(valOperAddr string, height int64) (sdk.DecCoins, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.ValidatorCommission( -// sdk.WrapSDKContext(ctx), -// &distrtypes.QueryValidatorCommissionRequest{ValidatorAddress: valOperAddr}, -// ) -// if err != nil { -// return nil, err -// } - -// return res.Commission.Commission, nil -// } - -// // DelegatorTotalRewards implements distrsource.Source -// func (s Source) DelegatorTotalRewards(delegator string, height int64) ([]distrtypes.DelegationDelegatorReward, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.DelegationTotalRewards( -// sdk.WrapSDKContext(ctx), -// &distrtypes.QueryDelegationTotalRewardsRequest{DelegatorAddress: delegator}, -// ) -// if err != nil { -// return nil, err -// } - -// return res.Rewards, nil -// } - -// // DelegatorWithdrawAddress implements distrsource.Source -// func (s Source) DelegatorWithdrawAddress(delegator string, height int64) (string, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return "", fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.DelegatorWithdrawAddress( -// sdk.WrapSDKContext(ctx), -// &distrtypes.QueryDelegatorWithdrawAddressRequest{DelegatorAddress: delegator}, -// ) -// if err != nil { -// return "", err -// } - -// return res.WithdrawAddress, nil -// } - -// // CommunityPool implements distrsource.Source -// func (s Source) CommunityPool(height int64) (sdk.DecCoins, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.CommunityPool(sdk.WrapSDKContext(ctx), &distrtypes.QueryCommunityPoolRequest{}) -// if err != nil { -// return nil, err -// } - -// return res.Pool, nil -// } - -// // Params implements distrsource.Source -// func (s Source) Params(height int64) (distrtypes.Params, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return distrtypes.Params{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Params(sdk.WrapSDKContext(ctx), &distrtypes.QueryParamsRequest{}) -// if err != nil { -// return distrtypes.Params{}, err -// } - -// return res.Params, nil -// } +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + "github.com/forbole/juno/v5/node/local" + + distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" +) + +var ( + _ distrsource.Source = &Source{} +) + +// Source implements distrsource.Source reading the data from a local node +type Source struct { + *local.Source + q distrtypes.QueryServer +} + +func NewSource(source *local.Source, keeper distrtypes.QueryServer) *Source { + return &Source{ + Source: source, + q: keeper, + } +} + +// ValidatorCommission implements distrsource.Source +func (s Source) ValidatorCommission(valOperAddr string, height int64) (sdk.DecCoins, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.ValidatorCommission( + sdk.WrapSDKContext(ctx), + &distrtypes.QueryValidatorCommissionRequest{ValidatorAddress: valOperAddr}, + ) + if err != nil { + return nil, err + } + + return res.Commission.Commission, nil +} + +// DelegatorTotalRewards implements distrsource.Source +func (s Source) DelegatorTotalRewards(delegator string, height int64) ([]distrtypes.DelegationDelegatorReward, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.DelegationTotalRewards( + sdk.WrapSDKContext(ctx), + &distrtypes.QueryDelegationTotalRewardsRequest{DelegatorAddress: delegator}, + ) + if err != nil { + return nil, err + } + + return res.Rewards, nil +} + +// DelegatorWithdrawAddress implements distrsource.Source +func (s Source) DelegatorWithdrawAddress(delegator string, height int64) (string, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return "", fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.DelegatorWithdrawAddress( + sdk.WrapSDKContext(ctx), + &distrtypes.QueryDelegatorWithdrawAddressRequest{DelegatorAddress: delegator}, + ) + if err != nil { + return "", err + } + + return res.WithdrawAddress, nil +} + +// CommunityPool implements distrsource.Source +func (s Source) CommunityPool(height int64) (sdk.DecCoins, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.CommunityPool(sdk.WrapSDKContext(ctx), &distrtypes.QueryCommunityPoolRequest{}) + if err != nil { + return nil, err + } + + return res.Pool, nil +} + +// Params implements distrsource.Source +func (s Source) Params(height int64) (distrtypes.Params, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return distrtypes.Params{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &distrtypes.QueryParamsRequest{}) + if err != nil { + return distrtypes.Params{}, err + } + + return res.Params, nil +} diff --git a/modules/distribution/source/remote/source.go b/modules/distribution/source/remote/source.go index 610b957fb..697e11b85 100644 --- a/modules/distribution/source/remote/source.go +++ b/modules/distribution/source/remote/source.go @@ -3,7 +3,7 @@ package remote import ( sdk "github.com/cosmos/cosmos-sdk/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" ) diff --git a/modules/distribution/source/remote/source_actions.go b/modules/distribution/source/remote/source_actions.go index 0c5c25b1c..120440407 100644 --- a/modules/distribution/source/remote/source_actions.go +++ b/modules/distribution/source/remote/source_actions.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" "github.com/forbole/bdjuno/v4/utils" ) diff --git a/modules/feegrant/handle_block.go b/modules/feegrant/handle_block.go index db615536a..693567fd4 100644 --- a/modules/feegrant/handle_block.go +++ b/modules/feegrant/handle_block.go @@ -6,7 +6,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" tmctypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/rs/zerolog/log" @@ -20,7 +20,7 @@ func (m *Module) HandleBlock( ) error { // Remove expired fee grant allowances - err := m.removeExpiredFeeGrantAllowances(block.Block.Height, res.EndBlockEvents) + err := m.removeExpiredFeeGrantAllowances(block.Block.Height, res.FinalizeBlockEvents) if err != nil { fmt.Printf("Error when removing expired fee grant allowance, error: %s", err) } diff --git a/modules/feegrant/handle_msg.go b/modules/feegrant/handle_msg.go index bc788a807..069589b07 100644 --- a/modules/feegrant/handle_msg.go +++ b/modules/feegrant/handle_msg.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" "github.com/forbole/bdjuno/v4/types" ) diff --git a/modules/feegrant/module.go b/modules/feegrant/module.go index bb68d1a16..deeae8609 100644 --- a/modules/feegrant/module.go +++ b/modules/feegrant/module.go @@ -5,7 +5,7 @@ import ( "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/gov/handle_block.go b/modules/gov/handle_block.go index 1139ed278..31fec7ad7 100644 --- a/modules/gov/handle_block.go +++ b/modules/gov/handle_block.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" tmctypes "github.com/cometbft/cometbft/rpc/core/types" diff --git a/modules/gov/handle_msg.go b/modules/gov/handle_msg.go index 200fb2272..8d649f0a9 100644 --- a/modules/gov/handle_msg.go +++ b/modules/gov/handle_msg.go @@ -13,7 +13,7 @@ import ( gov "github.com/cosmos/cosmos-sdk/x/gov/types" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" ) // HandleMsg implements modules.MessageModule diff --git a/modules/gov/module.go b/modules/gov/module.go index dbad7e3ec..7c51496b0 100644 --- a/modules/gov/module.go +++ b/modules/gov/module.go @@ -7,7 +7,7 @@ import ( govsource "github.com/forbole/bdjuno/v4/modules/gov/source" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/gov/source/local/source.go b/modules/gov/source/local/source.go index 88dc64ce1..9cb1d960b 100644 --- a/modules/gov/source/local/source.go +++ b/modules/gov/source/local/source.go @@ -1,123 +1,123 @@ package local -// import ( -// "fmt" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" -// govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - -// "github.com/forbole/juno/v4/node/local" - -// govsource "github.com/forbole/bdjuno/v4/modules/gov/source" -// ) - -// var ( -// _ govsource.Source = &Source{} -// ) - -// // Source implements govsource.Source by using a local node -// type Source struct { -// *local.Source -// q govtypesv1.QueryServer -// qv1beta1 govtypesv1beta1.QueryClient -// } - -// // NewSource returns a new Source instance -// func NewSource(source *local.Source, govKeeper govtypesv1.QueryServer, govKeeperv1beta1 govtypesv1beta1.QueryClient) *Source { -// return &Source{ -// Source: source, -// q: govKeeper, -// qv1beta1: govKeeperv1beta1, -// } -// } - -// // Proposal implements govsource.Source -// func (s Source) Proposal(height int64, id uint64) (govtypesv1beta1.Proposal, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return govtypesv1beta1.Proposal{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.qv1beta1.Proposal(sdk.WrapSDKContext(ctx), &govtypesv1beta1.QueryProposalRequest{ProposalId: id}) -// if err != nil { -// return govtypesv1beta1.Proposal{}, err -// } - -// return res.Proposal, nil -// } - -// // ProposalDeposit implements govsource.Source -// func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (*govtypesv1.Deposit, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Deposit(sdk.WrapSDKContext(ctx), &govtypesv1.QueryDepositRequest{ProposalId: id, Depositor: depositor}) -// if err != nil { -// return nil, err -// } - -// return res.Deposit, nil -// } - -// // TallyResult implements govsource.Source -// func (s Source) TallyResult(height int64, proposalID uint64) (*govtypesv1.TallyResult, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.TallyResult(sdk.WrapSDKContext(ctx), &govtypesv1.QueryTallyResultRequest{ProposalId: proposalID}) -// if err != nil { -// return nil, err -// } - -// return res.Tally, nil -// } - -// // DepositParams implements govsource.Source -// func (s Source) DepositParams(height int64) (*govtypesv1.DepositParams, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamDeposit}) -// if err != nil { -// return nil, err -// } - -// return res.DepositParams, nil -// } - -// // VotingParams implements govsource.Source -// func (s Source) VotingParams(height int64) (*govtypesv1.VotingParams, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamVoting}) -// if err != nil { -// return nil, err -// } - -// return res.VotingParams, nil -// } - -// // TallyParams implements govsource.Source -// func (s Source) TallyParams(height int64) (*govtypesv1.TallyParams, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamTallying}) -// if err != nil { -// return nil, err -// } - -// return res.TallyParams, nil -// } +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + + "github.com/forbole/juno/v5/node/local" + + govsource "github.com/forbole/bdjuno/v4/modules/gov/source" +) + +var ( + _ govsource.Source = &Source{} +) + +// Source implements govsource.Source by using a local node +type Source struct { + *local.Source + q govtypesv1.QueryServer + qv1beta1 govtypesv1beta1.QueryClient +} + +// NewSource returns a new Source instance +func NewSource(source *local.Source, govKeeper govtypesv1.QueryServer, govKeeperv1beta1 govtypesv1beta1.QueryClient) *Source { + return &Source{ + Source: source, + q: govKeeper, + qv1beta1: govKeeperv1beta1, + } +} + +// Proposal implements govsource.Source +func (s Source) Proposal(height int64, id uint64) (govtypesv1beta1.Proposal, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return govtypesv1beta1.Proposal{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.qv1beta1.Proposal(sdk.WrapSDKContext(ctx), &govtypesv1beta1.QueryProposalRequest{ProposalId: id}) + if err != nil { + return govtypesv1beta1.Proposal{}, err + } + + return res.Proposal, nil +} + +// ProposalDeposit implements govsource.Source +func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (*govtypesv1.Deposit, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Deposit(sdk.WrapSDKContext(ctx), &govtypesv1.QueryDepositRequest{ProposalId: id, Depositor: depositor}) + if err != nil { + return nil, err + } + + return res.Deposit, nil +} + +// TallyResult implements govsource.Source +func (s Source) TallyResult(height int64, proposalID uint64) (*govtypesv1.TallyResult, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.TallyResult(sdk.WrapSDKContext(ctx), &govtypesv1.QueryTallyResultRequest{ProposalId: proposalID}) + if err != nil { + return nil, err + } + + return res.Tally, nil +} + +// DepositParams implements govsource.Source +func (s Source) DepositParams(height int64) (*govtypesv1.DepositParams, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamDeposit}) + if err != nil { + return nil, err + } + + return res.DepositParams, nil +} + +// VotingParams implements govsource.Source +func (s Source) VotingParams(height int64) (*govtypesv1.VotingParams, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamVoting}) + if err != nil { + return nil, err + } + + return res.VotingParams, nil +} + +// TallyParams implements govsource.Source +func (s Source) TallyParams(height int64) (*govtypesv1.TallyParams, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamTallying}) + if err != nil { + return nil, err + } + + return res.TallyParams, nil +} diff --git a/modules/gov/source/remote/source.go b/modules/gov/source/remote/source.go index db0330471..a91622cef 100644 --- a/modules/gov/source/remote/source.go +++ b/modules/gov/source/remote/source.go @@ -2,7 +2,7 @@ package remote import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" govsource "github.com/forbole/bdjuno/v4/modules/gov/source" diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index 2436ce661..88eb60c4f 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -282,7 +282,7 @@ func (m *Module) handlePassedProposal(proposal govtypesv1beta1.Proposal, height // Unpack proposal var content govtypesv1beta1.Content - err := m.db.EncodingConfig.Codec.UnpackAny(proposal.Content, &content) + err := m.db.Cdc.UnpackAny(proposal.Content, &content) if err != nil { return fmt.Errorf("error while handling ParamChangeProposal: %s", err) } diff --git a/modules/mint/module.go b/modules/mint/module.go index 1440693db..1462dde5b 100644 --- a/modules/mint/module.go +++ b/modules/mint/module.go @@ -2,7 +2,7 @@ package mint import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" "github.com/forbole/bdjuno/v4/database" mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" diff --git a/modules/mint/source/local/source.go b/modules/mint/source/local/source.go index 17224f08f..b9ec18f79 100644 --- a/modules/mint/source/local/source.go +++ b/modules/mint/source/local/source.go @@ -1,59 +1,59 @@ package local -// import ( -// "fmt" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" -// "github.com/forbole/juno/v4/node/local" - -// mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" -// ) - -// var ( -// _ mintsource.Source = &Source{} -// ) - -// // Source implements mintsource.Source using a local node -// type Source struct { -// *local.Source -// querier minttypes.QueryServer -// } - -// // NewSource returns a new Source instace -// func NewSource(source *local.Source, querier minttypes.QueryServer) *Source { -// return &Source{ -// Source: source, -// querier: querier, -// } -// } - -// // GetInflation implements mintsource.Source -// func (s Source) GetInflation(height int64) (sdk.Dec, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return sdk.Dec{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.querier.Inflation(sdk.WrapSDKContext(ctx), &minttypes.QueryInflationRequest{}) -// if err != nil { -// return sdk.Dec{}, err -// } - -// return res.Inflation, nil -// } - -// // Params implements mintsource.Source -// func (s Source) Params(height int64) (minttypes.Params, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return minttypes.Params{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.querier.Params(sdk.WrapSDKContext(ctx), &minttypes.QueryParamsRequest{}) -// if err != nil { -// return minttypes.Params{}, err -// } - -// return res.Params, nil -// } +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + "github.com/forbole/juno/v5/node/local" + + mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" +) + +var ( + _ mintsource.Source = &Source{} +) + +// Source implements mintsource.Source using a local node +type Source struct { + *local.Source + querier minttypes.QueryServer +} + +// NewSource returns a new Source instace +func NewSource(source *local.Source, querier minttypes.QueryServer) *Source { + return &Source{ + Source: source, + querier: querier, + } +} + +// GetInflation implements mintsource.Source +func (s Source) GetInflation(height int64) (sdk.Dec, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return sdk.Dec{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.querier.Inflation(sdk.WrapSDKContext(ctx), &minttypes.QueryInflationRequest{}) + if err != nil { + return sdk.Dec{}, err + } + + return res.Inflation, nil +} + +// Params implements mintsource.Source +func (s Source) Params(height int64) (minttypes.Params, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return minttypes.Params{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.querier.Params(sdk.WrapSDKContext(ctx), &minttypes.QueryParamsRequest{}) + if err != nil { + return minttypes.Params{}, err + } + + return res.Params, nil +} diff --git a/modules/mint/source/remote/source.go b/modules/mint/source/remote/source.go index 52fba9c4e..8471e6c59 100644 --- a/modules/mint/source/remote/source.go +++ b/modules/mint/source/remote/source.go @@ -3,7 +3,7 @@ package remote import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" ) diff --git a/modules/modules/module.go b/modules/modules/module.go index b3b42147a..ae22fb7c6 100644 --- a/modules/modules/module.go +++ b/modules/modules/module.go @@ -1,8 +1,8 @@ package modules import ( - "github.com/forbole/juno/v4/modules" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/modules" + "github.com/forbole/juno/v5/types/config" "github.com/forbole/bdjuno/v4/database" ) diff --git a/modules/pricefeed/module.go b/modules/pricefeed/module.go index 52a857f6f..21b42634c 100644 --- a/modules/pricefeed/module.go +++ b/modules/pricefeed/module.go @@ -2,11 +2,11 @@ package pricefeed import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/types/config" "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/modules/registrar.go b/modules/registrar.go index 42d5c82ac..9a70aa46e 100644 --- a/modules/registrar.go +++ b/modules/registrar.go @@ -4,16 +4,14 @@ import ( "github.com/forbole/bdjuno/v4/modules/actions" "github.com/forbole/bdjuno/v4/modules/types" - "github.com/forbole/juno/v4/modules/pruning" - "github.com/forbole/juno/v4/modules/telemetry" + "github.com/forbole/juno/v5/modules/pruning" + "github.com/forbole/juno/v5/modules/telemetry" "github.com/forbole/bdjuno/v4/modules/slashing" - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - jmodules "github.com/forbole/juno/v4/modules" - "github.com/forbole/juno/v4/modules/messages" - "github.com/forbole/juno/v4/modules/registrar" + jmodules "github.com/forbole/juno/v5/modules" + "github.com/forbole/juno/v5/modules/messages" + "github.com/forbole/juno/v5/modules/registrar" "github.com/forbole/bdjuno/v4/utils" @@ -31,12 +29,13 @@ import ( "github.com/forbole/bdjuno/v4/modules/pricefeed" "github.com/forbole/bdjuno/v4/modules/staking" "github.com/forbole/bdjuno/v4/modules/upgrade" + juno "github.com/forbole/juno/v5/types" ) // UniqueAddressesParser returns a wrapper around the given parser that removes all duplicated addresses func UniqueAddressesParser(parser messages.MessageAddressesParser) messages.MessageAddressesParser { - return func(cdc codec.Codec, msg sdk.Msg) ([]string, error) { - addresses, err := parser(cdc, msg) + return func(tx *juno.Tx) ([]string, error) { + addresses, err := parser(tx) if err != nil { return nil, err } diff --git a/modules/slashing/handle_block.go b/modules/slashing/handle_block.go index 3d63d9d42..928f83774 100644 --- a/modules/slashing/handle_block.go +++ b/modules/slashing/handle_block.go @@ -3,7 +3,7 @@ package slashing import ( "fmt" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" tmctypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/rs/zerolog/log" diff --git a/modules/slashing/module.go b/modules/slashing/module.go index 5c085ea5a..70ada3ee8 100644 --- a/modules/slashing/module.go +++ b/modules/slashing/module.go @@ -2,7 +2,7 @@ package slashing import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" "github.com/forbole/bdjuno/v4/database" slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" diff --git a/modules/slashing/source/local/source.go b/modules/slashing/source/local/source.go index 54fff0953..95271bead 100644 --- a/modules/slashing/source/local/source.go +++ b/modules/slashing/source/local/source.go @@ -1,98 +1,98 @@ package local -// import ( -// "fmt" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/cosmos/cosmos-sdk/types/query" -// slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" -// "github.com/forbole/juno/v4/node/local" - -// slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" -// ) - -// var ( -// _ slashingsource.Source = &Source{} -// ) - -// // Source implements slashingsource.Source using a local node -// type Source struct { -// *local.Source -// querier slashingtypes.QueryServer -// } - -// // NewSource implements a new Source instance -// func NewSource(source *local.Source, querier slashingtypes.QueryServer) *Source { -// return &Source{ -// Source: source, -// querier: querier, -// } -// } - -// // GetSigningInfos implements slashingsource.Source -// func (s Source) GetSigningInfos(height int64) ([]slashingtypes.ValidatorSigningInfo, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// var signingInfos []slashingtypes.ValidatorSigningInfo -// var nextKey []byte -// var stop = false -// for !stop { -// res, err := s.querier.SigningInfos( -// sdk.WrapSDKContext(ctx), -// &slashingtypes.QuerySigningInfosRequest{ -// Pagination: &query.PageRequest{ -// Key: nextKey, -// Limit: 1000, // Query 1000 signing infos at a time -// }, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// nextKey = res.Pagination.NextKey -// stop = len(res.Pagination.NextKey) == 0 -// signingInfos = append(signingInfos, res.Info...) -// } - -// return signingInfos, nil -// } - -// // GetParams implements slashingsource.Source -// func (s Source) GetParams(height int64) (slashingtypes.Params, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return slashingtypes.Params{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.querier.Params(sdk.WrapSDKContext(ctx), &slashingtypes.QueryParamsRequest{}) -// if err != nil { -// return slashingtypes.Params{}, nil -// } - -// return res.Params, nil -// } - -// // GetSigningInfo implements slashingsource.GetSigningInfo -// func (s Source) GetSigningInfo(height int64, consAddr sdk.ConsAddress) (slashingtypes.ValidatorSigningInfo, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return slashingtypes.ValidatorSigningInfo{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.querier.SigningInfo( -// sdk.WrapSDKContext(ctx), -// &slashingtypes.QuerySigningInfoRequest{ -// ConsAddress: consAddr.String(), -// }, -// ) - -// if err != nil { -// return slashingtypes.ValidatorSigningInfo{}, err -// } - -// return res.ValSigningInfo, nil -// } +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + "github.com/forbole/juno/v5/node/local" + + slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" +) + +var ( + _ slashingsource.Source = &Source{} +) + +// Source implements slashingsource.Source using a local node +type Source struct { + *local.Source + querier slashingtypes.QueryServer +} + +// NewSource implements a new Source instance +func NewSource(source *local.Source, querier slashingtypes.QueryServer) *Source { + return &Source{ + Source: source, + querier: querier, + } +} + +// GetSigningInfos implements slashingsource.Source +func (s Source) GetSigningInfos(height int64) ([]slashingtypes.ValidatorSigningInfo, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + var signingInfos []slashingtypes.ValidatorSigningInfo + var nextKey []byte + var stop = false + for !stop { + res, err := s.querier.SigningInfos( + sdk.WrapSDKContext(ctx), + &slashingtypes.QuerySigningInfosRequest{ + Pagination: &query.PageRequest{ + Key: nextKey, + Limit: 1000, // Query 1000 signing infos at a time + }, + }, + ) + if err != nil { + return nil, err + } + + nextKey = res.Pagination.NextKey + stop = len(res.Pagination.NextKey) == 0 + signingInfos = append(signingInfos, res.Info...) + } + + return signingInfos, nil +} + +// GetParams implements slashingsource.Source +func (s Source) GetParams(height int64) (slashingtypes.Params, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return slashingtypes.Params{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.querier.Params(sdk.WrapSDKContext(ctx), &slashingtypes.QueryParamsRequest{}) + if err != nil { + return slashingtypes.Params{}, nil + } + + return res.Params, nil +} + +// GetSigningInfo implements slashingsource.GetSigningInfo +func (s Source) GetSigningInfo(height int64, consAddr sdk.ConsAddress) (slashingtypes.ValidatorSigningInfo, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return slashingtypes.ValidatorSigningInfo{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.querier.SigningInfo( + sdk.WrapSDKContext(ctx), + &slashingtypes.QuerySigningInfoRequest{ + ConsAddress: consAddr.String(), + }, + ) + + if err != nil { + return slashingtypes.ValidatorSigningInfo{}, err + } + + return res.ValSigningInfo, nil +} diff --git a/modules/slashing/source/remote/source.go b/modules/slashing/source/remote/source.go index 87e6b5315..89722d2ab 100644 --- a/modules/slashing/source/remote/source.go +++ b/modules/slashing/source/remote/source.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" ) diff --git a/modules/staking/handle_block.go b/modules/staking/handle_block.go index e8dde3cb1..fa5df5e08 100644 --- a/modules/staking/handle_block.go +++ b/modules/staking/handle_block.go @@ -7,7 +7,7 @@ import ( "github.com/forbole/bdjuno/v4/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" tmctypes "github.com/cometbft/cometbft/rpc/core/types" tmtypes "github.com/cometbft/cometbft/types" diff --git a/modules/staking/handle_msg.go b/modules/staking/handle_msg.go index 366b11151..db8790e66 100644 --- a/modules/staking/handle_msg.go +++ b/modules/staking/handle_msg.go @@ -6,7 +6,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" ) // HandleMsg implements MessageModule diff --git a/modules/staking/module.go b/modules/staking/module.go index 9b0903b7f..c92c67350 100644 --- a/modules/staking/module.go +++ b/modules/staking/module.go @@ -2,7 +2,7 @@ package staking import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" "github.com/forbole/bdjuno/v4/database" stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" diff --git a/modules/staking/source/local/source.go b/modules/staking/source/local/source.go index 3d95cb43e..d1d1825fb 100644 --- a/modules/staking/source/local/source.go +++ b/modules/staking/source/local/source.go @@ -1,227 +1,227 @@ package local -// import ( -// "fmt" - -// sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/cosmos/cosmos-sdk/types/query" -// stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" -// "github.com/forbole/juno/v4/node/local" - -// stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" -// ) - -// var ( -// _ stakingsource.Source = &Source{} -// ) - -// // Source implements stakingsource.Source using a local node -// type Source struct { -// *local.Source -// q stakingtypes.QueryServer -// } - -// // NewSource returns a new Source instance -// func NewSource(source *local.Source, querier stakingtypes.QueryServer) *Source { -// return &Source{ -// Source: source, -// q: querier, -// } -// } - -// // GetValidator implements stakingsource.Source -// func (s Source) GetValidator(height int64, valOper string) (stakingtypes.Validator, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return stakingtypes.Validator{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Validator(sdk.WrapSDKContext(ctx), &stakingtypes.QueryValidatorRequest{ValidatorAddr: valOper}) -// if err != nil { -// return stakingtypes.Validator{}, fmt.Errorf("error while reading validator: %s", err) -// } - -// return res.Validator, nil -// } - -// // GetDelegationsWithPagination implements stakingsource.Source -// func (s Source) GetDelegationsWithPagination(height int64, delegator string, pagination *query.PageRequest) (*stakingtypes.QueryDelegatorDelegationsResponse, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.DelegatorDelegations( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryDelegatorDelegationsRequest{ -// DelegatorAddr: delegator, -// Pagination: &query.PageRequest{ -// Limit: pagination.GetLimit(), -// Offset: pagination.GetOffset(), -// CountTotal: pagination.GetCountTotal(), -// }, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// return res, nil -// } - -// // GetRedelegations implements stakingsource.Source -// func (s Source) GetRedelegations(height int64, request *stakingtypes.QueryRedelegationsRequest) (*stakingtypes.QueryRedelegationsResponse, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// redelegations, err := s.q.Redelegations(sdk.WrapSDKContext(ctx), request) -// if err != nil { -// return nil, err -// } - -// return redelegations, nil -// } - -// // GetValidatorsWithStatus implements stakingsource.Source -// func (s Source) GetValidatorsWithStatus(height int64, status string) ([]stakingtypes.Validator, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// var validators []stakingtypes.Validator -// var nextKey []byte -// var stop = false -// for !stop { -// res, err := s.q.Validators( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryValidatorsRequest{ -// Status: status, -// Pagination: &query.PageRequest{ -// Key: nextKey, -// Limit: 100, // Query 100 validators at time -// }, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// nextKey = res.Pagination.NextKey -// stop = len(res.Pagination.NextKey) == 0 -// validators = append(validators, res.Validators...) -// } - -// return validators, nil -// } - -// // GetPool implements stakingsource.Source -// func (s Source) GetPool(height int64) (stakingtypes.Pool, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return stakingtypes.Pool{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Pool( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryPoolRequest{}, -// ) -// if err != nil { -// return stakingtypes.Pool{}, err -// } - -// return res.Pool, nil -// } - -// // GetParams implements stakingsource.Source -// func (s Source) GetParams(height int64) (stakingtypes.Params, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return stakingtypes.Params{}, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.Params( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryParamsRequest{}, -// ) -// if err != nil { -// return stakingtypes.Params{}, nil -// } - -// return res.Params, nil -// } - -// // GetUnbondingDelegations implements stakingsource.Source -// func (s Source) GetUnbondingDelegations(height int64, delegator string, pagination *query.PageRequest) (*stakingtypes.QueryDelegatorUnbondingDelegationsResponse, error) { - -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// unbondingDelegations, err := s.q.DelegatorUnbondingDelegations( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryDelegatorUnbondingDelegationsRequest{ -// DelegatorAddr: delegator, -// Pagination: &query.PageRequest{ -// Limit: pagination.GetLimit(), -// Offset: pagination.GetOffset(), -// CountTotal: pagination.GetCountTotal(), -// }, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// return unbondingDelegations, nil - -// } - -// // GetValidatorDelegationsWithPagination implements stakingsource.Source -// func (s Source) GetValidatorDelegationsWithPagination( -// height int64, validator string, pagination *query.PageRequest, -// ) (*stakingtypes.QueryValidatorDelegationsResponse, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// res, err := s.q.ValidatorDelegations( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryValidatorDelegationsRequest{ -// ValidatorAddr: validator, -// Pagination: pagination, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// return res, nil -// } - -// // GetUnbondingDelegationsFromValidator implements stakingsource.Source -// func (s Source) GetUnbondingDelegationsFromValidator( -// height int64, validator string, pagination *query.PageRequest, -// ) (*stakingtypes.QueryValidatorUnbondingDelegationsResponse, error) { -// ctx, err := s.LoadHeight(height) -// if err != nil { -// return nil, fmt.Errorf("error while loading height: %s", err) -// } - -// unbondingDelegations, err := s.q.ValidatorUnbondingDelegations( -// sdk.WrapSDKContext(ctx), -// &stakingtypes.QueryValidatorUnbondingDelegationsRequest{ -// ValidatorAddr: validator, -// Pagination: pagination, -// }, -// ) -// if err != nil { -// return nil, err -// } - -// return unbondingDelegations, nil -// } +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/forbole/juno/v5/node/local" + + stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" +) + +var ( + _ stakingsource.Source = &Source{} +) + +// Source implements stakingsource.Source using a local node +type Source struct { + *local.Source + q stakingtypes.QueryServer +} + +// NewSource returns a new Source instance +func NewSource(source *local.Source, querier stakingtypes.QueryServer) *Source { + return &Source{ + Source: source, + q: querier, + } +} + +// GetValidator implements stakingsource.Source +func (s Source) GetValidator(height int64, valOper string) (stakingtypes.Validator, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return stakingtypes.Validator{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Validator(sdk.WrapSDKContext(ctx), &stakingtypes.QueryValidatorRequest{ValidatorAddr: valOper}) + if err != nil { + return stakingtypes.Validator{}, fmt.Errorf("error while reading validator: %s", err) + } + + return res.Validator, nil +} + +// GetDelegationsWithPagination implements stakingsource.Source +func (s Source) GetDelegationsWithPagination(height int64, delegator string, pagination *query.PageRequest) (*stakingtypes.QueryDelegatorDelegationsResponse, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.DelegatorDelegations( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryDelegatorDelegationsRequest{ + DelegatorAddr: delegator, + Pagination: &query.PageRequest{ + Limit: pagination.GetLimit(), + Offset: pagination.GetOffset(), + CountTotal: pagination.GetCountTotal(), + }, + }, + ) + if err != nil { + return nil, err + } + + return res, nil +} + +// GetRedelegations implements stakingsource.Source +func (s Source) GetRedelegations(height int64, request *stakingtypes.QueryRedelegationsRequest) (*stakingtypes.QueryRedelegationsResponse, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + redelegations, err := s.q.Redelegations(sdk.WrapSDKContext(ctx), request) + if err != nil { + return nil, err + } + + return redelegations, nil +} + +// GetValidatorsWithStatus implements stakingsource.Source +func (s Source) GetValidatorsWithStatus(height int64, status string) ([]stakingtypes.Validator, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + var validators []stakingtypes.Validator + var nextKey []byte + var stop = false + for !stop { + res, err := s.q.Validators( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryValidatorsRequest{ + Status: status, + Pagination: &query.PageRequest{ + Key: nextKey, + Limit: 100, // Query 100 validators at time + }, + }, + ) + if err != nil { + return nil, err + } + + nextKey = res.Pagination.NextKey + stop = len(res.Pagination.NextKey) == 0 + validators = append(validators, res.Validators...) + } + + return validators, nil +} + +// GetPool implements stakingsource.Source +func (s Source) GetPool(height int64) (stakingtypes.Pool, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return stakingtypes.Pool{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Pool( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryPoolRequest{}, + ) + if err != nil { + return stakingtypes.Pool{}, err + } + + return res.Pool, nil +} + +// GetParams implements stakingsource.Source +func (s Source) GetParams(height int64) (stakingtypes.Params, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return stakingtypes.Params{}, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.Params( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryParamsRequest{}, + ) + if err != nil { + return stakingtypes.Params{}, nil + } + + return res.Params, nil +} + +// GetUnbondingDelegations implements stakingsource.Source +func (s Source) GetUnbondingDelegations(height int64, delegator string, pagination *query.PageRequest) (*stakingtypes.QueryDelegatorUnbondingDelegationsResponse, error) { + + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + unbondingDelegations, err := s.q.DelegatorUnbondingDelegations( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryDelegatorUnbondingDelegationsRequest{ + DelegatorAddr: delegator, + Pagination: &query.PageRequest{ + Limit: pagination.GetLimit(), + Offset: pagination.GetOffset(), + CountTotal: pagination.GetCountTotal(), + }, + }, + ) + if err != nil { + return nil, err + } + + return unbondingDelegations, nil + +} + +// GetValidatorDelegationsWithPagination implements stakingsource.Source +func (s Source) GetValidatorDelegationsWithPagination( + height int64, validator string, pagination *query.PageRequest, +) (*stakingtypes.QueryValidatorDelegationsResponse, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + res, err := s.q.ValidatorDelegations( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryValidatorDelegationsRequest{ + ValidatorAddr: validator, + Pagination: pagination, + }, + ) + if err != nil { + return nil, err + } + + return res, nil +} + +// GetUnbondingDelegationsFromValidator implements stakingsource.Source +func (s Source) GetUnbondingDelegationsFromValidator( + height int64, validator string, pagination *query.PageRequest, +) (*stakingtypes.QueryValidatorUnbondingDelegationsResponse, error) { + ctx, err := s.LoadHeight(height) + if err != nil { + return nil, fmt.Errorf("error while loading height: %s", err) + } + + unbondingDelegations, err := s.q.ValidatorUnbondingDelegations( + sdk.WrapSDKContext(ctx), + &stakingtypes.QueryValidatorUnbondingDelegationsRequest{ + ValidatorAddr: validator, + Pagination: pagination, + }, + ) + if err != nil { + return nil, err + } + + return unbondingDelegations, nil +} diff --git a/modules/staking/source/remote/source.go b/modules/staking/source/remote/source.go index 734a589a8..dd1d51fa7 100644 --- a/modules/staking/source/remote/source.go +++ b/modules/staking/source/remote/source.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" ) diff --git a/modules/staking/source/remote/source_actions.go b/modules/staking/source/remote/source_actions.go index ca2174695..3af79ff51 100644 --- a/modules/staking/source/remote/source_actions.go +++ b/modules/staking/source/remote/source_actions.go @@ -3,7 +3,7 @@ package remote import ( "github.com/cosmos/cosmos-sdk/types/query" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" "github.com/forbole/bdjuno/v4/utils" ) diff --git a/modules/staking/utils_validators.go b/modules/staking/utils_validators.go index 0d42b8b8a..e5a0d2e29 100644 --- a/modules/staking/utils_validators.go +++ b/modules/staking/utils_validators.go @@ -4,7 +4,7 @@ import ( "fmt" tmctypes "github.com/cometbft/cometbft/rpc/core/types" - juno "github.com/forbole/juno/v4/types" + juno "github.com/forbole/juno/v5/types" "github.com/forbole/bdjuno/v4/modules/staking/keybase" "github.com/forbole/bdjuno/v4/types" diff --git a/modules/types/sources.go b/modules/types/sources.go index e1de80f8f..4f37f0ea6 100644 --- a/modules/types/sources.go +++ b/modules/types/sources.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/forbole/juno/v4/node/remote" + "github.com/forbole/juno/v5/node/remote" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" @@ -13,9 +13,9 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/juno/v4/node/local" + "github.com/forbole/juno/v5/node/local" - nodeconfig "github.com/forbole/juno/v4/node/config" + nodeconfig "github.com/forbole/juno/v5/node/config" banksource "github.com/forbole/bdjuno/v4/modules/bank/source" remotebanksource "github.com/forbole/bdjuno/v4/modules/bank/source/remote" diff --git a/modules/upgrade/handle_block.go b/modules/upgrade/handle_block.go index 69110b3ae..c5ca62fd8 100644 --- a/modules/upgrade/handle_block.go +++ b/modules/upgrade/handle_block.go @@ -3,7 +3,7 @@ package upgrade import ( "fmt" - "github.com/forbole/juno/v4/types" + "github.com/forbole/juno/v5/types" tmctypes "github.com/cometbft/cometbft/rpc/core/types" ) diff --git a/modules/upgrade/module.go b/modules/upgrade/module.go index d4a6c32de..463c3fa18 100644 --- a/modules/upgrade/module.go +++ b/modules/upgrade/module.go @@ -3,7 +3,7 @@ package upgrade import ( "github.com/forbole/bdjuno/v4/database" - "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v5/modules" ) var ( diff --git a/types/config/config.go b/types/config/config.go index f3587737c..d7dcb24b6 100644 --- a/types/config/config.go +++ b/types/config/config.go @@ -1,8 +1,8 @@ package config import ( - initcmd "github.com/forbole/juno/v4/cmd/init" - junoconfig "github.com/forbole/juno/v4/types/config" + initcmd "github.com/forbole/juno/v5/cmd/init" + junoconfig "github.com/forbole/juno/v5/types/config" "github.com/spf13/cobra" "gopkg.in/yaml.v3" diff --git a/utils/genesis.go b/utils/genesis.go index 5e83f49a3..5023f0c0a 100644 --- a/utils/genesis.go +++ b/utils/genesis.go @@ -6,8 +6,8 @@ import ( tmjson "github.com/cometbft/cometbft/libs/json" tmos "github.com/cometbft/cometbft/libs/os" tmtypes "github.com/cometbft/cometbft/types" - "github.com/forbole/juno/v4/node" - "github.com/forbole/juno/v4/types/config" + "github.com/forbole/juno/v5/node" + "github.com/forbole/juno/v5/types/config" ) // ReadGenesis reads the genesis data based on the given config diff --git a/utils/node.go b/utils/node.go index 1d6b9f489..2c56a1354 100644 --- a/utils/node.go +++ b/utils/node.go @@ -4,7 +4,7 @@ import ( "fmt" coretypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/forbole/juno/v4/node" + "github.com/forbole/juno/v5/node" ) // QueryTxs queries all the transactions from the given node corresponding to the given query