From 65dccb0c9809d5acd18db0ab0f0a0f75fcee2308 Mon Sep 17 00:00:00 2001 From: Dreamer Date: Mon, 11 Mar 2024 14:26:40 +0800 Subject: [PATCH] refactor: change path from v2 to v3 (#2912) * bump up go to v1.21 * change path from v2 to v3 * make format --- .github/workflows/TestUnit.yml | 2 +- Dockerfile | 2 +- Makefile | 10 ++--- app/ante/handler_options.go | 2 +- app/app.go | 12 +++--- app/encoding.go | 2 +- app/genesis.go | 2 +- app/keepers/keepers.go | 12 +++--- app/keepers/keys.go | 4 +- app/modules.go | 12 +++--- app/rpc/auth.go | 2 +- app/rpc/override.go | 3 +- app/sim_test.go | 6 +-- app/upgrade.go | 8 ++-- app/upgrades/types.go | 2 +- app/upgrades/v200/config.go | 2 +- app/upgrades/v200/upgrades.go | 4 +- app/upgrades/v210/upgrades.go | 2 +- app/upgrades/v300/upgrades.go | 2 +- client/lite/swagger.go | 2 +- cmd/iris/cmd/genesis.go | 2 +- cmd/iris/cmd/keys.go | 2 +- cmd/iris/cmd/root.go | 6 +-- cmd/iris/cmd/testnet.go | 4 +- cmd/iris/main.go | 6 +-- go.mod | 4 +- go.sum | 42 +++++++++++++++++++ modules/guardian/client/cli/cli_test.go | 8 ++-- modules/guardian/client/cli/query.go | 2 +- modules/guardian/client/cli/tx.go | 2 +- .../guardian/client/testutil/test_helpers.go | 4 +- modules/guardian/genesis.go | 4 +- modules/guardian/genesis_test.go | 8 ++-- modules/guardian/handler.go | 4 +- modules/guardian/keeper/grpc_query.go | 2 +- modules/guardian/keeper/grpc_query_test.go | 2 +- modules/guardian/keeper/keeper.go | 2 +- modules/guardian/keeper/keeper_test.go | 6 +-- modules/guardian/keeper/msg_service.go | 2 +- modules/guardian/module.go | 6 +-- modules/guardian/types/msgs_test.go | 3 +- modules/mint/abci.go | 4 +- modules/mint/abci_test.go | 6 +-- modules/mint/client/cli/cli_test.go | 6 +-- modules/mint/client/cli/query.go | 2 +- modules/mint/client/rest/grpc_query_test.go | 4 +- modules/mint/client/testutil/test_helpers.go | 2 +- modules/mint/genesis.go | 4 +- modules/mint/keeper/grpc_query.go | 2 +- modules/mint/keeper/grpc_query_test.go | 2 +- modules/mint/keeper/keeper.go | 2 +- modules/mint/keeper/keeper_test.go | 4 +- modules/mint/keeper/migrations.go | 2 +- modules/mint/keeper/msg_server.go | 2 +- modules/mint/keeper/params.go | 2 +- modules/mint/migrations/v2/migrate.go | 2 +- modules/mint/module.go | 8 ++-- modules/mint/simulation/decoder.go | 2 +- modules/mint/simulation/decoder_test.go | 6 +-- modules/mint/simulation/genesis.go | 2 +- proto/buf.gen.pulsar.yaml | 2 +- proto/irishub/guardian/genesis.proto | 2 +- proto/irishub/guardian/guardian.proto | 2 +- proto/irishub/guardian/query.proto | 2 +- proto/irishub/guardian/tx.proto | 2 +- proto/irishub/mint/genesis.proto | 2 +- proto/irishub/mint/mint.proto | 2 +- proto/irishub/mint/query.proto | 2 +- proto/irishub/mint/tx.proto | 3 +- scripts/protocgen.sh | 2 +- simapp/app.go | 17 ++++---- simapp/test_helpers.go | 4 +- sims.mk | 2 +- 73 files changed, 182 insertions(+), 140 deletions(-) diff --git a/.github/workflows/TestUnit.yml b/.github/workflows/TestUnit.yml index f58f1a32f..1709d9a37 100644 --- a/.github/workflows/TestUnit.yml +++ b/.github/workflows/TestUnit.yml @@ -12,5 +12,5 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '^1.18' # The Go version to download (if necessary) and use. + go-version: '^1.21' # The Go version to download (if necessary) and use. - run: make test-unit diff --git a/Dockerfile b/Dockerfile index ceb07eac7..3bb97a4e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Build image: docker build -t irisnet/irishub:v2.1.0 --build-arg EVM_CHAIN_ID=6688 . # -FROM golang:1.19.13-alpine3.18 as builder +FROM golang:1.21-alpine as builder ARG EVM_CHAIN_ID diff --git a/Makefile b/Makefile index 6398cd70a..c94b614a7 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=iris \ -X github.com/cosmos/cosmos-sdk/version.AppName=iris \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/irisnet/irishub/v2/types.EIP155ChainID=$(EVM_CHAIN_ID) \ + -X github.com/irisnet/irishub/v3/types.EIP155ChainID=$(EVM_CHAIN_ID) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" ifeq ($(WITH_CLEVELDB),yes) @@ -193,13 +193,13 @@ test-cover: lint: golangci-lint golangci-lint run - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs gofmt -d -s + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lite/statik/statik.go" -not -path "*.pb.go" | xargs gofmt -d -s go mod verify format: - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs gofmt -w -s - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs misspell -w - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs goimports -w -local github.com/irisnet/irishub/v2 + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lite/statik/statik.go" -not -path "*.pb.go" | xargs gofmt -w -s + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lite/statik/statik.go" -not -path "*.pb.go" | xargs misspell -w + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lite/statik/statik.go" -not -path "*.pb.go" | xargs goimports -w -local github.com/irisnet/irishub/v3 benchmark: @go test -mod=readonly -bench=. ./... diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 1b02f7481..b1e9c1047 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -14,7 +14,7 @@ import ( oraclekeeper "github.com/irisnet/irismod/modules/oracle/keeper" tokenkeeper "github.com/irisnet/irismod/modules/token/keeper" - guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" + guardiankeeper "github.com/irisnet/irishub/v3/modules/guardian/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/app.go b/app/app.go index 6890fa01d..d1a6eeede 100644 --- a/app/app.go +++ b/app/app.go @@ -35,12 +35,12 @@ import ( srvflags "github.com/evmos/ethermint/server/flags" - irishubante "github.com/irisnet/irishub/v2/app/ante" - "github.com/irisnet/irishub/v2/app/keepers" - "github.com/irisnet/irishub/v2/app/params" - "github.com/irisnet/irishub/v2/app/rpc" - "github.com/irisnet/irishub/v2/client/lite" - iristypes "github.com/irisnet/irishub/v2/types" + irishubante "github.com/irisnet/irishub/v3/app/ante" + "github.com/irisnet/irishub/v3/app/keepers" + "github.com/irisnet/irishub/v3/app/params" + "github.com/irisnet/irishub/v3/app/rpc" + "github.com/irisnet/irishub/v3/client/lite" + iristypes "github.com/irisnet/irishub/v3/types" ) var ( diff --git a/app/encoding.go b/app/encoding.go index 1797abfa0..afd64dc3f 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package app import ( enccodec "github.com/evmos/ethermint/encoding/codec" - "github.com/irisnet/irishub/v2/app/params" + "github.com/irisnet/irishub/v3/app/params" ) // RegisterEncodingConfig registers concrete types on codec diff --git a/app/genesis.go b/app/genesis.go index 60fa8a68b..d75e1f068 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -1,7 +1,7 @@ package app import ( - "github.com/irisnet/irishub/v2/types" + "github.com/irisnet/irishub/v3/types" ) // NewDefaultGenesisState generates the default state for the application. diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index dcdc503fc..f3067e51f 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -105,12 +105,12 @@ import ( tokentypes "github.com/irisnet/irismod/modules/token/types" tokenv1 "github.com/irisnet/irismod/modules/token/types/v1" - guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/modules/internft" - mintkeeper "github.com/irisnet/irishub/v2/modules/mint/keeper" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" - iristypes "github.com/irisnet/irishub/v2/types" + guardiankeeper "github.com/irisnet/irishub/v3/modules/guardian/keeper" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/internft" + mintkeeper "github.com/irisnet/irishub/v3/modules/mint/keeper" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" + iristypes "github.com/irisnet/irishub/v3/types" ) // AppKeepers defines a structure used to consolidate all diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 4a24980eb..e32c53f64 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -41,8 +41,8 @@ import ( tibcnfttypes "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer/types" tibchost "github.com/bianjieai/tibc-go/modules/tibc/core/24-host" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" ) func (appKeepers *AppKeepers) genStoreKeys() { diff --git a/app/modules.go b/app/modules.go index 4380e2fb5..ff96be58a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -85,12 +85,12 @@ import ( nfttransfer "github.com/bianjieai/nft-transfer" ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" - irisappparams "github.com/irisnet/irishub/v2/app/params" - irisevm "github.com/irisnet/irishub/v2/modules/evm" - "github.com/irisnet/irishub/v2/modules/guardian" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/modules/mint" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" + irisappparams "github.com/irisnet/irishub/v3/app/params" + irisevm "github.com/irisnet/irishub/v3/modules/evm" + "github.com/irisnet/irishub/v3/modules/guardian" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/mint" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" ) var ( diff --git a/app/rpc/auth.go b/app/rpc/auth.go index c1e99fe8d..28c4c7237 100644 --- a/app/rpc/auth.go +++ b/app/rpc/auth.go @@ -19,7 +19,7 @@ import ( ethermint "github.com/evmos/ethermint/types" - "github.com/irisnet/irishub/v2/app/keepers" + "github.com/irisnet/irishub/v3/app/keepers" ) var _ authtypes.QueryServer = authQueryServer{} diff --git a/app/rpc/override.go b/app/rpc/override.go index f0a3838a8..b6d80dfaf 100644 --- a/app/rpc/override.go +++ b/app/rpc/override.go @@ -3,7 +3,8 @@ package rpc import ( "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/irisnet/irishub/v2/app/keepers" + + "github.com/irisnet/irishub/v3/app/keepers" ) var overrideModules = map[string]overrideHandler{ diff --git a/app/sim_test.go b/app/sim_test.go index aa08ae12f..c3f92c1bc 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -19,7 +19,7 @@ import ( tokentypes "github.com/irisnet/irismod/modules/token/types" "github.com/stretchr/testify/require" - iristypes "github.com/irisnet/irishub/v2/types" + iristypes "github.com/irisnet/irishub/v3/types" dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" @@ -314,7 +314,7 @@ func TestAppImportExport(t *testing.T) { func TestAppSimulationAfterImport(t *testing.T) { config := simcli.NewConfigFromFlags() config.ChainID = AppChainID - encfg := RegisterEncodingConfig() + encfg := RegisterEncodingConfig() db, dir, logger, skip, err := simtestutil.SetupSimulation( config, @@ -439,7 +439,7 @@ func TestAppStateDeterminism(t *testing.T) { numSeeds := 3 numTimesToRunPerSeed := 5 appHashList := make([]json.RawMessage, numTimesToRunPerSeed) - encfg := RegisterEncodingConfig() + encfg := RegisterEncodingConfig() for i := 0; i < numSeeds; i++ { config.Seed = rand.Int63() diff --git a/app/upgrade.go b/app/upgrade.go index 4cf6e2116..22dea8b93 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -5,10 +5,10 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/irisnet/irishub/v2/app/upgrades" - v200 "github.com/irisnet/irishub/v2/app/upgrades/v200" - v210 "github.com/irisnet/irishub/v2/app/upgrades/v210" - v300 "github.com/irisnet/irishub/v2/app/upgrades/v300" + "github.com/irisnet/irishub/v3/app/upgrades" + v200 "github.com/irisnet/irishub/v3/app/upgrades/v200" + v210 "github.com/irisnet/irishub/v3/app/upgrades/v210" + v300 "github.com/irisnet/irishub/v3/app/upgrades/v300" ) var ( diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 343d45e95..4336ec725 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/irisnet/irishub/v2/app/keepers" + "github.com/irisnet/irishub/v3/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v200/config.go b/app/upgrades/v200/config.go index d3ffbf8ac..81b92b32c 100644 --- a/app/upgrades/v200/config.go +++ b/app/upgrades/v200/config.go @@ -6,7 +6,7 @@ import ( etherminttypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/irisnet/irishub/v2/types" + "github.com/irisnet/irishub/v3/types" ) // NOTE: Before the release of irishub 2.0.0, the configuration in this file must be modified diff --git a/app/upgrades/v200/upgrades.go b/app/upgrades/v200/upgrades.go index 1c86e5da3..843e2a50c 100644 --- a/app/upgrades/v200/upgrades.go +++ b/app/upgrades/v200/upgrades.go @@ -18,8 +18,8 @@ import ( "github.com/evmos/ethermint/x/feemarket" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/irisnet/irishub/v2/app/upgrades" - irisevm "github.com/irisnet/irishub/v2/modules/evm" + "github.com/irisnet/irishub/v3/app/upgrades" + irisevm "github.com/irisnet/irishub/v3/modules/evm" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v210/upgrades.go b/app/upgrades/v210/upgrades.go index a7ae4ef94..c8ce72ff5 100644 --- a/app/upgrades/v210/upgrades.go +++ b/app/upgrades/v210/upgrades.go @@ -13,7 +13,7 @@ import ( ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" - "github.com/irisnet/irishub/v2/app/upgrades" + "github.com/irisnet/irishub/v3/app/upgrades" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v300/upgrades.go b/app/upgrades/v300/upgrades.go index da1e32da5..d20cad437 100644 --- a/app/upgrades/v300/upgrades.go +++ b/app/upgrades/v300/upgrades.go @@ -12,7 +12,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - "github.com/irisnet/irishub/v2/app/upgrades" + "github.com/irisnet/irishub/v3/app/upgrades" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/client/lite/swagger.go b/client/lite/swagger.go index e34ff6d29..bf6cc207f 100644 --- a/client/lite/swagger.go +++ b/client/lite/swagger.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - _ "github.com/irisnet/irishub/v2/client/lite/statik" + _ "github.com/irisnet/irishub/v3/client/lite/statik" ) // RegisterSwaggerAPI registers swagger route with API Server diff --git a/cmd/iris/cmd/genesis.go b/cmd/iris/cmd/genesis.go index 69773dc12..799ed826b 100644 --- a/cmd/iris/cmd/genesis.go +++ b/cmd/iris/cmd/genesis.go @@ -16,7 +16,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/irisnet/irishub/v2/app/params" + "github.com/irisnet/irishub/v3/app/params" ) const ( diff --git a/cmd/iris/cmd/keys.go b/cmd/iris/cmd/keys.go index 5a4e6a06b..019f0b84c 100644 --- a/cmd/iris/cmd/keys.go +++ b/cmd/iris/cmd/keys.go @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/input" "github.com/cosmos/cosmos-sdk/client/keys" - "github.com/irisnet/irishub/v2/client/keystore" + "github.com/irisnet/irishub/v3/client/keystore" ) // Commands registers a sub-tree of commands to interact with diff --git a/cmd/iris/cmd/root.go b/cmd/iris/cmd/root.go index 98318b3b7..94b6411a5 100644 --- a/cmd/iris/cmd/root.go +++ b/cmd/iris/cmd/root.go @@ -31,9 +31,9 @@ import ( ethermintserver "github.com/evmos/ethermint/server" servercfg "github.com/evmos/ethermint/server/config" - "github.com/irisnet/irishub/v2/app" - "github.com/irisnet/irishub/v2/app/params" - iristypes "github.com/irisnet/irishub/v2/types" + "github.com/irisnet/irishub/v3/app" + "github.com/irisnet/irishub/v3/app/params" + iristypes "github.com/irisnet/irishub/v3/types" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/iris/cmd/testnet.go b/cmd/iris/cmd/testnet.go index c514d8af7..5884edd9b 100644 --- a/cmd/iris/cmd/testnet.go +++ b/cmd/iris/cmd/testnet.go @@ -45,8 +45,8 @@ import ( servicetypes "github.com/irisnet/irismod/modules/service/types" tokentypesv1 "github.com/irisnet/irismod/modules/token/types/v1" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - iristypes "github.com/irisnet/irishub/v2/types" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + iristypes "github.com/irisnet/irishub/v3/types" ) var ( diff --git a/cmd/iris/main.go b/cmd/iris/main.go index 57f02870d..504ca5c00 100644 --- a/cmd/iris/main.go +++ b/cmd/iris/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - _ "github.com/irisnet/irishub/v2/client/lite/statik" - "github.com/irisnet/irishub/v2/cmd/iris/cmd" - "github.com/irisnet/irishub/v2/types" + _ "github.com/irisnet/irishub/v3/client/lite/statik" + "github.com/irisnet/irishub/v3/cmd/iris/cmd" + "github.com/irisnet/irishub/v3/types" ) func main() { diff --git a/go.mod b/go.mod index f2436db2c..6aaf16a1e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/irisnet/irishub/v2 +module github.com/irisnet/irishub/v3 -go 1.19 +go 1.21 require ( github.com/bianjieai/nft-transfer v1.1.3-ibc-v7.3.0 diff --git a/go.sum b/go.sum index fd4c7c051..ec84c22bd 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,7 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3 github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= 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 v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= @@ -230,9 +231,12 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI= +github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= @@ -244,6 +248,7 @@ github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrd github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= +github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= 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/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -331,6 +336,7 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -395,6 +401,7 @@ github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSM github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -472,7 +479,9 @@ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/ github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf h1:Yt+4K30SdjOkRoRRm3vYNQgR+/ZIy0RmeUDZo7Y8zeQ= github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= @@ -512,9 +521,11 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlK github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= 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.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -530,10 +541,12 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-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= @@ -563,10 +576,13 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -575,6 +591,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= @@ -582,6 +599,7 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -670,12 +688,14 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -834,6 +854,7 @@ github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1C github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= 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= @@ -850,6 +871,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u 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.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +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/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= @@ -892,6 +914,7 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v1.0.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= @@ -967,6 +990,7 @@ 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 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -988,6 +1012,7 @@ github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -1001,16 +1026,22 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU= +github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= 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= @@ -1021,6 +1052,7 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ 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/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= +github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= 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/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -1040,6 +1072,7 @@ github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG 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/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1129,6 +1162,7 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= 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 h1:YJfZp12Z3AFhSBeXOlv4BO55RMwPn2NoQeDsrdWnBtY= @@ -1220,6 +1254,7 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -1228,6 +1263,7 @@ github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= +github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -1245,6 +1281,7 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1276,6 +1313,7 @@ go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/ go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1357,6 +1395,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1605,6 +1644,7 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1671,6 +1711,7 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= 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= @@ -1963,6 +2004,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/modules/guardian/client/cli/cli_test.go b/modules/guardian/client/cli/cli_test.go index 8e31f9ac5..57d54c60c 100644 --- a/modules/guardian/client/cli/cli_test.go +++ b/modules/guardian/client/cli/cli_test.go @@ -15,10 +15,10 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - guardiancli "github.com/irisnet/irishub/v2/modules/guardian/client/cli" - guardiantestutil "github.com/irisnet/irishub/v2/modules/guardian/client/testutil" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/simapp" + guardiancli "github.com/irisnet/irishub/v3/modules/guardian/client/cli" + guardiantestutil "github.com/irisnet/irishub/v3/modules/guardian/client/testutil" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/simapp" ) var privKey cryptotypes.PrivKey diff --git a/modules/guardian/client/cli/query.go b/modules/guardian/client/cli/query.go index 84f1f6fb7..84f41a4cb 100644 --- a/modules/guardian/client/cli/query.go +++ b/modules/guardian/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) // GetQueryCmd returns the cli query commands for the guardian module. diff --git a/modules/guardian/client/cli/tx.go b/modules/guardian/client/cli/tx.go index 31c9f581e..4895be93d 100644 --- a/modules/guardian/client/cli/tx.go +++ b/modules/guardian/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) // NewTxCmd returns the transaction commands for the guardian module. diff --git a/modules/guardian/client/testutil/test_helpers.go b/modules/guardian/client/testutil/test_helpers.go index ba87c26b5..7b938185b 100644 --- a/modules/guardian/client/testutil/test_helpers.go +++ b/modules/guardian/client/testutil/test_helpers.go @@ -13,8 +13,8 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - guardiancli "github.com/irisnet/irishub/v2/modules/guardian/client/cli" - "github.com/irisnet/irishub/v2/simapp" + guardiancli "github.com/irisnet/irishub/v3/modules/guardian/client/cli" + "github.com/irisnet/irishub/v3/simapp" ) // MsgRedelegateExec creates a redelegate message. diff --git a/modules/guardian/genesis.go b/modules/guardian/genesis.go index 117e551e1..09b5732b5 100644 --- a/modules/guardian/genesis.go +++ b/modules/guardian/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/guardian/keeper" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/keeper" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) // InitGenesis stores genesis data diff --git a/modules/guardian/genesis_test.go b/modules/guardian/genesis_test.go index 19e1198e7..3313fe5ef 100644 --- a/modules/guardian/genesis_test.go +++ b/modules/guardian/genesis_test.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/guardian" - "github.com/irisnet/irishub/v2/modules/guardian/keeper" - "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/simapp" + "github.com/irisnet/irishub/v3/modules/guardian" + "github.com/irisnet/irishub/v3/modules/guardian/keeper" + "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/simapp" ) type TestSuite struct { diff --git a/modules/guardian/handler.go b/modules/guardian/handler.go index 8876ab7cb..6397506ee 100644 --- a/modules/guardian/handler.go +++ b/modules/guardian/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/v2/modules/guardian/keeper" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/keeper" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) // NewHandler returns a handler for all "guardian" type messages. diff --git a/modules/guardian/keeper/grpc_query.go b/modules/guardian/keeper/grpc_query.go index 3d70064ac..3cd49a8fd 100644 --- a/modules/guardian/keeper/grpc_query.go +++ b/modules/guardian/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) var _ types.QueryServer = Keeper{} diff --git a/modules/guardian/keeper/grpc_query_test.go b/modules/guardian/keeper/grpc_query_test.go index 12809a862..ad6be59e6 100644 --- a/modules/guardian/keeper/grpc_query_test.go +++ b/modules/guardian/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) func (suite *KeeperTestSuite) TestGRPCQuerySupers() { diff --git a/modules/guardian/keeper/keeper.go b/modules/guardian/keeper/keeper.go index 74eb53844..8645afd7b 100644 --- a/modules/guardian/keeper/keeper.go +++ b/modules/guardian/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) // Keeper of the guardian store diff --git a/modules/guardian/keeper/keeper_test.go b/modules/guardian/keeper/keeper_test.go index dceeff1a5..98aae202b 100644 --- a/modules/guardian/keeper/keeper_test.go +++ b/modules/guardian/keeper/keeper_test.go @@ -13,9 +13,9 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/guardian/keeper" - "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/simapp" + "github.com/irisnet/irishub/v3/modules/guardian/keeper" + "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/simapp" ) var ( diff --git a/modules/guardian/keeper/msg_service.go b/modules/guardian/keeper/msg_service.go index a10cc30e4..a4e450859 100644 --- a/modules/guardian/keeper/msg_service.go +++ b/modules/guardian/keeper/msg_service.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) type msgServer struct { diff --git a/modules/guardian/module.go b/modules/guardian/module.go index 9290e699c..da8e35b57 100644 --- a/modules/guardian/module.go +++ b/modules/guardian/module.go @@ -18,9 +18,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/irisnet/irishub/v2/modules/guardian/client/cli" - "github.com/irisnet/irishub/v2/modules/guardian/keeper" - "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/guardian/client/cli" + "github.com/irisnet/irishub/v3/modules/guardian/keeper" + "github.com/irisnet/irishub/v3/modules/guardian/types" ) var ( diff --git a/modules/guardian/types/msgs_test.go b/modules/guardian/types/msgs_test.go index 2b2bbd435..da71a4ebf 100644 --- a/modules/guardian/types/msgs_test.go +++ b/modules/guardian/types/msgs_test.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - _ "github.com/irisnet/irishub/v2/types" + _ "github.com/irisnet/irishub/v3/types" ) // nolint: deadcode unused @@ -22,6 +22,7 @@ var ( description = "description" nilDescription = "" ) + // ---------------------------------------------- // test MsgAddSuper // ---------------------------------------------- diff --git a/modules/mint/abci.go b/modules/mint/abci.go index 839ba4e6f..47e1285de 100644 --- a/modules/mint/abci.go +++ b/modules/mint/abci.go @@ -3,8 +3,8 @@ package mint import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/mint/keeper" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/keeper" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // BeginBlocker handles block beginning logic for mint diff --git a/modules/mint/abci_test.go b/modules/mint/abci_test.go index 2ff04ee55..0b507f719 100644 --- a/modules/mint/abci_test.go +++ b/modules/mint/abci_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/irisnet/irishub/v2/modules/mint" - "github.com/irisnet/irishub/v2/modules/mint/types" - "github.com/irisnet/irishub/v2/simapp" + "github.com/irisnet/irishub/v3/modules/mint" + "github.com/irisnet/irishub/v3/modules/mint/types" + "github.com/irisnet/irishub/v3/simapp" ) func TestBeginBlocker(t *testing.T) { diff --git a/modules/mint/client/cli/cli_test.go b/modules/mint/client/cli/cli_test.go index 239bcd6bb..4fcf0fd57 100644 --- a/modules/mint/client/cli/cli_test.go +++ b/modules/mint/client/cli/cli_test.go @@ -7,9 +7,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - minttestutil "github.com/irisnet/irishub/v2/modules/mint/client/testutil" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" - "github.com/irisnet/irishub/v2/simapp" + minttestutil "github.com/irisnet/irishub/v3/modules/mint/client/testutil" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" + "github.com/irisnet/irishub/v3/simapp" ) type IntegrationTestSuite struct { diff --git a/modules/mint/client/cli/query.go b/modules/mint/client/cli/query.go index 89514459f..8e4714442 100644 --- a/modules/mint/client/cli/query.go +++ b/modules/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // GetQueryCmd returns the cli query commands for the mint module. diff --git a/modules/mint/client/rest/grpc_query_test.go b/modules/mint/client/rest/grpc_query_test.go index b5621392f..90e9677de 100644 --- a/modules/mint/client/rest/grpc_query_test.go +++ b/modules/mint/client/rest/grpc_query_test.go @@ -10,8 +10,8 @@ package rest_test // "github.com/cosmos/cosmos-sdk/testutil/network" // "github.com/cosmos/cosmos-sdk/types/rest" -// minttypes "github.com/irisnet/irishub/v2/modules/mint/types" -// "github.com/irisnet/irishub/v2/simapp" +// minttypes "github.com/irisnet/irishub/v3/modules/mint/types" +// "github.com/irisnet/irishub/v3/simapp" // ) // type IntegrationTestSuite struct { diff --git a/modules/mint/client/testutil/test_helpers.go b/modules/mint/client/testutil/test_helpers.go index bc4a9abe2..7dc90f3a5 100644 --- a/modules/mint/client/testutil/test_helpers.go +++ b/modules/mint/client/testutil/test_helpers.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" - mintcli "github.com/irisnet/irishub/v2/modules/mint/client/cli" + mintcli "github.com/irisnet/irishub/v3/modules/mint/client/cli" ) func QueryParamsExec(clientCtx client.Context, extraArgs ...string) (testutil.BufferWriter, error) { diff --git a/modules/mint/genesis.go b/modules/mint/genesis.go index c70888200..e73f52544 100644 --- a/modules/mint/genesis.go +++ b/modules/mint/genesis.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/irisnet/irishub/v2/modules/mint/keeper" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/keeper" + "github.com/irisnet/irishub/v3/modules/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/modules/mint/keeper/grpc_query.go b/modules/mint/keeper/grpc_query.go index e7aed2146..13ae2cbfd 100644 --- a/modules/mint/keeper/grpc_query.go +++ b/modules/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/modules/mint/keeper/grpc_query_test.go b/modules/mint/keeper/grpc_query_test.go index 1326c297c..27268f15f 100644 --- a/modules/mint/keeper/grpc_query_test.go +++ b/modules/mint/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) func (suite *KeeperTestSuite) TestGRPCQueryPoolParameters() { diff --git a/modules/mint/keeper/keeper.go b/modules/mint/keeper/keeper.go index db1f5eea9..027230525 100644 --- a/modules/mint/keeper/keeper.go +++ b/modules/mint/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // keeper of the mint store diff --git a/modules/mint/keeper/keeper_test.go b/modules/mint/keeper/keeper_test.go index 24ac75758..ade97df81 100644 --- a/modules/mint/keeper/keeper_test.go +++ b/modules/mint/keeper/keeper_test.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/mint/types" - "github.com/irisnet/irishub/v2/simapp" + "github.com/irisnet/irishub/v3/modules/mint/types" + "github.com/irisnet/irishub/v3/simapp" ) type KeeperTestSuite struct { diff --git a/modules/mint/keeper/migrations.go b/modules/mint/keeper/migrations.go index a700bf47f..79d5bf54f 100644 --- a/modules/mint/keeper/migrations.go +++ b/modules/mint/keeper/migrations.go @@ -5,7 +5,7 @@ import ( "github.com/irisnet/irismod/types/exported" - v2 "github.com/irisnet/irishub/v2/modules/mint/migrations/v2" + v2 "github.com/irisnet/irishub/v3/modules/mint/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/modules/mint/keeper/msg_server.go b/modules/mint/keeper/msg_server.go index 9f10fe9db..a2dc14b51 100644 --- a/modules/mint/keeper/msg_server.go +++ b/modules/mint/keeper/msg_server.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) type msgServer struct { diff --git a/modules/mint/keeper/params.go b/modules/mint/keeper/params.go index 3189fe837..96d2d8228 100644 --- a/modules/mint/keeper/params.go +++ b/modules/mint/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // GetParams sets the mint module parameters. diff --git a/modules/mint/migrations/v2/migrate.go b/modules/mint/migrations/v2/migrate.go index 32b29b3ca..6681c17e1 100644 --- a/modules/mint/migrations/v2/migrate.go +++ b/modules/mint/migrations/v2/migrate.go @@ -5,7 +5,7 @@ import ( "github.com/irisnet/irismod/types/exported" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // MintKeeper defines a interface for SetParams function diff --git a/modules/mint/module.go b/modules/mint/module.go index 6afd727ac..97370a50b 100644 --- a/modules/mint/module.go +++ b/modules/mint/module.go @@ -19,10 +19,10 @@ import ( "github.com/irisnet/irismod/types/exported" - "github.com/irisnet/irishub/v2/modules/mint/client/cli" - "github.com/irisnet/irishub/v2/modules/mint/keeper" - "github.com/irisnet/irishub/v2/modules/mint/simulation" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/client/cli" + "github.com/irisnet/irishub/v3/modules/mint/keeper" + "github.com/irisnet/irishub/v3/modules/mint/simulation" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // ConsensusVersion defines the current mint module consensus version. diff --git a/modules/mint/simulation/decoder.go b/modules/mint/simulation/decoder.go index 554d03853..5a1edd7e4 100644 --- a/modules/mint/simulation/decoder.go +++ b/modules/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // NewDecodeStore returns a function closure that unmarshals the KVPair's values diff --git a/modules/mint/simulation/decoder_test.go b/modules/mint/simulation/decoder_test.go index c74468b96..f1b2f1ffb 100644 --- a/modules/mint/simulation/decoder_test.go +++ b/modules/mint/simulation/decoder_test.go @@ -10,9 +10,9 @@ import ( sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/irisnet/irishub/v2/modules/mint/simulation" - "github.com/irisnet/irishub/v2/modules/mint/types" - "github.com/irisnet/irishub/v2/simapp" + "github.com/irisnet/irishub/v3/modules/mint/simulation" + "github.com/irisnet/irishub/v3/modules/mint/types" + "github.com/irisnet/irishub/v3/simapp" ) func TestDecodeStore(t *testing.T) { diff --git a/modules/mint/simulation/genesis.go b/modules/mint/simulation/genesis.go index 2aa275887..9d18523f4 100644 --- a/modules/mint/simulation/genesis.go +++ b/modules/mint/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v3/modules/mint/types" ) // Simulation parameter constants diff --git a/proto/buf.gen.pulsar.yaml b/proto/buf.gen.pulsar.yaml index fcb167981..ddf8443d7 100644 --- a/proto/buf.gen.pulsar.yaml +++ b/proto/buf.gen.pulsar.yaml @@ -8,7 +8,7 @@ managed: - buf.build/cosmos/gogo-proto - buf.build/cosmos/cosmos-proto override: - buf.build/irisnet/irishub: github.com/irisnet/irishub/v2/api + buf.build/irisnet/irishub: github.com/irisnet/irishub/v3/api plugins: - name: go-pulsar out: ../api diff --git a/proto/irishub/guardian/genesis.proto b/proto/irishub/guardian/genesis.proto index 04ea6b97c..e4001b898 100644 --- a/proto/irishub/guardian/genesis.proto +++ b/proto/irishub/guardian/genesis.proto @@ -4,7 +4,7 @@ package irishub.guardian; import "irishub/guardian/guardian.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/guardian/types"; // GenesisState defines the guardian module's genesis state message GenesisState { diff --git a/proto/irishub/guardian/guardian.proto b/proto/irishub/guardian/guardian.proto index 5c286e3b3..5d786bc4f 100644 --- a/proto/irishub/guardian/guardian.proto +++ b/proto/irishub/guardian/guardian.proto @@ -3,7 +3,7 @@ package irishub.guardian; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/guardian/types"; // Super defines the super standard message Super { diff --git a/proto/irishub/guardian/query.proto b/proto/irishub/guardian/query.proto index 464e9efb2..b79106080 100644 --- a/proto/irishub/guardian/query.proto +++ b/proto/irishub/guardian/query.proto @@ -6,7 +6,7 @@ import "irishub/guardian/guardian.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/guardian/types"; // Query creates service with guardian as RPC service Query { diff --git a/proto/irishub/guardian/tx.proto b/proto/irishub/guardian/tx.proto index 7f8c0892b..1c1ca3286 100644 --- a/proto/irishub/guardian/tx.proto +++ b/proto/irishub/guardian/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package irishub.guardian; -option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/guardian/types"; // Msg defines the guardian Msg service service Msg { diff --git a/proto/irishub/mint/genesis.proto b/proto/irishub/mint/genesis.proto index 74271bc30..3976255c2 100644 --- a/proto/irishub/mint/genesis.proto +++ b/proto/irishub/mint/genesis.proto @@ -4,7 +4,7 @@ package irishub.mint; import "irishub/mint/mint.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/mint/types"; // GenesisState defines the mint module's genesis state message GenesisState { diff --git a/proto/irishub/mint/mint.proto b/proto/irishub/mint/mint.proto index 19ab82fc5..fe1592e2d 100644 --- a/proto/irishub/mint/mint.proto +++ b/proto/irishub/mint/mint.proto @@ -4,7 +4,7 @@ package irishub.mint; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/mint/types"; // Minter represents the minting state message Minter { diff --git a/proto/irishub/mint/query.proto b/proto/irishub/mint/query.proto index a3daa2da7..04ae70e17 100644 --- a/proto/irishub/mint/query.proto +++ b/proto/irishub/mint/query.proto @@ -6,7 +6,7 @@ import "irishub/mint/mint.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/mint/types"; // Query creates service with guardian as rpc service Query { diff --git a/proto/irishub/mint/tx.proto b/proto/irishub/mint/tx.proto index 1095f0cfd..1b13a220a 100644 --- a/proto/irishub/mint/tx.proto +++ b/proto/irishub/mint/tx.proto @@ -2,12 +2,11 @@ syntax = "proto3"; package irishub.mint; import "irishub/mint/mint.proto"; -import "cosmos/base/v1beta1/coin.proto"; import "cosmos/msg/v1/msg.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v3/modules/mint/types"; option (gogoproto.goproto_getters_all) = false; // Msg defines the coinswap Msg service diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index df853ec79..b5249d354 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -19,5 +19,5 @@ done cd .. # move proto files to the right places -cp -r github.com/irisnet/irishub/v2/* ./ +cp -r github.com/irisnet/irishub/v3/* ./ rm -rf github.com diff --git a/simapp/app.go b/simapp/app.go index 2f4011abd..be458b358 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -64,14 +64,14 @@ import ( simappparams "cosmossdk.io/simapp/params" - "github.com/irisnet/irishub/v2/client/lite" - "github.com/irisnet/irishub/v2/modules/guardian" - guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" - guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" - "github.com/irisnet/irishub/v2/modules/mint" - mintkeeper "github.com/irisnet/irishub/v2/modules/mint/keeper" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" - iristypes "github.com/irisnet/irishub/v2/types" + "github.com/irisnet/irishub/v3/client/lite" + "github.com/irisnet/irishub/v3/modules/guardian" + guardiankeeper "github.com/irisnet/irishub/v3/modules/guardian/keeper" + guardiantypes "github.com/irisnet/irishub/v3/modules/guardian/types" + "github.com/irisnet/irishub/v3/modules/mint" + mintkeeper "github.com/irisnet/irishub/v3/modules/mint/keeper" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" + iristypes "github.com/irisnet/irishub/v3/types" tibcmttransfer "github.com/bianjieai/tibc-go/modules/tibc/apps/mt_transfer" tibcnfttransfer "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer" @@ -108,7 +108,6 @@ var ( stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking}, stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking}, } - ) var ( diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index 8e5531a83..bb340bda9 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -43,8 +43,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - minttypes "github.com/irisnet/irishub/v2/modules/mint/types" - iristypes "github.com/irisnet/irishub/v2/types" + minttypes "github.com/irisnet/irishub/v3/modules/mint/types" + iristypes "github.com/irisnet/irishub/v3/types" ) func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) { diff --git a/sims.mk b/sims.mk index c141b1f85..5362d834c 100644 --- a/sims.mk +++ b/sims.mk @@ -4,7 +4,7 @@ ### Simulations BINDIR ?= $(GOPATH)/bin -SIMAPP = github.com/irisnet/irishub/v2/app +SIMAPP = github.com/irisnet/irishub/v3/app test-sim-nondeterminism: @echo "Running non-determinism test..."