From 4f4508a2a19339982b68de5a4983fc39926d48bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:37:07 +0000 Subject: [PATCH 01/11] build(deps): bump docker/build-push-action from 3 to 4 (#518) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
Release notes

Sourced from docker/build-push-action's releases.

v4.0.0

Warning

Buildx v0.10 enables support for a minimal SLSA Provenance attestation, which requires support for OCI-compliant multi-platform images. This may introduce issues with registry and runtime support (e.g. Google Cloud Run and AWS Lambda). You can optionally disable the default provenance attestation functionality using provenance: false.

Full Changelog: https://github.com/docker/build-push-action/compare/v3.3.1...v4.0.0

v3.3.1

Full Changelog: https://github.com/docker/build-push-action/compare/v3.3.0...v3.3.1

v3.3.0

Warning

Buildx v0.10 enables support for a minimal SLSA Provenance attestation, which requires support for OCI-compliant multi-platform images. This may introduce issues with registry and runtime support (e.g. Google Cloud Run and AWS Lambda). You can optionally disable the default provenance attestation functionality using provenance: false.

Full Changelog: https://github.com/docker/build-push-action/compare/v3.2.0...v3.3.0

v3.2.0

Full Changelog: https://github.com/docker/build-push-action/compare/v3.1.1...v3.2.0

v3.1.1

Full Changelog: https://github.com/docker/build-push-action/compare/v3.1.0...v3.1.1

v3.1.0

Full Changelog: https://github.com/docker/build-push-action/compare/v3.0.0...v3.1.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=docker/build-push-action&package-manager=github_actions&previous-version=3&new-version=4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 2196187e7..c56842e92 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -44,7 +44,7 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: . push: true From eaac03a87eb45859e980f8106169d11b064954d4 Mon Sep 17 00:00:00 2001 From: Magic Cat Date: Wed, 8 Feb 2023 13:47:51 +0700 Subject: [PATCH 02/11] updated cosmos-sdk to v0.46.x and juno to v4 --- Makefile | 4 +- cmd/bdjuno/main.go | 16 +- cmd/migrate/cmd.go | 4 +- cmd/migrate/v3/migrate.go | 6 +- cmd/migrate/v3/types.go | 2 +- cmd/migrate/v3/utils.go | 2 +- cmd/parse/auth/cmd.go | 2 +- cmd/parse/auth/vesting.go | 6 +- cmd/parse/bank/cmd.go | 2 +- cmd/parse/bank/supply.go | 6 +- cmd/parse/distribution/cmd.go | 2 +- cmd/parse/distribution/communitypool.go | 6 +- cmd/parse/feegrant/allowance.go | 6 +- cmd/parse/feegrant/cmd.go | 2 +- cmd/parse/gov/cmd.go | 2 +- cmd/parse/gov/proposal.go | 34 +- cmd/parse/mint/cmd.go | 2 +- cmd/parse/mint/inflation.go | 6 +- cmd/parse/parse.go | 8 +- cmd/parse/pricefeed/cmd.go | 2 +- cmd/parse/pricefeed/price.go | 6 +- cmd/parse/pricefeed/pricehistory.go | 6 +- cmd/parse/staking/cmd.go | 2 +- cmd/parse/staking/staking.go | 6 +- cmd/parse/staking/validators.go | 6 +- database/auth.go | 10 +- database/auth_test.go | 2 +- database/bank.go | 2 +- database/consensus_test.go | 12 +- database/daily_refetch.go | 7 - database/database.go | 6 +- database/database_test.go | 24 +- database/distribution.go | 4 +- database/feegrant.go | 4 +- database/feegrant_test.go | 4 +- database/gov.go | 135 ++- database/gov_test.go | 97 +- database/mint.go | 4 +- database/pricefeed.go | 8 +- database/pricefeed_test.go | 4 +- database/pruning.go | 22 +- database/slashing.go | 4 +- database/staking_params.go | 2 +- database/staking_params_test.go | 5 +- database/staking_pool.go | 2 +- database/staking_validators.go | 20 +- database/staking_validators_test.go | 6 +- database/utils.go | 4 +- go.mod | 137 ++- go.sum | 908 ++++++++---------- modules/actions/config.go | 2 +- modules/actions/module.go | 10 +- modules/actions/types/handler.go | 2 +- modules/actions/types/response.go | 8 +- modules/auth/handle_msg.go | 2 +- modules/auth/module.go | 4 +- modules/bank/module.go | 4 +- modules/bank/source/local/source.go | 2 +- modules/bank/source/remote/source.go | 2 +- modules/consensus/handle_block.go | 2 +- modules/consensus/module.go | 2 +- .../handle_periodic_operations.go | 6 +- modules/daily_refetch/module.go | 4 +- modules/distribution/handle_msg.go | 2 +- modules/distribution/module.go | 2 +- modules/distribution/source/local/source.go | 2 +- modules/distribution/source/remote/source.go | 2 +- .../source/remote/source_actions.go | 2 +- modules/feegrant/handle_block.go | 2 +- modules/feegrant/handle_msg.go | 2 +- modules/feegrant/module.go | 2 +- modules/gov/handle_block.go | 2 +- modules/gov/handle_genesis.go | 21 +- modules/gov/handle_msg.go | 31 +- modules/gov/module.go | 2 +- modules/gov/source/local/source.go | 64 +- modules/gov/source/remote/source.go | 53 +- modules/gov/source/source.go | 17 +- modules/gov/utils_proposal.go | 42 +- modules/mint/module.go | 2 +- modules/mint/source/local/source.go | 2 +- modules/mint/source/remote/source.go | 2 +- modules/modules/module.go | 4 +- modules/pricefeed/module.go | 4 +- modules/registrar.go | 12 +- modules/slashing/handle_block.go | 2 +- modules/slashing/module.go | 2 +- modules/slashing/source/local/source.go | 2 +- modules/slashing/source/remote/source.go | 2 +- modules/staking/handle_block.go | 2 +- modules/staking/handle_msg.go | 2 +- modules/staking/module.go | 2 +- modules/staking/source/local/source.go | 2 +- modules/staking/source/remote/source.go | 2 +- .../staking/source/remote/source_actions.go | 2 +- modules/staking/utils_validators.go | 2 +- modules/types/sources.go | 13 +- modules/upgrade/handle_block.go | 2 +- modules/upgrade/module.go | 2 +- types/config/config.go | 4 +- types/gov.go | 67 +- types/staking_pool_params.go | 12 +- utils/genesis.go | 4 +- utils/node.go | 2 +- 104 files changed, 1023 insertions(+), 1008 deletions(-) diff --git a/Makefile b/Makefile index 5ba606775..6851dc9ea 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ all: lint build test-unit ### Build flags ### ############################################################################### -LD_FLAGS = -X github.com/forbole/juno/v3/cmd.Version=$(VERSION) \ - -X github.com/forbole/juno/v3/cmd.Commit=$(COMMIT) +LD_FLAGS = -X github.com/forbole/juno/v4/cmd.Version=$(VERSION) \ + -X github.com/forbole/juno/v4/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 cc6ffaff8..bf8d5c8da 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/v3/cmd" - initcmd "github.com/forbole/juno/v3/cmd/init" - parsetypes "github.com/forbole/juno/v3/cmd/parse/types" - startcmd "github.com/forbole/juno/v3/cmd/start" - "github.com/forbole/juno/v3/modules/messages" + "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" migratecmd "github.com/forbole/bdjuno/v3/cmd/migrate" parsecmd "github.com/forbole/bdjuno/v3/cmd/parse" @@ -15,8 +15,6 @@ import ( "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/modules" - - gaiaapp "github.com/cosmos/gaia/v7/app" ) func main() { @@ -54,9 +52,7 @@ func main() { // support custom messages. // This should be edited by custom implementations if needed. func getBasicManagers() []module.BasicManager { - return []module.BasicManager{ - gaiaapp.ModuleBasics, - } + return []module.BasicManager{} } // getAddressesParser returns the messages parser that should be used to get the users involved in diff --git a/cmd/migrate/cmd.go b/cmd/migrate/cmd.go index 0aa4ac6bb..c01c45999 100644 --- a/cmd/migrate/cmd.go +++ b/cmd/migrate/cmd.go @@ -4,8 +4,7 @@ import ( "fmt" "os" - v2 "github.com/forbole/juno/v3/cmd/migrate/v2" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" v3 "github.com/forbole/bdjuno/v3/cmd/migrate/v3" @@ -15,7 +14,6 @@ type Migrator func(parseCfg *parsecmdtypes.Config) error var ( migrations = map[string]Migrator{ - "v2": v2.RunMigration, "v3": v3.RunMigration, } ) diff --git a/cmd/migrate/v3/migrate.go b/cmd/migrate/v3/migrate.go index 579758619..2c8c8f1e9 100644 --- a/cmd/migrate/v3/migrate.go +++ b/cmd/migrate/v3/migrate.go @@ -6,12 +6,12 @@ import ( "github.com/forbole/bdjuno/v3/modules/actions" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "gopkg.in/yaml.v3" - junov3 "github.com/forbole/juno/v3/cmd/migrate/v3" - "github.com/forbole/juno/v3/types/config" + junov3 "github.com/forbole/juno/v4/cmd/migrate/v4" + "github.com/forbole/juno/v4/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 a93e3d1eb..f0fc2f430 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/v3/cmd/migrate/v3" + v3 "github.com/forbole/juno/v4/cmd/migrate/v3" "github.com/forbole/bdjuno/v3/modules/actions" ) diff --git a/cmd/migrate/v3/utils.go b/cmd/migrate/v3/utils.go index 56bff751b..f4e67700b 100644 --- a/cmd/migrate/v3/utils.go +++ b/cmd/migrate/v3/utils.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/forbole/juno/v3/types/config" + "github.com/forbole/juno/v4/types/config" "gopkg.in/yaml.v3" ) diff --git a/cmd/parse/auth/cmd.go b/cmd/parse/auth/cmd.go index 4012bb1e2..8d4c3baa4 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/auth/vesting.go b/cmd/parse/auth/vesting.go index a35eaad02..7d59264f9 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -38,7 +38,7 @@ func vestingCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { return fmt.Errorf("error unmarshalling genesis doc: %s", err) } - vestingAccounts, err := authutils.GetGenesisVestingAccounts(appState, parseCtx.EncodingConfig.Marshaler) + vestingAccounts, err := authutils.GetGenesisVestingAccounts(appState, parseCtx.EncodingConfig.Codec) if err != nil { return fmt.Errorf("error while gestting vesting accounts: %s", err) } diff --git a/cmd/parse/bank/cmd.go b/cmd/parse/bank/cmd.go index 6ee5f0a60..90afb8e09 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/bank/supply.go b/cmd/parse/bank/supply.go index b9a2f87a6..062622b3f 100644 --- a/cmd/parse/bank/supply.go +++ b/cmd/parse/bank/supply.go @@ -5,8 +5,8 @@ import ( modulestypes "github.com/forbole/bdjuno/v3/modules/types" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -33,7 +33,7 @@ func supplyCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build bank module - bankModule := bank.NewModule(nil, sources.BankSource, parseCtx.EncodingConfig.Marshaler, db) + bankModule := bank.NewModule(nil, sources.BankSource, parseCtx.EncodingConfig.Codec, db) err = bankModule.UpdateSupply() if err != nil { diff --git a/cmd/parse/distribution/cmd.go b/cmd/parse/distribution/cmd.go index 096ad4041..a7fd698b8 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/distribution/communitypool.go b/cmd/parse/distribution/communitypool.go index eaddf56ce..6ecee2222 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -32,7 +32,7 @@ func communityPoolCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build distribution module - distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Marshaler, db) + distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Codec, db) err = distrModule.GetLatestCommunityPool() if err != nil { diff --git a/cmd/parse/feegrant/allowance.go b/cmd/parse/feegrant/allowance.go index 906fc9845..b3033aed4 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/forbole/bdjuno/v3/modules/feegrant" "github.com/forbole/bdjuno/v3/utils" @@ -37,7 +37,7 @@ func allowanceCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build feegrant module - feegrantModule := feegrant.NewModule(parseCtx.EncodingConfig.Marshaler, db) + feegrantModule := feegrant.NewModule(parseCtx.EncodingConfig.Codec, db) // Get the accounts // Collect all the transactions diff --git a/cmd/parse/feegrant/cmd.go b/cmd/parse/feegrant/cmd.go index 40438d3ba..9f45e9767 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/gov/cmd.go b/cmd/parse/gov/cmd.go index 8b9619a1e..8e7e3ea2e 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/gov/proposal.go b/cmd/parse/gov/proposal.go index 151f6cd89..2c7a869fa 100644 --- a/cmd/parse/gov/proposal.go +++ b/cmd/parse/gov/proposal.go @@ -9,13 +9,8 @@ import ( modulestypes "github.com/forbole/bdjuno/v3/modules/types" "github.com/rs/zerolog/log" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" - "github.com/spf13/cobra" - - "github.com/forbole/juno/v3/parser" - + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/modules/distribution" "github.com/forbole/bdjuno/v3/modules/gov" @@ -23,6 +18,10 @@ import ( "github.com/forbole/bdjuno/v3/modules/slashing" "github.com/forbole/bdjuno/v3/modules/staking" "github.com/forbole/bdjuno/v3/utils" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/parser" + "github.com/forbole/juno/v4/types/config" + "github.com/spf13/cobra" ) // proposalCmd returns the Cobra command allowing to fix all things related to a proposal @@ -50,13 +49,13 @@ func proposalCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build expected modules of gov modules for handleParamChangeProposal - distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Marshaler, db) - mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Marshaler, db) - slashingModule := slashing.NewModule(sources.SlashingSource, parseCtx.EncodingConfig.Marshaler, db) - stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Marshaler, db) + distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Codec, db) + mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Codec, db) + slashingModule := slashing.NewModule(sources.SlashingSource, parseCtx.EncodingConfig.Codec, db) + stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Codec, db) // Build the gov module - govModule := gov.NewModule(sources.GovSource, nil, distrModule, mintModule, slashingModule, stakingModule, parseCtx.EncodingConfig.Marshaler, db) + govModule := gov.NewModule(sources.GovSource, nil, distrModule, mintModule, slashingModule, stakingModule, parseCtx.EncodingConfig.Codec, db) err = refreshProposalDetails(parseCtx, proposalID, govModule) if err != nil { @@ -102,6 +101,11 @@ func refreshProposalDetails(parseCtx *parser.Context, proposalID uint64, govModu return fmt.Errorf("expecting only one create proposal transaction, found %d", len(txs)) } + if len(txs) == 0 { + fmt.Printf("error: couldn't find submit proposal tx info") + return nil + } + // Get the tx details tx, err := parseCtx.Node.Tx(hex.EncodeToString(txs[0].Tx.Hash())) if err != nil { @@ -110,7 +114,7 @@ func refreshProposalDetails(parseCtx *parser.Context, proposalID uint64, govModu // Handle the MsgSubmitProposal messages for index, msg := range tx.GetMsgs() { - if _, ok := msg.(*govtypes.MsgSubmitProposal); !ok { + if _, ok := msg.(*govtypesv1beta1.MsgSubmitProposal); !ok { continue } @@ -141,7 +145,7 @@ func refreshProposalDeposits(parseCtx *parser.Context, proposalID uint64, govMod // Handle the MsgDeposit messages for index, msg := range junoTx.GetMsgs() { - if _, ok := msg.(*govtypes.MsgDeposit); !ok { + if _, ok := msg.(*govtypesv1.MsgDeposit); !ok { continue } @@ -173,7 +177,7 @@ func refreshProposalVotes(parseCtx *parser.Context, proposalID uint64, govModule // Handle the MsgVote messages for index, msg := range junoTx.GetMsgs() { - if _, ok := msg.(*govtypes.MsgVote); !ok { + if _, ok := msg.(*govtypesv1.MsgVote); !ok { continue } diff --git a/cmd/parse/mint/cmd.go b/cmd/parse/mint/cmd.go index b5345c8d3..2bcc991aa 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/mint/inflation.go b/cmd/parse/mint/inflation.go index 01fe772d7..5ae99f0c1 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -32,7 +32,7 @@ func inflationCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build mint module - mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Marshaler, db) + mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Codec, db) err = mintModule.UpdateInflation() if err != nil { diff --git a/cmd/parse/parse.go b/cmd/parse/parse.go index 34061227d..4211eddb3 100644 --- a/cmd/parse/parse.go +++ b/cmd/parse/parse.go @@ -1,12 +1,12 @@ package parse import ( - parse "github.com/forbole/juno/v3/cmd/parse/types" + parse "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" - parseblocks "github.com/forbole/juno/v3/cmd/parse/blocks" + parseblocks "github.com/forbole/juno/v4/cmd/parse/blocks" - parsegenesis "github.com/forbole/juno/v3/cmd/parse/genesis" + parsegenesis "github.com/forbole/juno/v4/cmd/parse/genesis" parseauth "github.com/forbole/bdjuno/v3/cmd/parse/auth" parsebank "github.com/forbole/bdjuno/v3/cmd/parse/bank" @@ -16,7 +16,7 @@ import ( parsemint "github.com/forbole/bdjuno/v3/cmd/parse/mint" parsepricefeed "github.com/forbole/bdjuno/v3/cmd/parse/pricefeed" parsestaking "github.com/forbole/bdjuno/v3/cmd/parse/staking" - parsetransaction "github.com/forbole/juno/v3/cmd/parse/transactions" + parsetransaction "github.com/forbole/juno/v4/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 2cabf9b35..a45262969 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/pricefeed/price.go b/cmd/parse/pricefeed/price.go index 4c9b77cf6..51e9b06b6 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -26,7 +26,7 @@ func priceCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build pricefeed module - pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Marshaler, db) + pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Codec, db) err = pricefeedModule.RunAdditionalOperations() if err != nil { diff --git a/cmd/parse/pricefeed/pricehistory.go b/cmd/parse/pricefeed/pricehistory.go index bad312105..4d9b0994e 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -26,7 +26,7 @@ func priceHistoryCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build pricefeed module - pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Marshaler, db) + pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Codec, db) err = pricefeedModule.RunAdditionalOperations() if err != nil { diff --git a/cmd/parse/staking/cmd.go b/cmd/parse/staking/cmd.go index 46251cddc..b74bee7f4 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/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" ) diff --git a/cmd/parse/staking/staking.go b/cmd/parse/staking/staking.go index d3dadafd4..074f4c5bf 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/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -32,7 +32,7 @@ func poolCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build staking module - stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Marshaler, db) + stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Codec, db) err = stakingModule.UpdateStakingPool() if err != nil { diff --git a/cmd/parse/staking/validators.go b/cmd/parse/staking/validators.go index 2497bd786..2e84c57c6 100644 --- a/cmd/parse/staking/validators.go +++ b/cmd/parse/staking/validators.go @@ -5,8 +5,8 @@ import ( modulestypes "github.com/forbole/bdjuno/v3/modules/types" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" + "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "github.com/forbole/bdjuno/v3/database" @@ -33,7 +33,7 @@ func validatorsCmd(parseConfig *parsecmdtypes.Config) *cobra.Command { db := database.Cast(parseCtx.Database) // Build the staking module - stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Marshaler, db) + stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Codec, db) // Get latest height height, err := parseCtx.Node.LatestHeight() diff --git a/database/auth.go b/database/auth.go index 80fdeb4b1..b66b8cfd4 100644 --- a/database/auth.go +++ b/database/auth.go @@ -51,7 +51,7 @@ func (db *Db) saveAccounts(paramsNumber int, accounts []types.Account) error { stmt = stmt[:len(stmt)-1] stmt += " ON CONFLICT DO NOTHING" - _, err := db.Sql.Exec(stmt, params...) + _, err := db.SQL.Exec(stmt, params...) if err != nil { return fmt.Errorf("error while storing accounts: %s", err) } @@ -99,7 +99,7 @@ func (db *Db) storeVestingAccount(account exported.VestingAccount) (int, error) RETURNING id ` var vestingAccountRowID int - err := db.Sql.QueryRow(stmt, + err := db.SQL.QueryRow(stmt, proto.MessageName(account), account.GetAddress().String(), pq.Array(dbtypes.NewDbCoins(account.GetOriginalVesting())), @@ -124,7 +124,7 @@ func (db *Db) StoreBaseVestingAccountFromMsg(bva *vestingtypes.BaseVestingAccoun start_time = excluded.start_time, end_time = excluded.end_time` - _, err := db.Sql.Exec(stmt, + _, err := db.SQL.Exec(stmt, proto.MessageName(bva), bva.GetAddress().String(), pq.Array(dbtypes.NewDbCoins(bva.OriginalVesting)), @@ -140,7 +140,7 @@ func (db *Db) StoreBaseVestingAccountFromMsg(bva *vestingtypes.BaseVestingAccoun func (db *Db) storeVestingPeriods(id int, vestingPeriods []vestingtypes.Period) error { // Delete already existing periods stmt := `DELETE FROM vesting_period WHERE vesting_account_id = $1` - _, err := db.Sql.Exec(stmt, id) + _, err := db.SQL.Exec(stmt, id) if err != nil { return fmt.Errorf("error while deleting vesting period: %s", err) } @@ -161,7 +161,7 @@ VALUES ` } stmt = stmt[:len(stmt)-1] - _, err = db.Sql.Exec(stmt, params...) + _, err = db.SQL.Exec(stmt, params...) if err != nil { return fmt.Errorf("error while saving vesting periods: %s", err) } diff --git a/database/auth_test.go b/database/auth_test.go index 1651664a4..22a3a225e 100644 --- a/database/auth_test.go +++ b/database/auth_test.go @@ -50,7 +50,7 @@ func (suite *DbTestSuite) TestBigDipperDb_GetAccounts() { } for _, query := range queries { - _, err := suite.database.Sql.Exec(query) + _, err := suite.database.SQL.Exec(query) suite.Require().NoError(err) } diff --git a/database/bank.go b/database/bank.go index 719ff5d5b..af94199e5 100644 --- a/database/bank.go +++ b/database/bank.go @@ -19,7 +19,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE supply.height <= excluded.height` - _, err := db.Sql.Exec(query, pq.Array(dbtypes.NewDbCoins(coins)), height) + _, err := db.SQL.Exec(query, pq.Array(dbtypes.NewDbCoins(coins)), height) if err != nil { return fmt.Errorf("error while storing supply: %s", err) } diff --git a/database/consensus_test.go b/database/consensus_test.go index 3b03b038b..ee29fe4b1 100644 --- a/database/consensus_test.go +++ b/database/consensus_test.go @@ -13,11 +13,11 @@ func (suite *DbTestSuite) TestSaveConsensus_GetBlockHeightTimeMinuteAgo() { var height int64 = 1000 - _, err = suite.database.Sql.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) + _, err = suite.database.SQL.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) VALUES ('desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', 'cosmosvalconspub1zcjduepq7mft6gfls57a0a42d7uhx656cckhfvtrlmw744jv4q0mvlv0dypskehfk8')`) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) + _, err = suite.database.SQL.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) VALUES ($1, '5EF85F2251F656BA0FBFED9AEFCBC44A9CCBCFD8B96897E74426E07229D2ADE0', '0', '0', 'desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', $2)`, height, timeAgo) suite.Require().NoError(err) @@ -34,11 +34,11 @@ func (suite *DbTestSuite) TestSaveConsensus_GetBlockHeightTimeHourAgo() { suite.Require().NoError(err) var height int64 = 1000 - _, err = suite.database.Sql.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) + _, err = suite.database.SQL.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) VALUES ('desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', 'cosmosvalconspub1zcjduepq7mft6gfls57a0a42d7uhx656cckhfvtrlmw744jv4q0mvlv0dypskehfk8')`) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) + _, err = suite.database.SQL.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) VALUES ($1, '5EF85F2251F656BA0FBFED9AEFCBC44A9CCBCFD8B96897E74426E07229D2ADE0', '0', '0', 'desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', $2)`, height, timeAgo) suite.Require().NoError(err) @@ -56,11 +56,11 @@ func (suite *DbTestSuite) TestSaveConsensus_GetBlockHeightTimeDayAgo() { var height int64 = 1000 - _, err = suite.database.Sql.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) + _, err = suite.database.SQL.Exec(`INSERT INTO validator (consensus_address, consensus_pubkey) VALUES ('desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', 'cosmosvalconspub1zcjduepq7mft6gfls57a0a42d7uhx656cckhfvtrlmw744jv4q0mvlv0dypskehfk8')`) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) + _, err = suite.database.SQL.Exec(`INSERT INTO block(height, hash, num_txs, total_gas, proposer_address, timestamp) VALUES ($1, '5EF85F2251F656BA0FBFED9AEFCBC44A9CCBCFD8B96897E74426E07229D2ADE0', '0', '0', 'desmosvalcons1mxrd5cyjgpx5vfgltrdufq9wq4ynwc799ndrg8', $2)`, height, timeAgo) suite.Require().NoError(err) diff --git a/database/daily_refetch.go b/database/daily_refetch.go index eefb51b7e..7c146936a 100644 --- a/database/daily_refetch.go +++ b/database/daily_refetch.go @@ -1,12 +1,5 @@ package database -// GetTotalBlocks implements database.Database -func (db *Db) GetTotalBlocks() (int64, error) { - var blockCount int64 - err := db.Sql.QueryRow(`SELECT count(*) FROM block;`).Scan(&blockCount) - return blockCount, err -} - // GetMissingBlocks returns an array of missing blocks from one day ago func (db *Db) GetMissingBlocks(startHeight, endHeight int64) []int64 { var result []int64 diff --git a/database/database.go b/database/database.go index eed2ecc51..8b48f624a 100644 --- a/database/database.go +++ b/database/database.go @@ -3,8 +3,8 @@ package database import ( "fmt" - db "github.com/forbole/juno/v3/database" - "github.com/forbole/juno/v3/database/postgresql" + db "github.com/forbole/juno/v4/database" + "github.com/forbole/juno/v4/database/postgresql" "github.com/jmoiron/sqlx" ) @@ -31,7 +31,7 @@ func Builder(ctx *db.Context) (db.Database, error) { return &Db{ Database: psqlDb, - Sqlx: sqlx.NewDb(psqlDb.Sql, "postgresql"), + Sqlx: sqlx.NewDb(psqlDb.SQL.DB, "postgresql"), }, nil } diff --git a/database/database_test.go b/database/database_test.go index 0efbf856f..8ca1b5d0f 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - dbconfig "github.com/forbole/juno/v3/database/config" - "github.com/forbole/juno/v3/logging" + dbconfig "github.com/forbole/juno/v4/database/config" + "github.com/forbole/juno/v4/logging" - junodb "github.com/forbole/juno/v3/database" + junodb "github.com/forbole/juno/v4/database" "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/types" - juno "github.com/forbole/juno/v3/types" + juno "github.com/forbole/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" tmversion "github.com/tendermint/tendermint/proto/tendermint/version" @@ -46,13 +46,7 @@ func (suite *DbTestSuite) SetupTest() { // Build the database dbCfg := dbconfig.NewDatabaseConfig( - "bdjuno", - "localhost", - 6433, - "bdjuno", - "password", - "", - "public", + "postgresql://bdjuno:password@localhost:6433/bdjuno?sslmode=disable&search_path=public", -1, -1, 100000, @@ -65,11 +59,11 @@ func (suite *DbTestSuite) SetupTest() { suite.Require().True(ok) // Delete the public schema - _, err = bigDipperDb.Sql.Exec(`DROP SCHEMA public CASCADE;`) + _, err = bigDipperDb.SQL.Exec(`DROP SCHEMA public CASCADE;`) suite.Require().NoError(err) // Re-create the schema - _, err = bigDipperDb.Sql.Exec(`CREATE SCHEMA public;`) + _, err = bigDipperDb.SQL.Exec(`CREATE SCHEMA public;`) suite.Require().NoError(err) dirPath := path.Join(".", "schema") @@ -83,7 +77,7 @@ func (suite *DbTestSuite) SetupTest() { commentsRegExp := regexp.MustCompile(`/\*.*\*/`) requests := strings.Split(string(file), ";") for _, request := range requests { - _, err := bigDipperDb.Sql.Exec(commentsRegExp.ReplaceAllString(request, "")) + _, err := bigDipperDb.SQL.Exec(commentsRegExp.ReplaceAllString(request, "")) suite.Require().NoError(err) } } @@ -166,7 +160,7 @@ func (suite *DbTestSuite) getAccount(addr string) sdk.AccAddress { delegator, err := sdk.AccAddressFromBech32(addr) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec(`INSERT INTO account (address) VALUES ($1) ON CONFLICT DO NOTHING`, delegator.String()) + _, err = suite.database.SQL.Exec(`INSERT INTO account (address) VALUES ($1) ON CONFLICT DO NOTHING`, delegator.String()) suite.Require().NoError(err) return delegator diff --git a/database/distribution.go b/database/distribution.go index 894a369eb..996fb9ed5 100644 --- a/database/distribution.go +++ b/database/distribution.go @@ -21,7 +21,7 @@ ON CONFLICT (one_row_id) DO UPDATE SET coins = excluded.coins, height = excluded.height WHERE community_pool.height <= excluded.height` - _, err := db.Sql.Exec(query, pq.Array(dbtypes.NewDbDecCoins(coin)), height) + _, err := db.SQL.Exec(query, pq.Array(dbtypes.NewDbDecCoins(coin)), height) if err != nil { return fmt.Errorf("error while storing community pool: %s", err) } @@ -45,7 +45,7 @@ ON CONFLICT (one_row_id) DO UPDATE SET params = excluded.params, height = excluded.height WHERE distribution_params.height <= excluded.height` - _, err = db.Sql.Exec(stmt, string(paramsBz), params.Height) + _, err = db.SQL.Exec(stmt, string(paramsBz), params.Height) if err != nil { return fmt.Errorf("error while storing distribution params: %s", err) } diff --git a/database/feegrant.go b/database/feegrant.go index 07d347b6b..c1fbbfac6 100644 --- a/database/feegrant.go +++ b/database/feegrant.go @@ -31,7 +31,7 @@ WHERE fee_grant_allowance.height <= excluded.height` return fmt.Errorf("error while marshaling grant allowance: %s", err) } - _, err = db.Sql.Exec(stmt, allowance.Grantee, allowance.Granter, allowanceJSON, allowance.Height) + _, err = db.SQL.Exec(stmt, allowance.Grantee, allowance.Granter, allowanceJSON, allowance.Height) if err != nil { return fmt.Errorf("error while saving fee grant allowance: %s", err) } @@ -42,7 +42,7 @@ WHERE fee_grant_allowance.height <= excluded.height` // DeleteFeeGrantAllowance removes the fee grant allowance data from the database func (db *Db) DeleteFeeGrantAllowance(allowance types.GrantRemoval) error { stmt := `DELETE FROM fee_grant_allowance WHERE grantee_address = $1 AND granter_address = $2 AND height <= $3` - _, err := db.Sql.Exec(stmt, allowance.Grantee, allowance.Granter, allowance.Height) + _, err := db.SQL.Exec(stmt, allowance.Grantee, allowance.Granter, allowance.Height) if err != nil { return fmt.Errorf("error while deleting grant allowance: %s", err) diff --git a/database/feegrant_test.go b/database/feegrant_test.go index 78c2b958c..950199156 100644 --- a/database/feegrant_test.go +++ b/database/feegrant_test.go @@ -37,7 +37,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveFeeGrantAllowance() { suite.Require().Equal(rows[0].Height, int64(121622)) var stored feegranttypes.FeeAllowanceI - err = suite.database.EncodingConfig.Marshaler.UnmarshalInterfaceJSON([]byte(rows[0].Allowance), &stored) + err = suite.database.EncodingConfig.Codec.UnmarshalInterfaceJSON([]byte(rows[0].Allowance), &stored) suite.Require().NoError(err) suite.Require().Equal(allowance, stored) } @@ -66,7 +66,7 @@ func (suite *DbTestSuite) TestBigDipperDb_RemoveFeeGrantAllowance() { // verify the data var count int - err = suite.database.Sql.QueryRow(`SELECT COUNT(*) FROM fee_grant_allowance`).Scan(&count) + err = suite.database.SQL.QueryRow(`SELECT COUNT(*) FROM fee_grant_allowance`).Scan(&count) suite.Require().NoError(err) suite.Require().Equal(0, count) } diff --git a/database/gov.go b/database/gov.go index aa52ffdcf..6d52d1c4b 100644 --- a/database/gov.go +++ b/database/gov.go @@ -6,14 +6,16 @@ import ( "time" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/gogo/protobuf/proto" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/forbole/bdjuno/v3/types" dbtypes "github.com/forbole/bdjuno/v3/database/types" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/lib/pq" ) @@ -36,15 +38,15 @@ func (db *Db) SaveGovParams(params *types.GovParams) error { } stmt := ` -INSERT INTO gov_params(deposit_params, voting_params, tally_params, height) +INSERT INTO gov_params(deposit_params, voting_params, tally_params, height) VALUES ($1, $2, $3, $4) -ON CONFLICT (one_row_id) DO UPDATE +ON CONFLICT (one_row_id) DO UPDATE SET deposit_params = excluded.deposit_params, voting_params = excluded.voting_params, tally_params = excluded.tally_params, height = excluded.height WHERE gov_params.height <= excluded.height` - _, err = db.Sql.Exec(stmt, string(depositParamsBz), string(votingParamsBz), string(tallyingParams), params.Height) + _, err = db.SQL.Exec(stmt, string(depositParamsBz), string(votingParamsBz), string(tallyingParams), params.Height) if err != nil { return fmt.Errorf("error while storing gov params: %s", err) } @@ -52,6 +54,41 @@ WHERE gov_params.height <= excluded.height` return nil } +// SaveGenesisGovParams saves the genesis x/gov parameters inside the database +func (db *Db) SaveGenesisGovParams(params *types.GenesisGovParams) error { + + depositParamsBz, err := json.Marshal(¶ms.DepositParams) + if err != nil { + return fmt.Errorf("error while marshaling genesis deposit params: %s", err) + } + + votingParamsBz, err := json.Marshal(¶ms.VotingParams) + if err != nil { + return fmt.Errorf("error while marshaling genesis voting params: %s", err) + } + + tallyingParams, err := json.Marshal(¶ms.TallyParams) + if err != nil { + return fmt.Errorf("error while marshaling genesis tally params: %s", err) + } + + stmt := ` +INSERT INTO gov_params(deposit_params, voting_params, tally_params, height) +VALUES ($1, $2, $3, $4) +ON CONFLICT (one_row_id) DO UPDATE + SET deposit_params = excluded.deposit_params, + voting_params = excluded.voting_params, + tally_params = excluded.tally_params, + height = excluded.height +WHERE gov_params.height <= excluded.height` + _, err = db.SQL.Exec(stmt, string(depositParamsBz), string(votingParamsBz), string(tallyingParams), params.Height) + if err != nil { + return fmt.Errorf("error while storing genesis gov params: %s", err) + } + + return nil +} + // GetGovParams returns the most recent governance parameters func (db *Db) GetGovParams() (*types.GovParams, error) { var rows []dbtypes.GovParamsRow @@ -102,7 +139,7 @@ func (db *Db) SaveProposals(proposals []types.Proposal) error { proposalsQuery := ` INSERT INTO proposal( - id, title, description, content, proposer_address, proposal_route, proposal_type, status, + id, title, description, content, proposer_address, proposal_route, proposal_type, status, submit_time, deposit_end_time, voting_start_time, voting_end_time ) VALUES` var proposalsParams []interface{} @@ -127,7 +164,7 @@ INSERT INTO proposal( return fmt.Errorf("error while wrapping proposal proto content: %s", err) } - contentBz, err := db.EncodingConfig.Marshaler.MarshalJSON(anyContent) + contentBz, err := db.EncodingConfig.Codec.MarshalJSON(anyContent) if err != nil { return fmt.Errorf("error while marshaling proposal content: %s", err) } @@ -157,7 +194,7 @@ INSERT INTO proposal( // Store the proposals proposalsQuery = proposalsQuery[:len(proposalsQuery)-1] // Remove trailing "," proposalsQuery += " ON CONFLICT DO NOTHING" - _, err = db.Sql.Exec(proposalsQuery, proposalsParams...) + _, err = db.SQL.Exec(proposalsQuery, proposalsParams...) if err != nil { return fmt.Errorf("error while storing proposals: %s", err) } @@ -166,29 +203,29 @@ INSERT INTO proposal( } // GetProposal returns the proposal with the given id, or nil if not found -func (db *Db) GetProposal(id uint64) (*types.Proposal, error) { +func (db *Db) GetProposal(id uint64) (types.Proposal, error) { var rows []*dbtypes.ProposalRow err := db.Sqlx.Select(&rows, `SELECT * FROM proposal WHERE id = $1`, id) if err != nil { - return nil, err + return types.Proposal{}, err } if len(rows) == 0 { - return nil, nil + return types.Proposal{}, nil } row := rows[0] var contentAny codectypes.Any - err = db.EncodingConfig.Marshaler.UnmarshalJSON([]byte(row.Content), &contentAny) + err = db.EncodingConfig.Codec.UnmarshalJSON([]byte(row.Content), &contentAny) if err != nil { - return nil, err + return types.Proposal{}, err } - var content govtypes.Content - err = db.EncodingConfig.Marshaler.UnpackAny(&contentAny, &content) + var content govtypesv1beta1.Content + err = db.EncodingConfig.Codec.UnpackAny(&contentAny, &content) if err != nil { - return nil, err + return types.Proposal{}, err } proposal := types.NewProposal( @@ -203,14 +240,14 @@ func (db *Db) GetProposal(id uint64) (*types.Proposal, error) { row.VotingEndTime, row.Proposer, ) - return &proposal, nil + return proposal, nil } // GetOpenProposalsIds returns all the ids of the proposals that are in deposit or voting period at the given block time func (db *Db) GetOpenProposalsIds(blockTime time.Time) ([]uint64, error) { var ids []uint64 stmt := `SELECT id FROM proposal WHERE status = $1 OR status = $2` - err := db.Sqlx.Select(&ids, stmt, govtypes.StatusDepositPeriod.String(), govtypes.StatusVotingPeriod.String()) + err := db.Sqlx.Select(&ids, stmt, govtypesv1.StatusDepositPeriod.String(), govtypesv1.StatusVotingPeriod.String()) if err != nil { return ids, err } @@ -229,7 +266,7 @@ func (db *Db) GetOpenProposalsIds(blockTime time.Time) ([]uint64, error) { // UpdateProposal updates a proposal stored inside the database func (db *Db) UpdateProposal(update types.ProposalUpdate) error { query := `UPDATE proposal SET status = $1, voting_start_time = $2, voting_end_time = $3 where id = $4` - _, err := db.Sql.Exec(query, + _, err := db.SQL.Exec(query, update.Status, update.VotingStartTime, update.VotingEndTime, @@ -250,7 +287,7 @@ func (db *Db) SaveDeposits(deposits []types.Deposit) error { query := `INSERT INTO proposal_deposit (proposal_id, depositor_address, amount, timestamp, height) VALUES ` var param []interface{} - + var accounts []types.Account for i, deposit := range deposits { vi := i * 5 query += fmt.Sprintf("($%d,$%d,$%d,$%d,$%d),", vi+1, vi+2, vi+3, vi+4, vi+5) @@ -260,7 +297,15 @@ func (db *Db) SaveDeposits(deposits []types.Deposit) error { deposit.Timestamp, deposit.Height, ) + accounts = append(accounts, types.NewAccount(deposit.Depositor)) + } + + // Store the depositor account + err := db.SaveAccounts(accounts) + if err != nil { + return fmt.Errorf("error while storing depositor account: %s", err) } + query = query[:len(query)-1] // Remove trailing "," query += ` ON CONFLICT ON CONSTRAINT unique_deposit DO UPDATE @@ -268,7 +313,7 @@ ON CONFLICT ON CONSTRAINT unique_deposit DO UPDATE timestamp = excluded.timestamp, height = excluded.height WHERE proposal_deposit.height <= excluded.height` - _, err := db.Sql.Exec(query, param...) + _, err = db.SQL.Exec(query, param...) if err != nil { return fmt.Errorf("error while storing deposits: %s", err) } @@ -281,8 +326,8 @@ WHERE proposal_deposit.height <= excluded.height` // SaveVote allows to save for the given height and the message vote func (db *Db) SaveVote(vote types.Vote) error { query := ` -INSERT INTO proposal_vote (proposal_id, voter_address, option, timestamp, height) -VALUES ($1, $2, $3, $4, $5) +INSERT INTO proposal_vote (proposal_id, voter_address, option, timestamp, height) +VALUES ($1, $2, $3, $4, $5) ON CONFLICT ON CONSTRAINT unique_vote DO UPDATE SET option = excluded.option, timestamp = excluded.timestamp, @@ -295,7 +340,7 @@ WHERE proposal_vote.height <= excluded.height` return fmt.Errorf("error while storing voter account: %s", err) } - _, err = db.Sql.Exec(query, vote.ProposalID, vote.Voter, vote.Option.String(), vote.Timestamp, vote.Height) + _, err = db.SQL.Exec(query, vote.ProposalID, vote.Voter, vote.Option.String(), vote.Timestamp, vote.Height) if err != nil { return fmt.Errorf("error while storing vote: %s", err) } @@ -326,14 +371,14 @@ func (db *Db) SaveTallyResults(tallys []types.TallyResult) error { query = query[:len(query)-1] // Remove trailing "," query += ` -ON CONFLICT ON CONSTRAINT unique_tally_result DO UPDATE - SET yes = excluded.yes, - abstain = excluded.abstain, - no = excluded.no, +ON CONFLICT ON CONSTRAINT unique_tally_result DO UPDATE + SET yes = excluded.yes, + abstain = excluded.abstain, + no = excluded.no, no_with_veto = excluded.no_with_veto, height = excluded.height WHERE proposal_tally_result.height <= excluded.height` - _, err := db.Sql.Exec(query, param...) + _, err := db.SQL.Exec(query, param...) if err != nil { return fmt.Errorf("error while storing tally result: %s", err) } @@ -351,11 +396,11 @@ VALUES ($1, $2, $3, $4) ON CONFLICT ON CONSTRAINT unique_staking_pool_snapshot DO UPDATE SET proposal_id = excluded.proposal_id, bonded_tokens = excluded.bonded_tokens, - not_bonded_tokens = excluded.not_bonded_tokens, + not_bonded_tokens = excluded.not_bonded_tokens, height = excluded.height WHERE proposal_staking_pool_snapshot.height <= excluded.height` - _, err := db.Sql.Exec(stmt, + _, err := db.SQL.Exec(stmt, snapshot.ProposalID, snapshot.Pool.BondedTokens.String(), snapshot.Pool.NotBondedTokens.String(), snapshot.Pool.Height) if err != nil { return fmt.Errorf("error while storing proposal staking pool snapshot: %s", err) @@ -371,7 +416,7 @@ func (db *Db) SaveProposalValidatorsStatusesSnapshots(snapshots []types.Proposal } stmt := ` -INSERT INTO proposal_validator_status_snapshot(proposal_id, validator_address, voting_power, status, jailed, height) +INSERT INTO proposal_validator_status_snapshot(proposal_id, validator_address, voting_power, status, jailed, height) VALUES ` var args []interface{} @@ -386,15 +431,15 @@ VALUES ` stmt = stmt[:len(stmt)-1] stmt += ` -ON CONFLICT ON CONSTRAINT unique_validator_status_snapshot DO UPDATE +ON CONFLICT ON CONSTRAINT unique_validator_status_snapshot DO UPDATE SET proposal_id = excluded.proposal_id, validator_address = excluded.validator_address, - voting_power = excluded.voting_power, - status = excluded.status, + voting_power = excluded.voting_power, + status = excluded.status, jailed = excluded.jailed, height = excluded.height WHERE proposal_validator_status_snapshot.height <= excluded.height` - _, err := db.Sql.Exec(stmt, args...) + _, err := db.SQL.Exec(stmt, args...) if err != nil { return fmt.Errorf("error while storing proposal validator statuses snapshot: %s", err) } @@ -406,16 +451,16 @@ WHERE proposal_validator_status_snapshot.height <= excluded.height` func (db *Db) SaveSoftwareUpgradePlan(proposalID uint64, plan upgradetypes.Plan, height int64) error { stmt := ` -INSERT INTO software_upgrade_plan(proposal_id, plan_name, upgrade_height, info, height) +INSERT INTO software_upgrade_plan(proposal_id, plan_name, upgrade_height, info, height) VALUES ($1, $2, $3, $4, $5) ON CONFLICT (proposal_id) DO UPDATE SET - plan_name = excluded.plan_name, - upgrade_height = excluded.upgrade_height, - info = excluded.info, - height = excluded.height + plan_name = excluded.plan_name, + upgrade_height = excluded.upgrade_height, + info = excluded.info, + height = excluded.height WHERE software_upgrade_plan.height <= excluded.height` - _, err := db.Sql.Exec(stmt, + _, err := db.SQL.Exec(stmt, proposalID, plan.Name, plan.Height, plan.Info, height) if err != nil { return fmt.Errorf("error while storing software upgrade plan: %s", err) @@ -428,7 +473,7 @@ WHERE software_upgrade_plan.height <= excluded.height` func (db *Db) DeleteSoftwareUpgradePlan(proposalID uint64) error { stmt := `DELETE FROM software_upgrade_plan WHERE proposal_id = $1` - _, err := db.Sql.Exec(stmt, proposalID) + _, err := db.SQL.Exec(stmt, proposalID) if err != nil { return fmt.Errorf("error while deleting software upgrade plan: %s", err) } @@ -441,7 +486,7 @@ func (db *Db) CheckSoftwareUpgradePlan(upgradeHeight int64) (bool, error) { var exist bool stmt := `SELECT EXISTS (SELECT 1 FROM software_upgrade_plan WHERE upgrade_height=$1)` - err := db.Sql.QueryRow(stmt, upgradeHeight).Scan(&exist) + err := db.SQL.QueryRow(stmt, upgradeHeight).Scan(&exist) if err != nil { return exist, fmt.Errorf("error while checking software upgrade plan existence: %s", err) } @@ -453,7 +498,7 @@ func (db *Db) CheckSoftwareUpgradePlan(upgradeHeight int64) (bool, error) { func (db *Db) TruncateSoftwareUpgradePlan(height int64) error { stmt := `DELETE FROM software_upgrade_plan WHERE upgrade_height <= $1` - _, err := db.Sql.Exec(stmt, height) + _, err := db.SQL.Exec(stmt, height) if err != nil { return fmt.Errorf("error while deleting software upgrade plan: %s", err) } diff --git a/database/gov_test.go b/database/gov_test.go index 63fd0faa5..bdc612c20 100644 --- a/database/gov_test.go +++ b/database/gov_test.go @@ -6,23 +6,24 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/gogo/protobuf/proto" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/gogo/protobuf/proto" "github.com/forbole/bdjuno/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" dbtypes "github.com/forbole/bdjuno/v3/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { - votingParams := govtypes.NewVotingParams(time.Second * 10) - tallyParams := govtypes.NewTallyParams(sdk.NewDec(10), sdk.NewDec(10), sdk.NewDec(10)) - depositParams := govtypes.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(10))), time.Minute*5) - original := types.NewGovParams(types.NewVotingParams(votingParams), types.NewDepositParam(depositParams), types.NewTallyParams(tallyParams), 10) + votingParams := govtypesv1.NewVotingParams(time.Second * 10) + tallyParams := govtypesv1.NewTallyParams(sdk.NewDec(10), sdk.NewDec(10), sdk.NewDec(10)) + depositParams := govtypesv1.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(10))), time.Minute*5) + original := types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 10) err := suite.database.SaveGovParams(original) suite.Require().NoError(err) @@ -33,8 +34,8 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { // ---------------------------------------------------------------------------------------------------------------- // Try updating with a lower height - depositParams = govtypes.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(1000))), time.Minute*5) - updated := types.NewGovParams(types.NewVotingParams(votingParams), types.NewDepositParam(depositParams), types.NewTallyParams(tallyParams), 9) + depositParams = govtypesv1.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(1000))), time.Minute*5) + updated := types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 9) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -44,8 +45,8 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { suite.Require().Equal(original, stored) // ---------------------------------------------------------------------------------------------------------------- - // Try updating with the same height depositParams = govtypes.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(1000))), time.Minute*5) - updated = types.NewGovParams(types.NewVotingParams(votingParams), types.NewDepositParam(depositParams), types.NewTallyParams(tallyParams), 10) + // Try updating with the same height depositParams = govtypesv1.NewDepositParams(sdk.NewCoins(sdk.NewCoin("uatom", sdk.NewInt(1000))), time.Minute*5) + updated = types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 10) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -56,9 +57,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { // ---------------------------------------------------------------------------------------------------------------- // Try updating with a higher height - tallyParams = govtypes.NewTallyParams(sdk.NewDec(100), sdk.NewDec(100), sdk.NewDec(100)) - depositParams = govtypes.NewDepositParams(sdk.NewCoins(sdk.NewCoin("udesmos", sdk.NewInt(10000))), time.Minute*5) - updated = types.NewGovParams(types.NewVotingParams(votingParams), types.NewDepositParam(depositParams), types.NewTallyParams(tallyParams), 11) + tallyParams = govtypesv1.NewTallyParams(sdk.NewDec(100), sdk.NewDec(100), sdk.NewDec(100)) + depositParams = govtypesv1.NewDepositParams(sdk.NewCoins(sdk.NewCoin("udesmos", sdk.NewInt(10000))), time.Minute*5) + updated = types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 11) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -82,8 +83,8 @@ func (suite *DbTestSuite) getProposalRow(id int) types.Proposal { uint64(id), proposalRoute, proposalType, - govtypes.NewTextProposal(title, description), - govtypes.StatusPassed.String(), + govtypesv1beta1.NewTextProposal(title, description), + govtypesv1.StatusPassed.String(), time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), @@ -97,14 +98,14 @@ func (suite *DbTestSuite) getProposalRow(id int) types.Proposal { return proposal } -func (suite *DbTestSuite) encodeProposalContent(content govtypes.Content) string { +func (suite *DbTestSuite) encodeProposalContent(content govtypesv1beta1.Content) string { protoContent, ok := content.(proto.Message) suite.Require().True(ok) anyContent, err := codectypes.NewAnyWithValue(protoContent) suite.Require().NoError(err) - contentBz, err := suite.database.EncodingConfig.Marshaler.MarshalJSON(anyContent) + contentBz, err := suite.database.EncodingConfig.Codec.MarshalJSON(anyContent) suite.Require().NoError(err) return string(contentBz) @@ -114,15 +115,16 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { proposer1 := suite.getAccount("cosmos1z4hfrxvlgl4s8u4n5ngjcw8kdqrcv43599amxs") proposer2 := suite.getAccount("cosmos184ma3twcfjqef6k95ne8w2hk80x2kah7vcwy4a") - content1 := govtypes.NewTextProposal("title", "description") - content2 := govtypes.NewTextProposal("title1", "description1") + content1 := govtypesv1beta1.NewTextProposal("title", "description") + content2 := govtypesv1beta1.NewTextProposal("title1", "description1") + input := []types.Proposal{ types.NewProposal( 1, "proposalRoute", "proposalType", content1, - govtypes.StatusDepositPeriod.String(), + govtypesv1.StatusDepositPeriod.String(), time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), @@ -134,7 +136,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { "proposalRoute1", "proposalType1", content2, - govtypes.StatusPassed.String(), + govtypesv1.StatusPassed.String(), time.Date(2020, 1, 2, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC), @@ -163,7 +165,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 03, 00, 00, 000, time.UTC), proposer1.String(), - govtypes.StatusDepositPeriod.String(), + govtypesv1.StatusDepositPeriod.String(), ), dbtypes.NewProposalRow( 2, @@ -177,7 +179,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 03, 00, 00, 000, time.UTC), proposer2.String(), - govtypes.StatusPassed.String(), + govtypesv1.StatusPassed.String(), ), } for i, expect := range expected { @@ -186,14 +188,14 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { } func (suite *DbTestSuite) TestBigDipperDb_GetProposal() { - content := govtypes.NewTextProposal("title", "description") + content := govtypesv1beta1.NewTextProposal("title", "description") proposer := suite.getAccount("cosmos1z4hfrxvlgl4s8u4n5ngjcw8kdqrcv43599amxs") proposal := types.NewProposal( 1, "proposalRoute", "proposalType", content, - govtypes.StatusDepositPeriod.String(), + govtypesv1.StatusDepositPeriod.String(), time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), @@ -207,15 +209,15 @@ func (suite *DbTestSuite) TestBigDipperDb_GetProposal() { stored, err := suite.database.GetProposal(1) suite.Require().NoError(err) - suite.Require().True(proposal.Equal(*stored)) + suite.Require().True(proposal.Equal(stored)) } func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { proposer1 := suite.getAccount("cosmos1z4hfrxvlgl4s8u4n5ngjcw8kdqrcv43599amxs") proposer2 := suite.getAccount("cosmos184ma3twcfjqef6k95ne8w2hk80x2kah7vcwy4a") - content1 := govtypes.NewTextProposal("title", "description") - content2 := govtypes.NewTextProposal("title1", "description1") + content1 := govtypesv1beta1.NewTextProposal("title", "description") + content2 := govtypesv1beta1.NewTextProposal("title1", "description1") invalidProposal := types.NewProposal( 6, @@ -236,7 +238,7 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalRoute", "proposalType", content1, - govtypes.StatusVotingPeriod.String(), + govtypesv1.StatusVotingPeriod.String(), time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), @@ -248,7 +250,7 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalRoute", "proposalType", content1, - govtypes.StatusDepositPeriod.String(), + govtypesv1.StatusDepositPeriod.String(), time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC), @@ -260,7 +262,7 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalRoute1", "proposalType1", content2, - govtypes.StatusPassed.String(), + govtypesv1.StatusPassed.String(), time.Date(2020, 1, 2, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC), @@ -272,7 +274,7 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalRoute1", "proposalType1", content2, - govtypes.StatusRejected.String(), + govtypesv1.StatusRejected.String(), time.Date(2020, 1, 2, 00, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 01, 00, 00, 000, time.UTC), time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC), @@ -296,11 +298,14 @@ func (suite *DbTestSuite) TestBigDipperDb_UpdateProposal() { proposer, err := sdk.AccAddressFromBech32(proposal.Proposer) suite.Require().NoError(err) + timestamp1 := time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC) + timestamp2 := time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC) + update := types.NewProposalUpdate( proposal.ProposalID, - govtypes.StatusPassed.String(), - time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), - time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), + govtypesv1.StatusPassed.String(), + timestamp1, + timestamp2, ) err = suite.database.UpdateProposal(update) @@ -315,10 +320,10 @@ func (suite *DbTestSuite) TestBigDipperDb_UpdateProposal() { suite.encodeProposalContent(proposal.Content), proposal.SubmitTime, proposal.DepositEndTime, - time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC), - time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC), + timestamp1, + timestamp2, proposer.String(), - govtypes.StatusPassed.String(), + govtypesv1.StatusPassed.String(), ) var result []dbtypes.ProposalRow @@ -416,11 +421,11 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveVote() { timestamp := time.Date(2020, 1, 1, 15, 00, 00, 000, time.UTC) - vote := types.NewVote(1, voter.String(), govtypes.OptionYes, timestamp, 1) + vote := types.NewVote(1, voter.String(), govtypesv1.OptionYes, timestamp, 1) err := suite.database.SaveVote(vote) suite.Require().NoError(err) - expected := dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypes.OptionYes.String(), timestamp, 1) + expected := dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypesv1.OptionYes.String(), timestamp, 1) var result []dbtypes.VoteRow err = suite.database.Sqlx.Select(&result, `SELECT * FROM proposal_vote`) @@ -429,7 +434,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveVote() { suite.Require().True(expected.Equals(result[0])) // Update with lower height should not change option - vote = types.NewVote(1, voter.String(), govtypes.OptionNo, timestamp, 0) + vote = types.NewVote(1, voter.String(), govtypesv1.OptionNo, timestamp, 0) err = suite.database.SaveVote(vote) suite.Require().NoError(err) @@ -440,11 +445,11 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveVote() { suite.Require().True(expected.Equals(result[0])) // Update with same height should change option - vote = types.NewVote(1, voter.String(), govtypes.OptionAbstain, timestamp, 1) + vote = types.NewVote(1, voter.String(), govtypesv1.OptionAbstain, timestamp, 1) err = suite.database.SaveVote(vote) suite.Require().NoError(err) - expected = dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypes.OptionAbstain.String(), timestamp, 1) + expected = dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypesv1.OptionAbstain.String(), timestamp, 1) result = []dbtypes.VoteRow{} err = suite.database.Sqlx.Select(&result, `SELECT * FROM proposal_vote`) @@ -453,11 +458,11 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveVote() { suite.Require().True(expected.Equals(result[0])) // Update with higher height should change option - vote = types.NewVote(1, voter.String(), govtypes.OptionNoWithVeto, timestamp, 2) + vote = types.NewVote(1, voter.String(), govtypesv1.OptionNoWithVeto, timestamp, 2) err = suite.database.SaveVote(vote) suite.Require().NoError(err) - expected = dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypes.OptionNoWithVeto.String(), timestamp, 2) + expected = dbtypes.NewVoteRow(int64(proposal.ProposalID), voter.String(), govtypesv1.OptionNoWithVeto.String(), timestamp, 2) result = []dbtypes.VoteRow{} err = suite.database.Sqlx.Select(&result, `SELECT * FROM proposal_vote`) @@ -960,4 +965,4 @@ func (suite *DbTestSuite) TestBigDipperDb_CheckSoftwareUpgradePlan() { exist, err = suite.database.CheckSoftwareUpgradePlan(11) suite.Require().NoError(err) suite.Require().Equal(false, exist) -} +} \ No newline at end of file diff --git a/database/mint.go b/database/mint.go index a3472f8a2..cb6a43878 100644 --- a/database/mint.go +++ b/database/mint.go @@ -19,7 +19,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE inflation.height <= excluded.height` - _, err := db.Sql.Exec(stmt, inflation.String(), height) + _, err := db.SQL.Exec(stmt, inflation.String(), height) if err != nil { return fmt.Errorf("error while storing inflation: %s", err) } @@ -42,7 +42,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE mint_params.height <= excluded.height` - _, err = db.Sql.Exec(stmt, string(paramsBz), params.Height) + _, err = db.SQL.Exec(stmt, string(paramsBz), params.Height) if err != nil { return fmt.Errorf("error while storing mint params: %s", err) } diff --git a/database/pricefeed.go b/database/pricefeed.go index ab42256de..3a9b03e81 100644 --- a/database/pricefeed.go +++ b/database/pricefeed.go @@ -35,7 +35,7 @@ func (db *Db) GetTokensPriceID() ([]string, error) { // SaveToken allows to save the given token details func (db *Db) SaveToken(token types.Token) error { query := `INSERT INTO token (name) VALUES ($1) ON CONFLICT DO NOTHING` - _, err := db.Sql.Exec(query, token.Name) + _, err := db.SQL.Exec(query, token.Name) if err != nil { return err } @@ -52,7 +52,7 @@ func (db *Db) SaveToken(token types.Token) error { query = query[:len(query)-1] // Remove trailing "," query += " ON CONFLICT DO NOTHING" - _, err = db.Sql.Exec(query, params...) + _, err = db.SQL.Exec(query, params...) if err != nil { return fmt.Errorf("error while saving token: %s", err) } @@ -85,7 +85,7 @@ ON CONFLICT (unit_name) DO UPDATE timestamp = excluded.timestamp WHERE token_price.timestamp <= excluded.timestamp` - _, err := db.Sql.Exec(query, param...) + _, err := db.SQL.Exec(query, param...) if err != nil { return fmt.Errorf("error while saving tokens prices: %s", err) } @@ -114,7 +114,7 @@ ON CONFLICT ON CONSTRAINT unique_price_for_timestamp DO UPDATE SET price = excluded.price, market_cap = excluded.market_cap` - _, err := db.Sql.Exec(query, param...) + _, err := db.SQL.Exec(query, param...) if err != nil { return fmt.Errorf("error while storing tokens price history: %s", err) } diff --git a/database/pricefeed_test.go b/database/pricefeed_test.go index 50a732a34..c68af4fb5 100644 --- a/database/pricefeed_test.go +++ b/database/pricefeed_test.go @@ -12,13 +12,13 @@ import ( func (suite *DbTestSuite) insertToken(name string) { query := fmt.Sprintf( `INSERT INTO token (name) VALUES ('%s')`, name) - _, err := suite.database.Sql.Query(query) + _, err := suite.database.SQL.Query(query) suite.Require().NoError(err) query = fmt.Sprintf( `INSERT INTO token_unit (token_name, denom, exponent, price_id) VALUES ('%[1]s', 'u%[1]s', 0, 'u%[1]s'), ('%[1]s', 'm%[1]s', 3, 'm%[1]s'), ('%[1]s', '%[1]s', 6, '%[1]s')`, name) - _, err = suite.database.Sql.Query(query) + _, err = suite.database.SQL.Query(query) suite.Require().NoError(err) } diff --git a/database/pruning.go b/database/pruning.go index 7c8c610f6..774c5ac87 100644 --- a/database/pruning.go +++ b/database/pruning.go @@ -40,7 +40,7 @@ func (db *Db) Prune(height int64) error { } func (db *Db) pruneBank(height int64) error { - _, err := db.Sql.Exec(`DELETE FROM supply WHERE height = $1`, height) + _, err := db.SQL.Exec(`DELETE FROM supply WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning supply: %s", err) } @@ -48,32 +48,32 @@ func (db *Db) pruneBank(height int64) error { } func (db *Db) pruneStaking(height int64) error { - _, err := db.Sql.Exec(`DELETE FROM staking_pool WHERE height = $1`, height) + _, err := db.SQL.Exec(`DELETE FROM staking_pool WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning staking pool: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM validator_commission WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM validator_commission WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning validator commission: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM validator_voting_power WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM validator_voting_power WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning validator voting power: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM validator_status WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM validator_status WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning validator status: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM double_sign_vote WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM double_sign_vote WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning double sign votes: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM double_sign_evidence WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM double_sign_evidence WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning double sign evidence: %s", err) } @@ -82,12 +82,12 @@ func (db *Db) pruneStaking(height int64) error { } func (db *Db) pruneMint(height int64) error { - _, err := db.Sql.Exec(`DELETE FROM inflation WHERE height = $1`, height) + _, err := db.SQL.Exec(`DELETE FROM inflation WHERE height = $1`, height) return fmt.Errorf("error while pruning inflation: %s", err) } func (db *Db) pruneDistribution(height int64) error { - _, err := db.Sql.Exec(`DELETE FROM community_pool WHERE height = $1`, height) + _, err := db.SQL.Exec(`DELETE FROM community_pool WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning community pool: %s", err) } @@ -96,12 +96,12 @@ func (db *Db) pruneDistribution(height int64) error { } func (db *Db) pruneSlashing(height int64) error { - _, err := db.Sql.Exec(`DELETE FROM validator_signing_info WHERE height = $1`, height) + _, err := db.SQL.Exec(`DELETE FROM validator_signing_info WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning validator signing info: %s", err) } - _, err = db.Sql.Exec(`DELETE FROM slashing_params WHERE height = $1`, height) + _, err = db.SQL.Exec(`DELETE FROM slashing_params WHERE height = $1`, height) if err != nil { return fmt.Errorf("error while pruning slashing params: %s", err) } diff --git a/database/slashing.go b/database/slashing.go index 7d9e27551..57ad015d1 100644 --- a/database/slashing.go +++ b/database/slashing.go @@ -41,7 +41,7 @@ ON CONFLICT (validator_address) DO UPDATE height = excluded.height WHERE validator_signing_info.height <= excluded.height` - _, err := db.Sql.Exec(stmt, args...) + _, err := db.SQL.Exec(stmt, args...) if err != nil { return fmt.Errorf("error while storing validators signing infos: %s", err) } @@ -64,7 +64,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE slashing_params.height <= excluded.height` - _, err = db.Sql.Exec(stmt, string(paramsBz), params.Height) + _, err = db.SQL.Exec(stmt, string(paramsBz), params.Height) if err != nil { return fmt.Errorf("error while storing slashing params: %s", err) } diff --git a/database/staking_params.go b/database/staking_params.go index 737aa5c3e..6b31537ac 100644 --- a/database/staking_params.go +++ b/database/staking_params.go @@ -25,7 +25,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE staking_params.height <= excluded.height` - _, err = db.Sql.Exec(stmt, string(paramsBz), params.Height) + _, err = db.SQL.Exec(stmt, string(paramsBz), params.Height) if err != nil { return fmt.Errorf("error while storing staking params: %s", err) } diff --git a/database/staking_params_test.go b/database/staking_params_test.go index 23af916b7..e8f8af514 100644 --- a/database/staking_params_test.go +++ b/database/staking_params_test.go @@ -6,6 +6,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + sdk "github.com/cosmos/cosmos-sdk/types" dbtypes "github.com/forbole/bdjuno/v3/database/types" "github.com/forbole/bdjuno/v3/types" ) @@ -17,6 +18,7 @@ func (suite *DbTestSuite) TestSaveStakingParams() { 7, 10000, "uatom", + sdk.NewDec(1), ) err := suite.database.SaveStakingParams(types.NewStakingParams(stakingParams, 10)) suite.Require().NoError(err) @@ -40,12 +42,13 @@ func (suite *DbTestSuite) TestGetStakingParams() { 7, 10000, "uatom", + sdk.NewDec(1), ) paramsBz, err := json.Marshal(&stakingParams) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec( + _, err = suite.database.SQL.Exec( `INSERT INTO staking_params (params, height) VALUES ($1, $2)`, string(paramsBz), 10, ) diff --git a/database/staking_pool.go b/database/staking_pool.go index 4b8637239..1d59dfaa1 100644 --- a/database/staking_pool.go +++ b/database/staking_pool.go @@ -19,7 +19,7 @@ ON CONFLICT (one_row_id) DO UPDATE height = excluded.height WHERE staking_pool.height <= excluded.height` - _, err := db.Sql.Exec(stmt, + _, err := db.SQL.Exec(stmt, pool.BondedTokens.String(), pool.NotBondedTokens.String(), pool.UnbondingTokens.String(), diff --git a/database/staking_validators.go b/database/staking_validators.go index 7384afe93..8e56e42b9 100644 --- a/database/staking_validators.go +++ b/database/staking_validators.go @@ -56,14 +56,14 @@ VALUES ` selfDelegationAccQuery = selfDelegationAccQuery[:len(selfDelegationAccQuery)-1] // Remove trailing "," selfDelegationAccQuery += " ON CONFLICT DO NOTHING" - _, err := db.Sql.Exec(selfDelegationAccQuery, selfDelegationParam...) + _, err := db.SQL.Exec(selfDelegationAccQuery, selfDelegationParam...) if err != nil { return fmt.Errorf("error while storing accounts: %s", err) } validatorQuery = validatorQuery[:len(validatorQuery)-1] // Remove trailing "," validatorQuery += " ON CONFLICT DO NOTHING" - _, err = db.Sql.Exec(validatorQuery, validatorParams...) + _, err = db.SQL.Exec(validatorQuery, validatorParams...) if err != nil { return fmt.Errorf("error while storing valdiators: %s", err) } @@ -78,7 +78,7 @@ ON CONFLICT (consensus_address) DO UPDATE max_rate = excluded.max_rate, height = excluded.height WHERE validator_info.height <= excluded.height` - _, err = db.Sql.Exec(validatorInfoQuery, validatorInfoParams...) + _, err = db.SQL.Exec(validatorInfoQuery, validatorInfoParams...) if err != nil { return fmt.Errorf("error while storing validator infos: %s", err) } @@ -247,7 +247,7 @@ ON CONFLICT (validator_address) DO UPDATE height = excluded.height WHERE validator_description.height <= excluded.height` - _, err = db.Sql.Exec(stmt, + _, err = db.SQL.Exec(stmt, dbtypes.ToNullString(consAddr.String()), dbtypes.ToNullString(des.Moniker), dbtypes.ToNullString(des.Identity), @@ -340,7 +340,7 @@ ON CONFLICT (validator_address) DO UPDATE min_self_delegation = excluded.min_self_delegation, height = excluded.height WHERE validator_commission.height <= excluded.height` - _, err = db.Sql.Exec(stmt, consAddr.String(), commission, minSelfDelegation, data.Height) + _, err = db.SQL.Exec(stmt, consAddr.String(), commission, minSelfDelegation, data.Height) if err != nil { return fmt.Errorf("error while storing validator commission: %s", err) } @@ -388,7 +388,7 @@ ON CONFLICT (validator_address) DO UPDATE height = excluded.height WHERE validator_voting_power.height <= excluded.height` - _, err := db.Sql.Exec(stmt, params...) + _, err := db.SQL.Exec(stmt, params...) if err != nil { return fmt.Errorf("error while storing validators voting power: %s", err) } @@ -422,7 +422,7 @@ func (db *Db) SaveValidatorsStatuses(statuses []types.ValidatorStatus) error { validatorStmt = validatorStmt[:len(validatorStmt)-1] validatorStmt += "ON CONFLICT DO NOTHING" - _, err := db.Sql.Exec(validatorStmt, valParams...) + _, err := db.SQL.Exec(validatorStmt, valParams...) if err != nil { return fmt.Errorf("error while storing validators: %s", err) } @@ -434,7 +434,7 @@ ON CONFLICT (validator_address) DO UPDATE jailed = excluded.jailed, height = excluded.height WHERE validator_status.height <= excluded.height` - _, err = db.Sql.Exec(statusStmt, statusParams...) + _, err = db.SQL.Exec(statusStmt, statusParams...) if err != nil { return fmt.Errorf("error while stroring validators statuses: %s", err) } @@ -450,7 +450,7 @@ INSERT INTO double_sign_vote VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT DO NOTHING RETURNING id` var id int64 - err := db.Sql.QueryRow(stmt, + err := db.SQL.QueryRow(stmt, vote.Type, vote.Height, vote.Round, vote.BlockID, vote.ValidatorAddress, vote.ValidatorIndex, vote.Signature, ).Scan(&id) return id, err @@ -471,7 +471,7 @@ func (db *Db) SaveDoubleSignEvidence(evidence types.DoubleSignEvidence) error { stmt := ` INSERT INTO double_sign_evidence (height, vote_a_id, vote_b_id) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING` - _, err = db.Sql.Exec(stmt, evidence.Height, voteA, voteB) + _, err = db.SQL.Exec(stmt, evidence.Height, voteA, voteB) if err != nil { return fmt.Errorf("error while storing double sign evidence: %s", err) } diff --git a/database/staking_validators_test.go b/database/staking_validators_test.go index 9d9f24c4c..cf1455fad 100644 --- a/database/staking_validators_test.go +++ b/database/staking_validators_test.go @@ -207,13 +207,13 @@ func (suite *DbTestSuite) TestGetValidator() { maxChangeRate := sdk.NewDec(ii) suite.getAccount("cosmos184ma3twcfjqef6k95ne8w2hk80x2kah7vcwy4a") // Insert test data - _, err := suite.database.Sql.Exec(` + _, err := suite.database.SQL.Exec(` INSERT INTO validator (consensus_address, consensus_pubkey) VALUES ('cosmosvalcons1qqqqrezrl53hujmpdch6d805ac75n220ku09rl', 'cosmosvalconspub1zcjduepq7mft6gfls57a0a42d7uhx656cckhfvtrlmw744jv4q0mvlv0dypskehfk8')`) suite.Require().NoError(err) - _, err = suite.database.Sql.Exec(` + _, err = suite.database.SQL.Exec(` INSERT INTO validator_info (consensus_address, operator_address,self_delegate_address,max_change_rate,max_rate,height) VALUES ('cosmosvalcons1qqqqrezrl53hujmpdch6d805ac75n220ku09rl', 'cosmosvaloper1rcp29q3hpd246n6qak7jluqep4v006cdsc2kkl', @@ -255,7 +255,7 @@ func (suite *DbTestSuite) TestGetValidators() { } for _, query := range queries { - _, err := suite.database.Sql.Exec(query) + _, err := suite.database.SQL.Exec(query) suite.Require().NoError(err) } diff --git a/database/utils.go b/database/utils.go index 6821c713c..be2da9c76 100644 --- a/database/utils.go +++ b/database/utils.go @@ -12,7 +12,7 @@ func (db *Db) InsertEnableModules(modules []string) error { // Remove existing modules stmt := "DELETE FROM modules WHERE TRUE" - _, err := db.Sql.Exec(stmt) + _, err := db.SQL.Exec(stmt) if err != nil { return fmt.Errorf("error while deleting modules: %s", err) } @@ -29,7 +29,7 @@ func (db *Db) InsertEnableModules(modules []string) error { } stmt = stmt[:len(stmt)-1] // remove tailing "," stmt += " ON CONFLICT DO NOTHING" - _, err = db.Sql.Exec(stmt, values...) + _, err = db.SQL.Exec(stmt, values...) if err != nil { return fmt.Errorf("error while storing modules: %s", err) } diff --git a/go.mod b/go.mod index 9f3b5d96e..e2f0a4adc 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/forbole/bdjuno/v3 -go 1.18 +go 1.19 require ( - github.com/cosmos/cosmos-sdk v0.45.4 - github.com/cosmos/gaia/v7 v7.0.2 - github.com/forbole/juno/v3 v3.4.0 + cosmossdk.io/math v1.0.0-beta.3 + github.com/cosmos/cosmos-sdk v0.46.7 + github.com/forbole/juno/v4 v4.0.0-20230207053719-d0f32f8970c3 github.com/go-co-op/gocron v1.18.0 github.com/gogo/protobuf v1.3.3 github.com/jmoiron/sqlx v1.3.5 @@ -16,78 +16,103 @@ require ( github.com/rs/zerolog v1.29.0 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 - github.com/tendermint/tendermint v0.34.19 - google.golang.org/grpc v1.45.0 + github.com/tendermint/tendermint v0.34.24 + google.golang.org/grpc v1.50.1 gopkg.in/yaml.v3 v3.0.1 ) require ( - filippo.io/edwards25519 v1.0.0-beta.2 // indirect - github.com/99designs/keyring v1.1.6 // indirect + cloud.google.com/go v0.104.0 // indirect + cloud.google.com/go/compute v1.12.1 // indirect + cloud.google.com/go/compute/metadata v0.2.1 // indirect + cloud.google.com/go/iam v0.4.0 // indirect + cloud.google.com/go/storage v1.23.0 // indirect + cosmossdk.io/errors v1.0.0-beta.7 // indirect + filippo.io/edwards25519 v1.0.0-rc.1 // indirect + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/Workiva/go-datastructures v1.0.53 // indirect - github.com/armon/go-metrics v0.3.10 // indirect + github.com/armon/go-metrics v0.4.1 // indirect + github.com/aws/aws-sdk-go v1.40.45 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/confio/ics23/go v0.7.0 // indirect - github.com/cosmos/btcutil v1.0.4 // indirect + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/cockroachdb/apd/v2 v2.0.2 // 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-alpha8 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.17.3 // indirect - github.com/cosmos/ibc-go/v3 v3.0.0 // indirect - github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect - github.com/cosmos/ledger-go v0.9.2 // indirect - github.com/danieljoos/wincred v1.0.2 // indirect + github.com/cosmos/iavl v0.19.4 // indirect + github.com/cosmos/ibc-go/v6 v6.1.0 // indirect + github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect + github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dustin/go-humanize v1.0.0 // indirect - github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/dvsekhvalnov/jose2go v1.5.0 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-kit/kit v0.12.0 // indirect - github.com/go-kit/log v0.2.0 // indirect + github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect github.com/golang/glog v1.0.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.1 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.6.0 // indirect + github.com/googleapis/go-type-adapters v1.0.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 - github.com/gravity-devs/liquidity v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-getter v1.6.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.1 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect + github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect + 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.13.6 // indirect - github.com/libp2p/go-buffer-pool v0.0.2 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect + github.com/klauspost/compress v1.15.11 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/magiconair/properties v1.8.6 // 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/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect + github.com/onsi/ginkgo v1.16.4 // indirect github.com/onsi/gomega v1.18.1 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -95,40 +120,48 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/rakyll/statik v0.1.7 // indirect - github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/rs/cors v1.8.2 // indirect - github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect - github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cast v1.4.1 // indirect + github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.10.1 // indirect - github.com/strangelove-ventures/packet-forward-middleware/v2 v2.1.1 // indirect - github.com/subosito/gotenv v1.2.0 // indirect + github.com/spf13/viper v1.14.0 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tendermint/tm-db v0.6.7 // indirect - github.com/zondax/hid v0.9.0 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + github.com/zondax/hid v0.9.1 // indirect + github.com/zondax/ledger-go v0.14.0 // indirect go.etcd.io/bbolt v1.3.6 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect - google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/crypto v0.2.0 // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/net v0.2.0 // indirect + golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.2.0 // indirect + golang.org/x/term v0.2.0 // indirect + golang.org/x/text v0.4.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/api v0.102.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect + google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/tendermint/tendermint => github.com/forbole/tendermint v0.34.13-0.20210820072129-a2a4af55563d - google.golang.org/grpc => google.golang.org/grpc v1.33.2 + // use informal system fork of tendermint + github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.24 ) diff --git a/go.sum b/go.sum index f22a2e7ae..34a0214c2 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,9 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -14,18 +16,44 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +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 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8= +cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +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.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= +cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= +cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= +cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/iam v0.4.0 h1:YBYU00SCDzZJdHqVc4I5d6lsklcYIjQZa1YmEz4jlSE= +cloud.google.com/go/iam v0.4.0/go.mod h1:cbaZxyScUhxl7ZAkNWiALgihfP75wS/fUsVNaa1r3vA= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -35,228 +63,165 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= +cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07qY= +cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= +cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= +cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/math v1.0.0-beta.3 h1:TbZxSopz2LqjJ7aXYfn7nJSb8vNaBklW6BLpcei1qwM= +cosmossdk.io/math v1.0.0-beta.3/go.mod h1:3LYasri3Zna4XpbrTNdKsWmD5fHHkaNAod/mNT9XdE4= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI= -filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= -github.com/99designs/keyring v1.1.6 h1:kVDC2uCgVwecxCk+9zoCt2uEL6dt+dfVzMvGgnVcIuM= -github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= +filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= +github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o= +github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= 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/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= -github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= -github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= +github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= +github.com/aws/aws-sdk-go v1.40.45 h1:QN1nsY27ssD/JmW4s83qmSb+uL6DG4GmCDzjmJB4xUI= +github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= -github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= -github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= -github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= -github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= -github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= -github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= -github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= -github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= -github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= -github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= -github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= +github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= -github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= -github.com/confio/ics23/go v0.6.3/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8= -github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= +github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= +github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= +github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= +github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= +github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= -github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.45.1/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= -github.com/cosmos/cosmos-sdk v0.45.4 h1:eStDAhJdMY8n5arbBRe+OwpNeBSunxSBHp1g55ulfdA= -github.com/cosmos/cosmos-sdk v0.45.4/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc= -github.com/cosmos/gaia/v7 v7.0.2 h1:tn4wZk6jt0uqDL7z/V2Bs6NVd+gtsX+4BsQ94wPB8xw= -github.com/cosmos/gaia/v7 v7.0.2/go.mod h1:RDJGBlI+gGnWjYAy6LFM/Dtor5ZSo0Z/BYm3HA+/RWE= +github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= +github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= +github.com/cosmos/cosmos-proto v1.0.0-alpha8 h1:d3pCRuMYYvGA5bM0ZbbjKn+AoQD4A7dyNG2wzwWalUw= +github.com/cosmos/cosmos-proto v1.0.0-alpha8/go.mod h1:6/p+Bc4O8JKeZqe0VqUGTX31eoYqemTT4C1hLCWsO7I= +github.com/cosmos/cosmos-sdk v0.46.7 h1:dkGy9y2ewgqvawrUOuWb2oz3MdotVduokyreXC4bS0s= +github.com/cosmos/cosmos-sdk v0.46.7/go.mod h1:fqKqz39U5IlEFb4nbQ72951myztsDzFKKDtffYJ63nk= 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/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= -github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= -github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= -github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= -github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= -github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= -github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok= +github.com/cosmos/iavl v0.19.4/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/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= +github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= -github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= -github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= +github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= +github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= +github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= -github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= 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.0.3/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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= 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= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b h1:HBah4D48ypg3J7Np4N+HY/ZR76fx3HEUGxDU6Uk39oQ= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +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= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= -github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/forbole/juno/v3 v3.4.0 h1:mawAHgfkT2U/z6YSPKSm9oceaQ1eTnlxWnDzeXclPdM= -github.com/forbole/juno/v3 v3.4.0/go.mod h1:BQF5zcjRTmfUsZTRGzZiQrIHndJdo+MnDoe0fDI28VE= -github.com/forbole/tendermint v0.34.13-0.20210820072129-a2a4af55563d h1:pUqGUgTUU24ibHeloQeg1F2pFbgQllddsuZ+x+CcUzw= -github.com/forbole/tendermint v0.34.13-0.20210820072129-a2a4af55563d/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= +github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/forbole/juno/v4 v4.0.0-20230207053719-d0f32f8970c3 h1:ZqUzQXmZFwGuv/p3Ea2UC/0iUzSSpMDNLuGn3TkRRzE= +github.com/forbole/juno/v4 v4.0.0-20230207053719-d0f32f8970c3/go.mod h1:AK6uI11WyKqonq7VXUfhC+5/2BAWc4zLFPVvNgXv5RY= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/frankban/quicktest v1.14.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.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/go-co-op/gocron v1.18.0 h1:SxTyJ5xnSN4byCq7b10LmmszFdxQlSQJod8s3gbnXxA= github.com/go-co-op/gocron v1.18.0/go.mod h1:sD/a0Aadtw5CpflUJ/lpP9Vfdk979Wl1Sg33HPHg0FY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -266,31 +231,21 @@ github.com/go-gorp/gorp v2.0.0+incompatible h1:dIQPsBtl6/H1MjVseWuWPXa7ET4p6Dve4 github.com/go-gorp/gorp v2.0.0+incompatible/go.mod h1:7IfkAQnO7jfT/9IQ3R9wL1dFhukN6aQxzKTHnkxzA/E= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +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.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= 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-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= 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= @@ -299,11 +254,12 @@ github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= @@ -332,9 +288,6 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -353,14 +306,20 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -372,46 +331,44 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +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/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= +github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU= +github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= +github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= +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= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/gravity-devs/liquidity v1.5.0 h1:QOMLCOBrvp6FYUDMbBPJ+K3Oi9UF/q74c1cp48SsCRs= -github.com/gravity-devs/liquidity v1.5.0/go.mod h1:67P0tk9OThjyIdXlIkxtBzCN+gTqNVc02uqLcrd7dT0= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 h1:X2vfSnm1WC8HEo0MBHZg2TcuDUHJj6kd1TmEAQncnSA= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1/go.mod h1:oVMjMN64nzEcepv1kdZKgx1qNYt4Ro0Gqefiq2JWdis= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -419,156 +376,112 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-getter v1.6.1 h1:NASsgP4q6tL94WH6nJxKWj8As2H/2kop/bB1d8JMyRY= +github.com/hashicorp/go-getter v1.6.1/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= +github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUjLpLt6bVvZ72SQc/B4dXcPBw4Vgd7soowdRl52qEM= -github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= +github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/improbable-eng/grpc-web v0.14.1 h1:NrN4PY71A6tAz2sKDvC5JCauENWp0ykG8Oq1H3cpFvw= -github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= +github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= -github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/informalsystems/tendermint v0.34.24 h1:2beNEg5tp+U5oj/Md+0xDBsMHGbdue31T3OrstS6xS0= +github.com/informalsystems/tendermint v0.34.24/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= 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/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= +github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +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.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -578,221 +491,125 @@ github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= 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/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.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.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= 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/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 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.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= 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/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/proullon/ramsql v0.0.0-20181213202341-817cee58a244 h1:fdX2U+a2Rmc4BjRYcOKzjYXtYTE4ga1B2lb8i7BlefU= github.com/proullon/ramsql v0.0.0-20181213202341-817cee58a244/go.mod h1:jG8oAQG0ZPHPyxg5QlMERS31airDC+ZuqiAe8DUvFVo= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= -github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= +github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= -github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= -github.com/strangelove-ventures/packet-forward-middleware/v2 v2.1.1 h1:4hBySIpnbC0VeR8cfJFdRGVu5I3hAD2XTXGbIqXn6xw= -github.com/strangelove-ventures/packet-forward-middleware/v2 v2.1.1/go.mod h1:86xAwtvd0gyEQsBAVTp8CRg3P/Yxvf9Hqs2I7rUeMFg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -806,106 +623,64 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/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/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= -github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= -github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= -github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= -github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= +github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= -github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= +github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/ledger-go v0.14.0 h1:dlMC7aO8Wss1CxBq2I96kZ69Nh1ligzbs8UWOtq/AsA= +github.com/zondax/ledger-go v0.14.0/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE= +golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= 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= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -913,9 +688,11 @@ 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-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= 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= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -929,27 +706,22 @@ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -960,7 +732,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -968,7 +739,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -978,20 +748,28 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R 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-20200904194848-62affa334b73/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= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= 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-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/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 h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= 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= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= 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= @@ -1003,9 +781,17 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -1017,12 +803,12 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +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/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= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1037,20 +823,15 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1058,7 +839,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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= @@ -1068,12 +848,9 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/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-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/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= @@ -1081,25 +858,48 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/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.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.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 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= 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= @@ -1108,18 +908,18 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1129,9 +929,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1139,8 +936,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1155,10 +950,8 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -1170,15 +963,23 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f 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= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1200,13 +1001,34 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= +google.golang.org/api v0.102.0 h1:JxJl2qQ85fRMPNvlZY/enexbxpCjLwGhZUtgfGeQ51I= +google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= +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= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1214,7 +1036,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1243,25 +1064,93 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb h1:ZrsicilzPCS/Xr8qtBZZLpy4P9TYXAfl49ctG1/5tgw= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= +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= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1272,33 +1161,26 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 h1:KR8+MyP7/qOlV+8Af01LtjL04bu7on42eVsxT4EyBQk= +google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1310,10 +1192,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1322,9 +1202,9 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= -nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +pgregory.net/rapid v0.5.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/modules/actions/config.go b/modules/actions/config.go index d127ed058..2930cbcc4 100644 --- a/modules/actions/config.go +++ b/modules/actions/config.go @@ -1,7 +1,7 @@ package actions import ( - "github.com/forbole/juno/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" "gopkg.in/yaml.v3" ) diff --git a/modules/actions/module.go b/modules/actions/module.go index a7c40ee02..8c7b52c96 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/v3/modules" - "github.com/forbole/juno/v3/node" - "github.com/forbole/juno/v3/node/builder" - nodeconfig "github.com/forbole/juno/v3/node/config" - "github.com/forbole/juno/v3/types/config" + "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" modulestypes "github.com/forbole/bdjuno/v3/modules/types" ) diff --git a/modules/actions/types/handler.go b/modules/actions/types/handler.go index f233a2d4c..c452d59e1 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/v3/node" + "github.com/forbole/juno/v4/node" modulestypes "github.com/forbole/bdjuno/v3/modules/types" ) diff --git a/modules/actions/types/response.go b/modules/actions/types/response.go index a675ac0a4..a25fe6aa3 100644 --- a/modules/actions/types/response.go +++ b/modules/actions/types/response.go @@ -1,11 +1,11 @@ package types import ( - "time" - + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" stakingtype "github.com/cosmos/cosmos-sdk/x/staking/types" + "time" ) type Coin struct { @@ -95,6 +95,6 @@ type Redelegation struct { } type RedelegationEntry struct { - CompletionTime time.Time `json:"completion_time"` - Balance sdk.Int `json:"balance"` + CompletionTime time.Time `json:"completion_time"` + Balance sdkmath.Int `json:"balance"` } diff --git a/modules/auth/handle_msg.go b/modules/auth/handle_msg.go index 20b0d7fc4..390dd7292 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/v3/types" + juno "github.com/forbole/juno/v4/types" "github.com/gogo/protobuf/proto" "github.com/rs/zerolog/log" diff --git a/modules/auth/module.go b/modules/auth/module.go index 2d725cb2a..1dcb4975a 100644 --- a/modules/auth/module.go +++ b/modules/auth/module.go @@ -5,8 +5,8 @@ import ( "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" - "github.com/forbole/juno/v3/modules/messages" + "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v4/modules/messages" ) var ( diff --git a/modules/bank/module.go b/modules/bank/module.go index 4f8fe26d6..73b0b3241 100644 --- a/modules/bank/module.go +++ b/modules/bank/module.go @@ -6,9 +6,9 @@ import ( "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/modules/bank/source" - junomessages "github.com/forbole/juno/v3/modules/messages" + junomessages "github.com/forbole/juno/v4/modules/messages" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/bank/source/local/source.go b/modules/bank/source/local/source.go index 7fc4df934..b4a49af71 100644 --- a/modules/bank/source/local/source.go +++ b/modules/bank/source/local/source.go @@ -7,7 +7,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/juno/v3/node/local" + "github.com/forbole/juno/v4/node/local" "github.com/forbole/bdjuno/v3/modules/bank/source" "github.com/forbole/bdjuno/v3/types" diff --git a/modules/bank/source/remote/source.go b/modules/bank/source/remote/source.go index 07aef412e..d29338c74 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" bankkeeper "github.com/forbole/bdjuno/v3/modules/bank/source" "github.com/forbole/bdjuno/v3/types" diff --git a/modules/consensus/handle_block.go b/modules/consensus/handle_block.go index fa21490e3..82cfd2ba4 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/v3/types" + "github.com/forbole/juno/v4/types" "github.com/rs/zerolog/log" diff --git a/modules/consensus/module.go b/modules/consensus/module.go index 47ddaebe9..298b2a8f8 100644 --- a/modules/consensus/module.go +++ b/modules/consensus/module.go @@ -3,7 +3,7 @@ package consensus import ( "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/daily_refetch/handle_periodic_operations.go b/modules/daily_refetch/handle_periodic_operations.go index d73133584..83be18edc 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/v3/parser" - "github.com/forbole/juno/v3/types/config" + "github.com/forbole/juno/v4/parser" + "github.com/forbole/juno/v4/types/config" "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" + parsecmdtypes "github.com/forbole/juno/v4/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 44fa8afb2..21a807f6d 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/v3/node" + "github.com/forbole/juno/v4/node" bdjunodb "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/distribution/handle_msg.go b/modules/distribution/handle_msg.go index 79a01f3da..b425a1115 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/v3/types" + juno "github.com/forbole/juno/v4/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" ) diff --git a/modules/distribution/module.go b/modules/distribution/module.go index 14faa75da..32cf41892 100644 --- a/modules/distribution/module.go +++ b/modules/distribution/module.go @@ -5,7 +5,7 @@ import ( distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" "github.com/forbole/bdjuno/v3/database" ) diff --git a/modules/distribution/source/local/source.go b/modules/distribution/source/local/source.go index ade7f3c38..6004f067a 100644 --- a/modules/distribution/source/local/source.go +++ b/modules/distribution/source/local/source.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/v3/node/local" + "github.com/forbole/juno/v4/node/local" distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" ) diff --git a/modules/distribution/source/remote/source.go b/modules/distribution/source/remote/source.go index 24287f4cc..4dba178fe 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" ) diff --git a/modules/distribution/source/remote/source_actions.go b/modules/distribution/source/remote/source_actions.go index aaca6160b..a4d7a79ac 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" "github.com/forbole/bdjuno/v3/utils" ) diff --git a/modules/feegrant/handle_block.go b/modules/feegrant/handle_block.go index 247e9a31e..32ddf2c48 100644 --- a/modules/feegrant/handle_block.go +++ b/modules/feegrant/handle_block.go @@ -6,7 +6,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - juno "github.com/forbole/juno/v3/types" + juno "github.com/forbole/juno/v4/types" "github.com/rs/zerolog/log" tmctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/modules/feegrant/handle_msg.go b/modules/feegrant/handle_msg.go index 9e9ca3232..4b221a408 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/v3/types" + juno "github.com/forbole/juno/v4/types" "github.com/forbole/bdjuno/v3/types" ) diff --git a/modules/feegrant/module.go b/modules/feegrant/module.go index 479e000c2..438a01496 100644 --- a/modules/feegrant/module.go +++ b/modules/feegrant/module.go @@ -5,7 +5,7 @@ import ( "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/gov/handle_block.go b/modules/gov/handle_block.go index 9a279eafa..9b16a05d5 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/v3/types" + juno "github.com/forbole/juno/v4/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/modules/gov/handle_genesis.go b/modules/gov/handle_genesis.go index d362db191..abf47a517 100644 --- a/modules/gov/handle_genesis.go +++ b/modules/gov/handle_genesis.go @@ -8,7 +8,8 @@ import ( "github.com/forbole/bdjuno/v3/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + gov "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/rs/zerolog/log" ) @@ -17,23 +18,23 @@ func (m *Module) HandleGenesis(doc *tmtypes.GenesisDoc, appState map[string]json log.Debug().Str("module", "gov").Msg("parsing genesis") // Read the genesis state - var genState govtypes.GenesisState - err := m.cdc.UnmarshalJSON(appState[govtypes.ModuleName], &genState) + var genStatev1beta1 govtypesv1beta1.GenesisState + err := m.cdc.UnmarshalJSON(appState[gov.ModuleName], &genStatev1beta1) if err != nil { return fmt.Errorf("error while reading gov genesis data: %s", err) } // Save the proposals - err = m.saveProposals(genState.Proposals, doc) + err = m.saveGenesisProposals(genStatev1beta1.Proposals, doc) if err != nil { return fmt.Errorf("error while storing genesis governance proposals: %s", err) } // Save the params - err = m.db.SaveGovParams(types.NewGovParams( - types.NewVotingParams(genState.VotingParams), - types.NewDepositParam(genState.DepositParams), - types.NewTallyParams(genState.TallyParams), + err = m.db.SaveGenesisGovParams(types.NewGenesisGovParams( + types.NewGenesisVotingParams(&genStatev1beta1.VotingParams), + types.NewGenesisDepositParam(&genStatev1beta1.DepositParams), + types.NewGenesisTallyParams(&genStatev1beta1.TallyParams), doc.InitialHeight, )) if err != nil { @@ -43,8 +44,8 @@ func (m *Module) HandleGenesis(doc *tmtypes.GenesisDoc, appState map[string]json return nil } -// saveProposals save proposals from genesis file -func (m *Module) saveProposals(slice govtypes.Proposals, genDoc *tmtypes.GenesisDoc) error { +// saveGenesisProposals save proposals from genesis file +func (m *Module) saveGenesisProposals(slice govtypesv1beta1.Proposals, genDoc *tmtypes.GenesisDoc) error { proposals := make([]types.Proposal, len(slice)) tallyResults := make([]types.TallyResult, len(slice)) deposits := make([]types.Deposit, len(slice)) diff --git a/modules/gov/handle_msg.go b/modules/gov/handle_msg.go index ce5c72a71..b1ce5648e 100644 --- a/modules/gov/handle_msg.go +++ b/modules/gov/handle_msg.go @@ -9,8 +9,11 @@ import ( "github.com/forbole/bdjuno/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - juno "github.com/forbole/juno/v3/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + + 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" ) // HandleMsg implements modules.MessageModule @@ -20,13 +23,13 @@ func (m *Module) HandleMsg(index int, msg sdk.Msg, tx *juno.Tx) error { } switch cosmosMsg := msg.(type) { - case *govtypes.MsgSubmitProposal: + case *govtypesv1beta1.MsgSubmitProposal: return m.handleMsgSubmitProposal(tx, index, cosmosMsg) - case *govtypes.MsgDeposit: + case *govtypesv1.MsgDeposit: return m.handleMsgDeposit(tx, cosmosMsg) - case *govtypes.MsgVote: + case *govtypesv1.MsgVote: return m.handleMsgVote(tx, cosmosMsg) } @@ -34,14 +37,14 @@ func (m *Module) HandleMsg(index int, msg sdk.Msg, tx *juno.Tx) error { } // handleMsgSubmitProposal allows to properly handle a handleMsgSubmitProposal -func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.MsgSubmitProposal) error { +func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypesv1beta1.MsgSubmitProposal) error { // Get the proposal id - event, err := tx.FindEventByType(index, govtypes.EventTypeSubmitProposal) + event, err := tx.FindEventByType(index, gov.EventTypeSubmitProposal) if err != nil { return fmt.Errorf("error while searching for EventTypeSubmitProposal: %s", err) } - id, err := tx.FindAttributeByKey(event, govtypes.AttributeKeyProposalID) + id, err := tx.FindAttributeByKey(event, gov.AttributeKeyProposalID) if err != nil { return fmt.Errorf("error while searching for AttributeKeyProposalID: %s", err) } @@ -60,9 +63,9 @@ func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.M // Store the proposal proposalObj := types.NewProposal( proposal.ProposalId, - proposal.ProposalRoute(), - proposal.ProposalType(), - proposal.GetContent(), + msg.GetContent().ProposalRoute(), + msg.GetContent().ProposalType(), + msg.GetContent(), proposal.Status.String(), proposal.SubmitTime, proposal.DepositEndTime, @@ -70,6 +73,7 @@ func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.M proposal.VotingEndTime, msg.Proposer, ) + err = m.db.SaveProposals([]types.Proposal{proposalObj}) if err != nil { return err @@ -86,12 +90,11 @@ func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.M } // handleMsgDeposit allows to properly handle a handleMsgDeposit -func (m *Module) handleMsgDeposit(tx *juno.Tx, msg *govtypes.MsgDeposit) error { +func (m *Module) handleMsgDeposit(tx *juno.Tx, msg *govtypesv1.MsgDeposit) error { deposit, err := m.source.ProposalDeposit(tx.Height, msg.ProposalId, msg.Depositor) if err != nil { return fmt.Errorf("error while getting proposal deposit: %s", err) } - txTimestamp, err := time.Parse(time.RFC3339, tx.Timestamp) if err != nil { return fmt.Errorf("error while parsing time: %s", err) @@ -103,7 +106,7 @@ func (m *Module) handleMsgDeposit(tx *juno.Tx, msg *govtypes.MsgDeposit) error { } // handleMsgVote allows to properly handle a handleMsgVote -func (m *Module) handleMsgVote(tx *juno.Tx, msg *govtypes.MsgVote) error { +func (m *Module) handleMsgVote(tx *juno.Tx, msg *govtypesv1.MsgVote) error { txTimestamp, err := time.Parse(time.RFC3339, tx.Timestamp) if err != nil { return fmt.Errorf("error while parsing time: %s", err) diff --git a/modules/gov/module.go b/modules/gov/module.go index 501084aef..ea9c3bb4a 100644 --- a/modules/gov/module.go +++ b/modules/gov/module.go @@ -7,7 +7,7 @@ import ( govsource "github.com/forbole/bdjuno/v3/modules/gov/source" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/gov/source/local/source.go b/modules/gov/source/local/source.go index 4964923a6..722207f07 100644 --- a/modules/gov/source/local/source.go +++ b/modules/gov/source/local/source.go @@ -4,8 +4,10 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/forbole/juno/v3/node/local" + 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/v3/modules/gov/source" ) @@ -17,102 +19,104 @@ var ( // Source implements govsource.Source by using a local node type Source struct { *local.Source - q govtypes.QueryServer + q govtypesv1.QueryServer + qv1beta1 govtypesv1beta1.QueryClient } // NewSource returns a new Source instance -func NewSource(source *local.Source, govKeeper govtypes.QueryServer) *Source { +func NewSource(source *local.Source, govKeeper govtypesv1.QueryServer, govKeeperv1beta1 govtypesv1beta1.QueryClient) *Source { return &Source{ - Source: source, - q: govKeeper, + Source: source, + q: govKeeper, + qv1beta1: govKeeperv1beta1, } } // Proposal implements govsource.Source -func (s Source) Proposal(height int64, id uint64) (govtypes.Proposal, error) { +func (s Source) Proposal(height int64, id uint64) (govtypesv1beta1.Proposal, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.Proposal{}, fmt.Errorf("error while loading height: %s", err) + return govtypesv1beta1.Proposal{}, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.Proposal(sdk.WrapSDKContext(ctx), &govtypes.QueryProposalRequest{ProposalId: id}) + res, err := s.qv1beta1.Proposal(sdk.WrapSDKContext(ctx), &govtypesv1beta1.QueryProposalRequest{ProposalId: id}) if err != nil { - return govtypes.Proposal{}, err + return govtypesv1beta1.Proposal{}, err } return res.Proposal, nil } // ProposalDeposit implements govsource.Source -func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (govtypes.Deposit, error) { +func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (*govtypesv1.Deposit, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.Deposit{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.Deposit(sdk.WrapSDKContext(ctx), &govtypes.QueryDepositRequest{ProposalId: id, Depositor: depositor}) + res, err := s.q.Deposit(sdk.WrapSDKContext(ctx), &govtypesv1.QueryDepositRequest{ProposalId: id, Depositor: depositor}) if err != nil { - return govtypes.Deposit{}, err + return nil, err } return res.Deposit, nil } // TallyResult implements govsource.Source -func (s Source) TallyResult(height int64, proposalID uint64) (govtypes.TallyResult, error) { +func (s Source) TallyResult(height int64, proposalID uint64) (*govtypesv1.TallyResult, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.TallyResult{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.TallyResult(sdk.WrapSDKContext(ctx), &govtypes.QueryTallyResultRequest{ProposalId: proposalID}) + res, err := s.q.TallyResult(sdk.WrapSDKContext(ctx), &govtypesv1.QueryTallyResultRequest{ProposalId: proposalID}) if err != nil { - return govtypes.TallyResult{}, err + return nil, err } return res.Tally, nil } // DepositParams implements govsource.Source -func (s Source) DepositParams(height int64) (govtypes.DepositParams, error) { +func (s Source) DepositParams(height int64) (*govtypesv1.DepositParams, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.DepositParams{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamDeposit}) + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamDeposit}) if err != nil { - return govtypes.DepositParams{}, err + return nil, err } return res.DepositParams, nil } // VotingParams implements govsource.Source -func (s Source) VotingParams(height int64) (govtypes.VotingParams, error) { +func (s Source) VotingParams(height int64) (*govtypesv1.VotingParams, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.VotingParams{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamVoting}) + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamVoting}) if err != nil { - return govtypes.VotingParams{}, err + return nil, err } return res.VotingParams, nil } // TallyParams implements govsource.Source -func (s Source) TallyParams(height int64) (govtypes.TallyParams, error) { +func (s Source) TallyParams(height int64) (*govtypesv1.TallyParams, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.TallyParams{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } - res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamTallying}) + res, err := s.q.Params(sdk.WrapSDKContext(ctx), &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamTallying}) if err != nil { - return govtypes.TallyParams{}, err + return nil, err } return res.TallyParams, nil diff --git a/modules/gov/source/remote/source.go b/modules/gov/source/remote/source.go index e943ac20a..d4d38d2ce 100644 --- a/modules/gov/source/remote/source.go +++ b/modules/gov/source/remote/source.go @@ -1,9 +1,10 @@ package remote import ( - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/forbole/juno/v3/node/remote" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + "github.com/forbole/juno/v4/node/remote" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" govsource "github.com/forbole/bdjuno/v3/modules/gov/source" ) @@ -14,90 +15,92 @@ var ( // Source implements govsource.Source using a remote node type Source struct { *remote.Source - govClient govtypes.QueryClient + govClient govtypesv1.QueryClient + govClientv1beta1 govtypesv1beta1.QueryClient } // NewSource returns a new Source implementation -func NewSource(source *remote.Source, govClient govtypes.QueryClient) *Source { +func NewSource(source *remote.Source, govClient govtypesv1.QueryClient, govClientv1beta1 govtypesv1beta1.QueryClient) *Source { return &Source{ - Source: source, - govClient: govClient, + Source: source, + govClient: govClient, + govClientv1beta1: govClientv1beta1, } } // Proposal implements govsource.Source -func (s Source) Proposal(height int64, id uint64) (govtypes.Proposal, error) { - res, err := s.govClient.Proposal( +func (s Source) Proposal(height int64, id uint64) (govtypesv1beta1.Proposal, error) { + res, err := s.govClientv1beta1.Proposal( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryProposalRequest{ProposalId: id}, + &govtypesv1beta1.QueryProposalRequest{ProposalId: id}, ) if err != nil { - return govtypes.Proposal{}, err + return govtypesv1beta1.Proposal{}, err } return res.Proposal, err } // ProposalDeposit implements govsource.Source -func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (govtypes.Deposit, error) { +func (s Source) ProposalDeposit(height int64, id uint64, depositor string) (*govtypesv1.Deposit, error) { res, err := s.govClient.Deposit( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryDepositRequest{ProposalId: id, Depositor: depositor}, + &govtypesv1.QueryDepositRequest{ProposalId: id, Depositor: depositor}, ) if err != nil { - return govtypes.Deposit{}, err + return nil, err } return res.Deposit, nil } // TallyResult implements govsource.Source -func (s Source) TallyResult(height int64, proposalID uint64) (govtypes.TallyResult, error) { +func (s Source) TallyResult(height int64, proposalID uint64) (*govtypesv1.TallyResult, error) { res, err := s.govClient.TallyResult( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryTallyResultRequest{ProposalId: proposalID}, + &govtypesv1.QueryTallyResultRequest{ProposalId: proposalID}, ) if err != nil { - return govtypes.TallyResult{}, err + return nil, err } return res.Tally, nil } // DepositParams implements govsource.Source -func (s Source) DepositParams(height int64) (govtypes.DepositParams, error) { +func (s Source) DepositParams(height int64) (*govtypesv1.DepositParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamDeposit}, + &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamDeposit}, ) if err != nil { - return govtypes.DepositParams{}, err + return nil, err } return res.DepositParams, nil } // VotingParams implements govsource.Source -func (s Source) VotingParams(height int64) (govtypes.VotingParams, error) { +func (s Source) VotingParams(height int64) (*govtypesv1.VotingParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamVoting}, + &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamVoting}, ) if err != nil { - return govtypes.VotingParams{}, err + return nil, err } return res.VotingParams, nil } // TallyParams implements govsource.Source -func (s Source) TallyParams(height int64) (govtypes.TallyParams, error) { +func (s Source) TallyParams(height int64) (*govtypesv1.TallyParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), - &govtypes.QueryParamsRequest{ParamsType: govtypes.ParamTallying}, + &govtypesv1.QueryParamsRequest{ParamsType: govtypesv1.ParamTallying}, ) if err != nil { - return govtypes.TallyParams{}, err + return nil, err } return res.TallyParams, nil diff --git a/modules/gov/source/source.go b/modules/gov/source/source.go index 3acdea56e..87761c2a9 100644 --- a/modules/gov/source/source.go +++ b/modules/gov/source/source.go @@ -1,12 +1,15 @@ package source -import govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" +import ( + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" +) type Source interface { - Proposal(height int64, id uint64) (govtypes.Proposal, error) - ProposalDeposit(height int64, id uint64, depositor string) (govtypes.Deposit, error) - TallyResult(height int64, proposalID uint64) (govtypes.TallyResult, error) - DepositParams(height int64) (govtypes.DepositParams, error) - VotingParams(height int64) (govtypes.VotingParams, error) - TallyParams(height int64) (govtypes.TallyParams, error) + Proposal(height int64, id uint64) (govtypesv1beta1.Proposal, error) + ProposalDeposit(height int64, id uint64, depositor string) (*govtypesv1.Deposit, error) + TallyResult(height int64, proposalID uint64) (*govtypesv1.TallyResult, error) + DepositParams(height int64) (*govtypesv1.DepositParams, error) + VotingParams(height int64) (*govtypesv1.VotingParams, error) + TallyParams(height int64) (*govtypesv1.TallyParams, error) } diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index fe13640b7..45bedcb09 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -10,25 +10,25 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - tmctypes "github.com/tendermint/tendermint/rpc/core/types" - "google.golang.org/grpc/codes" + tmctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/forbole/bdjuno/v3/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + + gov "github.com/cosmos/cosmos-sdk/x/gov/types" ) func (m *Module) UpdateProposal(height int64, blockTime time.Time, id uint64) error { // Get the proposal proposal, err := m.source.Proposal(height, id) if err != nil { - // Check if proposal has reached the voting end time - passedVotingPeriod := blockTime.After(proposal.VotingEndTime) - - if strings.Contains(err.Error(), codes.NotFound.String()) && passedVotingPeriod { + // Check if proposal exist on the chain + if strings.Contains(err.Error(), codes.NotFound.String()) && strings.Contains(err.Error(), "doesn't exist") { // Handle case when a proposal is deleted from the chain (did not pass deposit period) return m.updateDeletedProposalStatus(id) } @@ -101,10 +101,10 @@ func (m *Module) handleParamChangeProposal(height int64, paramChangeProposal *pr if err != nil { return fmt.Errorf("error while updating ParamChangeProposal %s params : %s", distrtypes.ModuleName, err) } - case govtypes.ModuleName: + case gov.ModuleName: err = m.UpdateParams(height) if err != nil { - return fmt.Errorf("error while updating ParamChangeProposal %s params : %s", govtypes.ModuleName, err) + return fmt.Errorf("error while updating ParamChangeProposal %s params : %s", gov.ModuleName, err) } case minttypes.ModuleName: err = m.mintModule.UpdateParams(height) @@ -133,7 +133,7 @@ func (m *Module) handleParamChangeProposal(height int64, paramChangeProposal *pr } // updateProposalStatus updates the given proposal status -func (m *Module) updateProposalStatus(proposal govtypes.Proposal) error { +func (m *Module) updateProposalStatus(proposal govtypesv1beta1.Proposal) error { return m.db.UpdateProposal( types.NewProposalUpdate( proposal.ProposalId, @@ -145,7 +145,7 @@ func (m *Module) updateProposalStatus(proposal govtypes.Proposal) error { } // updateProposalTallyResult updates the tally result associated with the given proposal -func (m *Module) updateProposalTallyResult(proposal govtypes.Proposal) error { +func (m *Module) updateProposalTallyResult(proposal govtypesv1beta1.Proposal) error { height, err := m.db.GetLastBlockHeight() if err != nil { return err @@ -159,17 +159,17 @@ func (m *Module) updateProposalTallyResult(proposal govtypes.Proposal) error { return m.db.SaveTallyResults([]types.TallyResult{ types.NewTallyResult( proposal.ProposalId, - result.Yes.String(), - result.Abstain.String(), - result.No.String(), - result.NoWithVeto.String(), + result.YesCount, + result.AbstainCount, + result.NoCount, + result.NoWithVetoCount, height, ), }) } // updateAccounts updates any account that might be involved in the proposal (eg. fund community recipient) -func (m *Module) updateAccounts(proposal govtypes.Proposal) error { +func (m *Module) updateAccounts(proposal govtypesv1beta1.Proposal) error { content, ok := proposal.Content.GetCachedValue().(*distrtypes.CommunityPoolSpendProposal) if ok { height, err := m.db.GetLastBlockHeight() @@ -270,15 +270,15 @@ func findStatus(consAddr string, statuses []types.ValidatorStatus) (types.Valida return types.ValidatorStatus{}, fmt.Errorf("cannot find status for validator with consensus address %s", consAddr) } -func (m *Module) handlePassedProposal(proposal govtypes.Proposal, height int64) error { - if proposal.Status != govtypes.StatusPassed { +func (m *Module) handlePassedProposal(proposal govtypesv1beta1.Proposal, height int64) error { + if proposal.Status != govtypesv1beta1.StatusPassed { // If proposal status is not passed, do nothing return nil } // Unpack proposal - var content govtypes.Content - err := m.db.EncodingConfig.Marshaler.UnpackAny(proposal.Content, &content) + var content govtypesv1beta1.Content + err := m.db.EncodingConfig.Codec.UnpackAny(proposal.Content, &content) if err != nil { return fmt.Errorf("error while handling ParamChangeProposal: %s", err) } @@ -290,14 +290,12 @@ func (m *Module) handlePassedProposal(proposal govtypes.Proposal, height int64) if err != nil { return fmt.Errorf("error while updating params from ParamChangeProposal: %s", err) } - case *upgradetypes.SoftwareUpgradeProposal: // Store software upgrade plan while SoftwareUpgradeProposal passed err = m.db.SaveSoftwareUpgradePlan(proposal.ProposalId, p.Plan, height) if err != nil { return fmt.Errorf("error while storing software upgrade plan: %s", err) } - case *upgradetypes.CancelSoftwareUpgradeProposal: // Delete software upgrade plan while CancelSoftwareUpgradeProposal passed err = m.db.DeleteSoftwareUpgradePlan(proposal.ProposalId) diff --git a/modules/mint/module.go b/modules/mint/module.go index e0b7fb834..df3051aa4 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/v3/modules" + "github.com/forbole/juno/v4/modules" "github.com/forbole/bdjuno/v3/database" mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" diff --git a/modules/mint/source/local/source.go b/modules/mint/source/local/source.go index 7b997d02c..69179273c 100644 --- a/modules/mint/source/local/source.go +++ b/modules/mint/source/local/source.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/forbole/juno/v3/node/local" + "github.com/forbole/juno/v4/node/local" mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" ) diff --git a/modules/mint/source/remote/source.go b/modules/mint/source/remote/source.go index dbe41bc2b..a05b4c58f 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" ) diff --git a/modules/modules/module.go b/modules/modules/module.go index 79801ec8f..0d7d036bf 100644 --- a/modules/modules/module.go +++ b/modules/modules/module.go @@ -1,8 +1,8 @@ package modules import ( - "github.com/forbole/juno/v3/modules" - "github.com/forbole/juno/v3/types/config" + "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v4/types/config" "github.com/forbole/bdjuno/v3/database" ) diff --git a/modules/pricefeed/module.go b/modules/pricefeed/module.go index 58d2f01ae..2be0171a8 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/v3/types/config" + "github.com/forbole/juno/v4/types/config" "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/modules/registrar.go b/modules/registrar.go index 1b4b1f33e..515842f83 100644 --- a/modules/registrar.go +++ b/modules/registrar.go @@ -4,16 +4,16 @@ import ( "github.com/forbole/bdjuno/v3/modules/actions" "github.com/forbole/bdjuno/v3/modules/types" - "github.com/forbole/juno/v3/modules/pruning" - "github.com/forbole/juno/v3/modules/telemetry" + "github.com/forbole/juno/v4/modules/pruning" + "github.com/forbole/juno/v4/modules/telemetry" "github.com/forbole/bdjuno/v3/modules/slashing" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - jmodules "github.com/forbole/juno/v3/modules" - "github.com/forbole/juno/v3/modules/messages" - "github.com/forbole/juno/v3/modules/registrar" + jmodules "github.com/forbole/juno/v4/modules" + "github.com/forbole/juno/v4/modules/messages" + "github.com/forbole/juno/v4/modules/registrar" "github.com/forbole/bdjuno/v3/utils" @@ -65,7 +65,7 @@ func NewRegistrar(parser messages.MessageAddressesParser) *Registrar { // BuildModules implements modules.Registrar func (r *Registrar) BuildModules(ctx registrar.Context) jmodules.Modules { - cdc := ctx.EncodingConfig.Marshaler + cdc := ctx.EncodingConfig.Codec db := database.Cast(ctx.Database) sources, err := types.BuildSources(ctx.JunoConfig.Node, ctx.EncodingConfig) diff --git a/modules/slashing/handle_block.go b/modules/slashing/handle_block.go index 2b7f68384..9be0c3f69 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/v3/types" + juno "github.com/forbole/juno/v4/types" "github.com/rs/zerolog/log" tmctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/modules/slashing/module.go b/modules/slashing/module.go index 481670127..88d3d646f 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/v3/modules" + "github.com/forbole/juno/v4/modules" "github.com/forbole/bdjuno/v3/database" slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" diff --git a/modules/slashing/source/local/source.go b/modules/slashing/source/local/source.go index e2cf4e179..e2f0e0e93 100644 --- a/modules/slashing/source/local/source.go +++ b/modules/slashing/source/local/source.go @@ -6,7 +6,7 @@ import ( 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/v3/node/local" + "github.com/forbole/juno/v4/node/local" slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" ) diff --git a/modules/slashing/source/remote/source.go b/modules/slashing/source/remote/source.go index e85c272ef..2b3340c0d 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" ) diff --git a/modules/staking/handle_block.go b/modules/staking/handle_block.go index 65732df9c..58e3684c3 100644 --- a/modules/staking/handle_block.go +++ b/modules/staking/handle_block.go @@ -7,7 +7,7 @@ import ( "github.com/forbole/bdjuno/v3/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - juno "github.com/forbole/juno/v3/types" + juno "github.com/forbole/juno/v4/types" "github.com/rs/zerolog/log" tmctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/modules/staking/handle_msg.go b/modules/staking/handle_msg.go index ffd606bf7..366b11151 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/v3/types" + juno "github.com/forbole/juno/v4/types" ) // HandleMsg implements MessageModule diff --git a/modules/staking/module.go b/modules/staking/module.go index c6c0d58aa..3002fd9ce 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/v3/modules" + "github.com/forbole/juno/v4/modules" "github.com/forbole/bdjuno/v3/database" stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" diff --git a/modules/staking/source/local/source.go b/modules/staking/source/local/source.go index 7b630b1d7..563afb9ec 100644 --- a/modules/staking/source/local/source.go +++ b/modules/staking/source/local/source.go @@ -6,7 +6,7 @@ import ( 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/v3/node/local" + "github.com/forbole/juno/v4/node/local" stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" ) diff --git a/modules/staking/source/remote/source.go b/modules/staking/source/remote/source.go index 7089620c2..40efd6f79 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" ) diff --git a/modules/staking/source/remote/source_actions.go b/modules/staking/source/remote/source_actions.go index 8fa9ad817..b87df6c07 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/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" "github.com/forbole/bdjuno/v3/utils" ) diff --git a/modules/staking/utils_validators.go b/modules/staking/utils_validators.go index 19f9176f9..bb442bf2a 100644 --- a/modules/staking/utils_validators.go +++ b/modules/staking/utils_validators.go @@ -3,7 +3,7 @@ package staking import ( "fmt" - juno "github.com/forbole/juno/v3/types" + juno "github.com/forbole/juno/v4/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/forbole/bdjuno/v3/modules/staking/keybase" diff --git a/modules/types/sources.go b/modules/types/sources.go index 76fb8560b..7a28b31a2 100644 --- a/modules/types/sources.go +++ b/modules/types/sources.go @@ -8,18 +8,19 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/forbole/juno/v3/node/remote" + "github.com/forbole/juno/v4/node/remote" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/juno/v3/node/local" + "github.com/forbole/juno/v4/node/local" - nodeconfig "github.com/forbole/juno/v3/node/config" + nodeconfig "github.com/forbole/juno/v4/node/config" banksource "github.com/forbole/bdjuno/v3/modules/bank/source" localbanksource "github.com/forbole/bdjuno/v3/modules/bank/source/local" @@ -76,7 +77,7 @@ func buildLocalSources(cfg *local.Details, encodingConfig *params.EncodingConfig sources := &Sources{ BankSource: localbanksource.NewSource(source, banktypes.QueryServer(app.BankKeeper)), DistrSource: localdistrsource.NewSource(source, distrtypes.QueryServer(app.DistrKeeper)), - GovSource: localgovsource.NewSource(source, govtypes.QueryServer(app.GovKeeper)), + GovSource: localgovsource.NewSource(source, govtypesv1.QueryServer(app.GovKeeper), nil), MintSource: localmintsource.NewSource(source, minttypes.QueryServer(app.MintKeeper)), SlashingSource: localslashingsource.NewSource(source, slashingtypes.QueryServer(app.SlashingKeeper)), StakingSource: localstakingsource.NewSource(source, stakingkeeper.Querier{Keeper: app.StakingKeeper}), @@ -115,7 +116,7 @@ func buildRemoteSources(cfg *remote.Details) (*Sources, error) { return &Sources{ BankSource: remotebanksource.NewSource(source, banktypes.NewQueryClient(source.GrpcConn)), DistrSource: remotedistrsource.NewSource(source, distrtypes.NewQueryClient(source.GrpcConn)), - GovSource: remotegovsource.NewSource(source, govtypes.NewQueryClient(source.GrpcConn)), + GovSource: remotegovsource.NewSource(source, govtypesv1.NewQueryClient(source.GrpcConn), govtypesv1beta1.NewQueryClient(source.GrpcConn)), MintSource: remotemintsource.NewSource(source, minttypes.NewQueryClient(source.GrpcConn)), SlashingSource: remoteslashingsource.NewSource(source, slashingtypes.NewQueryClient(source.GrpcConn)), StakingSource: remotestakingsource.NewSource(source, stakingtypes.NewQueryClient(source.GrpcConn)), diff --git a/modules/upgrade/handle_block.go b/modules/upgrade/handle_block.go index 9a588b71f..96896658e 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/v3/types" + "github.com/forbole/juno/v4/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" ) diff --git a/modules/upgrade/module.go b/modules/upgrade/module.go index 6576bff4b..a04f6b1b4 100644 --- a/modules/upgrade/module.go +++ b/modules/upgrade/module.go @@ -3,7 +3,7 @@ package upgrade import ( "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/forbole/juno/v4/modules" ) var ( diff --git a/types/config/config.go b/types/config/config.go index f36154ed3..77220bd95 100644 --- a/types/config/config.go +++ b/types/config/config.go @@ -1,8 +1,8 @@ package config import ( - initcmd "github.com/forbole/juno/v3/cmd/init" - junoconfig "github.com/forbole/juno/v3/types/config" + initcmd "github.com/forbole/juno/v4/cmd/init" + junoconfig "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" "gopkg.in/yaml.v3" diff --git a/types/gov.go b/types/gov.go index 2ed1075b9..6c297db28 100644 --- a/types/gov.go +++ b/types/gov.go @@ -5,7 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" ) const ( @@ -19,7 +21,15 @@ type DepositParams struct { } // NewDepositParam allows to build a new DepositParams -func NewDepositParam(d govtypes.DepositParams) DepositParams { +func NewDepositParam(d *govtypesv1.DepositParams) DepositParams { + return DepositParams{ + MinDeposit: d.MinDeposit, + MaxDepositPeriod: d.MaxDepositPeriod.Nanoseconds(), + } +} + +// NewGenesisDepositParam allows to build a new DepositParams +func NewGenesisDepositParam(d *govtypesv1beta1.DepositParams) DepositParams { return DepositParams{ MinDeposit: d.MinDeposit, MaxDepositPeriod: d.MaxDepositPeriod.Nanoseconds(), @@ -32,7 +42,14 @@ type VotingParams struct { } // NewVotingParams allows to build a new VotingParams instance -func NewVotingParams(v govtypes.VotingParams) VotingParams { +func NewVotingParams(v *govtypesv1.VotingParams) VotingParams { + return VotingParams{ + VotingPeriod: v.VotingPeriod.Nanoseconds(), + } +} + +// NewGenesisVotingParams allows to build a new VotingParams instance +func NewGenesisVotingParams(v *govtypesv1beta1.VotingParams) VotingParams { return VotingParams{ VotingPeriod: v.VotingPeriod.Nanoseconds(), } @@ -46,15 +63,30 @@ type GovParams struct { Height int64 `json:"height" ymal:"height"` } +// GenesisGovParams contains the data of the x/gov module parameters +type GenesisGovParams struct { + DepositParams DepositParams `json:"deposit_params" yaml:"deposit_params"` + VotingParams VotingParams `json:"voting_params" yaml:"voting_params"` + TallyParams GenesisTallyParams `json:"tally_params" yaml:"tally_params"` + Height int64 `json:"height" ymal:"height"` +} + // TallyParams contains the tally parameters of the x/gov module type TallyParams struct { + Quorum string `json:"quorum,omitempty"` + Threshold string `json:"threshold,omitempty"` + VetoThreshold string `json:"veto_threshold,omitempty" yaml:"veto_threshold"` +} + +// GenesisTallyParams contains genesis tally parameters of the x/gov module +type GenesisTallyParams struct { Quorum sdk.Dec `json:"quorum,omitempty"` Threshold sdk.Dec `json:"threshold,omitempty"` VetoThreshold sdk.Dec `json:"veto_threshold,omitempty" yaml:"veto_threshold"` } // NewTallyParams allows to build a new TallyParams instance -func NewTallyParams(t govtypes.TallyParams) TallyParams { +func NewTallyParams(t *govtypesv1.TallyParams) TallyParams { return TallyParams{ Quorum: t.Quorum, Threshold: t.Threshold, @@ -62,6 +94,15 @@ func NewTallyParams(t govtypes.TallyParams) TallyParams { } } +// NewGenesisTallyParams allows to build a new GenesisTallyParams instance +func NewGenesisTallyParams(t *govtypesv1beta1.TallyParams) GenesisTallyParams { + return GenesisTallyParams{ + Quorum: t.Quorum, + Threshold: t.Threshold, + VetoThreshold: t.VetoThreshold, + } +} + // NewGovParams allows to build a new GovParams instance func NewGovParams(votingParams VotingParams, depositParams DepositParams, tallyParams TallyParams, height int64) *GovParams { return &GovParams{ @@ -72,6 +113,16 @@ func NewGovParams(votingParams VotingParams, depositParams DepositParams, tallyP } } +// NewGenesisGovParams allows to build a new GenesisGovParams instance +func NewGenesisGovParams(votingParams VotingParams, depositParams DepositParams, tallyParams GenesisTallyParams, height int64) *GenesisGovParams { + return &GenesisGovParams{ + DepositParams: depositParams, + VotingParams: votingParams, + TallyParams: tallyParams, + Height: height, + } +} + // -------------------------------------------------------------------------------------------------------------------- // Proposal represents a single governance proposal @@ -79,7 +130,7 @@ type Proposal struct { ProposalRoute string ProposalType string ProposalID uint64 - Content govtypes.Content + Content govtypesv1beta1.Content Status string SubmitTime time.Time DepositEndTime time.Time @@ -93,7 +144,7 @@ func NewProposal( proposalID uint64, proposalRoute string, proposalType string, - content govtypes.Content, + content govtypesv1beta1.Content, status string, submitTime time.Time, depositEndTime time.Time, @@ -183,7 +234,7 @@ func NewDeposit( type Vote struct { ProposalID uint64 Voter string - Option govtypes.VoteOption + Option govtypesv1.VoteOption Timestamp time.Time Height int64 } @@ -192,7 +243,7 @@ type Vote struct { func NewVote( proposalID uint64, voter string, - option govtypes.VoteOption, + option govtypesv1.VoteOption, timestamp time.Time, height int64, ) Vote { diff --git a/types/staking_pool_params.go b/types/staking_pool_params.go index 708ed1ed0..b131be09f 100644 --- a/types/staking_pool_params.go +++ b/types/staking_pool_params.go @@ -1,21 +1,21 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) // Pool contains the data of the staking pool at the given height type Pool struct { - BondedTokens sdk.Int - NotBondedTokens sdk.Int - UnbondingTokens sdk.Int - StakedNotBondedTokens sdk.Int + BondedTokens sdkmath.Int + NotBondedTokens sdkmath.Int + UnbondingTokens sdkmath.Int + StakedNotBondedTokens sdkmath.Int Height int64 } // NewPool allows to build a new Pool instance -func NewPool(bondedTokens, notBondedTokens, unbondingTokens, stakedNotBondedTokens sdk.Int, height int64) *Pool { +func NewPool(bondedTokens, notBondedTokens, unbondingTokens, stakedNotBondedTokens sdkmath.Int, height int64) *Pool { return &Pool{ BondedTokens: bondedTokens, NotBondedTokens: notBondedTokens, diff --git a/utils/genesis.go b/utils/genesis.go index 326591f04..969d11ff7 100644 --- a/utils/genesis.go +++ b/utils/genesis.go @@ -3,8 +3,8 @@ package utils import ( "fmt" - "github.com/forbole/juno/v3/node" - "github.com/forbole/juno/v3/types/config" + "github.com/forbole/juno/v4/node" + "github.com/forbole/juno/v4/types/config" tmjson "github.com/tendermint/tendermint/libs/json" tmos "github.com/tendermint/tendermint/libs/os" tmtypes "github.com/tendermint/tendermint/types" diff --git a/utils/node.go b/utils/node.go index e4de56247..01c3a0744 100644 --- a/utils/node.go +++ b/utils/node.go @@ -3,7 +3,7 @@ package utils import ( "fmt" - "github.com/forbole/juno/v3/node" + "github.com/forbole/juno/v4/node" coretypes "github.com/tendermint/tendermint/rpc/core/types" ) From 0ee50ecadcc636ecb7b2a1b5919c7f50891d87e9 Mon Sep 17 00:00:00 2001 From: Magic Cat Date: Wed, 8 Feb 2023 13:50:45 +0700 Subject: [PATCH 03/11] updated bdjuno paths to v4 --- cmd/bdjuno/main.go | 10 ++--- cmd/migrate/cmd.go | 2 +- cmd/migrate/v3/migrate.go | 2 +- cmd/migrate/v3/types.go | 2 +- cmd/parse/auth/vesting.go | 6 +-- cmd/parse/bank/supply.go | 6 +-- cmd/parse/distribution/communitypool.go | 6 +-- cmd/parse/feegrant/allowance.go | 6 +-- cmd/parse/gov/proposal.go | 16 ++++---- cmd/parse/mint/inflation.go | 6 +-- cmd/parse/parse.go | 16 ++++---- cmd/parse/pricefeed/price.go | 4 +- cmd/parse/pricefeed/pricehistory.go | 4 +- cmd/parse/staking/staking.go | 6 +-- cmd/parse/staking/validators.go | 6 +-- database/auth.go | 6 +-- database/auth_test.go | 4 +- database/bank.go | 2 +- database/bank_test.go | 4 +- database/consensus.go | 4 +- database/consensus_test.go | 4 +- database/database_test.go | 4 +- database/distribution.go | 4 +- database/distribution_test.go | 6 +-- database/feegrant.go | 2 +- database/feegrant_test.go | 4 +- database/gov.go | 4 +- database/gov_test.go | 6 +-- database/mint.go | 2 +- database/mint_test.go | 4 +- database/pricefeed.go | 4 +- database/pricefeed_test.go | 4 +- database/slashing.go | 2 +- database/slashing_test.go | 4 +- database/staking_params.go | 4 +- database/staking_params_test.go | 4 +- database/staking_pool.go | 2 +- database/staking_pool_test.go | 4 +- database/staking_validators.go | 4 +- database/staking_validators_test.go | 4 +- database/utils/bank.go | 2 +- database/utils_test.go | 2 +- go.mod | 2 +- .../actions/handle_additional_operations.go | 4 +- modules/actions/handlers/account_balance.go | 2 +- modules/actions/handlers/delegation.go | 2 +- modules/actions/handlers/delegation_total.go | 2 +- modules/actions/handlers/delegator_reward.go | 2 +- .../handlers/delegator_withdraw_address.go | 2 +- modules/actions/handlers/redelegation.go | 2 +- .../handlers/unbonding_delegation_total.go | 2 +- .../actions/handlers/unbonding_delegations.go | 2 +- .../actions/handlers/validator_commission.go | 2 +- .../actions/handlers/validator_delegation.go | 2 +- .../handlers/validator_redelegations_from.go | 2 +- .../validator_unbonding_delegations.go | 2 +- modules/actions/module.go | 2 +- modules/actions/types/handler.go | 2 +- modules/actions/types/worker.go | 2 +- modules/auth/auth_accounts.go | 2 +- modules/auth/handle_msg.go | 4 +- modules/auth/module.go | 2 +- modules/bank/handle_periodic_operations.go | 2 +- modules/bank/module.go | 4 +- modules/bank/source/local/source.go | 4 +- modules/bank/source/remote/source.go | 4 +- modules/bank/source/remote/source_actions.go | 2 +- modules/bank/source/source.go | 2 +- modules/consensus/handle_genesis.go | 2 +- .../consensus/handle_periodic_operations.go | 2 +- modules/consensus/module.go | 2 +- modules/daily_refetch/module.go | 2 +- modules/distribution/handle_genesis.go | 2 +- .../handle_periodic_operations.go | 2 +- modules/distribution/module.go | 4 +- modules/distribution/source/local/source.go | 2 +- modules/distribution/source/remote/source.go | 2 +- .../source/remote/source_actions.go | 2 +- modules/distribution/utils_params.go | 2 +- modules/feegrant/handle_block.go | 2 +- modules/feegrant/handle_msg.go | 2 +- modules/feegrant/module.go | 2 +- modules/gov/expected_modules.go | 2 +- modules/gov/handle_genesis.go | 2 +- modules/gov/handle_msg.go | 2 +- modules/gov/module.go | 4 +- modules/gov/source/local/source.go | 2 +- modules/gov/source/remote/source.go | 2 +- modules/gov/utils_params.go | 2 +- modules/gov/utils_proposal.go | 2 +- modules/mint/handle_genesis.go | 2 +- modules/mint/handle_periodic_operations.go | 2 +- modules/mint/module.go | 4 +- modules/mint/source/local/source.go | 2 +- modules/mint/source/remote/source.go | 2 +- modules/mint/utils_params.go | 2 +- modules/modules/module.go | 2 +- modules/pricefeed/coingecko/apis.go | 2 +- modules/pricefeed/coingecko/apis_test.go | 2 +- modules/pricefeed/config.go | 2 +- .../pricefeed/handle_additional_operations.go | 2 +- .../pricefeed/handle_periodic_operations.go | 6 +-- modules/pricefeed/module.go | 2 +- modules/registrar.go | 38 +++++++++---------- modules/slashing/handle_genesis.go | 2 +- modules/slashing/module.go | 4 +- modules/slashing/source/local/source.go | 2 +- modules/slashing/source/remote/source.go | 2 +- modules/slashing/utils_params.go | 2 +- modules/slashing/utils_signing_info.go | 2 +- modules/staking/handle_block.go | 2 +- modules/staking/handle_genesis.go | 2 +- modules/staking/handle_periodic_operations.go | 2 +- modules/staking/module.go | 4 +- modules/staking/source/local/source.go | 2 +- modules/staking/source/remote/source.go | 2 +- .../staking/source/remote/source_actions.go | 2 +- modules/staking/utils_gentx.go | 4 +- modules/staking/utils_params.go | 2 +- modules/staking/utils_staking_pool.go | 2 +- modules/staking/utils_validators.go | 4 +- modules/types/sources.go | 36 +++++++++--------- modules/upgrade/module.go | 2 +- modules/utils/addresses_test.go | 2 +- types/config/config.go | 2 +- 125 files changed, 231 insertions(+), 231 deletions(-) diff --git a/cmd/bdjuno/main.go b/cmd/bdjuno/main.go index bf8d5c8da..f988f2bac 100644 --- a/cmd/bdjuno/main.go +++ b/cmd/bdjuno/main.go @@ -8,13 +8,13 @@ import ( startcmd "github.com/forbole/juno/v4/cmd/start" "github.com/forbole/juno/v4/modules/messages" - migratecmd "github.com/forbole/bdjuno/v3/cmd/migrate" - parsecmd "github.com/forbole/bdjuno/v3/cmd/parse" + migratecmd "github.com/forbole/bdjuno/v4/cmd/migrate" + parsecmd "github.com/forbole/bdjuno/v4/cmd/parse" - "github.com/forbole/bdjuno/v3/types/config" + "github.com/forbole/bdjuno/v4/types/config" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules" ) func main() { diff --git a/cmd/migrate/cmd.go b/cmd/migrate/cmd.go index c01c45999..4d3b0c784 100644 --- a/cmd/migrate/cmd.go +++ b/cmd/migrate/cmd.go @@ -7,7 +7,7 @@ import ( parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/spf13/cobra" - v3 "github.com/forbole/bdjuno/v3/cmd/migrate/v3" + v3 "github.com/forbole/bdjuno/v4/cmd/migrate/v3" ) type Migrator func(parseCfg *parsecmdtypes.Config) error diff --git a/cmd/migrate/v3/migrate.go b/cmd/migrate/v3/migrate.go index 2c8c8f1e9..8a76b562f 100644 --- a/cmd/migrate/v3/migrate.go +++ b/cmd/migrate/v3/migrate.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "github.com/forbole/bdjuno/v3/modules/actions" + "github.com/forbole/bdjuno/v4/modules/actions" parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" diff --git a/cmd/migrate/v3/types.go b/cmd/migrate/v3/types.go index f0fc2f430..98b84a28e 100644 --- a/cmd/migrate/v3/types.go +++ b/cmd/migrate/v3/types.go @@ -3,7 +3,7 @@ package v3 import ( v3 "github.com/forbole/juno/v4/cmd/migrate/v3" - "github.com/forbole/bdjuno/v3/modules/actions" + "github.com/forbole/bdjuno/v4/modules/actions" ) type Config struct { diff --git a/cmd/parse/auth/vesting.go b/cmd/parse/auth/vesting.go index 7d59264f9..d24ded4bd 100644 --- a/cmd/parse/auth/vesting.go +++ b/cmd/parse/auth/vesting.go @@ -8,9 +8,9 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - authutils "github.com/forbole/bdjuno/v3/modules/auth" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/database" + authutils "github.com/forbole/bdjuno/v4/modules/auth" + "github.com/forbole/bdjuno/v4/utils" ) // vestingCmd returns a Cobra command that allows to fix the vesting data for the accounts diff --git a/cmd/parse/bank/supply.go b/cmd/parse/bank/supply.go index 062622b3f..def846b62 100644 --- a/cmd/parse/bank/supply.go +++ b/cmd/parse/bank/supply.go @@ -3,14 +3,14 @@ package bank import ( "fmt" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/bank" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/bank" ) // supplyCmd returns the Cobra command allowing to refresh x/bank total supply diff --git a/cmd/parse/distribution/communitypool.go b/cmd/parse/distribution/communitypool.go index 6ecee2222..1e0b60a33 100644 --- a/cmd/parse/distribution/communitypool.go +++ b/cmd/parse/distribution/communitypool.go @@ -7,9 +7,9 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/distribution" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/distribution" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) // communityPoolCmd returns the Cobra command allowing to refresh community pool diff --git a/cmd/parse/feegrant/allowance.go b/cmd/parse/feegrant/allowance.go index b3033aed4..79664fdf3 100644 --- a/cmd/parse/feegrant/allowance.go +++ b/cmd/parse/feegrant/allowance.go @@ -7,12 +7,12 @@ import ( parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/forbole/juno/v4/types/config" - "github.com/forbole/bdjuno/v3/modules/feegrant" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/modules/feegrant" + "github.com/forbole/bdjuno/v4/utils" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "sort" diff --git a/cmd/parse/gov/proposal.go b/cmd/parse/gov/proposal.go index 2c7a869fa..2dbc714d7 100644 --- a/cmd/parse/gov/proposal.go +++ b/cmd/parse/gov/proposal.go @@ -6,18 +6,18 @@ import ( "strconv" "time" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" "github.com/rs/zerolog/log" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/distribution" - "github.com/forbole/bdjuno/v3/modules/gov" - "github.com/forbole/bdjuno/v3/modules/mint" - "github.com/forbole/bdjuno/v3/modules/slashing" - "github.com/forbole/bdjuno/v3/modules/staking" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/distribution" + "github.com/forbole/bdjuno/v4/modules/gov" + "github.com/forbole/bdjuno/v4/modules/mint" + "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" diff --git a/cmd/parse/mint/inflation.go b/cmd/parse/mint/inflation.go index 5ae99f0c1..213f5ab6c 100644 --- a/cmd/parse/mint/inflation.go +++ b/cmd/parse/mint/inflation.go @@ -7,9 +7,9 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/mint" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/mint" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) // inflationCmd returns the Cobra command allowing to refresh x/mint inflation diff --git a/cmd/parse/parse.go b/cmd/parse/parse.go index 4211eddb3..f922b1a44 100644 --- a/cmd/parse/parse.go +++ b/cmd/parse/parse.go @@ -8,14 +8,14 @@ import ( parsegenesis "github.com/forbole/juno/v4/cmd/parse/genesis" - parseauth "github.com/forbole/bdjuno/v3/cmd/parse/auth" - parsebank "github.com/forbole/bdjuno/v3/cmd/parse/bank" - parsedistribution "github.com/forbole/bdjuno/v3/cmd/parse/distribution" - parsefeegrant "github.com/forbole/bdjuno/v3/cmd/parse/feegrant" - parsegov "github.com/forbole/bdjuno/v3/cmd/parse/gov" - parsemint "github.com/forbole/bdjuno/v3/cmd/parse/mint" - parsepricefeed "github.com/forbole/bdjuno/v3/cmd/parse/pricefeed" - parsestaking "github.com/forbole/bdjuno/v3/cmd/parse/staking" + parseauth "github.com/forbole/bdjuno/v4/cmd/parse/auth" + parsebank "github.com/forbole/bdjuno/v4/cmd/parse/bank" + parsedistribution "github.com/forbole/bdjuno/v4/cmd/parse/distribution" + parsefeegrant "github.com/forbole/bdjuno/v4/cmd/parse/feegrant" + parsegov "github.com/forbole/bdjuno/v4/cmd/parse/gov" + 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" parsetransaction "github.com/forbole/juno/v4/cmd/parse/transactions" ) diff --git a/cmd/parse/pricefeed/price.go b/cmd/parse/pricefeed/price.go index 51e9b06b6..9d7228f14 100644 --- a/cmd/parse/pricefeed/price.go +++ b/cmd/parse/pricefeed/price.go @@ -7,8 +7,8 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/pricefeed" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/pricefeed" ) // priceCmd returns the Cobra command allowing to refresh token price diff --git a/cmd/parse/pricefeed/pricehistory.go b/cmd/parse/pricefeed/pricehistory.go index 4d9b0994e..112990f96 100644 --- a/cmd/parse/pricefeed/pricehistory.go +++ b/cmd/parse/pricefeed/pricehistory.go @@ -7,8 +7,8 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/pricefeed" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/pricefeed" ) // priceHistoryCmd returns the Cobra command allowing to store token price history diff --git a/cmd/parse/staking/staking.go b/cmd/parse/staking/staking.go index 074f4c5bf..cbfc9834b 100644 --- a/cmd/parse/staking/staking.go +++ b/cmd/parse/staking/staking.go @@ -7,9 +7,9 @@ import ( "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/staking" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/staking" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) // poolCmd returns the Cobra command allowing to refresh x/staking pool diff --git a/cmd/parse/staking/validators.go b/cmd/parse/staking/validators.go index 2e84c57c6..b6ecb770f 100644 --- a/cmd/parse/staking/validators.go +++ b/cmd/parse/staking/validators.go @@ -3,14 +3,14 @@ package staking import ( "fmt" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" "github.com/forbole/juno/v4/types/config" "github.com/spf13/cobra" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/staking" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/staking" ) // validatorsCmd returns a Cobra command that allows to fix the validator infos for all validators. diff --git a/database/auth.go b/database/auth.go index b66b8cfd4..8084b3d09 100644 --- a/database/auth.go +++ b/database/auth.go @@ -9,10 +9,10 @@ import ( "github.com/gogo/protobuf/proto" "github.com/lib/pq" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - dbutils "github.com/forbole/bdjuno/v3/database/utils" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + dbutils "github.com/forbole/bdjuno/v4/database/utils" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveAccounts saves the given accounts inside the database diff --git a/database/auth_test.go b/database/auth_test.go index 22a3a225e..e4ad0ee2b 100644 --- a/database/auth_test.go +++ b/database/auth_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authttypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestSaveAccount() { diff --git a/database/bank.go b/database/bank.go index af94199e5..fc1e9519d 100644 --- a/database/bank.go +++ b/database/bank.go @@ -3,7 +3,7 @@ package database import ( "fmt" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/lib/pq" diff --git a/database/bank_test.go b/database/bank_test.go index 2687fa2d4..28edd87eb 100644 --- a/database/bank_test.go +++ b/database/bank_test.go @@ -3,9 +3,9 @@ package database_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" - bddbtypes "github.com/forbole/bdjuno/v3/database/types" + bddbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveSupply() { diff --git a/database/consensus.go b/database/consensus.go index 0845ded0d..556c8c8a1 100644 --- a/database/consensus.go +++ b/database/consensus.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) // GetLastBlock returns the last block stored inside the database based on the heights diff --git a/database/consensus_test.go b/database/consensus_test.go index ee29fe4b1..2511e47aa 100644 --- a/database/consensus_test.go +++ b/database/consensus_test.go @@ -3,8 +3,8 @@ package database_test import ( time "time" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - "github.com/forbole/bdjuno/v3/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + "github.com/forbole/bdjuno/v4/types" ) func (suite *DbTestSuite) TestSaveConsensus_GetBlockHeightTimeMinuteAgo() { diff --git a/database/database_test.go b/database/database_test.go index 8ca1b5d0f..5e42682d0 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -14,8 +14,8 @@ import ( junodb "github.com/forbole/juno/v4/database" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/types" juno "github.com/forbole/juno/v4/types" diff --git a/database/distribution.go b/database/distribution.go index 996fb9ed5..750f503a0 100644 --- a/database/distribution.go +++ b/database/distribution.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/lib/pq" diff --git a/database/distribution_test.go b/database/distribution_test.go index 29eeef135..6aa4f7bab 100644 --- a/database/distribution_test.go +++ b/database/distribution_test.go @@ -5,12 +5,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - bddbtypes "github.com/forbole/bdjuno/v3/database/types" + bddbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveCommunityPool() { diff --git a/database/feegrant.go b/database/feegrant.go index c1fbbfac6..9ffaf4286 100644 --- a/database/feegrant.go +++ b/database/feegrant.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveFeeGrantAllowance allows to store the fee grant allowances for the given block height diff --git a/database/feegrant_test.go b/database/feegrant_test.go index 950199156..3b73641cb 100644 --- a/database/feegrant_test.go +++ b/database/feegrant_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - "github.com/forbole/bdjuno/v3/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + "github.com/forbole/bdjuno/v4/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveFeeGrantAllowance() { diff --git a/database/gov.go b/database/gov.go index 6d52d1c4b..af50592d0 100644 --- a/database/gov.go +++ b/database/gov.go @@ -11,9 +11,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/lib/pq" diff --git a/database/gov_test.go b/database/gov_test.go index bdc612c20..3d1ae88c0 100644 --- a/database/gov_test.go +++ b/database/gov_test.go @@ -10,13 +10,13 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" 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" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { @@ -965,4 +965,4 @@ func (suite *DbTestSuite) TestBigDipperDb_CheckSoftwareUpgradePlan() { exist, err = suite.database.CheckSoftwareUpgradePlan(11) suite.Require().NoError(err) suite.Require().Equal(false, exist) -} \ No newline at end of file +} diff --git a/database/mint.go b/database/mint.go index cb6a43878..ef080eef1 100644 --- a/database/mint.go +++ b/database/mint.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveInflation allows to store the inflation for the given block height as well as timestamp diff --git a/database/mint_test.go b/database/mint_test.go index b3fc44f09..d55d2a556 100644 --- a/database/mint_test.go +++ b/database/mint_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveInflation() { diff --git a/database/pricefeed.go b/database/pricefeed.go index 3a9b03e81..aca814382 100644 --- a/database/pricefeed.go +++ b/database/pricefeed.go @@ -3,9 +3,9 @@ package database import ( "fmt" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" "github.com/lib/pq" ) diff --git a/database/pricefeed_test.go b/database/pricefeed_test.go index c68af4fb5..a246df41c 100644 --- a/database/pricefeed_test.go +++ b/database/pricefeed_test.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) insertToken(name string) { diff --git a/database/slashing.go b/database/slashing.go index 57ad015d1..55a4bbeda 100644 --- a/database/slashing.go +++ b/database/slashing.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveValidatorsSigningInfos saves the given infos inside the database diff --git a/database/slashing_test.go b/database/slashing_test.go index 895d1db3c..ed0e85c85 100644 --- a/database/slashing_test.go +++ b/database/slashing_test.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_ValidatorSigningInfo() { diff --git a/database/staking_params.go b/database/staking_params.go index 6b31537ac..f6e5924a0 100644 --- a/database/staking_params.go +++ b/database/staking_params.go @@ -6,8 +6,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - "github.com/forbole/bdjuno/v3/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveStakingParams allows to store the given params into the database diff --git a/database/staking_params_test.go b/database/staking_params_test.go index e8f8af514..849ee4734 100644 --- a/database/staking_params_test.go +++ b/database/staking_params_test.go @@ -7,8 +7,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" sdk "github.com/cosmos/cosmos-sdk/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - "github.com/forbole/bdjuno/v3/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + "github.com/forbole/bdjuno/v4/types" ) func (suite *DbTestSuite) TestSaveStakingParams() { diff --git a/database/staking_pool.go b/database/staking_pool.go index 1d59dfaa1..0e2d83bf9 100644 --- a/database/staking_pool.go +++ b/database/staking_pool.go @@ -3,7 +3,7 @@ package database import ( "fmt" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // SaveStakingPool allows to save for the given height the given stakingtypes pool diff --git a/database/staking_pool_test.go b/database/staking_pool_test.go index 49b13f7b4..ceaeecd55 100644 --- a/database/staking_pool_test.go +++ b/database/staking_pool_test.go @@ -3,8 +3,8 @@ package database_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" - "github.com/forbole/bdjuno/v3/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" + "github.com/forbole/bdjuno/v4/types" ) func (suite *DbTestSuite) TestBigDipperDb_SaveStakingPool() { diff --git a/database/staking_validators.go b/database/staking_validators.go index 8e56e42b9..04043cf1a 100644 --- a/database/staking_validators.go +++ b/database/staking_validators.go @@ -3,9 +3,9 @@ package database import ( "fmt" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/database/staking_validators_test.go b/database/staking_validators_test.go index cf1455fad..3fce81e5e 100644 --- a/database/staking_validators_test.go +++ b/database/staking_validators_test.go @@ -3,12 +3,12 @@ package database_test import ( tmtypes "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - dbtypes "github.com/forbole/bdjuno/v3/database/types" + dbtypes "github.com/forbole/bdjuno/v4/database/types" ) func newDecPts(value int64, prec int64) *sdk.Dec { diff --git a/database/utils/bank.go b/database/utils/bank.go index 470fedac8..5a0af8bb7 100644 --- a/database/utils/bank.go +++ b/database/utils/bank.go @@ -1,6 +1,6 @@ package utils -import "github.com/forbole/bdjuno/v3/types" +import "github.com/forbole/bdjuno/v4/types" const ( maxPostgreSQLParams = 65535 diff --git a/database/utils_test.go b/database/utils_test.go index 599d0dfa8..99600801c 100644 --- a/database/utils_test.go +++ b/database/utils_test.go @@ -1,7 +1,7 @@ package database_test import ( - "github.com/forbole/bdjuno/v3/database/types" + "github.com/forbole/bdjuno/v4/database/types" ) func (suite *DbTestSuite) TestBigDipperDb_InsertEnableModules() { diff --git a/go.mod b/go.mod index e2f0a4adc..e4759c825 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/forbole/bdjuno/v3 +module github.com/forbole/bdjuno/v4 go 1.19 diff --git a/modules/actions/handle_additional_operations.go b/modules/actions/handle_additional_operations.go index 5a6cd0a34..e555de208 100644 --- a/modules/actions/handle_additional_operations.go +++ b/modules/actions/handle_additional_operations.go @@ -6,8 +6,8 @@ import ( "sync" "syscall" - "github.com/forbole/bdjuno/v3/modules/actions/handlers" - actionstypes "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/handlers" + actionstypes "github.com/forbole/bdjuno/v4/modules/actions/types" ) var ( diff --git a/modules/actions/handlers/account_balance.go b/modules/actions/handlers/account_balance.go index ed572a748..8aa693ad4 100644 --- a/modules/actions/handlers/account_balance.go +++ b/modules/actions/handlers/account_balance.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/delegation.go b/modules/actions/handlers/delegation.go index 20513a012..c0f7d98f9 100644 --- a/modules/actions/handlers/delegation.go +++ b/modules/actions/handlers/delegation.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "google.golang.org/grpc/codes" diff --git a/modules/actions/handlers/delegation_total.go b/modules/actions/handlers/delegation_total.go index 091c5fad4..b6d81083b 100644 --- a/modules/actions/handlers/delegation_total.go +++ b/modules/actions/handlers/delegation_total.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/rs/zerolog/log" diff --git a/modules/actions/handlers/delegator_reward.go b/modules/actions/handlers/delegator_reward.go index 7039e0882..0eb29f16e 100644 --- a/modules/actions/handlers/delegator_reward.go +++ b/modules/actions/handlers/delegator_reward.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/delegator_withdraw_address.go b/modules/actions/handlers/delegator_withdraw_address.go index 516cff0d3..92debf01e 100644 --- a/modules/actions/handlers/delegator_withdraw_address.go +++ b/modules/actions/handlers/delegator_withdraw_address.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/redelegation.go b/modules/actions/handlers/redelegation.go index 891d9f562..5334ca3a5 100644 --- a/modules/actions/handlers/redelegation.go +++ b/modules/actions/handlers/redelegation.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/rs/zerolog/log" diff --git a/modules/actions/handlers/unbonding_delegation_total.go b/modules/actions/handlers/unbonding_delegation_total.go index d61f3bca4..6f79fdd32 100644 --- a/modules/actions/handlers/unbonding_delegation_total.go +++ b/modules/actions/handlers/unbonding_delegation_total.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/unbonding_delegations.go b/modules/actions/handlers/unbonding_delegations.go index 1764759a6..bdd227609 100644 --- a/modules/actions/handlers/unbonding_delegations.go +++ b/modules/actions/handlers/unbonding_delegations.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/validator_commission.go b/modules/actions/handlers/validator_commission.go index 86340bf30..7a1ece22b 100644 --- a/modules/actions/handlers/validator_commission.go +++ b/modules/actions/handlers/validator_commission.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/handlers/validator_delegation.go b/modules/actions/handlers/validator_delegation.go index 344826588..bb3598c88 100644 --- a/modules/actions/handlers/validator_delegation.go +++ b/modules/actions/handlers/validator_delegation.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/rs/zerolog/log" diff --git a/modules/actions/handlers/validator_redelegations_from.go b/modules/actions/handlers/validator_redelegations_from.go index c51708230..d04f8608e 100644 --- a/modules/actions/handlers/validator_redelegations_from.go +++ b/modules/actions/handlers/validator_redelegations_from.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/rs/zerolog/log" diff --git a/modules/actions/handlers/validator_unbonding_delegations.go b/modules/actions/handlers/validator_unbonding_delegations.go index 161afc4d6..be6258655 100644 --- a/modules/actions/handlers/validator_unbonding_delegations.go +++ b/modules/actions/handlers/validator_unbonding_delegations.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/forbole/bdjuno/v3/modules/actions/types" + "github.com/forbole/bdjuno/v4/modules/actions/types" "github.com/rs/zerolog/log" ) diff --git a/modules/actions/module.go b/modules/actions/module.go index 8c7b52c96..7726ad665 100644 --- a/modules/actions/module.go +++ b/modules/actions/module.go @@ -8,7 +8,7 @@ import ( nodeconfig "github.com/forbole/juno/v4/node/config" "github.com/forbole/juno/v4/types/config" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) const ( diff --git a/modules/actions/types/handler.go b/modules/actions/types/handler.go index c452d59e1..b16518e73 100644 --- a/modules/actions/types/handler.go +++ b/modules/actions/types/handler.go @@ -5,7 +5,7 @@ import ( "github.com/forbole/juno/v4/node" - modulestypes "github.com/forbole/bdjuno/v3/modules/types" + modulestypes "github.com/forbole/bdjuno/v4/modules/types" ) // Context contains the data about a Hasura actions worker execution diff --git a/modules/actions/types/worker.go b/modules/actions/types/worker.go index c14db03f3..71e03145e 100644 --- a/modules/actions/types/worker.go +++ b/modules/actions/types/worker.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/forbole/bdjuno/v3/modules/actions/logging" + "github.com/forbole/bdjuno/v4/modules/actions/logging" "github.com/rs/zerolog/log" ) diff --git a/modules/auth/auth_accounts.go b/modules/auth/auth_accounts.go index e7fad5d43..63c869f5b 100644 --- a/modules/auth/auth_accounts.go +++ b/modules/auth/auth_accounts.go @@ -7,7 +7,7 @@ import ( authttypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // GetGenesisAccounts parses the given appState and returns the genesis accounts diff --git a/modules/auth/handle_msg.go b/modules/auth/handle_msg.go index 390dd7292..3b481a44c 100644 --- a/modules/auth/handle_msg.go +++ b/modules/auth/handle_msg.go @@ -12,8 +12,8 @@ import ( authttypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/forbole/bdjuno/v3/modules/utils" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/modules/utils" + "github.com/forbole/bdjuno/v4/types" ) // HandleMsg implements modules.MessageModule diff --git a/modules/auth/module.go b/modules/auth/module.go index 1dcb4975a..c0855a511 100644 --- a/modules/auth/module.go +++ b/modules/auth/module.go @@ -3,7 +3,7 @@ package auth import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" "github.com/forbole/juno/v4/modules/messages" diff --git a/modules/bank/handle_periodic_operations.go b/modules/bank/handle_periodic_operations.go index f15ebba16..856b3bb17 100644 --- a/modules/bank/handle_periodic_operations.go +++ b/modules/bank/handle_periodic_operations.go @@ -6,7 +6,7 @@ import ( "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" ) // RegisterPeriodicOperations implements modules.Module diff --git a/modules/bank/module.go b/modules/bank/module.go index 73b0b3241..83544c316 100644 --- a/modules/bank/module.go +++ b/modules/bank/module.go @@ -3,8 +3,8 @@ package bank import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/bank/source" + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/bank/source" junomessages "github.com/forbole/juno/v4/modules/messages" diff --git a/modules/bank/source/local/source.go b/modules/bank/source/local/source.go index b4a49af71..284bb431a 100644 --- a/modules/bank/source/local/source.go +++ b/modules/bank/source/local/source.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/forbole/juno/v4/node/local" - "github.com/forbole/bdjuno/v3/modules/bank/source" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/modules/bank/source" + "github.com/forbole/bdjuno/v4/types" ) var ( diff --git a/modules/bank/source/remote/source.go b/modules/bank/source/remote/source.go index d29338c74..f359d8604 100644 --- a/modules/bank/source/remote/source.go +++ b/modules/bank/source/remote/source.go @@ -8,8 +8,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/forbole/juno/v4/node/remote" - bankkeeper "github.com/forbole/bdjuno/v3/modules/bank/source" - "github.com/forbole/bdjuno/v3/types" + bankkeeper "github.com/forbole/bdjuno/v4/modules/bank/source" + "github.com/forbole/bdjuno/v4/types" ) var ( diff --git a/modules/bank/source/remote/source_actions.go b/modules/bank/source/remote/source_actions.go index 343e1838a..f2a0efae7 100644 --- a/modules/bank/source/remote/source_actions.go +++ b/modules/bank/source/remote/source_actions.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/utils" ) // GetAccountBalances implements bankkeeper.Source diff --git a/modules/bank/source/source.go b/modules/bank/source/source.go index 905d32448..a1a2ac9a4 100644 --- a/modules/bank/source/source.go +++ b/modules/bank/source/source.go @@ -3,7 +3,7 @@ package source import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) type Source interface { diff --git a/modules/consensus/handle_genesis.go b/modules/consensus/handle_genesis.go index 0dd28cf60..2e434c34c 100644 --- a/modules/consensus/handle_genesis.go +++ b/modules/consensus/handle_genesis.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" "github.com/rs/zerolog/log" tmtypes "github.com/tendermint/tendermint/types" diff --git a/modules/consensus/handle_periodic_operations.go b/modules/consensus/handle_periodic_operations.go index c7ea64282..4f39023cf 100644 --- a/modules/consensus/handle_periodic_operations.go +++ b/modules/consensus/handle_periodic_operations.go @@ -6,7 +6,7 @@ import ( "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" ) // RegisterPeriodicOperations implements modules.Module diff --git a/modules/consensus/module.go b/modules/consensus/module.go index 298b2a8f8..df96853c7 100644 --- a/modules/consensus/module.go +++ b/modules/consensus/module.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/daily_refetch/module.go b/modules/daily_refetch/module.go index 21a807f6d..7918a8b20 100644 --- a/modules/daily_refetch/module.go +++ b/modules/daily_refetch/module.go @@ -3,7 +3,7 @@ package daily_refetch import ( "github.com/forbole/juno/v4/node" - bdjunodb "github.com/forbole/bdjuno/v3/database" + bdjunodb "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/distribution/handle_genesis.go b/modules/distribution/handle_genesis.go index 34915d71a..6a1d6f871 100644 --- a/modules/distribution/handle_genesis.go +++ b/modules/distribution/handle_genesis.go @@ -6,7 +6,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/rs/zerolog/log" diff --git a/modules/distribution/handle_periodic_operations.go b/modules/distribution/handle_periodic_operations.go index 0e70c025c..38ff5e50e 100644 --- a/modules/distribution/handle_periodic_operations.go +++ b/modules/distribution/handle_periodic_operations.go @@ -6,7 +6,7 @@ import ( "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" ) // RegisterPeriodicOperations implements modules.PeriodicOperationsModule diff --git a/modules/distribution/module.go b/modules/distribution/module.go index 32cf41892..af439ba71 100644 --- a/modules/distribution/module.go +++ b/modules/distribution/module.go @@ -3,11 +3,11 @@ package distribution import ( "github.com/cosmos/cosmos-sdk/codec" - distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" + distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" "github.com/forbole/juno/v4/modules" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" ) var ( diff --git a/modules/distribution/source/local/source.go b/modules/distribution/source/local/source.go index 6004f067a..9e5ed9997 100644 --- a/modules/distribution/source/local/source.go +++ b/modules/distribution/source/local/source.go @@ -7,7 +7,7 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/forbole/juno/v4/node/local" - distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" + distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" ) var ( diff --git a/modules/distribution/source/remote/source.go b/modules/distribution/source/remote/source.go index 4dba178fe..610b957fb 100644 --- a/modules/distribution/source/remote/source.go +++ b/modules/distribution/source/remote/source.go @@ -5,7 +5,7 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/forbole/juno/v4/node/remote" - distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" + distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" ) var ( diff --git a/modules/distribution/source/remote/source_actions.go b/modules/distribution/source/remote/source_actions.go index a4d7a79ac..0c5c25b1c 100644 --- a/modules/distribution/source/remote/source_actions.go +++ b/modules/distribution/source/remote/source_actions.go @@ -7,7 +7,7 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/forbole/juno/v4/node/remote" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/utils" ) // DelegatorTotalRewards implements distrsource.Source diff --git a/modules/distribution/utils_params.go b/modules/distribution/utils_params.go index 4350d6860..fbbf53213 100644 --- a/modules/distribution/utils_params.go +++ b/modules/distribution/utils_params.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // UpdateParams gets the updated params and stores them inside the database diff --git a/modules/feegrant/handle_block.go b/modules/feegrant/handle_block.go index 32ddf2c48..3041fa7f7 100644 --- a/modules/feegrant/handle_block.go +++ b/modules/feegrant/handle_block.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" tmctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // HandleBlock implements BlockModule diff --git a/modules/feegrant/handle_msg.go b/modules/feegrant/handle_msg.go index 4b221a408..bc788a807 100644 --- a/modules/feegrant/handle_msg.go +++ b/modules/feegrant/handle_msg.go @@ -7,7 +7,7 @@ import ( feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" juno "github.com/forbole/juno/v4/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // HandleMsg implements modules.MessageModule diff --git a/modules/feegrant/module.go b/modules/feegrant/module.go index 438a01496..bb68d1a16 100644 --- a/modules/feegrant/module.go +++ b/modules/feegrant/module.go @@ -3,7 +3,7 @@ package feegrant import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/gov/expected_modules.go b/modules/gov/expected_modules.go index 7a22e1f00..9e8f02ba8 100644 --- a/modules/gov/expected_modules.go +++ b/modules/gov/expected_modules.go @@ -4,7 +4,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) type AuthModule interface { diff --git a/modules/gov/handle_genesis.go b/modules/gov/handle_genesis.go index abf47a517..07ab39ead 100644 --- a/modules/gov/handle_genesis.go +++ b/modules/gov/handle_genesis.go @@ -6,7 +6,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" gov "github.com/cosmos/cosmos-sdk/x/gov/types" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" diff --git a/modules/gov/handle_msg.go b/modules/gov/handle_msg.go index b1ce5648e..200fb2272 100644 --- a/modules/gov/handle_msg.go +++ b/modules/gov/handle_msg.go @@ -6,7 +6,7 @@ import ( "strconv" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" diff --git a/modules/gov/module.go b/modules/gov/module.go index ea9c3bb4a..dbad7e3ec 100644 --- a/modules/gov/module.go +++ b/modules/gov/module.go @@ -3,9 +3,9 @@ package gov import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" - govsource "github.com/forbole/bdjuno/v3/modules/gov/source" + govsource "github.com/forbole/bdjuno/v4/modules/gov/source" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/gov/source/local/source.go b/modules/gov/source/local/source.go index 722207f07..1246dfac8 100644 --- a/modules/gov/source/local/source.go +++ b/modules/gov/source/local/source.go @@ -9,7 +9,7 @@ import ( "github.com/forbole/juno/v4/node/local" - govsource "github.com/forbole/bdjuno/v3/modules/gov/source" + govsource "github.com/forbole/bdjuno/v4/modules/gov/source" ) var ( diff --git a/modules/gov/source/remote/source.go b/modules/gov/source/remote/source.go index d4d38d2ce..db0330471 100644 --- a/modules/gov/source/remote/source.go +++ b/modules/gov/source/remote/source.go @@ -5,7 +5,7 @@ import ( "github.com/forbole/juno/v4/node/remote" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - govsource "github.com/forbole/bdjuno/v3/modules/gov/source" + govsource "github.com/forbole/bdjuno/v4/modules/gov/source" ) var ( diff --git a/modules/gov/utils_params.go b/modules/gov/utils_params.go index 4ef633857..0c82ca53d 100644 --- a/modules/gov/utils_params.go +++ b/modules/gov/utils_params.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // UpdateParams updates the governance parameters for the given height diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index 45bedcb09..393c2a5b0 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -14,7 +14,7 @@ import ( tmctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" diff --git a/modules/mint/handle_genesis.go b/modules/mint/handle_genesis.go index 67d54f6f6..aa671dbc0 100644 --- a/modules/mint/handle_genesis.go +++ b/modules/mint/handle_genesis.go @@ -6,7 +6,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/rs/zerolog/log" diff --git a/modules/mint/handle_periodic_operations.go b/modules/mint/handle_periodic_operations.go index fe61cd240..725f048b5 100644 --- a/modules/mint/handle_periodic_operations.go +++ b/modules/mint/handle_periodic_operations.go @@ -1,7 +1,7 @@ package mint import ( - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" diff --git a/modules/mint/module.go b/modules/mint/module.go index df3051aa4..1440693db 100644 --- a/modules/mint/module.go +++ b/modules/mint/module.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/forbole/juno/v4/modules" - "github.com/forbole/bdjuno/v3/database" - mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" + "github.com/forbole/bdjuno/v4/database" + mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" ) var ( diff --git a/modules/mint/source/local/source.go b/modules/mint/source/local/source.go index 69179273c..ede4e8e97 100644 --- a/modules/mint/source/local/source.go +++ b/modules/mint/source/local/source.go @@ -7,7 +7,7 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/forbole/juno/v4/node/local" - mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" + mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" ) var ( diff --git a/modules/mint/source/remote/source.go b/modules/mint/source/remote/source.go index a05b4c58f..52fba9c4e 100644 --- a/modules/mint/source/remote/source.go +++ b/modules/mint/source/remote/source.go @@ -5,7 +5,7 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/forbole/juno/v4/node/remote" - mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" + mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" ) var ( diff --git a/modules/mint/utils_params.go b/modules/mint/utils_params.go index dbc1b6e43..af4805702 100644 --- a/modules/mint/utils_params.go +++ b/modules/mint/utils_params.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // UpdateParams gets the updated params and stores them inside the database diff --git a/modules/modules/module.go b/modules/modules/module.go index 0d7d036bf..b3b42147a 100644 --- a/modules/modules/module.go +++ b/modules/modules/module.go @@ -4,7 +4,7 @@ import ( "github.com/forbole/juno/v4/modules" "github.com/forbole/juno/v4/types/config" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" ) var ( diff --git a/modules/pricefeed/coingecko/apis.go b/modules/pricefeed/coingecko/apis.go index 539aacbd6..9832d9d23 100644 --- a/modules/pricefeed/coingecko/apis.go +++ b/modules/pricefeed/coingecko/apis.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // GetCoinsList allows to fetch from the remote APIs the list of all the supported tokens diff --git a/modules/pricefeed/coingecko/apis_test.go b/modules/pricefeed/coingecko/apis_test.go index 6f738a554..5164f6f5a 100644 --- a/modules/pricefeed/coingecko/apis_test.go +++ b/modules/pricefeed/coingecko/apis_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/forbole/bdjuno/v3/modules/pricefeed/coingecko" + "github.com/forbole/bdjuno/v4/modules/pricefeed/coingecko" ) func TestConvertCoingeckoPrices(t *testing.T) { diff --git a/modules/pricefeed/config.go b/modules/pricefeed/config.go index 24c5f5ce2..db3819e86 100644 --- a/modules/pricefeed/config.go +++ b/modules/pricefeed/config.go @@ -3,7 +3,7 @@ package pricefeed import ( "gopkg.in/yaml.v3" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // Config contains the configuration about the pricefeed module diff --git a/modules/pricefeed/handle_additional_operations.go b/modules/pricefeed/handle_additional_operations.go index eaa76c0c2..944a2cbb1 100644 --- a/modules/pricefeed/handle_additional_operations.go +++ b/modules/pricefeed/handle_additional_operations.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" "github.com/rs/zerolog/log" ) diff --git a/modules/pricefeed/handle_periodic_operations.go b/modules/pricefeed/handle_periodic_operations.go index 3bec7b855..0b893ffa8 100644 --- a/modules/pricefeed/handle_periodic_operations.go +++ b/modules/pricefeed/handle_periodic_operations.go @@ -7,10 +7,10 @@ import ( "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" - "github.com/forbole/bdjuno/v3/modules/pricefeed/coingecko" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/pricefeed/coingecko" + "github.com/forbole/bdjuno/v4/modules/utils" ) // RegisterPeriodicOperations implements modules.PeriodicOperationsModule diff --git a/modules/pricefeed/module.go b/modules/pricefeed/module.go index 2be0171a8..52a857f6f 100644 --- a/modules/pricefeed/module.go +++ b/modules/pricefeed/module.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/forbole/juno/v4/types/config" - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/registrar.go b/modules/registrar.go index 515842f83..42d5c82ac 100644 --- a/modules/registrar.go +++ b/modules/registrar.go @@ -1,13 +1,13 @@ package modules import ( - "github.com/forbole/bdjuno/v3/modules/actions" - "github.com/forbole/bdjuno/v3/modules/types" + "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/bdjuno/v3/modules/slashing" + "github.com/forbole/bdjuno/v4/modules/slashing" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,22 +15,22 @@ import ( "github.com/forbole/juno/v4/modules/messages" "github.com/forbole/juno/v4/modules/registrar" - "github.com/forbole/bdjuno/v3/utils" - - "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/bdjuno/v3/modules/auth" - "github.com/forbole/bdjuno/v3/modules/bank" - "github.com/forbole/bdjuno/v3/modules/consensus" - "github.com/forbole/bdjuno/v3/modules/distribution" - "github.com/forbole/bdjuno/v3/modules/feegrant" - - dailyrefetch "github.com/forbole/bdjuno/v3/modules/daily_refetch" - "github.com/forbole/bdjuno/v3/modules/gov" - "github.com/forbole/bdjuno/v3/modules/mint" - "github.com/forbole/bdjuno/v3/modules/modules" - "github.com/forbole/bdjuno/v3/modules/pricefeed" - "github.com/forbole/bdjuno/v3/modules/staking" - "github.com/forbole/bdjuno/v3/modules/upgrade" + "github.com/forbole/bdjuno/v4/utils" + + "github.com/forbole/bdjuno/v4/database" + "github.com/forbole/bdjuno/v4/modules/auth" + "github.com/forbole/bdjuno/v4/modules/bank" + "github.com/forbole/bdjuno/v4/modules/consensus" + "github.com/forbole/bdjuno/v4/modules/distribution" + "github.com/forbole/bdjuno/v4/modules/feegrant" + + dailyrefetch "github.com/forbole/bdjuno/v4/modules/daily_refetch" + "github.com/forbole/bdjuno/v4/modules/gov" + "github.com/forbole/bdjuno/v4/modules/mint" + "github.com/forbole/bdjuno/v4/modules/modules" + "github.com/forbole/bdjuno/v4/modules/pricefeed" + "github.com/forbole/bdjuno/v4/modules/staking" + "github.com/forbole/bdjuno/v4/modules/upgrade" ) // UniqueAddressesParser returns a wrapper around the given parser that removes all duplicated addresses diff --git a/modules/slashing/handle_genesis.go b/modules/slashing/handle_genesis.go index a828f16a2..b9e4ed966 100644 --- a/modules/slashing/handle_genesis.go +++ b/modules/slashing/handle_genesis.go @@ -6,7 +6,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/rs/zerolog/log" diff --git a/modules/slashing/module.go b/modules/slashing/module.go index 88d3d646f..5c085ea5a 100644 --- a/modules/slashing/module.go +++ b/modules/slashing/module.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/forbole/juno/v4/modules" - "github.com/forbole/bdjuno/v3/database" - slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" + "github.com/forbole/bdjuno/v4/database" + slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" ) var ( diff --git a/modules/slashing/source/local/source.go b/modules/slashing/source/local/source.go index e2f0e0e93..3f64bc787 100644 --- a/modules/slashing/source/local/source.go +++ b/modules/slashing/source/local/source.go @@ -8,7 +8,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/forbole/juno/v4/node/local" - slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" + slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" ) var ( diff --git a/modules/slashing/source/remote/source.go b/modules/slashing/source/remote/source.go index 2b3340c0d..87e6b5315 100644 --- a/modules/slashing/source/remote/source.go +++ b/modules/slashing/source/remote/source.go @@ -7,7 +7,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/forbole/juno/v4/node/remote" - slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" + slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" ) var ( diff --git a/modules/slashing/utils_params.go b/modules/slashing/utils_params.go index d0103cd2c..1e4c468be 100644 --- a/modules/slashing/utils_params.go +++ b/modules/slashing/utils_params.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // UpdateParams gets the slashing params for the given height, and stores them inside the database diff --git a/modules/slashing/utils_signing_info.go b/modules/slashing/utils_signing_info.go index 39e549e3a..fe07c3154 100644 --- a/modules/slashing/utils_signing_info.go +++ b/modules/slashing/utils_signing_info.go @@ -3,7 +3,7 @@ package slashing import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) func (m *Module) getSigningInfos(height int64) ([]types.ValidatorSigningInfo, error) { diff --git a/modules/staking/handle_block.go b/modules/staking/handle_block.go index 58e3684c3..cf3055154 100644 --- a/modules/staking/handle_block.go +++ b/modules/staking/handle_block.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" juno "github.com/forbole/juno/v4/types" diff --git a/modules/staking/handle_genesis.go b/modules/staking/handle_genesis.go index aef97e9c9..9422d0cc0 100644 --- a/modules/staking/handle_genesis.go +++ b/modules/staking/handle_genesis.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" tmtypes "github.com/tendermint/tendermint/types" diff --git a/modules/staking/handle_periodic_operations.go b/modules/staking/handle_periodic_operations.go index f8621d02b..352ad8cab 100644 --- a/modules/staking/handle_periodic_operations.go +++ b/modules/staking/handle_periodic_operations.go @@ -6,7 +6,7 @@ import ( "github.com/go-co-op/gocron" "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" ) // RegisterPeriodicOperations implements modules.PeriodicOperationsModule diff --git a/modules/staking/module.go b/modules/staking/module.go index 3002fd9ce..9b0903b7f 100644 --- a/modules/staking/module.go +++ b/modules/staking/module.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/forbole/juno/v4/modules" - "github.com/forbole/bdjuno/v3/database" - stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" + "github.com/forbole/bdjuno/v4/database" + stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" ) var ( diff --git a/modules/staking/source/local/source.go b/modules/staking/source/local/source.go index 563afb9ec..0c3b17bff 100644 --- a/modules/staking/source/local/source.go +++ b/modules/staking/source/local/source.go @@ -8,7 +8,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/forbole/juno/v4/node/local" - stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" + stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" ) var ( diff --git a/modules/staking/source/remote/source.go b/modules/staking/source/remote/source.go index 40efd6f79..734a589a8 100644 --- a/modules/staking/source/remote/source.go +++ b/modules/staking/source/remote/source.go @@ -7,7 +7,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/forbole/juno/v4/node/remote" - stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" + stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" ) var ( diff --git a/modules/staking/source/remote/source_actions.go b/modules/staking/source/remote/source_actions.go index b87df6c07..ca2174695 100644 --- a/modules/staking/source/remote/source_actions.go +++ b/modules/staking/source/remote/source_actions.go @@ -5,7 +5,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/forbole/juno/v4/node/remote" - "github.com/forbole/bdjuno/v3/utils" + "github.com/forbole/bdjuno/v4/utils" ) // GetDelegationsWithPagination implements stakingsource.Source diff --git a/modules/staking/utils_gentx.go b/modules/staking/utils_gentx.go index 9b2200e4c..42726c63b 100644 --- a/modules/staking/utils_gentx.go +++ b/modules/staking/utils_gentx.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/bdjuno/v3/modules/staking/keybase" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/modules/staking/keybase" + "github.com/forbole/bdjuno/v4/types" ) // StoreValidatorFromMsgCreateValidator handles properly a MsgCreateValidator instance by diff --git a/modules/staking/utils_params.go b/modules/staking/utils_params.go index 1558597c8..eff89883c 100644 --- a/modules/staking/utils_params.go +++ b/modules/staking/utils_params.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) // UpdateParams gets the updated params and stores them inside the database diff --git a/modules/staking/utils_staking_pool.go b/modules/staking/utils_staking_pool.go index 9164ff6ed..d8a7874f1 100644 --- a/modules/staking/utils_staking_pool.go +++ b/modules/staking/utils_staking_pool.go @@ -6,7 +6,7 @@ import ( 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/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/types" ) func (m *Module) GetStakingPool(height int64) (*types.Pool, error) { diff --git a/modules/staking/utils_validators.go b/modules/staking/utils_validators.go index bb442bf2a..3e218c71c 100644 --- a/modules/staking/utils_validators.go +++ b/modules/staking/utils_validators.go @@ -6,8 +6,8 @@ import ( juno "github.com/forbole/juno/v4/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/forbole/bdjuno/v3/modules/staking/keybase" - "github.com/forbole/bdjuno/v3/types" + "github.com/forbole/bdjuno/v4/modules/staking/keybase" + "github.com/forbole/bdjuno/v4/types" "github.com/rs/zerolog/log" diff --git a/modules/types/sources.go b/modules/types/sources.go index 7a28b31a2..9c3171ad6 100644 --- a/modules/types/sources.go +++ b/modules/types/sources.go @@ -22,24 +22,24 @@ import ( nodeconfig "github.com/forbole/juno/v4/node/config" - banksource "github.com/forbole/bdjuno/v3/modules/bank/source" - localbanksource "github.com/forbole/bdjuno/v3/modules/bank/source/local" - remotebanksource "github.com/forbole/bdjuno/v3/modules/bank/source/remote" - distrsource "github.com/forbole/bdjuno/v3/modules/distribution/source" - localdistrsource "github.com/forbole/bdjuno/v3/modules/distribution/source/local" - remotedistrsource "github.com/forbole/bdjuno/v3/modules/distribution/source/remote" - govsource "github.com/forbole/bdjuno/v3/modules/gov/source" - localgovsource "github.com/forbole/bdjuno/v3/modules/gov/source/local" - remotegovsource "github.com/forbole/bdjuno/v3/modules/gov/source/remote" - mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" - localmintsource "github.com/forbole/bdjuno/v3/modules/mint/source/local" - remotemintsource "github.com/forbole/bdjuno/v3/modules/mint/source/remote" - slashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source" - localslashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source/local" - remoteslashingsource "github.com/forbole/bdjuno/v3/modules/slashing/source/remote" - stakingsource "github.com/forbole/bdjuno/v3/modules/staking/source" - localstakingsource "github.com/forbole/bdjuno/v3/modules/staking/source/local" - remotestakingsource "github.com/forbole/bdjuno/v3/modules/staking/source/remote" + banksource "github.com/forbole/bdjuno/v4/modules/bank/source" + localbanksource "github.com/forbole/bdjuno/v4/modules/bank/source/local" + remotebanksource "github.com/forbole/bdjuno/v4/modules/bank/source/remote" + distrsource "github.com/forbole/bdjuno/v4/modules/distribution/source" + localdistrsource "github.com/forbole/bdjuno/v4/modules/distribution/source/local" + remotedistrsource "github.com/forbole/bdjuno/v4/modules/distribution/source/remote" + govsource "github.com/forbole/bdjuno/v4/modules/gov/source" + localgovsource "github.com/forbole/bdjuno/v4/modules/gov/source/local" + remotegovsource "github.com/forbole/bdjuno/v4/modules/gov/source/remote" + mintsource "github.com/forbole/bdjuno/v4/modules/mint/source" + localmintsource "github.com/forbole/bdjuno/v4/modules/mint/source/local" + remotemintsource "github.com/forbole/bdjuno/v4/modules/mint/source/remote" + slashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source" + localslashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source/local" + remoteslashingsource "github.com/forbole/bdjuno/v4/modules/slashing/source/remote" + stakingsource "github.com/forbole/bdjuno/v4/modules/staking/source" + localstakingsource "github.com/forbole/bdjuno/v4/modules/staking/source/local" + remotestakingsource "github.com/forbole/bdjuno/v4/modules/staking/source/remote" ) type Sources struct { diff --git a/modules/upgrade/module.go b/modules/upgrade/module.go index a04f6b1b4..d4a6c32de 100644 --- a/modules/upgrade/module.go +++ b/modules/upgrade/module.go @@ -1,7 +1,7 @@ package upgrade import ( - "github.com/forbole/bdjuno/v3/database" + "github.com/forbole/bdjuno/v4/database" "github.com/forbole/juno/v4/modules" ) diff --git a/modules/utils/addresses_test.go b/modules/utils/addresses_test.go index 0c3ac8ec5..303f78141 100644 --- a/modules/utils/addresses_test.go +++ b/modules/utils/addresses_test.go @@ -3,7 +3,7 @@ package utils_test import ( "testing" - "github.com/forbole/bdjuno/v3/modules/utils" + "github.com/forbole/bdjuno/v4/modules/utils" "github.com/stretchr/testify/require" ) diff --git a/types/config/config.go b/types/config/config.go index 77220bd95..f3587737c 100644 --- a/types/config/config.go +++ b/types/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v3" - "github.com/forbole/bdjuno/v3/modules/actions" + "github.com/forbole/bdjuno/v4/modules/actions" ) // Config represents the BDJuno configuration From 2bce237c4ce85a0f84f2444312d8fd17f0baf59b Mon Sep 17 00:00:00 2001 From: Magic Cat Date: Wed, 8 Feb 2023 13:54:13 +0700 Subject: [PATCH 04/11] updated migrate cmd desc --- cmd/migrate/cmd.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/migrate/cmd.go b/cmd/migrate/cmd.go index 4d3b0c784..9ab61e008 100644 --- a/cmd/migrate/cmd.go +++ b/cmd/migrate/cmd.go @@ -32,8 +32,7 @@ func NewMigrateCmd(appName string, parseConfig *parsecmdtypes.Config) *cobra.Com Use: "migrate [to-version]", Short: "Perform the migrations from the current version to the specified one", Long: `Migrates all the necessary things (config file, database, etc) from the current version to the new one. -If you are upgrading from a very old version to the latest one, migrations must be performed in order -(eg. to migrate from v1 to v3 you need to do v1 -> v2 and then v2 -> v3). +Note that migrations must be performed in order: to migrate from vX to vX+2 you need to do vX -> vX+1 and then vX+1 -> vX+2. `, Example: fmt.Sprintf("%s migrate v3", appName), Args: cobra.RangeArgs(0, 1), From 50b77c1f5c355c5df048ac012a330d0d77a1b4ab Mon Sep 17 00:00:00 2001 From: Magic Cat Date: Thu, 9 Feb 2023 16:58:13 +0700 Subject: [PATCH 05/11] updated golangci.yaml --- .golangci.yaml | 4 ++++ modules/actions/types/response.go | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.golangci.yaml b/.golangci.yaml index c373821c4..c0b59e6ce 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -51,6 +51,10 @@ issues: - text: "ST1016:" linters: - stylecheck + # Disable until Msg-based gov proposals are fully implemented + - text: "SA1019:" + linters: + - staticcheck max-issues-per-linter: 10000 max-same-issues: 10000 diff --git a/modules/actions/types/response.go b/modules/actions/types/response.go index a25fe6aa3..f1764ca3d 100644 --- a/modules/actions/types/response.go +++ b/modules/actions/types/response.go @@ -1,11 +1,12 @@ package types import ( + "time" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" stakingtype "github.com/cosmos/cosmos-sdk/x/staking/types" - "time" ) type Coin struct { From b12d56bcfb73c4dfa9be15f710a3232c987f66a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:37:14 +0000 Subject: [PATCH 06/11] build(deps): bump amannn/action-semantic-pull-request from 5.0.2 to 5.1.0 (#522) Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 5.0.2 to 5.1.0.
Release notes

Sourced from amannn/action-semantic-pull-request's releases.

v5.1.0

5.1.0 (2023-02-10)

Features

  • Add regex support to scope and disallowScopes configuration (#226) (403a6f8)
Changelog

Sourced from amannn/action-semantic-pull-request's changelog.

5.1.0 (2023-02-10)

Features

  • Add regex support to scope and disallowScopes configuration (#226) (403a6f8)
Commits
  • b6bca70 chore: Release 5.1.0 [skip ci]
  • 403a6f8 feat: Add regex support to scope and disallowScopes configuration (#226)
  • 0b14f54 Update issue templates [skip ci]
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=amannn/action-semantic-pull-request&package-manager=github_actions&previous-version=5.0.2&new-version=5.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- .github/workflows/lint-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml index e4a92bb8c..a02ee4b3f 100644 --- a/.github/workflows/lint-pr.yml +++ b/.github/workflows/lint-pr.yml @@ -11,6 +11,6 @@ jobs: main: runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@v5.0.2 + - uses: amannn/action-semantic-pull-request@v5.1.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From eedd9f610d8338d90a6dbc7dfb024b4ebb82153d Mon Sep 17 00:00:00 2001 From: Magic Cat <37407870+MonikaCat@users.noreply.github.com> Date: Tue, 14 Feb 2023 21:25:54 +0700 Subject: [PATCH 07/11] feat: update proposal snapshots handling on block (#523) ## Description Closes: #XXXX --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch - [ ] provided a link to the relevant issue or specification - [x] added a changelog entry to `CHANGELOG.md` - [x] included comments for [documenting Go code](https://blog.golang.org/godoc) - [x] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- CHANGELOG.md | 2 +- database/gov_test.go | 16 ++++------------ modules/gov/expected_modules.go | 1 + modules/gov/handle_block.go | 9 +++++++-- modules/gov/utils_proposal.go | 16 ++++++++++------ modules/staking/utils_staking_pool.go | 9 +++++++++ types/gov.go | 4 ++-- types/staking_pool_params.go | 16 ++++++++++++++++ 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 976feb7c8..fe1931d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ #### CI - ([\#508](https://github.com/forbole/bdjuno/pull/508)) Upgrade workflow golangci version to v1.50.1 - #### Parse Command - ([\#492](https://github.com/forbole/bdjuno/pull/492)) Add parse command for periodic tasks: `x/bank` total supply, `x/distribution` community pool, `x/mint` inflation, `pricefeed` token price and price history, `x/staking` staking pool @@ -20,6 +19,7 @@ - ([\#465](https://github.com/forbole/bdjuno/pull/465)) Get open proposal ids in deposit or voting period by block time instead of current time - ([\#489](https://github.com/forbole/bdjuno/pull/489)) Remove block height foreign key from proposal_vote and proposal_deposit tables and add column timestamp - ([\#499](https://github.com/forbole/bdjuno/pull/499)) Check if proposal has passed voting end time before marking it invalid +- ([\#523](https://github.com/forbole/bdjuno/pull/523)) Update proposal snapshots handling on block #### Daily refetch - ([\#454](https://github.com/forbole/bdjuno/pull/454)) Added `daily refetch` module to refetch missing blocks every day diff --git a/database/gov_test.go b/database/gov_test.go index 63fd0faa5..fcd29f6a0 100644 --- a/database/gov_test.go +++ b/database/gov_test.go @@ -528,11 +528,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Save snapshot - snapshot := types.NewProposalStakingPoolSnapshot(1, types.NewPool( + snapshot := types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(100), sdk.NewInt(200), - sdk.NewInt(20), - sdk.NewInt(30), 10, )) err := suite.database.SaveProposalStakingPoolSnapshot(snapshot) @@ -552,11 +550,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with lower height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(200), sdk.NewInt(500), - sdk.NewInt(14), - sdk.NewInt(10), 9, ))) suite.Require().NoError(err) @@ -575,11 +571,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with same height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(500), sdk.NewInt(1000), - sdk.NewInt(20), - sdk.NewInt(30), 10, ))) suite.Require().NoError(err) @@ -598,11 +592,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with higher height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(1000), sdk.NewInt(2000), - sdk.NewInt(80), - sdk.NewInt(40), 11, ))) suite.Require().NoError(err) diff --git a/modules/gov/expected_modules.go b/modules/gov/expected_modules.go index 7a22e1f00..6be8fa10e 100644 --- a/modules/gov/expected_modules.go +++ b/modules/gov/expected_modules.go @@ -26,6 +26,7 @@ type SlashingModule interface { type StakingModule interface { GetStakingPool(height int64) (*types.Pool, error) + GetStakingPoolSnapshot(height int64) (*types.PoolSnapshot, error) GetValidatorsWithStatus(height int64, status string) ([]stakingtypes.Validator, []types.Validator, error) GetValidatorsVotingPowers(height int64, vals *tmctypes.ResultValidators) ([]types.ValidatorVotingPower, error) GetValidatorsStatuses(height int64, validators []stakingtypes.Validator) ([]types.ValidatorStatus, error) diff --git a/modules/gov/handle_block.go b/modules/gov/handle_block.go index 9a279eafa..9022a4f05 100644 --- a/modules/gov/handle_block.go +++ b/modules/gov/handle_block.go @@ -36,9 +36,14 @@ func (m *Module) updateProposals(height int64, blockTime time.Time, blockVals *t return fmt.Errorf("error while updating proposal: %s", err) } - err = m.UpdateProposalSnapshots(height, blockVals, id) + err = m.UpdateProposalValidatorStatusesSnapshot(height, blockVals, id) if err != nil { - return fmt.Errorf("error while updating proposal snapshots: %s", err) + return fmt.Errorf("error while updating proposal validator statuses snapshots: %s", err) + } + + err = m.UpdateProposalStakingPoolSnapshot(height, blockVals, id) + if err != nil { + return fmt.Errorf("error while updating proposal validator statuses snapshots: %s", err) } } return nil diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index fe13640b7..2f868ab9c 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -59,15 +59,19 @@ func (m *Module) UpdateProposal(height int64, blockTime time.Time, id uint64) er return nil } -func (m *Module) UpdateProposalSnapshots(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { - err := m.updateProposalStakingPoolSnapshot(height, id) +func (m *Module) UpdateProposalValidatorStatusesSnapshot(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { + err := m.updateProposalValidatorStatusesSnapshot(height, id, blockVals) if err != nil { - return fmt.Errorf("error while updating proposal staking pool snapshot: %s", err) + return fmt.Errorf("error while updating proposal validator statuses snapshot: %s", err) } - err = m.updateProposalValidatorStatusesSnapshot(height, id, blockVals) + return nil +} + +func (m *Module) UpdateProposalStakingPoolSnapshot(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { + err := m.updateProposalStakingPoolSnapshot(height, id) if err != nil { - return fmt.Errorf("error while updating proposal validator statuses snapshot: %s", err) + return fmt.Errorf("error while updating proposal staking pool snapshot: %s", err) } return nil @@ -192,7 +196,7 @@ func (m *Module) updateAccounts(proposal govtypes.Proposal) error { // updateProposalStakingPoolSnapshot updates the staking pool snapshot associated with the gov // proposal having the provided id func (m *Module) updateProposalStakingPoolSnapshot(height int64, proposalID uint64) error { - pool, err := m.stakingModule.GetStakingPool(height) + pool, err := m.stakingModule.GetStakingPoolSnapshot(height) if err != nil { return fmt.Errorf("error while getting staking pool: %s", err) } diff --git a/modules/staking/utils_staking_pool.go b/modules/staking/utils_staking_pool.go index 9164ff6ed..bba59af11 100644 --- a/modules/staking/utils_staking_pool.go +++ b/modules/staking/utils_staking_pool.go @@ -42,6 +42,15 @@ func (m *Module) GetStakingPool(height int64) (*types.Pool, error) { return types.NewPool(pool.BondedTokens, pool.NotBondedTokens, unbondingTokens, stakedNotBondedTokens, height), nil } +func (m *Module) GetStakingPoolSnapshot(height int64) (*types.PoolSnapshot, error) { + pool, err := m.source.GetPool(height) + if err != nil { + return nil, fmt.Errorf("error while getting staking pool snapshot: %s", err) + } + + return types.NewPoolSnapshot(pool.BondedTokens, pool.NotBondedTokens, height), nil +} + func (m *Module) getTotalUnbondingDelegationsFromValidator(height int64, valOperatorAddress string) []stakingtypes.UnbondingDelegation { var unbondingDelegations []stakingtypes.UnbondingDelegation var nextKey []byte diff --git a/types/gov.go b/types/gov.go index 2ed1075b9..2591a5ade 100644 --- a/types/gov.go +++ b/types/gov.go @@ -241,11 +241,11 @@ func NewTallyResult( // ProposalStakingPoolSnapshot contains the data about a single staking pool snapshot to be associated with a proposal type ProposalStakingPoolSnapshot struct { ProposalID uint64 - Pool *Pool + Pool *PoolSnapshot } // NewProposalStakingPoolSnapshot returns a new ProposalStakingPoolSnapshot instance -func NewProposalStakingPoolSnapshot(proposalID uint64, pool *Pool) ProposalStakingPoolSnapshot { +func NewProposalStakingPoolSnapshot(proposalID uint64, pool *PoolSnapshot) ProposalStakingPoolSnapshot { return ProposalStakingPoolSnapshot{ ProposalID: proposalID, Pool: pool, diff --git a/types/staking_pool_params.go b/types/staking_pool_params.go index 708ed1ed0..05b134849 100644 --- a/types/staking_pool_params.go +++ b/types/staking_pool_params.go @@ -25,6 +25,22 @@ func NewPool(bondedTokens, notBondedTokens, unbondingTokens, stakedNotBondedToke } } +// PoolSnapshot contains the data of the staking pool snapshot at the given height +type PoolSnapshot struct { + BondedTokens sdk.Int + NotBondedTokens sdk.Int + Height int64 +} + +// NewPoolSnapshot allows to build a new PoolSnapshot instance +func NewPoolSnapshot(bondedTokens, notBondedTokens sdk.Int, height int64) *PoolSnapshot { + return &PoolSnapshot{ + BondedTokens: bondedTokens, + NotBondedTokens: notBondedTokens, + Height: height, + } +} + // -------------------------------------------------------------------------------------------------------------------- // StakingParams represents the parameters of the x/staking module From e1b5ef4dcb559985c07415ab2ae981e4ee48c9a9 Mon Sep 17 00:00:00 2001 From: Magic Cat <37407870+MonikaCat@users.noreply.github.com> Date: Tue, 14 Feb 2023 21:25:54 +0700 Subject: [PATCH 08/11] feat: update proposal snapshots handling on block (#523) ## Description Closes: #XXXX --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch - [ ] provided a link to the relevant issue or specification - [x] added a changelog entry to `CHANGELOG.md` - [x] included comments for [documenting Go code](https://blog.golang.org/godoc) - [x] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- CHANGELOG.md | 2 +- database/gov_test.go | 16 ++++------------ modules/gov/expected_modules.go | 1 + modules/gov/handle_block.go | 9 +++++++-- modules/gov/utils_proposal.go | 16 ++++++++++------ modules/staking/utils_staking_pool.go | 9 +++++++++ types/gov.go | 4 ++-- types/staking_pool_params.go | 16 ++++++++++++++++ 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 976feb7c8..fe1931d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ #### CI - ([\#508](https://github.com/forbole/bdjuno/pull/508)) Upgrade workflow golangci version to v1.50.1 - #### Parse Command - ([\#492](https://github.com/forbole/bdjuno/pull/492)) Add parse command for periodic tasks: `x/bank` total supply, `x/distribution` community pool, `x/mint` inflation, `pricefeed` token price and price history, `x/staking` staking pool @@ -20,6 +19,7 @@ - ([\#465](https://github.com/forbole/bdjuno/pull/465)) Get open proposal ids in deposit or voting period by block time instead of current time - ([\#489](https://github.com/forbole/bdjuno/pull/489)) Remove block height foreign key from proposal_vote and proposal_deposit tables and add column timestamp - ([\#499](https://github.com/forbole/bdjuno/pull/499)) Check if proposal has passed voting end time before marking it invalid +- ([\#523](https://github.com/forbole/bdjuno/pull/523)) Update proposal snapshots handling on block #### Daily refetch - ([\#454](https://github.com/forbole/bdjuno/pull/454)) Added `daily refetch` module to refetch missing blocks every day diff --git a/database/gov_test.go b/database/gov_test.go index 3d1ae88c0..a9350038e 100644 --- a/database/gov_test.go +++ b/database/gov_test.go @@ -533,11 +533,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Save snapshot - snapshot := types.NewProposalStakingPoolSnapshot(1, types.NewPool( + snapshot := types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(100), sdk.NewInt(200), - sdk.NewInt(20), - sdk.NewInt(30), 10, )) err := suite.database.SaveProposalStakingPoolSnapshot(snapshot) @@ -557,11 +555,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with lower height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(200), sdk.NewInt(500), - sdk.NewInt(14), - sdk.NewInt(10), 9, ))) suite.Require().NoError(err) @@ -580,11 +576,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with same height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(500), sdk.NewInt(1000), - sdk.NewInt(20), - sdk.NewInt(30), 10, ))) suite.Require().NoError(err) @@ -603,11 +597,9 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposalStakingPoolSnapshot() { // ---------------------------------------------------------------------------------------------------------------- // Update with higher height - err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPool( + err = suite.database.SaveProposalStakingPoolSnapshot(types.NewProposalStakingPoolSnapshot(1, types.NewPoolSnapshot( sdk.NewInt(1000), sdk.NewInt(2000), - sdk.NewInt(80), - sdk.NewInt(40), 11, ))) suite.Require().NoError(err) diff --git a/modules/gov/expected_modules.go b/modules/gov/expected_modules.go index 9e8f02ba8..def7fca1c 100644 --- a/modules/gov/expected_modules.go +++ b/modules/gov/expected_modules.go @@ -26,6 +26,7 @@ type SlashingModule interface { type StakingModule interface { GetStakingPool(height int64) (*types.Pool, error) + GetStakingPoolSnapshot(height int64) (*types.PoolSnapshot, error) GetValidatorsWithStatus(height int64, status string) ([]stakingtypes.Validator, []types.Validator, error) GetValidatorsVotingPowers(height int64, vals *tmctypes.ResultValidators) ([]types.ValidatorVotingPower, error) GetValidatorsStatuses(height int64, validators []stakingtypes.Validator) ([]types.ValidatorStatus, error) diff --git a/modules/gov/handle_block.go b/modules/gov/handle_block.go index 9b16a05d5..1fff0db86 100644 --- a/modules/gov/handle_block.go +++ b/modules/gov/handle_block.go @@ -36,9 +36,14 @@ func (m *Module) updateProposals(height int64, blockTime time.Time, blockVals *t return fmt.Errorf("error while updating proposal: %s", err) } - err = m.UpdateProposalSnapshots(height, blockVals, id) + err = m.UpdateProposalValidatorStatusesSnapshot(height, blockVals, id) if err != nil { - return fmt.Errorf("error while updating proposal snapshots: %s", err) + return fmt.Errorf("error while updating proposal validator statuses snapshots: %s", err) + } + + err = m.UpdateProposalStakingPoolSnapshot(height, blockVals, id) + if err != nil { + return fmt.Errorf("error while updating proposal validator statuses snapshots: %s", err) } } return nil diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index 393c2a5b0..9c5a59820 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -59,15 +59,19 @@ func (m *Module) UpdateProposal(height int64, blockTime time.Time, id uint64) er return nil } -func (m *Module) UpdateProposalSnapshots(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { - err := m.updateProposalStakingPoolSnapshot(height, id) +func (m *Module) UpdateProposalValidatorStatusesSnapshot(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { + err := m.updateProposalValidatorStatusesSnapshot(height, id, blockVals) if err != nil { - return fmt.Errorf("error while updating proposal staking pool snapshot: %s", err) + return fmt.Errorf("error while updating proposal validator statuses snapshot: %s", err) } - err = m.updateProposalValidatorStatusesSnapshot(height, id, blockVals) + return nil +} + +func (m *Module) UpdateProposalStakingPoolSnapshot(height int64, blockVals *tmctypes.ResultValidators, id uint64) error { + err := m.updateProposalStakingPoolSnapshot(height, id) if err != nil { - return fmt.Errorf("error while updating proposal validator statuses snapshot: %s", err) + return fmt.Errorf("error while updating proposal staking pool snapshot: %s", err) } return nil @@ -192,7 +196,7 @@ func (m *Module) updateAccounts(proposal govtypesv1beta1.Proposal) error { // updateProposalStakingPoolSnapshot updates the staking pool snapshot associated with the gov // proposal having the provided id func (m *Module) updateProposalStakingPoolSnapshot(height int64, proposalID uint64) error { - pool, err := m.stakingModule.GetStakingPool(height) + pool, err := m.stakingModule.GetStakingPoolSnapshot(height) if err != nil { return fmt.Errorf("error while getting staking pool: %s", err) } diff --git a/modules/staking/utils_staking_pool.go b/modules/staking/utils_staking_pool.go index d8a7874f1..f0c01e89f 100644 --- a/modules/staking/utils_staking_pool.go +++ b/modules/staking/utils_staking_pool.go @@ -42,6 +42,15 @@ func (m *Module) GetStakingPool(height int64) (*types.Pool, error) { return types.NewPool(pool.BondedTokens, pool.NotBondedTokens, unbondingTokens, stakedNotBondedTokens, height), nil } +func (m *Module) GetStakingPoolSnapshot(height int64) (*types.PoolSnapshot, error) { + pool, err := m.source.GetPool(height) + if err != nil { + return nil, fmt.Errorf("error while getting staking pool snapshot: %s", err) + } + + return types.NewPoolSnapshot(pool.BondedTokens, pool.NotBondedTokens, height), nil +} + func (m *Module) getTotalUnbondingDelegationsFromValidator(height int64, valOperatorAddress string) []stakingtypes.UnbondingDelegation { var unbondingDelegations []stakingtypes.UnbondingDelegation var nextKey []byte diff --git a/types/gov.go b/types/gov.go index 6c297db28..c02359cd4 100644 --- a/types/gov.go +++ b/types/gov.go @@ -292,11 +292,11 @@ func NewTallyResult( // ProposalStakingPoolSnapshot contains the data about a single staking pool snapshot to be associated with a proposal type ProposalStakingPoolSnapshot struct { ProposalID uint64 - Pool *Pool + Pool *PoolSnapshot } // NewProposalStakingPoolSnapshot returns a new ProposalStakingPoolSnapshot instance -func NewProposalStakingPoolSnapshot(proposalID uint64, pool *Pool) ProposalStakingPoolSnapshot { +func NewProposalStakingPoolSnapshot(proposalID uint64, pool *PoolSnapshot) ProposalStakingPoolSnapshot { return ProposalStakingPoolSnapshot{ ProposalID: proposalID, Pool: pool, diff --git a/types/staking_pool_params.go b/types/staking_pool_params.go index b131be09f..845321d53 100644 --- a/types/staking_pool_params.go +++ b/types/staking_pool_params.go @@ -25,6 +25,22 @@ func NewPool(bondedTokens, notBondedTokens, unbondingTokens, stakedNotBondedToke } } +// PoolSnapshot contains the data of the staking pool snapshot at the given height +type PoolSnapshot struct { + BondedTokens sdk.Int + NotBondedTokens sdk.Int + Height int64 +} + +// NewPoolSnapshot allows to build a new PoolSnapshot instance +func NewPoolSnapshot(bondedTokens, notBondedTokens sdk.Int, height int64) *PoolSnapshot { + return &PoolSnapshot{ + BondedTokens: bondedTokens, + NotBondedTokens: notBondedTokens, + Height: height, + } +} + // -------------------------------------------------------------------------------------------------------------------- // StakingParams represents the parameters of the x/staking module From 9869cdea004fca772697e52c1de7bd6ea1f042fa Mon Sep 17 00:00:00 2001 From: maiquanghiep Date: Thu, 16 Feb 2023 20:34:23 +0700 Subject: [PATCH 09/11] fix: fix docker authentication & determine Dockerfile at run time (#524) ## Description This request has two changes: First, the request updates the login credentials to DockerHub. Second, the request enables the CI to build Docker images using two different Dockerfiles. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch - [ ] provided a link to the relevant issue or specification - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- .github/workflows/docker-build.yml | 13 +++++++++-- Dockerfile | 36 ------------------------------ Dockerfile.cosmwasm | 22 ++++++++++++++++++ Dockerfile.default | 11 +++++++++ 4 files changed, 44 insertions(+), 38 deletions(-) delete mode 100644 Dockerfile create mode 100644 Dockerfile.cosmwasm create mode 100644 Dockerfile.default diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c56842e92..af9d7a4a2 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -33,6 +33,14 @@ jobs: echo ::set-output name=version::${VERSION} echo ::set-output name=tags::${TAGS} echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') + - name: Determine Dockerfile to use + run: | + if [[ -f Dockerfile.cosmwasm ]]; then + export DOCKERFILE=Dockerfile.cosmwasm + else + export DOCKERFILE=Dockerfile.default + fi + echo "DOCKERFILE=${DOCKERFILE}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -40,12 +48,13 @@ jobs: name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v4 with: context: . + docker: "./${{ env.DOCKERFILE }}" push: true tags: ${{ steps.prep.outputs.tags }} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d6a226c1e..000000000 --- a/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM golang:1.18-alpine AS builder -RUN apk update && apk add --no-cache make git -WORKDIR /go/src/github.com/forbole/bdjuno -COPY . ./ - -###################################################### -## Enabe the lines below if chain supports cosmwasm ## -## module to properly build docker image ## -###################################################### -#RUN apk update && apk add --no-cache ca-certificates build-base git -#ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a -#ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a -#RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 9ecb037336bd56076573dc18c26631a9d2099a7f2b40dc04b6cae31ffb4c8f9a -#RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 6e4de7ba9bad4ae9679c7f9ecf7e283dd0160e71567c6a7be6ae47c81ebe7f32 -## Copy the library you want to the final location that will be found by the linker flag `-lwasmvm_muslc` -#RUN cp /lib/libwasmvm_muslc.$(uname -m).a /lib/libwasmvm_muslc.a - -RUN go mod download -RUN make build - -################################################## -## Enabe line below if chain supports cosmwasm ## -## module to properly build docker image ## -################################################## -#RUN LINK_STATICALLY=true BUILD_TAGS="muslc" make build - - -FROM alpine:latest -################################################## -## Enabe line below if chain supports cosmwasm ## -## module to properly build docker image ## -################################################## -#RUN apk update && apk add --no-cache ca-certificates build-base -WORKDIR /bdjuno -COPY --from=builder /go/src/github.com/forbole/bdjuno/build/bdjuno /usr/bin/bdjuno -CMD [ "bdjuno" ] \ No newline at end of file diff --git a/Dockerfile.cosmwasm b/Dockerfile.cosmwasm new file mode 100644 index 000000000..6fc372266 --- /dev/null +++ b/Dockerfile.cosmwasm @@ -0,0 +1,22 @@ + + +FROM golang:1.18-alpine AS builder +RUN apk update && apk add --no-cache make git +WORKDIR /go/src/github.com/forbole/bdjuno +COPY . ./ + +RUN apk update && apk add --no-cache ca-certificates build-base git +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a +RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 9ecb037336bd56076573dc18c26631a9d2099a7f2b40dc04b6cae31ffb4c8f9a +RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 6e4de7ba9bad4ae9679c7f9ecf7e283dd0160e71567c6a7be6ae47c81ebe7f32 +## Copy the library you want to the final location that will be found by the linker flag `-lwasmvm_muslc` +RUN cp /lib/libwasmvm_muslc.$(uname -m).a /lib/libwasmvm_muslc.a +RUN go mod download +RUN LINK_STATICALLY=true BUILD_TAGS="muslc" make build + +FROM alpine:latest +RUN apk update && apk add --no-cache ca-certificates build-base +WORKDIR /bdjuno +COPY --from=builder /go/src/github.com/forbole/bdjuno/build/bdjuno /usr/bin/bdjuno +CMD [ "bdjuno" ] \ No newline at end of file diff --git a/Dockerfile.default b/Dockerfile.default new file mode 100644 index 000000000..f58643e18 --- /dev/null +++ b/Dockerfile.default @@ -0,0 +1,11 @@ +FROM golang:1.18-alpine AS builder +RUN apk update && apk add --no-cache make git +WORKDIR /go/src/github.com/forbole/bdjuno +COPY . ./ +RUN go mod download +RUN make build + +FROM alpine:latest +WORKDIR /bdjuno +COPY --from=builder /go/src/github.com/forbole/bdjuno/build/bdjuno /usr/bin/bdjuno +CMD [ "bdjuno" ] \ No newline at end of file From 8573e2f4b25cac236d172baf2fcc44b803203f52 Mon Sep 17 00:00:00 2001 From: maiquanghiep Date: Fri, 17 Feb 2023 11:38:27 +0700 Subject: [PATCH 10/11] fix: correct docker/build-push-action's input (#525) ## Description Closes: #XXXX --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch - [ ] provided a link to the relevant issue or specification - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index af9d7a4a2..c7e3f46d9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -55,6 +55,6 @@ jobs: uses: docker/build-push-action@v4 with: context: . - docker: "./${{ env.DOCKERFILE }}" + file: "./${{ env.DOCKERFILE }}" push: true tags: ${{ steps.prep.outputs.tags }} From 4e03eaa85e8862b9c5e98146e2baf20b57a90503 Mon Sep 17 00:00:00 2001 From: Sai Krishna Sunkari Date: Fri, 17 Mar 2023 19:29:39 +0530 Subject: [PATCH 11/11] fix: sdkmath type in PoolSnapshot (#536) ## Description Closes: #XXXX typo fixes --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch - [ ] provided a link to the relevant issue or specification - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 3 ++- go.mod | 2 +- types/staking_pool_params.go | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e25e23143..87abb6540 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.17 + go-version: 1.18 - name: Test & Create coverage report run: make install test-unit stop-docker-test - name: Upload cove coverage diff --git a/CHANGELOG.md b/CHANGELOG.md index fe1931d68..d5983273e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ #### Staking Module - ([\#443](https://github.com/forbole/bdjuno/pull/443)) Remove tombstone status from staking module(already stored in slashing module) - ([\#455](https://github.com/forbole/bdjuno/pull/455)) Added `unbonding_tokens` and `staked_not_bonded_tokens` values to staking pool table +- ([\#536](https://github.com/forbole/bdjuno/pull/536) Fix `PoolSnapshot` tokens type from `sdk.Int` to `sdkmath.Int` #### Gov Module - ([\#461](https://github.com/forbole/bdjuno/pull/461)) Parse `x/gov` genesis with `genesisDoc.InitialHeight` instead of the hard-coded height 1 @@ -130,4 +131,4 @@ This version introduces breaking changes to certain address-specific data that i - ([\#276](https://github.com/forbole/bdjuno/pull/276)) Added `fee_grant_allowance` table (v0.44.x) #### Modules -- ([\#353](https://github.com/forbole/bdjuno/pull/353)) Removed the support for the `history` module \ No newline at end of file +- ([\#353](https://github.com/forbole/bdjuno/pull/353)) Removed the support for the `history` module diff --git a/go.mod b/go.mod index e4759c825..79b4cc578 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/forbole/bdjuno/v4 -go 1.19 +go 1.18 require ( cosmossdk.io/math v1.0.0-beta.3 diff --git a/types/staking_pool_params.go b/types/staking_pool_params.go index 845321d53..ca6e5cab7 100644 --- a/types/staking_pool_params.go +++ b/types/staking_pool_params.go @@ -27,13 +27,13 @@ func NewPool(bondedTokens, notBondedTokens, unbondingTokens, stakedNotBondedToke // PoolSnapshot contains the data of the staking pool snapshot at the given height type PoolSnapshot struct { - BondedTokens sdk.Int - NotBondedTokens sdk.Int + BondedTokens sdkmath.Int + NotBondedTokens sdkmath.Int Height int64 } // NewPoolSnapshot allows to build a new PoolSnapshot instance -func NewPoolSnapshot(bondedTokens, notBondedTokens sdk.Int, height int64) *PoolSnapshot { +func NewPoolSnapshot(bondedTokens, notBondedTokens sdkmath.Int, height int64) *PoolSnapshot { return &PoolSnapshot{ BondedTokens: bondedTokens, NotBondedTokens: notBondedTokens,