diff --git a/cmd/bdjuno/cheqd.go b/cmd/bdjuno/cheqd.go index 340365665..b77be3e17 100644 --- a/cmd/bdjuno/cheqd.go +++ b/cmd/bdjuno/cheqd.go @@ -1,11 +1,11 @@ package main import ( - didMsgs "github.com/cheqd/cheqd-node/x/cheqd/types" - resourceMsgs "github.com/cheqd/cheqd-node/x/resource/types" + didtypes "github.com/cheqd/cheqd-node/x/did/types" + resources "github.com/cheqd/cheqd-node/x/resource/types" + "github.com/cheqd/juno/v4/modules/messages" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/juno/v3/modules/messages" ) // CheqdAddressesParser func represents a MessageAddressesParser for the my custom module @@ -13,13 +13,13 @@ import ( func CheqdAddressesParser(_ codec.Codec, cosmosMsg sdk.Msg) ([]string, error) { switch msg := cosmosMsg.(type) { - case *didMsgs.MsgCreateDid: + case *didtypes.MsgCreateDidDoc: return []string{msg.GetPayload().GetId()}, nil - case *didMsgs.MsgUpdateDid: + case *didtypes.MsgUpdateDidDoc: return []string{msg.GetPayload().GetId()}, nil - case *resourceMsgs.MsgCreateResource: + case *resources.MsgCreateResource: return []string{msg.GetPayload().GetId()}, nil default: diff --git a/cmd/bdjuno/main.go b/cmd/bdjuno/main.go index da4077f39..adacd1426 100644 --- a/cmd/bdjuno/main.go +++ b/cmd/bdjuno/main.go @@ -2,12 +2,12 @@ package main import ( "github.com/cheqd/cheqd-node/app" + "github.com/cheqd/juno/v4/cmd" + initcmd "github.com/cheqd/juno/v4/cmd/init" + parsetypes "github.com/cheqd/juno/v4/cmd/parse/types" + startcmd "github.com/cheqd/juno/v4/cmd/start" + "github.com/cheqd/juno/v4/modules/messages" "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" migratecmd "github.com/forbole/bdjuno/v3/cmd/migrate" parsecmd "github.com/forbole/bdjuno/v3/cmd/parse" @@ -16,8 +16,7 @@ import ( "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/modules" - - gaiaapp "github.com/cosmos/gaia/v7/app" + // gaiaapp "github.com/cosmos/gaia/v7/app" ) func main() { @@ -56,7 +55,7 @@ func main() { // This should be edited by custom implementations if needed. func getBasicManagers() []module.BasicManager { return []module.BasicManager{ - gaiaapp.ModuleBasics, + // gaiaapp.ModuleBasics, app.ModuleBasics, } } diff --git a/cmd/migrate/cmd.go b/cmd/migrate/cmd.go index b33f7a49f..7578aab33 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/cheqd/juno/v4/cmd/parse/types" "github.com/spf13/cobra" v3 "github.com/forbole/bdjuno/v3/cmd/migrate/v3" @@ -14,7 +13,6 @@ import ( 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 f829d7bb0..ac9fc7efc 100644 --- a/cmd/migrate/v3/migrate.go +++ b/cmd/migrate/v3/migrate.go @@ -5,10 +5,13 @@ import ( "os" "github.com/forbole/bdjuno/v3/modules/actions" - junov3 "github.com/forbole/juno/v3/cmd/migrate/v3" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + + parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types" + "gopkg.in/yaml.v3" + + junov3 "github.com/cheqd/juno/v4/cmd/migrate/v4" + "github.com/cheqd/juno/v4/types/config" ) // RunMigration runs the migrations from v2 to v3 @@ -36,7 +39,7 @@ func RunMigration(parseConfig *parsecmdtypes.Config) error { return fmt.Errorf("error while serializing config: %s", err) } - err = os.WriteFile(config.GetConfigFilePath(), bz, 0o600) + err = os.WriteFile(config.GetConfigFilePath(), bz, 0600) if err != nil { return fmt.Errorf("error while writing v3 config: %s", err) } diff --git a/cmd/migrate/v3/types.go b/cmd/migrate/v3/types.go index a93e3d1eb..52cf7a7d5 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/cheqd/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 9444285d9..fc9db7f80 100644 --- a/cmd/migrate/v3/utils.go +++ b/cmd/migrate/v3/utils.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/forbole/juno/v3/types/config" + "github.com/cheqd/juno/v4/types/config" "gopkg.in/yaml.v3" ) diff --git a/cmd/parse/auth/cmd.go b/cmd/parse/auth/cmd.go index 4012bb1e2..20f71e8c9 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/cheqd/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..3762f477c 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..72da4ec9e 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/cheqd/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..bf2850c0c 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..0c385e729 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/cheqd/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..583c54870 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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 1e536e931..de90e5a20 100644 --- a/cmd/parse/feegrant/allowance.go +++ b/cmd/parse/feegrant/allowance.go @@ -5,8 +5,8 @@ import ( "fmt" "sort" - parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types" - "github.com/forbole/juno/v3/types/config" + parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/juno/v4/types/config" "github.com/forbole/bdjuno/v3/modules/feegrant" "github.com/forbole/bdjuno/v3/utils" @@ -36,7 +36,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..a38745738 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/cheqd/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..37aa8e349 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/cheqd/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..8732c2839 100644 --- a/cmd/parse/gov/proposal.go +++ b/cmd/parse/gov/proposal.go @@ -9,12 +9,12 @@ 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" + parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/juno/v4/types/config" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/spf13/cobra" - "github.com/forbole/juno/v3/parser" + "github.com/cheqd/juno/v4/parser" "github.com/forbole/bdjuno/v3/database" "github.com/forbole/bdjuno/v3/modules/distribution" @@ -50,13 +50,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 { diff --git a/cmd/parse/mint/cmd.go b/cmd/parse/mint/cmd.go index b5345c8d3..c0be56775 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/cheqd/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..68d4743f9 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..ab8648f91 100644 --- a/cmd/parse/parse.go +++ b/cmd/parse/parse.go @@ -1,13 +1,14 @@ package parse import ( - parse "github.com/forbole/juno/v3/cmd/parse/types" + parse "github.com/cheqd/juno/v4/cmd/parse/types" "github.com/spf13/cobra" - parseblocks "github.com/forbole/juno/v3/cmd/parse/blocks" + parseblocks "github.com/cheqd/juno/v4/cmd/parse/blocks" - parsegenesis "github.com/forbole/juno/v3/cmd/parse/genesis" + parsegenesis "github.com/cheqd/juno/v4/cmd/parse/genesis" + parsetransaction "github.com/cheqd/juno/v4/cmd/parse/transactions" 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" @@ -16,7 +17,6 @@ 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" ) // 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..257d2246e 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/cheqd/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..7b9697ea9 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..b338e0c6e 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..c39b19197 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/cheqd/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..4e46f880d 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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..804b887a6 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/cheqd/juno/v4/cmd/parse/types" + "github.com/cheqd/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 ed4fb4124..0307d79b1 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())), @@ -123,7 +123,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)), @@ -139,7 +139,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) } @@ -160,7 +160,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 681fe287a..e4b8e4bda 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..15b1cbda4 100644 --- a/database/daily_refetch.go +++ b/database/daily_refetch.go @@ -1,11 +1,11 @@ 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 -} +// 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 { diff --git a/database/database.go b/database/database.go index eed2ecc51..596fab695 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/cheqd/juno/v4/database" + "github.com/cheqd/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..502637c9f 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/cheqd/juno/v4/database/config" + "github.com/cheqd/juno/v4/logging" - junodb "github.com/forbole/juno/v3/database" + junodb "github.com/cheqd/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/cheqd/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 8178c34c4..031a05346 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 a489414fa..bcbd3dc72 100644 --- a/database/gov.go +++ b/database/gov.go @@ -6,19 +6,22 @@ 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" + govtypes "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" ) // SaveGovParams saves the given x/gov parameters inside the database func (db *Db) SaveGovParams(params *types.GovParams) error { + depositParamsBz, err := json.Marshal(¶ms.DepositParams) if err != nil { return fmt.Errorf("error while marshaling deposit params: %s", err) @@ -35,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) } @@ -51,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 @@ -100,10 +138,10 @@ func (db *Db) SaveProposals(proposals []types.Proposal) error { var accounts []types.Account proposalsQuery := ` -INSERT INTO proposal( - id, title, description, content, proposer_address, proposal_route, proposal_type, status, - submit_time, deposit_end_time, voting_start_time, voting_end_time -) VALUES` + INSERT INTO proposal( + 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{} for i, proposal := range proposals { @@ -126,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) } @@ -156,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) } @@ -179,13 +217,13 @@ func (db *Db) GetProposal(id uint64) (*types.Proposal, error) { 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 } - 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 } @@ -228,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, @@ -260,14 +298,10 @@ func (db *Db) SaveDeposits(deposits []types.Deposit) error { deposit.Height, ) } + fmt.Printf("\n param %v \v ", param) query = query[:len(query)-1] // Remove trailing "," - query += ` -ON CONFLICT ON CONSTRAINT unique_deposit DO UPDATE - SET amount = excluded.amount, - timestamp = excluded.timestamp, - height = excluded.height -WHERE proposal_deposit.height <= excluded.height` - _, err := db.Sql.Exec(query, param...) + query += ` ON CONFLICT DO NOTHING` + _, err := db.SQL.Exec(query, param...) if err != nil { return fmt.Errorf("error while storing deposits: %s", err) } @@ -280,13 +314,9 @@ 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) -ON CONFLICT ON CONSTRAINT unique_vote DO UPDATE - SET option = excluded.option, - timestamp = excluded.timestamp, - height = excluded.height -WHERE proposal_vote.height <= excluded.height` +INSERT INTO proposal_vote (proposal_id, voter_address, option, timestamp, height) +VALUES ($1, $2, $3, $4, $5) + ON CONFLICT DO NOTHING` // Store the voter account err := db.SaveAccounts([]types.Account{types.NewAccount(vote.Voter)}) @@ -294,7 +324,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) } @@ -325,14 +355,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) } @@ -350,11 +380,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) @@ -370,7 +400,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{} @@ -385,15 +415,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) } @@ -404,16 +434,16 @@ WHERE proposal_validator_status_snapshot.height <= excluded.height` // SaveSoftwareUpgradePlan allows to save the given software upgrade plan with its proposal id 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) @@ -426,7 +456,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) } @@ -439,7 +469,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) } @@ -451,7 +481,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 2b2fd52ce..0d17c8376 100644 --- a/database/gov_test.go +++ b/database/gov_test.go @@ -13,7 +13,8 @@ import ( "github.com/forbole/bdjuno/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypes "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" ) @@ -22,7 +23,7 @@ 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) + original := types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 10) err := suite.database.SaveGovParams(original) suite.Require().NoError(err) @@ -34,7 +35,7 @@ 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) + updated := types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 9) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -45,7 +46,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveGovParams() { // ---------------------------------------------------------------------------------------------------------------- // 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) + updated = types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 10) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -58,7 +59,7 @@ 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) + updated = types.NewGovParams(types.NewVotingParams(&votingParams), types.NewDepositParam(&depositParams), types.NewTallyParams(&tallyParams), 11) err = suite.database.SaveGovParams(updated) suite.Require().NoError(err) @@ -77,17 +78,21 @@ func (suite *DbTestSuite) getProposalRow(id int) types.Proposal { description := fmt.Sprintf("description%d", id) proposalRoute := fmt.Sprintf("proposalRoute%d", id) proposalType := fmt.Sprintf("proposalType%d", id) + timestamp1 := time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC) + timestamp2 := time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC) + timestamp3 := time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC) + timestamp4 := time.Date(2020, 1, 1, 03, 00, 00, 000, time.UTC) proposal := types.NewProposal( uint64(id), proposalRoute, proposalType, - govtypes.NewTextProposal(title, description), + govtypesv1beta1.NewTextProposal(title, description), govtypes.StatusPassed.String(), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer.String(), ) @@ -97,14 +102,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,8 +119,19 @@ 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") + + timestamp1 := time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC) + timestamp2 := time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC) + timestamp3 := time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC) + timestamp4 := time.Date(2020, 1, 1, 03, 00, 00, 000, time.UTC) + + timestamp5 := time.Date(2020, 1, 2, 00, 00, 00, 000, time.UTC) + timestamp6 := time.Date(2020, 1, 2, 01, 00, 00, 000, time.UTC) + timestamp7 := time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC) + timestamp8 := time.Date(2020, 1, 2, 03, 00, 00, 000, time.UTC) + input := []types.Proposal{ types.NewProposal( 1, @@ -123,10 +139,10 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { "proposalType", content1, govtypes.StatusDepositPeriod.String(), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer1.String(), ), types.NewProposal( @@ -135,10 +151,10 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { "proposalType1", content2, govtypes.StatusPassed.String(), - time.Date(2020, 1, 2, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp5, + ×tamp6, + ×tamp7, + ×tamp8, proposer2.String(), ), } @@ -158,10 +174,10 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { "title", "description", suite.encodeProposalContent(content1), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer1.String(), govtypes.StatusDepositPeriod.String(), ), @@ -172,10 +188,10 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { "title1", "description1", suite.encodeProposalContent(content2), - time.Date(2020, 1, 2, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp5, + ×tamp6, + ×tamp7, + ×tamp8, proposer2.String(), govtypes.StatusPassed.String(), ), @@ -186,18 +202,22 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveProposals() { } func (suite *DbTestSuite) TestBigDipperDb_GetProposal() { - content := govtypes.NewTextProposal("title", "description") + content := govtypesv1beta1.NewTextProposal("title", "description") proposer := suite.getAccount("cosmos1z4hfrxvlgl4s8u4n5ngjcw8kdqrcv43599amxs") + timestamp1 := time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC) + timestamp2 := time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC) + timestamp3 := time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC) + timestamp4 := time.Date(2020, 1, 1, 03, 00, 00, 000, time.UTC) proposal := types.NewProposal( 1, "proposalRoute", "proposalType", content, govtypes.StatusDepositPeriod.String(), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer.String(), ) input := []types.Proposal{proposal} @@ -214,8 +234,18 @@ 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") + + timestamp1 := time.Date(2020, 1, 2, 00, 00, 00, 000, time.UTC) + timestamp2 := time.Date(2020, 1, 2, 01, 00, 00, 000, time.UTC) + timestamp3 := time.Date(2020, 1, 2, 02, 00, 00, 000, time.UTC) + timestamp4 := time.Date(2020, 1, 2, 03, 00, 00, 000, time.UTC) + + timestamp5 := time.Date(2020, 1, 1, 00, 00, 00, 000, time.UTC) + timestamp6 := time.Date(2020, 1, 1, 01, 00, 00, 000, time.UTC) + timestamp7 := time.Date(2020, 1, 1, 02, 00, 00, 000, time.UTC) + timestamp8 := time.Date(2020, 1, 1, 03, 00, 00, 000, time.UTC) invalidProposal := types.NewProposal( 6, @@ -223,10 +253,10 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalType1", content2, types.ProposalStatusInvalid, - time.Date(2020, 1, 2, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp5, + ×tamp6, + ×tamp7, + ×tamp8, proposer2.String(), ) @@ -237,10 +267,10 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalType", content1, govtypes.StatusVotingPeriod.String(), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp5, + ×tamp6, + ×tamp7, + ×tamp8, proposer1.String(), ), types.NewProposal( @@ -249,10 +279,10 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalType", content1, govtypes.StatusDepositPeriod.String(), - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer1.String(), ), types.NewProposal( @@ -261,10 +291,10 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalType1", content2, govtypes.StatusPassed.String(), - time.Date(2020, 1, 2, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer2.String(), ), types.NewProposal( @@ -273,10 +303,10 @@ func (suite *DbTestSuite) TestBigDipperDb_GetOpenProposalsIds() { "proposalType1", content2, govtypes.StatusRejected.String(), - time.Date(2020, 1, 2, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o1, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o2, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 2, 0o3, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, + ×tamp3, + ×tamp4, proposer2.String(), ), invalidProposal, @@ -296,11 +326,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, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, ) err = suite.database.UpdateProposal(update) @@ -315,8 +348,8 @@ func (suite *DbTestSuite) TestBigDipperDb_UpdateProposal() { suite.encodeProposalContent(proposal.Content), proposal.SubmitTime, proposal.DepositEndTime, - time.Date(2020, 1, 1, 0o0, 0o0, 0o0, 0o00, time.UTC), - time.Date(2020, 1, 1, 0o1, 0o0, 0o0, 0o00, time.UTC), + ×tamp1, + ×tamp2, proposer.String(), govtypes.StatusPassed.String(), ) 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 4c517b26a..35fe4526a 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 e6f08f4e4..db00503df 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) } @@ -246,7 +246,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), @@ -339,7 +339,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) } @@ -387,7 +387,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) } @@ -421,7 +421,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) } @@ -433,7 +433,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) } @@ -449,7 +449,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 @@ -470,7 +470,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 de26b170a..2567d8c00 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', @@ -254,7 +254,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/types/gov.go b/database/types/gov.go index 3b6ad0646..1a619780b 100644 --- a/database/types/gov.go +++ b/database/types/gov.go @@ -17,18 +17,18 @@ type GovParamsRow struct { // ProposalRow represents a single row inside the proposal table type ProposalRow struct { - SubmitTime time.Time `db:"submit_time"` - DepositEndTime time.Time `db:"deposit_end_time"` - VotingStartTime time.Time `db:"voting_start_time"` - VotingEndTime time.Time `db:"voting_end_time"` - Title string `db:"title"` - Description string `db:"description"` - Content string `db:"content"` - ProposalRoute string `db:"proposal_route"` - ProposalType string `db:"proposal_type"` - Proposer string `db:"proposer_address"` - Status string `db:"status"` - ProposalID uint64 `db:"id"` + SubmitTime *time.Time `db:"submit_time"` + DepositEndTime *time.Time `db:"deposit_end_time"` + VotingStartTime *time.Time `db:"voting_start_time"` + VotingEndTime *time.Time `db:"voting_end_time"` + Title string `db:"title"` + Description string `db:"description"` + Content string `db:"content"` + ProposalRoute string `db:"proposal_route"` + ProposalType string `db:"proposal_type"` + Proposer string `db:"proposer_address"` + Status string `db:"status"` + ProposalID uint64 `db:"id"` } // NewProposalRow allows to easily create a new ProposalRow @@ -39,10 +39,10 @@ func NewProposalRow( title string, description string, content string, - submitTime time.Time, - depositEndTime time.Time, - votingStartTime time.Time, - votingEndTime time.Time, + submitTime *time.Time, + depositEndTime *time.Time, + votingStartTime *time.Time, + votingEndTime *time.Time, proposer string, status string, ) ProposalRow { @@ -69,10 +69,10 @@ func (w ProposalRow) Equals(v ProposalRow) bool { w.ProposalRoute == v.ProposalRoute && w.ProposalType == v.ProposalType && w.ProposalID == v.ProposalID && - w.SubmitTime.Equal(v.SubmitTime) && - w.DepositEndTime.Equal(v.DepositEndTime) && - w.VotingStartTime.Equal(v.VotingStartTime) && - w.VotingEndTime.Equal(v.VotingEndTime) && + w.SubmitTime == v.SubmitTime && + w.DepositEndTime == v.DepositEndTime && + w.VotingStartTime == v.VotingStartTime && + w.VotingEndTime == v.VotingEndTime && w.Proposer == v.Proposer && w.Status == v.Status } 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/deploy/config.yaml b/deploy/config.yaml index 35f638ebf..dcf08f1cd 100644 --- a/deploy/config.yaml +++ b/deploy/config.yaml @@ -32,13 +32,7 @@ parsing: fast_sync: true average_block_time: 7s database: - name: DATABASE_NAME - host: DATABASE_HOST - port: 25060 - user: DATABASE_USER - password: DATABASE_PASSWORD - ssl_mode: require - schema: public + url: DATABASE_URL max_open_connections: 40 max_idle_connections: 10 partition_size: 100000 diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh index 5235d5532..d9e4512b9 100644 --- a/deploy/entrypoint.sh +++ b/deploy/entrypoint.sh @@ -5,9 +5,6 @@ set -euo pipefail sed -i "s, RPC_ADDRESS, '${RPC_ADDRESS}',g" /bdjuno/.bdjuno/config.yaml sed -i "s, GRPC_ADDRESS, '${GRPC_ADDRESS}',g" /bdjuno/.bdjuno/config.yaml sed -i "s, LOG_LEVEL, '${LOG_LEVEL}',g" /bdjuno/.bdjuno/config.yaml -sed -i "s, DATABASE_NAME, '${DATABASE_NAME}',g" /bdjuno/.bdjuno/config.yaml -sed -i "s, DATABASE_HOST, '${DATABASE_HOST}',g" /bdjuno/.bdjuno/config.yaml -sed -i "s, DATABASE_USER, '${DATABASE_USER}',g" /bdjuno/.bdjuno/config.yaml -sed -i "s, DATABASE_PASSWORD, '${DATABASE_PASSWORD}',g" /bdjuno/.bdjuno/config.yaml +sed -i "s, DATABASE_URL, '${DATABASE_URL}',g" /bdjuno/.bdjuno/config.yaml bdjuno start --home /bdjuno/.bdjuno diff --git a/go.mod b/go.mod index 072e6ad5e..0b34c84b6 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,13 @@ module github.com/forbole/bdjuno/v3 go 1.18 require ( - github.com/cheqd/cheqd-node v0.6.10 - github.com/cosmos/cosmos-sdk v0.45.9 - github.com/cosmos/gaia/v7 v7.0.2 - github.com/forbole/juno/v3 v3.4.0 - github.com/go-co-op/gocron v1.18.0 + cosmossdk.io/math v1.0.0-beta.4 // indirect + github.com/cheqd/cheqd-node v1.2.2 + // github.com/cosmos/ibc-go/v5 v5.2.0 + // github.com/cosmos/gaia/v7 v7.0.2 + github.com/cheqd/juno/v4 v4.0.2-cheqd + github.com/cosmos/cosmos-sdk v0.46.8 + github.com/go-co-op/gocron v1.16.1 github.com/gogo/protobuf v1.3.3 github.com/jmoiron/sqlx v1.3.5 github.com/lib/pq v1.10.7 @@ -17,41 +19,52 @@ require ( github.com/rs/zerolog v1.28.0 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 - github.com/tendermint/tendermint v0.34.21 - google.golang.org/grpc v1.48.0 + github.com/tendermint/tendermint v0.34.24 + google.golang.org/grpc v1.51.0 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.105.0 // indirect + cloud.google.com/go/compute v1.13.0 // indirect + cloud.google.com/go/compute/metadata v0.2.1 // indirect + cloud.google.com/go/iam v0.8.0 // indirect + cloud.google.com/go/storage v1.27.0 // indirect + cosmossdk.io/errors v1.0.0-beta.7 // indirect + filippo.io/edwards25519 v1.0.0-rc.1 // indirect + github.com/99designs/keyring v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/Workiva/go-datastructures v1.0.53 // indirect - github.com/armon/go-metrics v0.4.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // 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/speakeasy v0.1.0 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/btcsuite/btcd v0.22.2 // 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/gogoproto v1.4.3 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.3 // indirect - github.com/cosmos/ibc-go/v3 v3.3.0 // indirect - github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect - github.com/cosmos/ledger-go v0.9.3 // 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.2 // 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/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.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.4 // 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/gabriel-vasile/mimetype v1.4.1 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -61,29 +74,36 @@ require ( 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.7.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.1 // 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-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.15.9 // indirect + github.com/klauspost/compress v1.15.11 // indirect github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect github.com/lestrrat-go/blackmagic v1.0.0 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect @@ -92,19 +112,21 @@ require ( github.com/lestrrat-go/option v1.0.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // 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-20181016162300-f8f6d4d2b643 // 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/go-testing-interface v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/mr-tron/base58 v1.1.0 // indirect + github.com/mr-tron/base58 v1.2.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/multiformats/go-base32 v0.0.3 // indirect github.com/multiformats/go-base36 v0.1.0 // indirect github.com/multiformats/go-multibase v0.1.1 // indirect - github.com/pelletier/go-toml/v2 v2.0.2 // 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 @@ -112,50 +134,61 @@ 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.8.2 // 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.12.0 // indirect - github.com/strangelove-ventures/packet-forward-middleware/v2 v2.1.1 // indirect - github.com/subosito/gotenv v1.4.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/tidwall/btree v1.5.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.1 // indirect go.etcd.io/bbolt v1.3.6 // indirect - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + go.opencensus.io v0.24.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.0.0-20220726230323-06994584191e // indirect - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect - golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b // indirect - google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/ini.v1 v1.66.6 // indirect + golang.org/x/net v0.5.0 // indirect + golang.org/x/oauth2 v0.3.0 // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.4.0 // indirect + golang.org/x/term v0.4.0 // indirect + golang.org/x/text v0.6.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/api v0.103.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // 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/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 // Dragonberry fix github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 + github.com/cosmos/iavl v0.15.3 => github.com/cosmos/iavl v0.19.4 + + // github.com/cosmos/ibc-go/v6 => github.com/cosmos/ibc-go/v5 v5.2.0 + github.com/forbole/juno/v4 => github.com/cheqd/juno/v4 v4.0.1-cheqd // Fee payer support - github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.45.9-cheqd-tag + // github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.45.9-cheqd-tag // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 + // github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // Forbole Tendermint fork - 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 +// Forbole Tendermint fork +// 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 ) diff --git a/go.sum b/go.sum index b73d14baf..21ab04b39 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +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= @@ -16,15 +17,23 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb 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.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y= +cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= 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 v1.13.0 h1:AYrLkB8NPdDRslNp4Jxmzrhdr03fUAIDbiGFjLWowoU= +cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= +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.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= +cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= 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,194 +44,166 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl 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.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ= +cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= +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.4 h1:JtKedVLGzA0vv84xjYmZ75RKG35Kf2WwcFu8IjRkIIw= +cosmossdk.io/math v1.0.0-beta.4/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= 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= +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/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/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/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/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/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/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.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= -github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -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/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/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -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/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/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/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= -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.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +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.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= +github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo= +github.com/btcsuite/btcd v0.22.2/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/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-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/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -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.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= 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/cheqd/cheqd-node v0.6.10 h1:d4BMjgetLw9qGiPC5iJ80EQGKzpPaZIYXZoEnl2yCu8= -github.com/cheqd/cheqd-node v0.6.10/go.mod h1:qleVcKI+Dgj2e1Dug1wRriOrjytlrz2YKh5BrSP0quE= -github.com/cheqd/cosmos-sdk v0.45.9-cheqd-tag h1:K1eIYxqaQ5aFSVAnPNOeU12U0B3mStYN0vrawMoUkCY= -github.com/cheqd/cosmos-sdk v0.45.9-cheqd-tag/go.mod h1:Z5M4TX7PsHNHlF/1XanI2DIpORQ+Q/st7oaeufEjnvU= +github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/cheqd/cheqd-node v1.2.2 h1:oQl732gnP2HmEmp6DKLmVsNAjoE0JnZNBRRbQmc6lPE= +github.com/cheqd/cheqd-node v1.2.2/go.mod h1:t4KptNTF4r67poQiPq9BlGZy0pOwDkRkzi7/40UnAMM= +github.com/cheqd/juno/v4 v4.0.2-cheqd h1:EhOXjk+X0UnMTDSdRhIvz6doeqq1HYB+TRpPge+sL+o= +github.com/cheqd/juno/v4 v4.0.2-cheqd/go.mod h1:0uDTg52EipxOLMutsaxXO2JevYgLfevmrxPcm+WT0/E= +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/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/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/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/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.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/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.8 h1:n3brrFOwTwR9cKpr+k6vf6ryU+4iyzNdKOnQzEP9DwM= +github.com/cosmos/cosmos-sdk v0.46.8/go.mod h1:lg+FqwndbbCYQk1YTUWRDpOsNbQG0nINQqxY7ZnsAP8= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= -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/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= +github.com/cosmos/gogoproto v1.4.3 h1:RP3yyVREh9snv/lsOvmsAPQt8f44LgL281X0IOIhhcI= +github.com/cosmos/gogoproto v1.4.3/go.mod h1:0hLIG5TR7IvV1fme1HCFKjfzW9X2x0Mo+RooWXCnOWU= 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.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= -github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v3 v3.3.0 h1:r8gYUvQreMQrf4R5RgedK9gcbjLk4uE2q6fuZGjf4n0= -github.com/cosmos/ibc-go/v3 v3.3.0/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog= -github.com/cosmos/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/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= -github.com/cosmos/ledger-go v0.9.3 h1:WGyZK4ikuLIkbxJm3lEr1tdQYDdTdveTwoVla7hqfhQ= -github.com/cosmos/ledger-go v0.9.3/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/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= +github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= +github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= +github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= 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/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.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= -github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d h1:1iy2qD6JEhHKKhUOA9IWs7mjco7lnw2qx8FsRI2wirE= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= -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/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= -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.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/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/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 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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -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.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -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/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.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q= github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -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-co-op/gocron v1.16.1 h1:N4MhkCmYx22WqYoII13mMMFW/Fv4RJuz8ft/YPPK7MY= +github.com/go-co-op/gocron v1.16.1/go.mod h1:W/N9G7bntRo5fVQlmjncvqSt74jxCxHfjyHlgcB33T8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -230,7 +211,6 @@ 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= @@ -242,9 +222,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V 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-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es= github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew= -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= @@ -258,11 +238,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= @@ -288,8 +269,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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/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= @@ -305,15 +284,19 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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.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.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/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= @@ -327,40 +310,27 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe 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/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.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.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/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= +github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= 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.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/gravity-devs/liquidity v1.5.1 h1:auhUXv0STUdzfu0pXSQ1iR6umMq0B4jzkC5bHe56xxU= -github.com/gravity-devs/liquidity v1.5.1/go.mod h1:hptEU310SpzhofYiM2ckrIGEDSvnTXJJWZtRQVb/Lk0= -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= @@ -368,78 +338,64 @@ 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 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= 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.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/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/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.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/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -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/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +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.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= 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.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.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +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= @@ -465,42 +421,37 @@ 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.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/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= 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/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/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.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.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -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.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-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/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/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.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -509,8 +460,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ= -github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= +github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= +github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= 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/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= @@ -521,115 +472,74 @@ github.com/multiformats/go-multibase v0.1.1 h1:3ASCDsuLX8+j4kx58qnJ4YFq/JWTJpCyD github.com/multiformats/go-multibase v0.1.1/go.mod h1:ZEjHE+IsUrgp5mhlEAYjMtZwK1k4haNkcaPg9aoe1a8= 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/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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -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/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 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -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/ginkgo/v2 v2.7.0 h1:/XxtEV3I3Eif/HobnVx9YmJgk8ENdRsuUmM+fLCFNow= 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.22.0 h1:AIg2/OntwkBiCg5Tt1ayyiF1ArFrWFoCSMtMi/wdApk= -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/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= +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/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 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.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= -github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/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.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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= 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.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.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= @@ -639,61 +549,41 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG 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/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= 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/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= github.com/rs/zerolog v1.28.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/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/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.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +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.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= 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.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= -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= @@ -707,68 +597,50 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= -github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= -github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/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/tendermint v0.34.24 h1:879MKKJWYYPJEMMKME+DWUTY4V9f/FBpnZDI82ky+4k= +github.com/tendermint/tendermint v0.34.24/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI= 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/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= +github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= 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/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -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/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/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/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.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= +github.com/zondax/ledger-go v0.14.1/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.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.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= 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/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -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= -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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -776,16 +648,13 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/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-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= 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.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/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= @@ -796,11 +665,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= @@ -821,15 +690,13 @@ 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/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-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= @@ -840,7 +707,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= @@ -848,7 +714,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= @@ -860,16 +725,18 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= 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-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220726230323-06994584191e h1:wOQNKh1uuDGRnmgF0jDxh7ctgGy/3P4rYWQRVJD4/Yg= -golang.org/x/net v0.0.0-20220726230323-06994584191e/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= 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= @@ -881,6 +748,8 @@ 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-20210514164344-f6687ab2804c/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.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8= +golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= 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= @@ -891,12 +760,11 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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= @@ -913,14 +781,11 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w 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= @@ -931,7 +796,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= @@ -944,7 +808,6 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/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= @@ -960,15 +823,16 @@ golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 h1:dyU22nBWzrmTQxtNrr4dzVOvaw35nUYE279vF9UmsI8= -golang.org/x/sys v0.0.0-20220727055044-e65921a090b8/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-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.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= 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= @@ -976,18 +840,18 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.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.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.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= @@ -997,9 +861,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= @@ -1007,7 +868,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-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= @@ -1036,11 +896,13 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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-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= @@ -1060,12 +922,15 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ= +google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= +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= @@ -1073,7 +938,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= @@ -1102,19 +966,34 @@ 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-20210108203827-ffc7fda8c3d7/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-20220725144611-272f38e5d71b h1:SfSkJugek6xm7lWywqth4r2iTrYLpD8lOj1nMIIhMNM= -google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= -google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= +google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 h1:jmIfw8+gSvXcZSgaFAGyInDXeWzUhvYH57G/5GKMn70= +google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +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.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= 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= @@ -1127,24 +1006,22 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.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.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 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +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.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +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/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= @@ -1166,8 +1043,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= +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..d28abfba4 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/cheqd/juno/v4/node/remote" "gopkg.in/yaml.v3" ) diff --git a/modules/actions/module.go b/modules/actions/module.go index a7c40ee02..95e690fd5 100644 --- a/modules/actions/module.go +++ b/modules/actions/module.go @@ -1,12 +1,12 @@ package actions import ( + "github.com/cheqd/juno/v4/modules" + "github.com/cheqd/juno/v4/node" + "github.com/cheqd/juno/v4/node/builder" + nodeconfig "github.com/cheqd/juno/v4/node/config" + "github.com/cheqd/juno/v4/types/config" "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" modulestypes "github.com/forbole/bdjuno/v3/modules/types" ) diff --git a/modules/actions/types/handler.go b/modules/actions/types/handler.go index f233a2d4c..8748b8f6e 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/cheqd/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 21df5f8ca..b48debbc2 100644 --- a/modules/actions/types/response.go +++ b/modules/actions/types/response.go @@ -3,6 +3,7 @@ package types import ( "time" + sdkint "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" @@ -95,6 +96,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 sdkint.Int `json:"balance"` } diff --git a/modules/auth/handle_msg.go b/modules/auth/handle_msg.go index ddcc054e4..c38d1312b 100644 --- a/modules/auth/handle_msg.go +++ b/modules/auth/handle_msg.go @@ -4,8 +4,8 @@ import ( "fmt" "time" + juno "github.com/cheqd/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v3/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..5ccc26d8c 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/cheqd/juno/v4/modules" + "github.com/cheqd/juno/v4/modules/messages" ) var ( diff --git a/modules/bank/module.go b/modules/bank/module.go index 4f8fe26d6..7a82a9f80 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/cheqd/juno/v4/modules/messages" - "github.com/forbole/juno/v3/modules" + "github.com/cheqd/juno/v4/modules" ) var ( diff --git a/modules/bank/source/local/source.go b/modules/bank/source/local/source.go index f81c48d89..53647cb0e 100644 --- a/modules/bank/source/local/source.go +++ b/modules/bank/source/local/source.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cheqd/juno/v4/node/local" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/forbole/juno/v3/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 81c920127..154b5fac6 100644 --- a/modules/bank/source/remote/source.go +++ b/modules/bank/source/remote/source.go @@ -3,10 +3,10 @@ package remote import ( "fmt" + "github.com/cheqd/juno/v4/node/remote" 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" 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..08f6d9fbc 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/cheqd/juno/v4/types" "github.com/rs/zerolog/log" diff --git a/modules/consensus/module.go b/modules/consensus/module.go index 47ddaebe9..ec4a65e0f 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/cheqd/juno/v4/modules" ) var ( diff --git a/modules/daily_refetch/handle_periodic_operations.go b/modules/daily_refetch/handle_periodic_operations.go index b54489e6e..9c12b252b 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/cheqd/juno/v4/parser" + "github.com/cheqd/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/cheqd/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..914d2c23c 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/cheqd/juno/v4/node" bdjunodb "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/cheqd/juno/v4/modules" ) var ( diff --git a/modules/distribution/handle_msg.go b/modules/distribution/handle_msg.go index 79a01f3da..a69a4aba9 100644 --- a/modules/distribution/handle_msg.go +++ b/modules/distribution/handle_msg.go @@ -1,8 +1,8 @@ package distribution import ( + juno "github.com/cheqd/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v3/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" ) diff --git a/modules/distribution/module.go b/modules/distribution/module.go index 14faa75da..8db659f51 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/cheqd/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 537eebc68..9bf8a1b9f 100644 --- a/modules/distribution/source/local/source.go +++ b/modules/distribution/source/local/source.go @@ -3,9 +3,9 @@ package local import ( "fmt" + "github.com/cheqd/juno/v4/node/local" sdk "github.com/cosmos/cosmos-sdk/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/forbole/juno/v3/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 7284c45bc..c56e43f32 100644 --- a/modules/distribution/source/remote/source.go +++ b/modules/distribution/source/remote/source.go @@ -1,9 +1,9 @@ package remote import ( + "github.com/cheqd/juno/v4/node/remote" sdk "github.com/cosmos/cosmos-sdk/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/forbole/juno/v3/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..43f7ee464 100644 --- a/modules/distribution/source/remote/source_actions.go +++ b/modules/distribution/source/remote/source_actions.go @@ -3,9 +3,9 @@ package remote import ( "fmt" + "github.com/cheqd/juno/v4/node/remote" 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/bdjuno/v3/utils" ) diff --git a/modules/feegrant/handle_block.go b/modules/feegrant/handle_block.go index e6f194947..46c816e38 100644 --- a/modules/feegrant/handle_block.go +++ b/modules/feegrant/handle_block.go @@ -5,8 +5,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" + juno "github.com/cheqd/juno/v4/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - juno "github.com/forbole/juno/v3/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..99e767931 100644 --- a/modules/feegrant/handle_msg.go +++ b/modules/feegrant/handle_msg.go @@ -3,9 +3,9 @@ package feegrant import ( "fmt" + juno "github.com/cheqd/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" - juno "github.com/forbole/juno/v3/types" "github.com/forbole/bdjuno/v3/types" ) diff --git a/modules/feegrant/module.go b/modules/feegrant/module.go index 479e000c2..3c04d1639 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/cheqd/juno/v4/modules" ) var ( diff --git a/modules/gov/handle_block.go b/modules/gov/handle_block.go index 9a279eafa..82cdc6193 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/cheqd/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..500907774 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.saveProposals(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 { @@ -44,7 +45,7 @@ func (m *Module) HandleGenesis(doc *tmtypes.GenesisDoc, appState map[string]json } // saveProposals save proposals from genesis file -func (m *Module) saveProposals(slice govtypes.Proposals, genDoc *tmtypes.GenesisDoc) error { +func (m *Module) saveProposals(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)) @@ -57,10 +58,10 @@ func (m *Module) saveProposals(slice govtypes.Proposals, genDoc *tmtypes.Genesis proposal.ProposalType(), proposal.GetContent(), proposal.Status.String(), - proposal.SubmitTime, - proposal.DepositEndTime, - proposal.VotingStartTime, - proposal.VotingEndTime, + &proposal.SubmitTime, + &proposal.DepositEndTime, + &proposal.VotingStartTime, + &proposal.VotingEndTime, "", ) diff --git a/modules/gov/handle_msg.go b/modules/gov/handle_msg.go index 0397c020e..c59be59a9 100644 --- a/modules/gov/handle_msg.go +++ b/modules/gov/handle_msg.go @@ -7,9 +7,11 @@ import ( "github.com/forbole/bdjuno/v3/types" + juno "github.com/cheqd/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - juno "github.com/forbole/juno/v3/types" + gov "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ) // HandleMsg implements modules.MessageModule @@ -19,10 +21,10 @@ 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 *govtypesv1beta1.MsgDeposit: return m.handleMsgDeposit(tx, cosmosMsg) case *govtypes.MsgVote: @@ -33,14 +35,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) } @@ -57,18 +59,18 @@ func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.M } // Unpack the content - var content govtypes.Content - err = m.cdc.UnpackAny(proposal.Content, &content) - if err != nil { - return fmt.Errorf("error while unpacking proposal content: %s", err) - } + // var content govtypes.Content + // err = m.cdc.UnpackAny(proposal.Content, &content) + // if err != nil { + // return fmt.Errorf("error while unpacking proposal content: %s", err) + // } // Store the proposal proposalObj := types.NewProposal( - proposal.ProposalId, - proposal.ProposalRoute(), - proposal.ProposalType(), - proposal.GetContent(), + proposal.Id, + msg.GetContent().ProposalRoute(), + msg.GetContent().ProposalType(), + msg.GetContent(), proposal.Status.String(), proposal.SubmitTime, proposal.DepositEndTime, @@ -87,12 +89,12 @@ func (m *Module) handleMsgSubmitProposal(tx *juno.Tx, index int, msg *govtypes.M } // Store the deposit - deposit := types.NewDeposit(proposal.ProposalId, msg.Proposer, msg.InitialDeposit, txTimestamp, tx.Height) + deposit := types.NewDeposit(proposal.Id, msg.Proposer, msg.InitialDeposit, txTimestamp, tx.Height) return m.db.SaveDeposits([]types.Deposit{deposit}) } // 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 *govtypesv1beta1.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) diff --git a/modules/gov/module.go b/modules/gov/module.go index 501084aef..9e63a9039 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/cheqd/juno/v4/modules" ) var ( diff --git a/modules/gov/source/local/source.go b/modules/gov/source/local/source.go index 5303cc736..5f751e323 100644 --- a/modules/gov/source/local/source.go +++ b/modules/gov/source/local/source.go @@ -3,9 +3,9 @@ package local import ( "fmt" + "github.com/cheqd/juno/v4/node/local" sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/forbole/juno/v3/node/local" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govsource "github.com/forbole/bdjuno/v3/modules/gov/source" ) @@ -27,90 +27,90 @@ func NewSource(source *local.Source, govKeeper govtypes.QueryServer) *Source { } // Proposal implements govsource.Source -func (s Source) Proposal(height int64, id uint64) (govtypes.Proposal, error) { +func (s Source) Proposal(height int64, id uint64) (*govtypes.Proposal, error) { ctx, err := s.LoadHeight(height) if err != nil { - return govtypes.Proposal{}, fmt.Errorf("error while loading height: %s", err) + return nil, fmt.Errorf("error while loading height: %s", err) } res, err := s.q.Proposal(sdk.WrapSDKContext(ctx), &govtypes.QueryProposalRequest{ProposalId: id}) if err != nil { - return govtypes.Proposal{}, err + return nil, 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) (*govtypes.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}) 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) (*govtypes.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}) 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) (*govtypes.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}) 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) (*govtypes.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}) 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) (*govtypes.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}) 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 25af5c5f7..ef332773d 100644 --- a/modules/gov/source/remote/source.go +++ b/modules/gov/source/remote/source.go @@ -1,8 +1,8 @@ package remote import ( - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/forbole/juno/v3/node/remote" + "github.com/cheqd/juno/v4/node/remote" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govsource "github.com/forbole/bdjuno/v3/modules/gov/source" ) @@ -24,78 +24,78 @@ func NewSource(source *remote.Source, govClient govtypes.QueryClient) *Source { } // Proposal implements govsource.Source -func (s Source) Proposal(height int64, id uint64) (govtypes.Proposal, error) { +func (s Source) Proposal(height int64, id uint64) (*govtypes.Proposal, error) { res, err := s.govClient.Proposal( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.QueryProposalRequest{ProposalId: id}, ) if err != nil { - return govtypes.Proposal{}, err + return nil, 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) (*govtypes.Deposit, error) { res, err := s.govClient.Deposit( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.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) (*govtypes.TallyResult, error) { res, err := s.govClient.TallyResult( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.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) (*govtypes.DepositParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.QueryParamsRequest{ParamsType: govtypes.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) (*govtypes.VotingParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.QueryParamsRequest{ParamsType: govtypes.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) (*govtypes.TallyParams, error) { res, err := s.govClient.Params( remote.GetHeightRequestContext(s.Ctx, height), &govtypes.QueryParamsRequest{ParamsType: govtypes.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..dfdce6536 100644 --- a/modules/gov/source/source.go +++ b/modules/gov/source/source.go @@ -1,12 +1,12 @@ package source -import govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" +import govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" 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) (*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) } diff --git a/modules/gov/utils_proposal.go b/modules/gov/utils_proposal.go index 18b987e0a..5b05a1b8b 100644 --- a/modules/gov/utils_proposal.go +++ b/modules/gov/utils_proposal.go @@ -9,6 +9,10 @@ import ( proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + gov "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" tmctypes "github.com/tendermint/tendermint/rpc/core/types" @@ -17,8 +21,6 @@ import ( "github.com/forbole/bdjuno/v3/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) func (m *Module) UpdateProposal(height int64, blockTime time.Time, id uint64) error { @@ -26,7 +28,7 @@ func (m *Module) UpdateProposal(height int64, blockTime time.Time, id uint64) er proposal, err := m.source.Proposal(height, id) if err != nil { // Check if proposal has reached the voting end time - passedVotingPeriod := blockTime.After(proposal.VotingEndTime) + passedVotingPeriod := blockTime.After(*proposal.VotingEndTime) if strings.Contains(err.Error(), codes.NotFound.String()) && passedVotingPeriod { // Handle case when a proposal is deleted from the chain (did not pass deposit period) @@ -101,10 +103,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,10 +135,10 @@ 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 *govtypes.Proposal) error { return m.db.UpdateProposal( types.NewProposalUpdate( - proposal.ProposalId, + proposal.Id, proposal.Status.String(), proposal.VotingStartTime, proposal.VotingEndTime, @@ -145,32 +147,32 @@ 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 *govtypes.Proposal) error { height, err := m.db.GetLastBlockHeight() if err != nil { return err } - result, err := m.source.TallyResult(height, proposal.ProposalId) + result, err := m.source.TallyResult(height, proposal.Id) if err != nil { return fmt.Errorf("error while getting tally result: %s", err) } return m.db.SaveTallyResults([]types.TallyResult{ types.NewTallyResult( - proposal.ProposalId, - result.Yes.String(), - result.Abstain.String(), - result.No.String(), - result.NoWithVeto.String(), + proposal.Id, + 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 { - content, ok := proposal.Content.GetCachedValue().(*distrtypes.CommunityPoolSpendProposal) +func (m *Module) updateAccounts(proposal *govtypes.Proposal) error { + content, ok := proposal.Messages[0].GetCachedValue().(*distrtypes.CommunityPoolSpendProposal) if ok { height, err := m.db.GetLastBlockHeight() if err != nil { @@ -270,15 +272,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 { +func (m *Module) handlePassedProposal(proposal *govtypes.Proposal, height int64) error { if proposal.Status != govtypes.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.Messages[0], &content) if err != nil { return fmt.Errorf("error while handling ParamChangeProposal: %s", err) } @@ -291,16 +293,17 @@ func (m *Module) handlePassedProposal(proposal govtypes.Proposal, height int64) return fmt.Errorf("error while updating params from ParamChangeProposal: %s", err) } + //nolint:staticcheck case *upgradetypes.SoftwareUpgradeProposal: // Store software upgrade plan while SoftwareUpgradeProposal passed - err = m.db.SaveSoftwareUpgradePlan(proposal.ProposalId, p.Plan, height) + err = m.db.SaveSoftwareUpgradePlan(proposal.Id, p.Plan, height) if err != nil { return fmt.Errorf("error while storing software upgrade plan: %s", err) } - + //nolint:staticcheck case *upgradetypes.CancelSoftwareUpgradeProposal: // Delete software upgrade plan while CancelSoftwareUpgradeProposal passed - err = m.db.DeleteSoftwareUpgradePlan(proposal.ProposalId) + err = m.db.DeleteSoftwareUpgradePlan(proposal.Id) if err != nil { return fmt.Errorf("error while deleting software upgrade plan: %s", err) } diff --git a/modules/mint/module.go b/modules/mint/module.go index e0b7fb834..f33d23ba8 100644 --- a/modules/mint/module.go +++ b/modules/mint/module.go @@ -1,8 +1,8 @@ package mint import ( + "github.com/cheqd/juno/v4/modules" "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v3/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 f8ce756f6..6cbd46be1 100644 --- a/modules/mint/source/local/source.go +++ b/modules/mint/source/local/source.go @@ -3,9 +3,9 @@ package local import ( "fmt" + "github.com/cheqd/juno/v4/node/local" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/forbole/juno/v3/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 3719c8455..3f0fcef34 100644 --- a/modules/mint/source/remote/source.go +++ b/modules/mint/source/remote/source.go @@ -1,9 +1,9 @@ package remote import ( + "github.com/cheqd/juno/v4/node/remote" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/forbole/juno/v3/node/remote" mintsource "github.com/forbole/bdjuno/v3/modules/mint/source" ) diff --git a/modules/modules/module.go b/modules/modules/module.go index f26098c34..92c96da32 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/cheqd/juno/v4/modules" + "github.com/cheqd/juno/v4/types/config" "github.com/forbole/bdjuno/v3/database" ) diff --git a/modules/pricefeed/module.go b/modules/pricefeed/module.go index 58d2f01ae..a57d28508 100644 --- a/modules/pricefeed/module.go +++ b/modules/pricefeed/module.go @@ -1,12 +1,12 @@ package pricefeed import ( + "github.com/cheqd/juno/v4/types/config" "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v3/types/config" "github.com/forbole/bdjuno/v3/database" - "github.com/forbole/juno/v3/modules" + "github.com/cheqd/juno/v4/modules" ) var ( diff --git a/modules/registrar.go b/modules/registrar.go index b1848080c..ec2768aef 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/cheqd/juno/v4/modules/pruning" + "github.com/cheqd/juno/v4/modules/telemetry" "github.com/forbole/bdjuno/v3/modules/slashing" + jmodules "github.com/cheqd/juno/v4/modules" + "github.com/cheqd/juno/v4/modules/messages" + "github.com/cheqd/juno/v4/modules/registrar" "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" "github.com/forbole/bdjuno/v3/utils" @@ -63,7 +63,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..572756612 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/cheqd/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..ffcb8f408 100644 --- a/modules/slashing/module.go +++ b/modules/slashing/module.go @@ -1,8 +1,8 @@ package slashing import ( + "github.com/cheqd/juno/v4/modules" "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v3/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 d90d88971..bf246d036 100644 --- a/modules/slashing/source/local/source.go +++ b/modules/slashing/source/local/source.go @@ -3,10 +3,10 @@ package local import ( "fmt" + "github.com/cheqd/juno/v4/node/local" 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" 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 a47f50acf..053257c98 100644 --- a/modules/slashing/source/remote/source.go +++ b/modules/slashing/source/remote/source.go @@ -3,9 +3,9 @@ package remote import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cheqd/juno/v4/node/remote" "github.com/cosmos/cosmos-sdk/types/query" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/forbole/juno/v3/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..e347cfa06 100644 --- a/modules/staking/handle_block.go +++ b/modules/staking/handle_block.go @@ -6,8 +6,8 @@ import ( "github.com/forbole/bdjuno/v3/types" + juno "github.com/cheqd/juno/v4/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - juno "github.com/forbole/juno/v3/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..d188a6f82 100644 --- a/modules/staking/handle_msg.go +++ b/modules/staking/handle_msg.go @@ -5,8 +5,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + juno "github.com/cheqd/juno/v4/types" sdk "github.com/cosmos/cosmos-sdk/types" - juno "github.com/forbole/juno/v3/types" ) // HandleMsg implements MessageModule diff --git a/modules/staking/module.go b/modules/staking/module.go index c6c0d58aa..48530b7bb 100644 --- a/modules/staking/module.go +++ b/modules/staking/module.go @@ -1,8 +1,8 @@ package staking import ( + "github.com/cheqd/juno/v4/modules" "github.com/cosmos/cosmos-sdk/codec" - "github.com/forbole/juno/v3/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 c5a6726c0..0d1b7d490 100644 --- a/modules/staking/source/local/source.go +++ b/modules/staking/source/local/source.go @@ -3,10 +3,10 @@ package local import ( "fmt" + "github.com/cheqd/juno/v4/node/local" 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" 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 8cae1ecec..bc678dd4a 100644 --- a/modules/staking/source/remote/source.go +++ b/modules/staking/source/remote/source.go @@ -3,9 +3,9 @@ package remote import ( "fmt" + "github.com/cheqd/juno/v4/node/remote" "github.com/cosmos/cosmos-sdk/types/query" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/forbole/juno/v3/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 eb3be92a0..60f53c3e2 100644 --- a/modules/staking/source/remote/source_actions.go +++ b/modules/staking/source/remote/source_actions.go @@ -1,9 +1,9 @@ package remote import ( + "github.com/cheqd/juno/v4/node/remote" "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/bdjuno/v3/utils" ) diff --git a/modules/staking/utils_validators.go b/modules/staking/utils_validators.go index 50fcc2c51..65512ee39 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/cheqd/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..34dea536c 100644 --- a/modules/types/sources.go +++ b/modules/types/sources.go @@ -7,19 +7,19 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/tendermint/tendermint/libs/log" + "github.com/cheqd/juno/v4/node/remote" "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/forbole/juno/v3/node/remote" + "github.com/cheqd/juno/v4/node/local" 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" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" 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" - nodeconfig "github.com/forbole/juno/v3/node/config" + nodeconfig "github.com/cheqd/juno/v4/node/config" banksource "github.com/forbole/bdjuno/v3/modules/bank/source" localbanksource "github.com/forbole/bdjuno/v3/modules/bank/source/local" diff --git a/modules/upgrade/handle_block.go b/modules/upgrade/handle_block.go index 9a588b71f..cbb2d0687 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/cheqd/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..6e4a501fd 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/cheqd/juno/v4/modules" ) var ( diff --git a/types/config/config.go b/types/config/config.go index f36154ed3..c406c1a1a 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/cheqd/juno/v4/cmd/init" + junoconfig "github.com/cheqd/juno/v4/types/config" "github.com/spf13/cobra" "gopkg.in/yaml.v3" diff --git a/types/gov.go b/types/gov.go index 4e26108d3..79e8ceb25 100644 --- a/types/gov.go +++ b/types/gov.go @@ -4,7 +4,10 @@ import ( "time" 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" + + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" ) const ( @@ -18,7 +21,15 @@ type DepositParams struct { } // NewDepositParam allows to build a new DepositParams -func NewDepositParam(d govtypes.DepositParams) DepositParams { +func NewDepositParam(d *govtypes.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(), @@ -31,7 +42,14 @@ type VotingParams struct { } // NewVotingParams allows to build a new VotingParams instance -func NewVotingParams(v govtypes.VotingParams) VotingParams { +func NewVotingParams(v *govtypes.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(), } @@ -39,21 +57,36 @@ func NewVotingParams(v govtypes.VotingParams) VotingParams { // GovParams contains the data of the x/gov module parameters type GovParams struct { - TallyParams TallyParams `json:"tally_params" yaml:"tally_params"` DepositParams DepositParams `json:"deposit_params" yaml:"deposit_params"` - Height int64 `json:"height" ymal:"height"` VotingParams VotingParams `json:"voting_params" yaml:"voting_params"` + TallyParams TallyParams `json:"tally_params" yaml:"tally_params"` + 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 *govtypes.TallyParams) TallyParams { return TallyParams{ Quorum: t.Quorum, Threshold: t.Threshold, @@ -61,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{ @@ -71,20 +113,30 @@ 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 type Proposal struct { - SubmitTime time.Time - DepositEndTime time.Time - VotingStartTime time.Time - VotingEndTime time.Time - Content govtypes.Content ProposalRoute string ProposalType string + ProposalID uint64 + Content govtypesv1beta1.Content Status string + SubmitTime *time.Time + DepositEndTime *time.Time + VotingStartTime *time.Time + VotingEndTime *time.Time Proposer string - ProposalID uint64 } // NewProposal return a new Proposal instance @@ -92,12 +144,12 @@ func NewProposal( proposalID uint64, proposalRoute string, proposalType string, - content govtypes.Content, + content govtypesv1beta1.Content, status string, - submitTime time.Time, - depositEndTime time.Time, - votingStartTime time.Time, - votingEndTime time.Time, + submitTime *time.Time, + depositEndTime *time.Time, + votingStartTime *time.Time, + votingEndTime *time.Time, proposer string, ) Proposal { return Proposal{ @@ -119,26 +171,26 @@ func (p Proposal) Equal(other Proposal) bool { return p.ProposalRoute == other.ProposalRoute && p.ProposalType == other.ProposalType && p.ProposalID == other.ProposalID && - p.Content.String() == other.Content.String() && + p.Content == other.Content && p.Status == other.Status && - p.SubmitTime.Equal(other.SubmitTime) && - p.DepositEndTime.Equal(other.DepositEndTime) && - p.VotingStartTime.Equal(other.VotingStartTime) && - p.VotingEndTime.Equal(other.VotingEndTime) && + p.SubmitTime == other.SubmitTime && + p.DepositEndTime == other.DepositEndTime && + p.VotingStartTime == other.VotingStartTime && + p.VotingEndTime == other.VotingEndTime && p.Proposer == other.Proposer } // ProposalUpdate contains the data that should be used when updating a governance proposal type ProposalUpdate struct { - VotingStartTime time.Time - VotingEndTime time.Time - Status string ProposalID uint64 + Status string + VotingStartTime *time.Time + VotingEndTime *time.Time } // NewProposalUpdate allows to build a new ProposalUpdate instance func NewProposalUpdate( - proposalID uint64, status string, votingStartTime, votingEndTime time.Time, + proposalID uint64, status string, votingStartTime, votingEndTime *time.Time, ) ProposalUpdate { return ProposalUpdate{ ProposalID: proposalID, @@ -208,11 +260,11 @@ func NewVote( // TallyResult contains the data about the final results of a proposal type TallyResult struct { + ProposalID uint64 Yes string Abstain string No string NoWithVeto string - ProposalID uint64 Height int64 } @@ -239,8 +291,8 @@ func NewTallyResult( // ProposalStakingPoolSnapshot contains the data about a single staking pool snapshot to be associated with a proposal type ProposalStakingPoolSnapshot struct { - Pool *Pool ProposalID uint64 + Pool *Pool } // NewProposalStakingPoolSnapshot returns a new ProposalStakingPoolSnapshot instance @@ -256,12 +308,12 @@ func NewProposalStakingPoolSnapshot(proposalID uint64, pool *Pool) ProposalStaki // ProposalValidatorStatusSnapshot represents a single snapshot of the status of a validator associated // with a single proposal type ProposalValidatorStatusSnapshot struct { - ValidatorConsAddress string ProposalID uint64 + ValidatorConsAddress string ValidatorVotingPower int64 ValidatorStatus int - Height int64 ValidatorJailed bool + Height int64 } // NewProposalValidatorStatusSnapshot returns a new ProposalValidatorStatusSnapshot instance diff --git a/types/staking_pool_params.go b/types/staking_pool_params.go index 708ed1ed0..cc87d6ccb 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" + sdkint "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 sdkint.Int + NotBondedTokens sdkint.Int + UnbondingTokens sdkint.Int + StakedNotBondedTokens sdkint.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 sdkint.Int, height int64) *Pool { return &Pool{ BondedTokens: bondedTokens, NotBondedTokens: notBondedTokens, diff --git a/types/staking_validator.go b/types/staking_validator.go index adf5c2b99..1eedc0e56 100644 --- a/types/staking_validator.go +++ b/types/staking_validator.go @@ -1,6 +1,7 @@ package types import ( + sdkint "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) @@ -104,14 +105,14 @@ func NewValidatorDescription( // ValidatorCommission contains the data of a validator commission at a given height type ValidatorCommission struct { Commission *sdk.Dec - MinSelfDelegation *sdk.Int + MinSelfDelegation *sdkint.Int ValAddress string Height int64 } // NewValidatorCommission return a new validator commission instance func NewValidatorCommission( - valAddress string, rate *sdk.Dec, minSelfDelegation *sdk.Int, height int64, + valAddress string, rate *sdk.Dec, minSelfDelegation *sdkint.Int, height int64, ) ValidatorCommission { return ValidatorCommission{ ValAddress: valAddress, diff --git a/utils/genesis.go b/utils/genesis.go index 326591f04..5b420d0ff 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/cheqd/juno/v4/node" + "github.com/cheqd/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 f15591cd9..03a1e2893 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/cheqd/juno/v4/node" coretypes "github.com/tendermint/tendermint/rpc/core/types" )