diff --git a/Makefile b/Makefile index a6819d953..f07c6b638 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ run-local: install lint: @echo "--> Running linter" - @which golangci-lint > /dev/null || echo "\033[91m install golangci-lint ...\033[0m" && go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + @go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest golangci-lint run -v --go=1.19 --out-format=tab format: format-goimports @@ -238,7 +238,7 @@ contract-publish: ### Releasing ### ############################################################################### -PACKAGE_NAME := github.com/functionx/fx-core/v5 +PACKAGE_NAME := github.com/functionx/fx-core/v6 GOLANG_CROSS_VERSION := v1.19 release-dry-run: docker run --rm --privileged -e CGO_ENABLED=1 \ diff --git a/README.md b/README.md index 66ae371b0..9c320545f 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ **fxcore** is a blockchain built using Cosmos SDK and Tendermint and created with [Starport](https://github.com/tendermint/starport). [![Version](https://img.shields.io/github/v/release/functionx/fx-core.svg)](https://github.com/functionx/fx-core/releases/latest) -[![API Reference](https://pkg.go.dev/badge/github.com/functionx/fx-core.svg)](https://pkg.go.dev/github.com/functionx/fx-core/v5) +[![API Reference](https://pkg.go.dev/badge/github.com/functionx/fx-core.svg)](https://pkg.go.dev/github.com/functionx/fx-core/v6) [![License](https://img.shields.io/github/license/functionx/fx-core.svg)](https://github.com/functionx/fx-core/blob/main/LICENSE) [![Tests](https://github.com/functionx/fx-core/actions/workflows/test.yml/badge.svg)](https://github.com/functionx/fx-core/actions/workflows/test.yml) [![Lint](https://github.com/functionx/fx-core/actions/workflows/lint.yml/badge.svg)](https://github.com/functionx/fx-core/actions/workflows/lint.yml) -[![Go Report Card](https://goreportcard.com/badge/github.com/functionx/fx-core/v5)](https://goreportcard.com/report/github.com/functionx/fx-core/v5) +[![Go Report Card](https://goreportcard.com/badge/github.com/functionx/fx-core/v6)](https://goreportcard.com/report/github.com/functionx/fx-core/v6) **Note**: Requires [Go 1.19+](https://go.dev/dl) diff --git a/ante/ante_sigs_test.go b/ante/ante_sigs_test.go index 5d969d26d..ed85455a2 100644 --- a/ante/ante_sigs_test.go +++ b/ante/ante_sigs_test.go @@ -7,7 +7,7 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *AnteTestSuite) TestSignatures() { diff --git a/ante/ante_test.go b/ante/ante_test.go index 317e92688..0990c034f 100644 --- a/ante/ante_test.go +++ b/ante/ante_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - fxante "github.com/functionx/fx-core/v5/ante" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + fxante "github.com/functionx/fx-core/v6/ante" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) type AnteTestSuite struct { diff --git a/ante/decorator.go b/ante/decorator.go index 4a068675e..82b4fd476 100644 --- a/ante/decorator.go +++ b/ante/decorator.go @@ -17,7 +17,7 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/evmos/ethermint/crypto/ethsecp256k1" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) var ( diff --git a/ante/eth_test.go b/ante/eth_test.go index 5d69563c3..d6771f6d3 100644 --- a/ante/eth_test.go +++ b/ante/eth_test.go @@ -10,8 +10,8 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/ante" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/ante" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *AnteTestSuite) TestEthSigVerificationDecorator() { diff --git a/ante/fee_market_test.go b/ante/fee_market_test.go index 3362e18ff..3689ee6c3 100644 --- a/ante/fee_market_test.go +++ b/ante/fee_market_test.go @@ -9,8 +9,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/ante" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/ante" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *AnteTestSuite) TestGasWantedDecorator() { diff --git a/ante/fees.go b/ante/fees.go index 8fb311a7b..e3bb0d025 100644 --- a/ante/fees.go +++ b/ante/fees.go @@ -16,7 +16,7 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" tmstrings "github.com/tendermint/tendermint/libs/strings" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) // DeductFeeDecorator deducts fees from the first signer of the tx diff --git a/ante/fees_test.go b/ante/fees_test.go index 13b2b10b4..16fe5036a 100644 --- a/ante/fees_test.go +++ b/ante/fees_test.go @@ -14,8 +14,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/functionx/fx-core/v5/ante" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/ante" + fxtypes "github.com/functionx/fx-core/v6/types" ) func (suite *AnteTestSuite) TestDeductFeeDecorator() { diff --git a/ante/reject_msgs_test.go b/ante/reject_msgs_test.go index c24b8cba0..c62f1124c 100644 --- a/ante/reject_msgs_test.go +++ b/ante/reject_msgs_test.go @@ -13,10 +13,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/server/config" - "github.com/functionx/fx-core/v5/ante" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/ante" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) func (suite *AnteTestSuite) TestRejectValidatorGranted() { diff --git a/app/app.go b/app/app.go index 58f26fbd0..2f26884d8 100644 --- a/app/app.go +++ b/app/app.go @@ -33,21 +33,21 @@ import ( tmos "github.com/tendermint/tendermint/libs/os" dbm "github.com/tendermint/tm-db" - fxante "github.com/functionx/fx-core/v5/ante" - "github.com/functionx/fx-core/v5/app/keepers" - _ "github.com/functionx/fx-core/v5/docs/statik" - fxcfg "github.com/functionx/fx-core/v5/server/config" - fxauth "github.com/functionx/fx-core/v5/server/grpc/auth" - gaspricev1 "github.com/functionx/fx-core/v5/server/grpc/gasprice/legacy/v1" - gaspricev2 "github.com/functionx/fx-core/v5/server/grpc/gasprice/legacy/v2" - fxrest "github.com/functionx/fx-core/v5/server/rest" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain" - "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/gravity" - gravitykeeper "github.com/functionx/fx-core/v5/x/gravity/keeper" - gravitytypes "github.com/functionx/fx-core/v5/x/gravity/types" + fxante "github.com/functionx/fx-core/v6/ante" + "github.com/functionx/fx-core/v6/app/keepers" + _ "github.com/functionx/fx-core/v6/docs/statik" + fxcfg "github.com/functionx/fx-core/v6/server/config" + fxauth "github.com/functionx/fx-core/v6/server/grpc/auth" + gaspricev1 "github.com/functionx/fx-core/v6/server/grpc/gasprice/legacy/v1" + gaspricev2 "github.com/functionx/fx-core/v6/server/grpc/gasprice/legacy/v2" + fxrest "github.com/functionx/fx-core/v6/server/rest" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain" + "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/gravity" + gravitykeeper "github.com/functionx/fx-core/v6/x/gravity/keeper" + gravitytypes "github.com/functionx/fx-core/v6/x/gravity/types" ) var _ servertypes.Application = (*App)(nil) diff --git a/app/app_test.go b/app/app_test.go index 8c260af17..19e760cde 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestUpgradeStateOnGenesis(t *testing.T) { diff --git a/app/encoding.go b/app/encoding.go index 39c4f8d46..f0170310e 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -15,8 +15,8 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" etherminttypes "github.com/evmos/ethermint/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - gravitytypes "github.com/functionx/fx-core/v5/x/gravity/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + gravitytypes "github.com/functionx/fx-core/v6/x/gravity/types" ) // EncodingConfig specifies the concrete encoding types to use for a given app. diff --git a/app/encoding_test.go b/app/encoding_test.go index dcf6dd742..b68d7d7f4 100644 --- a/app/encoding_test.go +++ b/app/encoding_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/app" + "github.com/functionx/fx-core/v6/app" ) func TestMakeEncodingConfig_RegisterInterfaces(t *testing.T) { diff --git a/app/export_test.go b/app/export_test.go index c68e5a7a6..6a82db84b 100644 --- a/app/export_test.go +++ b/app/export_test.go @@ -21,11 +21,11 @@ import ( "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/testutil/network" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/network" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestUseExportGenesisDataRunNode(t *testing.T) { diff --git a/app/genesis.go b/app/genesis.go index 8ea3d0e79..d48aa873f 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -25,9 +25,9 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - fxtypes "github.com/functionx/fx-core/v5/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxtypes "github.com/functionx/fx-core/v6/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) const ( diff --git a/app/genesis_test.go b/app/genesis_test.go index 8497a1030..912e0ffa9 100644 --- a/app/genesis_test.go +++ b/app/genesis_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/app" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestNewDefaultGenesisByDenom(t *testing.T) { diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 768e43332..ec640feb6 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -53,33 +53,33 @@ import ( feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" "github.com/spf13/cast" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - fxauthzkeeper "github.com/functionx/fx-core/v5/x/authz/keeper" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20" - erc20keeper "github.com/functionx/fx-core/v5/x/erc20/keeper" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - fxevmkeeper "github.com/functionx/fx-core/v5/x/evm/keeper" - fxgovkeeper "github.com/functionx/fx-core/v5/x/gov/keeper" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" - gravitytypes "github.com/functionx/fx-core/v5/x/gravity/types" - fxtransfer "github.com/functionx/fx-core/v5/x/ibc/applications/transfer" - fxtransferkeeper "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/keeper" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter" - migratekeeper "github.com/functionx/fx-core/v5/x/migrate/keeper" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - fxslashingkeeper "github.com/functionx/fx-core/v5/x/slashing/keeper" - fxstakingkeeper "github.com/functionx/fx-core/v5/x/staking/keeper" - tronkeeper "github.com/functionx/fx-core/v5/x/tron/keeper" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + fxauthzkeeper "github.com/functionx/fx-core/v6/x/authz/keeper" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20" + erc20keeper "github.com/functionx/fx-core/v6/x/erc20/keeper" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + fxevmkeeper "github.com/functionx/fx-core/v6/x/evm/keeper" + fxgovkeeper "github.com/functionx/fx-core/v6/x/gov/keeper" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" + gravitytypes "github.com/functionx/fx-core/v6/x/gravity/types" + fxtransfer "github.com/functionx/fx-core/v6/x/ibc/applications/transfer" + fxtransferkeeper "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/keeper" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter" + migratekeeper "github.com/functionx/fx-core/v6/x/migrate/keeper" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + fxslashingkeeper "github.com/functionx/fx-core/v6/x/slashing/keeper" + fxstakingkeeper "github.com/functionx/fx-core/v6/x/staking/keeper" + tronkeeper "github.com/functionx/fx-core/v6/x/tron/keeper" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type CrossChainKeepers struct { diff --git a/app/keepers/keepers_test.go b/app/keepers/keepers_test.go index 150fec2e0..a00f1bc5e 100644 --- a/app/keepers/keepers_test.go +++ b/app/keepers/keepers_test.go @@ -16,17 +16,17 @@ import ( tmlog "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/app/keepers" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/app/keepers" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func TestNewAppKeeper(t *testing.T) { diff --git a/app/keepers/keys.go b/app/keepers/keys.go index e30c8b78c..2aa9832b2 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -23,18 +23,18 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - precompilescrosschain "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" - precompilesstaking "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + precompilescrosschain "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" + precompilesstaking "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (appKeepers *AppKeepers) generateKeys() { diff --git a/app/modules.go b/app/modules.go index cd6aa4663..1a3983347 100644 --- a/app/modules.go +++ b/app/modules.go @@ -45,32 +45,32 @@ import ( "github.com/evmos/ethermint/x/feemarket" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/functionx/fx-core/v5/x/arbitrum" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - "github.com/functionx/fx-core/v5/x/avalanche" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - "github.com/functionx/fx-core/v5/x/bsc" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - crosschainclient "github.com/functionx/fx-core/v5/x/crosschain/client" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20" - erc20client "github.com/functionx/fx-core/v5/x/erc20/client" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/eth" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - fxevm "github.com/functionx/fx-core/v5/x/evm" - fxgov "github.com/functionx/fx-core/v5/x/gov" - fxibctransfer "github.com/functionx/fx-core/v5/x/ibc/applications/transfer" - fxibctransfertypes "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" - "github.com/functionx/fx-core/v5/x/migrate" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" - "github.com/functionx/fx-core/v5/x/optimism" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - "github.com/functionx/fx-core/v5/x/polygon" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - fxstaking "github.com/functionx/fx-core/v5/x/staking" - "github.com/functionx/fx-core/v5/x/tron" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/x/arbitrum" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + "github.com/functionx/fx-core/v6/x/avalanche" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + "github.com/functionx/fx-core/v6/x/bsc" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + crosschainclient "github.com/functionx/fx-core/v6/x/crosschain/client" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20" + erc20client "github.com/functionx/fx-core/v6/x/erc20/client" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/eth" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + fxevm "github.com/functionx/fx-core/v6/x/evm" + fxgov "github.com/functionx/fx-core/v6/x/gov" + fxibctransfer "github.com/functionx/fx-core/v6/x/ibc/applications/transfer" + fxibctransfertypes "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/migrate" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" + "github.com/functionx/fx-core/v6/x/optimism" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + "github.com/functionx/fx-core/v6/x/polygon" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + fxstaking "github.com/functionx/fx-core/v6/x/staking" + "github.com/functionx/fx-core/v6/x/tron" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func init() { diff --git a/app/modules_test.go b/app/modules_test.go index 217d8e7f4..af129c4f5 100644 --- a/app/modules_test.go +++ b/app/modules_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestOnOrderBeginBlockers(t *testing.T) { diff --git a/app/upgrade.go b/app/upgrade.go index be5a9fdb3..f1f1b320c 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -5,12 +5,12 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/functionx/fx-core/v5/app/upgrades" - v5 "github.com/functionx/fx-core/v5/app/upgrades/v5" + "github.com/functionx/fx-core/v6/app/upgrades" + v6 "github.com/functionx/fx-core/v6/app/upgrades/v6" ) func (app *App) GetUpgrade() upgrades.Upgrade { - return v5.Upgrade + return v6.Upgrade } // configure store loader that checks if version == upgradeHeight and applies store upgrades diff --git a/app/upgrade_test.go b/app/upgrade_test.go index d9331324a..5e0e04a4c 100644 --- a/app/upgrade_test.go +++ b/app/upgrade_test.go @@ -1,29 +1,23 @@ package app_test import ( - "fmt" "os" "path/filepath" - "sort" "testing" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + v6 "github.com/functionx/fx-core/v6/app/upgrades/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - v5 "github.com/functionx/fx-core/v5/app/upgrades/v5" - "github.com/functionx/fx-core/v5/client/jsonrpc" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) func Test_TestnetUpgrade(t *testing.T) { @@ -40,12 +34,12 @@ func Test_TestnetUpgrade(t *testing.T) { plan upgradetypes.Plan }{ { - name: "upgrade v5.0.x", - fromVersion: 4, - toVersion: 5, + name: "upgrade v6.0.x", + fromVersion: 5, + toVersion: 6, plan: upgradetypes.Plan{ - Name: v5.Upgrade.UpgradeName, - Info: "local test upgrade v5.0.x", + Name: v6.Upgrade.UpgradeName, + Info: "local test upgrade v6.0.x", }, }, } @@ -58,7 +52,7 @@ func Test_TestnetUpgrade(t *testing.T) { db, nil, false, map[int64]bool{}, fxtypes.GetDefaultNodeHome(), 0, makeEncodingConfig, app.EmptyAppOptions{}) // todo default DefaultStoreLoader New module verification failed - myApp.SetStoreLoader(upgradetypes.UpgradeStoreLoader(myApp.LastBlockHeight()+1, v5.Upgrade.StoreUpgrades())) + myApp.SetStoreLoader(upgradetypes.UpgradeStoreLoader(myApp.LastBlockHeight()+1, v6.Upgrade.StoreUpgrades())) err = myApp.LoadLatestVersion() require.NoError(t, err) @@ -71,8 +65,6 @@ func Test_TestnetUpgrade(t *testing.T) { }) } - checkSlashPeriod(t, ctx, myApp) - myApp.EthKeeper.EndBlocker(ctx.WithBlockHeight(ctx.BlockHeight() + 1)) myApp.BscKeeper.EndBlocker(ctx.WithBlockHeight(ctx.BlockHeight() + 1)) myApp.TronKeeper.EndBlocker(ctx.WithBlockHeight(ctx.BlockHeight() + 1)) @@ -96,114 +88,3 @@ func newContext(t *testing.T, myApp *app.App) sdk.Context { ctx = ctx.WithProposer(pubKey.Address().Bytes()) return ctx } - -func checkSlashPeriod(t *testing.T, ctx sdk.Context, myApp *app.App) { - for val := range v5.ValidatorSlashHeightTestnetFXV4 { - valAddr, err := sdk.ValAddressFromBech32(val) - require.NoError(t, err) - delegations := myApp.StakingKeeper.GetValidatorDelegations(ctx, valAddr) - - for _, del := range delegations { - cacheCtx, _ := ctx.CacheContext() - _, err := myApp.DistrKeeper.DelegationRewards(sdk.WrapSDKContext(cacheCtx), &distributiontypes.QueryDelegationRewardsRequest{ - DelegatorAddress: del.DelegatorAddress, - ValidatorAddress: del.ValidatorAddress, - }) - assert.NoError(t, err) - } - - // withdraw - for _, del := range delegations { - cacheCtx, _ := ctx.CacheContext() - _, err := myApp.DistrKeeper.WithdrawDelegationRewards(cacheCtx, del.GetDelegatorAddr(), del.GetValidatorAddr()) - assert.NoError(t, err) - } - - // undelegate - for _, del := range delegations { - cacheCtx, _ := ctx.CacheContext() - _, err := myApp.StakingKeeper.Undelegate(cacheCtx, del.GetDelegatorAddr(), del.GetValidatorAddr(), del.GetShares()) - assert.NoError(t, err) - } - - // delegate - count := 0 - for _, del := range delegations { - cacheCtx, _ := ctx.CacheContext() - fxBalance := myApp.BankKeeper.GetBalance(ctx, del.GetDelegatorAddr(), fxtypes.DefaultDenom) - if fxBalance.Amount.IsZero() { - continue - } - validator, found := myApp.StakingKeeper.GetValidator(ctx, del.GetValidatorAddr()) - require.True(t, found) - _, err := myApp.StakingKeeper.Delegate(cacheCtx, del.GetDelegatorAddr(), fxBalance.Amount, stakingtypes.Unbonded, validator, true) - assert.NoError(t, err) - count++ - } - assert.True(t, count > 0) - } -} - -func TestSlashPeriodTestnetFXV4(t *testing.T) { - helpers.SkipTest(t, "Skipping local test:", t.Name()) - - fxtypes.SetConfig(true) - rpc := jsonrpc.NewNodeRPC(jsonrpc.NewClient("https://testnet-fx-json.functionx.io:26657")) - query := fmt.Sprintf("block.height > %d AND slash.reason = 'missing_signature'", fxtypes.TestnetBlockHeightV4) - - blockSearch, err := rpc.BlockSearch(query, 1, 100, "") - require.NoError(t, err) - - slashedFXV4 := make(map[string][]int64, len(v5.ValidatorSlashHeightTestnetFXV4)) - slashedValFXV4 := make([]string, 0, len(v5.ValidatorSlashHeightTestnetFXV4)) - for _, block := range blockSearch.Blocks { - results, err := rpc.BlockResults(block.Block.Height) - require.NoError(t, err) - for _, result := range results.BeginBlockEvents { - if result.Type != slashingtypes.EventTypeLiveness { - continue - } - for _, attr := range result.Attributes { - if string(attr.Key) != slashingtypes.AttributeKeyAddress { - continue - } - valAddr, err := rpc.GetValAddressByCons(string(attr.Value)) - assert.NoError(t, err) - if _, ok := slashedFXV4[valAddr.String()]; ok { - slashedFXV4[valAddr.String()] = append(slashedFXV4[valAddr.String()], block.Block.Height) - } else { - slashedFXV4[valAddr.String()] = []int64{block.Block.Height} - slashedValFXV4 = append(slashedValFXV4, valAddr.String()) - } - } - } - } - eq := len(v5.ValidatorSlashHeightTestnetFXV4) == len(slashedFXV4) - assert.True(t, eq) - - if eq { - for val, h1 := range slashedFXV4 { - h2, ok := v5.ValidatorSlashHeightTestnetFXV4[val] - assert.True(t, ok, "val: %s", val) - sort.SliceStable(h1, func(i, j int) bool { - return h1[i] < h1[j] - }) - eq = assert.ObjectsAreEqual(h1, h2) - assert.True(t, eq, "val: %s", val) - } - } - - // print - if !eq { - sort.SliceStable(slashedValFXV4, func(i, j int) bool { - return slashedValFXV4[i] < slashedValFXV4[j] - }) - for _, addr := range slashedValFXV4 { - heights := slashedFXV4[addr] - sort.SliceStable(heights, func(i, j int) bool { - return heights[i] < heights[j] - }) - t.Log("val:", addr, "heights:", heights) - } - } -} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 7bb6016cd..2ed2ab4cb 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/functionx/fx-core/v5/app/keepers" + "github.com/functionx/fx-core/v6/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go deleted file mode 100644 index 8f0f52116..000000000 --- a/app/upgrades/v5/constants.go +++ /dev/null @@ -1,31 +0,0 @@ -package v5 - -import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/functionx/fx-core/v5/app/upgrades" -) - -type SlashPeriod struct { - Delegator sdk.AccAddress - Height uint64 - Period uint64 -} - -// ValidatorSlashHeightTestnetFXV4 is a map of testnet validator address to slash height -var ValidatorSlashHeightTestnetFXV4 = map[string][]int64{ - "fxvaloper14lpap6mwytqtnrx6q9cnje2sen5a5wcctuwnsh": {8224664, 8457967, 8552303}, - "fxvaloper1695tvr34jdrmajtc0t6kzumaxxwhulfl7h6mq2": {9469704}, - "fxvaloper16d0jly49xgwm9tyf7lpf0splnfhrnttdejkz9h": {8787488, 8885841, 9416069}, - "fxvaloper1c863577qlc4sq64v5dsfunf5drykz7fnqkgdha": {9128756}, - "fxvaloper1xdqas5ak98us9eljqj5ppj5mhmku4slh2664l8": {8806427}, -} - -var Upgrade = upgrades.Upgrade{ - UpgradeName: "v5.0.x", - CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: func() *storetypes.StoreUpgrades { - return &storetypes.StoreUpgrades{} - }, -} diff --git a/app/upgrades/v5/repair.go b/app/upgrades/v5/repair.go deleted file mode 100644 index a7e62a7d0..000000000 --- a/app/upgrades/v5/repair.go +++ /dev/null @@ -1,207 +0,0 @@ -package v5 - -import ( - "sort" - - sdk "github.com/cosmos/cosmos-sdk/types" - distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - fxtypes "github.com/functionx/fx-core/v5/types" - fxstakingkeeper "github.com/functionx/fx-core/v5/x/staking/keeper" -) - -func RepairSlashPeriod(ctx sdk.Context, sk fxstakingkeeper.Keeper, dk distrkeeper.Keeper) { - slashPeriod := delegatorNotSlash(ctx, sk, dk) - vals, newSlashPeriods := addSlashPeriodTestnetFXV4(ctx, slashPeriod) - for _, val := range vals { - valAddr, err := sdk.ValAddressFromBech32(val) - if err != nil { - panic(err) - } - fixSlashPeriodTestnetFXV4(ctx, dk, valAddr, newSlashPeriods[val]) - } -} - -func fixSlashPeriodTestnetFXV4(ctx sdk.Context, dk distrkeeper.Keeper, val sdk.ValAddress, periods []SlashPeriod) { - logger := ctx.Logger() - - currentRewards := dk.GetValidatorCurrentRewards(ctx, val) - currentHistoricalRewards := dk.GetValidatorHistoricalRewards(ctx, val, currentRewards.Period) - - periodHistoricalRewards := make(map[uint64]distrtypes.ValidatorHistoricalRewards, len(periods)) - for _, p := range periods { - if p.Delegator == nil { - continue - } - // get period starting info - startingInfo := dk.GetDelegatorStartingInfo(ctx, val, p.Delegator) - historicalRewards := dk.GetValidatorHistoricalRewards(ctx, val, startingInfo.PreviousPeriod) - periodHistoricalRewards[p.Period] = historicalRewards - dk.DeleteValidatorHistoricalReward(ctx, val, startingInfo.PreviousPeriod) - } - - slashBefore := false - for idx, p := range periods { - if p.Delegator != nil { - // set new period historical rewards - dk.SetValidatorHistoricalRewards(ctx, val, p.Period, periodHistoricalRewards[p.Period]) - } - - if p.Height < fxtypes.TestnetBlockHeightV4 || - p.Delegator != nil && !slashBefore { - continue - } - - if p.Delegator == nil { - referenceCount := uint32(1) - if idx == len(periods)-1 { - referenceCount += 1 - } - logger.Info("add slash period", "validator", val, "height", p.Height, "period", p.Period, "referenceCount", referenceCount) - lastHistoricalRewards := periodHistoricalRewards[periods[idx-1].Period] - historicalRewards := distrtypes.NewValidatorHistoricalRewards(lastHistoricalRewards.CumulativeRewardRatio, referenceCount) - dk.SetValidatorHistoricalRewards(ctx, val, p.Period, historicalRewards) - periodHistoricalRewards[p.Period] = historicalRewards - - // add slash period - fraction, _ := sdk.NewDecFromStr("0.001") - slashEvent := distrtypes.NewValidatorSlashEvent(p.Period, fraction) - dk.SetValidatorSlashEvent(ctx, val, p.Height, p.Period, slashEvent) - slashBefore = true - } else { - logger.Info("migrate slash period", "validator", val, "height", p.Height, "period", p.Period, "delegator", p.Delegator) - // set new starting info - startingInfo := dk.GetDelegatorStartingInfo(ctx, val, p.Delegator) - startingInfo.PreviousPeriod = p.Period - dk.SetDelegatorStartingInfo(ctx, val, p.Delegator, startingInfo) - } - - if idx == len(periods)-1 { - currentRewards.Period = p.Period + 1 - dk.SetValidatorCurrentRewards(ctx, val, currentRewards) - dk.SetValidatorHistoricalRewards(ctx, val, currentRewards.Period, currentHistoricalRewards) - } - } -} - -func addSlashPeriodTestnetFXV4(ctx sdk.Context, slashPeriod map[string][]SlashPeriod) ([]string, map[string][]SlashPeriod) { - vals := make([]string, 0, len(slashPeriod)) - newSlashPeriod := make(map[string][]SlashPeriod, len(slashPeriod)) - for val, periods := range slashPeriod { - if len(periods) == 0 { - ctx.Logger().Info("skip delegation empty", "address", val) - continue - } - heights, ok := ValidatorSlashHeightTestnetFXV4[val] - if !ok { - ctx.Logger().Info("skip validator not found", "address", val) - continue - } - - for _, height := range heights { - periods = append(periods, SlashPeriod{ - Delegator: nil, - Height: uint64(height), - Period: 0, - }) - } - sort.SliceStable(periods, func(i, j int) bool { - return periods[i].Height < periods[j].Height - }) - - // fix period with slash height - lastPeriod := uint64(0) - newPeriods := make([]SlashPeriod, 0, len(periods)) - for _, del := range periods { - if del.Delegator == nil && del.Period == 0 || // slash height - del.Period <= lastPeriod { // after slash height - del.Period = lastPeriod + 1 - } - lastPeriod = del.Period - newPeriods = append(newPeriods, del) - } - - newSlashPeriod[val] = newPeriods - vals = append(vals, val) - } - - // sort by validator address - sort.SliceStable(vals, func(i, j int) bool { - return vals[i] < vals[j] - }) - - return vals, newSlashPeriod -} - -func delegatorNotSlash(ctx sdk.Context, sk fxstakingkeeper.Keeper, dk distrkeeper.Keeper) map[string][]SlashPeriod { - valDels := validatorNotSlash(ctx, sk, dk) - sk.IterateAllDelegations(ctx, func(del stakingtypes.Delegation) (stop bool) { - if _, ok := valDels[del.ValidatorAddress]; !ok { - return false - } - startingInfo := dk.GetDelegatorStartingInfo(ctx, del.GetValidatorAddr(), del.GetDelegatorAddr()) - valDels[del.ValidatorAddress] = append(valDels[del.ValidatorAddress], SlashPeriod{ - Delegator: del.GetDelegatorAddr(), - Height: startingInfo.Height, - Period: startingInfo.PreviousPeriod, - }) - return false - }) - for val, dels := range valDels { - sort.SliceStable(dels, func(i, j int) bool { - return dels[i].Period < dels[j].Period - }) - valDels[val] = dels - } - return valDels -} - -func validatorNotSlash(ctx sdk.Context, sk fxstakingkeeper.Keeper, dk distrkeeper.Keeper) map[string][]SlashPeriod { - vals := make(map[string][]SlashPeriod, 50) - sk.IterateAllDelegations(ctx, func(del stakingtypes.Delegation) (stop bool) { - if _, ok := vals[del.GetValidatorAddr().String()]; ok { - return false - } - val, found := sk.GetValidator(ctx, del.GetValidatorAddr()) - if !found { - ctx.Logger().Error("validator not found", "validator", del.GetValidatorAddr().String()) - // if validator not found, skip - return false - } - currentStake := val.TokensFromShares(del.GetShares()) - stake := calculateSlashStake(ctx, dk, del) - - marginOfErr := sdk.SmallestDec().MulInt64(3) - if !stake.LTE(currentStake.Add(marginOfErr)) { - // if delegate after slash, no error - vals[del.GetValidatorAddr().String()] = make([]SlashPeriod, 0, 30) - } - return false - }) - return vals -} - -func calculateSlashStake(ctx sdk.Context, dk distrkeeper.Keeper, del stakingtypes.Delegation) sdk.Dec { - startingInfo := dk.GetDelegatorStartingInfo(ctx, del.GetValidatorAddr(), del.GetDelegatorAddr()) - startingPeriod := startingInfo.PreviousPeriod - stake := startingInfo.Stake - - startingHeight := startingInfo.Height - endingHeight := uint64(ctx.BlockHeight()) - - if endingHeight > startingHeight { - dk.IterateValidatorSlashEventsBetween(ctx, del.GetValidatorAddr(), startingHeight, endingHeight, - func(height uint64, event distrtypes.ValidatorSlashEvent) (stop bool) { - endingPeriod := event.ValidatorPeriod - if endingPeriod > startingPeriod { - stake = stake.MulTruncate(sdk.OneDec().Sub(event.Fraction)) - startingPeriod = endingPeriod - } - return false - }, - ) - } - return stake -} diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go new file mode 100644 index 000000000..e348d552d --- /dev/null +++ b/app/upgrades/v6/constants.go @@ -0,0 +1,14 @@ +package v6 + +import ( + storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/functionx/fx-core/v6/app/upgrades" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: "v6.0.x", + CreateUpgradeHandler: CreateUpgradeHandler, + StoreUpgrades: func() *storetypes.StoreUpgrades { + return &storetypes.StoreUpgrades{} + }, +} diff --git a/app/upgrades/v5/upgrade.go b/app/upgrades/v6/upgrade.go similarity index 69% rename from app/upgrades/v5/upgrade.go rename to app/upgrades/v6/upgrade.go index 82914cc36..df42c29c2 100644 --- a/app/upgrades/v5/upgrade.go +++ b/app/upgrades/v6/upgrade.go @@ -1,12 +1,11 @@ -package v5 +package v6 import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/functionx/fx-core/v5/app/keepers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app/keepers" ) func CreateUpgradeHandler( @@ -17,11 +16,7 @@ func CreateUpgradeHandler( return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { cacheCtx, commit := ctx.CacheContext() - if ctx.ChainID() == fxtypes.TestnetChainId { - RepairSlashPeriod(ctx, app.StakingKeeper, app.DistrKeeper) - } - - ctx.Logger().Info("start to run v5 migrations...", "module", "upgrade") + ctx.Logger().Info("start to run v6 migrations...", "module", "upgrade") toVM, err := mm.RunMigrations(cacheCtx, configurator, fromVM) if err != nil { return fromVM, err diff --git a/client/cli/debug_test.go b/client/cli/debug_test.go index 5d072d2b2..c21ce26df 100644 --- a/client/cli/debug_test.go +++ b/client/cli/debug_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/client/cli" + "github.com/functionx/fx-core/v6/client/cli" ) func TestToStringCmd(t *testing.T) { diff --git a/client/cli/gentx.go b/client/cli/gentx.go index 0fe691b9b..943bbd5bf 100644 --- a/client/cli/gentx.go +++ b/client/cli/gentx.go @@ -32,7 +32,7 @@ import ( tmos "github.com/tendermint/tendermint/libs/os" tmtypes "github.com/tendermint/tendermint/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) // GenTxCmd builds the application's gentx command. diff --git a/client/cli/keys/parse.go b/client/cli/keys/parse.go index a2138ce71..c0a39ac8c 100644 --- a/client/cli/keys/parse.go +++ b/client/cli/keys/parse.go @@ -12,7 +12,7 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/client/cli" + "github.com/functionx/fx-core/v6/client/cli" ) const prefixFlag = "prefix" diff --git a/client/client_test.go b/client/client_test.go index 80670c584..3e050da7d 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -25,14 +25,14 @@ import ( "github.com/stretchr/testify/suite" ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/client/grpc" - "github.com/functionx/fx-core/v5/client/jsonrpc" - fxauth "github.com/functionx/fx-core/v5/server/grpc/auth" - "github.com/functionx/fx-core/v5/testutil" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/testutil/network" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/client/grpc" + "github.com/functionx/fx-core/v6/client/jsonrpc" + fxauth "github.com/functionx/fx-core/v6/server/grpc/auth" + "github.com/functionx/fx-core/v6/testutil" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/network" + fxtypes "github.com/functionx/fx-core/v6/types" ) type rpcTestClient interface { diff --git a/client/grpc/grpc_client.go b/client/grpc/grpc_client.go index 286dd8dc6..db9bebe76 100644 --- a/client/grpc/grpc_client.go +++ b/client/grpc/grpc_client.go @@ -35,10 +35,10 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" - "github.com/functionx/fx-core/v5/client" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/client" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" ) type Client struct { diff --git a/client/grpc/grpc_client_test.go b/client/grpc/grpc_client_test.go index 8e87f8b63..fc63a95cd 100644 --- a/client/grpc/grpc_client_test.go +++ b/client/grpc/grpc_client_test.go @@ -7,8 +7,8 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/client/grpc" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/client/grpc" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestClient_QueryBalances(t *testing.T) { diff --git a/client/jsonrpc/abci_query.go b/client/jsonrpc/abci_query.go index 22b03eaa6..a22d2dda4 100644 --- a/client/jsonrpc/abci_query.go +++ b/client/jsonrpc/abci_query.go @@ -13,7 +13,7 @@ import ( "github.com/gogo/protobuf/proto" ctypes "github.com/tendermint/tendermint/rpc/core/types" - gravitytypes "github.com/functionx/fx-core/v5/x/gravity/types" + gravitytypes "github.com/functionx/fx-core/v6/x/gravity/types" ) func (c *NodeRPC) QueryAccount(address string) (authtypes.AccountI, error) { diff --git a/client/jsonrpc/json_rpc.go b/client/jsonrpc/json_rpc.go index e6a6369aa..9744d591c 100644 --- a/client/jsonrpc/json_rpc.go +++ b/client/jsonrpc/json_rpc.go @@ -20,7 +20,7 @@ import ( ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" - "github.com/functionx/fx-core/v5/client" + "github.com/functionx/fx-core/v6/client" ) type jsonRPCCaller interface { diff --git a/client/jsonrpc/rpc_client_test.go b/client/jsonrpc/rpc_client_test.go index d6d05290f..7d777561e 100644 --- a/client/jsonrpc/rpc_client_test.go +++ b/client/jsonrpc/rpc_client_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/tendermint/tendermint/libs/log" - "github.com/functionx/fx-core/v5/client/jsonrpc" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/client/jsonrpc" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestNewWsClient(t *testing.T) { diff --git a/cmd/config.go b/cmd/config.go index 818b96e4b..4a5f7d715 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -10,7 +10,7 @@ import ( tmcfg "github.com/tendermint/tendermint/config" tmcli "github.com/tendermint/tendermint/libs/cli" - fxcfg "github.com/functionx/fx-core/v5/server/config" + fxcfg "github.com/functionx/fx-core/v6/server/config" ) const ( diff --git a/cmd/config_test.go b/cmd/config_test.go index 9543a3697..a644f3796 100644 --- a/cmd/config_test.go +++ b/cmd/config_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" tmcfg "github.com/tendermint/tendermint/config" - fxcfg "github.com/functionx/fx-core/v5/server/config" + fxcfg "github.com/functionx/fx-core/v6/server/config" ) func Test_updateCfgCmd(t *testing.T) { diff --git a/cmd/doctor.go b/cmd/doctor.go index 82e897249..b5fdb5d7f 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -28,10 +28,10 @@ import ( tmtypes "github.com/tendermint/tendermint/types" tmversion "github.com/tendermint/tendermint/version" - "github.com/functionx/fx-core/v5/client/grpc" - "github.com/functionx/fx-core/v5/server" - fxcfg "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/client/grpc" + "github.com/functionx/fx-core/v6/server" + fxcfg "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" ) const SPACE = " " diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index 3be82d10a..419f043f0 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) func Test_doctorCmd(t *testing.T) { diff --git a/cmd/fxcored/main.go b/cmd/fxcored/main.go index 916a2c1bf..375ddd78a 100644 --- a/cmd/fxcored/main.go +++ b/cmd/fxcored/main.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/functionx/fx-core/v5/cmd" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/cmd" + fxtypes "github.com/functionx/fx-core/v6/types" ) func main() { diff --git a/cmd/keys.go b/cmd/keys.go index a936cfd3e..c86e4daae 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" - fxkeys "github.com/functionx/fx-core/v5/client/cli/keys" + fxkeys "github.com/functionx/fx-core/v6/client/cli/keys" ) // Commands registers a sub-tree of commands to interact with diff --git a/cmd/root.go b/cmd/root.go index f85725281..04098c1c0 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -31,19 +31,19 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/client/cli" - fxserver "github.com/functionx/fx-core/v5/server" - fxcfg "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumcli "github.com/functionx/fx-core/v5/x/arbitrum/client/cli" - avalanchecli "github.com/functionx/fx-core/v5/x/avalanche/client/cli" - bsccli "github.com/functionx/fx-core/v5/x/bsc/client/cli" - crosschaincli "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - ethcli "github.com/functionx/fx-core/v5/x/eth/client/cli" - optimismcli "github.com/functionx/fx-core/v5/x/optimism/client/cli" - polygoncli "github.com/functionx/fx-core/v5/x/polygon/client/cli" - troncli "github.com/functionx/fx-core/v5/x/tron/client/cli" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/client/cli" + fxserver "github.com/functionx/fx-core/v6/server" + fxcfg "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumcli "github.com/functionx/fx-core/v6/x/arbitrum/client/cli" + avalanchecli "github.com/functionx/fx-core/v6/x/avalanche/client/cli" + bsccli "github.com/functionx/fx-core/v6/x/bsc/client/cli" + crosschaincli "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + ethcli "github.com/functionx/fx-core/v6/x/eth/client/cli" + optimismcli "github.com/functionx/fx-core/v6/x/optimism/client/cli" + polygoncli "github.com/functionx/fx-core/v6/x/polygon/client/cli" + troncli "github.com/functionx/fx-core/v6/x/tron/client/cli" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/testnet.go b/cmd/testnet.go index 17f4c26c9..83dea16a0 100644 --- a/cmd/testnet.go +++ b/cmd/testnet.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" tmcfg "github.com/tendermint/tendermint/config" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil" - "github.com/functionx/fx-core/v5/testutil/network" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil" + "github.com/functionx/fx-core/v6/testutil/network" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/docs/swagger_test.go b/docs/swagger_test.go index ecbfb1460..34dfb1adb 100644 --- a/docs/swagger_test.go +++ b/docs/swagger_test.go @@ -15,7 +15,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestSwaggerConfig(t *testing.T) { diff --git a/go.mod b/go.mod index 5d5913baf..5fc65e254 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/functionx/fx-core/v5 +module github.com/functionx/fx-core/v6 go 1.19 diff --git a/server/config/config_cmd.go b/server/config/config_cmd.go index dea7c6250..04c80046f 100644 --- a/server/config/config_cmd.go +++ b/server/config/config_cmd.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/viper" tmcfg "github.com/tendermint/tendermint/config" - "github.com/functionx/fx-core/v5/client/cli" + "github.com/functionx/fx-core/v6/client/cli" ) func CmdHandler(cmd *cobra.Command, args []string) error { diff --git a/server/config/config_cmd_test.go b/server/config/config_cmd_test.go index ef90066d3..3b10b2e92 100644 --- a/server/config/config_cmd_test.go +++ b/server/config/config_cmd_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/tendermint/tendermint/config" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) func Test_output(t *testing.T) { diff --git a/server/database_test.go b/server/database_test.go index d6cdd7117..62b95b553 100644 --- a/server/database_test.go +++ b/server/database_test.go @@ -12,8 +12,8 @@ import ( tmtypes "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/server" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/server" ) type DatabaseTestSuite struct { diff --git a/server/grpc/auth/grpc_query.go b/server/grpc/auth/grpc_query.go index d647c5b95..fcdf8bd4b 100644 --- a/server/grpc/auth/grpc_query.go +++ b/server/grpc/auth/grpc_query.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) var _ QueryServer = Querier{} diff --git a/server/log_filter_test.go b/server/log_filter_test.go index e8875a86e..ca5dbc5b7 100644 --- a/server/log_filter_test.go +++ b/server/log_filter_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" tmlog "github.com/tendermint/tendermint/libs/log" - fxserver "github.com/functionx/fx-core/v5/server" + fxserver "github.com/functionx/fx-core/v6/server" ) func TestFxZeroLogWrapper(t *testing.T) { diff --git a/server/rosetta.go b/server/rosetta.go index 9b26151de..565f11b21 100644 --- a/server/rosetta.go +++ b/server/rosetta.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/server/rosetta" "github.com/spf13/cobra" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // RosettaCommand builds the rosetta root command given diff --git a/server/start.go b/server/start.go index cb61c0b08..adc4ff0a0 100644 --- a/server/start.go +++ b/server/start.go @@ -52,8 +52,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - fxcfg "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" + fxcfg "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" ) const FlagApplicationDatabaseDir = "application-db-dir" @@ -664,6 +664,7 @@ func checkMainnetAndBlock(genesisDoc *tmtypes.GenesisDoc, config *tmcfg.Config) return errors.New("invalid version: The current block height is less than the v5.0.0 upgrade height(11_601_700)," + " please use the v4.x.x version to synchronize the block or download the latest snapshot") } + return errors.New("invalid version: The current version is not released, please use the corresponding version") } return nil } diff --git a/server/start_test.go b/server/start_test.go index 7c8d47d2f..9d46889bd 100644 --- a/server/start_test.go +++ b/server/start_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" tmcfg "github.com/tendermint/tendermint/config" - "github.com/functionx/fx-core/v5/app" - fxserver "github.com/functionx/fx-core/v5/server" - fxcfg "github.com/functionx/fx-core/v5/server/config" + "github.com/functionx/fx-core/v6/app" + fxserver "github.com/functionx/fx-core/v6/server" + fxcfg "github.com/functionx/fx-core/v6/server/config" ) var errCancelledInPreRun = errors.New("cancelled in prerun") diff --git a/tests/amino_test.go b/tests/amino_test.go index a6ec38a7b..3eb4a4417 100644 --- a/tests/amino_test.go +++ b/tests/amino_test.go @@ -17,12 +17,12 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/app" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" - ibctransfertypes "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/app" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" + ibctransfertypes "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) func TestAminoEncode(t *testing.T) { diff --git a/tests/ante_test.go b/tests/ante_test.go index f465f5a81..ee78c2187 100644 --- a/tests/ante_test.go +++ b/tests/ante_test.go @@ -6,7 +6,7 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *IntegrationTest) ByPassFeeTest() { diff --git a/tests/contract_test.go b/tests/contract_test.go index c0199bbce..5781b0dd2 100644 --- a/tests/contract_test.go +++ b/tests/contract_test.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestFIP20Code(t *testing.T) { diff --git a/tests/crosschain_suite.go b/tests/crosschain_suite.go index 9215578a1..a4a496df3 100644 --- a/tests/crosschain_suite.go +++ b/tests/crosschain_suite.go @@ -15,10 +15,10 @@ import ( ethcrypto "github.com/ethereum/go-ethereum/crypto" tronaddress "github.com/fbsobreira/gotron-sdk/pkg/address" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type CrosschainTestSuite struct { diff --git a/tests/crosschain_test.go b/tests/crosschain_test.go index b1b36aa31..2f4d13ac6 100644 --- a/tests/crosschain_test.go +++ b/tests/crosschain_test.go @@ -10,10 +10,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) func (suite *IntegrationTest) CrossChainTest() { diff --git a/tests/erc20_suite.go b/tests/erc20_suite.go index 99d8cd6a4..761c5dd91 100644 --- a/tests/erc20_suite.go +++ b/tests/erc20_suite.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/functionx/fx-core/v5/client" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - precompilescrosschain "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + "github.com/functionx/fx-core/v6/client" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + precompilescrosschain "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) type Erc20TestSuite struct { diff --git a/tests/erc20_test.go b/tests/erc20_test.go index f864b5278..0b0ce1dd4 100644 --- a/tests/erc20_test.go +++ b/tests/erc20_test.go @@ -15,12 +15,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/functionx/fx-core/v5/client" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/client" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *IntegrationTest) ERC20Test() { diff --git a/tests/evm_suite.go b/tests/evm_suite.go index b0a0a733a..92813d684 100644 --- a/tests/evm_suite.go +++ b/tests/evm_suite.go @@ -15,11 +15,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/client" - "github.com/functionx/fx-core/v5/contract" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/client" + "github.com/functionx/fx-core/v6/contract" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) type EvmTestSuite struct { diff --git a/tests/evm_test.go b/tests/evm_test.go index b50c077db..05907f235 100644 --- a/tests/evm_test.go +++ b/tests/evm_test.go @@ -17,11 +17,11 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/client" - "github.com/functionx/fx-core/v5/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/types" - fxevmtypes "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/client" + "github.com/functionx/fx-core/v6/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/types" + fxevmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) func (suite *IntegrationTest) WFXTest() { diff --git a/tests/integration_test.go b/tests/integration_test.go index 6eca4ab3b..4ee04659d 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/suite" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type IntegrationTest struct { diff --git a/tests/migrate_test.go b/tests/migrate_test.go index 4ac03f7b6..28a9bc797 100644 --- a/tests/migrate_test.go +++ b/tests/migrate_test.go @@ -16,9 +16,9 @@ import ( hd2 "github.com/evmos/ethermint/crypto/hd" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" ) func (suite *IntegrationTest) migrateAccount(fromPrivateKey, toPrivateKey cryptotypes.PrivKey) { diff --git a/tests/staking_suite.go b/tests/staking_suite.go index 89fc604d5..05b992ee0 100644 --- a/tests/staking_suite.go +++ b/tests/staking_suite.go @@ -18,11 +18,11 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/functionx/fx-core/v5/client" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - precompilesstaking "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + "github.com/functionx/fx-core/v6/client" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + precompilesstaking "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) type StakingSuite struct { diff --git a/tests/staking_test.go b/tests/staking_test.go index 0930b4a5d..684b5010a 100644 --- a/tests/staking_test.go +++ b/tests/staking_test.go @@ -17,11 +17,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "google.golang.org/grpc/metadata" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - precompilesstaking "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + precompilesstaking "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func (suite *IntegrationTest) StakingTest() { diff --git a/tests/store/subspace_test.go b/tests/store/subspace_test.go index ca30ab3aa..2d71d006b 100644 --- a/tests/store/subspace_test.go +++ b/tests/store/subspace_test.go @@ -12,8 +12,8 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/app" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" ) func Benchmark_Subspace(b *testing.B) { diff --git a/tests/suite.go b/tests/suite.go index 4754cefb0..7c099dbb1 100644 --- a/tests/suite.go +++ b/tests/suite.go @@ -24,14 +24,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/suite" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/client/grpc" - "github.com/functionx/fx-core/v5/client/jsonrpc" - "github.com/functionx/fx-core/v5/testutil" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/testutil/network" - fxtypes "github.com/functionx/fx-core/v5/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/client/grpc" + "github.com/functionx/fx-core/v6/client/jsonrpc" + "github.com/functionx/fx-core/v6/testutil" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/network" + fxtypes "github.com/functionx/fx-core/v6/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) type TestSuite struct { diff --git a/tests/upgrade_time_calc_test.go b/tests/upgrade_time_calc_test.go index 334918830..4e3d49526 100644 --- a/tests/upgrade_time_calc_test.go +++ b/tests/upgrade_time_calc_test.go @@ -12,7 +12,7 @@ import ( clienthttp "github.com/tendermint/tendermint/rpc/client/http" jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestCalculateUpgradeHeight(t *testing.T) { diff --git a/testutil/helpers/key_test.go b/testutil/helpers/key_test.go index 693e267cc..84eaa5d7f 100644 --- a/testutil/helpers/key_test.go +++ b/testutil/helpers/key_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func TestPrivKeyFromMnemonic(t *testing.T) { diff --git a/testutil/helpers/test_helpers.go b/testutil/helpers/test_helpers.go index e62ddd5dc..08886fa5d 100644 --- a/testutil/helpers/test_helpers.go +++ b/testutil/helpers/test_helpers.go @@ -43,9 +43,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - fxtypes "github.com/functionx/fx-core/v5/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/app" + fxtypes "github.com/functionx/fx-core/v6/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) // ABCIConsensusParams defines the default Tendermint consensus params used in fxCore testing. diff --git a/testutil/network.go b/testutil/network.go index 4a86679c0..fd796b648 100644 --- a/testutil/network.go +++ b/testutil/network.go @@ -32,11 +32,11 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" dbm "github.com/tendermint/tm-db" - "github.com/functionx/fx-core/v5/app" - fxcfg "github.com/functionx/fx-core/v5/server/config" - "github.com/functionx/fx-core/v5/testutil/network" - fxtypes "github.com/functionx/fx-core/v5/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/app" + fxcfg "github.com/functionx/fx-core/v6/server/config" + "github.com/functionx/fx-core/v6/testutil/network" + fxtypes "github.com/functionx/fx-core/v6/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) // DefaultNetworkConfig returns a sane default configuration suitable for nearly all diff --git a/testutil/network/network.go b/testutil/network/network.go index 61c99f4bc..e58c69dd2 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -41,8 +41,8 @@ import ( dbm "github.com/tendermint/tm-db" "google.golang.org/grpc" - fxcfg "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" + fxcfg "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" ) // package-wide network lock to only allow one test network at a time diff --git a/testutil/network/util.go b/testutil/network/util.go index bceebdfa4..63b51e5e6 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -28,9 +28,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/server" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/server" + fxtypes "github.com/functionx/fx-core/v6/types" ) //gocyclo:ignore diff --git a/testutil/network_test.go b/testutil/network_test.go index 913a9dd8b..14b137137 100644 --- a/testutil/network_test.go +++ b/testutil/network_test.go @@ -12,10 +12,10 @@ import ( hd2 "github.com/evmos/ethermint/crypto/hd" "github.com/stretchr/testify/suite" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/testutil/network" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/network" ) type IntegrationTestSuite struct { diff --git a/types/byte32_test.go b/types/byte32_test.go index b7af023d4..5f7ea61c5 100644 --- a/types/byte32_test.go +++ b/types/byte32_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestStrToByte32(t *testing.T) { diff --git a/types/contract.go b/types/contract.go index 2afbfbb3f..48ce2dd6b 100644 --- a/types/contract.go +++ b/types/contract.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - "github.com/functionx/fx-core/v5/contract" + "github.com/functionx/fx-core/v6/contract" ) const ( diff --git a/types/eth_validation_test.go b/types/eth_validation_test.go index 77905d61b..b5b618d08 100644 --- a/types/eth_validation_test.go +++ b/types/eth_validation_test.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestIsEmptyHash(t *testing.T) { diff --git a/types/target_test.go b/types/target_test.go index e22be35fc..01527c297 100644 --- a/types/target_test.go +++ b/types/target_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) func TestParseTargetIBC(t *testing.T) { diff --git a/x/arbitrum/client/cli/query.go b/x/arbitrum/client/cli/query.go index b52587fbe..9427d0fa3 100644 --- a/x/arbitrum/client/cli/query.go +++ b/x/arbitrum/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/arbitrum/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/arbitrum/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetQueryCmd() *cobra.Command { diff --git a/x/arbitrum/client/cli/tx.go b/x/arbitrum/client/cli/tx.go index bdb9a612e..a6ce0c377 100644 --- a/x/arbitrum/client/cli/tx.go +++ b/x/arbitrum/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/arbitrum/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/arbitrum/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetTxCmd() *cobra.Command { diff --git a/x/arbitrum/module.go b/x/arbitrum/module.go index 7330f532a..b1518aa03 100644 --- a/x/arbitrum/module.go +++ b/x/arbitrum/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/arbitrum/client/cli" - "github.com/functionx/fx-core/v5/x/arbitrum/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/arbitrum/client/cli" + "github.com/functionx/fx-core/v6/x/arbitrum/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) // type check to ensure the interface is properly implemented diff --git a/x/arbitrum/types/genesis.go b/x/arbitrum/types/genesis.go index ae238dae8..e48c03ec8 100644 --- a/x/arbitrum/types/genesis.go +++ b/x/arbitrum/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/arbitrum/types/genesis_test.go b/x/arbitrum/types/genesis_test.go index 2628769c3..e4581881d 100644 --- a/x/arbitrum/types/genesis_test.go +++ b/x/arbitrum/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/avalanche/client/cli/query.go b/x/avalanche/client/cli/query.go index a4bfa7d51..2a76a1356 100644 --- a/x/avalanche/client/cli/query.go +++ b/x/avalanche/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/avalanche/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/avalanche/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetQueryCmd() *cobra.Command { diff --git a/x/avalanche/client/cli/tx.go b/x/avalanche/client/cli/tx.go index 360465f4a..8137dc1d9 100644 --- a/x/avalanche/client/cli/tx.go +++ b/x/avalanche/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/avalanche/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/avalanche/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetTxCmd() *cobra.Command { diff --git a/x/avalanche/module.go b/x/avalanche/module.go index 5619ef483..5a677c266 100644 --- a/x/avalanche/module.go +++ b/x/avalanche/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/avalanche/client/cli" - "github.com/functionx/fx-core/v5/x/avalanche/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/avalanche/client/cli" + "github.com/functionx/fx-core/v6/x/avalanche/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) // type check to ensure the interface is properly implemented diff --git a/x/avalanche/types/genesis.go b/x/avalanche/types/genesis.go index 854edfa3f..5691a45e7 100644 --- a/x/avalanche/types/genesis.go +++ b/x/avalanche/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/avalanche/types/genesis_test.go b/x/avalanche/types/genesis_test.go index 39fdef13c..e9716aea4 100644 --- a/x/avalanche/types/genesis_test.go +++ b/x/avalanche/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/bsc/client/cli/query.go b/x/bsc/client/cli/query.go index e6ac62e15..780a32d74 100644 --- a/x/bsc/client/cli/query.go +++ b/x/bsc/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetQueryCmd() *cobra.Command { diff --git a/x/bsc/client/cli/tx.go b/x/bsc/client/cli/tx.go index 0e451760f..ce3b9f5f7 100644 --- a/x/bsc/client/cli/tx.go +++ b/x/bsc/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) func GetTxCmd() *cobra.Command { diff --git a/x/bsc/module.go b/x/bsc/module.go index e7baebdbe..e8e03fee8 100644 --- a/x/bsc/module.go +++ b/x/bsc/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/bsc/client/cli" - "github.com/functionx/fx-core/v5/x/bsc/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/bsc/client/cli" + "github.com/functionx/fx-core/v6/x/bsc/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) // type check to ensure the interface is properly implemented diff --git a/x/bsc/types/genesis.go b/x/bsc/types/genesis.go index f737ea47e..173a50cbd 100644 --- a/x/bsc/types/genesis.go +++ b/x/bsc/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/bsc/types/genesis_test.go b/x/bsc/types/genesis_test.go index 67ffb4ad5..d2c07ad42 100644 --- a/x/bsc/types/genesis_test.go +++ b/x/bsc/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/crosschain/client/cli/query.go b/x/crosschain/client/cli/query.go index 4adfe8a72..a3499cbb2 100644 --- a/x/crosschain/client/cli/query.go +++ b/x/crosschain/client/cli/query.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" abcitype "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func GetQueryCmd(subCmd ...*cobra.Command) *cobra.Command { diff --git a/x/crosschain/client/cli/tx.go b/x/crosschain/client/cli/tx.go index 1d4097c60..521473be2 100644 --- a/x/crosschain/client/cli/tx.go +++ b/x/crosschain/client/cli/tx.go @@ -21,7 +21,7 @@ import ( troncommon "github.com/fbsobreira/gotron-sdk/pkg/common" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func GetTxCmd(subCmd ...*cobra.Command) *cobra.Command { diff --git a/x/crosschain/client/cli/tx_proposal.go b/x/crosschain/client/cli/tx_proposal.go index 2dea31304..62d11c41c 100644 --- a/x/crosschain/client/cli/tx_proposal.go +++ b/x/crosschain/client/cli/tx_proposal.go @@ -11,7 +11,7 @@ import ( govv1betal "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func CmdUpdateChainOraclesProposal(chainName string) *cobra.Command { diff --git a/x/crosschain/client/proposal_handler.go b/x/crosschain/client/proposal_handler.go index e87b41800..ac367cda3 100644 --- a/x/crosschain/client/proposal_handler.go +++ b/x/crosschain/client/proposal_handler.go @@ -4,7 +4,7 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" ) var LegacyUpdateChainOraclesProposalHandler = govclient.NewProposalHandler(NewLegacyUpdateChainOraclesProposalCmd) diff --git a/x/crosschain/keeper/abci.go b/x/crosschain/keeper/abci.go index 45293390f..64ea5e32c 100644 --- a/x/crosschain/keeper/abci.go +++ b/x/crosschain/keeper/abci.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // EndBlocker is called at the end of every block diff --git a/x/crosschain/keeper/abci_test.go b/x/crosschain/keeper/abci_test.go index f8f788832..971afb726 100644 --- a/x/crosschain/keeper/abci_test.go +++ b/x/crosschain/keeper/abci_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain" - "github.com/functionx/fx-core/v5/x/crosschain/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain" + "github.com/functionx/fx-core/v6/x/crosschain/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *KeeperTestSuite) TestABCIEndBlockDepositClaim() { diff --git a/x/crosschain/keeper/attestation.go b/x/crosschain/keeper/attestation.go index 5c54a9f7c..128157f1a 100644 --- a/x/crosschain/keeper/attestation.go +++ b/x/crosschain/keeper/attestation.go @@ -9,7 +9,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (k Keeper) Attest(ctx sdk.Context, oracleAddr sdk.AccAddress, claim types.ExternalClaim) (*types.Attestation, error) { diff --git a/x/crosschain/keeper/attestation_handler.go b/x/crosschain/keeper/attestation_handler.go index 7e180ba3d..c16da5abc 100644 --- a/x/crosschain/keeper/attestation_handler.go +++ b/x/crosschain/keeper/attestation_handler.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // AttestationHandler Handle is the entry point for Attestation processing. diff --git a/x/crosschain/keeper/batch.go b/x/crosschain/keeper/batch.go index 524bfbebb..c91186229 100644 --- a/x/crosschain/keeper/batch.go +++ b/x/crosschain/keeper/batch.go @@ -8,7 +8,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // BuildOutgoingTxBatch starts the following process chain: diff --git a/x/crosschain/keeper/batch_test.go b/x/crosschain/keeper/batch_test.go index 24d89348b..f23495288 100644 --- a/x/crosschain/keeper/batch_test.go +++ b/x/crosschain/keeper/batch_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (suite *KeeperTestSuite) TestLastPendingBatchRequestByAddr() { diff --git a/x/crosschain/keeper/bridge_token.go b/x/crosschain/keeper/bridge_token.go index 7b8370eb3..39de637d5 100644 --- a/x/crosschain/keeper/bridge_token.go +++ b/x/crosschain/keeper/bridge_token.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (k Keeper) GetBridgeTokenDenom(ctx sdk.Context, tokenContract string) *types.BridgeToken { diff --git a/x/crosschain/keeper/bridge_token_test.go b/x/crosschain/keeper/bridge_token_test.go index 57515995f..9d5601fe5 100644 --- a/x/crosschain/keeper/bridge_token_test.go +++ b/x/crosschain/keeper/bridge_token_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "fmt" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (suite *KeeperTestSuite) TestKeeper_BridgeToken() { diff --git a/x/crosschain/keeper/delegate.go b/x/crosschain/keeper/delegate.go index 6159b1374..456cf212d 100644 --- a/x/crosschain/keeper/delegate.go +++ b/x/crosschain/keeper/delegate.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (k Keeper) GetOracleDelegateToken(ctx sdk.Context, delegateAddr sdk.AccAddress, valAddr sdk.ValAddress) (sdkmath.Int, error) { diff --git a/x/crosschain/keeper/evidence.go b/x/crosschain/keeper/evidence.go index c755fc168..a45ea7c23 100644 --- a/x/crosschain/keeper/evidence.go +++ b/x/crosschain/keeper/evidence.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // SetPastExternalSignatureCheckpoint puts the checkpoint of a oracle set, batch into a set diff --git a/x/crosschain/keeper/evidence_test.go b/x/crosschain/keeper/evidence_test.go index 6010198c3..0b411809a 100644 --- a/x/crosschain/keeper/evidence_test.go +++ b/x/crosschain/keeper/evidence_test.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *KeeperTestSuite) TestKeeper_PastExternalSignatureCheckpoint() { diff --git a/x/crosschain/keeper/genesis.go b/x/crosschain/keeper/genesis.go index 46915701a..ab1bcaff4 100644 --- a/x/crosschain/keeper/genesis.go +++ b/x/crosschain/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // InitGenesis import module genesis diff --git a/x/crosschain/keeper/genesis_test.go b/x/crosschain/keeper/genesis_test.go index 117a63374..2b9d269ea 100644 --- a/x/crosschain/keeper/genesis_test.go +++ b/x/crosschain/keeper/genesis_test.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/keeper" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/keeper" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) // Tests that batches and transactions are preserved during chain restart diff --git a/x/crosschain/keeper/grpc_query.go b/x/crosschain/keeper/grpc_query.go index 4b0f33a2c..e7fae2e8b 100644 --- a/x/crosschain/keeper/grpc_query.go +++ b/x/crosschain/keeper/grpc_query.go @@ -9,15 +9,15 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/crosschain/keeper/grpc_query_router.go b/x/crosschain/keeper/grpc_query_router.go index 6864a82c4..22781bb46 100644 --- a/x/crosschain/keeper/grpc_query_router.go +++ b/x/crosschain/keeper/grpc_query_router.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) var _ types.QueryServer = RouterKeeper{} diff --git a/x/crosschain/keeper/grpc_query_test.go b/x/crosschain/keeper/grpc_query_test.go index 21b5c5ddf..701b7cfc3 100644 --- a/x/crosschain/keeper/grpc_query_test.go +++ b/x/crosschain/keeper/grpc_query_test.go @@ -22,18 +22,18 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/keeper" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/keeper" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type CrossChainGrpcTestSuite struct { diff --git a/x/crosschain/keeper/hook.go b/x/crosschain/keeper/hook.go index 03418279b..3e3f61b94 100644 --- a/x/crosschain/keeper/hook.go +++ b/x/crosschain/keeper/hook.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // TransferAfter diff --git a/x/crosschain/keeper/keeper.go b/x/crosschain/keeper/keeper.go index 21464cdac..3bf57c1cc 100644 --- a/x/crosschain/keeper/keeper.go +++ b/x/crosschain/keeper/keeper.go @@ -11,8 +11,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/tendermint/tendermint/libs/log" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // Keeper maintains the link to storage and exposes getter/setter methods for the various parts of the state machine diff --git a/x/crosschain/keeper/keeper_router.go b/x/crosschain/keeper/keeper_router.go index 30a18b1d8..88b759dbb 100644 --- a/x/crosschain/keeper/keeper_router.go +++ b/x/crosschain/keeper/keeper_router.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // RouterKeeper maintains the link to storage and exposes getter/setter methods for the various parts of the state machine diff --git a/x/crosschain/keeper/keeper_test.go b/x/crosschain/keeper/keeper_test.go index db52017a1..760b2aaf3 100644 --- a/x/crosschain/keeper/keeper_test.go +++ b/x/crosschain/keeper/keeper_test.go @@ -15,19 +15,19 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - arbitrumtypes "github.com/functionx/fx-core/v5/x/arbitrum/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/keeper" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - optimismtypes "github.com/functionx/fx-core/v5/x/optimism/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - tronkeeper "github.com/functionx/fx-core/v5/x/tron/keeper" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + arbitrumtypes "github.com/functionx/fx-core/v6/x/arbitrum/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/keeper" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + tronkeeper "github.com/functionx/fx-core/v6/x/tron/keeper" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type KeeperTestSuite struct { diff --git a/x/crosschain/keeper/migrations.go b/x/crosschain/keeper/migrations.go index 2f30d51fe..f609c233e 100644 --- a/x/crosschain/keeper/migrations.go +++ b/x/crosschain/keeper/migrations.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v4 "github.com/functionx/fx-core/v5/x/crosschain/migrations/v4" - "github.com/functionx/fx-core/v5/x/crosschain/types" + v4 "github.com/functionx/fx-core/v6/x/crosschain/migrations/v4" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/crosschain/keeper/msg_server.go b/x/crosschain/keeper/msg_server.go index 0e78d2879..1c5c91a8a 100644 --- a/x/crosschain/keeper/msg_server.go +++ b/x/crosschain/keeper/msg_server.go @@ -12,8 +12,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) var _ types.MsgServer = MsgServer{} diff --git a/x/crosschain/keeper/msg_server_router.go b/x/crosschain/keeper/msg_server_router.go index 336f2350c..5b07155eb 100644 --- a/x/crosschain/keeper/msg_server_router.go +++ b/x/crosschain/keeper/msg_server_router.go @@ -7,7 +7,7 @@ import ( errorsmod "cosmossdk.io/errors" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) type msgServer struct { diff --git a/x/crosschain/keeper/msg_server_test.go b/x/crosschain/keeper/msg_server_test.go index 779dd8730..37ea9af1b 100644 --- a/x/crosschain/keeper/msg_server_test.go +++ b/x/crosschain/keeper/msg_server_test.go @@ -18,11 +18,11 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *KeeperTestSuite) TestMsgBondedOracle() { diff --git a/x/crosschain/keeper/oracle.go b/x/crosschain/keeper/oracle.go index 648df011a..3c77e5621 100644 --- a/x/crosschain/keeper/oracle.go +++ b/x/crosschain/keeper/oracle.go @@ -4,7 +4,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // --- PROPOSAL ORACLE --- // diff --git a/x/crosschain/keeper/oracle_set.go b/x/crosschain/keeper/oracle_set.go index 59ab3fa3f..cc8a1be66 100644 --- a/x/crosschain/keeper/oracle_set.go +++ b/x/crosschain/keeper/oracle_set.go @@ -7,7 +7,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // --- ORACLE SET REQUESTS --- // diff --git a/x/crosschain/keeper/oracle_set_test.go b/x/crosschain/keeper/oracle_set_test.go index 3c41dcbb0..9e06029d3 100644 --- a/x/crosschain/keeper/oracle_set_test.go +++ b/x/crosschain/keeper/oracle_set_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (suite *KeeperTestSuite) TestLastPendingOracleSetRequestByAddr() { diff --git a/x/crosschain/keeper/params.go b/x/crosschain/keeper/params.go index bab40fca1..352d47926 100644 --- a/x/crosschain/keeper/params.go +++ b/x/crosschain/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // GetParams returns the parameters from the store diff --git a/x/crosschain/keeper/params_test.go b/x/crosschain/keeper/params_test.go index e30e596e9..bb032b0cf 100644 --- a/x/crosschain/keeper/params_test.go +++ b/x/crosschain/keeper/params_test.go @@ -4,8 +4,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/crosschain/keeper/pool.go b/x/crosschain/keeper/pool.go index 071ffc951..bc2b04cd7 100644 --- a/x/crosschain/keeper/pool.go +++ b/x/crosschain/keeper/pool.go @@ -9,8 +9,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // AddToOutgoingPool diff --git a/x/crosschain/keeper/pool_test.go b/x/crosschain/keeper/pool_test.go index a28e2b5a4..9591194f0 100644 --- a/x/crosschain/keeper/pool_test.go +++ b/x/crosschain/keeper/pool_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) func (suite *KeeperTestSuite) TestKeeper_Outgoing() { diff --git a/x/crosschain/keeper/proposal_legacy.go b/x/crosschain/keeper/proposal_legacy.go index f5791558c..e2037ba20 100644 --- a/x/crosschain/keeper/proposal_legacy.go +++ b/x/crosschain/keeper/proposal_legacy.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // Deprecated diff --git a/x/crosschain/keeper/proposal_legacy_test.go b/x/crosschain/keeper/proposal_legacy_test.go index a3ea89a15..ca03cafc1 100644 --- a/x/crosschain/keeper/proposal_legacy_test.go +++ b/x/crosschain/keeper/proposal_legacy_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (suite *KeeperTestSuite) TestUpdateCrossChainOraclesProposal() { diff --git a/x/crosschain/keeper/relay_transfer.go b/x/crosschain/keeper/relay_transfer.go index b0c65b2c3..099490d9d 100644 --- a/x/crosschain/keeper/relay_transfer.go +++ b/x/crosschain/keeper/relay_transfer.go @@ -13,8 +13,8 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func (k Keeper) RelayTransferHandler(ctx sdk.Context, eventNonce uint64, targetHex string, receiver sdk.AccAddress, coin sdk.Coin) error { diff --git a/x/crosschain/migrations/v4/migrator_param.go b/x/crosschain/migrations/v4/migrator_param.go index 2488e418e..3f9be9462 100644 --- a/x/crosschain/migrations/v4/migrator_param.go +++ b/x/crosschain/migrations/v4/migrator_param.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func MigratorParam(ctx sdk.Context, legacySubspace types.Subspace, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { diff --git a/x/crosschain/migrations/v4/migrator_param_test.go b/x/crosschain/migrations/v4/migrator_param_test.go index 36ea240ac..f70b52ef2 100644 --- a/x/crosschain/migrations/v4/migrator_param_test.go +++ b/x/crosschain/migrations/v4/migrator_param_test.go @@ -9,9 +9,9 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - v4 "github.com/functionx/fx-core/v5/x/crosschain/migrations/v4" - "github.com/functionx/fx-core/v5/x/crosschain/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + v4 "github.com/functionx/fx-core/v6/x/crosschain/migrations/v4" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) type mockSubspace struct { diff --git a/x/crosschain/proposal_legacy.go b/x/crosschain/proposal_legacy.go index 41bd88067..e5d62d0a9 100644 --- a/x/crosschain/proposal_legacy.go +++ b/x/crosschain/proposal_legacy.go @@ -9,8 +9,8 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" govv1betal "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/functionx/fx-core/v5/x/crosschain/keeper" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/keeper" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // NewCrosschainProposalHandler diff --git a/x/crosschain/service.go b/x/crosschain/service.go index 616fe648c..86f3d288b 100644 --- a/x/crosschain/service.go +++ b/x/crosschain/service.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/grpc-ecosystem/grpc-gateway/runtime" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go index d20019963..00d47232b 100644 --- a/x/crosschain/types/expected_keepers.go +++ b/x/crosschain/types/expected_keepers.go @@ -10,7 +10,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" tranfsertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) type StakingKeeper interface { diff --git a/x/crosschain/types/key_test.go b/x/crosschain/types/key_test.go index 58de45435..835cf0acd 100644 --- a/x/crosschain/types/key_test.go +++ b/x/crosschain/types/key_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestGetBatchConfirmKey(t *testing.T) { diff --git a/x/crosschain/types/msg_validate.go b/x/crosschain/types/msg_validate.go index 3beccc812..59790dd04 100644 --- a/x/crosschain/types/msg_validate.go +++ b/x/crosschain/types/msg_validate.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) var _ MsgValidateBasic = &MsgValidate{} diff --git a/x/crosschain/types/msg_validator_test.go b/x/crosschain/types/msg_validator_test.go index 52ead8bba..935bcd2f8 100644 --- a/x/crosschain/types/msg_validator_test.go +++ b/x/crosschain/types/msg_validator_test.go @@ -14,15 +14,15 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - _ "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + _ "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) const ( diff --git a/x/crosschain/types/msgs_test.go b/x/crosschain/types/msgs_test.go index 3bec328c0..f830925cd 100644 --- a/x/crosschain/types/msgs_test.go +++ b/x/crosschain/types/msgs_test.go @@ -5,13 +5,13 @@ import ( "github.com/stretchr/testify/assert" - _ "github.com/functionx/fx-core/v5/app" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + _ "github.com/functionx/fx-core/v6/app" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func TestValidateModuleName(t *testing.T) { diff --git a/x/crosschain/types/params.go b/x/crosschain/types/params.go index 3de44ae87..3f54bce1e 100644 --- a/x/crosschain/types/params.go +++ b/x/crosschain/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/x/crosschain/types/types.go b/x/crosschain/types/types.go index efc407f1b..efa13c3ed 100644 --- a/x/crosschain/types/types.go +++ b/x/crosschain/types/types.go @@ -12,7 +12,7 @@ import ( gethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // --- ERC20Token --- // diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index ca72d4df9..1629f4772 100644 --- a/x/erc20/client/cli/query.go +++ b/x/erc20/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // GetQueryCmd returns the parent command for all erc20 CLI query commands. diff --git a/x/erc20/client/cli/tx.go b/x/erc20/client/cli/tx.go index 5ce878672..824ab6bec 100644 --- a/x/erc20/client/cli/tx.go +++ b/x/erc20/client/cli/tx.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // NewTxCmd returns a root CLI command handler for certain modules/erc20 transaction commands. diff --git a/x/erc20/client/cli/tx_proposal.go b/x/erc20/client/cli/tx_proposal.go index 0e32c67eb..d7c064415 100644 --- a/x/erc20/client/cli/tx_proposal.go +++ b/x/erc20/client/cli/tx_proposal.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/codes" grpcstatus "google.golang.org/grpc/status" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // NewLegacyRegisterCoinProposalCmd implements the command to submit a register-coin proposal diff --git a/x/erc20/client/proposal_handler.go b/x/erc20/client/proposal_handler.go index ddbc9f9b3..5f7888f7f 100644 --- a/x/erc20/client/proposal_handler.go +++ b/x/erc20/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/functionx/fx-core/v5/x/erc20/client/cli" + "github.com/functionx/fx-core/v6/x/erc20/client/cli" ) var ( diff --git a/x/erc20/keeper/evm.go b/x/erc20/keeper/evm.go index 74f0454c4..4173deb6b 100644 --- a/x/erc20/keeper/evm.go +++ b/x/erc20/keeper/evm.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" evmtypes "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // QueryERC20 returns the data of a deployed ERC20 contract diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index 2dd24dc10..beb82b850 100644 --- a/x/erc20/keeper/evm_test.go +++ b/x/erc20/keeper/evm_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestQueryERC20() { diff --git a/x/erc20/keeper/genesis.go b/x/erc20/keeper/genesis.go index 759c196b8..0190a334a 100644 --- a/x/erc20/keeper/genesis.go +++ b/x/erc20/keeper/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // InitGenesis import module genesis diff --git a/x/erc20/keeper/grpc_query.go b/x/erc20/keeper/grpc_query.go index f22836c73..f961684f7 100644 --- a/x/erc20/keeper/grpc_query.go +++ b/x/erc20/keeper/grpc_query.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 408a442bd..338f3f789 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/erc20/keeper/keeper.go b/x/erc20/keeper/keeper.go index 77f5c42f5..08d8f0785 100644 --- a/x/erc20/keeper/keeper.go +++ b/x/erc20/keeper/keeper.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/tendermint/tendermint/libs/log" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // Keeper of this module maintains collections of erc20. diff --git a/x/erc20/keeper/keeper_test.go b/x/erc20/keeper/keeper_test.go index 2f32289d6..224e75353 100644 --- a/x/erc20/keeper/keeper_test.go +++ b/x/erc20/keeper/keeper_test.go @@ -38,13 +38,13 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - fxserverconfig "github.com/functionx/fx-core/v5/server/config" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/app" + fxserverconfig "github.com/functionx/fx-core/v6/server/config" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) type KeeperTestSuite struct { diff --git a/x/erc20/keeper/migrations.go b/x/erc20/keeper/migrations.go index 5e2ee398c..769f9bce8 100644 --- a/x/erc20/keeper/migrations.go +++ b/x/erc20/keeper/migrations.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v4 "github.com/functionx/fx-core/v5/x/erc20/migrations/v4" - "github.com/functionx/fx-core/v5/x/erc20/types" + v4 "github.com/functionx/fx-core/v6/x/erc20/migrations/v4" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/erc20/keeper/mint.go b/x/erc20/keeper/mint.go index 51ccf24fa..892a70960 100644 --- a/x/erc20/keeper/mint.go +++ b/x/erc20/keeper/mint.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // MintingEnabled checks that: diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index bd1a8030c..0251681d5 100644 --- a/x/erc20/keeper/mint_test.go +++ b/x/erc20/keeper/mint_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestMintingEnabled() { diff --git a/x/erc20/keeper/msg_server.go b/x/erc20/keeper/msg_server.go index 25fee6392..dcc195263 100644 --- a/x/erc20/keeper/msg_server.go +++ b/x/erc20/keeper/msg_server.go @@ -16,8 +16,8 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index f10f3e2aa..2541e844b 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { diff --git a/x/erc20/keeper/params.go b/x/erc20/keeper/params.go index 323d69f63..c95aa8696 100644 --- a/x/erc20/keeper/params.go +++ b/x/erc20/keeper/params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // GetParams returns the total set of erc20 parameters. diff --git a/x/erc20/keeper/params_test.go b/x/erc20/keeper/params_test.go index bdd5a6b28..0ed1dce71 100644 --- a/x/erc20/keeper/params_test.go +++ b/x/erc20/keeper/params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/erc20/keeper/proposals.go b/x/erc20/keeper/proposals.go index d12286d0d..b21f8e026 100644 --- a/x/erc20/keeper/proposals.go +++ b/x/erc20/keeper/proposals.go @@ -9,8 +9,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // RegisterNativeCoin deploys an erc20 contract and creates the token pair for the existing cosmos coin diff --git a/x/erc20/keeper/proposals_test.go b/x/erc20/keeper/proposals_test.go index 2ca8e6f3d..9ef1bac51 100644 --- a/x/erc20/keeper/proposals_test.go +++ b/x/erc20/keeper/proposals_test.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "golang.org/x/exp/slices" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" ) func (suite *KeeperTestSuite) setupRegisterERC20Pair() common.Address { diff --git a/x/erc20/keeper/token_pairs.go b/x/erc20/keeper/token_pairs.go index a72d24826..371d6dfe2 100644 --- a/x/erc20/keeper/token_pairs.go +++ b/x/erc20/keeper/token_pairs.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // GetAllTokenPairs - get all registered token tokenPairs diff --git a/x/erc20/keeper/token_pairs_test.go b/x/erc20/keeper/token_pairs_test.go index eb3b64d81..c0cd3f642 100644 --- a/x/erc20/keeper/token_pairs_test.go +++ b/x/erc20/keeper/token_pairs_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (suite *KeeperTestSuite) TestGetTokenPair() { diff --git a/x/erc20/keeper/transfer_relation.go b/x/erc20/keeper/transfer_relation.go index 3c1a07231..6c8ea9590 100644 --- a/x/erc20/keeper/transfer_relation.go +++ b/x/erc20/keeper/transfer_relation.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func (k Keeper) RefundAfter(ctx sdk.Context, channel string, sequence uint64, sender sdk.AccAddress, amount sdk.Coin) error { diff --git a/x/erc20/migrations/v4/migrator_param.go b/x/erc20/migrations/v4/migrator_param.go index e5f646efe..536688efc 100644 --- a/x/erc20/migrations/v4/migrator_param.go +++ b/x/erc20/migrations/v4/migrator_param.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func MigratorParam(ctx sdk.Context, legacySubspace types.Subspace, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { diff --git a/x/erc20/migrations/v4/migrator_param_test.go b/x/erc20/migrations/v4/migrator_param_test.go index fabd242fc..20cfe0597 100644 --- a/x/erc20/migrations/v4/migrator_param_test.go +++ b/x/erc20/migrations/v4/migrator_param_test.go @@ -9,8 +9,8 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - v4 "github.com/functionx/fx-core/v5/x/erc20/migrations/v4" - "github.com/functionx/fx-core/v5/x/erc20/types" + v4 "github.com/functionx/fx-core/v6/x/erc20/migrations/v4" + "github.com/functionx/fx-core/v6/x/erc20/types" ) type mockSubspace struct { diff --git a/x/erc20/module.go b/x/erc20/module.go index ef7b80ffc..80cd00008 100644 --- a/x/erc20/module.go +++ b/x/erc20/module.go @@ -15,9 +15,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/erc20/client/cli" - "github.com/functionx/fx-core/v5/x/erc20/keeper" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/client/cli" + "github.com/functionx/fx-core/v6/x/erc20/keeper" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // type check to ensure the interface is properly implemented diff --git a/x/erc20/proposal.go b/x/erc20/proposal.go index 620acac92..ec6b2dcb1 100644 --- a/x/erc20/proposal.go +++ b/x/erc20/proposal.go @@ -8,8 +8,8 @@ import ( govv1betal "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/erc20/keeper" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/keeper" + "github.com/functionx/fx-core/v6/x/erc20/types" ) // NewErc20ProposalHandler creates a governance handler to manage new proposal types. diff --git a/x/erc20/types/contract_event.go b/x/erc20/types/contract_event.go index f72e0fe98..ec984d135 100644 --- a/x/erc20/types/contract_event.go +++ b/x/erc20/types/contract_event.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/x/erc20/types/contract_event_test.go b/x/erc20/types/contract_event_test.go index 77f98041d..da6cca72c 100644 --- a/x/erc20/types/contract_event_test.go +++ b/x/erc20/types/contract_event_test.go @@ -10,7 +10,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) func BenchmarkSingleParseEventLog(b *testing.B) { diff --git a/x/erc20/types/msg.go b/x/erc20/types/msg.go index 6aaa45d3a..29516b064 100644 --- a/x/erc20/types/msg.go +++ b/x/erc20/types/msg.go @@ -11,7 +11,7 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) var ( diff --git a/x/erc20/types/proposal.go b/x/erc20/types/proposal.go index c7a30b293..54c252815 100644 --- a/x/erc20/types/proposal.go +++ b/x/erc20/types/proposal.go @@ -10,7 +10,7 @@ import ( govv1betal "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // constants diff --git a/x/erc20/types/token_pair.go b/x/erc20/types/token_pair.go index c98ba6a4e..d3449054f 100644 --- a/x/erc20/types/token_pair.go +++ b/x/erc20/types/token_pair.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/tendermint/tendermint/crypto/tmhash" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // NewTokenPair returns an instance of TokenPair diff --git a/x/eth/client/cli/query.go b/x/eth/client/cli/query.go index 94fc8c2cb..b496d6ce1 100644 --- a/x/eth/client/cli/query.go +++ b/x/eth/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/eth/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/eth/client/cli/tx.go b/x/eth/client/cli/tx.go index 23c3891cd..0a53c265a 100644 --- a/x/eth/client/cli/tx.go +++ b/x/eth/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/eth/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/eth/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/eth/module.go b/x/eth/module.go index aaff65e5c..68848c087 100644 --- a/x/eth/module.go +++ b/x/eth/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/eth/client/cli" - "github.com/functionx/fx-core/v5/x/eth/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/eth/client/cli" + "github.com/functionx/fx-core/v6/x/eth/types" ) // type check to ensure the interface is properly implemented diff --git a/x/eth/types/genesis.go b/x/eth/types/genesis.go index bc12963a0..2bf07bc05 100644 --- a/x/eth/types/genesis.go +++ b/x/eth/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/eth/types/genesis_test.go b/x/eth/types/genesis_test.go index 7ac364dc1..b65cb309f 100644 --- a/x/eth/types/genesis_test.go +++ b/x/eth/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/evm/keeper/contract_code.go b/x/evm/keeper/contract_code.go index 5babc4aa8..19fb39ca4 100644 --- a/x/evm/keeper/contract_code.go +++ b/x/evm/keeper/contract_code.go @@ -14,8 +14,8 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) // CreateContractWithCode create contract account and set code diff --git a/x/evm/keeper/contract_code_test.go b/x/evm/keeper/contract_code_test.go index c9cec52e7..2e049682d 100644 --- a/x/evm/keeper/contract_code_test.go +++ b/x/evm/keeper/contract_code_test.go @@ -10,8 +10,8 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) func (suite *KeeperTestSuite) TestKeeper_CreateContractWithCode() { diff --git a/x/evm/keeper/genesis.go b/x/evm/keeper/genesis.go index 003d20cd9..c26c3af94 100644 --- a/x/evm/keeper/genesis.go +++ b/x/evm/keeper/genesis.go @@ -11,7 +11,7 @@ import ( "github.com/evmos/ethermint/x/evm/types" abci "github.com/tendermint/tendermint/abci/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go index 4912096cd..30435d53f 100644 --- a/x/evm/keeper/keeper.go +++ b/x/evm/keeper/keeper.go @@ -13,9 +13,9 @@ import ( evmkeeper "github.com/evmos/ethermint/x/evm/keeper" "github.com/evmos/ethermint/x/evm/types" - fxserverconfig "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" - fxevmtypes "github.com/functionx/fx-core/v5/x/evm/types" + fxserverconfig "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" + fxevmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) type Keeper struct { diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index 0876389d2..a70e1f644 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -15,9 +15,9 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" ) type KeeperTestSuite struct { diff --git a/x/evm/keeper/msg_server.go b/x/evm/keeper/msg_server.go index 0735243f2..903b8ea98 100644 --- a/x/evm/keeper/msg_server.go +++ b/x/evm/keeper/msg_server.go @@ -17,7 +17,7 @@ import ( tmbytes "github.com/tendermint/tendermint/libs/bytes" tmtypes "github.com/tendermint/tendermint/types" - fxevmtypes "github.com/functionx/fx-core/v5/x/evm/types" + fxevmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/evm/keeper/msg_server_test.go b/x/evm/keeper/msg_server_test.go index 0e0748785..5fde3760d 100644 --- a/x/evm/keeper/msg_server_test.go +++ b/x/evm/keeper/msg_server_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - fxevmtypes "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + fxevmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) func (suite *KeeperTestSuite) TestKeeper_EthereumTx() { diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index 9de24d596..b670cc599 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -14,7 +14,7 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // EVMConfig creates the EVMConfig based on current state diff --git a/x/evm/keeper/statedb_test.go b/x/evm/keeper/statedb_test.go index 8ab7f0f46..cc2c3d9f1 100644 --- a/x/evm/keeper/statedb_test.go +++ b/x/evm/keeper/statedb_test.go @@ -4,7 +4,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethermint "github.com/evmos/ethermint/types" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *KeeperTestSuite) TestKeeper_SetAccount() { diff --git a/x/evm/module.go b/x/evm/module.go index afc2b4856..d2ac83901 100644 --- a/x/evm/module.go +++ b/x/evm/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/client/cli" - "github.com/functionx/fx-core/v5/x/evm/keeper" - fxevmtypes "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/client/cli" + "github.com/functionx/fx-core/v6/x/evm/keeper" + fxevmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) var ( diff --git a/x/evm/precompiles/crosschain/bridge_coin_amount.go b/x/evm/precompiles/crosschain/bridge_coin_amount.go index 6442174d5..a162d9776 100644 --- a/x/evm/precompiles/crosschain/bridge_coin_amount.go +++ b/x/evm/precompiles/crosschain/bridge_coin_amount.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/vm" - fxtypes "github.com/functionx/fx-core/v5/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) BridgeCoinAmount(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, _ bool) ([]byte, error) { diff --git a/x/evm/precompiles/crosschain/bridge_coin_amount_test.go b/x/evm/precompiles/crosschain/bridge_coin_amount_test.go index 9c9a1d660..77127dc10 100644 --- a/x/evm/precompiles/crosschain/bridge_coin_amount_test.go +++ b/x/evm/precompiles/crosschain/bridge_coin_amount_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) func TestBridgeCoinAmountABI(t *testing.T) { diff --git a/x/evm/precompiles/crosschain/call_evm.go b/x/evm/precompiles/crosschain/call_evm.go index 882689d4d..107227ba7 100644 --- a/x/evm/precompiles/crosschain/call_evm.go +++ b/x/evm/precompiles/crosschain/call_evm.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" - fxserverconfig "github.com/functionx/fx-core/v5/server/config" - fxtypes "github.com/functionx/fx-core/v5/types" + fxserverconfig "github.com/functionx/fx-core/v6/server/config" + fxtypes "github.com/functionx/fx-core/v6/types" ) type CallerRef struct { diff --git a/x/evm/precompiles/crosschain/cancel_sendtoexternal.go b/x/evm/precompiles/crosschain/cancel_sendtoexternal.go index 4664ef8a0..328a75f4c 100644 --- a/x/evm/precompiles/crosschain/cancel_sendtoexternal.go +++ b/x/evm/precompiles/crosschain/cancel_sendtoexternal.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) CancelSendToExternal(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/crosschain/cancel_sendtoexternal_test.go b/x/evm/precompiles/crosschain/cancel_sendtoexternal_test.go index 76edc8a39..e63af3e30 100644 --- a/x/evm/precompiles/crosschain/cancel_sendtoexternal_test.go +++ b/x/evm/precompiles/crosschain/cancel_sendtoexternal_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) func TestCancelSendToExternalABI(t *testing.T) { diff --git a/x/evm/precompiles/crosschain/contract.go b/x/evm/precompiles/crosschain/contract.go index c4ef23115..fa89c3b16 100644 --- a/x/evm/precompiles/crosschain/contract.go +++ b/x/evm/precompiles/crosschain/contract.go @@ -9,8 +9,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) type Contract struct { diff --git a/x/evm/precompiles/crosschain/contract_test.go b/x/evm/precompiles/crosschain/contract_test.go index 9ae390a8d..349fd4d4b 100644 --- a/x/evm/precompiles/crosschain/contract_test.go +++ b/x/evm/precompiles/crosschain/contract_test.go @@ -38,13 +38,13 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - fxserverconfig "github.com/functionx/fx-core/v5/server/config" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + "github.com/functionx/fx-core/v6/app" + fxserverconfig "github.com/functionx/fx-core/v6/server/config" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) type PrecompileTestSuite struct { diff --git a/x/evm/precompiles/crosschain/crosschain.go b/x/evm/precompiles/crosschain/crosschain.go index 45f19564c..40b9aae2c 100644 --- a/x/evm/precompiles/crosschain/crosschain.go +++ b/x/evm/precompiles/crosschain/crosschain.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) // FIP20CrossChain only for fip20 contract transferCrossChain called diff --git a/x/evm/precompiles/crosschain/crosschain_test.go b/x/evm/precompiles/crosschain/crosschain_test.go index cc73721fb..a4070d061 100644 --- a/x/evm/precompiles/crosschain/crosschain_test.go +++ b/x/evm/precompiles/crosschain/crosschain_test.go @@ -17,14 +17,14 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testcontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + testcontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) func TestCrossChainABI(t *testing.T) { diff --git a/x/evm/precompiles/crosschain/events.go b/x/evm/precompiles/crosschain/events.go index ef2a9136e..77fa43516 100644 --- a/x/evm/precompiles/crosschain/events.go +++ b/x/evm/precompiles/crosschain/events.go @@ -3,7 +3,7 @@ package crosschain import ( "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) var ( diff --git a/x/evm/precompiles/crosschain/fip20crosschain_test.go b/x/evm/precompiles/crosschain/fip20crosschain_test.go index 75fd5e690..11d7dbed3 100644 --- a/x/evm/precompiles/crosschain/fip20crosschain_test.go +++ b/x/evm/precompiles/crosschain/fip20crosschain_test.go @@ -17,13 +17,13 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) func TestFIP20CrossChainABI(t *testing.T) { diff --git a/x/evm/precompiles/crosschain/increase_bridgefee.go b/x/evm/precompiles/crosschain/increase_bridgefee.go index 8e98b328e..b469615d2 100644 --- a/x/evm/precompiles/crosschain/increase_bridgefee.go +++ b/x/evm/precompiles/crosschain/increase_bridgefee.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) // IncreaseBridgeFee add bridge fee to unbatched tx diff --git a/x/evm/precompiles/crosschain/increase_bridgefee_test.go b/x/evm/precompiles/crosschain/increase_bridgefee_test.go index 0aaee30cb..c951c8af1 100644 --- a/x/evm/precompiles/crosschain/increase_bridgefee_test.go +++ b/x/evm/precompiles/crosschain/increase_bridgefee_test.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/crosschain" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain" ) func TestIncreaseBridgeFeeABI(t *testing.T) { diff --git a/x/evm/precompiles/crosschain/interfaces.go b/x/evm/precompiles/crosschain/interfaces.go index 383043445..3c9480d07 100644 --- a/x/evm/precompiles/crosschain/interfaces.go +++ b/x/evm/precompiles/crosschain/interfaces.go @@ -12,8 +12,8 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" tmbytes "github.com/tendermint/tendermint/libs/bytes" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/erc20/types" ) type Erc20Keeper interface { diff --git a/x/evm/precompiles/crosschain/keys.go b/x/evm/precompiles/crosschain/keys.go index 448bfbcdb..c09ef803f 100644 --- a/x/evm/precompiles/crosschain/keys.go +++ b/x/evm/precompiles/crosschain/keys.go @@ -4,8 +4,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/contract" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/contract" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/x/evm/precompiles/crosschain/methods.go b/x/evm/precompiles/crosschain/methods.go index 2df5be7cb..e59a2d6e4 100644 --- a/x/evm/precompiles/crosschain/methods.go +++ b/x/evm/precompiles/crosschain/methods.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/evm/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) // BridgeCoinAmountMethod query the amount of bridge coin diff --git a/x/evm/precompiles/staking/allowance_shares.go b/x/evm/precompiles/staking/allowance_shares.go index 0d7f47a01..d40380144 100644 --- a/x/evm/precompiles/staking/allowance_shares.go +++ b/x/evm/precompiles/staking/allowance_shares.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) AllowanceShares(ctx sdk.Context, _ *vm.EVM, contract *vm.Contract, _ bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/allowance_shares_test.go b/x/evm/precompiles/staking/allowance_shares_test.go index d26916485..b22cf935e 100644 --- a/x/evm/precompiles/staking/allowance_shares_test.go +++ b/x/evm/precompiles/staking/allowance_shares_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingAllowanceSharesABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/approve_shares.go b/x/evm/precompiles/staking/approve_shares.go index cd3b2e544..ba71022d6 100644 --- a/x/evm/precompiles/staking/approve_shares.go +++ b/x/evm/precompiles/staking/approve_shares.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/x/evm/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/evm/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func (c *Contract) ApproveShares(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/approve_shares_test.go b/x/evm/precompiles/staking/approve_shares_test.go index 04a8ec461..d077587cd 100644 --- a/x/evm/precompiles/staking/approve_shares_test.go +++ b/x/evm/precompiles/staking/approve_shares_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func TestStakingApproveSharesABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/contract.go b/x/evm/precompiles/staking/contract.go index f1a87b2f8..75fd7eab7 100644 --- a/x/evm/precompiles/staking/contract.go +++ b/x/evm/precompiles/staking/contract.go @@ -9,7 +9,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) type Contract struct { diff --git a/x/evm/precompiles/staking/contract_test.go b/x/evm/precompiles/staking/contract_test.go index 658df40e9..2956e5304 100644 --- a/x/evm/precompiles/staking/contract_test.go +++ b/x/evm/precompiles/staking/contract_test.go @@ -25,11 +25,11 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + "github.com/functionx/fx-core/v6/app" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) const ( diff --git a/x/evm/precompiles/staking/delegate.go b/x/evm/precompiles/staking/delegate.go index d01b4c6bb..0e87d981e 100644 --- a/x/evm/precompiles/staking/delegate.go +++ b/x/evm/precompiles/staking/delegate.go @@ -14,8 +14,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) Delegate(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/delegate_test.go b/x/evm/precompiles/staking/delegate_test.go index e0f3346bc..c8b90da8d 100644 --- a/x/evm/precompiles/staking/delegate_test.go +++ b/x/evm/precompiles/staking/delegate_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingDelegateABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/delegation.go b/x/evm/precompiles/staking/delegation.go index 881bdd024..87e99d2ce 100644 --- a/x/evm/precompiles/staking/delegation.go +++ b/x/evm/precompiles/staking/delegation.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) Delegation(ctx sdk.Context, _ *vm.EVM, contract *vm.Contract, _ bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/delegation_rewards.go b/x/evm/precompiles/staking/delegation_rewards.go index 2829f41e7..d3f0c2bfc 100644 --- a/x/evm/precompiles/staking/delegation_rewards.go +++ b/x/evm/precompiles/staking/delegation_rewards.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) DelegationRewards(ctx sdk.Context, _ *vm.EVM, contract *vm.Contract, _ bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/delegation_rewards_test.go b/x/evm/precompiles/staking/delegation_rewards_test.go index 248b7f970..60b62621e 100644 --- a/x/evm/precompiles/staking/delegation_rewards_test.go +++ b/x/evm/precompiles/staking/delegation_rewards_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingDelegationRewardsABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/delegation_test.go b/x/evm/precompiles/staking/delegation_test.go index be220329f..4ca69eb7d 100644 --- a/x/evm/precompiles/staking/delegation_test.go +++ b/x/evm/precompiles/staking/delegation_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingDelegationABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/events.go b/x/evm/precompiles/staking/events.go index 5b82c0f21..f1a7e0e1c 100644 --- a/x/evm/precompiles/staking/events.go +++ b/x/evm/precompiles/staking/events.go @@ -3,7 +3,7 @@ package staking import ( "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) var ( diff --git a/x/evm/precompiles/staking/keys.go b/x/evm/precompiles/staking/keys.go index 665718f2e..ff9bcb72a 100644 --- a/x/evm/precompiles/staking/keys.go +++ b/x/evm/precompiles/staking/keys.go @@ -4,8 +4,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/contract" - fxtypes "github.com/functionx/fx-core/v5/types" + "github.com/functionx/fx-core/v6/contract" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/x/evm/precompiles/staking/methods.go b/x/evm/precompiles/staking/methods.go index 548daf9fc..21936fc91 100644 --- a/x/evm/precompiles/staking/methods.go +++ b/x/evm/precompiles/staking/methods.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) var ( diff --git a/x/evm/precompiles/staking/transfer_shares.go b/x/evm/precompiles/staking/transfer_shares.go index d97e47e40..6861aed63 100644 --- a/x/evm/precompiles/staking/transfer_shares.go +++ b/x/evm/precompiles/staking/transfer_shares.go @@ -15,8 +15,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/x/evm/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/evm/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func (c *Contract) TransferShares(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/transfer_shares_test.go b/x/evm/precompiles/staking/transfer_shares_test.go index a288a04d2..1de7ed646 100644 --- a/x/evm/precompiles/staking/transfer_shares_test.go +++ b/x/evm/precompiles/staking/transfer_shares_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func TestStakingTransferSharesABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/undelegate.go b/x/evm/precompiles/staking/undelegate.go index 9ac1eaec7..4e5d0b88e 100644 --- a/x/evm/precompiles/staking/undelegate.go +++ b/x/evm/precompiles/staking/undelegate.go @@ -15,8 +15,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) Undelegate(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/undelegate_test.go b/x/evm/precompiles/staking/undelegate_test.go index 2e3010c0a..db74e3579 100644 --- a/x/evm/precompiles/staking/undelegate_test.go +++ b/x/evm/precompiles/staking/undelegate_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingUndelegateABI(t *testing.T) { diff --git a/x/evm/precompiles/staking/withdraw.go b/x/evm/precompiles/staking/withdraw.go index 9bf5bb507..0f5063b1c 100644 --- a/x/evm/precompiles/staking/withdraw.go +++ b/x/evm/precompiles/staking/withdraw.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/functionx/fx-core/v5/x/evm/types" + "github.com/functionx/fx-core/v6/x/evm/types" ) func (c *Contract) Withdraw(ctx sdk.Context, evm *vm.EVM, contract *vm.Contract, readonly bool) ([]byte, error) { diff --git a/x/evm/precompiles/staking/withdraw_test.go b/x/evm/precompiles/staking/withdraw_test.go index 95d14dbc0..b330da0a9 100644 --- a/x/evm/precompiles/staking/withdraw_test.go +++ b/x/evm/precompiles/staking/withdraw_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - testscontract "github.com/functionx/fx-core/v5/tests/contract" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/evm/precompiles/staking" + testscontract "github.com/functionx/fx-core/v6/tests/contract" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/evm/precompiles/staking" ) func TestStakingWithdrawABI(t *testing.T) { diff --git a/x/evm/types/codec.go b/x/evm/types/codec.go index 86a973f12..88e49a318 100644 --- a/x/evm/types/codec.go +++ b/x/evm/types/codec.go @@ -8,7 +8,7 @@ import ( authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" govv1betal "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/functionx/fx-core/v5/x/evm/legacy" + "github.com/functionx/fx-core/v6/x/evm/legacy" ) // ModuleCdc is the codec for the module diff --git a/x/evm/types/msg.go b/x/evm/types/msg.go index 11bbdf4fd..21d576540 100644 --- a/x/evm/types/msg.go +++ b/x/evm/types/msg.go @@ -6,7 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) var _ sdk.Msg = &MsgCallContract{} diff --git a/x/gov/client/cli/query.go b/x/gov/client/cli/query.go index 60d1be232..2e7c4de6a 100644 --- a/x/gov/client/cli/query.go +++ b/x/gov/client/cli/query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/spf13/cobra" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/gov/client/cli/query_test.go b/x/gov/client/cli/query_test.go index a3fc85abe..90c8c960c 100644 --- a/x/gov/client/cli/query_test.go +++ b/x/gov/client/cli/query_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/functionx/fx-core/v5/x/gov/client/cli" + "github.com/functionx/fx-core/v6/x/gov/client/cli" ) func TestCmdParams(t *testing.T) { diff --git a/x/gov/keeper/abci.go b/x/gov/keeper/abci.go index 6171022ea..7dd9bf675 100644 --- a/x/gov/keeper/abci.go +++ b/x/gov/keeper/abci.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) // EndBlocker called every block, process inflation, update validator set. diff --git a/x/gov/keeper/grpc_query.go b/x/gov/keeper/grpc_query.go index ccb7fdf1d..6aadd1c16 100644 --- a/x/gov/keeper/grpc_query.go +++ b/x/gov/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/gov/keeper/grpc_query_test.go b/x/gov/keeper/grpc_query_test.go index efd1db18a..105fc2865 100644 --- a/x/gov/keeper/grpc_query_test.go +++ b/x/gov/keeper/grpc_query_test.go @@ -4,9 +4,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - govtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + govtypes "github.com/functionx/fx-core/v6/x/gov/types" ) func (suite *KeeperTestSuite) TestGRPCQueryParams() { diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go index 99062e016..5c7c279e3 100644 --- a/x/gov/keeper/keeper.go +++ b/x/gov/keeper/keeper.go @@ -11,8 +11,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) type Keeper struct { diff --git a/x/gov/keeper/keeper_test.go b/x/gov/keeper/keeper_test.go index 9c9754922..f817f105e 100644 --- a/x/gov/keeper/keeper_test.go +++ b/x/gov/keeper/keeper_test.go @@ -19,14 +19,14 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - evmtypes "github.com/functionx/fx-core/v5/x/evm/types" - "github.com/functionx/fx-core/v5/x/gov/keeper" - "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + evmtypes "github.com/functionx/fx-core/v6/x/evm/types" + "github.com/functionx/fx-core/v6/x/gov/keeper" + "github.com/functionx/fx-core/v6/x/gov/types" ) type KeeperTestSuite struct { diff --git a/x/gov/keeper/migrations.go b/x/gov/keeper/migrations.go index d3becae79..62e57adf7 100644 --- a/x/gov/keeper/migrations.go +++ b/x/gov/keeper/migrations.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - fxv046 "github.com/functionx/fx-core/v5/x/gov/migrations/v046" + fxv046 "github.com/functionx/fx-core/v6/x/gov/migrations/v046" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index e9cc4d2b7..d15676c6c 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -16,7 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) type msgServer struct { diff --git a/x/gov/keeper/msg_server_test.go b/x/gov/keeper/msg_server_test.go index 29118ce1a..14dcbf3bc 100644 --- a/x/gov/keeper/msg_server_test.go +++ b/x/gov/keeper/msg_server_test.go @@ -16,10 +16,10 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) func (suite *KeeperTestSuite) TestSubmitProposal() { diff --git a/x/gov/keeper/params.go b/x/gov/keeper/params.go index 1458356fe..4460bf963 100644 --- a/x/gov/keeper/params.go +++ b/x/gov/keeper/params.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) // GetParams gets the gov module's parameters. diff --git a/x/gov/keeper/params_test.go b/x/gov/keeper/params_test.go index 85eb62498..1760b4e48 100644 --- a/x/gov/keeper/params_test.go +++ b/x/gov/keeper/params_test.go @@ -7,9 +7,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/gov/keeper/proposal.go b/x/gov/keeper/proposal.go index 17f17f6d8..9c6ad112a 100644 --- a/x/gov/keeper/proposal.go +++ b/x/gov/keeper/proposal.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) // SubmitProposal creates a new proposal given an array of messages diff --git a/x/gov/keeper/tally.go b/x/gov/keeper/tally.go index 0519f9dc1..75f25459b 100644 --- a/x/gov/keeper/tally.go +++ b/x/gov/keeper/tally.go @@ -6,7 +6,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) // Tally iterates over the votes and updates the tally of a proposal based on the voting power of the diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go index 25dd95b55..35e123287 100644 --- a/x/gov/keeper/tally_test.go +++ b/x/gov/keeper/tally_test.go @@ -6,9 +6,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) func (suite *KeeperTestSuite) TestKeeper_Tally() { diff --git a/x/gov/migrations/v046/convert.go b/x/gov/migrations/v046/convert.go index 9fafdf9fe..c8f456f6f 100644 --- a/x/gov/migrations/v046/convert.go +++ b/x/gov/migrations/v046/convert.go @@ -11,7 +11,7 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) func convertToNewProposal(oldProp v1beta1.Proposal) (v1.Proposal, error) { diff --git a/x/gov/migrations/v046/store_test.go b/x/gov/migrations/v046/store_test.go index 5f9ddaf54..db989543e 100644 --- a/x/gov/migrations/v046/store_test.go +++ b/x/gov/migrations/v046/store_test.go @@ -13,8 +13,8 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/stretchr/testify/require" - fxv046 "github.com/functionx/fx-core/v5/x/gov/migrations/v046" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" + fxv046 "github.com/functionx/fx-core/v6/x/gov/migrations/v046" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" ) var voter = sdk.MustAccAddressFromBech32("cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh") diff --git a/x/gov/module.go b/x/gov/module.go index 90f35ddcc..c2fc6e82c 100644 --- a/x/gov/module.go +++ b/x/gov/module.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/gov/client/cli" - "github.com/functionx/fx-core/v5/x/gov/keeper" - "github.com/functionx/fx-core/v5/x/gov/types" + "github.com/functionx/fx-core/v6/x/gov/client/cli" + "github.com/functionx/fx-core/v6/x/gov/keeper" + "github.com/functionx/fx-core/v6/x/gov/types" ) var ( diff --git a/x/gov/types/msgs_test.go b/x/gov/types/msgs_test.go index 653d004f7..c44be9704 100644 --- a/x/gov/types/msgs_test.go +++ b/x/gov/types/msgs_test.go @@ -9,8 +9,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/require" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/gov/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/gov/types" ) var ( diff --git a/x/gov/types/params.go b/x/gov/types/params.go index bb32f4083..5c6839a86 100644 --- a/x/gov/types/params.go +++ b/x/gov/types/params.go @@ -12,9 +12,9 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/gogo/protobuf/proto" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - evmtypes "github.com/functionx/fx-core/v5/x/evm/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + evmtypes "github.com/functionx/fx-core/v6/x/evm/types" ) var ( diff --git a/x/gravity/keeper/grpc_query.go b/x/gravity/keeper/grpc_query.go index 3469f52dc..341bafd6c 100644 --- a/x/gravity/keeper/grpc_query.go +++ b/x/gravity/keeper/grpc_query.go @@ -4,11 +4,11 @@ package keeper import ( "context" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/gravity/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/gravity/types" ) type queryServer struct { diff --git a/x/gravity/keeper/msg_server.go b/x/gravity/keeper/msg_server.go index 6da551969..e398c2978 100644 --- a/x/gravity/keeper/msg_server.go +++ b/x/gravity/keeper/msg_server.go @@ -4,10 +4,10 @@ package keeper import ( "context" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - "github.com/functionx/fx-core/v5/x/gravity/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + "github.com/functionx/fx-core/v6/x/gravity/types" ) type msgServer struct { diff --git a/x/gravity/service.go b/x/gravity/service.go index de4a61f85..58ce3fb22 100644 --- a/x/gravity/service.go +++ b/x/gravity/service.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/functionx/fx-core/v5/x/gravity/types" + "github.com/functionx/fx-core/v6/x/gravity/types" ) // RegisterGRPCGatewayRoutes diff --git a/x/gravity/types/msgs.go b/x/gravity/types/msgs.go index 7650390ad..e38a9afde 100644 --- a/x/gravity/types/msgs.go +++ b/x/gravity/types/msgs.go @@ -9,7 +9,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/tendermint/tendermint/crypto/tmhash" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) const ( diff --git a/x/ibc/applications/transfer/client/cli/tx.go b/x/ibc/applications/transfer/client/cli/tx.go index 91577d884..faacacc0f 100644 --- a/x/ibc/applications/transfer/client/cli/tx.go +++ b/x/ibc/applications/transfer/client/cli/tx.go @@ -17,7 +17,7 @@ import ( channelutils "github.com/cosmos/ibc-go/v6/modules/core/04-channel/client/utils" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) const ( diff --git a/x/ibc/applications/transfer/ibc_middleware.go b/x/ibc/applications/transfer/ibc_middleware.go index f51806a7d..5288fd4d3 100644 --- a/x/ibc/applications/transfer/ibc_middleware.go +++ b/x/ibc/applications/transfer/ibc_middleware.go @@ -14,9 +14,9 @@ import ( porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/functionx/fx-core/v5/x/ibc" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/keeper" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/ibc" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/keeper" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/ibc/applications/transfer/ibc_middleware_test.go b/x/ibc/applications/transfer/ibc_middleware_test.go index 1713a227d..08488f816 100644 --- a/x/ibc/applications/transfer/ibc_middleware_test.go +++ b/x/ibc/applications/transfer/ibc_middleware_test.go @@ -6,8 +6,8 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" "github.com/stretchr/testify/require" - _ "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + _ "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) func TestUnmarshalJSON(t *testing.T) { diff --git a/x/ibc/applications/transfer/keeper/keeper.go b/x/ibc/applications/transfer/keeper/keeper.go index 97987b601..2c135f182 100644 --- a/x/ibc/applications/transfer/keeper/keeper.go +++ b/x/ibc/applications/transfer/keeper/keeper.go @@ -12,8 +12,8 @@ import ( host "github.com/cosmos/ibc-go/v6/modules/core/24-host" "github.com/tendermint/tendermint/libs/log" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) // Keeper defines the IBC fungible transfer keeper diff --git a/x/ibc/applications/transfer/keeper/keeper_test.go b/x/ibc/applications/transfer/keeper/keeper_test.go index 8caf183aa..c369edb1d 100644 --- a/x/ibc/applications/transfer/keeper/keeper_test.go +++ b/x/ibc/applications/transfer/keeper/keeper_test.go @@ -8,9 +8,9 @@ import ( ibctesting "github.com/cosmos/ibc-go/v6/testing" "github.com/stretchr/testify/suite" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" - fxibctesting "github.com/functionx/fx-core/v5/x/ibc/testing" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" + fxibctesting "github.com/functionx/fx-core/v6/x/ibc/testing" ) type KeeperTestSuite struct { diff --git a/x/ibc/applications/transfer/keeper/msg_server.go b/x/ibc/applications/transfer/keeper/msg_server.go index 594920434..91ceb01c1 100644 --- a/x/ibc/applications/transfer/keeper/msg_server.go +++ b/x/ibc/applications/transfer/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) var ( diff --git a/x/ibc/applications/transfer/keeper/msg_server_test.go b/x/ibc/applications/transfer/keeper/msg_server_test.go index 0f32e22a0..a20ed8abb 100644 --- a/x/ibc/applications/transfer/keeper/msg_server_test.go +++ b/x/ibc/applications/transfer/keeper/msg_server_test.go @@ -5,8 +5,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - fxtypes "github.com/functionx/fx-core/v5/types" - ibctesting "github.com/functionx/fx-core/v5/x/ibc/testing" + fxtypes "github.com/functionx/fx-core/v6/types" + ibctesting "github.com/functionx/fx-core/v6/x/ibc/testing" ) func (suite *KeeperTestSuite) TestMsgTransfer() { diff --git a/x/ibc/applications/transfer/keeper/parse.go b/x/ibc/applications/transfer/keeper/parse.go index 9bfa83b03..b98ae5f6c 100644 --- a/x/ibc/applications/transfer/keeper/parse.go +++ b/x/ibc/applications/transfer/keeper/parse.go @@ -9,8 +9,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) func parseIBCCoinDenom(packet channeltypes.Packet, packetDenom string) string { diff --git a/x/ibc/applications/transfer/keeper/parse_test.go b/x/ibc/applications/transfer/keeper/parse_test.go index fef59e6ee..58e73ba7d 100644 --- a/x/ibc/applications/transfer/keeper/parse_test.go +++ b/x/ibc/applications/transfer/keeper/parse_test.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - _ "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + _ "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) func TestParseReceiveAndAmountByPacket(t *testing.T) { diff --git a/x/ibc/applications/transfer/keeper/relay.go b/x/ibc/applications/transfer/keeper/relay.go index 0d9c0ca8a..641d1c367 100644 --- a/x/ibc/applications/transfer/keeper/relay.go +++ b/x/ibc/applications/transfer/keeper/relay.go @@ -16,9 +16,9 @@ import ( coretypes "github.com/cosmos/ibc-go/v6/modules/core/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) // make SendTransfer private diff --git a/x/ibc/applications/transfer/keeper/relay_test.go b/x/ibc/applications/transfer/keeper/relay_test.go index ed578374a..2c4e3c634 100644 --- a/x/ibc/applications/transfer/keeper/relay_test.go +++ b/x/ibc/applications/transfer/keeper/relay_test.go @@ -18,17 +18,17 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - avalanchetypes "github.com/functionx/fx-core/v5/x/avalanche/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - fxtransfer "github.com/functionx/fx-core/v5/x/ibc/applications/transfer" - fxtransfertypes "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" - fxibctesting "github.com/functionx/fx-core/v5/x/ibc/testing" - polygontypes "github.com/functionx/fx-core/v5/x/polygon/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + avalanchetypes "github.com/functionx/fx-core/v6/x/avalanche/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + fxtransfer "github.com/functionx/fx-core/v6/x/ibc/applications/transfer" + fxtransfertypes "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" + fxibctesting "github.com/functionx/fx-core/v6/x/ibc/testing" + polygontypes "github.com/functionx/fx-core/v6/x/polygon/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *KeeperTestSuite) TestSendTransfer() { diff --git a/x/ibc/applications/transfer/module.go b/x/ibc/applications/transfer/module.go index 2181b8053..0c27deffc 100644 --- a/x/ibc/applications/transfer/module.go +++ b/x/ibc/applications/transfer/module.go @@ -15,9 +15,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/client/cli" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/keeper" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/client/cli" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/keeper" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" ) // type check to ensure the interface is properly implemented diff --git a/x/ibc/applications/transfer/transfer_test.go b/x/ibc/applications/transfer/transfer_test.go index d396a8fe6..d1c38bf29 100644 --- a/x/ibc/applications/transfer/transfer_test.go +++ b/x/ibc/applications/transfer/transfer_test.go @@ -10,9 +10,9 @@ import ( ibctesting "github.com/cosmos/ibc-go/v6/testing" "github.com/stretchr/testify/suite" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" - fxibctesting "github.com/functionx/fx-core/v5/x/ibc/testing" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" + fxibctesting "github.com/functionx/fx-core/v6/x/ibc/testing" ) var defaultMsgRouter = "" diff --git a/x/ibc/applications/transfer/types/expected_keepers.go b/x/ibc/applications/transfer/types/expected_keepers.go index b91611eee..834af2111 100644 --- a/x/ibc/applications/transfer/types/expected_keepers.go +++ b/x/ibc/applications/transfer/types/expected_keepers.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" ) type RefundHook interface { diff --git a/x/ibc/applications/transfer/types/msgs_test.go b/x/ibc/applications/transfer/types/msgs_test.go index ed2f2a868..4bb298b1a 100644 --- a/x/ibc/applications/transfer/types/msgs_test.go +++ b/x/ibc/applications/transfer/types/msgs_test.go @@ -10,7 +10,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" "github.com/stretchr/testify/require" - _ "github.com/functionx/fx-core/v5/types" + _ "github.com/functionx/fx-core/v6/types" ) // define constants used for testing diff --git a/x/ibc/ibcrouter/ibc_middleware.go b/x/ibc/ibcrouter/ibc_middleware.go index f06abf09d..3b4d78f06 100644 --- a/x/ibc/ibcrouter/ibc_middleware.go +++ b/x/ibc/ibcrouter/ibc_middleware.go @@ -18,9 +18,9 @@ import ( "github.com/cosmos/ibc-go/v6/modules/core/exported" "github.com/tendermint/tendermint/libs/log" - fxtransfertypes "github.com/functionx/fx-core/v5/x/ibc/applications/transfer/types" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter/parser" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter/types" + fxtransfertypes "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter/parser" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter/types" ) const ( diff --git a/x/ibc/ibcrouter/ibc_middleware_test.go b/x/ibc/ibcrouter/ibc_middleware_test.go index f4665006c..ff5eb6f67 100644 --- a/x/ibc/ibcrouter/ibc_middleware_test.go +++ b/x/ibc/ibcrouter/ibc_middleware_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" tmrand "github.com/tendermint/tendermint/libs/rand" - _ "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter/parser" + _ "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter/parser" ) func TestParseIncomingTransferField(t *testing.T) { diff --git a/x/ibc/ibcrouter/parser/receiver_parser_test.go b/x/ibc/ibcrouter/parser/receiver_parser_test.go index 48375762a..47e82b681 100644 --- a/x/ibc/ibcrouter/parser/receiver_parser_test.go +++ b/x/ibc/ibcrouter/parser/receiver_parser_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/x/ibc/ibcrouter/parser" + "github.com/functionx/fx-core/v6/x/ibc/ibcrouter/parser" ) func TestParseReceiverDataTransfer(t *testing.T) { diff --git a/x/ibc/testing/app.go b/x/ibc/testing/app.go index 4587a3d54..683f1c2e5 100644 --- a/x/ibc/testing/app.go +++ b/x/ibc/testing/app.go @@ -18,9 +18,9 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) var DefaultTestingAppInit = helpers.SetupTestingApp diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index 742bf07d6..ed2ef9ec5 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -14,7 +14,7 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) // ChainIDPrefix defines the default chain ID prefix for Evmos test chains diff --git a/x/migrate/client/cli/query.go b/x/migrate/client/cli/query.go index 38d3fa0ca..94c0c50fd 100644 --- a/x/migrate/client/cli/query.go +++ b/x/migrate/client/cli/query.go @@ -14,7 +14,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/migrate/client/cli/tx.go b/x/migrate/client/cli/tx.go index f26875f62..aa114070c 100644 --- a/x/migrate/client/cli/tx.go +++ b/x/migrate/client/cli/tx.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - fxtypes "github.com/functionx/fx-core/v5/types" - erc20types "github.com/functionx/fx-core/v5/x/erc20/types" - "github.com/functionx/fx-core/v5/x/migrate/types" + fxtypes "github.com/functionx/fx-core/v6/types" + erc20types "github.com/functionx/fx-core/v6/x/erc20/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/migrate/keeper/bank.go b/x/migrate/keeper/bank.go index 5f552c39f..7bb3bbd8e 100644 --- a/x/migrate/keeper/bank.go +++ b/x/migrate/keeper/bank.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" ) type BankMigrate struct { diff --git a/x/migrate/keeper/bank_test.go b/x/migrate/keeper/bank_test.go index 0842ce48d..6f6e3da3d 100644 --- a/x/migrate/keeper/bank_test.go +++ b/x/migrate/keeper/bank_test.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - ethtypes "github.com/functionx/fx-core/v5/x/eth/types" - migratekeeper "github.com/functionx/fx-core/v5/x/migrate/keeper" + ethtypes "github.com/functionx/fx-core/v6/x/eth/types" + migratekeeper "github.com/functionx/fx-core/v6/x/migrate/keeper" ) func (suite *KeeperTestSuite) TestMigrateBank() { diff --git a/x/migrate/keeper/distr_staking.go b/x/migrate/keeper/distr_staking.go index b78b85d94..557223ac0 100644 --- a/x/migrate/keeper/distr_staking.go +++ b/x/migrate/keeper/distr_staking.go @@ -9,7 +9,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) type DistrStakingMigrate struct { diff --git a/x/migrate/keeper/distr_staking_test.go b/x/migrate/keeper/distr_staking_test.go index e4e6fc75c..27bd89e87 100644 --- a/x/migrate/keeper/distr_staking_test.go +++ b/x/migrate/keeper/distr_staking_test.go @@ -22,10 +22,10 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - migratekeeper "github.com/functionx/fx-core/v5/x/migrate/keeper" + "github.com/functionx/fx-core/v6/app" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + migratekeeper "github.com/functionx/fx-core/v6/x/migrate/keeper" ) func (suite *KeeperTestSuite) TestMigrateStakingDelegate() { diff --git a/x/migrate/keeper/genesis.go b/x/migrate/keeper/genesis.go index 7c5f84099..ed118c31f 100644 --- a/x/migrate/keeper/genesis.go +++ b/x/migrate/keeper/genesis.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/migrate/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) // InitGenesis import module genesis diff --git a/x/migrate/keeper/gov.go b/x/migrate/keeper/gov.go index d42be8a3d..6629eea85 100644 --- a/x/migrate/keeper/gov.go +++ b/x/migrate/keeper/gov.go @@ -11,7 +11,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) type GovMigrate struct { diff --git a/x/migrate/keeper/gov_test.go b/x/migrate/keeper/gov_test.go index 13c358722..4fc544377 100644 --- a/x/migrate/keeper/gov_test.go +++ b/x/migrate/keeper/gov_test.go @@ -8,10 +8,10 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - fxtypes "github.com/functionx/fx-core/v5/types" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" - migratekeeper "github.com/functionx/fx-core/v5/x/migrate/keeper" + fxtypes "github.com/functionx/fx-core/v6/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" + migratekeeper "github.com/functionx/fx-core/v6/x/migrate/keeper" ) func (suite *KeeperTestSuite) TestMigrateGovInactive() { diff --git a/x/migrate/keeper/grpc_query.go b/x/migrate/keeper/grpc_query.go index 7878426e8..23da90143 100644 --- a/x/migrate/keeper/grpc_query.go +++ b/x/migrate/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/migrate/keeper/grpc_query_test.go b/x/migrate/keeper/grpc_query_test.go index 2d235802a..cbc52c5dd 100644 --- a/x/migrate/keeper/grpc_query_test.go +++ b/x/migrate/keeper/grpc_query_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/evmos/ethermint/crypto/ethsecp256k1" - fxtypes "github.com/functionx/fx-core/v5/types" - fxgovtypes "github.com/functionx/fx-core/v5/x/gov/types" - "github.com/functionx/fx-core/v5/x/migrate/types" + fxtypes "github.com/functionx/fx-core/v6/types" + fxgovtypes "github.com/functionx/fx-core/v6/x/gov/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) func (suite *KeeperTestSuite) TestMigrateRecord() { diff --git a/x/migrate/keeper/keeper.go b/x/migrate/keeper/keeper.go index 2428ffefe..80ea62047 100644 --- a/x/migrate/keeper/keeper.go +++ b/x/migrate/keeper/keeper.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/tendermint/tendermint/libs/log" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) // secp256k1 diff --git a/x/migrate/keeper/keeper_test.go b/x/migrate/keeper/keeper_test.go index 14b593402..a0c65e6dc 100644 --- a/x/migrate/keeper/keeper_test.go +++ b/x/migrate/keeper/keeper_test.go @@ -20,10 +20,10 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - migratetypes "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + migratetypes "github.com/functionx/fx-core/v6/x/migrate/types" ) type KeeperTestSuite struct { diff --git a/x/migrate/keeper/msg_server.go b/x/migrate/keeper/msg_server.go index 0ed9b1d78..24b3e6020 100644 --- a/x/migrate/keeper/msg_server.go +++ b/x/migrate/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/migrate/keeper/msg_server_test.go b/x/migrate/keeper/msg_server_test.go index 47ab00837..bb917f2e4 100644 --- a/x/migrate/keeper/msg_server_test.go +++ b/x/migrate/keeper/msg_server_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - bsctypes "github.com/functionx/fx-core/v5/x/bsc/types" - "github.com/functionx/fx-core/v5/x/migrate/types" + bsctypes "github.com/functionx/fx-core/v6/x/bsc/types" + "github.com/functionx/fx-core/v6/x/migrate/types" ) func (suite *KeeperTestSuite) TestMigrateAccount() { diff --git a/x/migrate/module.go b/x/migrate/module.go index 1b5225b20..70d9a5b02 100644 --- a/x/migrate/module.go +++ b/x/migrate/module.go @@ -15,9 +15,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/migrate/client/cli" - "github.com/functionx/fx-core/v5/x/migrate/keeper" - "github.com/functionx/fx-core/v5/x/migrate/types" + "github.com/functionx/fx-core/v6/x/migrate/client/cli" + "github.com/functionx/fx-core/v6/x/migrate/keeper" + "github.com/functionx/fx-core/v6/x/migrate/types" ) // type check to ensure the interface is properly implemented diff --git a/x/migrate/types/msg.go b/x/migrate/types/msg.go index f5499089a..6a2708577 100644 --- a/x/migrate/types/msg.go +++ b/x/migrate/types/msg.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - fxtypes "github.com/functionx/fx-core/v5/types" + fxtypes "github.com/functionx/fx-core/v6/types" ) const TypeMsgMigrateAccount = "migrate_account" diff --git a/x/migrate/types/msg_test.go b/x/migrate/types/msg_test.go index 8376d197c..07e7dfb13 100644 --- a/x/migrate/types/msg_test.go +++ b/x/migrate/types/msg_test.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - _ "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/x/migrate/types" + _ "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/x/migrate/types" ) func TestMsgMigrateAccountRoute(t *testing.T) { diff --git a/x/optimism/client/cli/query.go b/x/optimism/client/cli/query.go index d70dea6ed..0dbd86270 100644 --- a/x/optimism/client/cli/query.go +++ b/x/optimism/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/optimism/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/optimism/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/optimism/client/cli/tx.go b/x/optimism/client/cli/tx.go index 9e56b07aa..53d5b30ea 100644 --- a/x/optimism/client/cli/tx.go +++ b/x/optimism/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/optimism/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/optimism/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/optimism/module.go b/x/optimism/module.go index e690004e6..6b7639001 100644 --- a/x/optimism/module.go +++ b/x/optimism/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/optimism/client/cli" - "github.com/functionx/fx-core/v5/x/optimism/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/optimism/client/cli" + "github.com/functionx/fx-core/v6/x/optimism/types" ) // type check to ensure the interface is properly implemented diff --git a/x/optimism/types/genesis.go b/x/optimism/types/genesis.go index 573ce326a..d456cdd19 100644 --- a/x/optimism/types/genesis.go +++ b/x/optimism/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/optimism/types/genesis_test.go b/x/optimism/types/genesis_test.go index 51f7e3969..084a8c017 100644 --- a/x/optimism/types/genesis_test.go +++ b/x/optimism/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/polygon/client/cli/query.go b/x/polygon/client/cli/query.go index 8a873bbee..51a240eee 100644 --- a/x/polygon/client/cli/query.go +++ b/x/polygon/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/polygon/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/polygon/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/polygon/client/cli/tx.go b/x/polygon/client/cli/tx.go index 8c5c9c1bb..a8fc0f631 100644 --- a/x/polygon/client/cli/tx.go +++ b/x/polygon/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/polygon/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/polygon/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/polygon/module.go b/x/polygon/module.go index c075890d5..5811479f4 100644 --- a/x/polygon/module.go +++ b/x/polygon/module.go @@ -14,10 +14,10 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - cli2 "github.com/functionx/fx-core/v5/x/polygon/client/cli" - "github.com/functionx/fx-core/v5/x/polygon/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + cli2 "github.com/functionx/fx-core/v6/x/polygon/client/cli" + "github.com/functionx/fx-core/v6/x/polygon/types" ) // type check to ensure the interface is properly implemented diff --git a/x/polygon/types/genesis.go b/x/polygon/types/genesis.go index 694864ab8..ed1d38ab2 100644 --- a/x/polygon/types/genesis.go +++ b/x/polygon/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/polygon/types/genesis_test.go b/x/polygon/types/genesis_test.go index 09e3e3005..19a65d27f 100644 --- a/x/polygon/types/genesis_test.go +++ b/x/polygon/types/genesis_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/staking/client/cli/tx.go b/x/staking/client/cli/tx.go index de8cab57c..be99676c6 100644 --- a/x/staking/client/cli/tx.go +++ b/x/staking/client/cli/tx.go @@ -15,7 +15,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) // NewTxCmd returns a root CLI command handler for all x/staking transaction commands. diff --git a/x/staking/keeper/abci.go b/x/staking/keeper/abci.go index 4d12fb263..9df611abd 100644 --- a/x/staking/keeper/abci.go +++ b/x/staking/keeper/abci.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/types" abci "github.com/tendermint/tendermint/abci/types" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) func (k Keeper) EndBlock(ctx sdk.Context) []abci.ValidatorUpdate { diff --git a/x/staking/keeper/abci_test.go b/x/staking/keeper/abci_test.go index 5aa82ae85..c990de3d3 100644 --- a/x/staking/keeper/abci_test.go +++ b/x/staking/keeper/abci_test.go @@ -17,10 +17,10 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/functionx/fx-core/v5/client/jsonrpc" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/client/jsonrpc" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) func (suite *KeeperTestSuite) TestValidatorUpdate() { diff --git a/x/staking/keeper/genesis.go b/x/staking/keeper/genesis.go index a5aaf0079..46bfd234e 100644 --- a/x/staking/keeper/genesis.go +++ b/x/staking/keeper/genesis.go @@ -8,7 +8,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, data *types.GenesisState) (res []abci.ValidatorUpdate) { diff --git a/x/staking/keeper/genesis_test.go b/x/staking/keeper/genesis_test.go index 26c0ca5c4..d5ee8582b 100644 --- a/x/staking/keeper/genesis_test.go +++ b/x/staking/keeper/genesis_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/staking/types" ) func (suite *KeeperTestSuite) TestInitGenesis() { diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index e5f1e8afa..65dd6f036 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -14,7 +14,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) type Keeper struct { diff --git a/x/staking/keeper/keeper_test.go b/x/staking/keeper/keeper_test.go index 78a5a88f3..5365021d6 100644 --- a/x/staking/keeper/keeper_test.go +++ b/x/staking/keeper/keeper_test.go @@ -22,10 +22,10 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) type KeeperTestSuite struct { diff --git a/x/staking/keeper/msg_server.go b/x/staking/keeper/msg_server.go index 2bc50f426..120320577 100644 --- a/x/staking/keeper/msg_server.go +++ b/x/staking/keeper/msg_server.go @@ -13,7 +13,7 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) var _ types.MsgServer = Keeper{} diff --git a/x/staking/keeper/msg_server_test.go b/x/staking/keeper/msg_server_test.go index 834e3f8cc..8badbab75 100644 --- a/x/staking/keeper/msg_server_test.go +++ b/x/staking/keeper/msg_server_test.go @@ -13,9 +13,9 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) func (suite *KeeperTestSuite) TestGrantPrivilege() { diff --git a/x/staking/keeper/shares.go b/x/staking/keeper/shares.go index 79fd97894..550d14e41 100644 --- a/x/staking/keeper/shares.go +++ b/x/staking/keeper/shares.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/x/staking/types" ) // SetAllowance sets the allowance of a spender for a delegator. diff --git a/x/staking/keeper/shares_test.go b/x/staking/keeper/shares_test.go index ab661bb58..a12d89c93 100644 --- a/x/staking/keeper/shares_test.go +++ b/x/staking/keeper/shares_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "math/big" - "github.com/functionx/fx-core/v5/testutil/helpers" + "github.com/functionx/fx-core/v6/testutil/helpers" ) func (suite *KeeperTestSuite) TestAllowance() { diff --git a/x/staking/module.go b/x/staking/module.go index ce39afa14..f1bcfa7f0 100644 --- a/x/staking/module.go +++ b/x/staking/module.go @@ -14,9 +14,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - fxstakingcli "github.com/functionx/fx-core/v5/x/staking/client/cli" - "github.com/functionx/fx-core/v5/x/staking/keeper" - fxstakingtypes "github.com/functionx/fx-core/v5/x/staking/types" + fxstakingcli "github.com/functionx/fx-core/v6/x/staking/client/cli" + "github.com/functionx/fx-core/v6/x/staking/keeper" + fxstakingtypes "github.com/functionx/fx-core/v6/x/staking/types" ) var ( diff --git a/x/staking/types/msg_test.go b/x/staking/types/msg_test.go index bc2cdc3a9..3c6a46a7f 100644 --- a/x/staking/types/msg_test.go +++ b/x/staking/types/msg_test.go @@ -14,9 +14,9 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/staking/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/staking/types" ) func TestMsgGrantPrivilegeRoute(t *testing.T) { diff --git a/x/tron/client/cli/query.go b/x/tron/client/cli/query.go index b1fd565e0..9e3894c60 100644 --- a/x/tron/client/cli/query.go +++ b/x/tron/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/tron/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/tron/client/cli/tx.go b/x/tron/client/cli/tx.go index 358b896e1..70a1db77b 100644 --- a/x/tron/client/cli/tx.go +++ b/x/tron/client/cli/tx.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/functionx/fx-core/v5/x/crosschain/client/cli" - "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/x/crosschain/client/cli" + "github.com/functionx/fx-core/v6/x/tron/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/tron/keeper/grpc_query.go b/x/tron/keeper/grpc_query.go index 99bc2d9ae..a05a013c3 100644 --- a/x/tron/keeper/grpc_query.go +++ b/x/tron/keeper/grpc_query.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/tron/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/tron/types" ) var _ crosschaintypes.QueryServer = Keeper{} diff --git a/x/tron/keeper/grpc_query_test.go b/x/tron/keeper/grpc_query_test.go index 63be39a2c..0036ea209 100644 --- a/x/tron/keeper/grpc_query_test.go +++ b/x/tron/keeper/grpc_query_test.go @@ -6,9 +6,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/functionx/fx-core/v5/testutil/helpers" - "github.com/functionx/fx-core/v5/x/crosschain/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + "github.com/functionx/fx-core/v6/x/crosschain/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *KeeperTestSuite) TestKeeper_BatchFees() { diff --git a/x/tron/keeper/hook.go b/x/tron/keeper/hook.go index 2d0e295ad..1661bd400 100644 --- a/x/tron/keeper/hook.go +++ b/x/tron/keeper/hook.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - fxtypes "github.com/functionx/fx-core/v5/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + fxtypes "github.com/functionx/fx-core/v6/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) var _ fxtypes.TransactionHook = &Keeper{} diff --git a/x/tron/keeper/keeper.go b/x/tron/keeper/keeper.go index c0a159663..a6286ba0b 100644 --- a/x/tron/keeper/keeper.go +++ b/x/tron/keeper/keeper.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/tron/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/tron/types" ) type Keeper struct { diff --git a/x/tron/keeper/keeper_test.go b/x/tron/keeper/keeper_test.go index 43cd9ba91..6faf9bbc1 100644 --- a/x/tron/keeper/keeper_test.go +++ b/x/tron/keeper/keeper_test.go @@ -14,12 +14,12 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/functionx/fx-core/v5/app" - "github.com/functionx/fx-core/v5/testutil/helpers" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - tronkeeper "github.com/functionx/fx-core/v5/x/tron/keeper" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/app" + "github.com/functionx/fx-core/v6/testutil/helpers" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + tronkeeper "github.com/functionx/fx-core/v6/x/tron/keeper" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) type KeeperTestSuite struct { diff --git a/x/tron/keeper/msg_server.go b/x/tron/keeper/msg_server.go index 23254e3f1..f91bda74d 100644 --- a/x/tron/keeper/msg_server.go +++ b/x/tron/keeper/msg_server.go @@ -8,9 +8,9 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) var _ crosschaintypes.MsgServer = msgServer{} diff --git a/x/tron/keeper/msg_server_test.go b/x/tron/keeper/msg_server_test.go index 6a5b41b79..e8903ef4f 100644 --- a/x/tron/keeper/msg_server_test.go +++ b/x/tron/keeper/msg_server_test.go @@ -7,9 +7,9 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/functionx/fx-core/v5/testutil/helpers" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - trontypes "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/testutil/helpers" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + trontypes "github.com/functionx/fx-core/v6/x/tron/types" ) func (suite *KeeperTestSuite) Test_msgServer_ConfirmBatch() { diff --git a/x/tron/module.go b/x/tron/module.go index 1b81f6b90..d57f31139 100644 --- a/x/tron/module.go +++ b/x/tron/module.go @@ -14,11 +14,11 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - crosschainkeeper "github.com/functionx/fx-core/v5/x/crosschain/keeper" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/tron/client/cli" - "github.com/functionx/fx-core/v5/x/tron/keeper" - "github.com/functionx/fx-core/v5/x/tron/types" + crosschainkeeper "github.com/functionx/fx-core/v6/x/crosschain/keeper" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/tron/client/cli" + "github.com/functionx/fx-core/v6/x/tron/keeper" + "github.com/functionx/fx-core/v6/x/tron/types" ) // type check to ensure the interface is properly implemented diff --git a/x/tron/types/checkpoint.go b/x/tron/types/checkpoint.go index eea92e469..4c5aa6f49 100644 --- a/x/tron/types/checkpoint.go +++ b/x/tron/types/checkpoint.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/fbsobreira/gotron-sdk/pkg/abi" - fxtypes "github.com/functionx/fx-core/v5/types" - "github.com/functionx/fx-core/v5/x/crosschain/types" + fxtypes "github.com/functionx/fx-core/v6/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) // GetCheckpointOracleSet returns the checkpoint diff --git a/x/tron/types/genesis.go b/x/tron/types/genesis.go index e8e31e14a..28a115d50 100644 --- a/x/tron/types/genesis.go +++ b/x/tron/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) func DefaultGenesisState() *crosschaintypes.GenesisState { diff --git a/x/tron/types/genesis_test.go b/x/tron/types/genesis_test.go index 9735be8d5..a9e654166 100644 --- a/x/tron/types/genesis_test.go +++ b/x/tron/types/genesis_test.go @@ -7,9 +7,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - fxtypes "github.com/functionx/fx-core/v5/types" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" - "github.com/functionx/fx-core/v5/x/tron/types" + fxtypes "github.com/functionx/fx-core/v6/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/tron/types" ) func TestDefaultGenesisState(t *testing.T) { diff --git a/x/tron/types/msg_validate.go b/x/tron/types/msg_validate.go index 9b386de34..569cb9f18 100644 --- a/x/tron/types/msg_validate.go +++ b/x/tron/types/msg_validate.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - crosschaintypes "github.com/functionx/fx-core/v5/x/crosschain/types" + crosschaintypes "github.com/functionx/fx-core/v6/x/crosschain/types" ) var _ crosschaintypes.MsgValidateBasic = &TronMsgValidate{} diff --git a/x/tron/types/signer.go b/x/tron/types/signer.go index 830bbe1a3..e1fce4882 100644 --- a/x/tron/types/signer.go +++ b/x/tron/types/signer.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/fbsobreira/gotron-sdk/pkg/address" - "github.com/functionx/fx-core/v5/x/crosschain/types" + "github.com/functionx/fx-core/v6/x/crosschain/types" ) const tronSignaturePrefix = "\x19TRON Signed Message:\n32" diff --git a/x/tron/types/tron_address_test.go b/x/tron/types/tron_address_test.go index 13f793d2c..87e252ff5 100644 --- a/x/tron/types/tron_address_test.go +++ b/x/tron/types/tron_address_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/functionx/fx-core/v5/x/tron/types" + "github.com/functionx/fx-core/v6/x/tron/types" ) func TestValidateTronAddress(t *testing.T) {