diff --git a/.golangci.yml b/.golangci.yml index c9567f4b3b..8fb8a0084a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -44,7 +44,7 @@ linters-settings: sections: - standard - default - - prefix(github.com/zeta-chain/zetacore) + - prefix(github.com/zeta-chain/node) skip-generated: true issues: diff --git a/.goreleaser.yaml b/.goreleaser.yaml index de42cf8b62..37cdbcb8c2 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -54,10 +54,10 @@ builds: - -X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .FullCommit }} - - -X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored - - -X github.com/zeta-chain/zetacore/pkg/constant.Version={{ .Version }} - - -X github.com/zeta-chain/zetacore/pkg/constant.CommitHash={{ .FullCommit }} - - -X github.com/zeta-chain/zetacore/pkg/constant.BuildTime={{ .Env.BUILDTIME }} + - -X github.com/zeta-chain/node/pkg/constant.Name=zetacored + - -X github.com/zeta-chain/node/pkg/constant.Version={{ .Version }} + - -X github.com/zeta-chain/node/pkg/constant.CommitHash={{ .FullCommit }} + - -X github.com/zeta-chain/node/pkg/constant.BuildTime={{ .Env.BUILDTIME }} - -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb - id: "zetaclientd" diff --git a/Makefile b/Makefile index 5a3d683da2..814b5969e9 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,10 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \ -X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored \ - -X github.com/zeta-chain/zetacore/pkg/constant.Version=$(VERSION) \ - -X github.com/zeta-chain/zetacore/pkg/constant.CommitHash=$(COMMIT) \ - -X github.com/zeta-chain/zetacore/pkg/constant.BuildTime=$(BUILDTIME) \ + -X github.com/zeta-chain/node/pkg/constant.Name=zetacored \ + -X github.com/zeta-chain/node/pkg/constant.Version=$(VERSION) \ + -X github.com/zeta-chain/node/pkg/constant.CommitHash=$(COMMIT) \ + -X github.com/zeta-chain/node/pkg/constant.BuildTime=$(BUILDTIME) \ -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb BUILD_FLAGS := -ldflags '$(ldflags)' -tags pebbledb,ledger diff --git a/app/ante/ante.go b/app/ante/ante.go index 7c7be0604c..38154d165c 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -27,8 +27,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func ValidateHandlerOptions(options HandlerOptions) error { diff --git a/app/ante/ante_test.go b/app/ante/ante_test.go index 695a680cf3..52d46475fa 100644 --- a/app/ante/ante_test.go +++ b/app/ante/ante_test.go @@ -9,11 +9,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/app/ante" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/app/ante" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) var _ sdk.AnteHandler = (&MockAnteHandler{}).AnteHandle diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 8af3a82593..5df711d52e 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -33,7 +33,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" ) type HandlerOptions struct { diff --git a/app/ante/system_tx_priority_decorator_test.go b/app/ante/system_tx_priority_decorator_test.go index 6f267bf5e2..4eae01315f 100644 --- a/app/ante/system_tx_priority_decorator_test.go +++ b/app/ante/system_tx_priority_decorator_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/app/ante" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/app/ante" + "github.com/zeta-chain/node/testutil/sample" ) func TestSystemTxPriorityDecorator_AnteHandle(t *testing.T) { diff --git a/app/ante/vesting_test.go b/app/ante/vesting_test.go index f174bb61c2..1b7fff120c 100644 --- a/app/ante/vesting_test.go +++ b/app/ante/vesting_test.go @@ -11,9 +11,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/app/ante" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/app/ante" + "github.com/zeta-chain/node/testutil/sample" ) func TestVesting_AnteHandle(t *testing.T) { diff --git a/app/app.go b/app/app.go index 32d85214eb..84b9a49253 100644 --- a/app/app.go +++ b/app/app.go @@ -89,29 +89,29 @@ import ( feemarketkeeper "github.com/zeta-chain/ethermint/x/feemarket/keeper" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - "github.com/zeta-chain/zetacore/app/ante" - "github.com/zeta-chain/zetacore/docs/openapi" - zetamempool "github.com/zeta-chain/zetacore/pkg/mempool" - "github.com/zeta-chain/zetacore/precompiles" - srvflags "github.com/zeta-chain/zetacore/server/flags" - authoritymodule "github.com/zeta-chain/zetacore/x/authority" - authoritykeeper "github.com/zeta-chain/zetacore/x/authority/keeper" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschainmodule "github.com/zeta-chain/zetacore/x/crosschain" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionsmodule "github.com/zeta-chain/zetacore/x/emissions" - emissionskeeper "github.com/zeta-chain/zetacore/x/emissions/keeper" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungiblemodule "github.com/zeta-chain/zetacore/x/fungible" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclientmodule "github.com/zeta-chain/zetacore/x/lightclient" - lightclientkeeper "github.com/zeta-chain/zetacore/x/lightclient/keeper" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observermodule "github.com/zeta-chain/zetacore/x/observer" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app/ante" + "github.com/zeta-chain/node/docs/openapi" + zetamempool "github.com/zeta-chain/node/pkg/mempool" + "github.com/zeta-chain/node/precompiles" + srvflags "github.com/zeta-chain/node/server/flags" + authoritymodule "github.com/zeta-chain/node/x/authority" + authoritykeeper "github.com/zeta-chain/node/x/authority/keeper" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschainmodule "github.com/zeta-chain/node/x/crosschain" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionsmodule "github.com/zeta-chain/node/x/emissions" + emissionskeeper "github.com/zeta-chain/node/x/emissions/keeper" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungiblemodule "github.com/zeta-chain/node/x/fungible" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclientmodule "github.com/zeta-chain/node/x/lightclient" + lightclientkeeper "github.com/zeta-chain/node/x/lightclient/keeper" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observermodule "github.com/zeta-chain/node/x/observer" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // TODO: enable back IBC @@ -128,9 +128,9 @@ import ( // ibctypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" // ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" // ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" -// "github.com/zeta-chain/zetacore/x/ibccrosschain" -// ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" -// ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types" +// "github.com/zeta-chain/node/x/ibccrosschain" +// ibccrosschainkeeper "github.com/zeta-chain/node/x/ibccrosschain/keeper" +// ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types" const Name = "zetacore" diff --git a/app/init_genesis.go b/app/init_genesis.go index a8765c28d7..b69972dbf8 100644 --- a/app/init_genesis.go +++ b/app/init_genesis.go @@ -19,12 +19,12 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionsModuleTypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibleModuleTypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionsModuleTypes "github.com/zeta-chain/node/x/emissions/types" + fungibleModuleTypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // InitGenesisModuleList returns the module list for genesis initialization diff --git a/app/prefix.go b/app/prefix.go index a0b3cb1936..34e0274a4e 100644 --- a/app/prefix.go +++ b/app/prefix.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethcfg "github.com/zeta-chain/ethermint/cmd/config" - cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config" + cmdcfg "github.com/zeta-chain/node/cmd/zetacored/config" ) func SetConfig() { diff --git a/app/setup_handlers.go b/app/setup_handlers.go index b34b147069..22a2fe5b3e 100644 --- a/app/setup_handlers.go +++ b/app/setup_handlers.go @@ -20,10 +20,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade/types" "golang.org/x/exp/slices" - "github.com/zeta-chain/zetacore/pkg/constant" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/constant" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func SetupHandlers(app *App) { diff --git a/app/upgrade_tracker_test.go b/app/upgrade_tracker_test.go index 28e312abf9..25880e7ce9 100644 --- a/app/upgrade_tracker_test.go +++ b/app/upgrade_tracker_test.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/stretchr/testify/require" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" ) func TestUpgradeTracker(t *testing.T) { diff --git a/cmd/zetaclientd-supervisor/lib.go b/cmd/zetaclientd-supervisor/lib.go index b6f57b5295..dc25a00e16 100644 --- a/cmd/zetaclientd-supervisor/lib.go +++ b/cmd/zetaclientd-supervisor/lib.go @@ -19,7 +19,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) const zetaclientdBinaryName = "zetaclientd" diff --git a/cmd/zetaclientd-supervisor/main.go b/cmd/zetaclientd-supervisor/main.go index 756a9138da..ceb8fa0d8f 100644 --- a/cmd/zetaclientd-supervisor/main.go +++ b/cmd/zetaclientd-supervisor/main.go @@ -14,9 +14,9 @@ import ( "cosmossdk.io/errors" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/app" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/app" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/zetaclient/config" ) func main() { diff --git a/cmd/zetaclientd/debug.go b/cmd/zetaclientd/debug.go index 9d7ece9a0c..2e5c1bbd49 100644 --- a/cmd/zetaclientd/debug.go +++ b/cmd/zetaclientd/debug.go @@ -16,14 +16,14 @@ import ( "github.com/rs/zerolog" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - btcobserver "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - evmobserver "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + evmobserver "github.com/zeta-chain/node/zetaclient/chains/evm/observer" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/zetacore" ) var debugArgs = debugArguments{} diff --git a/cmd/zetaclientd/encrypt_tss.go b/cmd/zetaclientd/encrypt_tss.go index 99322c0ecd..92be57a190 100644 --- a/cmd/zetaclientd/encrypt_tss.go +++ b/cmd/zetaclientd/encrypt_tss.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/crypto" ) var encTssCmd = &cobra.Command{ diff --git a/cmd/zetaclientd/hsm.go b/cmd/zetaclientd/hsm.go index 99fae253c1..25bfb87d9c 100644 --- a/cmd/zetaclientd/hsm.go +++ b/cmd/zetaclientd/hsm.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" keystone "github.com/zeta-chain/keystone/keys" - "github.com/zeta-chain/zetacore/cmd" - "github.com/zeta-chain/zetacore/pkg/cosmos" - "github.com/zeta-chain/zetacore/zetaclient/hsm" + "github.com/zeta-chain/node/cmd" + "github.com/zeta-chain/node/pkg/cosmos" + "github.com/zeta-chain/node/zetaclient/hsm" ) var HsmCmd = &cobra.Command{ diff --git a/cmd/zetaclientd/import_relayer_keys.go b/cmd/zetaclientd/import_relayer_keys.go index b624ac7afb..ecd71a6f5c 100644 --- a/cmd/zetaclientd/import_relayer_keys.go +++ b/cmd/zetaclientd/import_relayer_keys.go @@ -9,11 +9,11 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/keys" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/keys" ) var CmdImportRelayerKey = &cobra.Command{ diff --git a/cmd/zetaclientd/init.go b/cmd/zetaclientd/init.go index 2d3e67d698..9f71ee2026 100644 --- a/cmd/zetaclientd/init.go +++ b/cmd/zetaclientd/init.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" ) var InitCmd = &cobra.Command{ diff --git a/cmd/zetaclientd/keygen_tss.go b/cmd/zetaclientd/keygen_tss.go index bf6be65e67..8404670cb5 100644 --- a/cmd/zetaclientd/keygen_tss.go +++ b/cmd/zetaclientd/keygen_tss.go @@ -14,13 +14,13 @@ import ( "gitlab.com/thorchain/tss/go-tss/tss" "golang.org/x/crypto/sha3" - "github.com/zeta-chain/zetacore/pkg/chains" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - mc "github.com/zeta-chain/zetacore/zetaclient/tss" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/metrics" + mc "github.com/zeta-chain/node/zetaclient/tss" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // GenerateTSS generates a new TSS if keygen is set. diff --git a/cmd/zetaclientd/main.go b/cmd/zetaclientd/main.go index 128b92972e..f9f53315c7 100644 --- a/cmd/zetaclientd/main.go +++ b/cmd/zetaclientd/main.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/types" ecdsakeygen "gitlab.com/thorchain/tss/tss-lib/ecdsa/keygen" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/cmd" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/cmd" ) var ( diff --git a/cmd/zetaclientd/p2p_diagnostics.go b/cmd/zetaclientd/p2p_diagnostics.go index dc8a98621d..201b91504b 100644 --- a/cmd/zetaclientd/p2p_diagnostics.go +++ b/cmd/zetaclientd/p2p_diagnostics.go @@ -20,9 +20,9 @@ import ( maddr "github.com/multiformats/go-multiaddr" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/cosmos" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/pkg/cosmos" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/metrics" ) func RunDiagnostics( diff --git a/cmd/zetaclientd/start.go b/cmd/zetaclientd/start.go index 0c0bbd6585..2dfc388d05 100644 --- a/cmd/zetaclientd/start.go +++ b/cmd/zetaclientd/start.go @@ -19,19 +19,19 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/maintenance" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/orchestrator" - mc "github.com/zeta-chain/zetacore/zetaclient/tss" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + zetaos "github.com/zeta-chain/node/pkg/os" + observerTypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/maintenance" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/orchestrator" + mc "github.com/zeta-chain/node/zetaclient/tss" + "github.com/zeta-chain/node/zetaclient/zetacore" ) var StartCmd = &cobra.Command{ diff --git a/cmd/zetaclientd/start_utils.go b/cmd/zetaclientd/start_utils.go index e8070ab5d0..a0b97e59ca 100644 --- a/cmd/zetaclientd/start_utils.go +++ b/cmd/zetaclientd/start_utils.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) func waitForZetaCore(config config.Config, logger zerolog.Logger) { diff --git a/cmd/zetaclientd/utils.go b/cmd/zetaclientd/utils.go index b25de0a2b5..e7b8bb6538 100644 --- a/cmd/zetaclientd/utils.go +++ b/cmd/zetaclientd/utils.go @@ -4,10 +4,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/zetaclient/authz" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/zetaclient/authz" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/zetacore" ) func CreateAuthzSigner(granter string, grantee sdk.AccAddress) { diff --git a/cmd/zetaclientd/version.go b/cmd/zetaclientd/version.go index 15886d4b80..cadba46095 100644 --- a/cmd/zetaclientd/version.go +++ b/cmd/zetaclientd/version.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" ) var VersionCmd = &cobra.Command{ diff --git a/cmd/zetacore_utils/main.go b/cmd/zetacore_utils/main.go index efef638bb8..10b3cf3bb0 100644 --- a/cmd/zetacore_utils/main.go +++ b/cmd/zetacore_utils/main.go @@ -12,7 +12,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" + "github.com/zeta-chain/node/cmd/zetacored/config" ) const node = "tcp://3.218.170.198:26657" diff --git a/cmd/zetacored/add_observer_list.go b/cmd/zetacored/add_observer_list.go index 2faf122cc2..8ef2dedd74 100644 --- a/cmd/zetacored/add_observer_list.go +++ b/cmd/zetacored/add_observer_list.go @@ -22,11 +22,11 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/crypto" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/crypto" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/x/observer/types" ) // Token distribution diff --git a/cmd/zetacored/collect_observer_info.go b/cmd/zetacored/collect_observer_info.go index 170b6d0196..094b5e2649 100644 --- a/cmd/zetacored/collect_observer_info.go +++ b/cmd/zetacored/collect_observer_info.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" + "github.com/zeta-chain/node/app" ) func CollectObserverInfoCmd() *cobra.Command { diff --git a/cmd/zetacored/flags_test.go b/cmd/zetacored/flags_test.go index a8d8d43596..dbfc664277 100644 --- a/cmd/zetacored/flags_test.go +++ b/cmd/zetacored/flags_test.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/require" - zetacore "github.com/zeta-chain/zetacore/cmd/zetacored" + zetacore "github.com/zeta-chain/node/cmd/zetacored" ) // alwaysErrorValue allows to test f.Value.Set failure diff --git a/cmd/zetacored/get_pubkey.go b/cmd/zetacored/get_pubkey.go index 569d28dd0f..daaa867ad6 100644 --- a/cmd/zetacored/get_pubkey.go +++ b/cmd/zetacored/get_pubkey.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/cosmos" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/cosmos" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" ) func GetPubKeyCmd() *cobra.Command { diff --git a/cmd/zetacored/main.go b/cmd/zetacored/main.go index 69fa673548..4ec6c36631 100644 --- a/cmd/zetacored/main.go +++ b/cmd/zetacored/main.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/zeta-chain/zetacore/app" - cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config" + "github.com/zeta-chain/node/app" + cmdcfg "github.com/zeta-chain/node/cmd/zetacored/config" ) func main() { diff --git a/cmd/zetacored/parse_genesis.go b/cmd/zetacored/parse_genesis.go index 1920f29752..89faf9bd2e 100644 --- a/cmd/zetacored/parse_genesis.go +++ b/cmd/zetacored/parse_genesis.go @@ -29,11 +29,11 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - "github.com/zeta-chain/zetacore/app" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const MaxItemsForList = 10 diff --git a/cmd/zetacored/parse_genesis_test.go b/cmd/zetacored/parse_genesis_test.go index 689075eb32..864a701fa8 100644 --- a/cmd/zetacored/parse_genesis_test.go +++ b/cmd/zetacored/parse_genesis_test.go @@ -15,13 +15,13 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - zetacored "github.com/zeta-chain/zetacore/cmd/zetacored" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + zetacored "github.com/zeta-chain/node/cmd/zetacored" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func setConfig(t *testing.T) { diff --git a/cmd/zetacored/parsers_test.go b/cmd/zetacored/parsers_test.go index 8750f0f61b..3dc47952da 100644 --- a/cmd/zetacored/parsers_test.go +++ b/cmd/zetacored/parsers_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/testutil/sample" ) func TestParsefileToObserverMapper(t *testing.T) { diff --git a/cmd/zetacored/root.go b/cmd/zetacored/root.go index eb63b4c9cd..440b921bc2 100644 --- a/cmd/zetacored/root.go +++ b/cmd/zetacored/root.go @@ -33,11 +33,11 @@ import ( "github.com/zeta-chain/ethermint/crypto/hd" "github.com/zeta-chain/ethermint/types" - "github.com/zeta-chain/zetacore/app" - zetacoredconfig "github.com/zeta-chain/zetacore/cmd/zetacored/config" - zetamempool "github.com/zeta-chain/zetacore/pkg/mempool" - zevmserver "github.com/zeta-chain/zetacore/server" - servercfg "github.com/zeta-chain/zetacore/server/config" + "github.com/zeta-chain/node/app" + zetacoredconfig "github.com/zeta-chain/node/cmd/zetacored/config" + zetamempool "github.com/zeta-chain/node/pkg/mempool" + zevmserver "github.com/zeta-chain/node/server" + servercfg "github.com/zeta-chain/node/server/config" ) const EnvPrefix = "zetacore" diff --git a/cmd/zetae2e/balances.go b/cmd/zetae2e/balances.go index 13df89430a..e8fa290065 100644 --- a/cmd/zetae2e/balances.go +++ b/cmd/zetae2e/balances.go @@ -6,10 +6,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) const flagSkipBTC = "skip-btc" diff --git a/cmd/zetae2e/bitcoin_address.go b/cmd/zetae2e/bitcoin_address.go index 6c9c5c3f4a..70d64ab582 100644 --- a/cmd/zetae2e/bitcoin_address.go +++ b/cmd/zetae2e/bitcoin_address.go @@ -6,10 +6,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) const flagPrivKey = "privkey" diff --git a/cmd/zetae2e/config/clients.go b/cmd/zetae2e/config/clients.go index 3aec591737..0a2534cd09 100644 --- a/cmd/zetae2e/config/clients.go +++ b/cmd/zetae2e/config/clients.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" - zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" + zetacore_rpc "github.com/zeta-chain/node/pkg/rpc" ) // getClientsFromConfig get clients from config diff --git a/cmd/zetae2e/config/config.go b/cmd/zetae2e/config/config.go index 7cf2afb461..8e87e63bef 100644 --- a/cmd/zetae2e/config/config.go +++ b/cmd/zetae2e/config/config.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) // RunnerFromConfig create test runner from config diff --git a/cmd/zetae2e/config/config_test.go b/cmd/zetae2e/config/config_test.go index f8eb98a01e..070239806c 100644 --- a/cmd/zetae2e/config/config_test.go +++ b/cmd/zetae2e/config/config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/config" + "github.com/zeta-chain/node/e2e/config" ) func TestReadConfig(t *testing.T) { diff --git a/cmd/zetae2e/config/contracts.go b/cmd/zetae2e/config/contracts.go index 0d554ef480..d6cba953a5 100644 --- a/cmd/zetae2e/config/contracts.go +++ b/cmd/zetae2e/config/contracts.go @@ -17,12 +17,12 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/contracts/contextapp" - "github.com/zeta-chain/zetacore/e2e/contracts/erc20" - "github.com/zeta-chain/zetacore/e2e/contracts/zevmswap" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/contracts/contextapp" + "github.com/zeta-chain/node/e2e/contracts/erc20" + "github.com/zeta-chain/node/e2e/contracts/zevmswap" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" ) // setContractsFromConfig get EVM contracts from config diff --git a/cmd/zetae2e/init.go b/cmd/zetae2e/init.go index 1f26814d24..df77991e88 100644 --- a/cmd/zetae2e/init.go +++ b/cmd/zetae2e/init.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/cmd/zetae2e/local" - "github.com/zeta-chain/zetacore/e2e/config" + "github.com/zeta-chain/node/cmd/zetae2e/local" + "github.com/zeta-chain/node/e2e/config" ) var initConf = config.Config{} diff --git a/cmd/zetae2e/list_tests.go b/cmd/zetae2e/list_tests.go index ec050e12e4..c6140dffbb 100644 --- a/cmd/zetae2e/list_tests.go +++ b/cmd/zetae2e/list_tests.go @@ -6,8 +6,8 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // NewListTestsCmd returns the list test cmd diff --git a/cmd/zetae2e/local/admin.go b/cmd/zetae2e/local/admin.go index 6aaf386496..d81e6ac46c 100644 --- a/cmd/zetae2e/local/admin.go +++ b/cmd/zetae2e/local/admin.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // adminTestRoutine runs admin functions tests diff --git a/cmd/zetae2e/local/bitcoin.go b/cmd/zetae2e/local/bitcoin.go index 184277d0cc..f28f182877 100644 --- a/cmd/zetae2e/local/bitcoin.go +++ b/cmd/zetae2e/local/bitcoin.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // bitcoinTestRoutine runs Bitcoin related e2e tests diff --git a/cmd/zetae2e/local/config.go b/cmd/zetae2e/local/config.go index 8788024b7d..2f4386e7b0 100644 --- a/cmd/zetae2e/local/config.go +++ b/cmd/zetae2e/local/config.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/e2e/config" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/e2e/config" ) // GetConfig returns config from file from the command line flag diff --git a/cmd/zetae2e/local/erc20.go b/cmd/zetae2e/local/erc20.go index 94c3cbfc29..3b2830a066 100644 --- a/cmd/zetae2e/local/erc20.go +++ b/cmd/zetae2e/local/erc20.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // erc20TestRoutine runs erc20 related e2e tests diff --git a/cmd/zetae2e/local/ethereum.go b/cmd/zetae2e/local/ethereum.go index 84b68608c8..09615bcbb8 100644 --- a/cmd/zetae2e/local/ethereum.go +++ b/cmd/zetae2e/local/ethereum.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // ethereumTestRoutine runs Ethereum related e2e tests diff --git a/cmd/zetae2e/local/local.go b/cmd/zetae2e/local/local.go index 4a0d62aae0..40900872f4 100644 --- a/cmd/zetae2e/local/local.go +++ b/cmd/zetae2e/local/local.go @@ -11,16 +11,16 @@ import ( "github.com/spf13/cobra" "golang.org/x/sync/errgroup" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/cmd/zetae2e/local/misc.go b/cmd/zetae2e/local/misc.go index a27c93c932..10e2d86a51 100644 --- a/cmd/zetae2e/local/misc.go +++ b/cmd/zetae2e/local/misc.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // miscTestRoutine runs miscellaneous e2e tests diff --git a/cmd/zetae2e/local/monitor_priority_txs.go b/cmd/zetae2e/local/monitor_priority_txs.go index f77e79d74c..05fc5746df 100644 --- a/cmd/zetae2e/local/monitor_priority_txs.go +++ b/cmd/zetae2e/local/monitor_priority_txs.go @@ -10,7 +10,7 @@ import ( rpchttp "github.com/cometbft/cometbft/rpc/client/http" coretypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/zeta-chain/zetacore/e2e/config" + "github.com/zeta-chain/node/e2e/config" ) var errWrongTxPriority = errors.New("wrong tx priority, system tx not on top") diff --git a/cmd/zetae2e/local/performance.go b/cmd/zetae2e/local/performance.go index 3bc8ed8377..0d3fea6e5b 100644 --- a/cmd/zetae2e/local/performance.go +++ b/cmd/zetae2e/local/performance.go @@ -9,9 +9,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // ethereumDepositPerformanceRoutine runs performance tests for Ether deposit diff --git a/cmd/zetae2e/local/precompiles.go b/cmd/zetae2e/local/precompiles.go index 55372431e6..400db0d973 100644 --- a/cmd/zetae2e/local/precompiles.go +++ b/cmd/zetae2e/local/precompiles.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // statefulPrecompilesTestRoutine runs steateful precompiles related e2e tests diff --git a/cmd/zetae2e/local/solana.go b/cmd/zetae2e/local/solana.go index ef8ffce1ea..135615051a 100644 --- a/cmd/zetae2e/local/solana.go +++ b/cmd/zetae2e/local/solana.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // solanaTestRoutine runs Solana related e2e tests diff --git a/cmd/zetae2e/local/test_runner.go b/cmd/zetae2e/local/test_runner.go index 14a6ba28fe..4ea7d4e603 100644 --- a/cmd/zetae2e/local/test_runner.go +++ b/cmd/zetae2e/local/test_runner.go @@ -1,9 +1,9 @@ package local import ( - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) // initTestRunner initializes a runner form tests diff --git a/cmd/zetae2e/local/tss_migration.go b/cmd/zetae2e/local/tss_migration.go index 860cebf91a..35a9f7a580 100644 --- a/cmd/zetae2e/local/tss_migration.go +++ b/cmd/zetae2e/local/tss_migration.go @@ -8,10 +8,10 @@ import ( "github.com/fatih/color" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // tssMigrationTestRoutine runs TSS migration related e2e tests diff --git a/cmd/zetae2e/local/v2.go b/cmd/zetae2e/local/v2.go index b38be32868..ce193bc32e 100644 --- a/cmd/zetae2e/local/v2.go +++ b/cmd/zetae2e/local/v2.go @@ -7,9 +7,9 @@ import ( "github.com/fatih/color" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // startV2Tests starts v2 related tests in parallel diff --git a/cmd/zetae2e/local/zeta.go b/cmd/zetae2e/local/zeta.go index a0f6d49a09..c361876948 100644 --- a/cmd/zetae2e/local/zeta.go +++ b/cmd/zetae2e/local/zeta.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // zetaTestRoutine runs Zeta transfer and message passing related e2e tests diff --git a/cmd/zetae2e/local/zevm_mp.go b/cmd/zetae2e/local/zevm_mp.go index b8d6126ae0..96f1e5a0b0 100644 --- a/cmd/zetae2e/local/zevm_mp.go +++ b/cmd/zetae2e/local/zevm_mp.go @@ -6,9 +6,9 @@ import ( "github.com/fatih/color" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" ) // zevmMPTestRoutine runs ZEVM message passing related e2e tests diff --git a/cmd/zetae2e/root.go b/cmd/zetae2e/root.go index d9adf800f0..28b4b0c003 100644 --- a/cmd/zetae2e/root.go +++ b/cmd/zetae2e/root.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/cmd/zetae2e/local" + "github.com/zeta-chain/node/cmd/zetae2e/local" ) var asciiArt = ` diff --git a/cmd/zetae2e/run.go b/cmd/zetae2e/run.go index 5f38a39cbd..f58e5b51cf 100644 --- a/cmd/zetae2e/run.go +++ b/cmd/zetae2e/run.go @@ -11,13 +11,13 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/e2etests" - "github.com/zeta-chain/zetacore/e2e/runner" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/e2etests" + "github.com/zeta-chain/node/e2e/runner" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const flagVerbose = "verbose" diff --git a/cmd/zetae2e/setup_bitcoin.go b/cmd/zetae2e/setup_bitcoin.go index 99a5365adc..622855a027 100644 --- a/cmd/zetae2e/setup_bitcoin.go +++ b/cmd/zetae2e/setup_bitcoin.go @@ -6,10 +6,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) // NewSetupBitcoinCmd sets up bitcoin wallet for e2e tests diff --git a/cmd/zetae2e/show_tss.go b/cmd/zetae2e/show_tss.go index 01b61317a1..22ba0b2ae7 100644 --- a/cmd/zetae2e/show_tss.go +++ b/cmd/zetae2e/show_tss.go @@ -6,10 +6,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" ) // NewShowTSSCmd returns the show TSS command diff --git a/cmd/zetae2e/stress.go b/cmd/zetae2e/stress.go index e7b0c169a0..66e8cd700d 100644 --- a/cmd/zetae2e/stress.go +++ b/cmd/zetae2e/stress.go @@ -18,13 +18,13 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" "google.golang.org/grpc" - "github.com/zeta-chain/zetacore/app" - zetae2econfig "github.com/zeta-chain/zetacore/cmd/zetae2e/config" - "github.com/zeta-chain/zetacore/cmd/zetae2e/local" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/app" + zetae2econfig "github.com/zeta-chain/node/cmd/zetae2e/config" + "github.com/zeta-chain/node/cmd/zetae2e/local" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const ( diff --git a/cmd/zetatool/filterdeposit/btc.go b/cmd/zetatool/filterdeposit/btc.go index a667a7d3eb..f4b2636da2 100644 --- a/cmd/zetatool/filterdeposit/btc.go +++ b/cmd/zetatool/filterdeposit/btc.go @@ -13,8 +13,8 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/cmd/zetatool/config" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/pkg/constant" ) func NewBtcCmd() *cobra.Command { diff --git a/cmd/zetatool/filterdeposit/evm.go b/cmd/zetatool/filterdeposit/evm.go index 2fa39b8c90..f4278b2fdb 100644 --- a/cmd/zetatool/filterdeposit/evm.go +++ b/cmd/zetatool/filterdeposit/evm.go @@ -16,9 +16,9 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.non-eth.sol" - "github.com/zeta-chain/zetacore/cmd/zetatool/config" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/zetaclient/chains/evm" ) const ( diff --git a/cmd/zetatool/filterdeposit/filterdeposit.go b/cmd/zetatool/filterdeposit/filterdeposit.go index ccab8e6273..e49a333f3f 100644 --- a/cmd/zetatool/filterdeposit/filterdeposit.go +++ b/cmd/zetatool/filterdeposit/filterdeposit.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/cmd/zetatool/config" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/cmd/zetatool/filterdeposit/filterdeposit_test.go b/cmd/zetatool/filterdeposit/filterdeposit_test.go index d1ef644c1c..a2d2adb510 100644 --- a/cmd/zetatool/filterdeposit/filterdeposit_test.go +++ b/cmd/zetatool/filterdeposit/filterdeposit_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetatool/config" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestCheckForCCTX(t *testing.T) { diff --git a/cmd/zetatool/main.go b/cmd/zetatool/main.go index cb36479573..7fd284ed2b 100644 --- a/cmd/zetatool/main.go +++ b/cmd/zetatool/main.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/cmd/zetatool/config" - "github.com/zeta-chain/zetacore/cmd/zetatool/filterdeposit" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/cmd/zetatool/filterdeposit" ) var rootCmd = &cobra.Command{ diff --git a/docs/main.go b/docs/main.go index 3e62a0e0b7..cd2a6095fa 100644 --- a/docs/main.go +++ b/docs/main.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/mux" - "github.com/zeta-chain/zetacore/docs/openapi" + "github.com/zeta-chain/node/docs/openapi" ) func main() { diff --git a/e2e/e2etests/e2etests.go b/e2e/e2etests/e2etests.go index 5b810276db..988c4fc5b8 100644 --- a/e2e/e2etests/e2etests.go +++ b/e2e/e2etests/e2etests.go @@ -1,7 +1,7 @@ package e2etests import ( - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) // List of all e2e test names to be used in zetae2e diff --git a/e2e/e2etests/helpers.go b/e2e/e2etests/helpers.go index 8146ff52b8..9e32a8d38e 100644 --- a/e2e/e2etests/helpers.go +++ b/e2e/e2etests/helpers.go @@ -10,10 +10,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func withdrawBTCZRC20(r *runner.E2ERunner, to btcutil.Address, amount *big.Int) *btcjson.TxRawResult { diff --git a/e2e/e2etests/test_admin_transactions.go b/e2e/e2etests/test_admin_transactions.go index e611d878c3..c091fd0789 100644 --- a/e2e/e2etests/test_admin_transactions.go +++ b/e2e/e2etests/test_admin_transactions.go @@ -3,13 +3,13 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // TestCriticalAdminTransactions tests critical admin transactions that are the most used on mainnet . diff --git a/e2e/e2etests/test_bitcoin_deposit.go b/e2e/e2etests/test_bitcoin_deposit.go index 48460c42be..c9c6fdbf45 100644 --- a/e2e/e2etests/test_bitcoin_deposit.go +++ b/e2e/e2etests/test_bitcoin_deposit.go @@ -3,9 +3,9 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestBitcoinDeposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_deposit_refund.go b/e2e/e2etests/test_bitcoin_deposit_refund.go index c17f04ba5d..b0189d4b69 100644 --- a/e2e/e2etests/test_bitcoin_deposit_refund.go +++ b/e2e/e2etests/test_bitcoin_deposit_refund.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/x/crosschain/types" - zetabitcoin "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/x/crosschain/types" + zetabitcoin "github.com/zeta-chain/node/zetaclient/chains/bitcoin" ) func TestBitcoinDepositRefund(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go b/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go index 00a9ecb5fe..5c7254a3a1 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go +++ b/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) func TestBitcoinWithdrawToInvalidAddress(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_legacy.go b/e2e/e2etests/test_bitcoin_withdraw_legacy.go index 57b96034dc..d40141a061 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_legacy.go +++ b/e2e/e2etests/test_bitcoin_withdraw_legacy.go @@ -4,7 +4,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestBitcoinWithdrawLegacy(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_multiple.go b/e2e/e2etests/test_bitcoin_withdraw_multiple.go index e744bbe8c8..09d77fde80 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_multiple.go +++ b/e2e/e2etests/test_bitcoin_withdraw_multiple.go @@ -3,8 +3,8 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/pkg/chains" ) const defaultReceiver = "mxpYha3UJKUgSwsAz2qYRqaDSwAkKZ3YEY" diff --git a/e2e/e2etests/test_bitcoin_withdraw_p2sh.go b/e2e/e2etests/test_bitcoin_withdraw_p2sh.go index c63a2d2c6b..a01ab497b2 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_p2sh.go +++ b/e2e/e2etests/test_bitcoin_withdraw_p2sh.go @@ -4,7 +4,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestBitcoinWithdrawP2SH(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go b/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go index 5748e0b671..9f05a0eef8 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go +++ b/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go @@ -4,7 +4,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestBitcoinWithdrawP2WSH(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go b/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go index 96cdc9ed0a..ab864c8b95 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go +++ b/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/testutils" ) func TestBitcoinWithdrawRestricted(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_segwit.go b/e2e/e2etests/test_bitcoin_withdraw_segwit.go index 2bd763693e..f65c4f6823 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_segwit.go +++ b/e2e/e2etests/test_bitcoin_withdraw_segwit.go @@ -4,7 +4,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestBitcoinWithdrawSegWit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_bitcoin_withdraw_taproot.go b/e2e/e2etests/test_bitcoin_withdraw_taproot.go index cc1c5feb87..d9d0b4cf48 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_taproot.go +++ b/e2e/e2etests/test_bitcoin_withdraw_taproot.go @@ -3,8 +3,8 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/pkg/chains" ) func TestBitcoinWithdrawTaproot(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_context_upgrade.go b/e2e/e2etests/test_context_upgrade.go index 82e81f2147..fdcc961670 100644 --- a/e2e/e2etests/test_context_upgrade.go +++ b/e2e/e2etests/test_context_upgrade.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) // TestContextUpgrade tests sending ETH on ZetaChain and check context data diff --git a/e2e/e2etests/test_crosschain_swap.go b/e2e/e2etests/test_crosschain_swap.go index f41d3d8372..813f2d76ed 100644 --- a/e2e/e2etests/test_crosschain_swap.go +++ b/e2e/e2etests/test_crosschain_swap.go @@ -9,9 +9,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestCrosschainSwap(r *runner.E2ERunner, _ []string) { diff --git a/e2e/e2etests/test_deploy_contract.go b/e2e/e2etests/test_deploy_contract.go index 6133942f60..bddef5b95d 100644 --- a/e2e/e2etests/test_deploy_contract.go +++ b/e2e/e2etests/test_deploy_contract.go @@ -6,9 +6,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) // deployFunc is a function that deploys a contract diff --git a/e2e/e2etests/test_donation.go b/e2e/e2etests/test_donation.go index d628cce62e..5623b42f5a 100644 --- a/e2e/e2etests/test_donation.go +++ b/e2e/e2etests/test_donation.go @@ -3,9 +3,9 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/constant" ) // TestDonationEther tests donation of ether to the tss address diff --git a/e2e/e2etests/test_erc20_deposit.go b/e2e/e2etests/test_erc20_deposit.go index 66d640f0c4..25c1d1106e 100644 --- a/e2e/e2etests/test_erc20_deposit.go +++ b/e2e/e2etests/test_erc20_deposit.go @@ -3,8 +3,8 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) func TestERC20Deposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_erc20_deposit_refund.go b/e2e/e2etests/test_erc20_deposit_refund.go index a47100ef3f..816cf702a8 100644 --- a/e2e/e2etests/test_erc20_deposit_refund.go +++ b/e2e/e2etests/test_erc20_deposit_refund.go @@ -10,9 +10,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestERC20DepositAndCallRefund(r *runner.E2ERunner, _ []string) { diff --git a/e2e/e2etests/test_erc20_deposit_restricted_address.go b/e2e/e2etests/test_erc20_deposit_restricted_address.go index ea5dd81252..fc28df4f2a 100644 --- a/e2e/e2etests/test_erc20_deposit_restricted_address.go +++ b/e2e/e2etests/test_erc20_deposit_restricted_address.go @@ -4,8 +4,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/zetaclient/testutils" ) func TestERC20DepositRestricted(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_erc20_multiple_deposits.go b/e2e/e2etests/test_erc20_multiple_deposits.go index 8948bc3fe7..a02710a58c 100644 --- a/e2e/e2etests/test_erc20_multiple_deposits.go +++ b/e2e/e2etests/test_erc20_multiple_deposits.go @@ -7,9 +7,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + testcontract "github.com/zeta-chain/node/testutil/contracts" ) func TestMultipleERC20Deposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_erc20_multiple_withdraws.go b/e2e/e2etests/test_erc20_multiple_withdraws.go index 80bdcac46e..8943a2e469 100644 --- a/e2e/e2etests/test_erc20_multiple_withdraws.go +++ b/e2e/e2etests/test_erc20_multiple_withdraws.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + testcontract "github.com/zeta-chain/node/testutil/contracts" ) func TestMultipleERC20Withdraws(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_erc20_withdraw.go b/e2e/e2etests/test_erc20_withdraw.go index 26f963297f..ebadbfb7f9 100644 --- a/e2e/e2etests/test_erc20_withdraw.go +++ b/e2e/e2etests/test_erc20_withdraw.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) func TestERC20Withdraw(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_eth_deposit.go b/e2e/e2etests/test_eth_deposit.go index 419dbe2298..1f1b27c20c 100644 --- a/e2e/e2etests/test_eth_deposit.go +++ b/e2e/e2etests/test_eth_deposit.go @@ -3,8 +3,8 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) // TestEtherDeposit tests deposit of ethers diff --git a/e2e/e2etests/test_eth_deposit_call.go b/e2e/e2etests/test_eth_deposit_call.go index 9d024e146a..570e7b05eb 100644 --- a/e2e/e2etests/test_eth_deposit_call.go +++ b/e2e/e2etests/test_eth_deposit_call.go @@ -4,10 +4,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + testcontract "github.com/zeta-chain/node/testutil/contracts" + "github.com/zeta-chain/node/x/crosschain/types" ) // TestEtherDepositAndCall tests deposit of ethers calling a example contract diff --git a/e2e/e2etests/test_eth_deposit_liquidity_cap.go b/e2e/e2etests/test_eth_deposit_liquidity_cap.go index 7e1ea55a70..636ada56b9 100644 --- a/e2e/e2etests/test_eth_deposit_liquidity_cap.go +++ b/e2e/e2etests/test_eth_deposit_liquidity_cap.go @@ -7,10 +7,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // TestDepositEtherLiquidityCap tests depositing Ethers in a context where a liquidity cap is set diff --git a/e2e/e2etests/test_eth_deposit_refund.go b/e2e/e2etests/test_eth_deposit_refund.go index 343452cdf1..2f7ce7a7a2 100644 --- a/e2e/e2etests/test_eth_deposit_refund.go +++ b/e2e/e2etests/test_eth_deposit_refund.go @@ -7,9 +7,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestEtherDepositAndCallRefund(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_eth_withdraw.go b/e2e/e2etests/test_eth_withdraw.go index 2d43bd095d..0a9140578b 100644 --- a/e2e/e2etests/test_eth_withdraw.go +++ b/e2e/e2etests/test_eth_withdraw.go @@ -7,9 +7,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestEtherWithdraw tests the withdrawal of ether diff --git a/e2e/e2etests/test_eth_withdraw_restricted_address.go b/e2e/e2etests/test_eth_withdraw_restricted_address.go index 89a0ebdee4..89663b7a56 100644 --- a/e2e/e2etests/test_eth_withdraw_restricted_address.go +++ b/e2e/e2etests/test_eth_withdraw_restricted_address.go @@ -6,10 +6,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/testutils" ) // TestEtherWithdrawRestricted tests the withdrawal to a restricted receiver address diff --git a/e2e/e2etests/test_message_passing_evm_to_zevm.go b/e2e/e2etests/test_message_passing_evm_to_zevm.go index 09dac29a73..42e9677280 100644 --- a/e2e/e2etests/test_message_passing_evm_to_zevm.go +++ b/e2e/e2etests/test_message_passing_evm_to_zevm.go @@ -7,10 +7,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessagePassingEVMtoZEVM(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go b/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go index 8d5a1e9469..fa95c8fe1f 100644 --- a/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go +++ b/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go @@ -7,10 +7,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) // fungibleModuleAddress is a constant representing the EVM address of the Fungible module account diff --git a/e2e/e2etests/test_message_passing_evm_to_zevm_revert_fail.go b/e2e/e2etests/test_message_passing_evm_to_zevm_revert_fail.go index 271c33e9c8..4c6b8b966a 100644 --- a/e2e/e2etests/test_message_passing_evm_to_zevm_revert_fail.go +++ b/e2e/e2etests/test_message_passing_evm_to_zevm_revert_fail.go @@ -4,10 +4,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdappnorevert" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdappnorevert" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessagePassingEVMtoZEVMRevertFail(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_message_passing_external_chains.go b/e2e/e2etests/test_message_passing_external_chains.go index 96cdc2fe99..fa9b4bbf0a 100644 --- a/e2e/e2etests/test_message_passing_external_chains.go +++ b/e2e/e2etests/test_message_passing_external_chains.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestMessagePassingExternalChains tests message passing between external EVM chains diff --git a/e2e/e2etests/test_message_passing_external_chains_revert.go b/e2e/e2etests/test_message_passing_external_chains_revert.go index 0f2f5c1c7b..c07b0bb491 100644 --- a/e2e/e2etests/test_message_passing_external_chains_revert.go +++ b/e2e/e2etests/test_message_passing_external_chains_revert.go @@ -5,10 +5,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestMessagePassingRevertSuccessExternalChains tests message passing with successful revert between external EVM chains diff --git a/e2e/e2etests/test_message_passing_external_chains_revert_fail.go b/e2e/e2etests/test_message_passing_external_chains_revert_fail.go index 47957e5678..478c78eb23 100644 --- a/e2e/e2etests/test_message_passing_external_chains_revert_fail.go +++ b/e2e/e2etests/test_message_passing_external_chains_revert_fail.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestMessagePassingRevertFailExternalChains tests message passing with failing revert between external EVM chains diff --git a/e2e/e2etests/test_message_passing_zevm_to_evm.go b/e2e/e2etests/test_message_passing_zevm_to_evm.go index 4e791b57c7..b49e9fd267 100644 --- a/e2e/e2etests/test_message_passing_zevm_to_evm.go +++ b/e2e/e2etests/test_message_passing_zevm_to_evm.go @@ -7,10 +7,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessagePassingZEVMtoEVM(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go b/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go index e837c1c05c..3553bcc076 100644 --- a/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go +++ b/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go @@ -7,10 +7,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessagePassingZEVMtoEVMRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_message_passing_zevm_to_evm_revert_fail.go b/e2e/e2etests/test_message_passing_zevm_to_evm_revert_fail.go index 506bb562cd..cfa2b7083e 100644 --- a/e2e/e2etests/test_message_passing_zevm_to_evm_revert_fail.go +++ b/e2e/e2etests/test_message_passing_zevm_to_evm_revert_fail.go @@ -6,10 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testdappnorevert" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/testdappnorevert" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessagePassingZEVMtoEVMRevertFail(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_migrate_chain_support.go b/e2e/e2etests/test_migrate_chain_support.go index b5222a81d7..9916c076c2 100644 --- a/e2e/e2etests/test_migrate_chain_support.go +++ b/e2e/e2etests/test_migrate_chain_support.go @@ -14,15 +14,15 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // EVM2RPCURL is the RPC URL for the additional EVM localnet diff --git a/e2e/e2etests/test_migrate_erc20_custody_funds.go b/e2e/e2etests/test_migrate_erc20_custody_funds.go index f26cd9e503..4ddb0da4e7 100644 --- a/e2e/e2etests/test_migrate_erc20_custody_funds.go +++ b/e2e/e2etests/test_migrate_erc20_custody_funds.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestMigrateERC20CustodyFunds tests the migration of ERC20 custody funds diff --git a/e2e/e2etests/test_migrate_tss.go b/e2e/e2etests/test_migrate_tss.go index cc7286360b..733b28cb34 100644 --- a/e2e/e2etests/test_migrate_tss.go +++ b/e2e/e2etests/test_migrate_tss.go @@ -11,12 +11,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestMigrateTSS(r *runner.E2ERunner, _ []string) { diff --git a/e2e/e2etests/test_mytest.go b/e2e/e2etests/test_mytest.go index 0349e1abb7..b12592c478 100644 --- a/e2e/e2etests/test_mytest.go +++ b/e2e/e2etests/test_mytest.go @@ -1,7 +1,7 @@ package e2etests import ( - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestMyTest(_ *runner.E2ERunner, _ []string) { diff --git a/e2e/e2etests/test_operation_add_liquidity_erc20.go b/e2e/e2etests/test_operation_add_liquidity_erc20.go index b52d22391e..5ef9a95377 100644 --- a/e2e/e2etests/test_operation_add_liquidity_erc20.go +++ b/e2e/e2etests/test_operation_add_liquidity_erc20.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) // TestOperationAddLiquidityERC20 is an operational test to add liquidity in erc20 token diff --git a/e2e/e2etests/test_operation_add_liquidity_eth.go b/e2e/e2etests/test_operation_add_liquidity_eth.go index dae3ae4c65..083cd3cb30 100644 --- a/e2e/e2etests/test_operation_add_liquidity_eth.go +++ b/e2e/e2etests/test_operation_add_liquidity_eth.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) // TestOperationAddLiquidityETH is an operational test to add liquidity in gas token diff --git a/e2e/e2etests/test_pause_erc20_custody.go b/e2e/e2etests/test_pause_erc20_custody.go index d39fbab512..a1b0319c76 100644 --- a/e2e/e2etests/test_pause_erc20_custody.go +++ b/e2e/e2etests/test_pause_erc20_custody.go @@ -4,10 +4,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestPauseERC20Custody tests the pausing and unpausing of ERC20 custody contracts on the EVM chain diff --git a/e2e/e2etests/test_pause_zrc20.go b/e2e/e2etests/test_pause_zrc20.go index c1924d85cf..991ccbcaf8 100644 --- a/e2e/e2etests/test_pause_zrc20.go +++ b/e2e/e2etests/test_pause_zrc20.go @@ -5,12 +5,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/vault" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/contracts/vault" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) func TestPauseZRC20(r *runner.E2ERunner, _ []string) { diff --git a/e2e/e2etests/test_precompiles_prototype.go b/e2e/e2etests/test_precompiles_prototype.go index a78a20385f..642539bc9d 100644 --- a/e2e/e2etests/test_precompiles_prototype.go +++ b/e2e/e2etests/test_precompiles_prototype.go @@ -4,8 +4,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/precompiles/prototype" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/precompiles/prototype" ) func TestPrecompilesRegular(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_rate_limiter.go b/e2e/e2etests/test_rate_limiter.go index d1eb666986..c2e10551aa 100644 --- a/e2e/e2etests/test_rate_limiter.go +++ b/e2e/e2etests/test_rate_limiter.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // WithdrawType is the type of withdraw to perform in the test diff --git a/e2e/e2etests/test_solana_deposit.go b/e2e/e2etests/test_solana_deposit.go index b1c7622c8c..d46a56c015 100644 --- a/e2e/e2etests/test_solana_deposit.go +++ b/e2e/e2etests/test_solana_deposit.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestSolanaDeposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_solana_deposit_call.go b/e2e/e2etests/test_solana_deposit_call.go index edb0239af9..2692936a9e 100644 --- a/e2e/e2etests/test_solana_deposit_call.go +++ b/e2e/e2etests/test_solana_deposit_call.go @@ -3,10 +3,10 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + testcontract "github.com/zeta-chain/node/testutil/contracts" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestSolanaDepositAndCall tests deposit of lamports calling a example contract diff --git a/e2e/e2etests/test_solana_deposit_refund.go b/e2e/e2etests/test_solana_deposit_refund.go index 07fe6c64e2..e9155c9ddd 100644 --- a/e2e/e2etests/test_solana_deposit_refund.go +++ b/e2e/e2etests/test_solana_deposit_refund.go @@ -3,10 +3,10 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + testcontract "github.com/zeta-chain/node/testutil/contracts" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestSolanaDepositAndCallRefund tests deposit of lamports calling a example contract diff --git a/e2e/e2etests/test_solana_withdraw.go b/e2e/e2etests/test_solana_withdraw.go index 6ef0354a06..9ff5114c34 100644 --- a/e2e/e2etests/test_solana_withdraw.go +++ b/e2e/e2etests/test_solana_withdraw.go @@ -7,7 +7,7 @@ import ( "github.com/gagliardetto/solana-go" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" + "github.com/zeta-chain/node/e2e/runner" ) func TestSolanaWithdraw(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_stress_btc_deposit.go b/e2e/e2etests/test_stress_btc_deposit.go index b6c3e7c6a8..25b89088ac 100644 --- a/e2e/e2etests/test_stress_btc_deposit.go +++ b/e2e/e2etests/test_stress_btc_deposit.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestStressBTCDeposit tests the stressing deposit of BTC diff --git a/e2e/e2etests/test_stress_btc_withdraw.go b/e2e/e2etests/test_stress_btc_withdraw.go index 08c5844448..6e212c97e3 100644 --- a/e2e/e2etests/test_stress_btc_withdraw.go +++ b/e2e/e2etests/test_stress_btc_withdraw.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestStressBTCWithdraw tests the stressing withdraw of btc diff --git a/e2e/e2etests/test_stress_eth_deposit.go b/e2e/e2etests/test_stress_eth_deposit.go index dc5c51c7e4..19676c9cba 100644 --- a/e2e/e2etests/test_stress_eth_deposit.go +++ b/e2e/e2etests/test_stress_eth_deposit.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestStressEtherDeposit tests the stressing deposit of ether diff --git a/e2e/e2etests/test_stress_eth_withdraw.go b/e2e/e2etests/test_stress_eth_withdraw.go index 39ff484054..98fa8e8783 100644 --- a/e2e/e2etests/test_stress_eth_withdraw.go +++ b/e2e/e2etests/test_stress_eth_withdraw.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestStressEtherWithdraw tests the stressing withdraw of ether diff --git a/e2e/e2etests/test_update_bytecode_connector.go b/e2e/e2etests/test_update_bytecode_connector.go index c370cf6a33..4cbe0f66aa 100644 --- a/e2e/e2etests/test_update_bytecode_connector.go +++ b/e2e/e2etests/test_update_bytecode_connector.go @@ -6,11 +6,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testconnectorzevm" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/contracts/testconnectorzevm" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // TestUpdateBytecodeConnector tests updating the bytecode of a connector and interact with it diff --git a/e2e/e2etests/test_update_bytecode_zrc20.go b/e2e/e2etests/test_update_bytecode_zrc20.go index 33f6c39dd6..a88d165470 100644 --- a/e2e/e2etests/test_update_bytecode_zrc20.go +++ b/e2e/e2etests/test_update_bytecode_zrc20.go @@ -6,12 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/contracts/testzrc20" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/contracts/testzrc20" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // TestUpdateBytecodeZRC20 tests updating the bytecode of a zrc20 and interact with it diff --git a/e2e/e2etests/test_v2_erc20_deposit.go b/e2e/e2etests/test_v2_erc20_deposit.go index 2dd83c6b3a..7b50141aaf 100644 --- a/e2e/e2etests/test_v2_erc20_deposit.go +++ b/e2e/e2etests/test_v2_erc20_deposit.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ERC20Deposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_erc20_deposit_and_call.go b/e2e/e2etests/test_v2_erc20_deposit_and_call.go index b6529840ec..6328998e81 100644 --- a/e2e/e2etests/test_v2_erc20_deposit_and_call.go +++ b/e2e/e2etests/test_v2_erc20_deposit_and_call.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageDepositERC20 = "this is a test ERC20 deposit and call payload" diff --git a/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go b/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go index 3f15808303..ba2d031710 100644 --- a/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go +++ b/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ERC20DepositAndCallRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_erc20_deposit_and_call_revert_with_call.go b/e2e/e2etests/test_v2_erc20_deposit_and_call_revert_with_call.go index 790434f58c..40a880ac6e 100644 --- a/e2e/e2etests/test_v2_erc20_deposit_and_call_revert_with_call.go +++ b/e2e/e2etests/test_v2_erc20_deposit_and_call_revert_with_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageDepositOnRevertERC20 = "this is a test ERC20 deposit and call on revert" diff --git a/e2e/e2etests/test_v2_erc20_withdraw.go b/e2e/e2etests/test_v2_erc20_withdraw.go index 28b0c1ed80..932d322439 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw.go +++ b/e2e/e2etests/test_v2_erc20_withdraw.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ERC20Withdraw(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_erc20_withdraw_and_call.go b/e2e/e2etests/test_v2_erc20_withdraw_and_call.go index 609d74a8b9..6773e84f17 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw_and_call.go +++ b/e2e/e2etests/test_v2_erc20_withdraw_and_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageWithdrawERC20 = "this is a test ERC20 withdraw and call payload" diff --git a/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go b/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go index d5fe206aab..8454d09710 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go +++ b/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ERC20WithdrawAndCallRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert_with_call.go b/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert_with_call.go index 3d34bea2f7..9ce4b48613 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert_with_call.go +++ b/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert_with_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageWithdrawOnRevertERC20 = "this is a test ERC20 withdraw and call on revert" diff --git a/e2e/e2etests/test_v2_eth_deposit.go b/e2e/e2etests/test_v2_eth_deposit.go index d99db8dcc3..c1bd53bfd1 100644 --- a/e2e/e2etests/test_v2_eth_deposit.go +++ b/e2e/e2etests/test_v2_eth_deposit.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ETHDeposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_eth_deposit_and_call.go b/e2e/e2etests/test_v2_eth_deposit_and_call.go index 657d3068f7..a7b2a3a8be 100644 --- a/e2e/e2etests/test_v2_eth_deposit_and_call.go +++ b/e2e/e2etests/test_v2_eth_deposit_and_call.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageDepositETH = "this is a test ETH deposit and call payload" diff --git a/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go b/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go index f8093f629a..4a57460ea6 100644 --- a/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go +++ b/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ETHDepositAndCallRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_eth_deposit_and_call_revert_with_call.go b/e2e/e2etests/test_v2_eth_deposit_and_call_revert_with_call.go index ad23989e38..47c3f20755 100644 --- a/e2e/e2etests/test_v2_eth_deposit_and_call_revert_with_call.go +++ b/e2e/e2etests/test_v2_eth_deposit_and_call_revert_with_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageDepositOnRevertETH = "this is a test ETH deposit and call on revert" diff --git a/e2e/e2etests/test_v2_eth_withdraw.go b/e2e/e2etests/test_v2_eth_withdraw.go index 5445040b08..04d9b0dc77 100644 --- a/e2e/e2etests/test_v2_eth_withdraw.go +++ b/e2e/e2etests/test_v2_eth_withdraw.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ETHWithdraw(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_eth_withdraw_and_call.go b/e2e/e2etests/test_v2_eth_withdraw_and_call.go index 5a54092288..40194c93ba 100644 --- a/e2e/e2etests/test_v2_eth_withdraw_and_call.go +++ b/e2e/e2etests/test_v2_eth_withdraw_and_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageWithdrawETH = "this is a test ETH withdraw and call payload" diff --git a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go index 7f4ce48224..6df64c9a69 100644 --- a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go +++ b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestV2ETHWithdrawAndCallRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert_with_call.go b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert_with_call.go index 638e50a39c..391e37e150 100644 --- a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert_with_call.go +++ b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert_with_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageWithdrawOnRevertETH = "this is a test ETH withdraw and call on revert" diff --git a/e2e/e2etests/test_v2_evm_to_zevm_call.go b/e2e/e2etests/test_v2_evm_to_zevm_call.go index 44fce408d1..9fb5502e7a 100644 --- a/e2e/e2etests/test_v2_evm_to_zevm_call.go +++ b/e2e/e2etests/test_v2_evm_to_zevm_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageZEVMCall = "this is a test ZEVM call payload" diff --git a/e2e/e2etests/test_v2_zevm_to_evm_call.go b/e2e/e2etests/test_v2_zevm_to_evm_call.go index 9132e72837..c38d328db8 100644 --- a/e2e/e2etests/test_v2_zevm_to_evm_call.go +++ b/e2e/e2etests/test_v2_zevm_to_evm_call.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const payloadMessageEVMCall = "this is a test EVM call payload" diff --git a/e2e/e2etests/test_whitelist_erc20.go b/e2e/e2etests/test_whitelist_erc20.go index 0fa043fe03..ca762ee9c5 100644 --- a/e2e/e2etests/test_whitelist_erc20.go +++ b/e2e/e2etests/test_whitelist_erc20.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/contracts/erc20" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/contracts/erc20" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestWhitelistERC20 tests the whitelist ERC20 functionality diff --git a/e2e/e2etests/test_zeta_deposit.go b/e2e/e2etests/test_zeta_deposit.go index 00b672ee61..dad8968276 100644 --- a/e2e/e2etests/test_zeta_deposit.go +++ b/e2e/e2etests/test_zeta_deposit.go @@ -3,8 +3,8 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) func TestZetaDeposit(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_zeta_deposit_new_address.go b/e2e/e2etests/test_zeta_deposit_new_address.go index 79a1360db9..7306adbd1a 100644 --- a/e2e/e2etests/test_zeta_deposit_new_address.go +++ b/e2e/e2etests/test_zeta_deposit_new_address.go @@ -3,9 +3,9 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/testutil/sample" ) func TestZetaDepositNewAddress(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_zeta_deposit_restricted_address.go b/e2e/e2etests/test_zeta_deposit_restricted_address.go index d760ccafbd..84a0cb1577 100644 --- a/e2e/e2etests/test_zeta_deposit_restricted_address.go +++ b/e2e/e2etests/test_zeta_deposit_restricted_address.go @@ -4,8 +4,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/zetaclient/testutils" ) func TestZetaDepositRestricted(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_zeta_withdraw.go b/e2e/e2etests/test_zeta_withdraw.go index 7695c28bab..f4cddc3187 100644 --- a/e2e/e2etests/test_zeta_withdraw.go +++ b/e2e/e2etests/test_zeta_withdraw.go @@ -3,9 +3,9 @@ package e2etests import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestZetaWithdraw(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go b/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go index ac8e1f2448..73e159dfa7 100644 --- a/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go +++ b/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" connectorzevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" ) func TestZetaWithdrawBTCRevert(r *runner.E2ERunner, args []string) { diff --git a/e2e/e2etests/test_zrc20_swap.go b/e2e/e2etests/test_zrc20_swap.go index 3008904306..72819aabf8 100644 --- a/e2e/e2etests/test_zrc20_swap.go +++ b/e2e/e2etests/test_zrc20_swap.go @@ -8,8 +8,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/runner" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" ) func TestZRC20Swap(r *runner.E2ERunner, _ []string) { diff --git a/e2e/runner/accounting.go b/e2e/runner/accounting.go index c56e9a76b7..92e120b7fd 100644 --- a/e2e/runner/accounting.go +++ b/e2e/runner/accounting.go @@ -12,8 +12,8 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/stretchr/testify/require" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/e2e/runner/admin_evm.go b/e2e/runner/admin_evm.go index 8b357a01f5..a373f2325a 100644 --- a/e2e/runner/admin_evm.go +++ b/e2e/runner/admin_evm.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/utils" ) func (r *E2ERunner) UpdateTssAddressForConnector() { diff --git a/e2e/runner/bitcoin.go b/e2e/runner/bitcoin.go index 3a4dad583e..f861e8ce8f 100644 --- a/e2e/runner/bitcoin.go +++ b/e2e/runner/bitcoin.go @@ -15,13 +15,13 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - zetabitcoin "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - btcobserver "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/signer" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + zetabitcoin "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/signer" ) // ListDeployerUTXOs list the deployer's UTXOs diff --git a/e2e/runner/clients.go b/e2e/runner/clients.go index 9573a53e29..e0a4ab1c97 100644 --- a/e2e/runner/clients.go +++ b/e2e/runner/clients.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/gagliardetto/solana-go/rpc" - zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc" + zetacore_rpc "github.com/zeta-chain/node/pkg/rpc" ) // Clients contains all the RPC clients and gRPC clients for E2E tests diff --git a/e2e/runner/evm.go b/e2e/runner/evm.go index 9bb1bb9082..1fc18f1a5c 100644 --- a/e2e/runner/evm.go +++ b/e2e/runner/evm.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/utils" ) // WaitForTxReceiptOnEvm waits for a tx receipt on EVM diff --git a/e2e/runner/liquidity.go b/e2e/runner/liquidity.go index 05f83e6c44..4679afbd1a 100644 --- a/e2e/runner/liquidity.go +++ b/e2e/runner/liquidity.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/utils" ) // AddLiquidityETH adds liquidity token to the uniswap pool ZETA/ETH diff --git a/e2e/runner/logger.go b/e2e/runner/logger.go index 0b970ab6f3..d52a625249 100644 --- a/e2e/runner/logger.go +++ b/e2e/runner/logger.go @@ -10,7 +10,7 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) const ( diff --git a/e2e/runner/report.go b/e2e/runner/report.go index d80024e0dd..c860f014b1 100644 --- a/e2e/runner/report.go +++ b/e2e/runner/report.go @@ -9,9 +9,9 @@ import ( sdkmath "cosmossdk.io/math" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/e2e/txserver" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/e2e/txserver" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // TestReport is a struct that contains the report for a specific e2e test diff --git a/e2e/runner/runner.go b/e2e/runner/runner.go index 90bffd1ed1..38106a76b4 100644 --- a/e2e/runner/runner.go +++ b/e2e/runner/runner.go @@ -30,18 +30,18 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/contracts/contextapp" - "github.com/zeta-chain/zetacore/e2e/contracts/erc20" - "github.com/zeta-chain/zetacore/e2e/contracts/zevmswap" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/contracts/contextapp" + "github.com/zeta-chain/node/e2e/contracts/erc20" + "github.com/zeta-chain/node/e2e/contracts/zevmswap" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) type E2ERunnerOption func(*E2ERunner) diff --git a/e2e/runner/setup_evm.go b/e2e/runner/setup_evm.go index ab8d3edd16..733109fbf6 100644 --- a/e2e/runner/setup_evm.go +++ b/e2e/runner/setup_evm.go @@ -11,13 +11,13 @@ import ( zetaeth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zeta.eth.sol" zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol" - "github.com/zeta-chain/zetacore/e2e/config" - "github.com/zeta-chain/zetacore/e2e/contracts/erc20" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/config" + "github.com/zeta-chain/node/e2e/contracts/erc20" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/e2e/runner/setup_solana.go b/e2e/runner/setup_solana.go index 10aa4b1a15..8f209dd23e 100644 --- a/e2e/runner/setup_solana.go +++ b/e2e/runner/setup_solana.go @@ -7,8 +7,8 @@ import ( "github.com/near/borsh-go" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - solanacontracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" + "github.com/zeta-chain/node/pkg/chains" + solanacontracts "github.com/zeta-chain/node/pkg/contracts/solana" ) // SetupSolanaAccount imports the deployer's private key diff --git a/e2e/runner/setup_zeta.go b/e2e/runner/setup_zeta.go index 4f72f72108..8920de1b57 100644 --- a/e2e/runner/setup_zeta.go +++ b/e2e/runner/setup_zeta.go @@ -15,14 +15,14 @@ import ( uniswapv2router "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/contracts/contextapp" - "github.com/zeta-chain/zetacore/e2e/contracts/testdapp" - "github.com/zeta-chain/zetacore/e2e/contracts/zevmswap" - "github.com/zeta-chain/zetacore/e2e/txserver" - e2eutils "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/contracts/contextapp" + "github.com/zeta-chain/node/e2e/contracts/testdapp" + "github.com/zeta-chain/node/e2e/contracts/zevmswap" + "github.com/zeta-chain/node/e2e/txserver" + e2eutils "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // EmissionsPoolFunding represents the amount of ZETA to fund the emissions pool with diff --git a/e2e/runner/solana.go b/e2e/runner/solana.go index 24685d3b61..d9fe24de49 100644 --- a/e2e/runner/solana.go +++ b/e2e/runner/solana.go @@ -10,9 +10,9 @@ import ( "github.com/near/borsh-go" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/e2e/utils" - solanacontract "github.com/zeta-chain/zetacore/pkg/contracts/solana" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/utils" + solanacontract "github.com/zeta-chain/node/pkg/contracts/solana" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // ComputePdaAddress computes the PDA address for the gateway program diff --git a/e2e/runner/testdapp.go b/e2e/runner/testdapp.go index 5515067aae..f9c63d7c67 100644 --- a/e2e/runner/testdapp.go +++ b/e2e/runner/testdapp.go @@ -7,7 +7,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" ) // AssertTestDAppZEVMCalled is a function that asserts the values of the test dapp on the ZEVM diff --git a/e2e/runner/trackers.go b/e2e/runner/trackers.go index 2ff27180ed..f798fc7ead 100644 --- a/e2e/runner/trackers.go +++ b/e2e/runner/trackers.go @@ -3,7 +3,7 @@ package runner import ( "github.com/stretchr/testify/require" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // EnsureNoTrackers ensures that there are no trackers left on zetacore diff --git a/e2e/runner/v2_evm.go b/e2e/runner/v2_evm.go index 09a8ed7c46..105387d2ab 100644 --- a/e2e/runner/v2_evm.go +++ b/e2e/runner/v2_evm.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/utils" + "github.com/zeta-chain/node/e2e/utils" ) // V2ETHDeposit calls Deposit of Gateway with gas token on EVM diff --git a/e2e/runner/v2_migration.go b/e2e/runner/v2_migration.go index abfb114409..de4c899537 100644 --- a/e2e/runner/v2_migration.go +++ b/e2e/runner/v2_migration.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/txserver" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/txserver" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // RunV2Migration runs the process for the v2 migration diff --git a/e2e/runner/v2_setup_evm.go b/e2e/runner/v2_setup_evm.go index cbacc59550..37f6423f29 100644 --- a/e2e/runner/v2_setup_evm.go +++ b/e2e/runner/v2_setup_evm.go @@ -9,10 +9,10 @@ import ( erc20custodyv2 "github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/pkg/contracts/erc1967proxy" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/pkg/contracts/erc1967proxy" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" ) // SetupEVMV2 setup contracts on EVM with v2 contracts diff --git a/e2e/runner/v2_setup_zeta.go b/e2e/runner/v2_setup_zeta.go index bac11aaae2..6d0607a7f9 100644 --- a/e2e/runner/v2_setup_zeta.go +++ b/e2e/runner/v2_setup_zeta.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/contracts/erc1967proxy" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/contracts/erc1967proxy" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // SetZEVMContractsV2 set contracts for the ZEVM diff --git a/e2e/runner/zeta.go b/e2e/runner/zeta.go index fec82f459a..cec59219cd 100644 --- a/e2e/runner/zeta.go +++ b/e2e/runner/zeta.go @@ -12,9 +12,9 @@ import ( zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol" connectorzevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/retry" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/retry" + "github.com/zeta-chain/node/x/crosschain/types" ) func (r *E2ERunner) WaitForBlocks(n int64) { diff --git a/e2e/txserver/authority.go b/e2e/txserver/authority.go index a6c4dfb9dd..b2e5fcf3dc 100644 --- a/e2e/txserver/authority.go +++ b/e2e/txserver/authority.go @@ -3,8 +3,8 @@ package txserver import ( "fmt" - e2eutils "github.com/zeta-chain/zetacore/e2e/utils" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + e2eutils "github.com/zeta-chain/node/e2e/utils" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) // AddAuthorization adds a new authorization in the authority module for admin message diff --git a/e2e/txserver/zeta_tx_server.go b/e2e/txserver/zeta_tx_server.go index a6aea77fed..41270e2bb4 100644 --- a/e2e/txserver/zeta_tx_server.go +++ b/e2e/txserver/zeta_tx_server.go @@ -37,16 +37,16 @@ import ( etherminttypes "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // SystemContractAddresses contains the addresses of the system contracts deployed diff --git a/e2e/utils/contracts.go b/e2e/utils/contracts.go index 605e458a22..7593253725 100644 --- a/e2e/utils/contracts.go +++ b/e2e/utils/contracts.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - testcontract "github.com/zeta-chain/zetacore/testutil/contracts" + testcontract "github.com/zeta-chain/node/testutil/contracts" ) const ( diff --git a/e2e/utils/require.go b/e2e/utils/require.go index 7471bf9b4e..b139a2cad5 100644 --- a/e2e/utils/require.go +++ b/e2e/utils/require.go @@ -6,7 +6,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // RequireCCTXStatus checks if the cctx status is equal to the expected status diff --git a/e2e/utils/zetacore.go b/e2e/utils/zetacore.go index b69d9fbc32..ca4594e79b 100644 --- a/e2e/utils/zetacore.go +++ b/e2e/utils/zetacore.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) type CCTXClient = crosschaintypes.QueryClient diff --git a/go.mod b/go.mod index 7297dc703b..922c2cf4b1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/zeta-chain/zetacore +module github.com/zeta-chain/node go 1.22.2 diff --git a/go.sum b/go.sum index fa99e25703..89792efb1f 100644 --- a/go.sum +++ b/go.sum @@ -1744,6 +1744,7 @@ golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1792,6 +1793,7 @@ golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1864,6 +1866,7 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1908,6 +1911,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2032,12 +2036,16 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2051,6 +2059,7 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2129,6 +2138,8 @@ golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlz golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/chains/chain_filters_test.go b/pkg/chains/chain_filters_test.go index 619d555882..6254600452 100644 --- a/pkg/chains/chain_filters_test.go +++ b/pkg/chains/chain_filters_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func TestFilterChains(t *testing.T) { diff --git a/pkg/chains/chain_test.go b/pkg/chains/chain_test.go index d097d3946c..9b53d6a200 100644 --- a/pkg/chains/chain_test.go +++ b/pkg/chains/chain_test.go @@ -3,12 +3,12 @@ package chains_test import ( "testing" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/testutil/sample" "github.com/btcsuite/btcd/chaincfg" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func TestChain_Validate(t *testing.T) { diff --git a/pkg/chains/chains.pb.go b/pkg/chains/chains.pb.go index f9bdca45bb..217ad55328 100644 --- a/pkg/chains/chains.pb.go +++ b/pkg/chains/chains.pb.go @@ -455,55 +455,56 @@ func init() { } var fileDescriptor_236b85e7bff6130d = []byte{ - // 765 bytes of a gzipped FileDescriptorProto + // 770 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x8e, 0xe4, 0x34, - 0x10, 0xee, 0x24, 0xfd, 0x5b, 0x99, 0x1f, 0xaf, 0x77, 0x80, 0xb0, 0x12, 0xcd, 0xc0, 0x01, 0x9a, - 0x11, 0xf4, 0x08, 0x38, 0x72, 0x41, 0x3b, 0x62, 0x11, 0x42, 0xec, 0x21, 0xac, 0x56, 0x88, 0x4b, - 0x70, 0xdc, 0x45, 0xda, 0x9a, 0x38, 0x8e, 0x62, 0x77, 0x76, 0x9b, 0xa7, 0xe0, 0x21, 0x38, 0x20, - 0xf1, 0x22, 0x1c, 0xf7, 0xc8, 0x11, 0xcd, 0x3c, 0x08, 0xc8, 0x8e, 0x93, 0x5e, 0x0e, 0xec, 0xce, - 0xa9, 0xed, 0xaf, 0xbf, 0xaf, 0xea, 0xab, 0x2a, 0x57, 0xe0, 0xe2, 0x17, 0x34, 0x8c, 0x6f, 0x99, - 0xa8, 0x2e, 0xdd, 0x49, 0x35, 0x78, 0x59, 0x5f, 0x17, 0x97, 0x0e, 0xd2, 0xfe, 0x67, 0x5d, 0x37, - 0xca, 0x28, 0xfa, 0xce, 0xc0, 0x5d, 0xf7, 0xdc, 0x75, 0x7d, 0x5d, 0xac, 0x3b, 0xd2, 0x83, 0xb3, - 0x42, 0x15, 0xca, 0x31, 0x2f, 0xed, 0xa9, 0x13, 0xbd, 0xff, 0x4f, 0x04, 0x93, 0x2b, 0x4b, 0xa0, - 0x6f, 0xc3, 0xdc, 0x31, 0x33, 0xb1, 0x49, 0xc2, 0xf3, 0x60, 0x15, 0xa5, 0x33, 0x77, 0xff, 0x66, - 0x43, 0xbf, 0x05, 0xe8, 0xfe, 0xaa, 0x98, 0xc4, 0x24, 0x38, 0x0f, 0x56, 0x27, 0x9f, 0xad, 0xd6, - 0xaf, 0x4c, 0xb7, 0x76, 0x41, 0x1f, 0x33, 0x89, 0x0f, 0xc3, 0x24, 0x48, 0x17, 0xbc, 0xbf, 0xd2, - 0x2f, 0x61, 0x56, 0xa1, 0x79, 0xa6, 0x9a, 0xeb, 0x24, 0x72, 0x91, 0x3e, 0x78, 0x4d, 0xa4, 0xc7, - 0x1d, 0x3b, 0xed, 0x65, 0xf4, 0x3b, 0x38, 0xf2, 0xc7, 0xcc, 0xec, 0x6b, 0x4c, 0xc6, 0x2e, 0xcc, - 0xc5, 0xdd, 0xc2, 0x3c, 0xd9, 0xd7, 0x98, 0xc6, 0xd5, 0xe1, 0x42, 0x3f, 0x85, 0xb0, 0x95, 0xc9, - 0xc4, 0x05, 0x79, 0xef, 0x35, 0x41, 0x9e, 0xca, 0x34, 0x6c, 0x25, 0x7d, 0x04, 0x0b, 0xae, 0x2a, - 0x8d, 0x95, 0xde, 0xe9, 0x64, 0x7a, 0xb7, 0x7e, 0xf4, 0xfc, 0xf4, 0x20, 0xa5, 0xef, 0x42, 0x2c, - 0x74, 0x86, 0xcf, 0x0d, 0x36, 0x15, 0x2b, 0x93, 0xd9, 0x79, 0xb0, 0x9a, 0xa7, 0x20, 0xf4, 0x57, - 0x1e, 0xb1, 0xa5, 0x72, 0x6e, 0x9e, 0x67, 0x05, 0x33, 0xf8, 0x8c, 0xed, 0x93, 0xf9, 0x9d, 0x4a, - 0xbd, 0xba, 0x7a, 0xf2, 0xc3, 0xd7, 0x9d, 0x22, 0x8d, 0xad, 0xde, 0x5f, 0x28, 0x85, 0xb1, 0x1b, - 0xe1, 0xe2, 0x3c, 0x58, 0x2d, 0x52, 0x77, 0xbe, 0xf8, 0x02, 0x8e, 0x53, 0xe4, 0x28, 0x5a, 0xfc, - 0xde, 0x30, 0xb3, 0xd3, 0x34, 0x86, 0x19, 0x6f, 0x90, 0x19, 0xdc, 0x90, 0x91, 0xbd, 0xe8, 0x1d, - 0xe7, 0xa8, 0x35, 0x09, 0x28, 0xc0, 0xf4, 0x67, 0x26, 0x4a, 0xdc, 0x90, 0xf0, 0xc1, 0xf8, 0xf7, - 0xdf, 0x96, 0xc1, 0xc5, 0x1f, 0x11, 0x2c, 0x86, 0x49, 0xd3, 0x05, 0x4c, 0x50, 0xd6, 0x66, 0x4f, - 0x46, 0xf4, 0x14, 0x62, 0x34, 0xdb, 0x4c, 0x32, 0x51, 0x55, 0x68, 0x48, 0x40, 0x09, 0x1c, 0x59, - 0xab, 0x03, 0x12, 0x5a, 0x4a, 0x6e, 0xf8, 0x00, 0x44, 0xf4, 0x3e, 0x9c, 0xd6, 0xaa, 0xdc, 0x17, - 0xaa, 0x1a, 0xc0, 0xb1, 0x63, 0xe9, 0x03, 0x6b, 0x42, 0x29, 0x9c, 0x14, 0x0a, 0x9b, 0x52, 0x64, - 0x06, 0xb5, 0xb1, 0xd8, 0xd4, 0x62, 0x72, 0x27, 0x73, 0x76, 0xc0, 0x66, 0xbd, 0xb0, 0x07, 0x60, - 0x70, 0xd0, 0x23, 0x71, 0xef, 0xa0, 0x07, 0x8e, 0xac, 0x03, 0x8d, 0xb5, 0x2a, 0xc5, 0x81, 0x75, - 0x6c, 0x41, 0x9f, 0xb0, 0x54, 0x9c, 0x95, 0x16, 0x3c, 0xe9, 0xa5, 0x0d, 0x16, 0x96, 0x48, 0x4e, - 0x6d, 0x74, 0x26, 0xd5, 0x7e, 0xd0, 0x11, 0x7a, 0x06, 0x44, 0xd5, 0x46, 0x48, 0xa1, 0xe5, 0x60, - 0xff, 0xde, 0x7f, 0x50, 0x9f, 0x8b, 0x50, 0xab, 0xce, 0x99, 0xc6, 0x81, 0x77, 0x7f, 0x40, 0x7a, - 0xce, 0x99, 0x2d, 0x52, 0xab, 0x92, 0x55, 0x87, 0x1e, 0xbe, 0x41, 0xef, 0xc1, 0xb1, 0xc7, 0x36, - 0xd8, 0x5a, 0xe8, 0x4d, 0x57, 0x43, 0x07, 0x0d, 0x76, 0xdf, 0xf2, 0xd3, 0x42, 0x98, 0xf9, 0x2d, - 0xa0, 0x33, 0x88, 0xd0, 0x6c, 0xc9, 0x88, 0xce, 0x61, 0x6c, 0xbb, 0x42, 0x02, 0x0b, 0xe5, 0x86, - 0x93, 0xd0, 0xce, 0xdc, 0xcf, 0x81, 0x44, 0x0e, 0xd5, 0x9c, 0x8c, 0xe9, 0x11, 0xcc, 0x7b, 0xe3, - 0x64, 0x62, 0x65, 0xd6, 0x1e, 0x99, 0xda, 0x47, 0xd1, 0xe5, 0x23, 0x33, 0x9f, 0xe6, 0x11, 0xc4, - 0x2f, 0x2d, 0x9b, 0x0d, 0xd7, 0x1b, 0x76, 0xef, 0xa9, 0xef, 0x50, 0xe0, 0x12, 0x35, 0xa2, 0xed, - 0x9e, 0x03, 0xc0, 0xd4, 0xd7, 0x10, 0xf9, 0x38, 0x1f, 0x42, 0xf8, 0x54, 0xda, 0x47, 0x55, 0xa9, - 0xac, 0x95, 0x64, 0xe4, 0x4c, 0xb7, 0xb2, 0xb3, 0xaa, 0x5b, 0x39, 0xbc, 0xc2, 0x9f, 0x60, 0x31, - 0xac, 0x97, 0xf5, 0x89, 0x66, 0x8b, 0x0d, 0xee, 0xac, 0xe4, 0x04, 0xc0, 0x60, 0xb5, 0xc1, 0x46, - 0x8a, 0xca, 0xa7, 0xcc, 0x85, 0xe1, 0x4a, 0x54, 0x24, 0xec, 0x4a, 0xca, 0xb4, 0x61, 0xfc, 0x9a, - 0x44, 0x76, 0x32, 0xbe, 0x71, 0xc3, 0x82, 0x92, 0xb1, 0xcf, 0xf0, 0x31, 0xc4, 0x2f, 0x2d, 0x55, - 0xd7, 0x34, 0x67, 0xe9, 0x18, 0x16, 0x2a, 0xd7, 0xd8, 0xb4, 0xd8, 0x68, 0x12, 0x74, 0xec, 0x87, - 0x57, 0x7f, 0xde, 0x2c, 0x83, 0x17, 0x37, 0xcb, 0xe0, 0xef, 0x9b, 0x65, 0xf0, 0xeb, 0xed, 0x72, - 0xf4, 0xe2, 0x76, 0x39, 0xfa, 0xeb, 0x76, 0x39, 0xfa, 0xf1, 0xa3, 0x42, 0x98, 0xed, 0x2e, 0x5f, - 0x73, 0x25, 0xdd, 0x07, 0xfd, 0x93, 0xff, 0xfd, 0xb6, 0xe7, 0x53, 0xf7, 0x81, 0xfe, 0xfc, 0xdf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0x40, 0x75, 0xa2, 0x03, 0x06, 0x00, 0x00, + 0x10, 0xee, 0x24, 0xfd, 0x5b, 0x3d, 0x3f, 0x5e, 0xef, 0x00, 0x61, 0x25, 0x9a, 0x01, 0x09, 0x68, + 0x8d, 0xa0, 0x47, 0xc0, 0x91, 0x03, 0x68, 0x47, 0x2c, 0x42, 0x88, 0x3d, 0x84, 0xd5, 0x0a, 0x71, + 0x69, 0xdc, 0xee, 0x22, 0x6d, 0x75, 0x6c, 0x47, 0xb1, 0x3b, 0xbb, 0xcd, 0x53, 0xf0, 0x10, 0x1c, + 0x90, 0x78, 0x11, 0x8e, 0x7b, 0xe4, 0x88, 0x66, 0x1e, 0x04, 0x64, 0xc7, 0x49, 0x0f, 0x97, 0x9d, + 0x39, 0xc5, 0xfe, 0xf2, 0x7d, 0x55, 0x5f, 0x55, 0xd9, 0x86, 0x8b, 0x5f, 0xd1, 0x32, 0xbe, 0x61, + 0x42, 0x5d, 0xfa, 0x95, 0xae, 0xf0, 0xb2, 0xdc, 0xe6, 0x97, 0x1e, 0x32, 0xe1, 0xb3, 0x28, 0x2b, + 0x6d, 0x35, 0x7d, 0xa7, 0xe3, 0x2e, 0x5a, 0xee, 0xa2, 0xdc, 0xe6, 0x8b, 0x86, 0xf4, 0xe8, 0x2c, + 0xd7, 0xb9, 0xf6, 0xcc, 0x4b, 0xb7, 0x6a, 0x44, 0xef, 0xff, 0x9b, 0xc0, 0xe0, 0xca, 0x11, 0xe8, + 0xdb, 0x30, 0xf6, 0xcc, 0xa5, 0x58, 0xa7, 0xf1, 0x79, 0x34, 0x4f, 0xb2, 0x91, 0xdf, 0x7f, 0xbb, + 0xa6, 0xdf, 0x01, 0x34, 0xbf, 0x14, 0x93, 0x98, 0x46, 0xe7, 0xd1, 0xfc, 0xe4, 0xb3, 0xf9, 0xe2, + 0xb5, 0xe9, 0x16, 0x3e, 0xe8, 0x53, 0x26, 0xf1, 0x71, 0x9c, 0x46, 0xd9, 0x84, 0xb7, 0x5b, 0xfa, + 0x15, 0x8c, 0x14, 0xda, 0x17, 0xba, 0xda, 0xa6, 0x89, 0x8f, 0xf4, 0xe1, 0x1d, 0x91, 0x9e, 0x36, + 0xec, 0xac, 0x95, 0xd1, 0xef, 0xe1, 0x28, 0x2c, 0x97, 0x76, 0x5f, 0x62, 0xda, 0xf7, 0x61, 0x2e, + 0xee, 0x17, 0xe6, 0xd9, 0xbe, 0xc4, 0x6c, 0xaa, 0x0e, 0x1b, 0xfa, 0x29, 0xc4, 0xb5, 0x4c, 0x07, + 0x3e, 0xc8, 0x7b, 0x77, 0x04, 0x79, 0x2e, 0xb3, 0xb8, 0x96, 0xf4, 0x09, 0x4c, 0xb8, 0x56, 0x06, + 0x95, 0xd9, 0x99, 0x74, 0x78, 0xbf, 0x7e, 0xb4, 0xfc, 0xec, 0x20, 0xa5, 0xef, 0xc2, 0x54, 0x98, + 0x25, 0xbe, 0xb4, 0x58, 0x29, 0x56, 0xa4, 0xa3, 0xf3, 0x68, 0x3e, 0xce, 0x40, 0x98, 0xaf, 0x03, + 0xe2, 0x4a, 0xe5, 0xdc, 0xbe, 0x5c, 0xe6, 0xcc, 0xe2, 0x0b, 0xb6, 0x4f, 0xc7, 0xf7, 0x2a, 0xf5, + 0xea, 0xea, 0xd9, 0x8f, 0xdf, 0x34, 0x8a, 0x6c, 0xea, 0xf4, 0x61, 0x43, 0x29, 0xf4, 0xfd, 0x08, + 0x27, 0xe7, 0xd1, 0x7c, 0x92, 0xf9, 0xf5, 0xc5, 0x17, 0x70, 0x9c, 0x21, 0x47, 0x51, 0xe3, 0x0f, + 0x96, 0xd9, 0x9d, 0xa1, 0x53, 0x18, 0xf1, 0x0a, 0x99, 0xc5, 0x35, 0xe9, 0xb9, 0x8d, 0xd9, 0x71, + 0x8e, 0xc6, 0x90, 0x88, 0x02, 0x0c, 0x7f, 0x61, 0xa2, 0xc0, 0x35, 0x89, 0x1f, 0xf5, 0xff, 0xf8, + 0x7d, 0x16, 0x5d, 0xfc, 0x99, 0xc0, 0xa4, 0x9b, 0x34, 0x9d, 0xc0, 0x00, 0x65, 0x69, 0xf7, 0xa4, + 0x47, 0x4f, 0x61, 0x8a, 0x76, 0xb3, 0x94, 0x4c, 0x28, 0x85, 0x96, 0x44, 0x94, 0xc0, 0x91, 0xb3, + 0xda, 0x21, 0xb1, 0xa3, 0xac, 0x2c, 0xef, 0x80, 0x84, 0x3e, 0x84, 0xd3, 0x52, 0x17, 0xfb, 0x5c, + 0xab, 0x0e, 0xec, 0x7b, 0x96, 0x39, 0xb0, 0x06, 0x94, 0xc2, 0x49, 0xae, 0xb1, 0x2a, 0xc4, 0xd2, + 0xa2, 0xb1, 0x0e, 0x1b, 0x3a, 0x4c, 0xee, 0xe4, 0x8a, 0x1d, 0xb0, 0x51, 0x2b, 0x6c, 0x01, 0xe8, + 0x1c, 0xb4, 0xc8, 0xb4, 0x75, 0xd0, 0x02, 0x47, 0xce, 0x81, 0xc1, 0x52, 0x17, 0xe2, 0xc0, 0x3a, + 0x76, 0x60, 0x48, 0x58, 0x68, 0xce, 0x0a, 0x07, 0x9e, 0xb4, 0xd2, 0x0a, 0x73, 0x47, 0x24, 0xa7, + 0x2e, 0x3a, 0x93, 0x7a, 0xdf, 0xe9, 0x08, 0x3d, 0x03, 0xa2, 0x4b, 0x2b, 0xa4, 0x30, 0xb2, 0xb3, + 0xff, 0xe0, 0x7f, 0x68, 0xc8, 0x45, 0xa8, 0x53, 0xaf, 0x98, 0xc1, 0x8e, 0xf7, 0xb0, 0x43, 0x5a, + 0xce, 0x99, 0x2b, 0xd2, 0xe8, 0x82, 0xa9, 0x43, 0x0f, 0xdf, 0xa0, 0x0f, 0xe0, 0x38, 0x60, 0x6b, + 0xac, 0x1d, 0xf4, 0xa6, 0xaf, 0xa1, 0x81, 0x3a, 0xbb, 0x6f, 0x85, 0x69, 0x21, 0x8c, 0xc2, 0x2d, + 0xa0, 0x23, 0x48, 0xd0, 0x6e, 0x48, 0x8f, 0x8e, 0xa1, 0xef, 0xba, 0x42, 0x22, 0x07, 0xad, 0x2c, + 0x27, 0xb1, 0x9b, 0x79, 0x98, 0x03, 0x49, 0x3c, 0x6a, 0x38, 0xe9, 0xd3, 0x23, 0x18, 0xb7, 0xc6, + 0xc9, 0xc0, 0xc9, 0x9c, 0x3d, 0x32, 0x74, 0x87, 0xa2, 0xc9, 0x47, 0x46, 0x21, 0xcd, 0x13, 0x98, + 0xde, 0xba, 0x6c, 0x2e, 0x5c, 0x6b, 0xd8, 0x9f, 0xa7, 0xb6, 0x43, 0x91, 0x4f, 0x54, 0x89, 0xba, + 0x39, 0x0e, 0x00, 0xc3, 0x50, 0x43, 0x12, 0xe2, 0x7c, 0x04, 0xf1, 0x73, 0xe9, 0x0e, 0x95, 0xd2, + 0xcb, 0x5a, 0x92, 0x9e, 0x37, 0x5d, 0xcb, 0xc6, 0xaa, 0xa9, 0x65, 0x77, 0x0a, 0x7f, 0x86, 0x49, + 0x77, 0xbd, 0x9c, 0x4f, 0xb4, 0x1b, 0xac, 0x70, 0xe7, 0x24, 0x27, 0x00, 0x16, 0xd5, 0x1a, 0x2b, + 0x29, 0x54, 0x48, 0xb9, 0x12, 0x96, 0x6b, 0xa1, 0x48, 0xdc, 0x94, 0xb4, 0x34, 0x96, 0xf1, 0x2d, + 0x49, 0xdc, 0x64, 0x42, 0xe3, 0xba, 0x0b, 0x4a, 0xfa, 0x21, 0xc3, 0xc7, 0x30, 0xbd, 0x75, 0xa9, + 0x9a, 0xa6, 0x79, 0x4b, 0xc7, 0x30, 0xd1, 0x2b, 0x83, 0x55, 0x8d, 0x95, 0x21, 0x51, 0xc3, 0x7e, + 0xfc, 0xe5, 0x5f, 0xd7, 0xb3, 0xe8, 0xd5, 0xf5, 0x2c, 0xfa, 0xe7, 0x7a, 0x16, 0xfd, 0x76, 0x33, + 0xeb, 0xbd, 0xba, 0x99, 0xf5, 0xfe, 0xbe, 0x99, 0xf5, 0x7e, 0xfa, 0x20, 0x17, 0x76, 0xb3, 0x5b, + 0x2d, 0xb8, 0x96, 0xfe, 0x41, 0xff, 0xa4, 0x79, 0xdb, 0x95, 0x5e, 0xdf, 0x7e, 0xd7, 0x57, 0x43, + 0xff, 0x38, 0x7f, 0xfe, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x0b, 0xc3, 0x03, 0xff, 0x05, + 0x00, 0x00, } func (m *Chain) Marshal() (dAtA []byte, err error) { diff --git a/pkg/chains/chains_test.go b/pkg/chains/chains_test.go index 12c2f3d7bf..d6e1456434 100644 --- a/pkg/chains/chains_test.go +++ b/pkg/chains/chains_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" ) func TestChain_Name(t *testing.T) { diff --git a/pkg/chains/status_test.go b/pkg/chains/status_test.go index 3f4061efb3..8adef7dd9e 100644 --- a/pkg/chains/status_test.go +++ b/pkg/chains/status_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func TestReceiveStatusFromString(t *testing.T) { diff --git a/pkg/coin/coin.pb.go b/pkg/coin/coin.pb.go index a974356d66..5666332fea 100644 --- a/pkg/coin/coin.pb.go +++ b/pkg/coin/coin.pb.go @@ -64,7 +64,7 @@ func init() { } var fileDescriptor_924f8c5071ab3892 = []byte{ - // 207 bytes of a gzipped FileDescriptorProto + // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xab, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x0b, 0xb2, 0xd3, 0xf5, 0x93, 0xf3, 0x33, 0xf3, 0xc0, 0x84, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x34, 0x5c, 0x9d, @@ -74,8 +74,9 @@ var fileDescriptor_924f8c5071ab3892 = []byte{ 0xec, 0x9e, 0x58, 0x2c, 0xc0, 0x28, 0xc4, 0xc9, 0xc5, 0xea, 0x1a, 0xe4, 0x6c, 0x64, 0x20, 0xc0, 0x04, 0x12, 0x73, 0xce, 0x4d, 0x11, 0x60, 0x16, 0xe2, 0xe7, 0xe2, 0xf6, 0xcb, 0x77, 0x2c, 0x2e, 0x4e, 0x2d, 0x71, 0x4e, 0xcc, 0xc9, 0x11, 0x60, 0x91, 0x62, 0x59, 0xb1, 0x44, 0x8e, 0xd1, 0xc9, - 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, - 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xd4, 0xd3, 0x33, 0x4b, 0x32, - 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, 0xee, 0xd7, 0xc5, 0xe1, 0x95, 0x24, 0x36, 0xb0, 0x9b, - 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x45, 0xfd, 0x2c, 0xf4, 0xf0, 0x00, 0x00, 0x00, + 0xf6, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, + 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x94, 0xd3, 0x33, 0x4b, 0x32, + 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, 0xee, 0xd7, 0x85, 0x78, 0x25, 0x2f, 0x3f, 0x05, 0xe1, + 0x8d, 0x24, 0x36, 0xb0, 0x7b, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x5a, 0x9b, 0xcd, + 0xec, 0x00, 0x00, 0x00, } diff --git a/pkg/contracts/solana/gateway_message_test.go b/pkg/contracts/solana/gateway_message_test.go index b2ffc24489..20c4d84ef9 100644 --- a/pkg/contracts/solana/gateway_message_test.go +++ b/pkg/contracts/solana/gateway_message_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/gagliardetto/solana-go" - "github.com/zeta-chain/zetacore/pkg/chains" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" + "github.com/zeta-chain/node/pkg/chains" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" ) func Test_MsgWithdrawHash(t *testing.T) { diff --git a/pkg/contracts/solana/instruction_test.go b/pkg/contracts/solana/instruction_test.go index 7f284169f1..4901f59476 100644 --- a/pkg/contracts/solana/instruction_test.go +++ b/pkg/contracts/solana/instruction_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" ethcommon "github.com/ethereum/go-ethereum/common" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" ) const ( diff --git a/pkg/crypto/address.go b/pkg/crypto/address.go index 4d0e9bc5a6..90876a790f 100644 --- a/pkg/crypto/address.go +++ b/pkg/crypto/address.go @@ -3,7 +3,7 @@ package crypto import ( "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" ) // IsEmptyAddress returns true if the address is empty diff --git a/pkg/crypto/address_test.go b/pkg/crypto/address_test.go index 162481730d..db10c5c7cf 100644 --- a/pkg/crypto/address_test.go +++ b/pkg/crypto/address_test.go @@ -3,7 +3,7 @@ package crypto import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" "testing" ) diff --git a/pkg/crypto/aes256_gcm_test.go b/pkg/crypto/aes256_gcm_test.go index 92c1e4f1f0..bd1d3d5dd4 100644 --- a/pkg/crypto/aes256_gcm_test.go +++ b/pkg/crypto/aes256_gcm_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/crypto" ) func Test_EncryptDecryptAES256GCM(t *testing.T) { diff --git a/pkg/crypto/crypto.pb.go b/pkg/crypto/crypto.pb.go index 05fa778c1a..c30cb8d3e7 100644 --- a/pkg/crypto/crypto.pb.go +++ b/pkg/crypto/crypto.pb.go @@ -85,7 +85,7 @@ func init() { } var fileDescriptor_89594c231a15fb86 = []byte{ - // 207 bytes of a gzipped FileDescriptorProto + // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xaa, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x0b, 0xb2, 0xd3, 0xf5, 0x93, 0x8b, 0x2a, 0x0b, 0x4a, 0xf2, 0xa1, 0x94, 0x5e, 0x41, 0x51, 0x7e, 0x49, 0xbe, 0x90, 0x2c, @@ -95,10 +95,11 @@ var fileDescriptor_89594c231a15fb86 = []byte{ 0x96, 0x6d, 0x28, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xfe, 0xe8, 0x9e, 0x3c, 0x67, 0x30, 0x4c, 0xf0, 0xd7, 0x3d, 0x79, 0x36, 0x88, 0xf2, 0x20, 0x84, 0x4a, 0x21, 0x15, 0x2e, 0xf6, 0xd4, 0x14, 0x23, 0x53, 0x53, 0x43, 0x4b, 0x09, 0x26, 0xb0, 0x26, 0x2e, 0x24, 0x75, 0x30, 0x29, 0x27, - 0xe7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, - 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x4c, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0xfb, 0x52, 0x17, 0xa7, 0x87, 0x93, 0xd8, 0xc0, 0xae, - 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x96, 0xf0, 0xc3, 0x18, 0x01, 0x00, 0x00, + 0xfb, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, + 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x52, 0x4d, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0xfb, 0x52, 0x17, 0xe2, 0xe1, 0xbc, 0xfc, 0x14, 0x64, + 0xcf, 0x26, 0xb1, 0x81, 0x5d, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x13, 0x9d, 0x6f, 0xf4, + 0x14, 0x01, 0x00, 0x00, } func (m *PubKeySet) Marshal() (dAtA []byte, err error) { diff --git a/pkg/crypto/privkey_test.go b/pkg/crypto/privkey_test.go index cf8921b454..c342eccad5 100644 --- a/pkg/crypto/privkey_test.go +++ b/pkg/crypto/privkey_test.go @@ -5,7 +5,7 @@ import ( "github.com/gagliardetto/solana-go" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/crypto" ) func Test_SolanaPrivateKeyFromString(t *testing.T) { diff --git a/pkg/crypto/pubkey.go b/pkg/crypto/pubkey.go index 545e5367ed..e59495207d 100644 --- a/pkg/crypto/pubkey.go +++ b/pkg/crypto/pubkey.go @@ -13,8 +13,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" eth "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/cosmos" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/cosmos" ) // PubKey is bech32 encoded string diff --git a/pkg/crypto/pubkey_test.go b/pkg/crypto/pubkey_test.go index 5f16f8142e..2c1f44f38c 100644 --- a/pkg/crypto/pubkey_test.go +++ b/pkg/crypto/pubkey_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" . "gopkg.in/check.v1" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/cosmos" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/cosmos" ) type KeyDataAddr struct { diff --git a/pkg/crypto/tss.go b/pkg/crypto/tss.go index 44e0987710..36edc7d4c6 100644 --- a/pkg/crypto/tss.go +++ b/pkg/crypto/tss.go @@ -6,7 +6,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/cosmos" + "github.com/zeta-chain/node/pkg/cosmos" ) // GetTssAddrEVM returns the ethereum address of the tss pubkey diff --git a/pkg/crypto/tss_test.go b/pkg/crypto/tss_test.go index b9315d6ec2..e0b60d4933 100644 --- a/pkg/crypto/tss_test.go +++ b/pkg/crypto/tss_test.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/cosmos" + "github.com/zeta-chain/node/pkg/cosmos" ) func TestGetTssAddrEVM(t *testing.T) { diff --git a/pkg/mempool/custom_proposal_handler_test.go b/pkg/mempool/custom_proposal_handler_test.go index d98d162a09..3b2e6e00a5 100644 --- a/pkg/mempool/custom_proposal_handler_test.go +++ b/pkg/mempool/custom_proposal_handler_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/suite" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - zetamempool "github.com/zeta-chain/zetacore/pkg/mempool" + zetamempool "github.com/zeta-chain/node/pkg/mempool" ) type testValidator struct { diff --git a/pkg/mempool/priority_nonce_mempool_test.go b/pkg/mempool/priority_nonce_mempool_test.go index 6e872fe342..65da8bc564 100644 --- a/pkg/mempool/priority_nonce_mempool_test.go +++ b/pkg/mempool/priority_nonce_mempool_test.go @@ -19,8 +19,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - zetamempool "github.com/zeta-chain/zetacore/pkg/mempool" - "github.com/zeta-chain/zetacore/testutil/sample" + zetamempool "github.com/zeta-chain/node/pkg/mempool" + "github.com/zeta-chain/node/testutil/sample" ) func TestOutOfOrder(t *testing.T) { diff --git a/pkg/os/console_test.go b/pkg/os/console_test.go index d5733744d2..8257fae7f3 100644 --- a/pkg/os/console_test.go +++ b/pkg/os/console_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - zetaos "github.com/zeta-chain/zetacore/pkg/os" + zetaos "github.com/zeta-chain/node/pkg/os" ) func Test_PromptPassword(t *testing.T) { diff --git a/pkg/os/path_test.go b/pkg/os/path_test.go index d02c55ef4e..086c0105bc 100644 --- a/pkg/os/path_test.go +++ b/pkg/os/path_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - "github.com/zeta-chain/zetacore/testutil/sample" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/testutil/sample" ) func TestResolveHome(t *testing.T) { diff --git a/pkg/proofs/bitcoin/bitcoin.pb.go b/pkg/proofs/bitcoin/bitcoin.pb.go index bc0f0f5693..ba9ce153a5 100644 --- a/pkg/proofs/bitcoin/bitcoin.pb.go +++ b/pkg/proofs/bitcoin/bitcoin.pb.go @@ -91,7 +91,7 @@ func init() { } var fileDescriptor_761b957bca33df27 = []byte{ - // 198 bytes of a gzipped FileDescriptorProto + // 203 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xae, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x0b, 0xb2, 0xd3, 0xf5, 0x0b, 0x8a, 0xf2, 0xf3, 0xd3, 0x8a, 0xf5, 0x93, 0x32, 0x4b, 0x92, 0xf3, 0x33, 0xf3, 0x60, 0xb4, @@ -100,11 +100,11 @@ var fileDescriptor_761b957bca33df27 = []byte{ 0x8b, 0xa3, 0xa4, 0x22, 0x3e, 0xa9, 0xb2, 0x24, 0xb5, 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0x27, 0x88, 0xbd, 0xa4, 0xc2, 0x09, 0xc4, 0x15, 0x12, 0xe2, 0x62, 0x29, 0x48, 0x2c, 0xc9, 0x90, 0x60, 0x02, 0x0b, 0x83, 0xd9, 0x42, 0x22, 0x5c, 0xac, 0x99, 0x79, 0x29, 0xa9, 0x15, 0x12, 0xcc, 0x0a, - 0x8c, 0x1a, 0xbc, 0x41, 0x10, 0x8e, 0x93, 0xf7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, + 0x8c, 0x1a, 0xbc, 0x41, 0x10, 0x8e, 0x93, 0xfb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, - 0x31, 0x44, 0x19, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x3d, 0xa1, - 0x4b, 0xd0, 0x3f, 0x49, 0x6c, 0x60, 0x8f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6b, 0xf6, - 0xf8, 0x28, 0xff, 0x00, 0x00, 0x00, + 0x31, 0x44, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x3d, 0xa1, + 0x0b, 0xf1, 0x4f, 0x5e, 0x7e, 0x0a, 0x36, 0xbf, 0x24, 0xb1, 0x81, 0x3d, 0x61, 0x0c, 0x08, 0x00, + 0x00, 0xff, 0xff, 0xe4, 0x17, 0xf0, 0x4a, 0xfb, 0x00, 0x00, 0x00, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/pkg/proofs/bitcoin/proof_test.go b/pkg/proofs/bitcoin/proof_test.go index ad9801f6ce..09f43e8414 100644 --- a/pkg/proofs/bitcoin/proof_test.go +++ b/pkg/proofs/bitcoin/proof_test.go @@ -13,7 +13,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/testdata" + "github.com/zeta-chain/node/testutil/testdata" ) func TestBitcoinMerkleProof(t *testing.T) { diff --git a/pkg/proofs/ethereum/ethereum.pb.go b/pkg/proofs/ethereum/ethereum.pb.go index 865e5bde99..9c061a39fc 100644 --- a/pkg/proofs/ethereum/ethereum.pb.go +++ b/pkg/proofs/ethereum/ethereum.pb.go @@ -83,7 +83,7 @@ func init() { } var fileDescriptor_c049832c17ba64fb = []byte{ - // 175 bytes of a gzipped FileDescriptorProto + // 181 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xad, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x0b, 0xb2, 0xd3, 0xf5, 0x0b, 0x8a, 0xf2, 0xf3, 0xd3, 0x8a, 0xf5, 0x53, 0x4b, 0x32, 0x52, 0x8b, 0x52, 0x4b, 0x73, 0xe1, @@ -91,10 +91,11 @@ var fileDescriptor_c049832c17ba64fb = []byte{ 0xec, 0x74, 0x3d, 0x88, 0x36, 0x3d, 0x98, 0x6a, 0x25, 0x63, 0x2e, 0xd6, 0x00, 0x90, 0x90, 0x90, 0x10, 0x17, 0x4b, 0x76, 0x6a, 0x65, 0xb1, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0x4f, 0x10, 0x98, 0x2d, 0x24, 0xc6, 0xc5, 0x56, 0x96, 0x98, 0x53, 0x9a, 0x5a, 0x2c, 0xc1, 0x04, 0x16, 0x85, 0xf2, 0x9c, - 0x7c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, - 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x28, 0x3d, 0xb3, 0x24, - 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0xec, 0x5c, 0x5d, 0xc2, 0x2e, 0x4f, 0x62, 0x03, 0xbb, - 0xd8, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x6d, 0xba, 0x77, 0xea, 0x00, 0x00, 0x00, + 0x3c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, + 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x2f, 0x3d, 0xb3, 0x24, + 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0xec, 0x5c, 0x5d, 0x88, 0xcb, 0xf3, 0xf2, 0x53, 0xb0, + 0xba, 0x3a, 0x89, 0x0d, 0xec, 0x5a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x31, 0xb2, 0x78, + 0x64, 0xe6, 0x00, 0x00, 0x00, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/pkg/proofs/ethereum/proof_test.go b/pkg/proofs/ethereum/proof_test.go index 8fb67c591b..3422430d14 100644 --- a/pkg/proofs/ethereum/proof_test.go +++ b/pkg/proofs/ethereum/proof_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/testdata" + "github.com/zeta-chain/node/testutil/testdata" ) func TestProofGeneration(t *testing.T) { diff --git a/pkg/proofs/headers.go b/pkg/proofs/headers.go index 666d55cf6e..cf3fdac1c7 100644 --- a/pkg/proofs/headers.go +++ b/pkg/proofs/headers.go @@ -14,8 +14,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs/bitcoin" ) // NewEthereumHeader returns a new HeaderData containing an Ethereum header diff --git a/pkg/proofs/headers_test.go b/pkg/proofs/headers_test.go index 8125435878..8eb22a537f 100644 --- a/pkg/proofs/headers_test.go +++ b/pkg/proofs/headers_test.go @@ -17,7 +17,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/testdata" + "github.com/zeta-chain/node/testutil/testdata" ) const numHeadersToTest = 100 diff --git a/pkg/proofs/proof.go b/pkg/proofs/proof.go index fe3a5b0fd3..6a0167b012 100644 --- a/pkg/proofs/proof.go +++ b/pkg/proofs/proof.go @@ -9,8 +9,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin" - "github.com/zeta-chain/zetacore/pkg/proofs/ethereum" + "github.com/zeta-chain/node/pkg/proofs/bitcoin" + "github.com/zeta-chain/node/pkg/proofs/ethereum" ) // ErrInvalidProof is a error type for invalid proofs embedding the underlying error diff --git a/pkg/proofs/proof_test.go b/pkg/proofs/proof_test.go index 7be25350f4..d5fee0dafb 100644 --- a/pkg/proofs/proof_test.go +++ b/pkg/proofs/proof_test.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin" - "github.com/zeta-chain/zetacore/pkg/proofs/ethereum" - "github.com/zeta-chain/zetacore/testutil/testdata" + "github.com/zeta-chain/node/pkg/proofs/bitcoin" + "github.com/zeta-chain/node/pkg/proofs/ethereum" + "github.com/zeta-chain/node/testutil/testdata" ) const ( diff --git a/pkg/proofs/proofs.pb.go b/pkg/proofs/proofs.pb.go index 6f3046934d..c797bba0da 100644 --- a/pkg/proofs/proofs.pb.go +++ b/pkg/proofs/proofs.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - bitcoin "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin" - ethereum "github.com/zeta-chain/zetacore/pkg/proofs/ethereum" + bitcoin "github.com/zeta-chain/node/pkg/proofs/bitcoin" + ethereum "github.com/zeta-chain/node/pkg/proofs/ethereum" io "io" math "math" math_bits "math/bits" @@ -285,32 +285,32 @@ func init() { } var fileDescriptor_874830d2276ded66 = []byte{ - // 392 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x4f, 0xaf, 0xd2, 0x40, - 0x10, 0xef, 0x42, 0x01, 0x33, 0x45, 0x4c, 0x36, 0xc6, 0x54, 0x12, 0x0b, 0xe1, 0x22, 0x18, 0x69, - 0x13, 0x88, 0x5f, 0xa0, 0x9a, 0x88, 0x37, 0x53, 0x13, 0x0f, 0x5e, 0x9a, 0xa5, 0x5d, 0xbb, 0x0d, - 0xc2, 0x36, 0x65, 0xb9, 0xf8, 0x29, 0xfc, 0x42, 0x7a, 0xe6, 0xc8, 0xd1, 0xd3, 0xcb, 0x0b, 0x7c, - 0x91, 0x97, 0x4e, 0x77, 0xfb, 0x4e, 0x0f, 0x4e, 0x3b, 0x3b, 0xf3, 0xfb, 0x33, 0x33, 0x19, 0x78, - 0xf7, 0x9b, 0x2b, 0x96, 0x08, 0x96, 0xef, 0x02, 0x8c, 0x64, 0xc9, 0x83, 0x62, 0x93, 0x05, 0x45, - 0x29, 0xe5, 0xcf, 0xbd, 0x7e, 0xfc, 0xa2, 0x94, 0x4a, 0xd2, 0x37, 0x0d, 0xd6, 0x37, 0x58, 0xbf, - 0xd8, 0x64, 0x7e, 0x0d, 0x1a, 0xbe, 0xcc, 0x64, 0x26, 0x11, 0x19, 0x54, 0x51, 0x4d, 0x1a, 0x2e, - 0xaf, 0x1b, 0xac, 0x73, 0x95, 0xc8, 0x7c, 0x67, 0x5e, 0x4d, 0xfa, 0x70, 0x9d, 0xc4, 0x95, 0xe0, - 0x25, 0x3f, 0x6c, 0x9b, 0xa0, 0xa6, 0x4d, 0xfe, 0x11, 0x70, 0xc2, 0x5f, 0x32, 0xd9, 0xac, 0x38, - 0x4b, 0x79, 0x49, 0x5f, 0x41, 0x57, 0xf0, 0x3c, 0x13, 0xca, 0x25, 0x63, 0x32, 0x6d, 0x47, 0xfa, - 0x47, 0x29, 0xd8, 0x82, 0xed, 0x85, 0xdb, 0x1a, 0x93, 0x69, 0x3f, 0xc2, 0x98, 0x8e, 0xc0, 0x29, - 0x58, 0xc9, 0x77, 0x2a, 0xc6, 0x52, 0x1b, 0x4b, 0x50, 0xa7, 0x56, 0x15, 0xe0, 0x35, 0x3c, 0xc3, - 0x8e, 0xe2, 0x3c, 0x75, 0x6d, 0x94, 0xeb, 0xe1, 0xff, 0x4b, 0x4a, 0x3f, 0x57, 0x3e, 0x95, 0xa3, - 0xdb, 0x19, 0x93, 0xa9, 0xb3, 0x98, 0xf9, 0x57, 0x37, 0xe5, 0xd7, 0xed, 0x7d, 0x62, 0x8a, 0x85, - 0xf6, 0xf1, 0x6e, 0x64, 0x45, 0x9a, 0x3e, 0x11, 0x00, 0x8f, 0x35, 0x3a, 0x83, 0x17, 0x66, 0xc0, - 0x58, 0xeb, 0x57, 0x73, 0xf4, 0x57, 0x56, 0x34, 0x30, 0x05, 0x3d, 0xe9, 0x5b, 0x18, 0xe8, 0x0d, - 0x1a, 0x64, 0x4b, 0x23, 0x9f, 0xeb, 0x7c, 0x0d, 0x0c, 0xbb, 0x60, 0xa7, 0x4c, 0xb1, 0xc9, 0x5f, - 0x02, 0x9d, 0xaf, 0x55, 0x37, 0xf4, 0x3b, 0x34, 0x62, 0x31, 0xf6, 0x87, 0x26, 0xce, 0x62, 0x7e, - 0x63, 0x88, 0x66, 0xf7, 0x28, 0x53, 0x39, 0x99, 0x4c, 0xad, 0xfb, 0x0d, 0x8c, 0xb5, 0x96, 0x6d, - 0xa1, 0xec, 0xfb, 0x1b, 0xb2, 0xe6, 0x10, 0x8c, 0x6a, 0x5f, 0x27, 0xf0, 0x1f, 0xf6, 0xa0, 0x83, - 0xb8, 0xf0, 0xe3, 0xf1, 0xec, 0x91, 0xd3, 0xd9, 0x23, 0xf7, 0x67, 0x8f, 0xfc, 0xb9, 0x78, 0xd6, - 0xe9, 0xe2, 0x59, 0xff, 0x2f, 0x9e, 0xf5, 0x63, 0x96, 0xe5, 0x4a, 0x1c, 0xd6, 0x7e, 0x22, 0xb7, - 0x78, 0x3c, 0xf3, 0x27, 0xef, 0x68, 0xdd, 0xc5, 0xb3, 0x59, 0x3e, 0x04, 0x00, 0x00, 0xff, 0xff, - 0xa6, 0x67, 0x4e, 0x4f, 0x05, 0x03, 0x00, 0x00, + // 398 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x41, 0xab, 0xd3, 0x40, + 0x10, 0xce, 0xf6, 0xa5, 0x7d, 0x32, 0xa9, 0x4f, 0x58, 0x44, 0xe2, 0x03, 0xd3, 0x52, 0x10, 0x5b, + 0xb1, 0x09, 0xb4, 0x78, 0x16, 0x82, 0x60, 0xbd, 0x49, 0x04, 0x0f, 0x5e, 0xc2, 0x36, 0x59, 0xb3, + 0xa1, 0x36, 0x1b, 0xd2, 0xed, 0xc5, 0x5f, 0xe1, 0x1f, 0xd2, 0x73, 0x8f, 0x3d, 0x7a, 0x12, 0x69, + 0xff, 0x88, 0x64, 0x76, 0x37, 0x7a, 0x6a, 0x4f, 0x3b, 0x3b, 0xf3, 0xcd, 0xf7, 0xcd, 0x0c, 0x1f, + 0xbc, 0xfc, 0xc6, 0x15, 0xcb, 0x04, 0x2b, 0xab, 0x08, 0x23, 0xd9, 0xf0, 0xa8, 0xde, 0x14, 0x51, + 0xdd, 0x48, 0xf9, 0x65, 0x67, 0x9e, 0xb0, 0x6e, 0xa4, 0x92, 0xf4, 0x59, 0x87, 0x0d, 0x2d, 0x36, + 0xac, 0x37, 0x45, 0xa8, 0x41, 0xf7, 0x8f, 0x0b, 0x59, 0x48, 0x44, 0x46, 0x6d, 0xa4, 0x9b, 0xee, + 0x97, 0x97, 0x05, 0xd6, 0xa5, 0xca, 0x64, 0x59, 0xd9, 0xd7, 0x34, 0xbd, 0xbe, 0xdc, 0xc4, 0x95, + 0xe0, 0x0d, 0xdf, 0x6f, 0xbb, 0x40, 0xb7, 0x4d, 0x7e, 0x12, 0xf0, 0xe2, 0xaf, 0x32, 0xdb, 0xac, + 0x38, 0xcb, 0x79, 0x43, 0x9f, 0xc0, 0x40, 0xf0, 0xb2, 0x10, 0xca, 0x27, 0x63, 0x32, 0xbd, 0x49, + 0xcc, 0x8f, 0x52, 0x70, 0x05, 0xdb, 0x09, 0xbf, 0x37, 0x26, 0xd3, 0x61, 0x82, 0x31, 0x1d, 0x81, + 0x57, 0xb3, 0x86, 0x57, 0x2a, 0xc5, 0xd2, 0x0d, 0x96, 0x40, 0xa7, 0x56, 0x2d, 0xe0, 0x29, 0x3c, + 0xc0, 0x89, 0xd2, 0x32, 0xf7, 0x5d, 0xa4, 0xbb, 0xc5, 0xff, 0xfb, 0x9c, 0xbe, 0x6b, 0x75, 0x5a, + 0x45, 0xbf, 0x3f, 0x26, 0x53, 0x6f, 0x31, 0x0b, 0x2f, 0x5e, 0x2a, 0xd4, 0xe3, 0xbd, 0x65, 0x8a, + 0xc5, 0xee, 0xe1, 0xf7, 0xc8, 0x49, 0x4c, 0xfb, 0x44, 0x00, 0xfc, 0xab, 0xd1, 0x19, 0x3c, 0xb2, + 0x0b, 0xa6, 0x86, 0xbf, 0xdd, 0x63, 0xb8, 0x72, 0x92, 0x3b, 0x5b, 0x30, 0x9b, 0xbe, 0x80, 0x3b, + 0x73, 0x41, 0x8b, 0xec, 0x19, 0xe4, 0x43, 0x93, 0xd7, 0xc0, 0x78, 0x00, 0x6e, 0xce, 0x14, 0x9b, + 0xfc, 0x20, 0xd0, 0xff, 0xd0, 0x4e, 0x43, 0x3f, 0x41, 0x47, 0x96, 0xe2, 0x7c, 0x28, 0xe2, 0x2d, + 0xe6, 0x57, 0x96, 0xe8, 0x6e, 0x8f, 0x34, 0xad, 0x92, 0xcd, 0x68, 0xde, 0x8f, 0x60, 0xa5, 0x0d, + 0x6d, 0x0f, 0x69, 0x5f, 0x5d, 0xa1, 0xb5, 0x46, 0xb0, 0xac, 0x43, 0x93, 0xc0, 0x7f, 0x7c, 0x0b, + 0x7d, 0xc4, 0xc5, 0x6f, 0x0e, 0xa7, 0x80, 0x1c, 0x4f, 0x01, 0xf9, 0x73, 0x0a, 0xc8, 0xf7, 0x73, + 0xe0, 0x1c, 0xcf, 0x81, 0xf3, 0xeb, 0x1c, 0x38, 0x9f, 0x9f, 0x17, 0xa5, 0x12, 0xfb, 0x75, 0x98, + 0xc9, 0x2d, 0x9a, 0x67, 0xae, 0x7d, 0x54, 0xc9, 0xfc, 0x7f, 0x0f, 0xad, 0x07, 0x68, 0x99, 0xe5, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0x34, 0x1b, 0x28, 0x01, 0x03, 0x00, 0x00, } func (m *BlockHeader) Marshal() (dAtA []byte, err error) { diff --git a/pkg/rpc/clients.go b/pkg/rpc/clients.go index 2fef17cf26..bafd6d44ab 100644 --- a/pkg/rpc/clients.go +++ b/pkg/rpc/clients.go @@ -12,12 +12,12 @@ import ( feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" "google.golang.org/grpc" - etherminttypes "github.com/zeta-chain/zetacore/rpc/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + etherminttypes "github.com/zeta-chain/node/rpc/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // Clients contains RPC client interfaces to interact with ZetaCore diff --git a/pkg/rpc/clients_authority.go b/pkg/rpc/clients_authority.go index 68baa01271..7354fc9c19 100644 --- a/pkg/rpc/clients_authority.go +++ b/pkg/rpc/clients_authority.go @@ -3,8 +3,8 @@ package rpc import ( "context" - "github.com/zeta-chain/zetacore/pkg/chains" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) // GetAdditionalChains returns the additional chains diff --git a/pkg/rpc/clients_cosmos.go b/pkg/rpc/clients_cosmos.go index 36d41acea2..329b5c2e20 100644 --- a/pkg/rpc/clients_cosmos.go +++ b/pkg/rpc/clients_cosmos.go @@ -8,7 +8,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" + "github.com/zeta-chain/node/cmd/zetacored/config" ) // GetUpgradePlan returns the current upgrade plan. diff --git a/pkg/rpc/clients_crosschain.go b/pkg/rpc/clients_crosschain.go index 3fa5b06675..30d9c9c926 100644 --- a/pkg/rpc/clients_crosschain.go +++ b/pkg/rpc/clients_crosschain.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "google.golang.org/grpc" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // 32MB diff --git a/pkg/rpc/clients_lightclient.go b/pkg/rpc/clients_lightclient.go index cb3e0e0c3c..96d9f9a048 100644 --- a/pkg/rpc/clients_lightclient.go +++ b/pkg/rpc/clients_lightclient.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/errors" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" ) // GetBlockHeaderEnabledChains returns the enabled chains for block headers diff --git a/pkg/rpc/clients_observer.go b/pkg/rpc/clients_observer.go index a5c7455e91..ee296b8fc9 100644 --- a/pkg/rpc/clients_observer.go +++ b/pkg/rpc/clients_observer.go @@ -6,9 +6,9 @@ import ( "cosmossdk.io/errors" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/retry" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/retry" + "github.com/zeta-chain/node/x/observer/types" ) // GetCrosschainFlags returns the crosschain flags diff --git a/pkg/rpc/clients_tendermint.go b/pkg/rpc/clients_tendermint.go index e1df340a71..cfec19aff8 100644 --- a/pkg/rpc/clients_tendermint.go +++ b/pkg/rpc/clients_tendermint.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" - "github.com/zeta-chain/zetacore/pkg/retry" + "github.com/zeta-chain/node/pkg/retry" ) // GetLatestZetaBlock returns the latest zeta block diff --git a/pkg/rpc/clients_test.go b/pkg/rpc/clients_test.go index ed4f7ccffa..ca5abf0d92 100644 --- a/pkg/rpc/clients_test.go +++ b/pkg/rpc/clients_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -20,14 +20,14 @@ import ( "go.nhat.io/grpcmock" "go.nhat.io/grpcmock/planner" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) const skipMethod = "skip" diff --git a/precompiles/precompiles.go b/precompiles/precompiles.go index e3901aa873..788da22e6d 100644 --- a/precompiles/precompiles.go +++ b/precompiles/precompiles.go @@ -9,8 +9,8 @@ import ( ethparams "github.com/ethereum/go-ethereum/params" evmkeeper "github.com/zeta-chain/ethermint/x/evm/keeper" - "github.com/zeta-chain/zetacore/precompiles/prototype" - "github.com/zeta-chain/zetacore/x/fungible/keeper" + "github.com/zeta-chain/node/precompiles/prototype" + "github.com/zeta-chain/node/x/fungible/keeper" ) // EnabledStatefulContracts contains the list of all enabled stateful precompiles. diff --git a/precompiles/precompiles_test.go b/precompiles/precompiles_test.go index 06c8ccb0bb..3718177358 100644 --- a/precompiles/precompiles_test.go +++ b/precompiles/precompiles_test.go @@ -7,7 +7,7 @@ import ( ethparams "github.com/ethereum/go-ethereum/params" "github.com/stretchr/testify/require" ethermint "github.com/zeta-chain/ethermint/types" - "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/node/testutil/keeper" ) func Test_StatefulContracts(t *testing.T) { diff --git a/precompiles/prototype/prototype.go b/precompiles/prototype/prototype.go index eeba2f9328..730ee6008c 100644 --- a/precompiles/prototype/prototype.go +++ b/precompiles/prototype/prototype.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" - ptypes "github.com/zeta-chain/zetacore/precompiles/types" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" + ptypes "github.com/zeta-chain/node/precompiles/types" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" ) const ( diff --git a/precompiles/prototype/prototype_test.go b/precompiles/prototype/prototype_test.go index 8999fa14eb..2fe97f5501 100644 --- a/precompiles/prototype/prototype_test.go +++ b/precompiles/prototype/prototype_test.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ethermint "github.com/zeta-chain/ethermint/types" - "github.com/zeta-chain/zetacore/precompiles/types" - "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/node/precompiles/types" + "github.com/zeta-chain/node/testutil/keeper" ) func Test_IPrototypeContract(t *testing.T) { diff --git a/proto/zetachain/zetacore/authority/authorization.proto b/proto/zetachain/zetacore/authority/authorization.proto index 914b6b7528..33c2ccbdea 100644 --- a/proto/zetachain/zetacore/authority/authorization.proto +++ b/proto/zetachain/zetacore/authority/authorization.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.authority; import "gogoproto/gogo.proto"; import "zetachain/zetacore/authority/policies.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // Authorization defines the authorization required to access use a message // which needs special permissions diff --git a/proto/zetachain/zetacore/authority/chain_info.proto b/proto/zetachain/zetacore/authority/chain_info.proto index f417184b06..4a97fa737f 100644 --- a/proto/zetachain/zetacore/authority/chain_info.proto +++ b/proto/zetachain/zetacore/authority/chain_info.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.authority; import "zetachain/zetacore/pkg/chains/chains.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // ChainInfo contains static information about the chains // This structure is used to dynamically update these info on a live network diff --git a/proto/zetachain/zetacore/authority/genesis.proto b/proto/zetachain/zetacore/authority/genesis.proto index 4f7b238aca..61842b27ed 100644 --- a/proto/zetachain/zetacore/authority/genesis.proto +++ b/proto/zetachain/zetacore/authority/genesis.proto @@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/authorization.proto"; import "zetachain/zetacore/authority/chain_info.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // GenesisState defines the authority module's genesis state. message GenesisState { diff --git a/proto/zetachain/zetacore/authority/policies.proto b/proto/zetachain/zetacore/authority/policies.proto index faefdbf2c7..d536d4065b 100644 --- a/proto/zetachain/zetacore/authority/policies.proto +++ b/proto/zetachain/zetacore/authority/policies.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.authority; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // PolicyType defines the type of policy enum PolicyType { diff --git a/proto/zetachain/zetacore/authority/query.proto b/proto/zetachain/zetacore/authority/query.proto index 33431783a0..09da8079d6 100644 --- a/proto/zetachain/zetacore/authority/query.proto +++ b/proto/zetachain/zetacore/authority/query.proto @@ -8,7 +8,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/authority/tx.proto b/proto/zetachain/zetacore/authority/tx.proto index 29b1b44362..23d041198b 100644 --- a/proto/zetachain/zetacore/authority/tx.proto +++ b/proto/zetachain/zetacore/authority/tx.proto @@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/chain_info.proto"; import "zetachain/zetacore/authority/authorization.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/authority/types"; +option go_package = "github.com/zeta-chain/node/x/authority/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto index 41028156c6..f8da0d0daa 100644 --- a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto +++ b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto @@ -6,7 +6,7 @@ import "zetachain/zetacore/pkg/coin/coin.proto"; // TODO : fix the descriptor numbers for the fields // https://github.com/zeta-chain/node/issues/1951 -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; enum CctxStatus { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/crosschain/events.proto b/proto/zetachain/zetacore/crosschain/events.proto index b39423fff4..311dbbfbca 100644 --- a/proto/zetachain/zetacore/crosschain/events.proto +++ b/proto/zetachain/zetacore/crosschain/events.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message EventInboundFinalized { string msg_type_url = 1; diff --git a/proto/zetachain/zetacore/crosschain/gas_price.proto b/proto/zetachain/zetacore/crosschain/gas_price.proto index c6f0b7719d..dc5e83eae1 100644 --- a/proto/zetachain/zetacore/crosschain/gas_price.proto +++ b/proto/zetachain/zetacore/crosschain/gas_price.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message GasPrice { string creator = 1; diff --git a/proto/zetachain/zetacore/crosschain/genesis.proto b/proto/zetachain/zetacore/crosschain/genesis.proto index 7ffef701d5..97aa1d8dba 100644 --- a/proto/zetachain/zetacore/crosschain/genesis.proto +++ b/proto/zetachain/zetacore/crosschain/genesis.proto @@ -10,7 +10,7 @@ import "zetachain/zetacore/crosschain/outbound_tracker.proto"; import "zetachain/zetacore/crosschain/rate_limiter_flags.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; // GenesisState defines the crosschain module's genesis state. message GenesisState { diff --git a/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto b/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto index 1a0d23089e..d793983d9d 100644 --- a/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto +++ b/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message InboundHashToCctx { string inbound_hash = 1; diff --git a/proto/zetachain/zetacore/crosschain/inbound_tracker.proto b/proto/zetachain/zetacore/crosschain/inbound_tracker.proto index b90bcb28ea..7376d18ef9 100644 --- a/proto/zetachain/zetacore/crosschain/inbound_tracker.proto +++ b/proto/zetachain/zetacore/crosschain/inbound_tracker.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain; import "zetachain/zetacore/pkg/coin/coin.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message InboundTracker { int64 chain_id = 1; diff --git a/proto/zetachain/zetacore/crosschain/last_block_height.proto b/proto/zetachain/zetacore/crosschain/last_block_height.proto index ed257c33ea..dcffab7f78 100644 --- a/proto/zetachain/zetacore/crosschain/last_block_height.proto +++ b/proto/zetachain/zetacore/crosschain/last_block_height.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message LastBlockHeight { string creator = 1; diff --git a/proto/zetachain/zetacore/crosschain/outbound_tracker.proto b/proto/zetachain/zetacore/crosschain/outbound_tracker.proto index 2599a0c7da..4f5b6108b8 100644 --- a/proto/zetachain/zetacore/crosschain/outbound_tracker.proto +++ b/proto/zetachain/zetacore/crosschain/outbound_tracker.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message TxHash { string tx_hash = 1; diff --git a/proto/zetachain/zetacore/crosschain/query.proto b/proto/zetachain/zetacore/crosschain/query.proto index da1786cc6e..9d2bc8c20b 100644 --- a/proto/zetachain/zetacore/crosschain/query.proto +++ b/proto/zetachain/zetacore/crosschain/query.proto @@ -12,7 +12,7 @@ import "zetachain/zetacore/crosschain/rate_limiter_flags.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto b/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto index b073aa46b4..3defcf621f 100644 --- a/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto +++ b/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.crosschain; import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/coin/coin.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; message RateLimiterFlags { bool enabled = 1; diff --git a/proto/zetachain/zetacore/crosschain/tx.proto b/proto/zetachain/zetacore/crosschain/tx.proto index a34ff32fb9..e5d310976d 100644 --- a/proto/zetachain/zetacore/crosschain/tx.proto +++ b/proto/zetachain/zetacore/crosschain/tx.proto @@ -8,7 +8,7 @@ import "zetachain/zetacore/pkg/proofs/proofs.proto"; import "zetachain/zetacore/crosschain/rate_limiter_flags.proto"; import "zetachain/zetacore/crosschain/cross_chain_tx.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/node/x/crosschain/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/emissions/events.proto b/proto/zetachain/zetacore/emissions/events.proto index 899afadcc2..6b6d120808 100644 --- a/proto/zetachain/zetacore/emissions/events.proto +++ b/proto/zetachain/zetacore/emissions/events.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.emissions; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; enum EmissionType { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/emissions/genesis.proto b/proto/zetachain/zetacore/emissions/genesis.proto index f9a7fa0ca4..d895064641 100644 --- a/proto/zetachain/zetacore/emissions/genesis.proto +++ b/proto/zetachain/zetacore/emissions/genesis.proto @@ -5,7 +5,7 @@ import "zetachain/zetacore/emissions/params.proto"; import "zetachain/zetacore/emissions/withdrawable_emissions.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; // GenesisState defines the emissions module's genesis state. message GenesisState { diff --git a/proto/zetachain/zetacore/emissions/params.proto b/proto/zetachain/zetacore/emissions/params.proto index 26f0fb5464..53aef8d9e0 100644 --- a/proto/zetachain/zetacore/emissions/params.proto +++ b/proto/zetachain/zetacore/emissions/params.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.emissions; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/zetachain/zetacore/emissions/query.proto b/proto/zetachain/zetacore/emissions/query.proto index 64d1a3ccca..4fc78af850 100644 --- a/proto/zetachain/zetacore/emissions/query.proto +++ b/proto/zetachain/zetacore/emissions/query.proto @@ -6,7 +6,7 @@ import "zetachain/zetacore/emissions/params.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/emissions/tx.proto b/proto/zetachain/zetacore/emissions/tx.proto index 347be273c1..76742c6127 100644 --- a/proto/zetachain/zetacore/emissions/tx.proto +++ b/proto/zetachain/zetacore/emissions/tx.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.emissions; import "zetachain/zetacore/emissions/params.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto b/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto index 9af2d5569b..f552a20640 100644 --- a/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto +++ b/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.emissions; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/emissions/types"; +option go_package = "github.com/zeta-chain/node/x/emissions/types"; message WithdrawableEmissions { string address = 1; diff --git a/proto/zetachain/zetacore/fungible/events.proto b/proto/zetachain/zetacore/fungible/events.proto index 02a686aad8..f27c28b5c8 100644 --- a/proto/zetachain/zetacore/fungible/events.proto +++ b/proto/zetachain/zetacore/fungible/events.proto @@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/tx.proto"; import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/coin/coin.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; message EventSystemContractUpdated { string msg_type_url = 1; diff --git a/proto/zetachain/zetacore/fungible/foreign_coins.proto b/proto/zetachain/zetacore/fungible/foreign_coins.proto index d82bbabdb2..db996ef17a 100644 --- a/proto/zetachain/zetacore/fungible/foreign_coins.proto +++ b/proto/zetachain/zetacore/fungible/foreign_coins.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.fungible; import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/coin/coin.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; message ForeignCoins { // string index = 1; diff --git a/proto/zetachain/zetacore/fungible/genesis.proto b/proto/zetachain/zetacore/fungible/genesis.proto index de4e87a336..1be1161326 100644 --- a/proto/zetachain/zetacore/fungible/genesis.proto +++ b/proto/zetachain/zetacore/fungible/genesis.proto @@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/foreign_coins.proto"; import "zetachain/zetacore/fungible/system_contract.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; // GenesisState defines the fungible module's genesis state. message GenesisState { diff --git a/proto/zetachain/zetacore/fungible/query.proto b/proto/zetachain/zetacore/fungible/query.proto index 150ef50b6b..49e6200307 100644 --- a/proto/zetachain/zetacore/fungible/query.proto +++ b/proto/zetachain/zetacore/fungible/query.proto @@ -7,7 +7,7 @@ import "zetachain/zetacore/fungible/system_contract.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/fungible/system_contract.proto b/proto/zetachain/zetacore/fungible/system_contract.proto index d9dca7f71a..c52b82b931 100644 --- a/proto/zetachain/zetacore/fungible/system_contract.proto +++ b/proto/zetachain/zetacore/fungible/system_contract.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.fungible; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; message SystemContract { string system_contract = 1; diff --git a/proto/zetachain/zetacore/fungible/tx.proto b/proto/zetachain/zetacore/fungible/tx.proto index 33ab8e7a7a..69be3bf7a4 100644 --- a/proto/zetachain/zetacore/fungible/tx.proto +++ b/proto/zetachain/zetacore/fungible/tx.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.fungible; import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/coin/coin.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/fungible/types"; +option go_package = "github.com/zeta-chain/node/x/fungible/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/ibccrosschain/genesis.proto b/proto/zetachain/zetacore/ibccrosschain/genesis.proto index 7190e7bf54..0d18d13633 100644 --- a/proto/zetachain/zetacore/ibccrosschain/genesis.proto +++ b/proto/zetachain/zetacore/ibccrosschain/genesis.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types"; +option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types"; // GenesisState defines the ibccrosschain module's genesis state. message GenesisState {} diff --git a/proto/zetachain/zetacore/ibccrosschain/query.proto b/proto/zetachain/zetacore/ibccrosschain/query.proto index cc2cfc577d..340cbf4cb2 100644 --- a/proto/zetachain/zetacore/ibccrosschain/query.proto +++ b/proto/zetachain/zetacore/ibccrosschain/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.ibccrosschain; -option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types"; +option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types"; // Query defines the gRPC querier service. service Query {} \ No newline at end of file diff --git a/proto/zetachain/zetacore/ibccrosschain/tx.proto b/proto/zetachain/zetacore/ibccrosschain/tx.proto index 54ea972a0c..a7e5174446 100644 --- a/proto/zetachain/zetacore/ibccrosschain/tx.proto +++ b/proto/zetachain/zetacore/ibccrosschain/tx.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types"; +option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types"; // Msg defines the Msg service. service Msg {} diff --git a/proto/zetachain/zetacore/lightclient/block_header_verification.proto b/proto/zetachain/zetacore/lightclient/block_header_verification.proto index 44613e550e..cb76d219f4 100644 --- a/proto/zetachain/zetacore/lightclient/block_header_verification.proto +++ b/proto/zetachain/zetacore/lightclient/block_header_verification.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types"; +option go_package = "github.com/zeta-chain/node/x/lightclient/types"; // HeaderSupportedChain is a structure containing information of weather a chain // is enabled or not for block header verification diff --git a/proto/zetachain/zetacore/lightclient/chain_state.proto b/proto/zetachain/zetacore/lightclient/chain_state.proto index 9d27e399b7..25cb3a395a 100644 --- a/proto/zetachain/zetacore/lightclient/chain_state.proto +++ b/proto/zetachain/zetacore/lightclient/chain_state.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types"; +option go_package = "github.com/zeta-chain/node/x/lightclient/types"; // ChainState defines the overall state of the block headers for a given chain message ChainState { diff --git a/proto/zetachain/zetacore/lightclient/genesis.proto b/proto/zetachain/zetacore/lightclient/genesis.proto index 67dc419e6b..8a1795971b 100644 --- a/proto/zetachain/zetacore/lightclient/genesis.proto +++ b/proto/zetachain/zetacore/lightclient/genesis.proto @@ -6,7 +6,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto"; import "zetachain/zetacore/lightclient/chain_state.proto"; import "zetachain/zetacore/pkg/proofs/proofs.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types"; +option go_package = "github.com/zeta-chain/node/x/lightclient/types"; // GenesisState defines the lightclient module's genesis state. message GenesisState { diff --git a/proto/zetachain/zetacore/lightclient/query.proto b/proto/zetachain/zetacore/lightclient/query.proto index 41c19823ee..d692d98eb3 100644 --- a/proto/zetachain/zetacore/lightclient/query.proto +++ b/proto/zetachain/zetacore/lightclient/query.proto @@ -8,7 +8,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto"; import "zetachain/zetacore/lightclient/chain_state.proto"; import "zetachain/zetacore/pkg/proofs/proofs.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types"; +option go_package = "github.com/zeta-chain/node/x/lightclient/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/lightclient/tx.proto b/proto/zetachain/zetacore/lightclient/tx.proto index 463055b533..02ee8c5c6b 100644 --- a/proto/zetachain/zetacore/lightclient/tx.proto +++ b/proto/zetachain/zetacore/lightclient/tx.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.lightclient; import "gogoproto/gogo.proto"; import "zetachain/zetacore/lightclient/block_header_verification.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types"; +option go_package = "github.com/zeta-chain/node/x/lightclient/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/observer/ballot.proto b/proto/zetachain/zetacore/observer/ballot.proto index 7b25e03910..8281572ad7 100644 --- a/proto/zetachain/zetacore/observer/ballot.proto +++ b/proto/zetachain/zetacore/observer/ballot.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; import "zetachain/zetacore/observer/observer.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; enum VoteType { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/observer/blame.proto b/proto/zetachain/zetacore/observer/blame.proto index 8894b2ce0d..ac5cd7a8ee 100644 --- a/proto/zetachain/zetacore/observer/blame.proto +++ b/proto/zetachain/zetacore/observer/blame.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "zetachain/zetacore/observer/observer.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message Node { string pub_key = 1; diff --git a/proto/zetachain/zetacore/observer/chain_nonces.proto b/proto/zetachain/zetacore/observer/chain_nonces.proto index 86288508d3..f20a0e3067 100644 --- a/proto/zetachain/zetacore/observer/chain_nonces.proto +++ b/proto/zetachain/zetacore/observer/chain_nonces.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message ChainNonces { string creator = 1; diff --git a/proto/zetachain/zetacore/observer/crosschain_flags.proto b/proto/zetachain/zetacore/observer/crosschain_flags.proto index 32d1fbd318..3105c1ced1 100644 --- a/proto/zetachain/zetacore/observer/crosschain_flags.proto +++ b/proto/zetachain/zetacore/observer/crosschain_flags.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message GasPriceIncreaseFlags { int64 epochLength = 1; diff --git a/proto/zetachain/zetacore/observer/events.proto b/proto/zetachain/zetacore/observer/events.proto index a939daafa1..ea2e0fc38a 100644 --- a/proto/zetachain/zetacore/observer/events.proto +++ b/proto/zetachain/zetacore/observer/events.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "zetachain/zetacore/observer/crosschain_flags.proto"; import "zetachain/zetacore/observer/observer.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message EventBallotCreated { string msg_type_url = 1; diff --git a/proto/zetachain/zetacore/observer/genesis.proto b/proto/zetachain/zetacore/observer/genesis.proto index 281c32f12a..e9af1fc51a 100644 --- a/proto/zetachain/zetacore/observer/genesis.proto +++ b/proto/zetachain/zetacore/observer/genesis.proto @@ -15,7 +15,7 @@ import "zetachain/zetacore/observer/pending_nonces.proto"; import "zetachain/zetacore/observer/tss.proto"; import "zetachain/zetacore/observer/tss_funds_migrator.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message GenesisState { repeated Ballot ballots = 1; diff --git a/proto/zetachain/zetacore/observer/keygen.proto b/proto/zetachain/zetacore/observer/keygen.proto index 9368f221fc..a0e5098db2 100644 --- a/proto/zetachain/zetacore/observer/keygen.proto +++ b/proto/zetachain/zetacore/observer/keygen.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; enum KeygenStatus { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/observer/node_account.proto b/proto/zetachain/zetacore/observer/node_account.proto index 3849983634..47a4eade4c 100644 --- a/proto/zetachain/zetacore/observer/node_account.proto +++ b/proto/zetachain/zetacore/observer/node_account.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/crypto/crypto.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; enum NodeStatus { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/observer/nonce_to_cctx.proto b/proto/zetachain/zetacore/observer/nonce_to_cctx.proto index 947e9c6f35..8a3cd056ea 100644 --- a/proto/zetachain/zetacore/observer/nonce_to_cctx.proto +++ b/proto/zetachain/zetacore/observer/nonce_to_cctx.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; // store key is tss+chainid+nonce message NonceToCctx { diff --git a/proto/zetachain/zetacore/observer/observer.proto b/proto/zetachain/zetacore/observer/observer.proto index 7fc6eb5b7b..cba94e8cec 100644 --- a/proto/zetachain/zetacore/observer/observer.proto +++ b/proto/zetachain/zetacore/observer/observer.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; enum ObservationType { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/observer/params.proto b/proto/zetachain/zetacore/observer/params.proto index c0c732b705..8b237b2c8e 100644 --- a/proto/zetachain/zetacore/observer/params.proto +++ b/proto/zetachain/zetacore/observer/params.proto @@ -4,7 +4,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; import "zetachain/zetacore/observer/observer.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message ChainParamsList { repeated ChainParams chain_params = 1; } diff --git a/proto/zetachain/zetacore/observer/pending_nonces.proto b/proto/zetachain/zetacore/observer/pending_nonces.proto index e733843d01..de6ce9fa82 100644 --- a/proto/zetachain/zetacore/observer/pending_nonces.proto +++ b/proto/zetachain/zetacore/observer/pending_nonces.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; // store key is tss+chainid message PendingNonces { diff --git a/proto/zetachain/zetacore/observer/query.proto b/proto/zetachain/zetacore/observer/query.proto index 9283b742fa..65d5afb7b1 100644 --- a/proto/zetachain/zetacore/observer/query.proto +++ b/proto/zetachain/zetacore/observer/query.proto @@ -18,7 +18,7 @@ import "zetachain/zetacore/pkg/chains/chains.proto"; import "zetachain/zetacore/pkg/proofs/proofs.proto"; import "zetachain/zetacore/observer/tss_funds_migrator.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/zetachain/zetacore/observer/tss.proto b/proto/zetachain/zetacore/observer/tss.proto index 62d2cdcbad..e938e55614 100644 --- a/proto/zetachain/zetacore/observer/tss.proto +++ b/proto/zetachain/zetacore/observer/tss.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message TSS { string tss_pubkey = 3; diff --git a/proto/zetachain/zetacore/observer/tss_funds_migrator.proto b/proto/zetachain/zetacore/observer/tss_funds_migrator.proto index f757057eff..7e454cbb67 100644 --- a/proto/zetachain/zetacore/observer/tss_funds_migrator.proto +++ b/proto/zetachain/zetacore/observer/tss_funds_migrator.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; message TssFundMigratorInfo { int64 chain_id = 1; diff --git a/proto/zetachain/zetacore/observer/tx.proto b/proto/zetachain/zetacore/observer/tx.proto index d5ad32e590..4086bb7e52 100644 --- a/proto/zetachain/zetacore/observer/tx.proto +++ b/proto/zetachain/zetacore/observer/tx.proto @@ -11,7 +11,7 @@ import "zetachain/zetacore/observer/tss.proto"; import "zetachain/zetacore/pkg/chains/chains.proto"; import "zetachain/zetacore/pkg/proofs/proofs.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; +option go_package = "github.com/zeta-chain/node/x/observer/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/zetachain/zetacore/pkg/chains/chains.proto b/proto/zetachain/zetacore/pkg/chains/chains.proto index be1ed79848..63b146cf42 100644 --- a/proto/zetachain/zetacore/pkg/chains/chains.proto +++ b/proto/zetachain/zetacore/pkg/chains/chains.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.chains; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/pkg/chains"; +option go_package = "github.com/zeta-chain/node/pkg/chains"; // ReceiveStatus represents the status of an outbound // TODO: Rename and move diff --git a/proto/zetachain/zetacore/pkg/coin/coin.proto b/proto/zetachain/zetacore/pkg/coin/coin.proto index e80fb4abb0..33d265d773 100644 --- a/proto/zetachain/zetacore/pkg/coin/coin.proto +++ b/proto/zetachain/zetacore/pkg/coin/coin.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.coin; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/pkg/coin"; +option go_package = "github.com/zeta-chain/node/pkg/coin"; enum CoinType { option (gogoproto.goproto_enum_stringer) = true; diff --git a/proto/zetachain/zetacore/pkg/crypto/crypto.proto b/proto/zetachain/zetacore/pkg/crypto/crypto.proto index 2c1154cc50..14ad382b37 100644 --- a/proto/zetachain/zetacore/pkg/crypto/crypto.proto +++ b/proto/zetachain/zetacore/pkg/crypto/crypto.proto @@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.crypto; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/pkg/crypto"; +option go_package = "github.com/zeta-chain/node/pkg/crypto"; // PubKeySet contains two pub keys , secp256k1 and ed25519 message PubKeySet { diff --git a/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto b/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto index f1af119edd..24890adfbd 100644 --- a/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto +++ b/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.pkg.proofs.bitcoin; -option go_package = "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin"; +option go_package = "github.com/zeta-chain/node/pkg/proofs/bitcoin"; message Proof { bytes tx_bytes = 1; diff --git a/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto b/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto index dcece6b249..1d5063e716 100644 --- a/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto +++ b/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package zetachain.zetacore.pkg.proofs.ethereum; -option go_package = "github.com/zeta-chain/zetacore/pkg/proofs/ethereum"; +option go_package = "github.com/zeta-chain/node/pkg/proofs/ethereum"; message Proof { repeated bytes keys = 1; diff --git a/proto/zetachain/zetacore/pkg/proofs/proofs.proto b/proto/zetachain/zetacore/pkg/proofs/proofs.proto index 8a269918b1..271eabd5b1 100644 --- a/proto/zetachain/zetacore/pkg/proofs/proofs.proto +++ b/proto/zetachain/zetacore/pkg/proofs/proofs.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto"; import "zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto"; -option go_package = "github.com/zeta-chain/zetacore/pkg/proofs"; +option go_package = "github.com/zeta-chain/node/pkg/proofs"; message BlockHeader { int64 height = 1; diff --git a/rpc/apis.go b/rpc/apis.go index 3f295b7136..d91f70c2c8 100644 --- a/rpc/apis.go +++ b/rpc/apis.go @@ -12,7 +12,7 @@ // GNU Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public License -// along with the Ethermint library. If not, see https://github.com/zeta-chain/zetacore/blob/main/LICENSE +// along with the Ethermint library. If not, see https://github.com/zeta-chain/node/blob/main/LICENSE package rpc import ( @@ -24,15 +24,15 @@ import ( "github.com/ethereum/go-ethereum/rpc" ethermint "github.com/zeta-chain/ethermint/types" - "github.com/zeta-chain/zetacore/rpc/backend" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/debug" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/eth" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/eth/filters" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/miner" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/net" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/personal" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/txpool" - "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/web3" + "github.com/zeta-chain/node/rpc/backend" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/debug" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/eth" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/eth/filters" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/miner" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/net" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/personal" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/txpool" + "github.com/zeta-chain/node/rpc/namespaces/ethereum/web3" ) // RPC namespaces and API version diff --git a/rpc/backend/account_info.go b/rpc/backend/account_info.go index bb9cf39689..ccbc19a906 100644 --- a/rpc/backend/account_info.go +++ b/rpc/backend/account_info.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // GetCode returns the contract code at the given address and block number. diff --git a/rpc/backend/account_info_test.go b/rpc/backend/account_info_test.go index c5937c1425..311f81c97f 100644 --- a/rpc/backend/account_info_test.go +++ b/rpc/backend/account_info_test.go @@ -14,8 +14,8 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpctypes "github.com/zeta-chain/node/rpc/types" ) func (suite *BackendTestSuite) TestGetCode() { diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go index 3749e1d221..80d33e0cd5 100644 --- a/rpc/backend/backend.go +++ b/rpc/backend/backend.go @@ -35,8 +35,8 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" - "github.com/zeta-chain/zetacore/server/config" + rpctypes "github.com/zeta-chain/node/rpc/types" + "github.com/zeta-chain/node/server/config" ) // BackendI implements the Cosmos and EVM backend. diff --git a/rpc/backend/backend_suite_test.go b/rpc/backend/backend_suite_test.go index c6f5ff20da..ce544b5d03 100644 --- a/rpc/backend/backend_suite_test.go +++ b/rpc/backend/backend_suite_test.go @@ -25,8 +25,8 @@ import ( "github.com/zeta-chain/ethermint/tests" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpctypes "github.com/zeta-chain/node/rpc/types" ) type BackendTestSuite struct { diff --git a/rpc/backend/blocks.go b/rpc/backend/blocks.go index a902c7b8cb..6607fcbc07 100644 --- a/rpc/backend/blocks.go +++ b/rpc/backend/blocks.go @@ -37,7 +37,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // BlockNumber returns the current block number in abci app state. Because abci diff --git a/rpc/backend/blocks_test.go b/rpc/backend/blocks_test.go index 83fba94cf3..5da81d03c9 100644 --- a/rpc/backend/blocks_test.go +++ b/rpc/backend/blocks_test.go @@ -18,9 +18,9 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - ethrpc "github.com/zeta-chain/zetacore/rpc/types" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/rpc/backend/mocks" + ethrpc "github.com/zeta-chain/node/rpc/types" + "github.com/zeta-chain/node/testutil/sample" ) func (suite *BackendTestSuite) TestBlockNumber() { diff --git a/rpc/backend/call_tx.go b/rpc/backend/call_tx.go index 781d8ce7c7..da94625692 100644 --- a/rpc/backend/call_tx.go +++ b/rpc/backend/call_tx.go @@ -35,7 +35,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // Resend accepts an existing transaction and a new gas price and limit. It will remove diff --git a/rpc/backend/call_tx_test.go b/rpc/backend/call_tx_test.go index f1b28e0a97..ec92db089b 100644 --- a/rpc/backend/call_tx_test.go +++ b/rpc/backend/call_tx_test.go @@ -14,8 +14,8 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpctypes "github.com/zeta-chain/node/rpc/types" ) func (suite *BackendTestSuite) TestResend() { diff --git a/rpc/backend/chain_info.go b/rpc/backend/chain_info.go index 965f20dcee..7ace99cf34 100644 --- a/rpc/backend/chain_info.go +++ b/rpc/backend/chain_info.go @@ -33,7 +33,7 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // ChainID is the EIP-155 replay-protection chain id for the current ethereum chain config. diff --git a/rpc/backend/chain_info_test.go b/rpc/backend/chain_info_test.go index 7259defa4b..b59e5c3461 100644 --- a/rpc/backend/chain_info_test.go +++ b/rpc/backend/chain_info_test.go @@ -14,8 +14,8 @@ import ( feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpc "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpc "github.com/zeta-chain/node/rpc/types" ) func (suite *BackendTestSuite) TestBaseFee() { diff --git a/rpc/backend/client_test.go b/rpc/backend/client_test.go index 6adf0ea5d0..952387a35b 100644 --- a/rpc/backend/client_test.go +++ b/rpc/backend/client_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpc "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpc "github.com/zeta-chain/node/rpc/types" ) // Client defines a mocked object that implements the Tendermint JSON-RPC Client diff --git a/rpc/backend/evm_query_client_test.go b/rpc/backend/evm_query_client_test.go index 997b6076d6..c3efd42add 100644 --- a/rpc/backend/evm_query_client_test.go +++ b/rpc/backend/evm_query_client_test.go @@ -21,8 +21,8 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpc "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpc "github.com/zeta-chain/node/rpc/types" ) // QueryClient defines a mocked object that implements the ethermint GRPC diff --git a/rpc/backend/feemarket_query_client_test.go b/rpc/backend/feemarket_query_client_test.go index e51bb7e7a5..aaca124c4b 100644 --- a/rpc/backend/feemarket_query_client_test.go +++ b/rpc/backend/feemarket_query_client_test.go @@ -4,8 +4,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpc "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpc "github.com/zeta-chain/node/rpc/types" ) var _ feemarkettypes.QueryClient = &mocks.FeeMarketQueryClient{} diff --git a/rpc/backend/filters_test.go b/rpc/backend/filters_test.go index 56bc32ad2d..92cfc3589e 100644 --- a/rpc/backend/filters_test.go +++ b/rpc/backend/filters_test.go @@ -8,8 +8,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - ethrpc "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend/mocks" + ethrpc "github.com/zeta-chain/node/rpc/types" ) func (suite *BackendTestSuite) TestGetLogs() { diff --git a/rpc/backend/node_info.go b/rpc/backend/node_info.go index 7c661c3fb1..0a5c9c0b0b 100644 --- a/rpc/backend/node_info.go +++ b/rpc/backend/node_info.go @@ -39,7 +39,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // Accounts returns the list of accounts available to this node. diff --git a/rpc/backend/node_info_test.go b/rpc/backend/node_info_test.go index ccfc3fe551..f3bd80b447 100644 --- a/rpc/backend/node_info_test.go +++ b/rpc/backend/node_info_test.go @@ -17,7 +17,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" + "github.com/zeta-chain/node/rpc/backend/mocks" ) func (suite *BackendTestSuite) TestRPCMinGasPrice() { diff --git a/rpc/backend/sign_tx_test.go b/rpc/backend/sign_tx_test.go index 791befec4c..1483b0b5e0 100644 --- a/rpc/backend/sign_tx_test.go +++ b/rpc/backend/sign_tx_test.go @@ -18,7 +18,7 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" + "github.com/zeta-chain/node/rpc/backend/mocks" ) func (suite *BackendTestSuite) TestSendTransaction() { diff --git a/rpc/backend/tracing.go b/rpc/backend/tracing.go index df893bde9e..b228f24c67 100644 --- a/rpc/backend/tracing.go +++ b/rpc/backend/tracing.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // TraceTransaction returns the structured logs created during the execution of EVM diff --git a/rpc/backend/tracing_test.go b/rpc/backend/tracing_test.go index d03c85ddb1..e548cd336d 100644 --- a/rpc/backend/tracing_test.go +++ b/rpc/backend/tracing_test.go @@ -15,7 +15,7 @@ import ( "github.com/zeta-chain/ethermint/indexer" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" + "github.com/zeta-chain/node/rpc/backend/mocks" ) func (suite *BackendTestSuite) TestTraceTransaction() { diff --git a/rpc/backend/tx_info.go b/rpc/backend/tx_info.go index e195efb49c..3d2810331d 100644 --- a/rpc/backend/tx_info.go +++ b/rpc/backend/tx_info.go @@ -30,7 +30,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // GetTransactionByHash returns the Ethereum format transaction identified by Ethereum transaction hash diff --git a/rpc/backend/tx_info_test.go b/rpc/backend/tx_info_test.go index 8aa336f57d..abdf95161b 100644 --- a/rpc/backend/tx_info_test.go +++ b/rpc/backend/tx_info_test.go @@ -17,9 +17,9 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "google.golang.org/grpc/metadata" - "github.com/zeta-chain/zetacore/rpc/backend/mocks" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/rpc/backend/mocks" + rpctypes "github.com/zeta-chain/node/rpc/types" + "github.com/zeta-chain/node/testutil/sample" ) func (suite *BackendTestSuite) TestGetSyntheticTransactionByHash() { diff --git a/rpc/backend/utils.go b/rpc/backend/utils.go index 21fd67e2df..bada8750c6 100644 --- a/rpc/backend/utils.go +++ b/rpc/backend/utils.go @@ -36,7 +36,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/types" ) type txGasAndReward struct { diff --git a/rpc/namespaces/ethereum/debug/api.go b/rpc/namespaces/ethereum/debug/api.go index 9608fa7d67..27c4ec5500 100644 --- a/rpc/namespaces/ethereum/debug/api.go +++ b/rpc/namespaces/ethereum/debug/api.go @@ -37,9 +37,9 @@ import ( stderrors "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - "github.com/zeta-chain/zetacore/rpc/backend" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/rpc/backend" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // HandlerT keeps track of the cpu profiler and trace execution diff --git a/rpc/namespaces/ethereum/debug/trace.go b/rpc/namespaces/ethereum/debug/trace.go index ae35b16fc2..2fd5a725df 100644 --- a/rpc/namespaces/ethereum/debug/trace.go +++ b/rpc/namespaces/ethereum/debug/trace.go @@ -26,7 +26,7 @@ import ( stderrors "github.com/pkg/errors" - zetaos "github.com/zeta-chain/zetacore/pkg/os" + zetaos "github.com/zeta-chain/node/pkg/os" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/rpc/namespaces/ethereum/debug/utils.go b/rpc/namespaces/ethereum/debug/utils.go index be318ddf2e..1709d45348 100644 --- a/rpc/namespaces/ethereum/debug/utils.go +++ b/rpc/namespaces/ethereum/debug/utils.go @@ -22,7 +22,7 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/server" - zetaos "github.com/zeta-chain/zetacore/pkg/os" + zetaos "github.com/zeta-chain/node/pkg/os" ) // isCPUProfileConfigurationActivated checks if cpuprofile was configured via flag diff --git a/rpc/namespaces/ethereum/eth/api.go b/rpc/namespaces/ethereum/eth/api.go index 25b8c99137..da8474d963 100644 --- a/rpc/namespaces/ethereum/eth/api.go +++ b/rpc/namespaces/ethereum/eth/api.go @@ -26,8 +26,8 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend" - rpctypes "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend" + rpctypes "github.com/zeta-chain/node/rpc/types" ) // The Ethereum API allows applications to connect to an Evmos node that is diff --git a/rpc/namespaces/ethereum/eth/filters/api.go b/rpc/namespaces/ethereum/eth/filters/api.go index ffa0611fcf..7b6d3d9ff3 100644 --- a/rpc/namespaces/ethereum/eth/filters/api.go +++ b/rpc/namespaces/ethereum/eth/filters/api.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/types" ) // FilterAPI gathers diff --git a/rpc/namespaces/ethereum/eth/filters/filter_system.go b/rpc/namespaces/ethereum/eth/filters/filter_system.go index 1427916df9..a6d9d2d6be 100644 --- a/rpc/namespaces/ethereum/eth/filters/filter_system.go +++ b/rpc/namespaces/ethereum/eth/filters/filter_system.go @@ -35,7 +35,7 @@ import ( "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/ethereum/pubsub" + "github.com/zeta-chain/node/rpc/ethereum/pubsub" ) var ( diff --git a/rpc/namespaces/ethereum/eth/filters/filters.go b/rpc/namespaces/ethereum/eth/filters/filters.go index fe975dcc62..5358c6eaeb 100644 --- a/rpc/namespaces/ethereum/eth/filters/filters.go +++ b/rpc/namespaces/ethereum/eth/filters/filters.go @@ -29,8 +29,8 @@ import ( "github.com/ethereum/go-ethereum/eth/filters" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/rpc/backend" - "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/backend" + "github.com/zeta-chain/node/rpc/types" ) // BloomIV represents the bit indexes and value inside the bloom filter that belong diff --git a/rpc/namespaces/ethereum/miner/api.go b/rpc/namespaces/ethereum/miner/api.go index 3e4abc9900..b20347e5bd 100644 --- a/rpc/namespaces/ethereum/miner/api.go +++ b/rpc/namespaces/ethereum/miner/api.go @@ -21,7 +21,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/zeta-chain/zetacore/rpc/backend" + "github.com/zeta-chain/node/rpc/backend" ) // API is the private miner prefixed set of APIs in the Miner JSON-RPC spec. diff --git a/rpc/namespaces/ethereum/personal/api.go b/rpc/namespaces/ethereum/personal/api.go index 4420857799..49e0acfd60 100644 --- a/rpc/namespaces/ethereum/personal/api.go +++ b/rpc/namespaces/ethereum/personal/api.go @@ -32,7 +32,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/backend" + "github.com/zeta-chain/node/rpc/backend" ) // PrivateAccountAPI is the personal_ prefixed set of APIs in the Web3 JSON-RPC spec. diff --git a/rpc/namespaces/ethereum/txpool/api.go b/rpc/namespaces/ethereum/txpool/api.go index c42c50b725..e1b346a43e 100644 --- a/rpc/namespaces/ethereum/txpool/api.go +++ b/rpc/namespaces/ethereum/txpool/api.go @@ -19,7 +19,7 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/zeta-chain/zetacore/rpc/types" + "github.com/zeta-chain/node/rpc/types" ) // PublicAPI offers and API for the transaction pool. It only operates on data that is non-confidential. diff --git a/rpc/namespaces/ethereum/web3/api.go b/rpc/namespaces/ethereum/web3/api.go index 77f01d6bac..7181ffd145 100644 --- a/rpc/namespaces/ethereum/web3/api.go +++ b/rpc/namespaces/ethereum/web3/api.go @@ -22,7 +22,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" ) // PublicAPI is the web3_ prefixed set of APIs in the Web3 JSON-RPC spec. diff --git a/rpc/websockets.go b/rpc/websockets.go index 48f357de26..c977c41acc 100644 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -41,10 +41,10 @@ import ( "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/rpc/ethereum/pubsub" - rpcfilters "github.com/zeta-chain/zetacore/rpc/namespaces/ethereum/eth/filters" - "github.com/zeta-chain/zetacore/rpc/types" - "github.com/zeta-chain/zetacore/server/config" + "github.com/zeta-chain/node/rpc/ethereum/pubsub" + rpcfilters "github.com/zeta-chain/node/rpc/namespaces/ethereum/eth/filters" + "github.com/zeta-chain/node/rpc/types" + "github.com/zeta-chain/node/server/config" ) const ( diff --git a/scripts/protoc-gen-go.sh b/scripts/protoc-gen-go.sh index 819f5769db..9893ca9d6d 100755 --- a/scripts/protoc-gen-go.sh +++ b/scripts/protoc-gen-go.sh @@ -18,5 +18,5 @@ done cd .. # Move proto files to the right places. -cp -r github.com/zeta-chain/zetacore/* ./ +cp -r github.com/zeta-chain/node/* ./ rm -rf github.com \ No newline at end of file diff --git a/server/json_rpc.go b/server/json_rpc.go index 4b17ccf413..47315892cd 100644 --- a/server/json_rpc.go +++ b/server/json_rpc.go @@ -28,8 +28,8 @@ import ( "github.com/rs/cors" ethermint "github.com/zeta-chain/ethermint/types" - "github.com/zeta-chain/zetacore/rpc" - "github.com/zeta-chain/zetacore/server/config" + "github.com/zeta-chain/node/rpc" + "github.com/zeta-chain/node/server/config" ) // StartJSONRPC starts the JSON-RPC server diff --git a/server/start.go b/server/start.go index 0301408f91..09bb9215c0 100644 --- a/server/start.go +++ b/server/start.go @@ -58,9 +58,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - zetaos "github.com/zeta-chain/zetacore/pkg/os" - "github.com/zeta-chain/zetacore/server/config" - srvflags "github.com/zeta-chain/zetacore/server/flags" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/server/config" + srvflags "github.com/zeta-chain/node/server/flags" ) // DBOpener is a function to open `application.db`, potentially with customized options. diff --git a/server/util.go b/server/util.go index b8a5d5ea63..f7e7374c5b 100644 --- a/server/util.go +++ b/server/util.go @@ -31,7 +31,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/net/netutil" - "github.com/zeta-chain/zetacore/server/config" + "github.com/zeta-chain/node/server/config" ) // AddCommands adds server commands diff --git a/testutil/keeper/authority.go b/testutil/keeper/authority.go index 34b917f2d4..5ea70f112d 100644 --- a/testutil/keeper/authority.go +++ b/testutil/keeper/authority.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) var ( diff --git a/testutil/keeper/codec.go b/testutil/keeper/codec.go index d9be189d04..bec28e5e14 100644 --- a/testutil/keeper/codec.go +++ b/testutil/keeper/codec.go @@ -16,10 +16,10 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func NewCodec() *codec.ProtoCodec { diff --git a/testutil/keeper/config.go b/testutil/keeper/config.go index ec42304a64..58826dd5a7 100644 --- a/testutil/keeper/config.go +++ b/testutil/keeper/config.go @@ -22,12 +22,12 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/testutil/keeper/crosschain.go b/testutil/keeper/crosschain.go index aae70a32f6..aade2afdeb 100644 --- a/testutil/keeper/crosschain.go +++ b/testutil/keeper/crosschain.go @@ -18,20 +18,20 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschainmocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/crosschain" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritykeeper "github.com/zeta-chain/zetacore/x/authority/keeper" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclientkeeper "github.com/zeta-chain/zetacore/x/lightclient/keeper" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschainmocks "github.com/zeta-chain/node/testutil/keeper/mocks/crosschain" + "github.com/zeta-chain/node/testutil/sample" + authoritykeeper "github.com/zeta-chain/node/x/authority/keeper" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclientkeeper "github.com/zeta-chain/node/x/lightclient/keeper" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) type CrosschainMockOptions struct { diff --git a/testutil/keeper/emissions.go b/testutil/keeper/emissions.go index 903b7457c2..99c385f72d 100644 --- a/testutil/keeper/emissions.go +++ b/testutil/keeper/emissions.go @@ -12,9 +12,9 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/require" - emissionsmocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/emissions" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + emissionsmocks "github.com/zeta-chain/node/testutil/keeper/mocks/emissions" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) type EmissionMockOptions struct { diff --git a/testutil/keeper/fungible.go b/testutil/keeper/fungible.go index a4e4dc406e..aa0e975c97 100644 --- a/testutil/keeper/fungible.go +++ b/testutil/keeper/fungible.go @@ -18,17 +18,17 @@ import ( "github.com/zeta-chain/ethermint/x/evm/statedb" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - fungiblemocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/fungible" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritykeeper "github.com/zeta-chain/zetacore/x/authority/keeper" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - fungiblemodule "github.com/zeta-chain/zetacore/x/fungible" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" - lightclientkeeper "github.com/zeta-chain/zetacore/x/lightclient/keeper" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + fungiblemocks "github.com/zeta-chain/node/testutil/keeper/mocks/fungible" + "github.com/zeta-chain/node/testutil/sample" + authoritykeeper "github.com/zeta-chain/node/x/authority/keeper" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + fungiblemodule "github.com/zeta-chain/node/x/fungible" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" + lightclientkeeper "github.com/zeta-chain/node/x/lightclient/keeper" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) type FungibleMockOptions struct { diff --git a/testutil/keeper/ibccrosschain.go b/testutil/keeper/ibccrosschain.go index d90e485002..95cf7559e7 100644 --- a/testutil/keeper/ibccrosschain.go +++ b/testutil/keeper/ibccrosschain.go @@ -11,9 +11,9 @@ import ( capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" "github.com/stretchr/testify/require" - ibccrosschainmocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/ibccrosschain" - "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + ibccrosschainmocks "github.com/zeta-chain/node/testutil/keeper/mocks/ibccrosschain" + "github.com/zeta-chain/node/x/ibccrosschain/keeper" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) type IBCCroscchainMockOptions struct { diff --git a/testutil/keeper/keeper.go b/testutil/keeper/keeper.go index c33e0686f5..0582c4232f 100644 --- a/testutil/keeper/keeper.go +++ b/testutil/keeper/keeper.go @@ -47,28 +47,28 @@ import ( feemarketkeeper "github.com/zeta-chain/ethermint/x/feemarket/keeper" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritymodule "github.com/zeta-chain/zetacore/x/authority" - authoritykeeper "github.com/zeta-chain/zetacore/x/authority/keeper" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschainmodule "github.com/zeta-chain/zetacore/x/crosschain" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionsmodule "github.com/zeta-chain/zetacore/x/emissions" - emissionskeeper "github.com/zeta-chain/zetacore/x/emissions/keeper" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungiblemodule "github.com/zeta-chain/zetacore/x/fungible" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - ibccrosschainmodule "github.com/zeta-chain/zetacore/x/ibccrosschain" - ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" - ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types" - lightclientmodule "github.com/zeta-chain/zetacore/x/lightclient" - lightclientkeeper "github.com/zeta-chain/zetacore/x/lightclient/keeper" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observermodule "github.com/zeta-chain/zetacore/x/observer" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + authoritymodule "github.com/zeta-chain/node/x/authority" + authoritykeeper "github.com/zeta-chain/node/x/authority/keeper" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschainmodule "github.com/zeta-chain/node/x/crosschain" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionsmodule "github.com/zeta-chain/node/x/emissions" + emissionskeeper "github.com/zeta-chain/node/x/emissions/keeper" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungiblemodule "github.com/zeta-chain/node/x/fungible" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + ibccrosschainmodule "github.com/zeta-chain/node/x/ibccrosschain" + ibccrosschainkeeper "github.com/zeta-chain/node/x/ibccrosschain/keeper" + ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types" + lightclientmodule "github.com/zeta-chain/node/x/lightclient" + lightclientkeeper "github.com/zeta-chain/node/x/lightclient/keeper" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observermodule "github.com/zeta-chain/node/x/observer" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // NewContext creates a new sdk.Context for testing purposes with initialized header diff --git a/testutil/keeper/lightclient.go b/testutil/keeper/lightclient.go index 62aa09288e..85702b247e 100644 --- a/testutil/keeper/lightclient.go +++ b/testutil/keeper/lightclient.go @@ -12,9 +12,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - lightclientmocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/lightclient" - "github.com/zeta-chain/zetacore/x/lightclient/keeper" - "github.com/zeta-chain/zetacore/x/lightclient/types" + lightclientmocks "github.com/zeta-chain/node/testutil/keeper/mocks/lightclient" + "github.com/zeta-chain/node/x/lightclient/keeper" + "github.com/zeta-chain/node/x/lightclient/types" ) // LightclientMockOptions represents options for instantiating a lightclient keeper with mocks diff --git a/testutil/keeper/mocks/crosschain/authority.go b/testutil/keeper/mocks/crosschain/authority.go index d38c117dd6..7dafb1331b 100644 --- a/testutil/keeper/mocks/crosschain/authority.go +++ b/testutil/keeper/mocks/crosschain/authority.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/crosschain/fungible.go b/testutil/keeper/mocks/crosschain/fungible.go index f7445a0785..e7cd2bfe09 100644 --- a/testutil/keeper/mocks/crosschain/fungible.go +++ b/testutil/keeper/mocks/crosschain/fungible.go @@ -6,13 +6,13 @@ import ( big "math/big" common "github.com/ethereum/go-ethereum/common" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" mock "github.com/stretchr/testify/mock" diff --git a/testutil/keeper/mocks/crosschain/lightclient.go b/testutil/keeper/mocks/crosschain/lightclient.go index d5ee740bc3..0f94d1e673 100644 --- a/testutil/keeper/mocks/crosschain/lightclient.go +++ b/testutil/keeper/mocks/crosschain/lightclient.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + proofs "github.com/zeta-chain/node/pkg/proofs" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/crosschain/observer.go b/testutil/keeper/mocks/crosschain/observer.go index c90c15c3a6..131224883e 100644 --- a/testutil/keeper/mocks/crosschain/observer.go +++ b/testutil/keeper/mocks/crosschain/observer.go @@ -3,14 +3,14 @@ package mocks import ( - chains "github.com/zeta-chain/zetacore/pkg/chains" - coin "github.com/zeta-chain/zetacore/pkg/coin" + chains "github.com/zeta-chain/node/pkg/chains" + coin "github.com/zeta-chain/node/pkg/coin" context "context" mock "github.com/stretchr/testify/mock" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/emissions/observer.go b/testutil/keeper/mocks/emissions/observer.go index 594f090907..501cc68d43 100644 --- a/testutil/keeper/mocks/emissions/observer.go +++ b/testutil/keeper/mocks/emissions/observer.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/fungible/authority.go b/testutil/keeper/mocks/fungible/authority.go index ed9dbd0e28..214834ac86 100644 --- a/testutil/keeper/mocks/fungible/authority.go +++ b/testutil/keeper/mocks/fungible/authority.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/fungible/observer.go b/testutil/keeper/mocks/fungible/observer.go index 7a003686e4..ecbfe27684 100644 --- a/testutil/keeper/mocks/fungible/observer.go +++ b/testutil/keeper/mocks/fungible/observer.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/lightclient/authority.go b/testutil/keeper/mocks/lightclient/authority.go index 8d058dbfc0..8bedef7dfc 100644 --- a/testutil/keeper/mocks/lightclient/authority.go +++ b/testutil/keeper/mocks/lightclient/authority.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/mocks/mocks.go b/testutil/keeper/mocks/mocks.go index 35499dd790..7b6a82f4c8 100644 --- a/testutil/keeper/mocks/mocks.go +++ b/testutil/keeper/mocks/mocks.go @@ -1,12 +1,12 @@ package mocks import ( - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) /** diff --git a/testutil/keeper/mocks/observer/authority.go b/testutil/keeper/mocks/observer/authority.go index 9150ffcfc5..24a105fb4d 100644 --- a/testutil/keeper/mocks/observer/authority.go +++ b/testutil/keeper/mocks/observer/authority.go @@ -3,8 +3,8 @@ package mocks import ( - chains "github.com/zeta-chain/zetacore/pkg/chains" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + chains "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" mock "github.com/stretchr/testify/mock" diff --git a/testutil/keeper/mocks/observer/lightclient.go b/testutil/keeper/mocks/observer/lightclient.go index 442d006a5f..24cbf09bb4 100644 --- a/testutil/keeper/mocks/observer/lightclient.go +++ b/testutil/keeper/mocks/observer/lightclient.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + proofs "github.com/zeta-chain/node/pkg/proofs" types "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/keeper/observer.go b/testutil/keeper/observer.go index c45d988045..d84f722b0c 100644 --- a/testutil/keeper/observer.go +++ b/testutil/keeper/observer.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - observermocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/observer" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + observermocks "github.com/zeta-chain/node/testutil/keeper/mocks/observer" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) // ObserverMockOptions represents options for instantiating an observer keeper with mocks diff --git a/testutil/network/genesis_state.go b/testutil/network/genesis_state.go index 73220ba9a5..f342d41cbb 100644 --- a/testutil/network/genesis_state.go +++ b/testutil/network/genesis_state.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/nullify" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + cmdcfg "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/nullify" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func SetupZetaGenesisState( diff --git a/testutil/network/network_setup.go b/testutil/network/network_setup.go index 0a942aa83b..5a8881854b 100644 --- a/testutil/network/network_setup.go +++ b/testutil/network/network_setup.go @@ -43,7 +43,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/grpc" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" + "github.com/zeta-chain/node/cmd/zetacored/config" ) // package-wide network lock to only allow one test network at a time diff --git a/testutil/sample/authority.go b/testutil/sample/authority.go index d777373282..7544145b25 100644 --- a/testutil/sample/authority.go +++ b/testutil/sample/authority.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) func Policies() authoritytypes.Policies { diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 6742c2d2f1..defc1f217a 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) func RateLimiterFlags() types.RateLimiterFlags { diff --git a/testutil/sample/crypto.go b/testutil/sample/crypto.go index 906b8f6ee0..e14b64f967 100644 --- a/testutil/sample/crypto.go +++ b/testutil/sample/crypto.go @@ -18,8 +18,8 @@ import ( "github.com/gagliardetto/solana-go" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/cosmos" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/cosmos" + "github.com/zeta-chain/node/pkg/crypto" ) func PubKeySet() *crypto.PubKeySet { diff --git a/testutil/sample/emissions.go b/testutil/sample/emissions.go index c5501e4cfc..88f2eabdf7 100644 --- a/testutil/sample/emissions.go +++ b/testutil/sample/emissions.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func WithdrawableEmissions(t *testing.T) types.WithdrawableEmissions { diff --git a/testutil/sample/fungible.go b/testutil/sample/fungible.go index 9d1892e29e..7d4ae17577 100644 --- a/testutil/sample/fungible.go +++ b/testutil/sample/fungible.go @@ -3,9 +3,9 @@ package sample import ( "testing" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/fungible/types" ) func ForeignCoins(t *testing.T, address string) types.ForeignCoins { diff --git a/testutil/sample/lightclient.go b/testutil/sample/lightclient.go index bbb0fc1d9b..3163c6e263 100644 --- a/testutil/sample/lightclient.go +++ b/testutil/sample/lightclient.go @@ -8,11 +8,11 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/pkg/proofs/ethereum" - "github.com/zeta-chain/zetacore/testutil/testdata" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/pkg/proofs/ethereum" + "github.com/zeta-chain/node/testutil/testdata" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" ) func BlockHeader(blockHash []byte) proofs.BlockHeader { diff --git a/testutil/sample/observer.go b/testutil/sample/observer.go index d6935c9bd7..8d0877ce9b 100644 --- a/testutil/sample/observer.go +++ b/testutil/sample/observer.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/cosmos" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/cosmos" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/observer/types" ) func Ballot(t *testing.T, index string) *types.Ballot { diff --git a/testutil/sample/sample.go b/testutil/sample/sample.go index 59c325beed..e07b118ba8 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -17,8 +17,8 @@ import ( ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" ) var ErrSample = errors.New("sample error") diff --git a/testutil/sample/zetaclient.go b/testutil/sample/zetaclient.go index 36f9c7292c..cbeaa9e190 100644 --- a/testutil/sample/zetaclient.go +++ b/testutil/sample/zetaclient.go @@ -1,8 +1,8 @@ package sample import ( - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/zetaclient/types" ) // InboundEvent returns a sample InboundEvent. diff --git a/testutil/simapp/simapp.go b/testutil/simapp/simapp.go index 4bd0f3610b..b42b0b5f1a 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -19,9 +19,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - types2 "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/cmd/zetacored/config" + types2 "github.com/zeta-chain/node/x/emissions/types" ) func Setup(isCheckTx bool) *app.App { diff --git a/x/authority/client/cli/query.go b/x/authority/client/cli/query.go index 687158d917..af9c170c0c 100644 --- a/x/authority/client/cli/query.go +++ b/x/authority/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/authority/client/cli/query_authorization_list.go b/x/authority/client/cli/query_authorization_list.go index a822e9603b..139f6ef9a2 100644 --- a/x/authority/client/cli/query_authorization_list.go +++ b/x/authority/client/cli/query_authorization_list.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // CmdAuthorizationsList shows the list of authorizations diff --git a/x/authority/client/cli/query_chain_info.go b/x/authority/client/cli/query_chain_info.go index 20872224c2..987f4ea080 100644 --- a/x/authority/client/cli/query_chain_info.go +++ b/x/authority/client/cli/query_chain_info.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // CmdShowChainInfo returns the command to show the chain info diff --git a/x/authority/client/cli/query_policies.go b/x/authority/client/cli/query_policies.go index f1cf8a4811..3ea4cbbe06 100644 --- a/x/authority/client/cli/query_policies.go +++ b/x/authority/client/cli/query_policies.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // CmdShowPolicies returns the command to show the policies diff --git a/x/authority/client/cli/tx.go b/x/authority/client/cli/tx.go index 8c1c1396db..6a0cfb803e 100644 --- a/x/authority/client/cli/tx.go +++ b/x/authority/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/authority/client/cli/tx_add_authorization.go b/x/authority/client/cli/tx_add_authorization.go index d1329801a3..f2435b2ce9 100644 --- a/x/authority/client/cli/tx_add_authorization.go +++ b/x/authority/client/cli/tx_add_authorization.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) func CmdAddAuthorization() *cobra.Command { diff --git a/x/authority/client/cli/tx_add_authorizations_test.go b/x/authority/client/cli/tx_add_authorizations_test.go index 5c5042ee36..c14dc636e2 100644 --- a/x/authority/client/cli/tx_add_authorizations_test.go +++ b/x/authority/client/cli/tx_add_authorizations_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/authority/client/cli" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/client/cli" + "github.com/zeta-chain/node/x/authority/types" ) func Test_GetPolicyType(t *testing.T) { diff --git a/x/authority/client/cli/tx_remove_authorization.go b/x/authority/client/cli/tx_remove_authorization.go index 3fee09f12f..47ac058480 100644 --- a/x/authority/client/cli/tx_remove_authorization.go +++ b/x/authority/client/cli/tx_remove_authorization.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) func CmdRemoveAuthorization() *cobra.Command { diff --git a/x/authority/client/cli/tx_update_chain_info.go b/x/authority/client/cli/tx_update_chain_info.go index 4a2f4b93eb..ff133577a1 100644 --- a/x/authority/client/cli/tx_update_chain_info.go +++ b/x/authority/client/cli/tx_update_chain_info.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) func CmdUpdateChainInfo() *cobra.Command { diff --git a/x/authority/client/cli/tx_update_chain_info_test.go b/x/authority/client/cli/tx_update_chain_info_test.go index e7a4d5c23c..10581a8c5e 100644 --- a/x/authority/client/cli/tx_update_chain_info_test.go +++ b/x/authority/client/cli/tx_update_chain_info_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/testdata" - "github.com/zeta-chain/zetacore/x/authority/client/cli" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/testdata" + "github.com/zeta-chain/node/x/authority/client/cli" ) func TestReadChainInfoFromFile(t *testing.T) { diff --git a/x/authority/client/cli/tx_update_policies.go b/x/authority/client/cli/tx_update_policies.go index 69b8cd71f0..206de7846b 100644 --- a/x/authority/client/cli/tx_update_policies.go +++ b/x/authority/client/cli/tx_update_policies.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) func CmdUpdatePolicies() *cobra.Command { diff --git a/x/authority/client/cli/tx_update_policies_test.go b/x/authority/client/cli/tx_update_policies_test.go index 35756605c9..2b2e105e60 100644 --- a/x/authority/client/cli/tx_update_policies_test.go +++ b/x/authority/client/cli/tx_update_policies_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/testdata" - "github.com/zeta-chain/zetacore/x/authority/client/cli" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/testutil/testdata" + "github.com/zeta-chain/node/x/authority/client/cli" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) func TestReadPoliciesFromFile(t *testing.T) { diff --git a/x/authority/genesis.go b/x/authority/genesis.go index 06dbaa7e57..0003ee9be3 100644 --- a/x/authority/genesis.go +++ b/x/authority/genesis.go @@ -3,8 +3,8 @@ package authority import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) // InitGenesis initializes the authority module's state from a provided genesis state diff --git a/x/authority/genesis_test.go b/x/authority/genesis_test.go index 59176ae91e..3388bdd83b 100644 --- a/x/authority/genesis_test.go +++ b/x/authority/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority" + "github.com/zeta-chain/node/x/authority/types" ) func TestGenesis(t *testing.T) { diff --git a/x/authority/keeper/authorization_list.go b/x/authority/keeper/authorization_list.go index 4464b7b640..aa30fdbe19 100644 --- a/x/authority/keeper/authorization_list.go +++ b/x/authority/keeper/authorization_list.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // SetAuthorizationList sets the authorization list to the store.It returns an error if the list is invalid. diff --git a/x/authority/keeper/authorization_list_test.go b/x/authority/keeper/authorization_list_test.go index a4c0d0e7bd..ebd095c1d8 100644 --- a/x/authority/keeper/authorization_list_test.go +++ b/x/authority/keeper/authorization_list_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_GetAuthorizationList(t *testing.T) { diff --git a/x/authority/keeper/chain_info.go b/x/authority/keeper/chain_info.go index 557ef7f1c4..fab0c0eef1 100644 --- a/x/authority/keeper/chain_info.go +++ b/x/authority/keeper/chain_info.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/authority/types" ) // SetChainInfo sets the chain info to the store diff --git a/x/authority/keeper/chain_info_test.go b/x/authority/keeper/chain_info_test.go index 59f1714504..054c1025d3 100644 --- a/x/authority/keeper/chain_info_test.go +++ b/x/authority/keeper/chain_info_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_SetChainInfo(t *testing.T) { diff --git a/x/authority/keeper/grpc_query.go b/x/authority/keeper/grpc_query.go index 1c9c7387e6..9f81cce742 100644 --- a/x/authority/keeper/grpc_query.go +++ b/x/authority/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/authority/keeper/grpc_query_authorization_list.go b/x/authority/keeper/grpc_query_authorization_list.go index 34c3f89708..8d8cab3296 100644 --- a/x/authority/keeper/grpc_query_authorization_list.go +++ b/x/authority/keeper/grpc_query_authorization_list.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // AuthorizationList returns the list of authorizations diff --git a/x/authority/keeper/grpc_query_authothorization_list_test.go b/x/authority/keeper/grpc_query_authothorization_list_test.go index 47148309c5..f04783b3b9 100644 --- a/x/authority/keeper/grpc_query_authothorization_list_test.go +++ b/x/authority/keeper/grpc_query_authothorization_list_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) func TestKeeper_Authorization(t *testing.T) { diff --git a/x/authority/keeper/grpc_query_chain_info.go b/x/authority/keeper/grpc_query_chain_info.go index f3632d71a6..64a4af9e64 100644 --- a/x/authority/keeper/grpc_query_chain_info.go +++ b/x/authority/keeper/grpc_query_chain_info.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/authority/types" ) // ChainInfo queries chain info diff --git a/x/authority/keeper/grpc_query_chain_info_test.go b/x/authority/keeper/grpc_query_chain_info_test.go index bd20475a31..206029c821 100644 --- a/x/authority/keeper/grpc_query_chain_info_test.go +++ b/x/authority/keeper/grpc_query_chain_info_test.go @@ -1,14 +1,14 @@ package keeper_test import ( - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" "testing" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestKeeper_ChainInfo(t *testing.T) { diff --git a/x/authority/keeper/grpc_query_policies.go b/x/authority/keeper/grpc_query_policies.go index fcabed9bb7..59bc732b6d 100644 --- a/x/authority/keeper/grpc_query_policies.go +++ b/x/authority/keeper/grpc_query_policies.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // Policies queries policies diff --git a/x/authority/keeper/grpc_query_policies_test.go b/x/authority/keeper/grpc_query_policies_test.go index fd8009f097..2eea282cc9 100644 --- a/x/authority/keeper/grpc_query_policies_test.go +++ b/x/authority/keeper/grpc_query_policies_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestKeeper_Policies(t *testing.T) { diff --git a/x/authority/keeper/keeper.go b/x/authority/keeper/keeper.go index d75fd98960..d4aca1653f 100644 --- a/x/authority/keeper/keeper.go +++ b/x/authority/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine diff --git a/x/authority/keeper/migrator.go b/x/authority/keeper/migrator.go index 9edf014b1d..e94adebb6d 100644 --- a/x/authority/keeper/migrator.go +++ b/x/authority/keeper/migrator.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/zeta-chain/zetacore/x/authority/migrations/v2" + v2 "github.com/zeta-chain/node/x/authority/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/authority/keeper/msg_server.go b/x/authority/keeper/msg_server.go index 976679fd31..a5d211bc87 100644 --- a/x/authority/keeper/msg_server.go +++ b/x/authority/keeper/msg_server.go @@ -1,6 +1,6 @@ package keeper -import "github.com/zeta-chain/zetacore/x/authority/types" +import "github.com/zeta-chain/node/x/authority/types" type msgServer struct { Keeper diff --git a/x/authority/keeper/msg_server_add_authorization.go b/x/authority/keeper/msg_server_add_authorization.go index 3c3247fc4e..95f3d7d59c 100644 --- a/x/authority/keeper/msg_server_add_authorization.go +++ b/x/authority/keeper/msg_server_add_authorization.go @@ -6,7 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // AddAuthorization defines a method to add an authorization.If the authorization already exists, it will be overwritten with the provided policy. diff --git a/x/authority/keeper/msg_server_add_authorization_test.go b/x/authority/keeper/msg_server_add_authorization_test.go index f761935a0c..fc5ca8216f 100644 --- a/x/authority/keeper/msg_server_add_authorization_test.go +++ b/x/authority/keeper/msg_server_add_authorization_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgServer_AddAuthorization(t *testing.T) { diff --git a/x/authority/keeper/msg_server_remove_authorization.go b/x/authority/keeper/msg_server_remove_authorization.go index 671406429c..2765a856de 100644 --- a/x/authority/keeper/msg_server_remove_authorization.go +++ b/x/authority/keeper/msg_server_remove_authorization.go @@ -7,7 +7,7 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // RemoveAuthorization defines a method to remove an authorization. diff --git a/x/authority/keeper/msg_server_remove_authorization_test.go b/x/authority/keeper/msg_server_remove_authorization_test.go index 6e39ab4701..3fabe835b7 100644 --- a/x/authority/keeper/msg_server_remove_authorization_test.go +++ b/x/authority/keeper/msg_server_remove_authorization_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgServer_RemoveAuthorization(t *testing.T) { diff --git a/x/authority/keeper/msg_server_update_chain_info.go b/x/authority/keeper/msg_server_update_chain_info.go index 5200e073e3..64d773e25f 100644 --- a/x/authority/keeper/msg_server_update_chain_info.go +++ b/x/authority/keeper/msg_server_update_chain_info.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // UpdateChainInfo updates the chain info structure that adds new static chain info or overwrite existing chain info diff --git a/x/authority/keeper/msg_server_update_chain_info_test.go b/x/authority/keeper/msg_server_update_chain_info_test.go index 47073bf70b..1964688a3a 100644 --- a/x/authority/keeper/msg_server_update_chain_info_test.go +++ b/x/authority/keeper/msg_server_update_chain_info_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgServer_UpdateChainInfo(t *testing.T) { diff --git a/x/authority/keeper/msg_server_update_policies.go b/x/authority/keeper/msg_server_update_policies.go index c7c21c0805..9f6468dd76 100644 --- a/x/authority/keeper/msg_server_update_policies.go +++ b/x/authority/keeper/msg_server_update_policies.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // UpdatePolicies updates policies diff --git a/x/authority/keeper/msg_server_update_policies_test.go b/x/authority/keeper/msg_server_update_policies_test.go index 45762edfe6..755ac34a09 100644 --- a/x/authority/keeper/msg_server_update_policies_test.go +++ b/x/authority/keeper/msg_server_update_policies_test.go @@ -7,10 +7,10 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgServer_UpdatePolicies(t *testing.T) { diff --git a/x/authority/keeper/policies.go b/x/authority/keeper/policies.go index cd04a23d34..2840e93d94 100644 --- a/x/authority/keeper/policies.go +++ b/x/authority/keeper/policies.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) // SetPolicies sets the policies to the store diff --git a/x/authority/keeper/policies_test.go b/x/authority/keeper/policies_test.go index 3cb7f486a6..d8b11fc487 100644 --- a/x/authority/keeper/policies_test.go +++ b/x/authority/keeper/policies_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_SetPolicies(t *testing.T) { diff --git a/x/authority/migrations/v2/migrate.go b/x/authority/migrations/v2/migrate.go index 8eb747fced..dfcbe7dc85 100644 --- a/x/authority/migrations/v2/migrate.go +++ b/x/authority/migrations/v2/migrate.go @@ -3,7 +3,7 @@ package v2 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) type authorityKeeper interface { diff --git a/x/authority/migrations/v2/migrate_test.go b/x/authority/migrations/v2/migrate_test.go index d8cbdbf6fe..48c7a19f23 100644 --- a/x/authority/migrations/v2/migrate_test.go +++ b/x/authority/migrations/v2/migrate_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - v2 "github.com/zeta-chain/zetacore/x/authority/migrations/v2" - "github.com/zeta-chain/zetacore/x/authority/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + v2 "github.com/zeta-chain/node/x/authority/migrations/v2" + "github.com/zeta-chain/node/x/authority/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/authority/module.go b/x/authority/module.go index 696c9c1edb..9b106c9989 100644 --- a/x/authority/module.go +++ b/x/authority/module.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/authority/client/cli" - "github.com/zeta-chain/zetacore/x/authority/keeper" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/client/cli" + "github.com/zeta-chain/node/x/authority/keeper" + "github.com/zeta-chain/node/x/authority/types" ) var ( diff --git a/x/authority/types/authorization.pb.go b/x/authority/types/authorization.pb.go index d8c5fa9292..ed3830774e 100644 --- a/x/authority/types/authorization.pb.go +++ b/x/authority/types/authorization.pb.go @@ -134,7 +134,7 @@ func init() { } var fileDescriptor_b7303e09de7c755a = []byte{ - // 271 bytes of a gzipped FileDescriptorProto + // 276 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xa8, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x13, 0x4b, 0x4b, 0x32, 0xf2, 0x8b, 0x32, 0x4b, 0x2a, 0x61, 0xac, 0xaa, 0xc4, 0x92, 0xcc, 0xfc, 0x3c, 0xbd, 0x82, 0xa2, @@ -147,11 +147,12 @@ var fileDescriptor_b7303e09de7c755a = []byte{ 0xf5, 0x02, 0xc0, 0x6a, 0x43, 0x2a, 0x0b, 0x52, 0x83, 0x04, 0x10, 0x46, 0x40, 0x44, 0x95, 0xf2, 0xb8, 0x04, 0x51, 0x1c, 0xe0, 0x93, 0x59, 0x5c, 0x22, 0x14, 0xc9, 0xc5, 0x87, 0x12, 0x1a, 0xc5, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0xda, 0xf8, 0x2d, 0x42, 0x31, 0xc8, 0x89, 0xe5, 0xc4, - 0x3d, 0x79, 0x86, 0x20, 0x34, 0x83, 0x9c, 0xbc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, + 0x3d, 0x79, 0x86, 0x20, 0x34, 0x83, 0x9c, 0xdc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, - 0x8e, 0x21, 0xca, 0x20, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x1c, 0x70, - 0xba, 0x68, 0x61, 0x58, 0x81, 0x14, 0x8a, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x30, - 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x88, 0x76, 0x6b, 0x6c, 0xd8, 0x01, 0x00, 0x00, + 0x8e, 0x21, 0x4a, 0x27, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x1c, 0x70, + 0xba, 0x90, 0x30, 0xcc, 0xcb, 0x4f, 0x49, 0xd5, 0xaf, 0x40, 0x0a, 0xc1, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0xf8, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xc9, 0xe9, 0x3a, + 0xd4, 0x01, 0x00, 0x00, } func (m *Authorization) Marshal() (dAtA []byte, err error) { diff --git a/x/authority/types/authorization_list_test.go b/x/authority/types/authorization_list_test.go index 4244e273fe..1585e079ca 100644 --- a/x/authority/types/authorization_list_test.go +++ b/x/authority/types/authorization_list_test.go @@ -8,11 +8,11 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/authority/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/authority/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestAuthorizationList_SetAuthorizations(t *testing.T) { diff --git a/x/authority/types/chain_info.go b/x/authority/types/chain_info.go index cff10235c4..eb6241c7ff 100644 --- a/x/authority/types/chain_info.go +++ b/x/authority/types/chain_info.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) // DefaultChainInfo returns the structure with an empty list of chains diff --git a/x/authority/types/chain_info.pb.go b/x/authority/types/chain_info.pb.go index 9dd945040e..3ad4556857 100644 --- a/x/authority/types/chain_info.pb.go +++ b/x/authority/types/chain_info.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" io "io" math "math" math_bits "math/bits" @@ -80,7 +80,7 @@ func init() { } var fileDescriptor_88c7b2261e38c0a9 = []byte{ - // 206 bytes of a gzipped FileDescriptorProto + // 211 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xad, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x13, 0x4b, 0x4b, 0x32, 0xf2, 0x8b, 0x32, 0x4b, 0x2a, 0xf5, 0xc1, 0x12, 0xf1, 0x99, 0x79, 0x69, 0xf9, 0x7a, 0x05, 0x45, @@ -89,11 +89,12 @@ var fileDescriptor_88c7b2261e38c0a9 = []byte{ 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x44, 0x54, 0xc9, 0x9f, 0x8b, 0xd3, 0x19, 0xa4, 0xca, 0x33, 0x2f, 0x2d, 0x5f, 0xc8, 0x89, 0x8b, 0x0d, 0xa2, 0x45, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x45, 0x0f, 0x8b, 0xed, 0x05, 0xd9, 0xe9, 0x7a, 0x50, 0x83, 0xc1, 0x3a, 0x9d, 0x58, 0x4e, 0xdc, - 0x93, 0x67, 0x08, 0x82, 0xea, 0x74, 0xf2, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, + 0x93, 0x67, 0x08, 0x82, 0xea, 0x74, 0x72, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, - 0x86, 0x28, 0x83, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xb0, 0x6b, 0x75, - 0xd1, 0x1c, 0x5e, 0x81, 0x14, 0x0e, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x37, 0x1a, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x16, 0x2c, 0xe3, 0x34, 0x01, 0x00, 0x00, + 0x86, 0x28, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xb0, 0x6b, 0x75, + 0x21, 0x0e, 0xcf, 0xcb, 0x4f, 0x49, 0xd5, 0xaf, 0x40, 0x0a, 0x83, 0x92, 0xca, 0x82, 0xd4, 0xe2, + 0x24, 0x36, 0xb0, 0xfb, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe1, 0x0e, 0xd3, 0x30, + 0x01, 0x00, 0x00, } func (m *ChainInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/authority/types/chain_info_test.go b/x/authority/types/chain_info_test.go index cffa79f0aa..a78a6da011 100644 --- a/x/authority/types/chain_info_test.go +++ b/x/authority/types/chain_info_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestDefaultChainInfo(t *testing.T) { diff --git a/x/authority/types/genesis.pb.go b/x/authority/types/genesis.pb.go index c4a9f015bc..ab4ec42798 100644 --- a/x/authority/types/genesis.pb.go +++ b/x/authority/types/genesis.pb.go @@ -93,7 +93,7 @@ func init() { } var fileDescriptor_633475075491b169 = []byte{ - // 287 bytes of a gzipped FileDescriptorProto + // 292 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xaa, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x13, 0x4b, 0x4b, 0x32, 0xf2, 0x8b, 0x32, 0x4b, 0x2a, 0xf5, 0xd3, 0x53, 0xf3, 0x52, 0x8b, 0x33, 0x8b, 0xf5, 0x0a, 0x8a, @@ -107,11 +107,12 @@ var fileDescriptor_633475075491b169 = []byte{ 0x42, 0x71, 0x76, 0x7c, 0x4e, 0x66, 0x71, 0x89, 0x04, 0x13, 0xd8, 0x4c, 0x7d, 0xfc, 0x66, 0x3a, 0x22, 0xeb, 0xf3, 0xc9, 0x2c, 0x2e, 0x81, 0x1a, 0x2e, 0x98, 0x88, 0x2e, 0x21, 0xe4, 0xc3, 0xc5, 0x85, 0xf0, 0xaa, 0x04, 0x33, 0xd8, 0x74, 0x75, 0xfc, 0xa6, 0x3b, 0x83, 0x24, 0x3c, 0xf3, 0xd2, - 0xf2, 0xa1, 0xa6, 0x72, 0x26, 0xc3, 0x05, 0xbc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, + 0xf2, 0xa1, 0xa6, 0x72, 0x26, 0xc3, 0x05, 0xdc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, - 0x8e, 0x21, 0xca, 0x20, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x1c, 0xdc, - 0xba, 0x68, 0x21, 0x5f, 0x81, 0x14, 0xf6, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x10, - 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x66, 0xd6, 0x94, 0x51, 0x02, 0x00, 0x00, + 0x8e, 0x21, 0x4a, 0x27, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x1c, 0xdc, + 0xba, 0x90, 0x90, 0xcf, 0xcb, 0x4f, 0x49, 0xd5, 0xaf, 0x40, 0x0a, 0xf7, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0xe8, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xa8, 0x33, 0xdb, + 0x4d, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/authority/types/genesis_test.go b/x/authority/types/genesis_test.go index 92771cdcb3..251a3192ba 100644 --- a/x/authority/types/genesis_test.go +++ b/x/authority/types/genesis_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/authority/types/message_add_authorizations_test.go b/x/authority/types/message_add_authorizations_test.go index dcc970adbd..8e8655a973 100644 --- a/x/authority/types/message_add_authorizations_test.go +++ b/x/authority/types/message_add_authorizations_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgAddAuthorization_ValidateBasic(t *testing.T) { diff --git a/x/authority/types/message_remove_authorizations_test.go b/x/authority/types/message_remove_authorizations_test.go index d9e35e45e0..22abc4aac8 100644 --- a/x/authority/types/message_remove_authorizations_test.go +++ b/x/authority/types/message_remove_authorizations_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgRemoveAuthorization_ValidateBasic(t *testing.T) { diff --git a/x/authority/types/message_update_chain_info_test.go b/x/authority/types/message_update_chain_info_test.go index f0a92f695f..0e77533d16 100644 --- a/x/authority/types/message_update_chain_info_test.go +++ b/x/authority/types/message_update_chain_info_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgUpdateChainInfo_ValidateBasic(t *testing.T) { diff --git a/x/authority/types/message_update_policies_test.go b/x/authority/types/message_update_policies_test.go index 5e3b4ec707..fbe7648fe5 100644 --- a/x/authority/types/message_update_policies_test.go +++ b/x/authority/types/message_update_policies_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) func TestMsgUpdatePolicies_ValidateBasic(t *testing.T) { diff --git a/x/authority/types/policies.pb.go b/x/authority/types/policies.pb.go index c67621c996..dd85e46fb6 100644 --- a/x/authority/types/policies.pb.go +++ b/x/authority/types/policies.pb.go @@ -165,27 +165,27 @@ func init() { } var fileDescriptor_afa9e3e7b996ef74 = []byte{ - // 310 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0xc1, 0x4a, 0x03, 0x31, - 0x14, 0xdc, 0xb4, 0x5a, 0xf5, 0x15, 0xca, 0x12, 0x7a, 0x58, 0x8a, 0x84, 0x52, 0x3c, 0x2c, 0x8a, - 0x59, 0xa9, 0x37, 0x6f, 0x0a, 0x15, 0xf4, 0x62, 0x29, 0x9e, 0x44, 0x90, 0x74, 0x1b, 0xb6, 0x81, - 0x66, 0x13, 0xb2, 0x29, 0x18, 0xbf, 0xc2, 0x8f, 0xf0, 0xe0, 0xa7, 0x78, 0xec, 0xd1, 0xa3, 0xb4, - 0x3f, 0x22, 0xcd, 0xda, 0x55, 0x3c, 0x88, 0xb7, 0x79, 0x8f, 0x99, 0x79, 0x8f, 0x19, 0x38, 0x7a, - 0xe2, 0x96, 0xa5, 0x53, 0x26, 0xf2, 0xc4, 0x23, 0x65, 0x78, 0xc2, 0xe6, 0x76, 0xaa, 0x8c, 0xb0, - 0x2e, 0xd1, 0x6a, 0x26, 0x52, 0xc1, 0x0b, 0xaa, 0x8d, 0xb2, 0x0a, 0xef, 0x57, 0x64, 0xba, 0x21, - 0xd3, 0x8a, 0xdc, 0x69, 0x67, 0x2a, 0x53, 0x9e, 0x98, 0xac, 0x51, 0xa9, 0xe9, 0x49, 0x68, 0x0c, - 0xd7, 0x2e, 0x0e, 0x5f, 0x41, 0xd3, 0xfb, 0xb9, 0x07, 0xeb, 0x34, 0x8f, 0x50, 0x17, 0xc5, 0xad, - 0x7e, 0x4c, 0xff, 0xf2, 0xa4, 0xa5, 0xf4, 0xd6, 0x69, 0x3e, 0x02, 0x5d, 0x61, 0x1c, 0xc1, 0x0e, - 0x9b, 0x4c, 0x0c, 0x2f, 0x8a, 0xa8, 0xd6, 0x45, 0xf1, 0xde, 0x68, 0x33, 0xf6, 0x2e, 0x61, 0x77, - 0xf8, 0xf5, 0x34, 0x3e, 0x83, 0x6d, 0x61, 0xb9, 0x2c, 0x22, 0xd4, 0xad, 0xc7, 0xcd, 0xfe, 0xc1, - 0x7f, 0x4e, 0x8d, 0x4a, 0xc9, 0xe1, 0x3d, 0xc0, 0xf7, 0x6d, 0x8c, 0xa1, 0x95, 0x19, 0x35, 0xd7, - 0x03, 0xc9, 0x4d, 0xc6, 0xf3, 0xd4, 0x85, 0x01, 0x6e, 0x43, 0xe8, 0x77, 0x37, 0x9a, 0x1b, 0x66, - 0x85, 0xca, 0xd9, 0x2c, 0x44, 0xb8, 0x05, 0xe0, 0xb7, 0xe7, 0x13, 0x29, 0xf2, 0xb0, 0x56, 0xcd, - 0x03, 0xa9, 0xad, 0x0b, 0xeb, 0x9d, 0xad, 0xd7, 0x17, 0x82, 0x2e, 0xae, 0xdf, 0x96, 0x04, 0x2d, - 0x96, 0x04, 0x7d, 0x2c, 0x09, 0x7a, 0x5e, 0x91, 0x60, 0xb1, 0x22, 0xc1, 0xfb, 0x8a, 0x04, 0x77, - 0x27, 0x99, 0xb0, 0xd3, 0xf9, 0x98, 0xa6, 0x4a, 0xfa, 0x42, 0x8e, 0x7f, 0x75, 0xf3, 0xf8, 0xa3, - 0x9d, 0x75, 0x8c, 0xc5, 0xb8, 0xe1, 0x73, 0x3e, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x37, 0x5d, - 0x49, 0x63, 0xca, 0x01, 0x00, 0x00, + // 314 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0xcd, 0x4a, 0x33, 0x31, + 0x14, 0x9d, 0xb4, 0xdf, 0x57, 0xf5, 0x16, 0xca, 0x10, 0xba, 0x18, 0x8a, 0x84, 0x52, 0x5c, 0x0c, + 0xfe, 0x64, 0xa0, 0xee, 0xdc, 0x29, 0xb4, 0xe0, 0xca, 0x52, 0x5c, 0x89, 0x20, 0xe9, 0x4c, 0x98, + 0x06, 0x9a, 0x49, 0xc8, 0xa4, 0x60, 0x7c, 0x0a, 0x1f, 0xc2, 0x85, 0x8f, 0xe2, 0xb2, 0x4b, 0x97, + 0xd2, 0xbe, 0x88, 0x34, 0x63, 0x47, 0x57, 0xe2, 0xee, 0xdc, 0xcb, 0x39, 0xe7, 0x5e, 0xce, 0x81, + 0x93, 0x27, 0x6e, 0x59, 0x3a, 0x67, 0xa2, 0x48, 0x3c, 0x52, 0x86, 0x27, 0x6c, 0x69, 0xe7, 0xca, + 0x08, 0xeb, 0x12, 0xad, 0x16, 0x22, 0x15, 0xbc, 0xa4, 0xda, 0x28, 0xab, 0xf0, 0x61, 0x4d, 0xa6, + 0x3b, 0x32, 0xad, 0xc9, 0xbd, 0x6e, 0xae, 0x72, 0xe5, 0x89, 0xc9, 0x16, 0x55, 0x9a, 0x81, 0x84, + 0xd6, 0x64, 0xeb, 0xe2, 0xf0, 0x35, 0xb4, 0xbd, 0x9f, 0x7b, 0xb0, 0x4e, 0xf3, 0x08, 0xf5, 0x51, + 0xdc, 0x19, 0xc6, 0xf4, 0x37, 0x4f, 0x5a, 0x49, 0x6f, 0x9d, 0xe6, 0x53, 0xd0, 0x35, 0xc6, 0x11, + 0xec, 0xb1, 0x2c, 0x33, 0xbc, 0x2c, 0xa3, 0x46, 0x1f, 0xc5, 0x07, 0xd3, 0xdd, 0x38, 0x18, 0xc3, + 0xfe, 0xe4, 0xeb, 0x69, 0x7c, 0x01, 0xff, 0x85, 0xe5, 0xb2, 0x8c, 0x50, 0xbf, 0x19, 0xb7, 0x87, + 0x47, 0x7f, 0x39, 0x35, 0xad, 0x24, 0xc7, 0xf7, 0x00, 0xdf, 0xb7, 0x31, 0x86, 0x4e, 0x6e, 0xd4, + 0x52, 0x8f, 0x24, 0x37, 0x39, 0x2f, 0x52, 0x17, 0x06, 0xb8, 0x0b, 0xa1, 0xdf, 0xdd, 0x68, 0x6e, + 0x98, 0x15, 0xaa, 0x60, 0x8b, 0x10, 0xe1, 0x0e, 0x80, 0xdf, 0x5e, 0x66, 0x52, 0x14, 0x61, 0xa3, + 0x9e, 0x47, 0x52, 0x5b, 0x17, 0x36, 0x7b, 0xff, 0x5e, 0x5f, 0x08, 0xba, 0x1a, 0xbf, 0xad, 0x09, + 0x5a, 0xad, 0x09, 0xfa, 0x58, 0x13, 0xf4, 0xbc, 0x21, 0xc1, 0x6a, 0x43, 0x82, 0xf7, 0x0d, 0x09, + 0xee, 0x4e, 0x73, 0x61, 0xe7, 0xcb, 0x19, 0x4d, 0x95, 0xf4, 0x85, 0x9c, 0x55, 0xdd, 0x14, 0x2a, + 0xe3, 0xc9, 0xe3, 0x8f, 0x66, 0xb6, 0x11, 0x96, 0xb3, 0x96, 0xcf, 0xf8, 0xfc, 0x33, 0x00, 0x00, + 0xff, 0xff, 0x27, 0x56, 0x51, 0xbe, 0xc6, 0x01, 0x00, 0x00, } func (m *Policy) Marshal() (dAtA []byte, err error) { diff --git a/x/authority/types/policies_test.go b/x/authority/types/policies_test.go index 57749b35f6..faa35993a5 100644 --- a/x/authority/types/policies_test.go +++ b/x/authority/types/policies_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/authority/types" ) // setConfig sets the global config to use zeta chain's bech32 prefixes diff --git a/x/authority/types/policy_type_test.go b/x/authority/types/policy_type_test.go index c6778c9200..ce109792c5 100644 --- a/x/authority/types/policy_type_test.go +++ b/x/authority/types/policy_type_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/x/authority/types" ) func TestPolicyType_Validate(t *testing.T) { diff --git a/x/authority/types/query.pb.go b/x/authority/types/query.pb.go index ca13419203..f8d689f7d4 100644 --- a/x/authority/types/query.pb.go +++ b/x/authority/types/query.pb.go @@ -390,43 +390,43 @@ func init() { } var fileDescriptor_5fe6130bc825be8d = []byte{ - // 573 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6b, 0x13, 0x41, - 0x18, 0xc6, 0x33, 0x62, 0x6b, 0x33, 0xd2, 0x43, 0x07, 0xa1, 0xed, 0x52, 0x37, 0x75, 0x91, 0xb4, - 0x58, 0xb3, 0xd3, 0x56, 0x6b, 0x05, 0xbd, 0x58, 0x0f, 0xfe, 0xa1, 0x07, 0x0d, 0x88, 0xe0, 0x25, - 0x4c, 0xd2, 0xe9, 0x66, 0x20, 0xd9, 0xd9, 0xee, 0xcc, 0x8a, 0xa9, 0x78, 0xf1, 0xe0, 0x59, 0xf0, - 0x13, 0x78, 0xf0, 0x43, 0x08, 0x7e, 0x80, 0x9e, 0xa4, 0xe0, 0xc5, 0x93, 0x48, 0xe2, 0x07, 0x91, - 0x4c, 0xde, 0xdd, 0x66, 0x9b, 0x64, 0xc9, 0xf6, 0x36, 0xcc, 0xbc, 0xcf, 0xf3, 0xfc, 0xe6, 0x65, - 0xde, 0xc1, 0xeb, 0xc7, 0x5c, 0xb3, 0x46, 0x93, 0x09, 0x9f, 0x9a, 0x95, 0x0c, 0x39, 0x65, 0x91, - 0x6e, 0xca, 0x50, 0xe8, 0x0e, 0x3d, 0x8a, 0x78, 0xd8, 0x71, 0x83, 0x50, 0x6a, 0x49, 0x56, 0x92, - 0x4a, 0x37, 0xae, 0x74, 0x93, 0x4a, 0x6b, 0x23, 0xd3, 0x27, 0x90, 0x2d, 0xd1, 0x10, 0x5c, 0x0d, - 0xac, 0xac, 0x4a, 0x66, 0xb1, 0x39, 0xa8, 0x09, 0xff, 0x50, 0x42, 0xf9, 0x66, 0x66, 0x39, 0xac, - 0x8e, 0x99, 0x16, 0xd2, 0x07, 0xc5, 0xad, 0x86, 0x54, 0x6d, 0xa9, 0x68, 0x9d, 0x29, 0x3e, 0xb8, - 0x04, 0x7d, 0xbb, 0x55, 0xe7, 0x9a, 0x6d, 0xd1, 0x80, 0x79, 0xc2, 0x1f, 0xae, 0xbd, 0xe6, 0x49, - 0x4f, 0x9a, 0x25, 0xed, 0xaf, 0x60, 0x77, 0xc5, 0x93, 0xd2, 0x6b, 0x71, 0xca, 0x02, 0x41, 0x99, - 0xef, 0x4b, 0x6d, 0x24, 0x70, 0x01, 0xa7, 0x84, 0xaf, 0xbf, 0xec, 0xbb, 0x3e, 0x1a, 0xce, 0xde, - 0x17, 0x4a, 0x57, 0xf9, 0x51, 0xc4, 0x95, 0x76, 0x3e, 0x21, 0x6c, 0x4f, 0xaa, 0x50, 0x81, 0xf4, - 0x15, 0x27, 0x07, 0x98, 0xa4, 0xd0, 0x6b, 0x2d, 0xa1, 0xf4, 0x12, 0x5a, 0x45, 0xeb, 0x57, 0xb7, - 0xa9, 0x9b, 0xd5, 0x6c, 0x77, 0xc4, 0x74, 0xef, 0xf2, 0xc9, 0x9f, 0x52, 0xa1, 0xba, 0xc0, 0xce, - 0x1f, 0x38, 0x77, 0xf1, 0xf2, 0x28, 0x07, 0x50, 0x92, 0x45, 0x7c, 0xa5, 0xad, 0xbc, 0x5a, 0x14, - 0xb6, 0x4c, 0x6e, 0xb1, 0x3a, 0xdb, 0x56, 0xde, 0xab, 0xb0, 0xe5, 0x44, 0xd8, 0x1a, 0xa7, 0x02, - 0xf2, 0xd7, 0x78, 0x3e, 0x15, 0x04, 0xd0, 0x1b, 0x39, 0xa0, 0x01, 0x38, 0xed, 0xe3, 0x2c, 0xe3, - 0x45, 0x13, 0xfb, 0x84, 0xeb, 0x17, 0xf0, 0x62, 0xe2, 0x86, 0x1e, 0xe0, 0xa5, 0xd1, 0x23, 0xe0, - 0x79, 0x8a, 0xe7, 0xe2, 0x07, 0x06, 0x28, 0xe5, 0x6c, 0x94, 0xd8, 0x01, 0x28, 0x12, 0xb5, 0x63, - 0x9d, 0xa5, 0x3c, 0xee, 0x8b, 0x9f, 0xf9, 0x87, 0x32, 0x26, 0x10, 0xd0, 0xc9, 0xf4, 0x19, 0x20, - 0xec, 0x63, 0x7c, 0xf6, 0x6c, 0x01, 0x62, 0x2d, 0x1b, 0x22, 0x31, 0x01, 0x8a, 0x62, 0x23, 0xde, - 0xd8, 0xfe, 0x39, 0x83, 0x67, 0x4c, 0x16, 0xf9, 0x8a, 0xf0, 0x5c, 0x4c, 0x4b, 0x76, 0xb2, 0x0d, - 0x27, 0xb4, 0xce, 0xba, 0x97, 0x57, 0x36, 0xb8, 0x93, 0x53, 0xfe, 0xf8, 0xeb, 0xdf, 0x97, 0x4b, - 0xab, 0xc4, 0x36, 0x53, 0x57, 0x19, 0x0c, 0xe0, 0xe8, 0x4c, 0x93, 0x6f, 0x08, 0x17, 0x93, 0xcb, - 0x90, 0x29, 0xd3, 0xce, 0xb7, 0xd7, 0xda, 0xcd, 0xad, 0x03, 0xcc, 0x35, 0x83, 0x79, 0x83, 0x94, - 0xc6, 0x63, 0x26, 0x5d, 0x25, 0x3f, 0x10, 0x5e, 0x18, 0x99, 0x1c, 0xf2, 0x60, 0x8a, 0xdc, 0x49, - 0x63, 0x6e, 0x3d, 0xbc, 0x98, 0x18, 0xc8, 0x6f, 0x1b, 0xf2, 0x32, 0xb9, 0x39, 0x9e, 0x3c, 0x35, - 0x1b, 0x8a, 0x7c, 0x47, 0x78, 0x3e, 0xe5, 0x45, 0x76, 0xf3, 0xa6, 0xc7, 0xd8, 0xf7, 0xf3, 0x0b, - 0x01, 0x79, 0xc7, 0x20, 0x53, 0x52, 0x99, 0x02, 0x99, 0xbe, 0x87, 0xcf, 0xe5, 0xc3, 0xde, 0xf3, - 0x93, 0xae, 0x8d, 0x4e, 0xbb, 0x36, 0xfa, 0xdb, 0xb5, 0xd1, 0xe7, 0x9e, 0x5d, 0x38, 0xed, 0xd9, - 0x85, 0xdf, 0x3d, 0xbb, 0xf0, 0x66, 0xd3, 0x13, 0xba, 0x19, 0xd5, 0xdd, 0x86, 0x6c, 0x0f, 0x5b, - 0x26, 0xff, 0xfc, 0xbb, 0x21, 0x77, 0xdd, 0x09, 0xb8, 0xaa, 0xcf, 0x9a, 0x2f, 0xf8, 0xce, 0xff, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xcd, 0x31, 0xbd, 0xba, 0x06, 0x00, 0x00, + // 575 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6b, 0x13, 0x4f, + 0x18, 0xc7, 0x33, 0x3f, 0x7e, 0xad, 0xcd, 0x48, 0x0f, 0x1d, 0x84, 0xb6, 0x4b, 0xdd, 0xd4, 0x45, + 0xd2, 0x62, 0x9b, 0x1d, 0x5b, 0xad, 0x15, 0xf4, 0x62, 0x05, 0xff, 0x40, 0x0f, 0x1a, 0x10, 0xc1, + 0x4b, 0x98, 0x24, 0xd3, 0xcd, 0x40, 0xb2, 0xb3, 0xdd, 0x99, 0x15, 0x53, 0xf1, 0xe2, 0xc1, 0xb3, + 0xe0, 0x2b, 0xf0, 0xe0, 0x8b, 0x10, 0x7c, 0x01, 0x3d, 0x49, 0xc1, 0x8b, 0x27, 0x91, 0xc4, 0x17, + 0x22, 0x99, 0x3c, 0xbb, 0xcd, 0x36, 0xc9, 0x92, 0xf5, 0x36, 0xec, 0x3c, 0xdf, 0xef, 0xf7, 0xf3, + 0x3c, 0xcc, 0xb3, 0x78, 0xf3, 0x84, 0x6b, 0xd6, 0x68, 0x31, 0xe1, 0x53, 0x73, 0x92, 0x21, 0xa7, + 0x2c, 0xd2, 0x2d, 0x19, 0x0a, 0xdd, 0xa5, 0xc7, 0x11, 0x0f, 0xbb, 0x6e, 0x10, 0x4a, 0x2d, 0xc9, + 0x5a, 0x52, 0xe9, 0xc6, 0x95, 0x6e, 0x52, 0x69, 0x6d, 0x65, 0xfa, 0x04, 0xb2, 0x2d, 0x1a, 0x82, + 0xab, 0xa1, 0x95, 0x55, 0xc9, 0x2c, 0x36, 0x17, 0x35, 0xe1, 0x1f, 0x49, 0x28, 0xbf, 0x99, 0x59, + 0x0e, 0xa7, 0x13, 0xa6, 0x85, 0xf4, 0x41, 0x71, 0xa3, 0x21, 0x55, 0x47, 0x2a, 0x5a, 0x67, 0x8a, + 0x0f, 0x9b, 0xa0, 0xaf, 0x77, 0xea, 0x5c, 0xb3, 0x1d, 0x1a, 0x30, 0x4f, 0xf8, 0xa3, 0xb5, 0x57, + 0x3c, 0xe9, 0x49, 0x73, 0xa4, 0x83, 0x13, 0x7c, 0x5d, 0xf3, 0xa4, 0xf4, 0xda, 0x9c, 0xb2, 0x40, + 0x50, 0xe6, 0xfb, 0x52, 0x1b, 0x09, 0x34, 0xe0, 0x94, 0xf0, 0xd5, 0xe7, 0x03, 0xd7, 0x07, 0xa3, + 0xd9, 0x87, 0x42, 0xe9, 0x2a, 0x3f, 0x8e, 0xb8, 0xd2, 0xce, 0x07, 0x84, 0xed, 0x69, 0x15, 0x2a, + 0x90, 0xbe, 0xe2, 0xa4, 0x89, 0x49, 0x0a, 0xbd, 0xd6, 0x16, 0x4a, 0xaf, 0xa0, 0x75, 0xb4, 0x79, + 0x79, 0x97, 0xba, 0x59, 0xc3, 0x76, 0xc7, 0x4c, 0x0f, 0xfe, 0x3f, 0xfd, 0x55, 0x2a, 0x54, 0x97, + 0xd8, 0xc5, 0x0b, 0xe7, 0x36, 0x5e, 0x1d, 0xe7, 0x00, 0x4a, 0xb2, 0x8c, 0x2f, 0x75, 0x94, 0x57, + 0x8b, 0xc2, 0xb6, 0xc9, 0x2d, 0x56, 0xe7, 0x3b, 0xca, 0x7b, 0x11, 0xb6, 0x9d, 0x08, 0x5b, 0x93, + 0x54, 0x40, 0xfe, 0x12, 0x2f, 0xa6, 0x82, 0x00, 0x7a, 0x2b, 0x07, 0x34, 0x00, 0xa7, 0x7d, 0x9c, + 0x55, 0xbc, 0x6c, 0x62, 0x1f, 0x73, 0xfd, 0x0c, 0x5e, 0x4c, 0x3c, 0xd0, 0x26, 0x5e, 0x19, 0xbf, + 0x02, 0x9e, 0x27, 0x78, 0x21, 0x7e, 0x60, 0x80, 0x52, 0xce, 0x46, 0x89, 0x1d, 0x80, 0x22, 0x51, + 0x3b, 0xd6, 0x79, 0xca, 0xc3, 0x81, 0xf8, 0xa9, 0x7f, 0x24, 0x63, 0x02, 0x01, 0x93, 0x4c, 0xdf, + 0x01, 0xc2, 0x21, 0xc6, 0xe7, 0xcf, 0x16, 0x20, 0x36, 0xb2, 0x21, 0x12, 0x13, 0xa0, 0x28, 0x36, + 0xe2, 0x0f, 0xbb, 0xdf, 0xe7, 0xf0, 0x9c, 0xc9, 0x22, 0x9f, 0x11, 0x5e, 0x88, 0x69, 0xc9, 0x5e, + 0xb6, 0xe1, 0x94, 0xd1, 0x59, 0x77, 0xf2, 0xca, 0x86, 0x3d, 0x39, 0xe5, 0xf7, 0x3f, 0xfe, 0x7c, + 0xfa, 0x6f, 0x9d, 0xd8, 0x66, 0xeb, 0x2a, 0xc3, 0x05, 0x1c, 0xdf, 0x69, 0xf2, 0x05, 0xe1, 0x62, + 0xd2, 0x0c, 0x99, 0x31, 0xed, 0xe2, 0x78, 0xad, 0xfd, 0xdc, 0x3a, 0xc0, 0xdc, 0x30, 0x98, 0xd7, + 0x48, 0x69, 0x32, 0x66, 0x32, 0x55, 0xf2, 0x0d, 0xe1, 0xa5, 0xb1, 0xcd, 0x21, 0xf7, 0x66, 0xc8, + 0x9d, 0xb6, 0xe6, 0xd6, 0xfd, 0x7f, 0x13, 0x03, 0xf9, 0xb6, 0x21, 0x2f, 0x93, 0xeb, 0x93, 0xc9, + 0x53, 0xbb, 0xa1, 0xc8, 0x57, 0x84, 0x17, 0x53, 0x5e, 0x64, 0x3f, 0x6f, 0x7a, 0x8c, 0x7d, 0x37, + 0xbf, 0x10, 0x90, 0xf7, 0x0c, 0x32, 0x25, 0x95, 0x19, 0x90, 0xe9, 0x5b, 0xf8, 0xb9, 0xbc, 0x3b, + 0x78, 0x74, 0xda, 0xb3, 0xd1, 0x59, 0xcf, 0x46, 0xbf, 0x7b, 0x36, 0xfa, 0xd8, 0xb7, 0x0b, 0x67, + 0x7d, 0xbb, 0xf0, 0xb3, 0x6f, 0x17, 0x5e, 0x6d, 0x7b, 0x42, 0xb7, 0xa2, 0xba, 0xdb, 0x90, 0x9d, + 0x51, 0x4b, 0x5f, 0x36, 0x39, 0x7d, 0x33, 0xe2, 0xac, 0xbb, 0x01, 0x57, 0xf5, 0x79, 0xf3, 0xfb, + 0xbd, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x9b, 0x5f, 0xbf, 0xb6, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/authority/types/tx.pb.go b/x/authority/types/tx.pb.go index 928353417f..1a021c4311 100644 --- a/x/authority/types/tx.pb.go +++ b/x/authority/types/tx.pb.go @@ -416,38 +416,38 @@ func init() { } var fileDescriptor_42e081863c477116 = []byte{ - // 487 bytes of a gzipped FileDescriptorProto + // 491 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6f, 0xd3, 0x30, 0x14, 0xaf, 0xd9, 0xb4, 0xb1, 0x87, 0x34, 0xb6, 0x0c, 0x41, 0xc9, 0x46, 0xa8, 0x22, 0x01, 0x95, - 0xd0, 0x92, 0x52, 0x90, 0x00, 0x89, 0xcb, 0xc6, 0x85, 0x7f, 0x95, 0xa6, 0x88, 0x5e, 0xb8, 0x54, - 0x59, 0xea, 0xb9, 0x96, 0xda, 0x38, 0x8a, 0x5d, 0x58, 0x2b, 0x90, 0xb8, 0x72, 0x82, 0x6f, 0xc0, - 0xd7, 0xd9, 0x71, 0x47, 0x4e, 0x08, 0xb5, 0x5f, 0x04, 0xcd, 0x8d, 0xbd, 0x29, 0x89, 0xbc, 0x16, - 0x6e, 0x2f, 0xf6, 0xef, 0x9f, 0x9f, 0xe3, 0x07, 0xf7, 0xc6, 0x58, 0x84, 0x51, 0x2f, 0xa4, 0xb1, - 0x2f, 0x2b, 0x96, 0x62, 0x3f, 0x1c, 0x8a, 0x1e, 0x4b, 0xa9, 0x18, 0xf9, 0xe2, 0xd8, 0x4b, 0x52, - 0x26, 0x98, 0xb5, 0xa3, 0x61, 0x9e, 0x82, 0x79, 0x1a, 0x66, 0x3f, 0x34, 0x8a, 0x24, 0xac, 0x4f, - 0x23, 0x8a, 0xf9, 0x4c, 0xca, 0xde, 0x35, 0x82, 0xe5, 0x46, 0x87, 0xc6, 0x47, 0x2c, 0x83, 0x37, - 0x8c, 0xf0, 0xac, 0x1a, 0x87, 0x82, 0xb2, 0x38, 0x63, 0xdc, 0x20, 0x8c, 0x30, 0x59, 0xfa, 0x67, - 0xd5, 0x6c, 0xd5, 0xfd, 0x89, 0x60, 0xab, 0xc5, 0xc9, 0x5e, 0xb7, 0xbb, 0x77, 0x91, 0x63, 0x55, - 0x61, 0x35, 0x4a, 0x71, 0x28, 0x58, 0x5a, 0x45, 0x35, 0x54, 0x5f, 0x0b, 0xd4, 0xa7, 0x75, 0x0b, - 0x56, 0x07, 0x9c, 0x74, 0x86, 0x69, 0xbf, 0x7a, 0x45, 0xee, 0xac, 0x0c, 0x38, 0x69, 0xa7, 0x7d, - 0xab, 0x0d, 0x9b, 0xca, 0x17, 0x77, 0x3b, 0xf2, 0x78, 0xa3, 0xea, 0x52, 0x0d, 0xd5, 0xd7, 0x9b, - 0x75, 0xcf, 0xd4, 0x28, 0xef, 0x40, 0x62, 0xdf, 0x8f, 0x12, 0x1c, 0x6c, 0x9c, 0x4b, 0xcc, 0x56, - 0xdd, 0x3b, 0xb0, 0x5d, 0x12, 0x30, 0xc0, 0x3c, 0x61, 0x31, 0xc7, 0xee, 0x5b, 0xb8, 0xd9, 0xe2, - 0x24, 0xc0, 0x03, 0xf6, 0x11, 0xff, 0xef, 0x11, 0xdc, 0x1a, 0x38, 0xe5, 0x62, 0xda, 0xee, 0x13, - 0x6c, 0xb6, 0x38, 0x69, 0x27, 0xdd, 0x50, 0xe0, 0x83, 0xec, 0x06, 0x0d, 0x4e, 0xaf, 0xe0, 0xaa, - 0xba, 0x67, 0x69, 0x75, 0xad, 0x79, 0x7f, 0x8e, 0x56, 0x50, 0xcc, 0xf7, 0x97, 0x4f, 0x7e, 0xdf, - 0xad, 0x04, 0x9a, 0xed, 0x6e, 0xc3, 0xed, 0x82, 0xb1, 0x4e, 0xf5, 0x19, 0x2c, 0xbd, 0xf9, 0xf2, - 0x4c, 0xfa, 0x75, 0x7c, 0xc4, 0x0c, 0xb1, 0xde, 0x01, 0x9c, 0xff, 0x51, 0x59, 0xb0, 0x07, 0xe6, - 0x60, 0x5a, 0x36, 0x4b, 0xb6, 0x16, 0xa9, 0x05, 0x77, 0x07, 0xec, 0xa2, 0xbb, 0xca, 0xd6, 0xfc, - 0xbe, 0x0c, 0x4b, 0x2d, 0x4e, 0xac, 0x31, 0xac, 0xe7, 0xda, 0xe6, 0x9b, 0x1d, 0x0b, 0xc7, 0xb5, - 0x9f, 0x2e, 0x48, 0x50, 0x19, 0xac, 0x2f, 0x70, 0x3d, 0xdf, 0x9c, 0xc6, 0x9c, 0x5a, 0x9a, 0x61, - 0x3f, 0x5b, 0x94, 0xa1, 0xed, 0xbf, 0x22, 0xd8, 0x28, 0xbc, 0xb0, 0x47, 0x97, 0xca, 0xe5, 0x29, - 0xf6, 0xf3, 0x85, 0x29, 0x3a, 0xc2, 0x37, 0x04, 0x5b, 0x65, 0x8f, 0xe4, 0xc9, 0xa5, 0x92, 0x25, - 0x2c, 0xfb, 0xc5, 0xbf, 0xb0, 0x54, 0x96, 0xfd, 0x37, 0x27, 0x13, 0x07, 0x9d, 0x4e, 0x1c, 0xf4, - 0x67, 0xe2, 0xa0, 0x1f, 0x53, 0xa7, 0x72, 0x3a, 0x75, 0x2a, 0xbf, 0xa6, 0x4e, 0xe5, 0x43, 0x83, - 0x50, 0xd1, 0x1b, 0x1e, 0x7a, 0x11, 0x1b, 0xc8, 0xb1, 0xb6, 0x9b, 0x9b, 0x70, 0xc7, 0x17, 0x87, - 0xf0, 0x28, 0xc1, 0xfc, 0x70, 0x45, 0x8e, 0xb1, 0xc7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x33, - 0xb2, 0x7c, 0x5f, 0xb1, 0x05, 0x00, 0x00, + 0x60, 0xc9, 0x28, 0x48, 0x80, 0xc4, 0x65, 0x43, 0x42, 0x20, 0xa8, 0x34, 0x45, 0xf4, 0xc2, 0xa5, + 0xca, 0x12, 0xcf, 0xb5, 0xd4, 0xc6, 0x51, 0xec, 0xc2, 0x5a, 0x81, 0xc4, 0x95, 0x13, 0x7c, 0x03, + 0xbe, 0xce, 0x8e, 0x3b, 0x72, 0x42, 0xa8, 0xfd, 0x22, 0x68, 0x6e, 0xec, 0x4d, 0x4d, 0xe4, 0xb5, + 0xec, 0xf6, 0x62, 0xff, 0xfe, 0xf9, 0x39, 0x7e, 0x70, 0x6f, 0x88, 0x45, 0x18, 0x75, 0x42, 0x9a, + 0xf8, 0xb2, 0x62, 0x19, 0xf6, 0xc3, 0xbe, 0xe8, 0xb0, 0x8c, 0x8a, 0x81, 0x2f, 0x8e, 0xbc, 0x34, + 0x63, 0x82, 0x59, 0x5b, 0x1a, 0xe6, 0x29, 0x98, 0xa7, 0x61, 0xf6, 0x43, 0xa3, 0x48, 0xca, 0xba, + 0x34, 0xa2, 0x98, 0x4f, 0xa4, 0xec, 0x6d, 0x23, 0x58, 0x6e, 0xb4, 0x69, 0x72, 0xc8, 0x72, 0xf8, + 0x8e, 0x11, 0x9e, 0x57, 0xc3, 0x50, 0x50, 0x96, 0xe4, 0x8c, 0x1b, 0x84, 0x11, 0x26, 0x4b, 0xff, + 0xb4, 0x9a, 0xac, 0xba, 0xbf, 0x10, 0x6c, 0x34, 0x39, 0xd9, 0x8d, 0xe3, 0xdd, 0xf3, 0x1c, 0xab, + 0x0a, 0xcb, 0x51, 0x86, 0x43, 0xc1, 0xb2, 0x2a, 0xaa, 0xa1, 0xfa, 0x4a, 0xa0, 0x3e, 0xad, 0x5b, + 0xb0, 0xdc, 0xe3, 0xa4, 0xdd, 0xcf, 0xba, 0xd5, 0x2b, 0x72, 0x67, 0xa9, 0xc7, 0x49, 0x2b, 0xeb, + 0x5a, 0x2d, 0x58, 0x57, 0xbe, 0x38, 0x6e, 0xcb, 0xe3, 0x0d, 0xaa, 0x0b, 0x35, 0x54, 0x5f, 0x6d, + 0xd4, 0x3d, 0x53, 0xa3, 0xbc, 0x7d, 0x89, 0xfd, 0x30, 0x48, 0x71, 0xb0, 0x76, 0x26, 0x31, 0x59, + 0x75, 0xef, 0xc0, 0x66, 0x49, 0xc0, 0x00, 0xf3, 0x94, 0x25, 0x1c, 0xbb, 0xef, 0xe0, 0x66, 0x93, + 0x93, 0x00, 0xf7, 0xd8, 0x27, 0x7c, 0xd9, 0x23, 0xb8, 0x35, 0x70, 0xca, 0xc5, 0xb4, 0xdd, 0x67, + 0x58, 0x6f, 0x72, 0xd2, 0x4a, 0xe3, 0x50, 0xe0, 0xfd, 0xfc, 0x06, 0x0d, 0x4e, 0x6f, 0xe0, 0xaa, + 0xba, 0x67, 0x69, 0x75, 0xad, 0x71, 0x7f, 0x86, 0x56, 0x50, 0xcc, 0xf7, 0x16, 0x8f, 0xff, 0xdc, + 0xad, 0x04, 0x9a, 0xed, 0x6e, 0xc2, 0xed, 0x82, 0xb1, 0x4e, 0xf5, 0x05, 0x2c, 0xbd, 0xf9, 0xea, + 0x54, 0xfa, 0x6d, 0x72, 0xc8, 0x0c, 0xb1, 0xde, 0x03, 0x9c, 0xfd, 0x51, 0x79, 0xb0, 0x07, 0xe6, + 0x60, 0x5a, 0x36, 0x4f, 0xb6, 0x12, 0xa9, 0x05, 0x77, 0x0b, 0xec, 0xa2, 0xbb, 0xca, 0xd6, 0xf8, + 0xb1, 0x08, 0x0b, 0x4d, 0x4e, 0xac, 0x21, 0xac, 0x4e, 0xb5, 0xcd, 0x37, 0x3b, 0x16, 0x8e, 0x6b, + 0x3f, 0x9b, 0x93, 0xa0, 0x32, 0x58, 0x5f, 0xe1, 0xfa, 0x74, 0x73, 0x76, 0x66, 0xd4, 0xd2, 0x0c, + 0xfb, 0xf9, 0xbc, 0x0c, 0x6d, 0xff, 0x0d, 0xc1, 0x5a, 0xe1, 0x85, 0x3d, 0xbe, 0x50, 0x6e, 0x9a, + 0x62, 0xbf, 0x98, 0x9b, 0xa2, 0x23, 0x7c, 0x47, 0xb0, 0x51, 0xf6, 0x48, 0x9e, 0x5e, 0x28, 0x59, + 0xc2, 0xb2, 0x5f, 0xfe, 0x0f, 0x4b, 0x65, 0xd9, 0x7b, 0x7d, 0x3c, 0x72, 0xd0, 0xc9, 0xc8, 0x41, + 0x7f, 0x47, 0x0e, 0xfa, 0x39, 0x76, 0x2a, 0x27, 0x63, 0xa7, 0xf2, 0x7b, 0xec, 0x54, 0x3e, 0x3e, + 0x22, 0x54, 0x74, 0xfa, 0x07, 0x5e, 0xc4, 0x7a, 0x72, 0xac, 0x6d, 0x4f, 0x26, 0x5c, 0xc2, 0x62, + 0xec, 0x1f, 0x9d, 0x1f, 0xc0, 0x83, 0x14, 0xf3, 0x83, 0x25, 0x39, 0xc2, 0x9e, 0xfc, 0x0b, 0x00, + 0x00, 0xff, 0xff, 0x74, 0x55, 0xd6, 0x33, 0xad, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/crosschain/client/cli/cli_gas_price.go b/x/crosschain/client/cli/cli_gas_price.go index a08d16eed1..c621842184 100644 --- a/x/crosschain/client/cli/cli_gas_price.go +++ b/x/crosschain/client/cli/cli_gas_price.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListGasPrice() *cobra.Command { diff --git a/x/crosschain/client/cli/cli_last_block_height.go b/x/crosschain/client/cli/cli_last_block_height.go index e30722dee7..f650a2fd31 100644 --- a/x/crosschain/client/cli/cli_last_block_height.go +++ b/x/crosschain/client/cli/cli_last_block_height.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListLastBlockHeight() *cobra.Command { diff --git a/x/crosschain/client/cli/cli_refund_aborted.go b/x/crosschain/client/cli/cli_refund_aborted.go index 46792b454f..5812d4697e 100644 --- a/x/crosschain/client/cli/cli_refund_aborted.go +++ b/x/crosschain/client/cli/cli_refund_aborted.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdRefundAborted() *cobra.Command { diff --git a/x/crosschain/client/cli/cli_tss.go b/x/crosschain/client/cli/cli_tss.go index f1391b9658..8874989d31 100644 --- a/x/crosschain/client/cli/cli_tss.go +++ b/x/crosschain/client/cli/cli_tss.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdUpdateTss() *cobra.Command { diff --git a/x/crosschain/client/cli/cli_whitelist_erc20.go b/x/crosschain/client/cli/cli_whitelist_erc20.go index 79647bc0db..111b07c23d 100644 --- a/x/crosschain/client/cli/cli_whitelist_erc20.go +++ b/x/crosschain/client/cli/cli_whitelist_erc20.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdWhitelistERC20() *cobra.Command { diff --git a/x/crosschain/client/cli/cli_zeta_height.go b/x/crosschain/client/cli/cli_zeta_height.go index 7d1f96c8ee..53f98381fb 100644 --- a/x/crosschain/client/cli/cli_zeta_height.go +++ b/x/crosschain/client/cli/cli_zeta_height.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdLastZetaHeight() *cobra.Command { diff --git a/x/crosschain/client/cli/query.go b/x/crosschain/client/cli/query.go index 4df27d227d..85708a516f 100644 --- a/x/crosschain/client/cli/query.go +++ b/x/crosschain/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/crosschain/client/cli/query_cctx.go b/x/crosschain/client/cli/query_cctx.go index 06d162c491..a5fc96ae0c 100644 --- a/x/crosschain/client/cli/query_cctx.go +++ b/x/crosschain/client/cli/query_cctx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListSend() *cobra.Command { diff --git a/x/crosschain/client/cli/query_cctx_rate_limit.go b/x/crosschain/client/cli/query_cctx_rate_limit.go index 0abc092436..3c03291742 100644 --- a/x/crosschain/client/cli/query_cctx_rate_limit.go +++ b/x/crosschain/client/cli/query_cctx_rate_limit.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListPendingCCTXWithinRateLimit() *cobra.Command { diff --git a/x/crosschain/client/cli/query_inbound_hash_to_cctx.go b/x/crosschain/client/cli/query_inbound_hash_to_cctx.go index 2752f27836..145fa2627f 100644 --- a/x/crosschain/client/cli/query_inbound_hash_to_cctx.go +++ b/x/crosschain/client/cli/query_inbound_hash_to_cctx.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListInboundHashToCctx() *cobra.Command { diff --git a/x/crosschain/client/cli/query_inbound_tracker.go b/x/crosschain/client/cli/query_inbound_tracker.go index 48d9e0e88b..ae947f0579 100644 --- a/x/crosschain/client/cli/query_inbound_tracker.go +++ b/x/crosschain/client/cli/query_inbound_tracker.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdShowInboundTracker() *cobra.Command { diff --git a/x/crosschain/client/cli/query_outbound_tracker.go b/x/crosschain/client/cli/query_outbound_tracker.go index 8409786568..ad119b6be5 100644 --- a/x/crosschain/client/cli/query_outbound_tracker.go +++ b/x/crosschain/client/cli/query_outbound_tracker.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdListOutboundTracker() *cobra.Command { diff --git a/x/crosschain/client/cli/query_rate_limiter_flags.go b/x/crosschain/client/cli/query_rate_limiter_flags.go index bdd8fd0558..039d959493 100644 --- a/x/crosschain/client/cli/query_rate_limiter_flags.go +++ b/x/crosschain/client/cli/query_rate_limiter_flags.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdShowUpdateRateLimiterFlags() *cobra.Command { diff --git a/x/crosschain/client/cli/query_zeta_accounting.go b/x/crosschain/client/cli/query_zeta_accounting.go index f823599190..bb74e8a277 100644 --- a/x/crosschain/client/cli/query_zeta_accounting.go +++ b/x/crosschain/client/cli/query_zeta_accounting.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdGetZetaAccounting() *cobra.Command { diff --git a/x/crosschain/client/cli/tx.go b/x/crosschain/client/cli/tx.go index 7ba75ff143..7a735606e6 100644 --- a/x/crosschain/client/cli/tx.go +++ b/x/crosschain/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/crosschain/client/cli/tx_add_inbound_tracker.go b/x/crosschain/client/cli/tx_add_inbound_tracker.go index bcbe144592..3c07ec97b2 100644 --- a/x/crosschain/client/cli/tx_add_inbound_tracker.go +++ b/x/crosschain/client/cli/tx_add_inbound_tracker.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdAddInboundTracker() *cobra.Command { diff --git a/x/crosschain/client/cli/tx_add_outbound_tracker.go b/x/crosschain/client/cli/tx_add_outbound_tracker.go index fe6075e6b2..a7a07ece29 100644 --- a/x/crosschain/client/cli/tx_add_outbound_tracker.go +++ b/x/crosschain/client/cli/tx_add_outbound_tracker.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdAddOutboundTracker() *cobra.Command { diff --git a/x/crosschain/client/cli/tx_remove_outbound_tracker.go b/x/crosschain/client/cli/tx_remove_outbound_tracker.go index 25737fedef..07a3c62f6a 100644 --- a/x/crosschain/client/cli/tx_remove_outbound_tracker.go +++ b/x/crosschain/client/cli/tx_remove_outbound_tracker.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdRemoveOutboundTracker() *cobra.Command { diff --git a/x/crosschain/client/cli/tx_vote_inbound.go b/x/crosschain/client/cli/tx_vote_inbound.go index 61d6deab2e..3c7fae37c0 100644 --- a/x/crosschain/client/cli/tx_vote_inbound.go +++ b/x/crosschain/client/cli/tx_vote_inbound.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdVoteInbound() *cobra.Command { diff --git a/x/crosschain/client/cli/tx_vote_outbound.go b/x/crosschain/client/cli/tx_vote_outbound.go index eec17f6020..4beacd116f 100644 --- a/x/crosschain/client/cli/tx_vote_outbound.go +++ b/x/crosschain/client/cli/tx_vote_outbound.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdVoteOutbound() *cobra.Command { diff --git a/x/crosschain/client/cli/tx_vote_stuck_cctx.go b/x/crosschain/client/cli/tx_vote_stuck_cctx.go index 4ecd579395..7791d1fbbf 100644 --- a/x/crosschain/client/cli/tx_vote_stuck_cctx.go +++ b/x/crosschain/client/cli/tx_vote_stuck_cctx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func CmdAbortStuckCCTX() *cobra.Command { diff --git a/x/crosschain/genesis.go b/x/crosschain/genesis.go index 7d750bafa1..467f532a53 100644 --- a/x/crosschain/genesis.go +++ b/x/crosschain/genesis.go @@ -3,8 +3,8 @@ package crosschain import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) // InitGenesis initializes the crosschain module's state from a provided genesis diff --git a/x/crosschain/genesis_test.go b/x/crosschain/genesis_test.go index 4a3cc7083f..11aa8964b9 100644 --- a/x/crosschain/genesis_test.go +++ b/x/crosschain/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestGenesis(t *testing.T) { diff --git a/x/crosschain/keeper/abci.go b/x/crosschain/keeper/abci.go index 391b417fb0..c499f5fe05 100644 --- a/x/crosschain/keeper/abci.go +++ b/x/crosschain/keeper/abci.go @@ -8,10 +8,10 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - zetachains "github.com/zeta-chain/zetacore/pkg/chains" - mathpkg "github.com/zeta-chain/zetacore/pkg/math" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + zetachains "github.com/zeta-chain/node/pkg/chains" + mathpkg "github.com/zeta-chain/node/pkg/math" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/x/crosschain/keeper/abci_test.go b/x/crosschain/keeper/abci_test.go index 03da0573f6..cee15a2777 100644 --- a/x/crosschain/keeper/abci_test.go +++ b/x/crosschain/keeper/abci_test.go @@ -9,12 +9,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_IterateAndUpdateCctxGasPrice(t *testing.T) { diff --git a/x/crosschain/keeper/cctx.go b/x/crosschain/keeper/cctx.go index 9a1e1781df..f2234362f0 100644 --- a/x/crosschain/keeper/cctx.go +++ b/x/crosschain/keeper/cctx.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" ) // SetCctxAndNonceToCctxAndInboundHashToCctx does the following things in one function: diff --git a/x/crosschain/keeper/cctx_gateway_observers.go b/x/crosschain/keeper/cctx_gateway_observers.go index c8ae0d718e..39a33f4edc 100644 --- a/x/crosschain/keeper/cctx_gateway_observers.go +++ b/x/crosschain/keeper/cctx_gateway_observers.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" ) // CCTXGatewayObservers is implementation of CCTXGateway interface for observers diff --git a/x/crosschain/keeper/cctx_gateway_zevm.go b/x/crosschain/keeper/cctx_gateway_zevm.go index d9061be54a..81366d6af3 100644 --- a/x/crosschain/keeper/cctx_gateway_zevm.go +++ b/x/crosschain/keeper/cctx_gateway_zevm.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // CCTXGatewayZEVM is implementation of CCTXGateway interface for ZEVM diff --git a/x/crosschain/keeper/cctx_gateways.go b/x/crosschain/keeper/cctx_gateways.go index 9f8e79c0d9..c5372ef334 100644 --- a/x/crosschain/keeper/cctx_gateways.go +++ b/x/crosschain/keeper/cctx_gateways.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" ) // CCTXGateway is interface implemented by every gateway. It is one of interfaces used for communication diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go index f2f10e23b6..826e21eca5 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go @@ -3,10 +3,10 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // ValidateInbound is the only entry-point to create new CCTX (eg. when observers voting is done or new inbound event is detected). diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go b/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go index fd798998c0..916a443d9c 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound_test.go @@ -6,13 +6,13 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/crypto" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/crypto" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_ValidateInbound(t *testing.T) { diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go b/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go index d4715271da..aec7eccb6e 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go @@ -12,11 +12,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) /* diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go index 1fca5bcc51..501848b3a0 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_outbound_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/x/evm/statedb" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/contracts" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/contracts" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_ValidateSuccessfulOutbound(t *testing.T) { diff --git a/x/crosschain/keeper/cctx_test.go b/x/crosschain/keeper/cctx_test.go index 0c99f979c9..ef54e7151b 100644 --- a/x/crosschain/keeper/cctx_test.go +++ b/x/crosschain/keeper/cctx_test.go @@ -12,11 +12,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func createNCctxWithStatus( diff --git a/x/crosschain/keeper/cctx_utils.go b/x/crosschain/keeper/cctx_utils.go index 3303a99c87..3f62202cb7 100644 --- a/x/crosschain/keeper/cctx_utils.go +++ b/x/crosschain/keeper/cctx_utils.go @@ -9,10 +9,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // SetObserverOutboundInfo sets the CCTX outbound nonce to the next available nonce for the TSS address, and updates the nonce of blockchain state. diff --git a/x/crosschain/keeper/cctx_utils_test.go b/x/crosschain/keeper/cctx_utils_test.go index 22a7d82063..b90999092e 100644 --- a/x/crosschain/keeper/cctx_utils_test.go +++ b/x/crosschain/keeper/cctx_utils_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestGetRevertGasLimit(t *testing.T) { diff --git a/x/crosschain/keeper/events.go b/x/crosschain/keeper/events.go index 42b32bc589..176359804b 100644 --- a/x/crosschain/keeper/events.go +++ b/x/crosschain/keeper/events.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func EmitEventInboundFinalized(ctx sdk.Context, cctx *types.CrossChainTx) { diff --git a/x/crosschain/keeper/evm_deposit.go b/x/crosschain/keeper/evm_deposit.go index 2b46cedcb6..c873e9b636 100644 --- a/x/crosschain/keeper/evm_deposit.go +++ b/x/crosschain/keeper/evm_deposit.go @@ -12,10 +12,10 @@ import ( "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) const InCCTXIndexKey = "inCctxIndex" diff --git a/x/crosschain/keeper/evm_deposit_test.go b/x/crosschain/keeper/evm_deposit_test.go index 18bc103bc3..e933d168aa 100644 --- a/x/crosschain/keeper/evm_deposit_test.go +++ b/x/crosschain/keeper/evm_deposit_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgServer_HandleEVMDeposit(t *testing.T) { diff --git a/x/crosschain/keeper/evm_hooks.go b/x/crosschain/keeper/evm_hooks.go index 03333e4f1e..5669c10fe7 100644 --- a/x/crosschain/keeper/evm_hooks.go +++ b/x/crosschain/keeper/evm_hooks.go @@ -18,14 +18,14 @@ import ( connectorzevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/crosschain/keeper/evm_hooks_test.go b/x/crosschain/keeper/evm_hooks_test.go index bff6df4e70..3f4e049d33 100644 --- a/x/crosschain/keeper/evm_hooks_test.go +++ b/x/crosschain/keeper/evm_hooks_test.go @@ -13,15 +13,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // SetupStateForProcessLogsZetaSent sets up additional state required for processing logs for ZetaSent events diff --git a/x/crosschain/keeper/finalized_inbounds.go b/x/crosschain/keeper/finalized_inbounds.go index dd2b2ab82a..4daa9d48e3 100644 --- a/x/crosschain/keeper/finalized_inbounds.go +++ b/x/crosschain/keeper/finalized_inbounds.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) SetFinalizedInbound(ctx sdk.Context, finalizedInboundIndex string) { diff --git a/x/crosschain/keeper/finalized_inbounds_test.go b/x/crosschain/keeper/finalized_inbounds_test.go index 8cc28c5aca..27d3b25213 100644 --- a/x/crosschain/keeper/finalized_inbounds_test.go +++ b/x/crosschain/keeper/finalized_inbounds_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_IsFinalizedInbound(t *testing.T) { diff --git a/x/crosschain/keeper/foreign_coins.go b/x/crosschain/keeper/foreign_coins.go index 8920cb48b6..fe7757cab9 100644 --- a/x/crosschain/keeper/foreign_coins.go +++ b/x/crosschain/keeper/foreign_coins.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - fungibleModuleTypes "github.com/zeta-chain/zetacore/x/fungible/types" + fungibleModuleTypes "github.com/zeta-chain/node/x/fungible/types" ) func (k Keeper) GetAllForeignCoins(ctx sdk.Context) []fungibleModuleTypes.ForeignCoins { diff --git a/x/crosschain/keeper/foreign_coins_test.go b/x/crosschain/keeper/foreign_coins_test.go index 4c19ac9f2b..e1cbcbd6b4 100644 --- a/x/crosschain/keeper/foreign_coins_test.go +++ b/x/crosschain/keeper/foreign_coins_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_GetAllForeignCoins(t *testing.T) { diff --git a/x/crosschain/keeper/gas_payment.go b/x/crosschain/keeper/gas_payment.go index 2a8331e059..63cbea0d4f 100644 --- a/x/crosschain/keeper/gas_payment.go +++ b/x/crosschain/keeper/gas_payment.go @@ -10,11 +10,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // ChainGasParams represents the parameters to calculate the fees for gas for a chain. diff --git a/x/crosschain/keeper/gas_payment_test.go b/x/crosschain/keeper/gas_payment_test.go index b80826aac7..3907268fd0 100644 --- a/x/crosschain/keeper/gas_payment_test.go +++ b/x/crosschain/keeper/gas_payment_test.go @@ -7,13 +7,13 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) var ( diff --git a/x/crosschain/keeper/gas_price.go b/x/crosschain/keeper/gas_price.go index 9950c760f8..b3617cc9ef 100644 --- a/x/crosschain/keeper/gas_price.go +++ b/x/crosschain/keeper/gas_price.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - slicemath "github.com/zeta-chain/zetacore/pkg/math" - "github.com/zeta-chain/zetacore/x/crosschain/types" + slicemath "github.com/zeta-chain/node/pkg/math" + "github.com/zeta-chain/node/x/crosschain/types" ) // SetGasPrice set a specific gasPrice in the store from its index diff --git a/x/crosschain/keeper/gas_price_test.go b/x/crosschain/keeper/gas_price_test.go index 928f73b9f8..55ce927444 100644 --- a/x/crosschain/keeper/gas_price_test.go +++ b/x/crosschain/keeper/gas_price_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) // Keeper Tests diff --git a/x/crosschain/keeper/grpc_query.go b/x/crosschain/keeper/grpc_query.go index 720f65c8f7..b828a2c909 100644 --- a/x/crosschain/keeper/grpc_query.go +++ b/x/crosschain/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/crosschain/keeper/grpc_query_cctx.go b/x/crosschain/keeper/grpc_query_cctx.go index 15c4420246..a157a95433 100644 --- a/x/crosschain/keeper/grpc_query_cctx.go +++ b/x/crosschain/keeper/grpc_query_cctx.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/x/crosschain/keeper/grpc_query_cctx_rate_limit.go b/x/crosschain/keeper/grpc_query_cctx_rate_limit.go index fa97806ee2..494c12d677 100644 --- a/x/crosschain/keeper/grpc_query_cctx_rate_limit.go +++ b/x/crosschain/keeper/grpc_query_cctx_rate_limit.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // RateLimiterInput collects the input data for the rate limiter diff --git a/x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go b/x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go index f08dcadadc..efcddbd672 100644 --- a/x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go +++ b/x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go @@ -7,13 +7,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) var ( diff --git a/x/crosschain/keeper/grpc_query_cctx_test.go b/x/crosschain/keeper/grpc_query_cctx_test.go index 6112d5e58c..54bffea45d 100644 --- a/x/crosschain/keeper/grpc_query_cctx_test.go +++ b/x/crosschain/keeper/grpc_query_cctx_test.go @@ -7,11 +7,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // createCctxWithNonceRange create in the store: diff --git a/x/crosschain/keeper/grpc_query_gas_price.go b/x/crosschain/keeper/grpc_query_gas_price.go index 56b95cff0c..a4a81a39af 100644 --- a/x/crosschain/keeper/grpc_query_gas_price.go +++ b/x/crosschain/keeper/grpc_query_gas_price.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) GasPriceAll( diff --git a/x/crosschain/keeper/grpc_query_gas_price_test.go b/x/crosschain/keeper/grpc_query_gas_price_test.go index ac28dd7b95..58b22e37a6 100644 --- a/x/crosschain/keeper/grpc_query_gas_price_test.go +++ b/x/crosschain/keeper/grpc_query_gas_price_test.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestGasPriceQuerySingle(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go b/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go index fe11c1668b..51ebe9b9a4 100644 --- a/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go +++ b/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) InboundHashToCctxAll( diff --git a/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx_test.go b/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx_test.go index da91836fe4..296b46a63b 100644 --- a/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx_test.go +++ b/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx_test.go @@ -12,11 +12,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestInboundHashToCctxQuerySingle(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_inbound_tracker.go b/x/crosschain/keeper/grpc_query_inbound_tracker.go index e5b57b895b..0cabd58380 100644 --- a/x/crosschain/keeper/grpc_query_inbound_tracker.go +++ b/x/crosschain/keeper/grpc_query_inbound_tracker.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) InboundTrackerAllByChain( diff --git a/x/crosschain/keeper/grpc_query_inbound_tracker_test.go b/x/crosschain/keeper/grpc_query_inbound_tracker_test.go index 3a5aa9b12c..6987da40ec 100644 --- a/x/crosschain/keeper/grpc_query_inbound_tracker_test.go +++ b/x/crosschain/keeper/grpc_query_inbound_tracker_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_InboundTrackerAllByChain(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_last_block_height.go b/x/crosschain/keeper/grpc_query_last_block_height.go index c5e691bf9c..614d679354 100644 --- a/x/crosschain/keeper/grpc_query_last_block_height.go +++ b/x/crosschain/keeper/grpc_query_last_block_height.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) LastBlockHeightAll( diff --git a/x/crosschain/keeper/grpc_query_last_block_height_test.go b/x/crosschain/keeper/grpc_query_last_block_height_test.go index b06be8f975..2ba8fae76e 100644 --- a/x/crosschain/keeper/grpc_query_last_block_height_test.go +++ b/x/crosschain/keeper/grpc_query_last_block_height_test.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestLastBlockHeightQuerySingle(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_last_zeta_height.go b/x/crosschain/keeper/grpc_query_last_zeta_height.go index 45fe776b96..a6754d42d1 100644 --- a/x/crosschain/keeper/grpc_query_last_zeta_height.go +++ b/x/crosschain/keeper/grpc_query_last_zeta_height.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) LastZetaHeight( diff --git a/x/crosschain/keeper/grpc_query_last_zeta_height_test.go b/x/crosschain/keeper/grpc_query_last_zeta_height_test.go index 22f82febf0..925cfb26f4 100644 --- a/x/crosschain/keeper/grpc_query_last_zeta_height_test.go +++ b/x/crosschain/keeper/grpc_query_last_zeta_height_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_LastZetaHeight(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_legacy.go b/x/crosschain/keeper/grpc_query_legacy.go index 1d52a0a603..9134f57c84 100644 --- a/x/crosschain/keeper/grpc_query_legacy.go +++ b/x/crosschain/keeper/grpc_query_legacy.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // OutTxTrackerAll diff --git a/x/crosschain/keeper/grpc_query_outbound_tracker.go b/x/crosschain/keeper/grpc_query_outbound_tracker.go index 59919970dd..7e80a199ee 100644 --- a/x/crosschain/keeper/grpc_query_outbound_tracker.go +++ b/x/crosschain/keeper/grpc_query_outbound_tracker.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) OutboundTrackerAll( diff --git a/x/crosschain/keeper/grpc_query_outbound_tracker_test.go b/x/crosschain/keeper/grpc_query_outbound_tracker_test.go index 47cde5e33a..6250aac082 100644 --- a/x/crosschain/keeper/grpc_query_outbound_tracker_test.go +++ b/x/crosschain/keeper/grpc_query_outbound_tracker_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_OutboundTrackerAllByChain(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_rate_limiter_flags.go b/x/crosschain/keeper/grpc_query_rate_limiter_flags.go index 066b86047f..1d1155f440 100644 --- a/x/crosschain/keeper/grpc_query_rate_limiter_flags.go +++ b/x/crosschain/keeper/grpc_query_rate_limiter_flags.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // RateLimiterFlags queries the rate limiter flags diff --git a/x/crosschain/keeper/grpc_query_rate_limiter_flags_test.go b/x/crosschain/keeper/grpc_query_rate_limiter_flags_test.go index 6132c6fdbf..76a81a0da0 100644 --- a/x/crosschain/keeper/grpc_query_rate_limiter_flags_test.go +++ b/x/crosschain/keeper/grpc_query_rate_limiter_flags_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_RateLimiterFlags(t *testing.T) { diff --git a/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go b/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go index 6c8974db5d..e27e1b37f7 100644 --- a/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go +++ b/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" - zetaObserverTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" + zetaObserverTypes "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) ConvertGasToZeta( diff --git a/x/crosschain/keeper/grpc_query_zeta_conversion_rate_test.go b/x/crosschain/keeper/grpc_query_zeta_conversion_rate_test.go index 4afc8378f7..60ce53169b 100644 --- a/x/crosschain/keeper/grpc_query_zeta_conversion_rate_test.go +++ b/x/crosschain/keeper/grpc_query_zeta_conversion_rate_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_ConvertGasToZeta(t *testing.T) { diff --git a/x/crosschain/keeper/inbound_hash_to_cctx.go b/x/crosschain/keeper/inbound_hash_to_cctx.go index 7593ca4e3b..cc303311bd 100644 --- a/x/crosschain/keeper/inbound_hash_to_cctx.go +++ b/x/crosschain/keeper/inbound_hash_to_cctx.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // SetInboundHashToCctx set a specific inboundHashToCctx in the store from its index diff --git a/x/crosschain/keeper/inbound_hash_to_cctx_test.go b/x/crosschain/keeper/inbound_hash_to_cctx_test.go index 6bdce68d82..804ef561ce 100644 --- a/x/crosschain/keeper/inbound_hash_to_cctx_test.go +++ b/x/crosschain/keeper/inbound_hash_to_cctx_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func createNInboundHashToCctx(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.InboundHashToCctx { diff --git a/x/crosschain/keeper/inbound_tracker.go b/x/crosschain/keeper/inbound_tracker.go index 9619f718c1..7ad5453c79 100644 --- a/x/crosschain/keeper/inbound_tracker.go +++ b/x/crosschain/keeper/inbound_tracker.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func getInboundTrackerKey(chainID int64, txHash string) string { diff --git a/x/crosschain/keeper/inbound_tracker_test.go b/x/crosschain/keeper/inbound_tracker_test.go index 899824e074..05f7d34ba7 100644 --- a/x/crosschain/keeper/inbound_tracker_test.go +++ b/x/crosschain/keeper/inbound_tracker_test.go @@ -9,11 +9,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func createNInboundTracker(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID int64) []types.InboundTracker { diff --git a/x/crosschain/keeper/initiate_outbound.go b/x/crosschain/keeper/initiate_outbound.go index 2a569cc8eb..5339cd4150 100644 --- a/x/crosschain/keeper/initiate_outbound.go +++ b/x/crosschain/keeper/initiate_outbound.go @@ -4,8 +4,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" ) // TODO (https://github.com/zeta-chain/node/issues/2345): this is just a tmp solution because some flows require gas payment and others don't. diff --git a/x/crosschain/keeper/initiate_outbound_test.go b/x/crosschain/keeper/initiate_outbound_test.go index 05da1daa0e..55ca3e36f8 100644 --- a/x/crosschain/keeper/initiate_outbound_test.go +++ b/x/crosschain/keeper/initiate_outbound_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_InitiateOutboundZEVMDeposit(t *testing.T) { diff --git a/x/crosschain/keeper/keeper.go b/x/crosschain/keeper/keeper.go index fc483689b3..c904d1add3 100644 --- a/x/crosschain/keeper/keeper.go +++ b/x/crosschain/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) type ( diff --git a/x/crosschain/keeper/last_block_height.go b/x/crosschain/keeper/last_block_height.go index da4580153f..d4467ce0cd 100644 --- a/x/crosschain/keeper/last_block_height.go +++ b/x/crosschain/keeper/last_block_height.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // SetLastBlockHeight set a specific lastBlockHeight in the store from its index diff --git a/x/crosschain/keeper/last_block_height_test.go b/x/crosschain/keeper/last_block_height_test.go index d38cec8f99..cfcb54c4d7 100644 --- a/x/crosschain/keeper/last_block_height_test.go +++ b/x/crosschain/keeper/last_block_height_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func createNLastBlockHeight(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.LastBlockHeight { diff --git a/x/crosschain/keeper/migrator.go b/x/crosschain/keeper/migrator.go index 490592b4cb..d71e439702 100644 --- a/x/crosschain/keeper/migrator.go +++ b/x/crosschain/keeper/migrator.go @@ -3,10 +3,10 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v2" - v3 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v3" - v4 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v4" - v5 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v5" + v2 "github.com/zeta-chain/node/x/crosschain/migrations/v2" + v3 "github.com/zeta-chain/node/x/crosschain/migrations/v3" + v4 "github.com/zeta-chain/node/x/crosschain/migrations/v4" + v5 "github.com/zeta-chain/node/x/crosschain/migrations/v5" ) // 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 fa6294588b..d4ba46489b 100644 --- a/x/crosschain/keeper/msg_server.go +++ b/x/crosschain/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) type msgServer struct { diff --git a/x/crosschain/keeper/msg_server_abort_stuck_cctx.go b/x/crosschain/keeper/msg_server_abort_stuck_cctx.go index 5ea695568f..6ba922e804 100644 --- a/x/crosschain/keeper/msg_server_abort_stuck_cctx.go +++ b/x/crosschain/keeper/msg_server_abort_stuck_cctx.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) const ( diff --git a/x/crosschain/keeper/msg_server_abort_stuck_cctx_test.go b/x/crosschain/keeper/msg_server_abort_stuck_cctx_test.go index 5e6df45d9b..a43d034b34 100644 --- a/x/crosschain/keeper/msg_server_abort_stuck_cctx_test.go +++ b/x/crosschain/keeper/msg_server_abort_stuck_cctx_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgServer_AbortStuckCCTX(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_add_inbound_tracker.go b/x/crosschain/keeper/msg_server_add_inbound_tracker.go index 13ad2bad1b..bec2eb2abf 100644 --- a/x/crosschain/keeper/msg_server_add_inbound_tracker.go +++ b/x/crosschain/keeper/msg_server_add_inbound_tracker.go @@ -7,9 +7,9 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // AddInboundTracker adds a new record to the inbound transaction tracker. diff --git a/x/crosschain/keeper/msg_server_add_inbound_tracker_test.go b/x/crosschain/keeper/msg_server_add_inbound_tracker_test.go index 0345cba1a1..e20cb21f69 100644 --- a/x/crosschain/keeper/msg_server_add_inbound_tracker_test.go +++ b/x/crosschain/keeper/msg_server_add_inbound_tracker_test.go @@ -7,15 +7,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_AddToInboundTracker(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_add_outbound_tracker.go b/x/crosschain/keeper/msg_server_add_outbound_tracker.go index 9fdf5ac48d..39002d3155 100644 --- a/x/crosschain/keeper/msg_server_add_outbound_tracker.go +++ b/x/crosschain/keeper/msg_server_add_outbound_tracker.go @@ -8,10 +8,10 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // MaxOutboundTrackerHashes is the maximum number of hashes that can be stored in the outbound transaction tracker diff --git a/x/crosschain/keeper/msg_server_add_outbound_tracker_test.go b/x/crosschain/keeper/msg_server_add_outbound_tracker_test.go index b6cb5d4bff..d243a3a7e6 100644 --- a/x/crosschain/keeper/msg_server_add_outbound_tracker_test.go +++ b/x/crosschain/keeper/msg_server_add_outbound_tracker_test.go @@ -7,14 +7,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func getEthereumChainID() int64 { diff --git a/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go b/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go index da1cd23618..c94ccc089a 100644 --- a/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go +++ b/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // MigrateERC20CustodyFunds migrates the funds from the current ERC20Custody contract to the new ERC20Custody contract diff --git a/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds_test.go b/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds_test.go index 511ac5cdec..e74f9ace1f 100644 --- a/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds_test.go +++ b/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds_test.go @@ -4,14 +4,14 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" "testing" ) diff --git a/x/crosschain/keeper/msg_server_migrate_tss_funds.go b/x/crosschain/keeper/msg_server_migrate_tss_funds.go index 7921686ab5..c285033f02 100644 --- a/x/crosschain/keeper/msg_server_migrate_tss_funds.go +++ b/x/crosschain/keeper/msg_server_migrate_tss_funds.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // MigrateTssFunds migrates the funds from the current TSS to the new TSS diff --git a/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go b/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go index 93e9a8fb98..c88f05ab29 100644 --- a/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go +++ b/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go @@ -8,14 +8,14 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/gas" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/gas" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func setupTssMigrationParams( diff --git a/x/crosschain/keeper/msg_server_refund_aborted_tx.go b/x/crosschain/keeper/msg_server_refund_aborted_tx.go index fb37dd1c4c..22e2b5da81 100644 --- a/x/crosschain/keeper/msg_server_refund_aborted_tx.go +++ b/x/crosschain/keeper/msg_server_refund_aborted_tx.go @@ -8,9 +8,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "golang.org/x/net/context" - "github.com/zeta-chain/zetacore/pkg/coin" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // RefundAbortedCCTX refunds the aborted CCTX. diff --git a/x/crosschain/keeper/msg_server_refund_aborted_tx_test.go b/x/crosschain/keeper/msg_server_refund_aborted_tx_test.go index 5e380acc81..cca28a0634 100644 --- a/x/crosschain/keeper/msg_server_refund_aborted_tx_test.go +++ b/x/crosschain/keeper/msg_server_refund_aborted_tx_test.go @@ -1,21 +1,21 @@ package keeper_test import ( - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" "testing" sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) func Test_GetRefundAddress(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_remove_outbound_tracker.go b/x/crosschain/keeper/msg_server_remove_outbound_tracker.go index ef20dfc6f7..0eda5ee389 100644 --- a/x/crosschain/keeper/msg_server_remove_outbound_tracker.go +++ b/x/crosschain/keeper/msg_server_remove_outbound_tracker.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // RemoveOutboundTracker removes a record from the outbound transaction tracker by chain ID and nonce. diff --git a/x/crosschain/keeper/msg_server_remove_outbound_tracker_test.go b/x/crosschain/keeper/msg_server_remove_outbound_tracker_test.go index 34c40044b5..578c1528fd 100644 --- a/x/crosschain/keeper/msg_server_remove_outbound_tracker_test.go +++ b/x/crosschain/keeper/msg_server_remove_outbound_tracker_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgServer_RemoveFromOutboundTracker(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status.go b/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status.go index 98e73566ed..ebd1b9cf1b 100644 --- a/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status.go +++ b/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // UpdateERC20CustodyPauseStatus creates a admin cmd cctx to update the pause status of the ERC20 custody contract diff --git a/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status_test.go b/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status_test.go index a7b3db78bf..ecc8b4429b 100644 --- a/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status_test.go +++ b/x/crosschain/keeper/msg_server_update_erc20_custody_pause_status_test.go @@ -4,14 +4,14 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" "testing" ) diff --git a/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go b/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go index 874338f205..8da83c2c81 100644 --- a/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go +++ b/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // UpdateRateLimiterFlags updates the rate limiter flags. diff --git a/x/crosschain/keeper/msg_server_update_rate_limiter_flags_test.go b/x/crosschain/keeper/msg_server_update_rate_limiter_flags_test.go index 6872479973..8be5f070f5 100644 --- a/x/crosschain/keeper/msg_server_update_rate_limiter_flags_test.go +++ b/x/crosschain/keeper/msg_server_update_rate_limiter_flags_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgServer_UpdateRateLimiterFlags(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_update_tss.go b/x/crosschain/keeper/msg_server_update_tss.go index f68c7e39d6..c8431190a8 100644 --- a/x/crosschain/keeper/msg_server_update_tss.go +++ b/x/crosschain/keeper/msg_server_update_tss.go @@ -6,9 +6,9 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // UpdateTssAddress updates the TSS address. diff --git a/x/crosschain/keeper/msg_server_update_tss_test.go b/x/crosschain/keeper/msg_server_update_tss_test.go index 6834d6bed1..f63ad2d708 100644 --- a/x/crosschain/keeper/msg_server_update_tss_test.go +++ b/x/crosschain/keeper/msg_server_update_tss_test.go @@ -4,14 +4,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_UpdateTssAddress(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_vote_gas_price.go b/x/crosschain/keeper/msg_server_vote_gas_price.go index 2f8fbde036..362d9ed99d 100644 --- a/x/crosschain/keeper/msg_server_vote_gas_price.go +++ b/x/crosschain/keeper/msg_server_vote_gas_price.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // VoteGasPrice submits information about the connected chain's gas price at a specific block diff --git a/x/crosschain/keeper/msg_server_vote_gas_price_test.go b/x/crosschain/keeper/msg_server_vote_gas_price_test.go index a048724581..c2d9f3261a 100644 --- a/x/crosschain/keeper/msg_server_vote_gas_price_test.go +++ b/x/crosschain/keeper/msg_server_vote_gas_price_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgServer_VoteGasPrice(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx.go b/x/crosschain/keeper/msg_server_vote_inbound_tx.go index 5aa925b363..a34e75c026 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx.go @@ -6,7 +6,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) const voteInboundID = "Vote Inbound" diff --git a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go index 98eb488d41..97263add19 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/x/evm/statedb" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func setObservers(t *testing.T, k *keeper.Keeper, ctx sdk.Context, zk keepertest.ZetaKeepers) []string { diff --git a/x/crosschain/keeper/msg_server_vote_outbound_tx.go b/x/crosschain/keeper/msg_server_vote_outbound_tx.go index d4505dd2f3..6682c2c705 100644 --- a/x/crosschain/keeper/msg_server_vote_outbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_outbound_tx.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + observerkeeper "github.com/zeta-chain/node/x/observer/keeper" ) const voteOutboundID = "Vote Outbound" diff --git a/x/crosschain/keeper/msg_server_vote_outbound_tx_test.go b/x/crosschain/keeper/msg_server_vote_outbound_tx_test.go index 13ecdc672e..cadc6eeac8 100644 --- a/x/crosschain/keeper/msg_server_vote_outbound_tx_test.go +++ b/x/crosschain/keeper/msg_server_vote_outbound_tx_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_FundGasStabilityPoolFromRemainingFees(t *testing.T) { diff --git a/x/crosschain/keeper/msg_server_whitelist_erc20.go b/x/crosschain/keeper/msg_server_whitelist_erc20.go index 62ce836643..4ae98a85b5 100644 --- a/x/crosschain/keeper/msg_server_whitelist_erc20.go +++ b/x/crosschain/keeper/msg_server_whitelist_erc20.go @@ -9,10 +9,10 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/coin" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // WhitelistERC20 deploys a new zrc20, create a foreign coin object for the ERC20 diff --git a/x/crosschain/keeper/msg_server_whitelist_erc20_test.go b/x/crosschain/keeper/msg_server_whitelist_erc20_test.go index 397fd7aac1..3eb18b9931 100644 --- a/x/crosschain/keeper/msg_server_whitelist_erc20_test.go +++ b/x/crosschain/keeper/msg_server_whitelist_erc20_test.go @@ -8,13 +8,13 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/constant" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/constant" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_WhitelistERC20(t *testing.T) { diff --git a/x/crosschain/keeper/outbound_tracker.go b/x/crosschain/keeper/outbound_tracker.go index dbf8bf3bb5..8edf5a2bb9 100644 --- a/x/crosschain/keeper/outbound_tracker.go +++ b/x/crosschain/keeper/outbound_tracker.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func getOutboundTrackerIndex(chainID int64, nonce uint64) string { diff --git a/x/crosschain/keeper/outbound_tracker_test.go b/x/crosschain/keeper/outbound_tracker_test.go index ce7cfe31f2..7eddcc2cfe 100644 --- a/x/crosschain/keeper/outbound_tracker_test.go +++ b/x/crosschain/keeper/outbound_tracker_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) // Keeper Tests diff --git a/x/crosschain/keeper/rate_limiter_flags.go b/x/crosschain/keeper/rate_limiter_flags.go index 52a1b91f6b..9ef567dc37 100644 --- a/x/crosschain/keeper/rate_limiter_flags.go +++ b/x/crosschain/keeper/rate_limiter_flags.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // SetRateLimiterFlags set the rate limiter flags in the store diff --git a/x/crosschain/keeper/rate_limiter_flags_test.go b/x/crosschain/keeper/rate_limiter_flags_test.go index 2e4ad7f92d..015af29489 100644 --- a/x/crosschain/keeper/rate_limiter_flags_test.go +++ b/x/crosschain/keeper/rate_limiter_flags_test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) // createForeignCoinAndAssetRate creates foreign coin and corresponding asset rate diff --git a/x/crosschain/keeper/refund.go b/x/crosschain/keeper/refund.go index a741434705..6c9deef32f 100644 --- a/x/crosschain/keeper/refund.go +++ b/x/crosschain/keeper/refund.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) RefundAbortedAmountOnZetaChain( diff --git a/x/crosschain/keeper/refund_test.go b/x/crosschain/keeper/refund_test.go index 1b1a22e100..e6239dae31 100644 --- a/x/crosschain/keeper/refund_test.go +++ b/x/crosschain/keeper/refund_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_RefundAmountOnZetaChainGas(t *testing.T) { diff --git a/x/crosschain/keeper/utils_test.go b/x/crosschain/keeper/utils_test.go index fb59b7afb9..258e11cedf 100644 --- a/x/crosschain/keeper/utils_test.go +++ b/x/crosschain/keeper/utils_test.go @@ -5,9 +5,9 @@ import ( "math/big" "testing" + "github.com/zeta-chain/node/pkg/contracts/erc1967proxy" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/pkg/contracts/erc1967proxy" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -17,13 +17,13 @@ import ( evmkeeper "github.com/zeta-chain/ethermint/x/evm/keeper" "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // getValidEthChainID get a valid eth chain id diff --git a/x/crosschain/keeper/v2_zevm_inbound.go b/x/crosschain/keeper/v2_zevm_inbound.go index 158a8f0f40..040bdec883 100644 --- a/x/crosschain/keeper/v2_zevm_inbound.go +++ b/x/crosschain/keeper/v2_zevm_inbound.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // ProcessZEVMInboundV2 processes the logs emitted by the zEVM contract for V2 protocol contracts diff --git a/x/crosschain/keeper/zeta_accounting.go b/x/crosschain/keeper/zeta_accounting.go index 275d7801bf..62f72fe417 100644 --- a/x/crosschain/keeper/zeta_accounting.go +++ b/x/crosschain/keeper/zeta_accounting.go @@ -4,7 +4,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func (k Keeper) SetZetaAccounting(ctx sdk.Context, abortedZetaAmount types.ZetaAccounting) { diff --git a/x/crosschain/keeper/zeta_accounting_test.go b/x/crosschain/keeper/zeta_accounting_test.go index 1e31cd1b4b..0743b7ffe9 100644 --- a/x/crosschain/keeper/zeta_accounting_test.go +++ b/x/crosschain/keeper/zeta_accounting_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestKeeper_AddZetaAccounting(t *testing.T) { diff --git a/x/crosschain/migrations/v2/migrate.go b/x/crosschain/migrations/v2/migrate.go index 4baa2e8baf..b0551b1f0d 100644 --- a/x/crosschain/migrations/v2/migrate.go +++ b/x/crosschain/migrations/v2/migrate.go @@ -6,8 +6,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/crosschain/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" ) // MigrateStore migrates the x/crosschain module state from the consensus version 1 to 2 diff --git a/x/crosschain/migrations/v3/migrate.go b/x/crosschain/migrations/v3/migrate.go index a6ec4f293b..3fcf989311 100644 --- a/x/crosschain/migrations/v3/migrate.go +++ b/x/crosschain/migrations/v3/migrate.go @@ -9,8 +9,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // MigrateStore adds a new TSSHistory store to crosschain module diff --git a/x/crosschain/migrations/v4/migrate.go b/x/crosschain/migrations/v4/migrate.go index b71fe26b1b..d6d71ef307 100644 --- a/x/crosschain/migrations/v4/migrate.go +++ b/x/crosschain/migrations/v4/migrate.go @@ -9,10 +9,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // crosschainKeeper is an interface to prevent cyclic dependency diff --git a/x/crosschain/migrations/v4/migrate_test.go b/x/crosschain/migrations/v4/migrate_test.go index 208086657b..d8990cd969 100644 --- a/x/crosschain/migrations/v4/migrate_test.go +++ b/x/crosschain/migrations/v4/migrate_test.go @@ -12,14 +12,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - v4 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v4" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/keeper" + v4 "github.com/zeta-chain/node/x/crosschain/migrations/v4" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/crosschain/migrations/v5/migrate.go b/x/crosschain/migrations/v5/migrate.go index 59ee7f7532..aeeb22451f 100644 --- a/x/crosschain/migrations/v5/migrate.go +++ b/x/crosschain/migrations/v5/migrate.go @@ -8,9 +8,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) // crosschainKeeper is an interface to prevent cyclic dependency diff --git a/x/crosschain/migrations/v5/migrate_test.go b/x/crosschain/migrations/v5/migrate_test.go index 3ffb006b58..d163fd4486 100644 --- a/x/crosschain/migrations/v5/migrate_test.go +++ b/x/crosschain/migrations/v5/migrate_test.go @@ -8,14 +8,14 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - v5 "github.com/zeta-chain/zetacore/x/crosschain/migrations/v5" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + v5 "github.com/zeta-chain/node/x/crosschain/migrations/v5" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/crosschain/module.go b/x/crosschain/module.go index 59f6bdfb11..e3b71cfeb0 100644 --- a/x/crosschain/module.go +++ b/x/crosschain/module.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/client/cli" - "github.com/zeta-chain/zetacore/x/crosschain/keeper" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/client/cli" + "github.com/zeta-chain/node/x/crosschain/keeper" + "github.com/zeta-chain/node/x/crosschain/types" ) var ( diff --git a/x/crosschain/module_simulation.go b/x/crosschain/module_simulation.go index 11cfe46d64..38ff067fbf 100644 --- a/x/crosschain/module_simulation.go +++ b/x/crosschain/module_simulation.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) // GenerateGenesisState creates a randomized GenState of the module diff --git a/x/crosschain/types/authz.go b/x/crosschain/types/authz.go index 75528388ca..97a09c979e 100644 --- a/x/crosschain/types/authz.go +++ b/x/crosschain/types/authz.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // GetAllAuthzZetaclientTxTypes returns all the authz types for required for zetaclient diff --git a/x/crosschain/types/authz_test.go b/x/crosschain/types/authz_test.go index 67b809a360..2238ff8842 100644 --- a/x/crosschain/types/authz_test.go +++ b/x/crosschain/types/authz_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) func TestGetAllAuthzZetaclientTxTypes(t *testing.T) { diff --git a/x/crosschain/types/cctx.go b/x/crosschain/types/cctx.go index d7a77e259c..90b398210d 100644 --- a/x/crosschain/types/cctx.go +++ b/x/crosschain/types/cctx.go @@ -10,7 +10,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // GetEVMRevertAddress returns the EVM revert address diff --git a/x/crosschain/types/cctx_test.go b/x/crosschain/types/cctx_test.go index 1b706d0feb..6317161196 100644 --- a/x/crosschain/types/cctx_test.go +++ b/x/crosschain/types/cctx_test.go @@ -8,12 +8,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestCrossChainTx_GetEVMRevertAddress(t *testing.T) { diff --git a/x/crosschain/types/cmd_cctxs.go b/x/crosschain/types/cmd_cctxs.go index 5ba7495d22..71ecaaf384 100644 --- a/x/crosschain/types/cmd_cctxs.go +++ b/x/crosschain/types/cmd_cctxs.go @@ -8,11 +8,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/pkg/gas" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/pkg/gas" ) const ( diff --git a/x/crosschain/types/cmd_cctxs_test.go b/x/crosschain/types/cmd_cctxs_test.go index 56fc205048..1712989000 100644 --- a/x/crosschain/types/cmd_cctxs_test.go +++ b/x/crosschain/types/cmd_cctxs_test.go @@ -4,12 +4,12 @@ import ( sdkmath "cosmossdk.io/math" "fmt" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/pkg/gas" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/pkg/gas" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" "testing" ) diff --git a/x/crosschain/types/cross_chain_tx.pb.go b/x/crosschain/types/cross_chain_tx.pb.go index 526efa053e..a0fbdab126 100644 --- a/x/crosschain/types/cross_chain_tx.pb.go +++ b/x/crosschain/types/cross_chain_tx.pb.go @@ -8,7 +8,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" io "io" math "math" math_bits "math/bits" @@ -691,88 +691,88 @@ func init() { } var fileDescriptor_d4c1966807fb5cb2 = []byte{ - // 1286 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x6f, 0x13, 0x47, - 0x14, 0xf7, 0x26, 0x8e, 0x63, 0x3f, 0xff, 0xc9, 0x32, 0x31, 0x61, 0x49, 0x85, 0x49, 0xdd, 0x02, - 0x86, 0x16, 0x5b, 0x04, 0xa9, 0xaa, 0x7a, 0x4b, 0x22, 0x02, 0x29, 0x85, 0x44, 0x4b, 0x40, 0x82, - 0x43, 0xb7, 0xe3, 0xdd, 0xc9, 0x7a, 0x14, 0x7b, 0xc7, 0xdd, 0x19, 0x47, 0x0e, 0xea, 0xad, 0xe7, - 0x4a, 0xed, 0x77, 0xe8, 0xa1, 0xc7, 0x7e, 0x0c, 0x8e, 0x1c, 0xab, 0x1e, 0x50, 0x05, 0xdf, 0xa0, - 0xe7, 0x1e, 0xaa, 0xf9, 0xb7, 0x8e, 0x91, 0x9b, 0x50, 0xda, 0x93, 0x67, 0x7e, 0x6f, 0xde, 0xef, - 0xcd, 0xbe, 0xf9, 0xbd, 0x37, 0x63, 0x58, 0x7f, 0x4e, 0x04, 0x0e, 0x7b, 0x98, 0x26, 0x1d, 0x35, - 0x62, 0x29, 0xe9, 0x84, 0x29, 0xe3, 0x5c, 0x63, 0x6a, 0x18, 0xa8, 0x71, 0x20, 0xc6, 0xed, 0x61, - 0xca, 0x04, 0x43, 0x97, 0x32, 0x9f, 0xb6, 0xf5, 0x69, 0x4f, 0x7c, 0x56, 0xeb, 0x31, 0x8b, 0x99, - 0x5a, 0xd9, 0x91, 0x23, 0xed, 0xb4, 0x7a, 0x75, 0x46, 0xa0, 0xe1, 0x61, 0xdc, 0x09, 0x99, 0x0c, - 0xc3, 0x68, 0xa2, 0xd7, 0x35, 0x7f, 0xcd, 0x43, 0x75, 0x27, 0xe9, 0xb2, 0x51, 0x12, 0xed, 0xe1, - 0x14, 0x0f, 0x38, 0x5a, 0x81, 0x02, 0x27, 0x49, 0x44, 0x52, 0xcf, 0x59, 0x73, 0x5a, 0x25, 0xdf, - 0xcc, 0xd0, 0x55, 0x58, 0xd2, 0x23, 0xb3, 0x3f, 0x1a, 0x79, 0x73, 0x6b, 0x4e, 0x6b, 0xde, 0xaf, - 0x6a, 0x78, 0x4b, 0xa2, 0x3b, 0x11, 0xfa, 0x00, 0x4a, 0x62, 0x1c, 0xb0, 0x94, 0xc6, 0x34, 0xf1, - 0xe6, 0x15, 0x45, 0x51, 0x8c, 0x77, 0xd5, 0x1c, 0x6d, 0x42, 0x49, 0x06, 0x0f, 0xc4, 0xf1, 0x90, - 0x78, 0xf9, 0x35, 0xa7, 0x55, 0x5b, 0xbf, 0xd2, 0x9e, 0xf1, 0x7d, 0xc3, 0xc3, 0xb8, 0xad, 0x76, - 0xb9, 0xc5, 0x68, 0xb2, 0x7f, 0x3c, 0x24, 0x7e, 0x31, 0x34, 0x23, 0x54, 0x87, 0x05, 0xcc, 0x39, - 0x11, 0xde, 0x82, 0x22, 0xd7, 0x13, 0x74, 0x17, 0x0a, 0x78, 0xc0, 0x46, 0x89, 0xf0, 0x0a, 0x12, - 0xde, 0xec, 0xbc, 0x78, 0x75, 0x39, 0xf7, 0xfb, 0xab, 0xcb, 0xd7, 0x62, 0x2a, 0x7a, 0xa3, 0x6e, - 0x3b, 0x64, 0x83, 0x4e, 0xc8, 0xf8, 0x80, 0x71, 0xf3, 0x73, 0x93, 0x47, 0x87, 0x1d, 0xb9, 0x0f, - 0xde, 0x7e, 0x4c, 0x13, 0xe1, 0x1b, 0x77, 0xf4, 0x11, 0x54, 0x59, 0x97, 0x93, 0xf4, 0x88, 0x44, - 0x41, 0x0f, 0xf3, 0x9e, 0xb7, 0xa8, 0xc2, 0x54, 0x2c, 0x78, 0x0f, 0xf3, 0x1e, 0xfa, 0x1c, 0xbc, - 0x6c, 0x11, 0x19, 0x0b, 0x92, 0x26, 0xb8, 0x1f, 0xf4, 0x08, 0x8d, 0x7b, 0xc2, 0x2b, 0xae, 0x39, - 0xad, 0xbc, 0xbf, 0x62, 0xed, 0x77, 0x8c, 0xf9, 0x9e, 0xb2, 0xa2, 0x0f, 0xa1, 0xd2, 0xc5, 0xfd, - 0x3e, 0x13, 0x01, 0x4d, 0x22, 0x32, 0xf6, 0x4a, 0x8a, 0xbd, 0xac, 0xb1, 0x1d, 0x09, 0xa1, 0x75, - 0x38, 0x7f, 0x40, 0x13, 0xdc, 0xa7, 0xcf, 0x49, 0x14, 0xc8, 0x94, 0x58, 0x66, 0x50, 0xcc, 0xcb, - 0x99, 0xf1, 0x19, 0x11, 0xd8, 0xd0, 0x52, 0x58, 0x11, 0xe3, 0xc0, 0x58, 0xb0, 0xa0, 0x2c, 0x09, - 0xb8, 0xc0, 0x62, 0xc4, 0xbd, 0xb2, 0xca, 0xf2, 0xed, 0xf6, 0xa9, 0x2a, 0x6a, 0xef, 0x8f, 0xb7, - 0x4f, 0xf8, 0x3e, 0x52, 0xae, 0x7e, 0x5d, 0xcc, 0x40, 0x9b, 0xdf, 0x42, 0x4d, 0x06, 0xde, 0x08, - 0x43, 0x99, 0x2f, 0x9a, 0xc4, 0x28, 0x80, 0x65, 0xdc, 0x65, 0xa9, 0xb0, 0xdb, 0x35, 0x07, 0xe1, - 0xbc, 0xdf, 0x41, 0x9c, 0x33, 0x5c, 0x2a, 0x88, 0x62, 0x6a, 0xfe, 0x54, 0x80, 0xda, 0xee, 0x48, - 0x9c, 0x94, 0xe9, 0x2a, 0x14, 0x53, 0x12, 0x12, 0x7a, 0x94, 0x09, 0x35, 0x9b, 0xa3, 0xeb, 0xe0, - 0xda, 0xb1, 0x16, 0xeb, 0x8e, 0xd5, 0xea, 0x92, 0xc5, 0xad, 0x5a, 0xa7, 0x04, 0x39, 0xff, 0x7e, - 0x82, 0x9c, 0x48, 0x2f, 0xff, 0xdf, 0xa4, 0x27, 0x4b, 0x87, 0xf3, 0x20, 0x61, 0x49, 0x48, 0x94, - 0xba, 0xf3, 0x7e, 0x51, 0x70, 0xfe, 0x50, 0xce, 0xa5, 0x31, 0xc6, 0x3c, 0xe8, 0xd3, 0x01, 0xd5, - 0x1a, 0xcf, 0xfb, 0xc5, 0x18, 0xf3, 0xaf, 0xe4, 0xdc, 0x1a, 0x87, 0x29, 0x0d, 0x89, 0x11, 0xac, - 0x34, 0xee, 0xc9, 0x39, 0x6a, 0x81, 0x6b, 0x8c, 0x2c, 0xa5, 0xe2, 0x38, 0x38, 0x20, 0xc4, 0xbb, - 0xa0, 0xd6, 0xd4, 0xf4, 0x1a, 0x05, 0x6f, 0x13, 0x82, 0x10, 0xe4, 0x95, 0xe4, 0x8b, 0xca, 0xaa, - 0xc6, 0xef, 0x22, 0xd8, 0xd3, 0xaa, 0x01, 0x4e, 0xad, 0x86, 0x8b, 0x20, 0xb7, 0x19, 0x8c, 0x38, - 0x89, 0xbc, 0xba, 0x5a, 0xb9, 0x18, 0x63, 0xfe, 0x98, 0x93, 0x08, 0x7d, 0x0d, 0xcb, 0xe4, 0xe0, - 0x80, 0x84, 0x82, 0x1e, 0x91, 0x60, 0xf2, 0x71, 0xe7, 0x55, 0x8a, 0xdb, 0x26, 0xc5, 0x57, 0xdf, - 0x21, 0xc5, 0x3b, 0x52, 0x53, 0x19, 0xd5, 0x5d, 0x9b, 0x95, 0xf6, 0xdb, 0xfc, 0x3a, 0xb3, 0x2b, - 0x6a, 0x17, 0x53, 0xeb, 0x75, 0x8a, 0x2f, 0x01, 0xc8, 0xc3, 0x19, 0x8e, 0xba, 0x87, 0xe4, 0x58, - 0x55, 0x55, 0xc9, 0x97, 0xc7, 0xb5, 0xa7, 0x80, 0x53, 0x0a, 0xb0, 0xf2, 0x3f, 0x17, 0xe0, 0x97, - 0xf9, 0x62, 0xd5, 0xad, 0x37, 0xff, 0x72, 0xa0, 0xa0, 0x01, 0xb4, 0x01, 0x05, 0x13, 0xcb, 0x51, - 0xb1, 0xae, 0x9f, 0x11, 0x6b, 0x2b, 0x14, 0x63, 0x13, 0xc1, 0x38, 0xa2, 0x2b, 0x50, 0xd3, 0xa3, - 0x60, 0x40, 0x38, 0xc7, 0x31, 0x51, 0x05, 0x53, 0xf2, 0xab, 0x1a, 0x7d, 0xa0, 0x41, 0x74, 0x0b, - 0xea, 0x7d, 0xcc, 0xc5, 0xe3, 0x61, 0x84, 0x05, 0x09, 0x04, 0x1d, 0x10, 0x2e, 0xf0, 0x60, 0xa8, - 0x2a, 0x67, 0xde, 0x5f, 0x9e, 0xd8, 0xf6, 0xad, 0x09, 0xb5, 0x60, 0x89, 0xf2, 0x0d, 0x59, 0xd2, - 0x3e, 0x39, 0x18, 0x25, 0x11, 0x89, 0x54, 0x99, 0x14, 0xfd, 0xb7, 0x61, 0xf4, 0x09, 0x9c, 0x0b, - 0x53, 0x82, 0x65, 0x1b, 0x99, 0x30, 0x2f, 0x28, 0x66, 0xd7, 0x18, 0x32, 0xda, 0xe6, 0xf7, 0x73, - 0x50, 0xf5, 0xc9, 0x11, 0x49, 0xc5, 0xee, 0x50, 0xe6, 0x46, 0x7d, 0x42, 0xaa, 0x80, 0x00, 0x47, - 0x51, 0x4a, 0x38, 0x37, 0x7d, 0xa1, 0xaa, 0xd1, 0x0d, 0x0d, 0xa2, 0x8f, 0xa1, 0x16, 0xe2, 0x7e, - 0x3f, 0x60, 0x49, 0xa0, 0x0d, 0xea, 0x4b, 0x8b, 0x7e, 0x45, 0xa2, 0xbb, 0x89, 0xe6, 0x94, 0xb7, - 0x80, 0x6a, 0x43, 0x19, 0x97, 0xbe, 0xc9, 0x2a, 0x0a, 0xb4, 0x54, 0x93, 0x88, 0x36, 0x69, 0xf2, - 0xcb, 0x2a, 0x36, 0xa2, 0x4d, 0xda, 0x53, 0xd9, 0x8e, 0xd4, 0xb2, 0x89, 0xcc, 0x16, 0xde, 0xaf, - 0x53, 0x98, 0x78, 0x56, 0x94, 0xcd, 0x1f, 0x16, 0xa0, 0xb2, 0x25, 0x0f, 0x56, 0xf5, 0xb3, 0xfd, - 0x31, 0xf2, 0x60, 0x51, 0xa5, 0x8a, 0xd9, 0xae, 0x68, 0xa7, 0xf2, 0xda, 0xd4, 0x05, 0xac, 0x0f, - 0x56, 0x4f, 0xd0, 0x37, 0x50, 0x52, 0x2d, 0xfb, 0x80, 0x10, 0x6e, 0x36, 0xb5, 0xf5, 0x2f, 0x37, - 0xf5, 0xe7, 0xab, 0xcb, 0xee, 0x31, 0x1e, 0xf4, 0xbf, 0x68, 0x66, 0x4c, 0x4d, 0xbf, 0x28, 0xc7, - 0xdb, 0x84, 0x70, 0x74, 0x0d, 0x96, 0x52, 0xd2, 0xc7, 0xc7, 0x24, 0xca, 0xb2, 0x54, 0xd0, 0xcd, - 0xc7, 0xc0, 0x36, 0x4d, 0xdb, 0x50, 0x0e, 0x43, 0x31, 0xb6, 0x65, 0x23, 0x7b, 0x50, 0x79, 0x76, - 0x33, 0x3e, 0x21, 0x65, 0x23, 0x63, 0x08, 0x33, 0x49, 0xa3, 0x47, 0x50, 0xa3, 0xfa, 0x45, 0x13, - 0x0c, 0xd5, 0x5d, 0xa1, 0x5a, 0x56, 0x79, 0xfd, 0xd3, 0x33, 0xa8, 0xa6, 0x9e, 0x41, 0x7e, 0x95, - 0x4e, 0xbd, 0x8a, 0x9e, 0xc0, 0x12, 0x33, 0x17, 0x90, 0x65, 0x85, 0xb5, 0xf9, 0x56, 0x79, 0xfd, - 0xe6, 0x19, 0xac, 0xd3, 0xd7, 0x96, 0x5f, 0x63, 0xd3, 0xd7, 0x58, 0x0a, 0x17, 0xd5, 0x43, 0x2c, - 0x64, 0xfd, 0x20, 0x64, 0x89, 0x48, 0x71, 0x28, 0x82, 0x23, 0x92, 0x72, 0xca, 0x12, 0x73, 0x75, - 0x7f, 0x76, 0x46, 0x84, 0x3d, 0xe3, 0xbf, 0x65, 0xdc, 0x9f, 0x68, 0x6f, 0xff, 0xc2, 0x70, 0xb6, - 0x01, 0x3d, 0xcd, 0x64, 0xcb, 0x74, 0xe9, 0xa8, 0x16, 0x75, 0x76, 0x82, 0xa6, 0xca, 0x6d, 0x33, - 0x2f, 0x65, 0x62, 0xa5, 0x6e, 0xc0, 0x1b, 0xdf, 0x01, 0x4c, 0x9a, 0x0b, 0x42, 0x50, 0xdb, 0x23, - 0x49, 0x44, 0x93, 0xd8, 0xe4, 0xd6, 0xcd, 0xa1, 0x65, 0x58, 0x32, 0x98, 0xcd, 0x8c, 0xeb, 0xa0, - 0x73, 0x50, 0xb5, 0xb3, 0x07, 0x34, 0x21, 0x91, 0x3b, 0x2f, 0x21, 0xb3, 0x4e, 0x87, 0x75, 0xf3, - 0xa8, 0x02, 0x45, 0x3d, 0x26, 0x91, 0xbb, 0x80, 0xca, 0xb0, 0xb8, 0xa1, 0x1f, 0x0a, 0x6e, 0x61, - 0x35, 0xff, 0xcb, 0xcf, 0x0d, 0xe7, 0xc6, 0x7d, 0xa8, 0xcf, 0x6a, 0xa3, 0xc8, 0x85, 0xca, 0x43, - 0x26, 0xb6, 0xed, 0xb3, 0xc9, 0xcd, 0xa1, 0x2a, 0x94, 0x26, 0x53, 0x47, 0x32, 0xdf, 0x19, 0x93, - 0x70, 0x24, 0xc9, 0xe6, 0x0c, 0x59, 0x07, 0x2e, 0xfc, 0x43, 0x66, 0x51, 0x01, 0xe6, 0x9e, 0xdc, - 0x72, 0x73, 0xea, 0x77, 0xdd, 0x75, 0xb4, 0xc3, 0xe6, 0xfd, 0x17, 0xaf, 0x1b, 0xce, 0xcb, 0xd7, - 0x0d, 0xe7, 0x8f, 0xd7, 0x0d, 0xe7, 0xc7, 0x37, 0x8d, 0xdc, 0xcb, 0x37, 0x8d, 0xdc, 0x6f, 0x6f, - 0x1a, 0xb9, 0x67, 0xb7, 0x4e, 0x54, 0x92, 0x4c, 0xec, 0xcd, 0xb7, 0x1e, 0xe6, 0xe3, 0x93, 0xff, - 0x01, 0x54, 0x61, 0x75, 0x0b, 0xea, 0xf0, 0x6e, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x16, - 0x38, 0x3b, 0x31, 0x0c, 0x00, 0x00, + // 1291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xcf, 0x26, 0x8e, 0x63, 0x3f, 0xff, 0xc8, 0x32, 0x31, 0x61, 0xc9, 0x57, 0x98, 0x7c, 0xdd, + 0x02, 0x86, 0x36, 0xb6, 0x08, 0x52, 0x55, 0xf5, 0x96, 0x44, 0x04, 0xd2, 0x16, 0x12, 0x2d, 0x01, + 0x09, 0x0e, 0xdd, 0x8e, 0x77, 0x5f, 0xd6, 0xa3, 0xd8, 0x3b, 0xee, 0xce, 0x38, 0x72, 0x50, 0x6f, + 0x3d, 0x57, 0x6a, 0xff, 0x87, 0x1e, 0x7a, 0xec, 0x9f, 0xc1, 0x91, 0x63, 0xd5, 0x03, 0xaa, 0xe0, + 0x3f, 0xe8, 0xb9, 0x87, 0x6a, 0x7e, 0xac, 0x1d, 0xa3, 0x34, 0xa1, 0xb4, 0xa7, 0x9d, 0xf9, 0xbc, + 0x79, 0x9f, 0x37, 0xfb, 0xe6, 0xf3, 0xde, 0x0c, 0xac, 0x3f, 0x47, 0x49, 0xc3, 0x2e, 0x65, 0x49, + 0x5b, 0x8f, 0x78, 0x8a, 0xed, 0x30, 0xe5, 0x42, 0x18, 0x4c, 0x0f, 0x03, 0x3d, 0x0e, 0xe4, 0xa8, + 0x35, 0x48, 0xb9, 0xe4, 0xe4, 0xca, 0xd8, 0xa7, 0x95, 0xf9, 0xb4, 0x26, 0x3e, 0x2b, 0xb5, 0x98, + 0xc7, 0x5c, 0xaf, 0x6c, 0xab, 0x91, 0x71, 0x5a, 0xb9, 0x7e, 0x4a, 0xa0, 0xc1, 0x61, 0xdc, 0x0e, + 0xb9, 0x0a, 0xc3, 0x59, 0x62, 0xd6, 0x35, 0x7e, 0xc9, 0x41, 0x65, 0x27, 0xe9, 0xf0, 0x61, 0x12, + 0xed, 0xd1, 0x94, 0xf6, 0x05, 0x59, 0x86, 0xbc, 0xc0, 0x24, 0xc2, 0xd4, 0x73, 0x56, 0x9d, 0x66, + 0xd1, 0xb7, 0x33, 0x72, 0x1d, 0x16, 0xcd, 0xc8, 0xee, 0x8f, 0x45, 0xde, 0xec, 0xaa, 0xd3, 0x9c, + 0xf3, 0x2b, 0x06, 0xde, 0x52, 0xe8, 0x4e, 0x44, 0xfe, 0x07, 0x45, 0x39, 0x0a, 0x78, 0xca, 0x62, + 0x96, 0x78, 0x73, 0x9a, 0xa2, 0x20, 0x47, 0xbb, 0x7a, 0x4e, 0x36, 0xa1, 0xa8, 0x82, 0x07, 0xf2, + 0x78, 0x80, 0x5e, 0x6e, 0xd5, 0x69, 0x56, 0xd7, 0xaf, 0xb5, 0x4e, 0xf9, 0xbf, 0xc1, 0x61, 0xdc, + 0xd2, 0xbb, 0xdc, 0xe2, 0x2c, 0xd9, 0x3f, 0x1e, 0xa0, 0x5f, 0x08, 0xed, 0x88, 0xd4, 0x60, 0x9e, + 0x0a, 0x81, 0xd2, 0x9b, 0xd7, 0xe4, 0x66, 0x42, 0xee, 0x41, 0x9e, 0xf6, 0xf9, 0x30, 0x91, 0x5e, + 0x5e, 0xc1, 0x9b, 0xed, 0x17, 0xaf, 0xae, 0xce, 0xfc, 0xf6, 0xea, 0xea, 0x8d, 0x98, 0xc9, 0xee, + 0xb0, 0xd3, 0x0a, 0x79, 0xbf, 0x1d, 0x72, 0xd1, 0xe7, 0xc2, 0x7e, 0xd6, 0x44, 0x74, 0xd8, 0x56, + 0xfb, 0x10, 0xad, 0xc7, 0x2c, 0x91, 0xbe, 0x75, 0x27, 0x1f, 0x40, 0x85, 0x77, 0x04, 0xa6, 0x47, + 0x18, 0x05, 0x5d, 0x2a, 0xba, 0xde, 0x82, 0x0e, 0x53, 0xce, 0xc0, 0xfb, 0x54, 0x74, 0xc9, 0xa7, + 0xe0, 0x8d, 0x17, 0xe1, 0x48, 0x62, 0x9a, 0xd0, 0x5e, 0xd0, 0x45, 0x16, 0x77, 0xa5, 0x57, 0x58, + 0x75, 0x9a, 0x39, 0x7f, 0x39, 0xb3, 0xdf, 0xb5, 0xe6, 0xfb, 0xda, 0x4a, 0xfe, 0x0f, 0xe5, 0x0e, + 0xed, 0xf5, 0xb8, 0x0c, 0x58, 0x12, 0xe1, 0xc8, 0x2b, 0x6a, 0xf6, 0x92, 0xc1, 0x76, 0x14, 0x44, + 0xd6, 0xe1, 0xe2, 0x01, 0x4b, 0x68, 0x8f, 0x3d, 0xc7, 0x28, 0x50, 0x29, 0xc9, 0x98, 0x41, 0x33, + 0x2f, 0x8d, 0x8d, 0xcf, 0x50, 0x52, 0x4b, 0xcb, 0x60, 0x59, 0x8e, 0x02, 0x6b, 0xa1, 0x92, 0xf1, + 0x24, 0x10, 0x92, 0xca, 0xa1, 0xf0, 0x4a, 0x3a, 0xcb, 0x77, 0x5a, 0x67, 0xaa, 0xa8, 0xb5, 0x3f, + 0xda, 0x3e, 0xe1, 0xfb, 0x48, 0xbb, 0xfa, 0x35, 0x79, 0x0a, 0xda, 0xf8, 0x06, 0xaa, 0x2a, 0xf0, + 0x46, 0x18, 0xaa, 0x7c, 0xb1, 0x24, 0x26, 0x01, 0x2c, 0xd1, 0x0e, 0x4f, 0x65, 0xb6, 0x5d, 0x7b, + 0x10, 0xce, 0xfb, 0x1d, 0xc4, 0x05, 0xcb, 0xa5, 0x83, 0x68, 0xa6, 0xc6, 0x8f, 0x79, 0xa8, 0xee, + 0x0e, 0xe5, 0x49, 0x99, 0xae, 0x40, 0x21, 0xc5, 0x10, 0xd9, 0xd1, 0x58, 0xa8, 0xe3, 0x39, 0xb9, + 0x09, 0x6e, 0x36, 0x36, 0x62, 0xdd, 0xc9, 0xb4, 0xba, 0x98, 0xe1, 0x99, 0x5a, 0xa7, 0x04, 0x39, + 0xf7, 0x7e, 0x82, 0x9c, 0x48, 0x2f, 0xf7, 0xef, 0xa4, 0xa7, 0x4a, 0x47, 0x88, 0x20, 0xe1, 0x49, + 0x88, 0x5a, 0xdd, 0x39, 0xbf, 0x20, 0x85, 0x78, 0xa8, 0xe6, 0xca, 0x18, 0x53, 0x11, 0xf4, 0x58, + 0x9f, 0x19, 0x8d, 0xe7, 0xfc, 0x42, 0x4c, 0xc5, 0x97, 0x6a, 0x9e, 0x19, 0x07, 0x29, 0x0b, 0xd1, + 0x0a, 0x56, 0x19, 0xf7, 0xd4, 0x9c, 0x34, 0xc1, 0xb5, 0x46, 0x9e, 0x32, 0x79, 0x1c, 0x1c, 0x20, + 0x7a, 0x97, 0xf4, 0x9a, 0xaa, 0x59, 0xa3, 0xe1, 0x6d, 0x44, 0x42, 0x20, 0xa7, 0x25, 0x5f, 0xd0, + 0x56, 0x3d, 0x7e, 0x17, 0xc1, 0x9e, 0x55, 0x0d, 0x70, 0x66, 0x35, 0x5c, 0x06, 0xb5, 0xcd, 0x60, + 0x28, 0x30, 0xf2, 0x6a, 0x7a, 0xe5, 0x42, 0x4c, 0xc5, 0x63, 0x81, 0x11, 0xf9, 0x0a, 0x96, 0xf0, + 0xe0, 0x00, 0x43, 0xc9, 0x8e, 0x30, 0x98, 0xfc, 0xdc, 0x45, 0x9d, 0xe2, 0x96, 0x4d, 0xf1, 0xf5, + 0x77, 0x48, 0xf1, 0x8e, 0xd2, 0xd4, 0x98, 0xea, 0x5e, 0x96, 0x95, 0xd6, 0xdb, 0xfc, 0x26, 0xb3, + 0xcb, 0x7a, 0x17, 0x53, 0xeb, 0x4d, 0x8a, 0xaf, 0x00, 0xa8, 0xc3, 0x19, 0x0c, 0x3b, 0x87, 0x78, + 0xac, 0xab, 0xaa, 0xe8, 0xab, 0xe3, 0xda, 0xd3, 0xc0, 0x19, 0x05, 0x58, 0xfe, 0x8f, 0x0b, 0xf0, + 0xf3, 0x5c, 0xa1, 0xe2, 0xd6, 0x1a, 0x7f, 0x3a, 0x90, 0x37, 0x00, 0xd9, 0x80, 0xbc, 0x8d, 0xe5, + 0xe8, 0x58, 0x37, 0xcf, 0x89, 0xb5, 0x15, 0xca, 0x91, 0x8d, 0x60, 0x1d, 0xc9, 0x35, 0xa8, 0x9a, + 0x51, 0xd0, 0x47, 0x21, 0x68, 0x8c, 0xba, 0x60, 0x8a, 0x7e, 0xc5, 0xa0, 0x0f, 0x0c, 0x48, 0x6e, + 0x43, 0xad, 0x47, 0x85, 0x7c, 0x3c, 0x88, 0xa8, 0xc4, 0x40, 0xb2, 0x3e, 0x0a, 0x49, 0xfb, 0x03, + 0x5d, 0x39, 0x73, 0xfe, 0xd2, 0xc4, 0xb6, 0x9f, 0x99, 0x48, 0x13, 0x16, 0x99, 0xd8, 0x50, 0x25, + 0xed, 0xe3, 0xc1, 0x30, 0x89, 0x30, 0xd2, 0x65, 0x52, 0xf0, 0xdf, 0x86, 0xc9, 0x47, 0x70, 0x21, + 0x4c, 0x91, 0xaa, 0x36, 0x32, 0x61, 0x9e, 0xd7, 0xcc, 0xae, 0x35, 0x8c, 0x69, 0x1b, 0xdf, 0xcd, + 0x42, 0xc5, 0xc7, 0x23, 0x4c, 0xe5, 0xee, 0x40, 0xe5, 0x46, 0xff, 0x42, 0xaa, 0x81, 0x80, 0x46, + 0x51, 0x8a, 0x42, 0xd8, 0xbe, 0x50, 0x31, 0xe8, 0x86, 0x01, 0xc9, 0x87, 0x50, 0x0d, 0x69, 0xaf, + 0x17, 0xf0, 0x24, 0x30, 0x06, 0xfd, 0xa7, 0x05, 0xbf, 0xac, 0xd0, 0xdd, 0xc4, 0x70, 0xaa, 0x5b, + 0x40, 0xb7, 0xa1, 0x31, 0x97, 0xb9, 0xc9, 0xca, 0x1a, 0xcc, 0xa8, 0x26, 0x11, 0xb3, 0xa4, 0xa9, + 0x3f, 0x2b, 0x67, 0x11, 0xb3, 0xa4, 0x3d, 0x55, 0xed, 0x48, 0x2f, 0x9b, 0xc8, 0x6c, 0xfe, 0xfd, + 0x3a, 0x85, 0x8d, 0x97, 0x89, 0xb2, 0xf1, 0xfd, 0x3c, 0x94, 0xb7, 0xd4, 0xc1, 0xea, 0x7e, 0xb6, + 0x3f, 0x22, 0x1e, 0x2c, 0xe8, 0x54, 0xf1, 0xac, 0x2b, 0x66, 0x53, 0x75, 0x6d, 0x9a, 0x02, 0x36, + 0x07, 0x6b, 0x26, 0xe4, 0x6b, 0x28, 0xea, 0x96, 0x7d, 0x80, 0x28, 0xec, 0xa6, 0xb6, 0xfe, 0xe1, + 0xa6, 0xfe, 0x78, 0x75, 0xd5, 0x3d, 0xa6, 0xfd, 0xde, 0x67, 0x8d, 0x31, 0x53, 0xc3, 0x2f, 0xa8, + 0xf1, 0x36, 0xa2, 0x20, 0x37, 0x60, 0x31, 0xc5, 0x1e, 0x3d, 0xc6, 0x68, 0x9c, 0xa5, 0xbc, 0x69, + 0x3e, 0x16, 0xce, 0xd2, 0xb4, 0x0d, 0xa5, 0x30, 0x94, 0xa3, 0xac, 0x6c, 0x54, 0x0f, 0x2a, 0x9d, + 0xde, 0x8c, 0x4f, 0x48, 0xd9, 0xca, 0x18, 0xc2, 0xb1, 0xa4, 0xc9, 0x23, 0xa8, 0x32, 0xf3, 0xa2, + 0x09, 0x06, 0xfa, 0xae, 0xd0, 0x2d, 0xab, 0xb4, 0xfe, 0xf1, 0x39, 0x54, 0x53, 0xcf, 0x20, 0xbf, + 0xc2, 0xa6, 0x5e, 0x45, 0x4f, 0x60, 0x91, 0xdb, 0x0b, 0x28, 0x63, 0x85, 0xd5, 0xb9, 0x66, 0x69, + 0x7d, 0xed, 0x1c, 0xd6, 0xe9, 0x6b, 0xcb, 0xaf, 0xf2, 0xe9, 0x6b, 0x2c, 0x85, 0xcb, 0xfa, 0x21, + 0x16, 0xf2, 0x5e, 0x10, 0xf2, 0x44, 0xa6, 0x34, 0x94, 0xc1, 0x11, 0xa6, 0x82, 0xf1, 0xc4, 0x5e, + 0xdd, 0x9f, 0x9c, 0x13, 0x61, 0xcf, 0xfa, 0x6f, 0x59, 0xf7, 0x27, 0xc6, 0xdb, 0xbf, 0x34, 0x38, + 0xdd, 0x40, 0x9e, 0x8e, 0x65, 0xcb, 0x4d, 0xe9, 0xe8, 0x16, 0x75, 0x7e, 0x82, 0xa6, 0xca, 0x6d, + 0x33, 0xa7, 0x64, 0x92, 0x49, 0xdd, 0x82, 0xb7, 0xbe, 0x05, 0x98, 0x34, 0x17, 0x42, 0xa0, 0xba, + 0x87, 0x49, 0xc4, 0x92, 0xd8, 0xe6, 0xd6, 0x9d, 0x21, 0x4b, 0xb0, 0x68, 0xb1, 0x2c, 0x33, 0xae, + 0x43, 0x2e, 0x40, 0x25, 0x9b, 0x3d, 0x60, 0x09, 0x46, 0xee, 0x9c, 0x82, 0xec, 0x3a, 0x13, 0xd6, + 0xcd, 0x91, 0x32, 0x14, 0xcc, 0x18, 0x23, 0x77, 0x9e, 0x94, 0x60, 0x61, 0xc3, 0x3c, 0x14, 0xdc, + 0xfc, 0x4a, 0xee, 0xe7, 0x9f, 0xea, 0xce, 0xad, 0x2f, 0xa0, 0x76, 0x5a, 0x1b, 0x25, 0x2e, 0x94, + 0x1f, 0x72, 0xb9, 0x9d, 0x3d, 0x9b, 0xdc, 0x19, 0x52, 0x81, 0xe2, 0x64, 0xea, 0x28, 0xe6, 0xbb, + 0x23, 0x0c, 0x87, 0x8a, 0x6c, 0xd6, 0x92, 0xb5, 0xe1, 0xd2, 0xdf, 0x64, 0x96, 0xe4, 0x61, 0xf6, + 0xc9, 0x6d, 0x77, 0x46, 0x7f, 0xd7, 0x5d, 0xc7, 0x38, 0x6c, 0xde, 0x7b, 0xf1, 0xba, 0xee, 0xbc, + 0x7c, 0x5d, 0x77, 0x7e, 0x7f, 0x5d, 0x77, 0x7e, 0x78, 0x53, 0x9f, 0x79, 0xf9, 0xa6, 0x3e, 0xf3, + 0xeb, 0x9b, 0xfa, 0xcc, 0xb3, 0xb5, 0x13, 0x95, 0xa4, 0x12, 0xbb, 0x66, 0x1e, 0xe6, 0x09, 0x8f, + 0xb0, 0x3d, 0x3a, 0xf9, 0xfe, 0xd7, 0x45, 0xd5, 0xc9, 0xeb, 0x83, 0xbb, 0xf3, 0x57, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x9b, 0xa4, 0xfd, 0xc5, 0x2d, 0x0c, 0x00, 0x00, } func (m *InboundParams) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/events.pb.go b/x/crosschain/types/events.pb.go index 05751c4336..ec29e14f2f 100644 --- a/x/crosschain/types/events.pb.go +++ b/x/crosschain/types/events.pb.go @@ -764,57 +764,57 @@ func init() { } var fileDescriptor_dd08b628129fa2e1 = []byte{ - // 789 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0xcd, 0x6e, 0xeb, 0x44, - 0x14, 0xc7, 0xeb, 0x9b, 0xef, 0xb9, 0x49, 0x00, 0xdf, 0x00, 0xa6, 0x52, 0xc3, 0xbd, 0x41, 0x08, - 0x84, 0x20, 0x2d, 0xe5, 0x09, 0x68, 0xd4, 0xd2, 0x08, 0x55, 0xad, 0xd2, 0xa2, 0xa2, 0x6e, 0x46, - 0x13, 0xcf, 0xc1, 0x1e, 0x70, 0xc6, 0xd1, 0xcc, 0xb8, 0x49, 0xfa, 0x14, 0x88, 0xf7, 0x60, 0x83, - 0xc4, 0x8e, 0x07, 0x60, 0xd9, 0x25, 0x4b, 0xd4, 0xbc, 0x08, 0x9a, 0x0f, 0xa7, 0x89, 0x53, 0xc1, - 0x02, 0x81, 0x74, 0x77, 0x3e, 0xff, 0x73, 0x3c, 0xe7, 0x37, 0xff, 0xe3, 0xf1, 0xa0, 0x4f, 0xee, - 0x40, 0x91, 0x30, 0x26, 0x8c, 0xef, 0x9b, 0xa7, 0x54, 0xc0, 0x7e, 0x28, 0x52, 0x29, 0xad, 0x06, - 0xb7, 0xc0, 0x95, 0xec, 0x4f, 0x45, 0xaa, 0x52, 0x7f, 0x6f, 0x55, 0xdb, 0xcf, 0x6b, 0xfb, 0x8f, - 0xb5, 0xbb, 0x9d, 0x28, 0x8d, 0x52, 0x53, 0xb9, 0xaf, 0x9f, 0xec, 0x4b, 0xbd, 0x65, 0x09, 0xbd, - 0x7d, 0xac, 0x57, 0x19, 0xf2, 0x71, 0x9a, 0x71, 0x7a, 0xc2, 0x38, 0x49, 0xd8, 0x1d, 0x50, 0xff, - 0x25, 0x6a, 0x4e, 0x64, 0x84, 0xd5, 0x62, 0x0a, 0x38, 0x13, 0x49, 0xe0, 0xbd, 0xf4, 0x3e, 0x6e, - 0x8c, 0xd0, 0x44, 0x46, 0x57, 0x8b, 0x29, 0x7c, 0x23, 0x12, 0x7f, 0x0f, 0xa1, 0x30, 0x54, 0x73, - 0xcc, 0x38, 0x85, 0x79, 0xf0, 0xcc, 0xe4, 0x1b, 0x5a, 0x19, 0x6a, 0xc1, 0x7f, 0x07, 0x55, 0x25, - 0x70, 0x0a, 0x22, 0x28, 0x99, 0x94, 0x8b, 0xfc, 0xf7, 0x50, 0x5d, 0xcd, 0x71, 0x2a, 0x22, 0xc6, - 0x83, 0xb2, 0xc9, 0xd4, 0xd4, 0xfc, 0x5c, 0x87, 0x7e, 0x07, 0x55, 0x88, 0x94, 0xa0, 0x82, 0x8a, - 0xd1, 0x6d, 0xe0, 0xbf, 0x42, 0x4d, 0x66, 0xe9, 0x70, 0x4c, 0x64, 0x1c, 0x54, 0x4d, 0xf2, 0xb9, - 0xd3, 0x4e, 0x89, 0x8c, 0xfd, 0x03, 0xd4, 0xc9, 0x4b, 0xc6, 0x49, 0x1a, 0xfe, 0x80, 0x63, 0x60, - 0x51, 0xac, 0x82, 0x9a, 0x29, 0xf5, 0x5d, 0xee, 0x48, 0xa7, 0x4e, 0x4d, 0xc6, 0xdf, 0x45, 0x75, - 0x01, 0x21, 0xb0, 0x5b, 0x10, 0x41, 0xdd, 0x54, 0xad, 0x62, 0xff, 0x43, 0xd4, 0xce, 0x9f, 0xb1, - 0x31, 0x2f, 0x68, 0x98, 0x8a, 0x56, 0xae, 0x0e, 0xb4, 0xa8, 0x37, 0x48, 0x26, 0x69, 0xc6, 0x55, - 0x80, 0xec, 0x06, 0x6d, 0xe4, 0x7f, 0x84, 0xde, 0x10, 0x90, 0x90, 0x05, 0x50, 0x3c, 0x01, 0x29, - 0x49, 0x04, 0xc1, 0x73, 0x53, 0xd0, 0x76, 0xf2, 0x99, 0x55, 0xb5, 0x81, 0x1c, 0x66, 0x58, 0x2a, - 0xa2, 0x32, 0x19, 0x34, 0xad, 0x81, 0x1c, 0x66, 0x97, 0x46, 0xd0, 0x18, 0x36, 0xb5, 0x5a, 0xa6, - 0x65, 0x31, 0xac, 0x9a, 0xaf, 0xf2, 0x0a, 0x35, 0xad, 0xb3, 0x8e, 0xb5, 0x6d, 0xed, 0xb1, 0x9a, - 0x21, 0xed, 0xfd, 0xf2, 0x0c, 0xbd, 0x6b, 0xa6, 0x7c, 0x23, 0xc2, 0x6b, 0xa6, 0x62, 0x2a, 0xc8, - 0x6c, 0x20, 0x80, 0xa8, 0xff, 0x72, 0xce, 0x45, 0xae, 0xf2, 0x16, 0xd7, 0xd6, 0x64, 0x2b, 0xdb, - 0x93, 0x5d, 0x9f, 0x53, 0xf5, 0x1f, 0xe7, 0x54, 0xfb, 0xfb, 0x39, 0xd5, 0x37, 0xe6, 0xb4, 0x69, - 0x7f, 0xa3, 0x60, 0x7f, 0xef, 0x57, 0x0f, 0x05, 0xd6, 0x34, 0x50, 0xe4, 0xff, 0x74, 0x6d, 0xc3, - 0x92, 0xf2, 0xb6, 0x25, 0x9b, 0xdc, 0x95, 0x22, 0xf7, 0x6f, 0x1e, 0xea, 0x18, 0xee, 0xf3, 0x4c, - 0xd9, 0x33, 0x4d, 0x58, 0x92, 0x09, 0xf8, 0xf7, 0xcc, 0x7b, 0x08, 0xa5, 0x09, 0xcd, 0x1b, 0x5b, - 0xee, 0x46, 0x9a, 0x50, 0xf7, 0xbd, 0x6e, 0x72, 0x95, 0x9f, 0xf8, 0x9c, 0x6f, 0x49, 0x92, 0x01, - 0x76, 0xd3, 0xa1, 0x0e, 0xbd, 0x65, 0xd4, 0x91, 0x13, 0xb7, 0xf1, 0x2f, 0xb3, 0x30, 0x04, 0x29, - 0x5f, 0x13, 0xfc, 0x9f, 0x3c, 0xb4, 0x6b, 0xf0, 0x07, 0x83, 0xab, 0x6f, 0xbf, 0x22, 0xf2, 0x42, - 0xb0, 0x10, 0x86, 0x3c, 0x14, 0x40, 0x24, 0xd0, 0x02, 0xa2, 0x57, 0x44, 0xfc, 0x14, 0xf9, 0x11, - 0x91, 0x78, 0xaa, 0x5f, 0xc2, 0xcc, 0xbd, 0xe5, 0x76, 0xf2, 0x66, 0x54, 0x58, 0x4d, 0xff, 0x68, - 0x08, 0xa5, 0x4c, 0xb1, 0x94, 0x93, 0x04, 0x7f, 0x07, 0x90, 0xef, 0xaa, 0xfd, 0x28, 0x9f, 0x00, - 0xc8, 0x5e, 0x82, 0x5e, 0x18, 0xa6, 0xe3, 0xd1, 0xe0, 0xf0, 0xe0, 0x3a, 0x66, 0x0a, 0x12, 0x26, - 0x95, 0xfe, 0x6b, 0xce, 0xf2, 0x00, 0x6f, 0x61, 0xf9, 0xab, 0xdc, 0x60, 0xc5, 0xf7, 0x01, 0x6a, - 0xdd, 0x89, 0xf0, 0xf0, 0x00, 0x13, 0x4a, 0x05, 0x48, 0xe9, 0xd0, 0x9a, 0x46, 0xfc, 0xd2, 0x6a, - 0xbd, 0x9f, 0x3d, 0xf4, 0xfe, 0x63, 0xbb, 0x41, 0x26, 0x55, 0x4a, 0x17, 0x27, 0x19, 0xa7, 0xf2, - 0x8c, 0x45, 0x82, 0x68, 0x2e, 0xbf, 0x8f, 0x5e, 0x68, 0xb3, 0x43, 0x9b, 0x5c, 0x2d, 0x67, 0x3b, - 0xbf, 0xc5, 0x61, 0xe6, 0x5e, 0x73, 0x6b, 0xea, 0xc6, 0xf0, 0x54, 0x63, 0x58, 0x6b, 0xbc, 0x76, - 0xd0, 0x4b, 0xc5, 0x83, 0xbe, 0xb6, 0xbb, 0x72, 0xc1, 0xf4, 0xde, 0xf7, 0xee, 0x9c, 0xaf, 0xe3, - 0x5e, 0x90, 0x4c, 0x32, 0x1e, 0xe9, 0xcb, 0xca, 0xfc, 0x59, 0x30, 0xa3, 0x06, 0xae, 0x34, 0xaa, - 0x99, 0x78, 0x48, 0xf5, 0x65, 0x35, 0x25, 0x99, 0x1b, 0x4f, 0x7d, 0x64, 0x83, 0x42, 0xaf, 0x52, - 0xa1, 0xd7, 0xd1, 0xd7, 0xbf, 0x3f, 0x74, 0xbd, 0xfb, 0x87, 0xae, 0xf7, 0xe7, 0x43, 0xd7, 0xfb, - 0x71, 0xd9, 0xdd, 0xb9, 0x5f, 0x76, 0x77, 0xfe, 0x58, 0x76, 0x77, 0x6e, 0x3e, 0x8f, 0x98, 0x8a, - 0xb3, 0x71, 0x3f, 0x4c, 0x27, 0xe6, 0xae, 0xff, 0xac, 0x70, 0xed, 0xcf, 0xd7, 0x2f, 0x7e, 0x7d, - 0x08, 0xe4, 0xb8, 0x6a, 0xee, 0xf0, 0x2f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xc2, 0xaf, - 0xdb, 0x26, 0x08, 0x00, 0x00, + // 793 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0xdd, 0x8e, 0x1b, 0x35, + 0x14, 0xc7, 0x77, 0x9a, 0x6f, 0x37, 0x09, 0x30, 0x0d, 0x30, 0xac, 0xb4, 0xa1, 0x0d, 0x42, 0x20, + 0x44, 0x93, 0x55, 0x79, 0x02, 0x1a, 0x75, 0xdb, 0x5c, 0x54, 0xad, 0xd2, 0xa2, 0xa2, 0xbd, 0xb1, + 0x9c, 0xf1, 0x61, 0xc6, 0x30, 0xb1, 0x23, 0xdb, 0xb3, 0x49, 0xf6, 0x29, 0x10, 0xef, 0xc1, 0x0d, + 0x12, 0x77, 0x3c, 0x00, 0x97, 0x7b, 0xc9, 0x25, 0xda, 0xbc, 0x08, 0xf2, 0xc7, 0x64, 0x93, 0xc9, + 0x0a, 0x2e, 0x10, 0x48, 0xbd, 0x9b, 0xf3, 0x3f, 0x67, 0x7c, 0x7e, 0xfe, 0x9f, 0xf1, 0x18, 0x7d, + 0x71, 0x09, 0x9a, 0xc4, 0x29, 0x61, 0x7c, 0x64, 0x9f, 0x84, 0x84, 0x51, 0x2c, 0x85, 0x52, 0x4e, + 0x83, 0x0b, 0xe0, 0x5a, 0x0d, 0x17, 0x52, 0x68, 0x11, 0x9e, 0x6c, 0x6b, 0x87, 0x45, 0xed, 0xf0, + 0xa6, 0xf6, 0xb8, 0x97, 0x88, 0x44, 0xd8, 0xca, 0x91, 0x79, 0x72, 0x2f, 0x0d, 0x36, 0x15, 0xf4, + 0xfe, 0x13, 0xb3, 0xca, 0x84, 0xcf, 0x44, 0xce, 0xe9, 0x19, 0xe3, 0x24, 0x63, 0x97, 0x40, 0xc3, + 0xfb, 0xa8, 0x3d, 0x57, 0x09, 0xd6, 0xeb, 0x05, 0xe0, 0x5c, 0x66, 0x51, 0x70, 0x3f, 0xf8, 0xbc, + 0x35, 0x45, 0x73, 0x95, 0xbc, 0x5e, 0x2f, 0xe0, 0x1b, 0x99, 0x85, 0x27, 0x08, 0xc5, 0xb1, 0x5e, + 0x61, 0xc6, 0x29, 0xac, 0xa2, 0x3b, 0x36, 0xdf, 0x32, 0xca, 0xc4, 0x08, 0xe1, 0x07, 0xa8, 0xae, + 0x80, 0x53, 0x90, 0x51, 0xc5, 0xa6, 0x7c, 0x14, 0x7e, 0x84, 0x9a, 0x7a, 0x85, 0x85, 0x4c, 0x18, + 0x8f, 0xaa, 0x36, 0xd3, 0xd0, 0xab, 0x17, 0x26, 0x0c, 0x7b, 0xa8, 0x46, 0x94, 0x02, 0x1d, 0xd5, + 0xac, 0xee, 0x82, 0xf0, 0x01, 0x6a, 0x33, 0x47, 0x87, 0x53, 0xa2, 0xd2, 0xa8, 0x6e, 0x93, 0x77, + 0xbd, 0xf6, 0x8c, 0xa8, 0x34, 0x3c, 0x45, 0xbd, 0xa2, 0x64, 0x96, 0x89, 0xf8, 0x07, 0x9c, 0x02, + 0x4b, 0x52, 0x1d, 0x35, 0x6c, 0x69, 0xe8, 0x73, 0x8f, 0x4d, 0xea, 0x99, 0xcd, 0x84, 0xc7, 0xa8, + 0x29, 0x21, 0x06, 0x76, 0x01, 0x32, 0x6a, 0xda, 0xaa, 0x6d, 0x1c, 0x7e, 0x8a, 0xba, 0xc5, 0x33, + 0xb6, 0xe6, 0x45, 0x2d, 0x5b, 0xd1, 0x29, 0xd4, 0xb1, 0x11, 0xcd, 0x06, 0xc9, 0x5c, 0xe4, 0x5c, + 0x47, 0xc8, 0x6d, 0xd0, 0x45, 0xe1, 0x67, 0xe8, 0x1d, 0x09, 0x19, 0x59, 0x03, 0xc5, 0x73, 0x50, + 0x8a, 0x24, 0x10, 0xdd, 0xb5, 0x05, 0x5d, 0x2f, 0x3f, 0x77, 0xaa, 0x31, 0x90, 0xc3, 0x12, 0x2b, + 0x4d, 0x74, 0xae, 0xa2, 0xb6, 0x33, 0x90, 0xc3, 0xf2, 0x95, 0x15, 0x0c, 0x86, 0x4b, 0x6d, 0x97, + 0xe9, 0x38, 0x0c, 0xa7, 0x16, 0xab, 0x3c, 0x40, 0x6d, 0xe7, 0xac, 0x67, 0xed, 0x3a, 0x7b, 0x9c, + 0x66, 0x49, 0x07, 0xbf, 0xdc, 0x41, 0x1f, 0xda, 0x29, 0x9f, 0xcb, 0xf8, 0x0d, 0xd3, 0x29, 0x95, + 0x64, 0x39, 0x96, 0x40, 0xf4, 0x7f, 0x39, 0xe7, 0x32, 0x57, 0xf5, 0x80, 0xeb, 0x60, 0xb2, 0xb5, + 0xc3, 0xc9, 0xee, 0xce, 0xa9, 0xfe, 0x8f, 0x73, 0x6a, 0xfc, 0xfd, 0x9c, 0x9a, 0x7b, 0x73, 0xda, + 0xb7, 0xbf, 0x55, 0xb2, 0x7f, 0xf0, 0x6b, 0x80, 0x22, 0x67, 0x1a, 0x68, 0xf2, 0x7f, 0xba, 0xb6, + 0x67, 0x49, 0xf5, 0xd0, 0x92, 0x7d, 0xee, 0x5a, 0x99, 0xfb, 0xb7, 0x00, 0xf5, 0x2c, 0xf7, 0x8b, + 0x5c, 0xbb, 0x33, 0x4d, 0x58, 0x96, 0x4b, 0xf8, 0xf7, 0xcc, 0x27, 0x08, 0x89, 0x8c, 0x16, 0x8d, + 0x1d, 0x77, 0x4b, 0x64, 0xd4, 0x7f, 0xaf, 0xfb, 0x5c, 0xd5, 0x5b, 0x3e, 0xe7, 0x0b, 0x92, 0xe5, + 0x80, 0xfd, 0x74, 0xa8, 0x47, 0xef, 0x58, 0x75, 0xea, 0xc5, 0x43, 0xfc, 0x57, 0x79, 0x1c, 0x83, + 0x52, 0x6f, 0x09, 0xfe, 0x4f, 0x01, 0x3a, 0xb6, 0xf8, 0xe3, 0xf1, 0xeb, 0x6f, 0x9f, 0x12, 0xf5, + 0x52, 0xb2, 0x18, 0x26, 0x3c, 0x96, 0x40, 0x14, 0xd0, 0x12, 0x62, 0x50, 0x46, 0xfc, 0x12, 0x85, + 0x09, 0x51, 0x78, 0x61, 0x5e, 0xc2, 0xcc, 0xbf, 0xe5, 0x77, 0xf2, 0x6e, 0x52, 0x5a, 0xcd, 0xfc, + 0x68, 0x08, 0xa5, 0x4c, 0x33, 0xc1, 0x49, 0x86, 0xbf, 0x03, 0x28, 0x76, 0xd5, 0xbd, 0x91, 0xcf, + 0x00, 0xd4, 0x20, 0x43, 0xf7, 0x2c, 0xd3, 0x93, 0xe9, 0xf8, 0xd1, 0xe9, 0x9b, 0x94, 0x69, 0xc8, + 0x98, 0xd2, 0xe6, 0xaf, 0xb9, 0x2c, 0x02, 0x7c, 0x80, 0x15, 0x6e, 0x73, 0xe3, 0x2d, 0xdf, 0x27, + 0xa8, 0x73, 0x29, 0xe3, 0x47, 0xa7, 0x98, 0x50, 0x2a, 0x41, 0x29, 0x8f, 0xd6, 0xb6, 0xe2, 0xd7, + 0x4e, 0x1b, 0xfc, 0x1c, 0xa0, 0x8f, 0x6f, 0xda, 0x8d, 0x73, 0xa5, 0x05, 0x5d, 0x9f, 0xe5, 0x9c, + 0xaa, 0xe7, 0x2c, 0x91, 0xc4, 0x70, 0x85, 0x43, 0x74, 0xcf, 0x98, 0x1d, 0xbb, 0xe4, 0x76, 0x39, + 0xd7, 0xf9, 0x3d, 0x0e, 0x4b, 0xff, 0x9a, 0x5f, 0xd3, 0x34, 0x86, 0xdb, 0x1a, 0xc3, 0x4e, 0xe3, + 0x9d, 0x83, 0x5e, 0x29, 0x1f, 0xf4, 0x9d, 0xdd, 0x55, 0x4b, 0xa6, 0x0f, 0xbe, 0xf7, 0xe7, 0x7c, + 0x17, 0xf7, 0x25, 0xc9, 0x15, 0xe3, 0x89, 0xb9, 0xac, 0xec, 0x9f, 0x05, 0x33, 0x6a, 0xe1, 0x2a, + 0xd3, 0x86, 0x8d, 0x27, 0xd4, 0x5c, 0x56, 0x0b, 0x92, 0xfb, 0xf1, 0x34, 0xa7, 0x2e, 0x28, 0xf5, + 0xaa, 0x94, 0x7a, 0x3d, 0x7e, 0xfa, 0xfb, 0x75, 0x3f, 0xb8, 0xba, 0xee, 0x07, 0x7f, 0x5e, 0xf7, + 0x83, 0x1f, 0x37, 0xfd, 0xa3, 0xab, 0x4d, 0xff, 0xe8, 0x8f, 0x4d, 0xff, 0xe8, 0xfc, 0x61, 0xc2, + 0x74, 0x9a, 0xcf, 0x86, 0xb1, 0x98, 0xdb, 0xbb, 0xfe, 0xa1, 0xbb, 0xe2, 0xb9, 0xa0, 0x30, 0x5a, + 0xed, 0x5e, 0xfa, 0xe6, 0x00, 0xa8, 0x59, 0xdd, 0xde, 0xdf, 0x5f, 0xfd, 0x15, 0x00, 0x00, 0xff, + 0xff, 0xde, 0x67, 0x9e, 0x8b, 0x22, 0x08, 0x00, 0x00, } func (m *EventInboundFinalized) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go index 9d053f9b05..c1bc41bdf2 100644 --- a/x/crosschain/types/expected_keepers.go +++ b/x/crosschain/types/expected_keepers.go @@ -10,11 +10,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/proofs" - fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/proofs" + fungibletypes "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) type StakingKeeper interface { diff --git a/x/crosschain/types/gas_price.pb.go b/x/crosschain/types/gas_price.pb.go index d5ccffd28e..561907b071 100644 --- a/x/crosschain/types/gas_price.pb.go +++ b/x/crosschain/types/gas_price.pb.go @@ -133,26 +133,26 @@ func init() { } var fileDescriptor_6c44a94bd00549c5 = []byte{ - // 300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xbf, 0x4e, 0xc3, 0x30, - 0x18, 0xc4, 0x6b, 0xd2, 0xbf, 0xa6, 0x2c, 0x16, 0x42, 0x66, 0xa8, 0x15, 0x60, 0xc9, 0xd2, 0x54, - 0x88, 0x37, 0x60, 0x00, 0x55, 0x48, 0x08, 0x65, 0x64, 0x89, 0x5c, 0xe7, 0xa3, 0xb5, 0x20, 0x71, - 0xe4, 0xcf, 0x95, 0x5a, 0x9e, 0x82, 0xc7, 0x62, 0xec, 0xc8, 0x88, 0xda, 0x9d, 0x67, 0x40, 0x71, - 0x1a, 0x40, 0x6c, 0xbe, 0x9f, 0xef, 0x3b, 0x9d, 0x8e, 0x8e, 0x5f, 0xc1, 0x49, 0xb5, 0x90, 0xba, - 0x98, 0xf8, 0x97, 0xb1, 0x30, 0x51, 0xd6, 0x20, 0xd6, 0x6c, 0x2e, 0x31, 0x2d, 0xad, 0x56, 0x10, - 0x97, 0xd6, 0x38, 0xc3, 0x46, 0x3f, 0xf6, 0xb8, 0xb1, 0xc7, 0xbf, 0xf6, 0xf3, 0x2f, 0x42, 0xfb, - 0xb7, 0x12, 0x1f, 0xaa, 0x0b, 0xc6, 0x69, 0x4f, 0x59, 0x90, 0xce, 0x58, 0x4e, 0x42, 0x12, 0x0d, - 0x92, 0x46, 0xb2, 0x63, 0xda, 0xd1, 0x45, 0x06, 0x2b, 0x7e, 0xe0, 0x79, 0x2d, 0xd8, 0x29, 0xed, - 0xfb, 0x94, 0x54, 0x67, 0x3c, 0x08, 0x49, 0x14, 0x24, 0x3d, 0xaf, 0xa7, 0x59, 0x15, 0x85, 0x7a, - 0x5e, 0x80, 0x45, 0xde, 0x0e, 0x83, 0x2a, 0x6a, 0x2f, 0xd9, 0x88, 0xd2, 0xd9, 0x8b, 0x51, 0xcf, - 0x69, 0xb1, 0xcc, 0x91, 0x77, 0xc2, 0x20, 0x6a, 0x27, 0x03, 0x4f, 0xee, 0x97, 0x39, 0xb2, 0x13, - 0xda, 0xf5, 0xf5, 0x91, 0x77, 0xfd, 0xd7, 0x5e, 0xb1, 0x33, 0x3a, 0xcc, 0x21, 0xd3, 0xb2, 0x48, - 0xeb, 0x22, 0xbd, 0x90, 0x44, 0xed, 0xe4, 0xb0, 0x66, 0x53, 0x5f, 0xe7, 0x82, 0x1e, 0x95, 0x56, - 0x1b, 0xab, 0xdd, 0x3a, 0x7d, 0x02, 0x40, 0xde, 0xf7, 0x09, 0xc3, 0x06, 0xde, 0x00, 0xe0, 0xf5, - 0xdd, 0xfb, 0x56, 0x90, 0xcd, 0x56, 0x90, 0xcf, 0xad, 0x20, 0x6f, 0x3b, 0xd1, 0xda, 0xec, 0x44, - 0xeb, 0x63, 0x27, 0x5a, 0x8f, 0x97, 0x73, 0xed, 0x16, 0xcb, 0x59, 0xac, 0x4c, 0xee, 0x97, 0x1d, - 0xff, 0x1b, 0x79, 0xf5, 0x77, 0x66, 0xb7, 0x2e, 0x01, 0x67, 0x5d, 0xbf, 0xf1, 0xd5, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x4e, 0x6a, 0xcb, 0x1e, 0x94, 0x01, 0x00, 0x00, + // 301 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xbf, 0x4e, 0xc3, 0x30, + 0x18, 0xc4, 0x6b, 0xd2, 0xbf, 0xa6, 0x2c, 0x16, 0x42, 0x66, 0xa8, 0x15, 0x60, 0xc9, 0xd2, 0x74, + 0xe0, 0x0d, 0x18, 0xa8, 0xba, 0x20, 0x94, 0x91, 0x25, 0x72, 0x9d, 0x8f, 0xd6, 0x82, 0xd8, 0x91, + 0x3f, 0x57, 0x6a, 0x79, 0x0a, 0x1e, 0x8b, 0xb1, 0x23, 0x23, 0x6a, 0x77, 0x9e, 0x01, 0xd5, 0x69, + 0x80, 0xcd, 0xf7, 0xf3, 0x7d, 0xa7, 0xd3, 0xd1, 0xf1, 0x1b, 0x78, 0xa9, 0x96, 0x52, 0x9b, 0x49, + 0x78, 0x59, 0x07, 0x13, 0xe5, 0x2c, 0x62, 0xcd, 0x16, 0x12, 0xf3, 0xca, 0x69, 0x05, 0x69, 0xe5, + 0xac, 0xb7, 0x6c, 0xf4, 0x6b, 0x4f, 0x1b, 0x7b, 0xfa, 0x67, 0xbf, 0xfe, 0x26, 0xb4, 0x3f, 0x95, + 0xf8, 0x78, 0xb8, 0x60, 0x9c, 0xf6, 0x94, 0x03, 0xe9, 0xad, 0xe3, 0x24, 0x26, 0xc9, 0x20, 0x6b, + 0x24, 0x3b, 0xa7, 0x1d, 0x6d, 0x0a, 0x58, 0xf3, 0x93, 0xc0, 0x6b, 0xc1, 0x2e, 0x69, 0x3f, 0xa4, + 0xe4, 0xba, 0xe0, 0x51, 0x4c, 0x92, 0x28, 0xeb, 0x05, 0x3d, 0x2b, 0x0e, 0x51, 0xa8, 0x17, 0x06, + 0x1c, 0xf2, 0x76, 0x1c, 0x1d, 0xa2, 0x8e, 0x92, 0x8d, 0x28, 0x9d, 0xbf, 0x5a, 0xf5, 0x92, 0x9b, + 0x55, 0x89, 0xbc, 0x13, 0x47, 0x49, 0x3b, 0x1b, 0x04, 0xf2, 0xb0, 0x2a, 0x91, 0x5d, 0xd0, 0x6e, + 0xa8, 0x8f, 0xbc, 0x1b, 0xbe, 0x8e, 0x8a, 0x5d, 0xd1, 0x61, 0x09, 0x85, 0x96, 0x26, 0xaf, 0x8b, + 0xf4, 0x62, 0x92, 0xb4, 0xb3, 0xd3, 0x9a, 0xcd, 0x42, 0x9d, 0x1b, 0x7a, 0x56, 0x39, 0x6d, 0x9d, + 0xf6, 0x9b, 0xfc, 0x19, 0x00, 0x79, 0x3f, 0x24, 0x0c, 0x1b, 0x78, 0x0f, 0x80, 0x77, 0xd3, 0x8f, + 0x9d, 0x20, 0xdb, 0x9d, 0x20, 0x5f, 0x3b, 0x41, 0xde, 0xf7, 0xa2, 0xb5, 0xdd, 0x8b, 0xd6, 0xe7, + 0x5e, 0xb4, 0x9e, 0xc6, 0x0b, 0xed, 0x97, 0xab, 0x79, 0xaa, 0x6c, 0x19, 0x96, 0x1d, 0xd7, 0x83, + 0x1a, 0x5b, 0xc0, 0x64, 0xfd, 0x7f, 0x62, 0xbf, 0xa9, 0x00, 0xe7, 0xdd, 0xb0, 0xef, 0xed, 0x4f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x41, 0x8a, 0x63, 0xfe, 0x90, 0x01, 0x00, 0x00, } func (m *GasPrice) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/genesis.pb.go b/x/crosschain/types/genesis.pb.go index 7ab67189d0..d1dbc488e1 100644 --- a/x/crosschain/types/genesis.pb.go +++ b/x/crosschain/types/genesis.pb.go @@ -141,39 +141,40 @@ func init() { } var fileDescriptor_547615497292ea23 = []byte{ - // 512 bytes of a gzipped FileDescriptorProto + // 515 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xc7, 0x5b, 0x06, 0x83, 0x79, 0x05, 0x36, 0x6f, 0x48, 0x51, 0x25, 0x42, 0xc5, 0x85, 0x49, - 0xa3, 0x29, 0x6c, 0x80, 0xb8, 0xb2, 0x4a, 0xdb, 0xd0, 0x2a, 0x01, 0xa1, 0xa7, 0x09, 0xc9, 0xb8, - 0x9e, 0x97, 0x58, 0xcb, 0xe2, 0xca, 0x7e, 0x95, 0x4a, 0x3f, 0x05, 0x9f, 0x88, 0xf3, 0x8e, 0x3b, - 0x72, 0x42, 0xa8, 0xfd, 0x22, 0xc8, 0x8e, 0x57, 0x96, 0xb6, 0x4a, 0x7a, 0x7b, 0x7a, 0x79, 0xff, - 0xff, 0xef, 0x29, 0x7f, 0x3f, 0xb4, 0x3b, 0xe2, 0x40, 0x59, 0x4c, 0x45, 0xda, 0xb2, 0x95, 0x54, - 0xbc, 0xc5, 0x94, 0xd4, 0x3a, 0xeb, 0x45, 0x3c, 0xe5, 0x5a, 0xe8, 0xa0, 0xaf, 0x24, 0x48, 0xfc, - 0x74, 0x3a, 0x1c, 0xdc, 0x0c, 0x07, 0xff, 0x87, 0xeb, 0x7b, 0xc5, 0x5e, 0xb6, 0x24, 0xb6, 0x26, - 0x30, 0xcc, 0x2c, 0xeb, 0xcd, 0x12, 0x3e, 0xd5, 0xa4, 0xaf, 0x04, 0xe3, 0x6e, 0xfc, 0x7d, 0xf1, - 0xb8, 0x48, 0x7b, 0x72, 0x90, 0x9e, 0x91, 0x98, 0xea, 0x98, 0x80, 0x24, 0x8c, 0x4d, 0x41, 0xfb, - 0xcb, 0x29, 0x41, 0x51, 0x76, 0xc1, 0x95, 0x13, 0xbd, 0x2d, 0x16, 0x25, 0x54, 0x03, 0xe9, 0x25, - 0x92, 0x5d, 0x90, 0x98, 0x8b, 0x28, 0x06, 0x27, 0x7b, 0x53, 0x2c, 0x93, 0x03, 0x58, 0x04, 0x7b, - 0x57, 0xac, 0x52, 0x14, 0x38, 0x49, 0xc4, 0xa5, 0x00, 0xae, 0xc8, 0x79, 0x42, 0x23, 0x97, 0x4a, - 0x7d, 0x3b, 0x92, 0x91, 0xb4, 0x65, 0xcb, 0x54, 0x59, 0xf7, 0xf9, 0xaf, 0x55, 0x54, 0x3b, 0xca, - 0xd2, 0xfb, 0x0a, 0x14, 0x38, 0x3e, 0x47, 0x5b, 0x37, 0xe0, 0x6e, 0xc6, 0xed, 0x08, 0x0d, 0xde, - 0x9d, 0xc6, 0xca, 0xce, 0xfa, 0x5e, 0x10, 0x14, 0x46, 0x1b, 0x7c, 0xca, 0x2b, 0x0f, 0xee, 0x5e, - 0xfd, 0x79, 0x56, 0x09, 0x17, 0x19, 0xe2, 0x13, 0x54, 0x8b, 0xa8, 0xfe, 0x6c, 0x42, 0xb3, 0x80, - 0x7b, 0x16, 0xf0, 0xa2, 0x04, 0x70, 0xe4, 0x24, 0x61, 0x4e, 0x8c, 0xbf, 0xa0, 0x87, 0x6d, 0x33, - 0xd4, 0x36, 0x43, 0xdd, 0xa1, 0xf6, 0xee, 0x5b, 0xb7, 0xdd, 0x12, 0xb7, 0xdb, 0x9a, 0x30, 0xef, - 0x80, 0xbf, 0xa3, 0x2d, 0x93, 0xdb, 0x81, 0x89, 0xed, 0xd8, 0xa6, 0x66, 0xd7, 0x7c, 0xb0, 0xd4, - 0x7f, 0xe8, 0xe4, 0x95, 0xe1, 0x22, 0x2b, 0x9c, 0xa0, 0x27, 0xee, 0x39, 0x1d, 0x53, 0x1d, 0x77, - 0x65, 0x9b, 0xc1, 0xd0, 0x32, 0xd6, 0x2c, 0xe3, 0x55, 0x09, 0xe3, 0xe3, 0xac, 0xd6, 0xfd, 0xed, - 0xc5, 0xa6, 0x98, 0xa3, 0xed, 0x99, 0xc7, 0x4b, 0x12, 0x03, 0x5b, 0xb7, 0xb0, 0xe6, 0x72, 0xb0, - 0x7c, 0xae, 0x58, 0xa4, 0x73, 0xb1, 0x7e, 0x43, 0x8f, 0x8d, 0x9e, 0x50, 0xc6, 0xe4, 0x20, 0x05, - 0x91, 0x46, 0x5e, 0xad, 0x51, 0x5d, 0x82, 0x70, 0xca, 0x81, 0x7e, 0x98, 0x8a, 0x1c, 0xe1, 0xd1, - 0x28, 0xd7, 0xc5, 0x2f, 0xd1, 0xe6, 0xa1, 0x48, 0x69, 0x22, 0x46, 0xfc, 0xcc, 0xad, 0xa4, 0xbd, - 0x8d, 0xc6, 0xca, 0xce, 0x5a, 0x38, 0xff, 0x01, 0x33, 0x84, 0xe7, 0xaf, 0xc1, 0xdb, 0xb4, 0xeb, - 0xb4, 0x4a, 0xd6, 0x09, 0x29, 0xf0, 0x4e, 0xa6, 0x3b, 0x34, 0x32, 0xb7, 0xd0, 0x86, 0x9a, 0xed, - 0x9f, 0x5c, 0x8d, 0xfd, 0xea, 0xf5, 0xd8, 0xaf, 0xfe, 0x1d, 0xfb, 0xd5, 0x9f, 0x13, 0xbf, 0x72, - 0x3d, 0xf1, 0x2b, 0xbf, 0x27, 0x7e, 0xe5, 0xf4, 0x75, 0x24, 0x20, 0x1e, 0xf4, 0x02, 0x26, 0x2f, - 0xed, 0xa5, 0x36, 0x67, 0x8e, 0x76, 0x78, 0xfb, 0x6c, 0xe1, 0x47, 0x9f, 0xeb, 0xde, 0xaa, 0x3d, - 0xca, 0xfd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x73, 0xa8, 0xd7, 0xb5, 0x6f, 0x05, 0x00, 0x00, + 0xa3, 0x09, 0xda, 0x00, 0x71, 0x65, 0x95, 0xd6, 0x21, 0x2a, 0x01, 0xa1, 0xa7, 0x09, 0xc9, 0xb8, + 0xae, 0x97, 0x58, 0xcb, 0xe2, 0x2a, 0x7e, 0x95, 0x4a, 0x3f, 0x05, 0x9f, 0x88, 0xf3, 0x8e, 0x3b, + 0x72, 0x42, 0xa8, 0xfd, 0x22, 0xc8, 0x8e, 0x57, 0x9a, 0xb6, 0x4a, 0x7a, 0x7b, 0x7a, 0x79, 0xff, + 0xff, 0xef, 0x29, 0x7f, 0x3f, 0x74, 0x38, 0xe6, 0x40, 0x59, 0x44, 0x45, 0xe2, 0x9b, 0x4a, 0xa6, + 0xdc, 0x67, 0xa9, 0x54, 0x2a, 0xeb, 0x85, 0x3c, 0xe1, 0x4a, 0x28, 0x6f, 0x90, 0x4a, 0x90, 0xf8, + 0xe9, 0x6c, 0xd8, 0xbb, 0x1d, 0xf6, 0xfe, 0x0f, 0xd7, 0x8f, 0x8a, 0xbd, 0x4c, 0x49, 0x4c, 0x4d, + 0x60, 0x94, 0x59, 0xd6, 0x9b, 0x25, 0x7c, 0xaa, 0xc8, 0x20, 0x15, 0x8c, 0xdb, 0xf1, 0x77, 0xc5, + 0xe3, 0x22, 0xe9, 0xc9, 0x61, 0xd2, 0x27, 0x11, 0x55, 0x11, 0x01, 0x49, 0x18, 0x9b, 0x81, 0x8e, + 0xd7, 0x53, 0x42, 0x4a, 0xd9, 0x25, 0x4f, 0xad, 0xe8, 0x4d, 0xb1, 0x28, 0xa6, 0x0a, 0x48, 0x2f, + 0x96, 0xec, 0x92, 0x44, 0x5c, 0x84, 0x11, 0x58, 0xd9, 0xeb, 0x62, 0x99, 0x1c, 0xc2, 0x2a, 0xd8, + 0xdb, 0x62, 0x55, 0x4a, 0x81, 0x93, 0x58, 0x5c, 0x09, 0xe0, 0x29, 0xb9, 0x88, 0x69, 0x68, 0x53, + 0xa9, 0xef, 0x87, 0x32, 0x94, 0xa6, 0xf4, 0x75, 0x95, 0x75, 0x9f, 0xff, 0xda, 0x44, 0xb5, 0x76, + 0x96, 0xde, 0x57, 0xa0, 0xc0, 0xf1, 0x05, 0xda, 0xbb, 0x05, 0x77, 0x33, 0x6e, 0x47, 0x28, 0x70, + 0xee, 0x34, 0x36, 0x0e, 0xb6, 0x8f, 0x3c, 0xaf, 0x30, 0x5a, 0xef, 0x53, 0x5e, 0x79, 0x72, 0xf7, + 0xfa, 0xcf, 0xb3, 0x4a, 0xb0, 0xca, 0x10, 0x7f, 0x44, 0xb5, 0x90, 0xaa, 0xcf, 0x3a, 0x34, 0x03, + 0xb8, 0x67, 0x00, 0x2f, 0x4a, 0x00, 0x6d, 0x2b, 0x09, 0x72, 0x62, 0xfc, 0x05, 0x3d, 0x6c, 0xe9, + 0xa1, 0x96, 0x1e, 0xea, 0x8e, 0x94, 0x73, 0xdf, 0xb8, 0x1d, 0x96, 0xb8, 0xcd, 0x6b, 0x82, 0xbc, + 0x03, 0xfe, 0x8e, 0xf6, 0x74, 0x6e, 0x27, 0x3a, 0xb6, 0x33, 0x93, 0x9a, 0x59, 0xf3, 0xc1, 0x5a, + 0xff, 0xa1, 0x93, 0x57, 0x06, 0xab, 0xac, 0x70, 0x8c, 0x9e, 0xd8, 0xe7, 0x74, 0x46, 0x55, 0xd4, + 0x95, 0x2d, 0x06, 0x23, 0xc3, 0xd8, 0x32, 0x8c, 0x57, 0x25, 0x8c, 0x0f, 0x8b, 0x5a, 0xfb, 0xb7, + 0x57, 0x9b, 0x62, 0x8e, 0xf6, 0x17, 0x1e, 0x2f, 0x89, 0x35, 0x6c, 0xdb, 0xc0, 0x9a, 0xeb, 0xc1, + 0xf2, 0xb9, 0x62, 0x91, 0x2c, 0xc5, 0xfa, 0x0d, 0x3d, 0xd6, 0x7a, 0x42, 0x19, 0x93, 0xc3, 0x04, + 0x44, 0x12, 0x3a, 0xb5, 0x46, 0x75, 0x0d, 0xc2, 0x39, 0x07, 0xfa, 0x7e, 0x26, 0xb2, 0x84, 0x47, + 0xe3, 0x5c, 0x17, 0xbf, 0x44, 0xbb, 0xa7, 0x22, 0xa1, 0xb1, 0x18, 0xf3, 0xbe, 0x5d, 0x49, 0x39, + 0x3b, 0x8d, 0x8d, 0x83, 0xad, 0x60, 0xf9, 0x03, 0x66, 0x08, 0x2f, 0x5f, 0x83, 0xb3, 0x6b, 0xd6, + 0xf1, 0x4b, 0xd6, 0x09, 0x28, 0xf0, 0x4e, 0xa6, 0x3b, 0xd5, 0x32, 0xbb, 0xd0, 0x4e, 0xba, 0xd8, + 0x6f, 0x5f, 0x4f, 0xdc, 0xea, 0xcd, 0xc4, 0xad, 0xfe, 0x9d, 0xb8, 0xd5, 0x9f, 0x53, 0xb7, 0x72, + 0x33, 0x75, 0x2b, 0xbf, 0xa7, 0x6e, 0xe5, 0xbc, 0x19, 0x0a, 0x88, 0x86, 0x3d, 0x8f, 0xc9, 0x2b, + 0x73, 0xa9, 0xcd, 0xec, 0x40, 0x13, 0xd9, 0xe7, 0xfe, 0x68, 0xfe, 0x64, 0xe1, 0xc7, 0x80, 0xab, + 0xde, 0xa6, 0x39, 0xc8, 0xe3, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xde, 0x67, 0x86, 0x4a, 0x6b, + 0x05, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/genesis_test.go b/x/crosschain/types/genesis_test.go index 9b71922821..7b1a151e5e 100644 --- a/x/crosschain/types/genesis_test.go +++ b/x/crosschain/types/genesis_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/crosschain/types/inbound_hash_to_cctx.pb.go b/x/crosschain/types/inbound_hash_to_cctx.pb.go index 10d230e758..bea0057319 100644 --- a/x/crosschain/types/inbound_hash_to_cctx.pb.go +++ b/x/crosschain/types/inbound_hash_to_cctx.pb.go @@ -83,7 +83,7 @@ func init() { } var fileDescriptor_b4f465fc984f53dd = []byte{ - // 203 bytes of a gzipped FileDescriptorProto + // 207 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xa8, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0x62, 0x99, 0x79, 0x49, 0xf9, 0xa5, 0x79, 0x29, 0xf1, 0x19, 0x89, 0xc5, 0x19, 0xf1, @@ -92,11 +92,11 @@ var fileDescriptor_b4f465fc984f53dd = []byte{ 0xc5, 0x19, 0x21, 0xf9, 0xce, 0xc9, 0x25, 0x15, 0x42, 0x8a, 0x5c, 0x3c, 0xc8, 0x26, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x71, 0x67, 0x22, 0x14, 0x0a, 0xc9, 0x72, 0x71, 0x81, 0x2c, 0x89, 0xcf, 0xcc, 0x4b, 0x49, 0xad, 0x90, 0x60, 0x52, 0x60, 0xd6, 0xe0, 0x0c, 0xe2, 0x04, 0x89, 0x78, - 0x82, 0x04, 0x9c, 0xbc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, - 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x30, - 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0xec, 0x15, 0x5d, 0x34, 0x5f, 0x55, - 0x20, 0xfb, 0xab, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x13, 0x63, 0x40, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe7, 0x45, 0x8d, 0x4b, 0x05, 0x01, 0x00, 0x00, + 0x82, 0x04, 0x9c, 0xdc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, + 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x37, + 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0xec, 0x15, 0x5d, 0x88, 0x0f, 0xf2, + 0xf2, 0x53, 0x52, 0xf5, 0x2b, 0x90, 0xfd, 0x54, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, + 0x85, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xed, 0xd6, 0x31, 0xcd, 0x01, 0x01, 0x00, 0x00, } func (m *InboundHashToCctx) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/inbound_params_test.go b/x/crosschain/types/inbound_params_test.go index 42d92a8f3f..dee5dbdc5e 100644 --- a/x/crosschain/types/inbound_params_test.go +++ b/x/crosschain/types/inbound_params_test.go @@ -7,7 +7,7 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/testutil/sample" ) func TestInboundTxParams_Validate(t *testing.T) { diff --git a/x/crosschain/types/inbound_tracker.pb.go b/x/crosschain/types/inbound_tracker.pb.go index 5e474c0e53..5bd280acfd 100644 --- a/x/crosschain/types/inbound_tracker.pb.go +++ b/x/crosschain/types/inbound_tracker.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" io "io" math "math" math_bits "math/bits" @@ -92,7 +92,7 @@ func init() { } var fileDescriptor_0795834bbbbe2970 = []byte{ - // 251 bytes of a gzipped FileDescriptorProto + // 256 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xae, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0x62, 0x99, 0x79, 0x49, 0xf9, 0xa5, 0x79, 0x29, 0xf1, 0x25, 0x45, 0x89, 0xc9, 0xd9, @@ -104,11 +104,11 @@ var fileDescriptor_0795834bbbbe2970 = []byte{ 0x18, 0x35, 0x38, 0x83, 0xd8, 0x4a, 0x2a, 0x3c, 0x12, 0x8b, 0x33, 0x84, 0x9c, 0xb8, 0x38, 0x41, 0x86, 0xc6, 0x97, 0x54, 0x16, 0xa4, 0x4a, 0x30, 0x2b, 0x30, 0x6a, 0xf0, 0x19, 0xa9, 0xea, 0x61, 0x71, 0x61, 0x41, 0x76, 0xba, 0x1e, 0xd8, 0x76, 0xe7, 0xfc, 0xcc, 0xbc, 0x90, 0xca, 0x82, 0xd4, - 0x20, 0x8e, 0x64, 0x28, 0xcb, 0xc9, 0xfb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, + 0x20, 0x8e, 0x64, 0x28, 0xcb, 0xc9, 0xfd, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, - 0xa2, 0x0c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, 0xbe, 0xd1, 0x45, - 0xf3, 0x58, 0x05, 0x72, 0x70, 0x81, 0x9c, 0x50, 0x9c, 0xc4, 0x06, 0xf6, 0x9e, 0x31, 0x20, 0x00, - 0x00, 0xff, 0xff, 0x8d, 0xae, 0xa4, 0x2f, 0x5c, 0x01, 0x00, 0x00, + 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, 0xbe, 0xd1, 0x85, + 0x78, 0x2c, 0x2f, 0x3f, 0x25, 0x55, 0xbf, 0x02, 0x39, 0xa8, 0x40, 0xd6, 0x17, 0x27, 0xb1, 0x81, + 0xbd, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x06, 0x06, 0x39, 0x58, 0x01, 0x00, 0x00, } func (m *InboundTracker) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/last_block_height.pb.go b/x/crosschain/types/last_block_height.pb.go index 7d1550d97b..01660e1b79 100644 --- a/x/crosschain/types/last_block_height.pb.go +++ b/x/crosschain/types/last_block_height.pb.go @@ -107,7 +107,7 @@ func init() { } var fileDescriptor_85a232f4b01c3902 = []byte{ - // 241 bytes of a gzipped FileDescriptorProto + // 245 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xad, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0x62, 0x39, 0x89, 0xc5, 0x25, 0xf1, 0x49, 0x39, 0xf9, 0xc9, 0xd9, 0xf1, 0x19, 0xa9, @@ -118,12 +118,12 @@ var fileDescriptor_85a232f4b01c3902 = []byte{ 0x09, 0x26, 0xb0, 0x38, 0x84, 0x03, 0x12, 0x05, 0x1b, 0x26, 0xc1, 0x0c, 0x11, 0x05, 0x73, 0x84, 0x74, 0xb8, 0x04, 0x41, 0x6e, 0xf2, 0xcc, 0x4b, 0xca, 0x2f, 0xcd, 0x4b, 0x81, 0x18, 0x2d, 0xc1, 0xa2, 0xc0, 0xa8, 0xc1, 0x12, 0x84, 0x29, 0x21, 0xa4, 0xc7, 0x25, 0x04, 0x12, 0xf4, 0x2f, 0x2d, - 0x41, 0x56, 0xce, 0x0a, 0x56, 0x8e, 0x45, 0xc6, 0xc9, 0xfb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, + 0x41, 0x56, 0xce, 0x0a, 0x56, 0x8e, 0x45, 0xc6, 0xc9, 0xfd, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, - 0x8f, 0xe5, 0x18, 0xa2, 0x0c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, - 0x01, 0xa5, 0x8b, 0x16, 0x66, 0x15, 0xc8, 0xa1, 0x56, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, - 0x0e, 0x2a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xdd, 0x55, 0x1d, 0x63, 0x01, 0x00, - 0x00, + 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, + 0x01, 0xa5, 0x0b, 0x09, 0x9f, 0xbc, 0xfc, 0x94, 0x54, 0xfd, 0x0a, 0xe4, 0x10, 0x2b, 0xa9, 0x2c, + 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x07, 0x93, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x27, 0x12, + 0x51, 0x5f, 0x01, 0x00, 0x00, } func (m *LastBlockHeight) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/message_abort_stuck_cctx_test.go b/x/crosschain/types/message_abort_stuck_cctx_test.go index f3bfb6617d..0ecd052b8c 100644 --- a/x/crosschain/types/message_abort_stuck_cctx_test.go +++ b/x/crosschain/types/message_abort_stuck_cctx_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgAbortStuckCCTX_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_add_inbound_tracker.go b/x/crosschain/types/message_add_inbound_tracker.go index 1c4a0691e7..ad03df450f 100644 --- a/x/crosschain/types/message_add_inbound_tracker.go +++ b/x/crosschain/types/message_add_inbound_tracker.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/coin" ) const TypeMsgAddInboundTracker = "AddInboundTracker" diff --git a/x/crosschain/types/message_add_inbound_tracker_test.go b/x/crosschain/types/message_add_inbound_tracker_test.go index 503c020c1d..0b35959109 100644 --- a/x/crosschain/types/message_add_inbound_tracker_test.go +++ b/x/crosschain/types/message_add_inbound_tracker_test.go @@ -8,10 +8,10 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgAddInboundTracker_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_add_outbound_tracker.go b/x/crosschain/types/message_add_outbound_tracker.go index a569cc6719..dddb19900a 100644 --- a/x/crosschain/types/message_add_outbound_tracker.go +++ b/x/crosschain/types/message_add_outbound_tracker.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/proofs" + "github.com/zeta-chain/node/pkg/proofs" ) const TypeMsgAddOutboundTracker = "AddOutboundTracker" diff --git a/x/crosschain/types/message_add_outbound_tracker_test.go b/x/crosschain/types/message_add_outbound_tracker_test.go index 753c13af1c..5eafc7b31c 100644 --- a/x/crosschain/types/message_add_outbound_tracker_test.go +++ b/x/crosschain/types/message_add_outbound_tracker_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgAddOutboundTracker_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_migrate_erc20_custody_funds_test.go b/x/crosschain/types/message_migrate_erc20_custody_funds_test.go index 9a86b6d141..4a6027e8e2 100644 --- a/x/crosschain/types/message_migrate_erc20_custody_funds_test.go +++ b/x/crosschain/types/message_migrate_erc20_custody_funds_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestNewMsgMigrateERC20CustodyFunds_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_migrate_tss_funds_test.go b/x/crosschain/types/message_migrate_tss_funds_test.go index 5514af9034..48362f207a 100644 --- a/x/crosschain/types/message_migrate_tss_funds_test.go +++ b/x/crosschain/types/message_migrate_tss_funds_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestNewMsgMigrateTssFunds_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_refund_aborted_test.go b/x/crosschain/types/message_refund_aborted_test.go index e7c1bdffec..7d819f1ee3 100644 --- a/x/crosschain/types/message_refund_aborted_test.go +++ b/x/crosschain/types/message_refund_aborted_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgRefundAbortedCCTX_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_remove_outbound_tracker_test.go b/x/crosschain/types/message_remove_outbound_tracker_test.go index 4ef8b7fe1e..a6322f7732 100644 --- a/x/crosschain/types/message_remove_outbound_tracker_test.go +++ b/x/crosschain/types/message_remove_outbound_tracker_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgRemoveOutboundTracker_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_update_erc20_custody_pause_status_test.go b/x/crosschain/types/message_update_erc20_custody_pause_status_test.go index 26842b4e0b..cddb141db5 100644 --- a/x/crosschain/types/message_update_erc20_custody_pause_status_test.go +++ b/x/crosschain/types/message_update_erc20_custody_pause_status_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestNewMsgUpdateERC20CustodyPauseStatus_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_update_rate_limiter_flags_test.go b/x/crosschain/types/message_update_rate_limiter_flags_test.go index a0ead6ed22..e875770dec 100644 --- a/x/crosschain/types/message_update_rate_limiter_flags_test.go +++ b/x/crosschain/types/message_update_rate_limiter_flags_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgUpdateRateLimiterFlags_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_update_tss_address.go b/x/crosschain/types/message_update_tss_address.go index 7e18ba27f6..f0af78561f 100644 --- a/x/crosschain/types/message_update_tss_address.go +++ b/x/crosschain/types/message_update_tss_address.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/cosmos" + "github.com/zeta-chain/node/pkg/cosmos" ) const TypeMsgUpdateTssAddress = "UpdateTssAddress" diff --git a/x/crosschain/types/message_update_tss_address_test.go b/x/crosschain/types/message_update_tss_address_test.go index cfcdea94f2..4118611307 100644 --- a/x/crosschain/types/message_update_tss_address_test.go +++ b/x/crosschain/types/message_update_tss_address_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMessageUpdateTssAddress_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_vote_gas_price.go b/x/crosschain/types/message_vote_gas_price.go index fd84a77c02..c71f5cb805 100644 --- a/x/crosschain/types/message_vote_gas_price.go +++ b/x/crosschain/types/message_vote_gas_price.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/authz" + "github.com/zeta-chain/node/pkg/authz" ) var _ sdk.Msg = &MsgVoteGasPrice{} diff --git a/x/crosschain/types/message_vote_gas_price_test.go b/x/crosschain/types/message_vote_gas_price_test.go index 91a450c79c..fbc9a18ec4 100644 --- a/x/crosschain/types/message_vote_gas_price_test.go +++ b/x/crosschain/types/message_vote_gas_price_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgVoteGasPrice_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_vote_inbound.go b/x/crosschain/types/message_vote_inbound.go index b5720e5e6f..8592b7e607 100644 --- a/x/crosschain/types/message_vote_inbound.go +++ b/x/crosschain/types/message_vote_inbound.go @@ -9,8 +9,8 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/coin" ) // MaxMessageLength is the maximum length of a message in a cctx diff --git a/x/crosschain/types/message_vote_inbound_test.go b/x/crosschain/types/message_vote_inbound_test.go index 29cf49ba40..c7fbcbb531 100644 --- a/x/crosschain/types/message_vote_inbound_test.go +++ b/x/crosschain/types/message_vote_inbound_test.go @@ -12,10 +12,10 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestNewMsgVoteInbound(t *testing.T) { diff --git a/x/crosschain/types/message_vote_outbound.go b/x/crosschain/types/message_vote_outbound.go index b853ec4b0b..99567edc7a 100644 --- a/x/crosschain/types/message_vote_outbound.go +++ b/x/crosschain/types/message_vote_outbound.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" ) var _ sdk.Msg = &MsgVoteOutbound{} diff --git a/x/crosschain/types/message_vote_outbound_test.go b/x/crosschain/types/message_vote_outbound_test.go index 8e782f1e66..e6cf411068 100644 --- a/x/crosschain/types/message_vote_outbound_test.go +++ b/x/crosschain/types/message_vote_outbound_test.go @@ -9,11 +9,11 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgVoteOutbound_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/message_whitelist_erc20.go b/x/crosschain/types/message_whitelist_erc20.go index a9a396e05f..3267581662 100644 --- a/x/crosschain/types/message_whitelist_erc20.go +++ b/x/crosschain/types/message_whitelist_erc20.go @@ -6,7 +6,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) const TypeMsgWhitelistERC20 = "whitelist_erc20" diff --git a/x/crosschain/types/message_whitelist_erc20_test.go b/x/crosschain/types/message_whitelist_erc20_test.go index f881915ae8..1cf5d6350c 100644 --- a/x/crosschain/types/message_whitelist_erc20_test.go +++ b/x/crosschain/types/message_whitelist_erc20_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestMsgWhitelistERC20_ValidateBasic(t *testing.T) { diff --git a/x/crosschain/types/outbound_params_test.go b/x/crosschain/types/outbound_params_test.go index 16bfc17844..07c417433d 100644 --- a/x/crosschain/types/outbound_params_test.go +++ b/x/crosschain/types/outbound_params_test.go @@ -7,7 +7,7 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/node/testutil/sample" ) func TestOutboundParams_Validate(t *testing.T) { diff --git a/x/crosschain/types/outbound_tracker.pb.go b/x/crosschain/types/outbound_tracker.pb.go index 03e17709f6..5002924b2b 100644 --- a/x/crosschain/types/outbound_tracker.pb.go +++ b/x/crosschain/types/outbound_tracker.pb.go @@ -160,26 +160,26 @@ func init() { } var fileDescriptor_77cb2cfe04eb42d9 = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcb, 0x4a, 0x03, 0x31, - 0x14, 0x86, 0x1b, 0x5b, 0xa7, 0xd3, 0xb8, 0x10, 0x82, 0xe8, 0x88, 0x18, 0x4a, 0x41, 0xe8, 0xc6, - 0x14, 0x2f, 0x4f, 0xd0, 0x95, 0xa2, 0x20, 0x8c, 0xc5, 0x85, 0x9b, 0x61, 0x3a, 0x13, 0x3a, 0x41, - 0x4d, 0x4a, 0x72, 0x46, 0xa2, 0x4f, 0xe1, 0x03, 0xf8, 0x40, 0x2e, 0xbb, 0x74, 0x29, 0x33, 0x2f, - 0x22, 0x93, 0x8c, 0x17, 0x5c, 0xb8, 0xcb, 0x97, 0xc3, 0x77, 0xf8, 0xcf, 0x8f, 0x4f, 0x9f, 0x39, - 0xa4, 0x59, 0x91, 0x0a, 0x39, 0x71, 0x2f, 0xa5, 0xf9, 0x24, 0xd3, 0xca, 0x18, 0xff, 0xa7, 0x4a, - 0x98, 0xab, 0x52, 0xe6, 0x09, 0xe8, 0x34, 0xbb, 0xe3, 0x9a, 0x2d, 0xb5, 0x02, 0x45, 0xf6, 0xbf, - 0x2d, 0xf6, 0x65, 0xb1, 0x1f, 0x6b, 0x74, 0x83, 0x83, 0x99, 0x3d, 0x4b, 0x4d, 0x41, 0x76, 0x70, - 0x1f, 0x6c, 0x52, 0xa4, 0xa6, 0x88, 0xd0, 0x10, 0x8d, 0x07, 0x71, 0x00, 0x7e, 0xb0, 0x87, 0x07, - 0x60, 0x13, 0x23, 0x16, 0x92, 0xeb, 0x68, 0xcd, 0x8d, 0x42, 0xb0, 0xd7, 0x8e, 0xc9, 0x36, 0x0e, - 0x96, 0x5a, 0x3d, 0xf2, 0x3c, 0xea, 0x0e, 0xd1, 0x38, 0x8c, 0x5b, 0x1a, 0xbd, 0x22, 0xbc, 0x79, - 0xd5, 0x26, 0x9a, 0xf9, 0x40, 0x64, 0x0b, 0xaf, 0x0b, 0x99, 0x73, 0xdb, 0xee, 0xf7, 0x40, 0x76, - 0x71, 0xe8, 0xa2, 0x24, 0x22, 0x77, 0xdb, 0xbb, 0x71, 0xdf, 0xf1, 0x79, 0xde, 0x08, 0x52, 0xc9, - 0x8c, 0xbb, 0xdd, 0xbd, 0xd8, 0x03, 0x99, 0xe2, 0x41, 0x93, 0x32, 0xb9, 0x17, 0x06, 0xa2, 0xde, - 0xb0, 0x3b, 0xde, 0x38, 0x3e, 0x60, 0xff, 0x5e, 0xc9, 0xfc, 0x89, 0x71, 0xd8, 0x78, 0x97, 0xc2, - 0xc0, 0xf4, 0xe2, 0xad, 0xa2, 0x68, 0x55, 0x51, 0xf4, 0x51, 0x51, 0xf4, 0x52, 0xd3, 0xce, 0xaa, - 0xa6, 0x9d, 0xf7, 0x9a, 0x76, 0x6e, 0x8f, 0x16, 0x02, 0x8a, 0x72, 0xce, 0x32, 0xf5, 0xe0, 0x6a, - 0x3e, 0xfc, 0xd3, 0xb8, 0xfd, 0xdd, 0x39, 0x3c, 0x2d, 0xb9, 0x99, 0x07, 0xae, 0xe9, 0x93, 0xcf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x29, 0xc8, 0x7e, 0xa1, 0x01, 0x00, 0x00, + // 304 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcd, 0x4a, 0x33, 0x31, + 0x14, 0x86, 0x9b, 0xaf, 0xfd, 0xa6, 0xd3, 0xb8, 0x10, 0x82, 0xe8, 0x88, 0x18, 0x4a, 0x41, 0xe8, + 0xa6, 0x29, 0xa8, 0x57, 0xd0, 0x8d, 0x0a, 0x82, 0x30, 0x16, 0x17, 0x6e, 0x86, 0xe9, 0x24, 0x74, + 0x82, 0x9a, 0x94, 0xe4, 0x54, 0xa2, 0x57, 0xe1, 0x05, 0x78, 0x41, 0x2e, 0xbb, 0x74, 0x29, 0x33, + 0x37, 0x22, 0x93, 0x8c, 0x3f, 0x2b, 0x77, 0x79, 0x72, 0x78, 0x0e, 0xef, 0x79, 0xf1, 0xe9, 0xb3, + 0x80, 0xbc, 0x28, 0x73, 0xa9, 0xa6, 0xfe, 0xa5, 0x8d, 0x98, 0x16, 0x46, 0x5b, 0x1b, 0xfe, 0xf4, + 0x1a, 0x16, 0x7a, 0xad, 0x78, 0x06, 0x26, 0x2f, 0xee, 0x84, 0x61, 0x2b, 0xa3, 0x41, 0x93, 0xc3, + 0x6f, 0x8b, 0x7d, 0x59, 0xec, 0xc7, 0x1a, 0xdd, 0xe0, 0x68, 0xee, 0xce, 0x73, 0x5b, 0x92, 0x3d, + 0xdc, 0x07, 0x97, 0x95, 0xb9, 0x2d, 0x13, 0x34, 0x44, 0xe3, 0x41, 0x1a, 0x41, 0x18, 0x1c, 0xe0, + 0x01, 0xb8, 0xcc, 0xca, 0xa5, 0x12, 0x26, 0xf9, 0xe7, 0x47, 0x31, 0xb8, 0x6b, 0xcf, 0x64, 0x17, + 0x47, 0x2b, 0xa3, 0x1f, 0x05, 0x4f, 0xba, 0x43, 0x34, 0x8e, 0xd3, 0x96, 0x46, 0xaf, 0x08, 0x6f, + 0x5f, 0xb5, 0x89, 0xe6, 0x21, 0x10, 0xd9, 0xc1, 0xff, 0xa5, 0xe2, 0xc2, 0xb5, 0xfb, 0x03, 0x90, + 0x7d, 0x1c, 0xfb, 0x28, 0x99, 0xe4, 0x7e, 0x7b, 0x37, 0xed, 0x7b, 0xbe, 0xe0, 0x8d, 0xa0, 0xb4, + 0x2a, 0x84, 0xdf, 0xdd, 0x4b, 0x03, 0x90, 0x19, 0x1e, 0x34, 0x29, 0xb3, 0x7b, 0x69, 0x21, 0xe9, + 0x0d, 0xbb, 0xe3, 0xad, 0xe3, 0x23, 0xf6, 0xe7, 0x95, 0x2c, 0x9c, 0x98, 0xc6, 0x8d, 0x77, 0x29, + 0x2d, 0xcc, 0xce, 0xde, 0x2a, 0x8a, 0x36, 0x15, 0x45, 0x1f, 0x15, 0x45, 0x2f, 0x35, 0xed, 0x6c, + 0x6a, 0xda, 0x79, 0xaf, 0x69, 0xe7, 0x76, 0xb2, 0x94, 0x50, 0xae, 0x17, 0xac, 0xd0, 0x0f, 0xbe, + 0xe6, 0x49, 0x68, 0x57, 0x69, 0x2e, 0xa6, 0xee, 0x77, 0xdf, 0xf0, 0xb4, 0x12, 0x76, 0x11, 0xf9, + 0x96, 0x4f, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x6a, 0xcf, 0xa4, 0x9d, 0x01, 0x00, 0x00, } func (m *TxHash) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/query.pb.go b/x/crosschain/types/query.pb.go index 2832a6c6a4..9de73f358d 100644 --- a/x/crosschain/types/query.pb.go +++ b/x/crosschain/types/query.pb.go @@ -2365,154 +2365,154 @@ func init() { } var fileDescriptor_d00cb546ea76908b = []byte{ - // 2349 bytes of a gzipped FileDescriptorProto + // 2350 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcb, 0x6f, 0x1c, 0x49, - 0x19, 0x4f, 0x79, 0xf2, 0x2c, 0x27, 0x76, 0x5c, 0x71, 0x12, 0xef, 0x6c, 0xe2, 0x64, 0x3b, 0x9b, - 0xd8, 0x9b, 0xe0, 0x99, 0xc4, 0x8e, 0x9d, 0xe7, 0x6e, 0xe2, 0x47, 0x1e, 0x06, 0x27, 0xf1, 0x8e, - 0x2c, 0x82, 0xc2, 0xa3, 0x55, 0xee, 0xa9, 0x9d, 0x69, 0xb6, 0xdd, 0x3d, 0x3b, 0x5d, 0x13, 0x4f, - 0xd6, 0xf2, 0x81, 0x95, 0x38, 0x70, 0x43, 0x5a, 0x21, 0x2e, 0x1c, 0x41, 0x70, 0xe0, 0xc0, 0x01, - 0xed, 0x05, 0x81, 0xc4, 0x3b, 0x62, 0x41, 0x0a, 0x8b, 0x84, 0x10, 0x07, 0xb4, 0x24, 0x08, 0xee, - 0xfc, 0x05, 0xab, 0xae, 0xfe, 0x7a, 0xa6, 0xdf, 0x5d, 0x33, 0x9e, 0x48, 0xde, 0x93, 0xbb, 0xbb, - 0xea, 0xfb, 0xea, 0xf7, 0xfb, 0xbe, 0x7a, 0x7c, 0xf5, 0xf3, 0xe0, 0x37, 0xde, 0x67, 0x9c, 0x6a, - 0x55, 0xaa, 0x9b, 0x45, 0xf1, 0x64, 0xd5, 0x59, 0x51, 0xab, 0x5b, 0xb6, 0xed, 0x7e, 0x7b, 0xaf, - 0xc1, 0xea, 0x4f, 0x0a, 0xb5, 0xba, 0xc5, 0x2d, 0x72, 0xbc, 0xd5, 0xb5, 0xe0, 0x75, 0x2d, 0xb4, - 0xbb, 0xe6, 0xcf, 0x6a, 0x96, 0xbd, 0x66, 0xd9, 0xc5, 0x55, 0x6a, 0x33, 0xd7, 0xae, 0xf8, 0xf8, - 0xc2, 0x2a, 0xe3, 0xf4, 0x42, 0xb1, 0x46, 0x2b, 0xba, 0x49, 0xb9, 0x6e, 0x99, 0xae, 0xab, 0xfc, - 0x64, 0xfa, 0xa8, 0xe2, 0x51, 0x15, 0xcf, 0x2a, 0x6f, 0x82, 0xcd, 0x44, 0xba, 0x4d, 0x85, 0xda, - 0x6a, 0xad, 0xae, 0x6b, 0x0c, 0xba, 0x5f, 0x4e, 0xef, 0xae, 0x9b, 0xab, 0x56, 0xc3, 0x2c, 0xab, - 0x55, 0x6a, 0x57, 0x55, 0x6e, 0xa9, 0x9a, 0xd6, 0x1a, 0x68, 0x4a, 0xce, 0x92, 0xd7, 0xa9, 0xf6, - 0x2e, 0xab, 0x83, 0xd1, 0x74, 0xba, 0x91, 0x41, 0x6d, 0xae, 0xae, 0x1a, 0x96, 0xf6, 0xae, 0x5a, - 0x65, 0x7a, 0xa5, 0xca, 0xc1, 0xec, 0x62, 0xba, 0x99, 0xd5, 0xe0, 0x71, 0x83, 0xcd, 0xa4, 0x5b, - 0xd5, 0x29, 0x67, 0xaa, 0xa1, 0xaf, 0xe9, 0x9c, 0xd5, 0xd5, 0x77, 0x0c, 0x5a, 0xb1, 0xc1, 0x6e, - 0xb8, 0x62, 0x55, 0x2c, 0xf1, 0x58, 0x74, 0x9e, 0xe0, 0xeb, 0xb1, 0x8a, 0x65, 0x55, 0x0c, 0x56, - 0xa4, 0x35, 0xbd, 0x48, 0x4d, 0xd3, 0xe2, 0x22, 0x53, 0x60, 0xa3, 0x1c, 0xc3, 0xf9, 0xb7, 0x9d, - 0x64, 0x3e, 0x62, 0x9c, 0xce, 0x6a, 0x9a, 0xd5, 0x30, 0xb9, 0x6e, 0x56, 0x4a, 0xec, 0xbd, 0x06, - 0xb3, 0xb9, 0x72, 0x0f, 0xbf, 0x1a, 0xdb, 0x6a, 0xd7, 0x2c, 0xd3, 0x66, 0xa4, 0x80, 0x0f, 0xd1, - 0x55, 0xab, 0xce, 0x59, 0x59, 0x75, 0x80, 0xaa, 0x74, 0xcd, 0xe9, 0x31, 0x82, 0x4e, 0xa2, 0xf1, - 0x7d, 0xa5, 0x21, 0x68, 0x12, 0xb6, 0xa2, 0x41, 0x59, 0xc6, 0xa3, 0xc2, 0xdd, 0x1d, 0xc6, 0x1f, - 0x00, 0xf5, 0x15, 0x97, 0x39, 0x0c, 0x48, 0x46, 0xf0, 0x1e, 0x41, 0x72, 0x71, 0x41, 0x78, 0xc9, - 0x95, 0xbc, 0x57, 0x32, 0x8c, 0x77, 0x99, 0x96, 0xa9, 0xb1, 0x91, 0xbe, 0x93, 0x68, 0x7c, 0x67, - 0xc9, 0x7d, 0x51, 0xbe, 0x85, 0xf0, 0x89, 0x44, 0x97, 0x80, 0xf2, 0x1b, 0x78, 0xd0, 0x0a, 0x36, - 0x09, 0xdf, 0xfd, 0x93, 0x85, 0x42, 0xea, 0x94, 0x2f, 0x84, 0x1c, 0xce, 0xed, 0x7c, 0xfa, 0xaf, - 0x13, 0x3b, 0x4a, 0x61, 0x67, 0x4a, 0x15, 0x58, 0xcd, 0x1a, 0x46, 0x02, 0xab, 0xdb, 0x18, 0xb7, - 0xd7, 0x08, 0x0c, 0x7e, 0xa6, 0xe0, 0x2e, 0xa8, 0x82, 0xb3, 0xa0, 0x0a, 0xee, 0x42, 0x84, 0x05, - 0x55, 0x58, 0xa6, 0x15, 0x06, 0xb6, 0x25, 0x9f, 0xa5, 0xf2, 0x27, 0x8f, 0x6d, 0xdc, 0x50, 0x69, - 0x6c, 0x73, 0x3d, 0x63, 0x4b, 0xee, 0x04, 0xb8, 0xf4, 0x09, 0x2e, 0x63, 0x99, 0x5c, 0x5c, 0x70, - 0x01, 0x32, 0xdf, 0x46, 0xf8, 0x74, 0x02, 0x99, 0xb9, 0x27, 0xf3, 0x0e, 0x24, 0x2f, 0x7c, 0xc3, - 0x78, 0x97, 0x80, 0x08, 0x53, 0xc2, 0x7d, 0x09, 0x05, 0xb5, 0xaf, 0xeb, 0xa0, 0xfe, 0x15, 0xe1, - 0x33, 0x59, 0x38, 0x3e, 0x6f, 0xb1, 0xfd, 0x0e, 0xc2, 0xaf, 0x7b, 0x9c, 0x16, 0xcd, 0x94, 0xd0, - 0xbe, 0x82, 0xf7, 0xba, 0xfb, 0xb0, 0x5e, 0x0e, 0x2e, 0xb8, 0x72, 0xcf, 0xe2, 0xfb, 0x17, 0x5f, - 0x9e, 0x13, 0xb0, 0x40, 0x78, 0xbf, 0x8a, 0x07, 0x74, 0x33, 0x26, 0xba, 0x13, 0x19, 0xd1, 0x0d, + 0x19, 0x4f, 0x79, 0xf2, 0x2c, 0x27, 0xf6, 0xba, 0xe2, 0x24, 0xde, 0xd9, 0xc4, 0xc9, 0x76, 0x36, + 0xb1, 0x37, 0xc1, 0x33, 0x89, 0x1d, 0x3b, 0xcf, 0xdd, 0xc4, 0x8f, 0xc4, 0x31, 0x72, 0x12, 0xef, + 0xc8, 0x22, 0x28, 0x3c, 0x5a, 0xe5, 0x9e, 0xda, 0x99, 0x66, 0xdb, 0xdd, 0xb3, 0xd3, 0x35, 0xf1, + 0x64, 0x2d, 0x1f, 0x58, 0x89, 0x03, 0x37, 0xa4, 0x15, 0xe2, 0xc2, 0x11, 0x04, 0x07, 0x0e, 0x1c, + 0xd0, 0x5e, 0x10, 0x48, 0xbc, 0x23, 0x16, 0xa4, 0xb0, 0x48, 0x08, 0x71, 0x40, 0x4b, 0x82, 0xe0, + 0xce, 0x5f, 0x80, 0xba, 0xfa, 0xeb, 0x99, 0x7e, 0x77, 0xcd, 0x78, 0x22, 0x79, 0x4f, 0xee, 0xee, + 0xaa, 0xef, 0xab, 0xdf, 0xef, 0xfb, 0xea, 0xf1, 0xd5, 0x6f, 0x8c, 0xdf, 0xfc, 0x80, 0x71, 0xaa, + 0x55, 0xa9, 0x6e, 0x16, 0xc5, 0x93, 0x55, 0x67, 0x45, 0xad, 0x6e, 0xd9, 0xb6, 0xfb, 0xed, 0xfd, + 0x06, 0xab, 0x3f, 0x29, 0xd4, 0xea, 0x16, 0xb7, 0xc8, 0x89, 0x56, 0xd7, 0x82, 0xd7, 0xb5, 0xd0, + 0xee, 0x9a, 0x3f, 0xa7, 0x59, 0xf6, 0xba, 0x65, 0x17, 0xd7, 0xa8, 0xcd, 0x5c, 0xbb, 0xe2, 0xe3, + 0x8b, 0x6b, 0x8c, 0xd3, 0x8b, 0xc5, 0x1a, 0xad, 0xe8, 0x26, 0xe5, 0xba, 0x65, 0xba, 0xae, 0xf2, + 0x93, 0xe9, 0xa3, 0x8a, 0x47, 0x55, 0x3c, 0xab, 0xbc, 0x09, 0x36, 0x13, 0xe9, 0x36, 0x15, 0x6a, + 0xab, 0xb5, 0xba, 0xae, 0x31, 0xe8, 0x7e, 0x25, 0xbd, 0xbb, 0x6e, 0xae, 0x59, 0x0d, 0xb3, 0xac, + 0x56, 0xa9, 0x5d, 0x55, 0xb9, 0xa5, 0x6a, 0x5a, 0x6b, 0xa0, 0x29, 0x39, 0x4b, 0x5e, 0xa7, 0xda, + 0x7b, 0xac, 0x0e, 0x46, 0xd3, 0xe9, 0x46, 0x06, 0xb5, 0xb9, 0xba, 0x66, 0x58, 0xda, 0x7b, 0x6a, + 0x95, 0xe9, 0x95, 0x2a, 0x07, 0xb3, 0x4b, 0xe9, 0x66, 0x56, 0x83, 0xc7, 0x0d, 0x36, 0x93, 0x6e, + 0x55, 0xa7, 0x9c, 0xa9, 0x86, 0xbe, 0xae, 0x73, 0x56, 0x57, 0xdf, 0x35, 0x68, 0xc5, 0x06, 0xbb, + 0xe1, 0x8a, 0x55, 0xb1, 0xc4, 0x63, 0xd1, 0x79, 0x82, 0xaf, 0xc7, 0x2b, 0x96, 0x55, 0x31, 0x58, + 0x91, 0xd6, 0xf4, 0x22, 0x35, 0x4d, 0x8b, 0x8b, 0x4c, 0x81, 0x8d, 0x72, 0x1c, 0xe7, 0xdf, 0x71, + 0x92, 0xf9, 0x88, 0x71, 0x3a, 0xab, 0x69, 0x56, 0xc3, 0xe4, 0xba, 0x59, 0x29, 0xb1, 0xf7, 0x1b, + 0xcc, 0xe6, 0xca, 0x3d, 0xfc, 0x5a, 0x6c, 0xab, 0x5d, 0xb3, 0x4c, 0x9b, 0x91, 0x02, 0x3e, 0x4c, + 0xd7, 0xac, 0x3a, 0x67, 0x65, 0xd5, 0x01, 0xaa, 0xd2, 0x75, 0xa7, 0xc7, 0x08, 0x3a, 0x85, 0xc6, + 0x0f, 0x94, 0x86, 0xa0, 0x49, 0xd8, 0x8a, 0x06, 0x65, 0x05, 0x8f, 0x0a, 0x77, 0x8b, 0x8c, 0x3f, + 0x00, 0xea, 0xab, 0x2e, 0x73, 0x18, 0x90, 0x8c, 0xe0, 0x7d, 0x82, 0xe4, 0xd2, 0x82, 0xf0, 0x92, + 0x2b, 0x79, 0xaf, 0x64, 0x18, 0xef, 0x31, 0x2d, 0x53, 0x63, 0x23, 0x7d, 0xa7, 0xd0, 0xf8, 0xee, + 0x92, 0xfb, 0xa2, 0x7c, 0x13, 0xe1, 0x93, 0x89, 0x2e, 0x01, 0xe5, 0xd7, 0xf1, 0xa0, 0x15, 0x6c, + 0x12, 0xbe, 0xfb, 0x27, 0x0b, 0x85, 0xd4, 0x29, 0x5f, 0x08, 0x39, 0x9c, 0xdb, 0xfd, 0xf4, 0x9f, + 0x27, 0x77, 0x95, 0xc2, 0xce, 0x94, 0x2a, 0xb0, 0x9a, 0x35, 0x8c, 0x04, 0x56, 0x77, 0x30, 0x6e, + 0xaf, 0x11, 0x18, 0xfc, 0x6c, 0xc1, 0x5d, 0x50, 0x05, 0x67, 0x41, 0x15, 0xdc, 0x85, 0x08, 0x0b, + 0xaa, 0xb0, 0x42, 0x2b, 0x0c, 0x6c, 0x4b, 0x3e, 0x4b, 0xe5, 0x8f, 0x1e, 0xdb, 0xb8, 0xa1, 0xd2, + 0xd8, 0xe6, 0x7a, 0xc6, 0x96, 0x2c, 0x06, 0xb8, 0xf4, 0x09, 0x2e, 0x63, 0x99, 0x5c, 0x5c, 0x70, + 0x01, 0x32, 0xdf, 0x42, 0xf8, 0x4c, 0x02, 0x99, 0xb9, 0x27, 0xf3, 0x0e, 0x24, 0x2f, 0x7c, 0xc3, + 0x78, 0x8f, 0x80, 0x08, 0x53, 0xc2, 0x7d, 0x09, 0x05, 0xb5, 0xaf, 0xeb, 0xa0, 0xfe, 0x05, 0xe1, + 0xb3, 0x59, 0x38, 0x3e, 0x6f, 0xb1, 0xfd, 0x36, 0xc2, 0x6f, 0x78, 0x9c, 0x96, 0xcc, 0x94, 0xd0, + 0xbe, 0x8a, 0xf7, 0xbb, 0xfb, 0xb0, 0x5e, 0x0e, 0x2e, 0xb8, 0x72, 0xcf, 0xe2, 0xfb, 0x67, 0x5f, + 0x9e, 0x13, 0xb0, 0x40, 0x78, 0xbf, 0x82, 0x07, 0x74, 0x33, 0x26, 0xba, 0x13, 0x19, 0xd1, 0x0d, 0x79, 0x75, 0x83, 0x1b, 0x72, 0xd5, 0xbb, 0xd8, 0xfa, 0x96, 0x7b, 0x70, 0x60, 0xbb, 0xd7, 0xcb, - 0xfd, 0x8f, 0xbe, 0xe5, 0x1e, 0x19, 0xea, 0x73, 0x15, 0xb3, 0x05, 0x7c, 0xd2, 0xdb, 0xa5, 0x61, - 0xe0, 0xbb, 0xd4, 0xae, 0xae, 0x58, 0xf3, 0x1a, 0x6f, 0x7a, 0x51, 0x3b, 0x89, 0xfb, 0xf5, 0x76, - 0x1b, 0x1c, 0x22, 0xfe, 0x4f, 0xce, 0xac, 0x7e, 0x2d, 0xc5, 0x0d, 0x44, 0xa4, 0x8c, 0x87, 0xf4, - 0x70, 0x23, 0x24, 0xe1, 0xbc, 0x5c, 0x50, 0xda, 0x76, 0x10, 0x97, 0xa8, 0x43, 0xe5, 0x16, 0x40, - 0x89, 0x98, 0x2c, 0x50, 0x4e, 0xe5, 0x29, 0x6d, 0x62, 0x25, 0xcd, 0x0d, 0x50, 0x7a, 0x88, 0x0f, - 0xcc, 0x3b, 0x28, 0xc5, 0x72, 0x59, 0x69, 0xda, 0x90, 0xe3, 0x73, 0x19, 0x74, 0xfc, 0x36, 0xc0, - 0x24, 0xe8, 0x47, 0xf9, 0x26, 0xe4, 0xa5, 0x3d, 0xc1, 0xa2, 0x79, 0xe9, 0xd5, 0x6c, 0xfe, 0xc4, - 0xcb, 0x5e, 0xfc, 0x60, 0xe9, 0xd9, 0xcb, 0xf5, 0x34, 0x7b, 0xbd, 0x9b, 0xd8, 0x45, 0x7c, 0xd4, - 0x9b, 0x91, 0x77, 0xa8, 0xbd, 0xec, 0x14, 0xa8, 0xbe, 0x53, 0x4b, 0x37, 0xcb, 0xac, 0x09, 0x69, - 0x77, 0x5f, 0x14, 0x15, 0x8f, 0x44, 0x0d, 0x80, 0xfb, 0x3c, 0xde, 0xeb, 0x7d, 0x83, 0x38, 0x8f, - 0x65, 0x50, 0x6e, 0xb9, 0x68, 0x19, 0x2a, 0x14, 0x10, 0xcd, 0x1a, 0x46, 0x18, 0x51, 0xaf, 0x32, - 0xf9, 0x13, 0x04, 0x24, 0x02, 0x63, 0xc4, 0x92, 0xc8, 0x75, 0x45, 0xa2, 0x77, 0xf9, 0x99, 0x69, - 0x57, 0x9c, 0x4b, 0xd4, 0xe6, 0x73, 0x4e, 0x89, 0x7e, 0x57, 0x54, 0xe8, 0xe9, 0x69, 0xda, 0x68, - 0x97, 0x95, 0x11, 0x3b, 0x20, 0xfa, 0x15, 0x3c, 0x18, 0x6a, 0x92, 0x2c, 0x2b, 0xc3, 0x0e, 0xc3, - 0x6e, 0xfc, 0x27, 0x4c, 0x02, 0xe8, 0x5e, 0x65, 0xf2, 0x77, 0xbe, 0x13, 0xa6, 0x23, 0x9e, 0xb9, - 0x1e, 0xf0, 0xec, 0x5d, 0x96, 0xcf, 0xe1, 0x43, 0x5e, 0xb6, 0xfc, 0x3b, 0x57, 0x7c, 0x6a, 0x97, - 0xe0, 0xc6, 0x03, 0x9d, 0xe7, 0x9e, 0xdc, 0x77, 0x6e, 0x12, 0xdd, 0x5e, 0x40, 0x2a, 0x78, 0x38, - 0x38, 0x34, 0x44, 0xed, 0x01, 0xde, 0xef, 0xdf, 0x6a, 0x21, 0x47, 0x9d, 0xec, 0xd8, 0xa5, 0x80, - 0x03, 0xe5, 0xeb, 0xc0, 0x71, 0xd6, 0x30, 0x5e, 0xc6, 0xee, 0xfc, 0x33, 0x04, 0x44, 0x5a, 0xfe, - 0x13, 0x89, 0xe4, 0xb6, 0x44, 0xa4, 0x77, 0x59, 0xbf, 0x0f, 0x97, 0xd3, 0x25, 0xdd, 0xe6, 0xcb, - 0xcc, 0x2c, 0xeb, 0x66, 0xc5, 0x1f, 0x99, 0x94, 0xd2, 0x76, 0x18, 0xef, 0x12, 0xf7, 0x67, 0x31, - 0xfa, 0x81, 0x92, 0xfb, 0xa2, 0x7c, 0x88, 0xf0, 0xb1, 0x78, 0x87, 0x2f, 0x2b, 0x14, 0x0a, 0xde, - 0xcf, 0x2d, 0x4e, 0x0d, 0x18, 0x0c, 0x66, 0x56, 0xe0, 0x9b, 0xb2, 0x04, 0xa0, 0x4a, 0x94, 0xb3, - 0x25, 0xf7, 0xd2, 0xbf, 0x68, 0xd6, 0x1a, 0xfe, 0xfd, 0xcb, 0xe5, 0x82, 0x7c, 0x5c, 0xc8, 0x11, - 0xbc, 0x7b, 0x5d, 0x37, 0xcb, 0xd6, 0xba, 0xf0, 0x99, 0x2b, 0xc1, 0x9b, 0xf2, 0xbd, 0x1c, 0x3e, - 0x9e, 0xe0, 0x0e, 0x48, 0x1e, 0xc1, 0xbb, 0xab, 0xed, 0xdd, 0x2c, 0x57, 0x82, 0x37, 0x72, 0x1f, - 0xef, 0xd7, 0x34, 0xde, 0xb4, 0xd5, 0x35, 0xdd, 0xb6, 0x59, 0x79, 0xa4, 0xaf, 0x73, 0xf2, 0xfd, - 0xc2, 0xc1, 0x3d, 0x61, 0x4f, 0x96, 0xf1, 0x01, 0xd7, 0x5f, 0x0d, 0xc8, 0xe7, 0xba, 0x88, 0xa6, - 0xf0, 0x00, 0x91, 0x22, 0xa7, 0xf0, 0x01, 0x11, 0xb9, 0x96, 0xc7, 0x9d, 0xd1, 0x70, 0x92, 0x71, - 0x7c, 0xb0, 0x46, 0x6d, 0xae, 0xba, 0x63, 0x3f, 0xa6, 0x46, 0x83, 0x8d, 0xec, 0x12, 0xdb, 0xc3, - 0x80, 0xf3, 0xdd, 0xc9, 0xb7, 0xfd, 0x65, 0xe7, 0x2b, 0x29, 0xe0, 0x43, 0xe0, 0x28, 0xd0, 0x79, - 0xb7, 0x2b, 0x6e, 0xd4, 0xda, 0xf3, 0x03, 0xfa, 0x5f, 0xc3, 0x79, 0xc3, 0x5a, 0x67, 0x36, 0x57, - 0xfd, 0x66, 0xa0, 0x07, 0x8d, 0xec, 0x11, 0xc1, 0x3c, 0xea, 0xf6, 0xf0, 0x4d, 0x2e, 0xd8, 0xf2, - 0xe7, 0xf0, 0xd9, 0xb8, 0xa9, 0xf7, 0x50, 0xe7, 0x55, 0xdd, 0x6c, 0xe5, 0x2a, 0x35, 0xe7, 0xca, - 0xaf, 0xfb, 0xf0, 0x39, 0x29, 0x27, 0x90, 0xe9, 0xb7, 0xf1, 0x40, 0x50, 0x89, 0xeb, 0x6a, 0x42, - 0x6b, 0xfe, 0x09, 0x1d, 0x49, 0x41, 0xcc, 0x8c, 0x26, 0x33, 0xf8, 0xa8, 0xd6, 0xa8, 0xd7, 0x99, - 0xc9, 0xd5, 0x75, 0x9d, 0x57, 0xcb, 0x75, 0xba, 0xae, 0xc2, 0x64, 0xcd, 0x89, 0x28, 0x1d, 0x86, - 0xe6, 0x87, 0xd0, 0xfa, 0x50, 0x34, 0x92, 0x49, 0x7c, 0x38, 0x62, 0x57, 0xa7, 0x9c, 0x89, 0x3c, - 0xef, 0x2b, 0x1d, 0x0a, 0x59, 0x39, 0x84, 0x9d, 0x24, 0xb6, 0xe5, 0x32, 0x95, 0x35, 0x35, 0xc6, - 0xca, 0xac, 0x2c, 0x32, 0xbe, 0xb7, 0x34, 0x54, 0xf7, 0x62, 0x72, 0x0b, 0x1a, 0x5a, 0x72, 0x98, + 0xfd, 0x0f, 0xbe, 0xe5, 0x1e, 0x19, 0xea, 0x73, 0x15, 0xb3, 0x05, 0x7c, 0xca, 0xdb, 0xa5, 0x61, + 0xe0, 0xbb, 0xd4, 0xae, 0xae, 0x5a, 0xf3, 0x1a, 0x6f, 0x7a, 0x51, 0x3b, 0x85, 0xfb, 0xf5, 0x76, + 0x1b, 0x1c, 0x22, 0xfe, 0x4f, 0xce, 0xac, 0x7e, 0x3d, 0xc5, 0x0d, 0x44, 0xa4, 0x8c, 0x87, 0xf4, + 0x70, 0x23, 0x24, 0xe1, 0x82, 0x5c, 0x50, 0xda, 0x76, 0x10, 0x97, 0xa8, 0x43, 0xe5, 0x36, 0x40, + 0x89, 0x98, 0x2c, 0x50, 0x4e, 0xe5, 0x29, 0x6d, 0x61, 0x25, 0xcd, 0x0d, 0x50, 0x7a, 0x88, 0x0f, + 0xcd, 0x3b, 0x28, 0xc5, 0x72, 0x59, 0x6d, 0xda, 0x90, 0xe3, 0xf3, 0x19, 0x74, 0xfc, 0x36, 0xc0, + 0x24, 0xe8, 0x47, 0xf9, 0x06, 0xe4, 0xa5, 0x3d, 0xc1, 0xa2, 0x79, 0xe9, 0xd5, 0x6c, 0xfe, 0xd4, + 0xcb, 0x5e, 0xfc, 0x60, 0xe9, 0xd9, 0xcb, 0xf5, 0x34, 0x7b, 0xbd, 0x9b, 0xd8, 0x45, 0x7c, 0xcc, + 0x9b, 0x91, 0x8b, 0xd4, 0x5e, 0x71, 0x0a, 0x54, 0xdf, 0xa9, 0xa5, 0x9b, 0x65, 0xd6, 0x84, 0xb4, + 0xbb, 0x2f, 0x8a, 0x8a, 0x47, 0xa2, 0x06, 0xc0, 0x7d, 0x1e, 0xef, 0xf7, 0xbe, 0x41, 0x9c, 0xc7, + 0x32, 0x28, 0xb7, 0x5c, 0xb4, 0x0c, 0x15, 0x0a, 0x88, 0x66, 0x0d, 0x23, 0x8c, 0xa8, 0x57, 0x99, + 0xfc, 0x31, 0x02, 0x12, 0x81, 0x31, 0x62, 0x49, 0xe4, 0xba, 0x22, 0xd1, 0xbb, 0xfc, 0xcc, 0xb4, + 0x2b, 0xce, 0x65, 0x6a, 0xf3, 0x39, 0xa7, 0x44, 0xbf, 0x2b, 0x2a, 0xf4, 0xf4, 0x34, 0x6d, 0xb6, + 0xcb, 0xca, 0x88, 0x1d, 0x10, 0xfd, 0x32, 0x1e, 0x0c, 0x35, 0x49, 0x96, 0x95, 0x61, 0x87, 0x61, + 0x37, 0xfe, 0x13, 0x26, 0x01, 0x74, 0xaf, 0x32, 0xf9, 0x5b, 0xdf, 0x09, 0xd3, 0x11, 0xcf, 0x5c, + 0x0f, 0x78, 0xf6, 0x2e, 0xcb, 0xe7, 0xf1, 0x61, 0x2f, 0x5b, 0xfe, 0x9d, 0x2b, 0x3e, 0xb5, 0xcb, + 0x70, 0xe3, 0x81, 0xce, 0x73, 0x4f, 0xee, 0x3b, 0x37, 0x89, 0x6e, 0x2f, 0x20, 0x15, 0x3c, 0x1c, + 0x1c, 0x1a, 0xa2, 0xf6, 0x00, 0x1f, 0xf4, 0x6f, 0xb5, 0x90, 0xa3, 0x4e, 0x76, 0xec, 0x52, 0xc0, + 0x81, 0xf2, 0x35, 0xe0, 0x38, 0x6b, 0x18, 0x2f, 0x63, 0x77, 0xfe, 0x29, 0x02, 0x22, 0x2d, 0xff, + 0x89, 0x44, 0x72, 0xdb, 0x22, 0xd2, 0xbb, 0xac, 0xdf, 0x87, 0xcb, 0xe9, 0xb2, 0x6e, 0xf3, 0x15, + 0x66, 0x96, 0x75, 0xb3, 0xe2, 0x8f, 0x4c, 0x4a, 0x69, 0x3b, 0x8c, 0xf7, 0x88, 0xfb, 0xb3, 0x18, + 0xfd, 0x50, 0xc9, 0x7d, 0x51, 0x3e, 0x42, 0xf8, 0x78, 0xbc, 0xc3, 0x97, 0x15, 0x0a, 0x05, 0x1f, + 0xe4, 0x16, 0xa7, 0x06, 0x0c, 0x06, 0x33, 0x2b, 0xf0, 0x4d, 0x59, 0x06, 0x50, 0x25, 0xca, 0xd9, + 0xb2, 0x7b, 0xe9, 0x5f, 0x32, 0x6b, 0x0d, 0xff, 0xfe, 0xe5, 0x72, 0x41, 0x3e, 0x2e, 0xe4, 0x28, + 0xde, 0xbb, 0xa1, 0x9b, 0x65, 0x6b, 0x43, 0xf8, 0xcc, 0x95, 0xe0, 0x4d, 0xf9, 0x6e, 0x0e, 0x9f, + 0x48, 0x70, 0x07, 0x24, 0x8f, 0xe2, 0xbd, 0xd5, 0xf6, 0x6e, 0x96, 0x2b, 0xc1, 0x1b, 0xb9, 0x8f, + 0x0f, 0x6a, 0x1a, 0x6f, 0xda, 0xea, 0xba, 0x6e, 0xdb, 0xac, 0x3c, 0xd2, 0xd7, 0x39, 0xf9, 0x7e, + 0xe1, 0xe0, 0x9e, 0xb0, 0x27, 0x2b, 0xf8, 0x90, 0xeb, 0xaf, 0x06, 0xe4, 0x73, 0x5d, 0x44, 0x53, + 0x78, 0x80, 0x48, 0x91, 0xd3, 0xf8, 0x90, 0x88, 0x5c, 0xcb, 0xe3, 0xee, 0x68, 0x38, 0xc9, 0x38, + 0x7e, 0xa5, 0x46, 0x6d, 0xae, 0xba, 0x63, 0x3f, 0xa6, 0x46, 0x83, 0x8d, 0xec, 0x11, 0xdb, 0xc3, + 0x80, 0xf3, 0xdd, 0xc9, 0xb7, 0xfd, 0x25, 0xe7, 0x2b, 0x29, 0xe0, 0xc3, 0xe0, 0x28, 0xd0, 0x79, + 0xaf, 0x2b, 0x6e, 0xd4, 0xda, 0xf3, 0x03, 0xfa, 0x5f, 0xc7, 0x79, 0xc3, 0xda, 0x60, 0x36, 0x57, + 0xfd, 0x66, 0xa0, 0x07, 0x8d, 0xec, 0x13, 0xc1, 0x3c, 0xe6, 0xf6, 0xf0, 0x4d, 0x2e, 0xd8, 0xf2, + 0xe7, 0xf0, 0xb9, 0xb8, 0xa9, 0xf7, 0x50, 0xe7, 0x55, 0xdd, 0x6c, 0xe5, 0x2a, 0x35, 0xe7, 0xca, + 0xaf, 0xfa, 0xf0, 0x79, 0x29, 0x27, 0x90, 0xe9, 0x77, 0xf0, 0x40, 0x50, 0x89, 0xeb, 0x6a, 0x42, + 0x6b, 0xfe, 0x09, 0x1d, 0x49, 0x41, 0xcc, 0x8c, 0x26, 0x33, 0xf8, 0x98, 0xd6, 0xa8, 0xd7, 0x99, + 0xc9, 0xd5, 0x0d, 0x9d, 0x57, 0xcb, 0x75, 0xba, 0xa1, 0xc2, 0x64, 0xcd, 0x89, 0x28, 0x1d, 0x81, + 0xe6, 0x87, 0xd0, 0xfa, 0x50, 0x34, 0x92, 0x49, 0x7c, 0x24, 0x62, 0x57, 0xa7, 0x9c, 0x89, 0x3c, + 0x1f, 0x28, 0x1d, 0x0e, 0x59, 0x39, 0x84, 0x9d, 0x24, 0xb6, 0xe5, 0x32, 0x95, 0x35, 0x35, 0xc6, + 0xca, 0xac, 0x2c, 0x32, 0xbe, 0xbf, 0x34, 0x54, 0xf7, 0x62, 0x72, 0x1b, 0x1a, 0x5a, 0x72, 0x98, 0x73, 0x54, 0x3d, 0x62, 0x9c, 0x06, 0x8e, 0x5d, 0x65, 0xda, 0xdb, 0x71, 0x42, 0xad, 0xed, 0xa5, - 0x73, 0x37, 0xb0, 0x74, 0x20, 0xb9, 0x2b, 0xb0, 0x84, 0xe7, 0x2d, 0xf3, 0x31, 0xab, 0x3b, 0x75, - 0xdf, 0x8a, 0xe5, 0x98, 0x47, 0xce, 0x9c, 0xc8, 0x46, 0x95, 0xc7, 0x7b, 0x2b, 0xd4, 0x5e, 0x6a, - 0xed, 0x55, 0xfb, 0x4a, 0xad, 0x77, 0xe5, 0x47, 0x08, 0x96, 0x72, 0xd4, 0x2d, 0xe0, 0xf9, 0x02, - 0x1e, 0xf2, 0x14, 0x86, 0x3b, 0xd4, 0x5e, 0x34, 0x9d, 0x46, 0x4f, 0x9c, 0x8b, 0x34, 0x38, 0xbd, - 0x85, 0x24, 0xa8, 0x59, 0xc6, 0x6d, 0xc6, 0xa0, 0x77, 0x1f, 0xcc, 0xf6, 0x70, 0x03, 0x19, 0xc7, - 0x83, 0xce, 0x5f, 0x7f, 0x55, 0x90, 0x13, 0xb9, 0x0e, 0x7f, 0x56, 0xc6, 0xe0, 0xfa, 0x7f, 0x8f, - 0xd9, 0x36, 0xad, 0xb0, 0x65, 0x6a, 0xdb, 0xba, 0x59, 0x59, 0x6e, 0x7b, 0xf4, 0xa2, 0x7b, 0x1b, - 0x74, 0x98, 0x94, 0x8e, 0x40, 0xec, 0x18, 0xde, 0xf7, 0x4e, 0x0b, 0xa2, 0x4b, 0xa8, 0xfd, 0x41, - 0x19, 0x8d, 0xee, 0x98, 0xb7, 0x0d, 0x5a, 0xf1, 0xae, 0xe7, 0xca, 0x07, 0x28, 0xba, 0x07, 0x42, - 0x07, 0xf0, 0x4f, 0xf1, 0xc1, 0x7a, 0xa8, 0x0d, 0x8e, 0xd6, 0x62, 0xc6, 0xda, 0x08, 0xbb, 0x84, - 0x2b, 0x48, 0xc4, 0x9d, 0xb2, 0x0c, 0x13, 0x2d, 0x78, 0x0f, 0x97, 0x38, 0xbb, 0x8e, 0xe2, 0x3d, - 0xce, 0xae, 0xe2, 0xdc, 0x27, 0xdd, 0xe4, 0xec, 0xe6, 0x4d, 0x71, 0x95, 0xdc, 0x80, 0xc9, 0x19, - 0xf6, 0x08, 0x9c, 0xbe, 0x86, 0x07, 0x43, 0xd2, 0x36, 0x50, 0xea, 0x85, 0x52, 0x30, 0xf9, 0xc3, - 0x49, 0xbc, 0x4b, 0x8c, 0x4e, 0x3e, 0x41, 0x78, 0x30, 0x24, 0x77, 0x91, 0x37, 0x33, 0x86, 0x48, - 0x17, 0x85, 0xf3, 0x6f, 0x75, 0x6b, 0xee, 0x52, 0x57, 0x6e, 0x7e, 0xf0, 0xb7, 0xff, 0x7c, 0xd8, - 0x77, 0x95, 0x5c, 0x16, 0x72, 0xfa, 0x84, 0xef, 0x9f, 0x10, 0x41, 0x19, 0x1e, 0xec, 0x8a, 0x1b, - 0x50, 0xf2, 0x6d, 0x16, 0x37, 0x44, 0x91, 0xb7, 0x49, 0x7e, 0x8b, 0x30, 0x09, 0x79, 0x9f, 0x35, - 0x0c, 0x39, 0x5e, 0x89, 0xb2, 0xb0, 0x1c, 0xaf, 0x64, 0xa9, 0x57, 0x29, 0x08, 0x5e, 0xe3, 0xe4, - 0x8c, 0x1c, 0x2f, 0xf2, 0x3f, 0x84, 0x5f, 0x89, 0xb2, 0x00, 0x15, 0x8e, 0x2c, 0x74, 0x87, 0x26, - 0x28, 0x28, 0xe6, 0x6f, 0x6d, 0xd1, 0x0b, 0x50, 0x7b, 0x53, 0x50, 0xbb, 0x44, 0xa6, 0xe5, 0xa8, - 0x81, 0x39, 0x64, 0x6e, 0x93, 0xfc, 0x17, 0xe1, 0x91, 0xe0, 0xbc, 0xf5, 0x11, 0x9d, 0x97, 0x84, - 0x98, 0x26, 0x9c, 0xe6, 0x17, 0xb6, 0xe6, 0x04, 0x68, 0xde, 0x10, 0x34, 0xaf, 0x90, 0x4b, 0x09, - 0x34, 0x75, 0x33, 0x99, 0xa5, 0xaa, 0x97, 0x37, 0xc9, 0x6f, 0x10, 0x1e, 0x8a, 0x10, 0x95, 0x9e, - 0x97, 0xf1, 0xfa, 0xa5, 0xf4, 0xbc, 0x4c, 0xd0, 0x24, 0x33, 0xe7, 0x65, 0x90, 0x95, 0x4d, 0x3e, - 0x46, 0x78, 0x20, 0xe8, 0x8b, 0x5c, 0x91, 0x81, 0x10, 0xbb, 0x77, 0xe6, 0xaf, 0x76, 0x63, 0x0a, - 0xc8, 0xe7, 0x04, 0xf2, 0xeb, 0xe4, 0xaa, 0x14, 0x72, 0x5f, 0x22, 0x8a, 0x1b, 0xb0, 0x29, 0x6f, - 0x92, 0xbf, 0xb7, 0x53, 0xe2, 0x53, 0x9c, 0x6e, 0x48, 0xee, 0x61, 0x49, 0x32, 0x5c, 0xfe, 0x66, - 0xf7, 0x0e, 0x80, 0xdc, 0x5b, 0x82, 0xdc, 0x65, 0x32, 0x93, 0x4e, 0xae, 0x6d, 0x59, 0xdc, 0xf0, - 0x7d, 0xda, 0x24, 0x9f, 0x22, 0x7c, 0x38, 0x56, 0xa7, 0x24, 0x37, 0x3b, 0x08, 0x79, 0xac, 0x52, - 0x9a, 0x9f, 0xdd, 0x82, 0x87, 0xce, 0x72, 0x17, 0xb4, 0x0e, 0x51, 0xfc, 0x18, 0xe1, 0xe1, 0xc8, - 0x28, 0xce, 0x8a, 0xba, 0xd1, 0xd9, 0x92, 0xe8, 0x32, 0x7d, 0x69, 0xca, 0xa8, 0x72, 0x5e, 0xf0, - 0x3b, 0x4b, 0xc6, 0x65, 0xf9, 0x91, 0x9f, 0xa2, 0xb6, 0x16, 0x47, 0x66, 0x24, 0xe7, 0x4f, 0x48, - 0x34, 0xcc, 0x5f, 0xea, 0xd8, 0x0e, 0xf0, 0x16, 0x05, 0xde, 0x37, 0xc8, 0x58, 0x02, 0xde, 0x0a, - 0x18, 0x38, 0x29, 0x28, 0xb3, 0xe6, 0x26, 0xf9, 0x31, 0xc2, 0xfd, 0x9e, 0x17, 0x27, 0xe6, 0x33, - 0x92, 0x21, 0xeb, 0x0a, 0x71, 0x8c, 0x74, 0xa9, 0x8c, 0x09, 0xc4, 0xaf, 0x91, 0x13, 0x19, 0x88, - 0xc9, 0xaf, 0x10, 0x3e, 0x18, 0xae, 0xba, 0xc9, 0x35, 0x99, 0x61, 0x13, 0xae, 0x00, 0xf9, 0xeb, - 0xdd, 0x19, 0x4b, 0x86, 0x5a, 0x0b, 0x63, 0xfd, 0x03, 0xc2, 0xfd, 0xbe, 0xc2, 0x5a, 0xee, 0xec, - 0xcf, 0x2a, 0xe0, 0xe5, 0xce, 0xfe, 0xcc, 0xea, 0x5e, 0x39, 0x2b, 0xd8, 0xbc, 0x4e, 0x94, 0x04, + 0x73, 0x37, 0xb0, 0x74, 0x20, 0xb9, 0xab, 0xb0, 0x84, 0xe7, 0x2d, 0xf3, 0x31, 0xab, 0x3b, 0x75, + 0xdf, 0xaa, 0xe5, 0x98, 0x47, 0xce, 0x9c, 0xc8, 0x46, 0x95, 0xc7, 0xfb, 0x2b, 0xd4, 0x5e, 0x6e, + 0xed, 0x55, 0x07, 0x4a, 0xad, 0x77, 0xe5, 0x87, 0x08, 0x96, 0x72, 0xd4, 0x2d, 0xe0, 0xf9, 0x02, + 0x1e, 0xf2, 0x14, 0x86, 0x45, 0x6a, 0x2f, 0x99, 0x4e, 0xa3, 0x27, 0xce, 0x45, 0x1a, 0x9c, 0xde, + 0x42, 0x12, 0xd4, 0x2c, 0xe3, 0x0e, 0x63, 0xd0, 0xbb, 0x0f, 0x66, 0x7b, 0xb8, 0x81, 0x8c, 0xe3, + 0x41, 0xe7, 0xaf, 0xbf, 0x2a, 0xc8, 0x89, 0x5c, 0x87, 0x3f, 0x2b, 0x63, 0x70, 0xfd, 0xbf, 0xc7, + 0x6c, 0x9b, 0x56, 0xd8, 0x0a, 0xb5, 0x6d, 0xdd, 0xac, 0xac, 0xb4, 0x3d, 0x7a, 0xd1, 0xbd, 0x03, + 0x3a, 0x4c, 0x4a, 0x47, 0x20, 0x76, 0x1c, 0x1f, 0x78, 0xb7, 0x05, 0xd1, 0x25, 0xd4, 0xfe, 0xa0, + 0x8c, 0x46, 0x77, 0xcc, 0x3b, 0x06, 0xad, 0x78, 0xd7, 0x73, 0xe5, 0x43, 0x14, 0xdd, 0x03, 0xa1, + 0x03, 0xf8, 0xa7, 0xf8, 0x95, 0x7a, 0xa8, 0x0d, 0x8e, 0xd6, 0x62, 0xc6, 0xda, 0x08, 0xbb, 0x84, + 0x2b, 0x48, 0xc4, 0x9d, 0xb2, 0x02, 0x13, 0x2d, 0x78, 0x0f, 0x97, 0x38, 0xbb, 0x8e, 0xe1, 0x7d, + 0xce, 0xae, 0xe2, 0xdc, 0x27, 0xdd, 0xe4, 0xec, 0xe5, 0x4d, 0x71, 0x95, 0xdc, 0x84, 0xc9, 0x19, + 0xf6, 0x08, 0x9c, 0xbe, 0x8a, 0x07, 0x43, 0xd2, 0x36, 0x50, 0xea, 0x85, 0x52, 0x30, 0xf9, 0x83, + 0x49, 0xbc, 0x47, 0x8c, 0x4e, 0x3e, 0x45, 0x78, 0x30, 0x24, 0x77, 0x91, 0xb7, 0x32, 0x86, 0x48, + 0x17, 0x85, 0xf3, 0x6f, 0x77, 0x6b, 0xee, 0x52, 0x57, 0x6e, 0x7d, 0xf8, 0xd7, 0x7f, 0x7f, 0xd4, + 0x77, 0x8d, 0x5c, 0x11, 0x72, 0xfa, 0x84, 0xef, 0x47, 0x88, 0xa0, 0x0c, 0x0f, 0x76, 0xc5, 0x4d, + 0x28, 0xf9, 0xb6, 0x8a, 0x9b, 0xa2, 0xc8, 0xdb, 0x22, 0xbf, 0x41, 0x98, 0x84, 0xbc, 0xcf, 0x1a, + 0x86, 0x1c, 0xaf, 0x44, 0x59, 0x58, 0x8e, 0x57, 0xb2, 0xd4, 0xab, 0x14, 0x04, 0xaf, 0x71, 0x72, + 0x56, 0x8e, 0x17, 0xf9, 0x2f, 0xc2, 0xaf, 0x46, 0x59, 0x80, 0x0a, 0x47, 0x16, 0xba, 0x43, 0x13, + 0x14, 0x14, 0xf3, 0xb7, 0xb7, 0xe9, 0x05, 0xa8, 0xbd, 0x25, 0xa8, 0x5d, 0x26, 0xd3, 0x72, 0xd4, + 0xc0, 0x1c, 0x32, 0xb7, 0x45, 0xfe, 0x83, 0xf0, 0x48, 0x70, 0xde, 0xfa, 0x88, 0xce, 0x4b, 0x42, + 0x4c, 0x13, 0x4e, 0xf3, 0x0b, 0xdb, 0x73, 0x02, 0x34, 0x6f, 0x0a, 0x9a, 0x57, 0xc9, 0xe5, 0x04, + 0x9a, 0xba, 0x99, 0xcc, 0x52, 0xd5, 0xcb, 0x5b, 0xe4, 0xd7, 0x08, 0x0f, 0x45, 0x88, 0x4a, 0xcf, + 0xcb, 0x78, 0xfd, 0x52, 0x7a, 0x5e, 0x26, 0x68, 0x92, 0x99, 0xf3, 0x32, 0xc8, 0xca, 0x26, 0x9f, + 0x20, 0x3c, 0x10, 0xf4, 0x45, 0xae, 0xca, 0x40, 0x88, 0xdd, 0x3b, 0xf3, 0xd7, 0xba, 0x31, 0x05, + 0xe4, 0x73, 0x02, 0xf9, 0x0d, 0x72, 0x4d, 0x0a, 0xb9, 0x2f, 0x11, 0xc5, 0x4d, 0xd8, 0x94, 0xb7, + 0xc8, 0xdf, 0xda, 0x29, 0xf1, 0x29, 0x4e, 0x37, 0x25, 0xf7, 0xb0, 0x24, 0x19, 0x2e, 0x7f, 0xab, + 0x7b, 0x07, 0x40, 0xee, 0x6d, 0x41, 0xee, 0x0a, 0x99, 0x49, 0x27, 0xd7, 0xb6, 0x2c, 0x6e, 0xfa, + 0x3e, 0x6d, 0x91, 0xcf, 0x10, 0x3e, 0x12, 0xab, 0x53, 0x92, 0x5b, 0x1d, 0x84, 0x3c, 0x56, 0x29, + 0xcd, 0xcf, 0x6e, 0xc3, 0x43, 0x67, 0xb9, 0x0b, 0x5a, 0x87, 0x28, 0x7e, 0x82, 0xf0, 0x70, 0x64, + 0x14, 0x67, 0x45, 0xdd, 0xec, 0x6c, 0x49, 0x74, 0x99, 0xbe, 0x34, 0x65, 0x54, 0xb9, 0x20, 0xf8, + 0x9d, 0x23, 0xe3, 0xb2, 0xfc, 0xc8, 0x4f, 0x50, 0x5b, 0x8b, 0x23, 0x33, 0x92, 0xf3, 0x27, 0x24, + 0x1a, 0xe6, 0x2f, 0x77, 0x6c, 0x07, 0x78, 0x8b, 0x02, 0xef, 0x9b, 0x64, 0x2c, 0x01, 0x6f, 0x05, + 0x0c, 0x9c, 0x14, 0x94, 0x59, 0x73, 0x8b, 0xfc, 0x08, 0xe1, 0x7e, 0xcf, 0x8b, 0x13, 0xf3, 0x19, + 0xc9, 0x90, 0x75, 0x85, 0x38, 0x46, 0xba, 0x54, 0xc6, 0x04, 0xe2, 0xd7, 0xc9, 0xc9, 0x0c, 0xc4, + 0xe4, 0x97, 0x08, 0xbf, 0x12, 0xae, 0xba, 0xc9, 0x75, 0x99, 0x61, 0x13, 0xae, 0x00, 0xf9, 0x1b, + 0xdd, 0x19, 0x4b, 0x86, 0x5a, 0x0b, 0x63, 0xfd, 0x3d, 0xc2, 0xfd, 0xbe, 0xc2, 0x5a, 0xee, 0xec, + 0xcf, 0x2a, 0xe0, 0xe5, 0xce, 0xfe, 0xcc, 0xea, 0x5e, 0x39, 0x27, 0xd8, 0xbc, 0x41, 0x94, 0x04, 0x36, 0xbe, 0xcb, 0x08, 0x79, 0x8a, 0x22, 0xea, 0xa4, 0x74, 0xb5, 0x19, 0xaf, 0xad, 0x4a, 0x57, - 0x9b, 0x09, 0x7a, 0xa9, 0x32, 0x23, 0xe0, 0x9f, 0x27, 0x85, 0x04, 0xf8, 0x46, 0xd0, 0xae, 0x35, - 0xfd, 0x9d, 0x1a, 0x33, 0xe4, 0xb3, 0x93, 0xb3, 0x7c, 0x2b, 0x6c, 0x92, 0xd5, 0xdf, 0xcc, 0xb3, - 0x3c, 0xc4, 0x86, 0xfc, 0x00, 0xe1, 0x9d, 0x62, 0xf3, 0x99, 0x94, 0x0c, 0xa3, 0x7f, 0x93, 0x9c, - 0xea, 0xc8, 0x06, 0x10, 0x9e, 0x13, 0x08, 0x4f, 0x93, 0x53, 0x49, 0x93, 0x1f, 0x4e, 0x32, 0x11, - 0xe4, 0x9f, 0x23, 0xdc, 0xef, 0x53, 0x7d, 0xe5, 0xea, 0x8c, 0x58, 0xa5, 0xb8, 0x3b, 0xb0, 0xd3, - 0x02, 0x6c, 0x91, 0x4c, 0xa4, 0x82, 0x8d, 0xdc, 0x3f, 0xbe, 0x8f, 0xf0, 0x1e, 0xef, 0x28, 0x9a, - 0x94, 0xcc, 0x68, 0xc7, 0x81, 0x0d, 0x29, 0xbf, 0xca, 0x29, 0x81, 0xf5, 0x38, 0x79, 0x35, 0x05, - 0x2b, 0xf9, 0xc8, 0x59, 0x80, 0x41, 0xbd, 0x89, 0x48, 0x55, 0x60, 0xf1, 0xaa, 0x6d, 0xfe, 0x5a, - 0x57, 0xb6, 0xb2, 0x3b, 0x87, 0x0f, 0xe4, 0xff, 0x11, 0x1e, 0x4d, 0x17, 0xca, 0xc8, 0x62, 0x17, - 0x58, 0xe2, 0x15, 0xbb, 0xfc, 0x17, 0x7b, 0xe1, 0x0a, 0x58, 0x5e, 0x11, 0x2c, 0xa7, 0xc8, 0x85, - 0x6c, 0x96, 0x61, 0x46, 0x1f, 0x21, 0x3c, 0x10, 0xfc, 0x2d, 0x97, 0xdc, 0x0a, 0x88, 0xfd, 0x75, - 0x98, 0x5c, 0xa5, 0x1d, 0xff, 0xd3, 0x31, 0x65, 0x42, 0x90, 0x18, 0x23, 0xa7, 0x13, 0x48, 0xbc, - 0x1f, 0x44, 0xe9, 0x00, 0x0f, 0xaa, 0x6e, 0x72, 0xc0, 0x63, 0x75, 0x3c, 0x39, 0xe0, 0xf1, 0x22, - 0x5f, 0x26, 0x70, 0x23, 0x88, 0xd2, 0x29, 0x15, 0xc2, 0xa2, 0x90, 0x5c, 0xa9, 0x90, 0x20, 0x5f, - 0xc9, 0x95, 0x0a, 0x49, 0xd2, 0x56, 0x66, 0xa9, 0x10, 0x16, 0xaa, 0xc2, 0x04, 0xc4, 0x3f, 0x0b, - 0x3a, 0x26, 0xe0, 0xff, 0x8f, 0x45, 0xc7, 0x04, 0x02, 0xff, 0x9f, 0xe8, 0x84, 0x80, 0x8b, 0xf5, - 0xcf, 0x08, 0xef, 0x7f, 0xd0, 0xe0, 0x2b, 0xcd, 0x6d, 0xa2, 0x46, 0x49, 0x48, 0x1b, 0x2d, 0xac, - 0x31, 0x47, 0xc1, 0x2f, 0x5d, 0x7d, 0xad, 0xd5, 0x65, 0x1b, 0xe8, 0x50, 0x59, 0x27, 0xb0, 0x9f, - 0x11, 0xf9, 0x37, 0xc2, 0x47, 0x42, 0xf8, 0xb7, 0xa5, 0x02, 0x75, 0x55, 0x90, 0xba, 0x48, 0x26, - 0x25, 0x48, 0x85, 0xe5, 0x27, 0xf7, 0xa6, 0x1c, 0x47, 0x71, 0x1b, 0x69, 0x4f, 0xd7, 0x05, 0xc1, - 0x19, 0x72, 0x31, 0xf1, 0x3e, 0x99, 0xc0, 0x4f, 0x08, 0x4f, 0xbf, 0x10, 0x9a, 0x4d, 0x57, 0xb3, - 0xf0, 0x25, 0xa9, 0x4e, 0x59, 0x87, 0xbf, 0x8f, 0x0f, 0x79, 0x06, 0xe8, 0xb7, 0x97, 0x40, 0x73, - 0x4d, 0x30, 0x98, 0x26, 0x53, 0x29, 0x0c, 0x12, 0xd5, 0x99, 0x7f, 0x22, 0x4c, 0x82, 0x94, 0xb6, - 0x8f, 0x34, 0x93, 0x2d, 0x73, 0x86, 0x71, 0x87, 0xc8, 0xfd, 0x5e, 0x68, 0x6a, 0xfe, 0x4e, 0xdb, - 0x44, 0x94, 0xc9, 0xaa, 0x06, 0x82, 0xcc, 0xe6, 0xbe, 0xf4, 0xf4, 0xf9, 0x28, 0x7a, 0xf6, 0x7c, - 0x14, 0x7d, 0xfa, 0x7c, 0x14, 0x7d, 0xf7, 0xc5, 0xe8, 0x8e, 0x67, 0x2f, 0x46, 0x77, 0xfc, 0xe3, - 0xc5, 0xe8, 0x8e, 0x47, 0x17, 0x2a, 0x3a, 0xaf, 0x36, 0x56, 0x0b, 0x9a, 0xb5, 0xe6, 0x77, 0xd5, - 0xfa, 0xfd, 0x7f, 0xd3, 0xef, 0x95, 0x3f, 0xa9, 0x31, 0x7b, 0x75, 0xb7, 0xb8, 0x08, 0x4f, 0x7d, - 0x16, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x90, 0xcc, 0xec, 0xe4, 0x31, 0x00, 0x00, + 0x9b, 0x09, 0x7a, 0xa9, 0x32, 0x23, 0xe0, 0x5f, 0x20, 0x85, 0x04, 0xf8, 0x46, 0xd0, 0xae, 0x35, + 0xfd, 0x9d, 0x1a, 0x33, 0xe4, 0xb3, 0x93, 0xb3, 0x7c, 0x3b, 0x6c, 0x92, 0xd5, 0xdf, 0xcc, 0xb3, + 0x3c, 0xc4, 0x86, 0x7c, 0x1f, 0xe1, 0xdd, 0x62, 0xf3, 0x99, 0x94, 0x0c, 0xa3, 0x7f, 0x93, 0x9c, + 0xea, 0xc8, 0x06, 0x10, 0x9e, 0x17, 0x08, 0xcf, 0x90, 0xd3, 0x49, 0x93, 0x1f, 0x4e, 0x32, 0x11, + 0xe4, 0x9f, 0x21, 0xdc, 0xef, 0x53, 0x7d, 0xe5, 0xea, 0x8c, 0x58, 0xa5, 0xb8, 0x3b, 0xb0, 0xd3, + 0x02, 0x6c, 0x91, 0x4c, 0xa4, 0x82, 0x8d, 0xdc, 0x3f, 0xbe, 0x87, 0xf0, 0x3e, 0xef, 0x28, 0x9a, + 0x94, 0xcc, 0x68, 0xc7, 0x81, 0x0d, 0x29, 0xbf, 0xca, 0x69, 0x81, 0xf5, 0x04, 0x79, 0x2d, 0x05, + 0x2b, 0xf9, 0xd8, 0x59, 0x80, 0x41, 0xbd, 0x89, 0x48, 0x55, 0x60, 0xf1, 0xaa, 0x6d, 0xfe, 0x7a, + 0x57, 0xb6, 0xb2, 0x3b, 0x87, 0x0f, 0xe4, 0xff, 0x10, 0x1e, 0x4d, 0x17, 0xca, 0xc8, 0x52, 0x17, + 0x58, 0xe2, 0x15, 0xbb, 0xfc, 0x17, 0x7b, 0xe1, 0x0a, 0x58, 0x5e, 0x15, 0x2c, 0xa7, 0xc8, 0xc5, + 0x6c, 0x96, 0x61, 0x46, 0x1f, 0x23, 0x3c, 0x10, 0xfc, 0x5f, 0x2e, 0xb9, 0x15, 0x10, 0xfb, 0xdf, + 0x61, 0x72, 0x95, 0x76, 0xfc, 0xbf, 0x8e, 0x29, 0x13, 0x82, 0xc4, 0x18, 0x39, 0x93, 0x40, 0xe2, + 0x83, 0x20, 0x4a, 0x07, 0x78, 0x50, 0x75, 0x93, 0x03, 0x1e, 0xab, 0xe3, 0xc9, 0x01, 0x8f, 0x17, + 0xf9, 0x32, 0x81, 0x1b, 0x41, 0x94, 0x4e, 0xa9, 0x10, 0x16, 0x85, 0xe4, 0x4a, 0x85, 0x04, 0xf9, + 0x4a, 0xae, 0x54, 0x48, 0x92, 0xb6, 0x32, 0x4b, 0x85, 0xb0, 0x50, 0x15, 0x26, 0x20, 0x7e, 0x2c, + 0xe8, 0x98, 0x80, 0xff, 0x17, 0x8b, 0x8e, 0x09, 0x04, 0x7e, 0x9f, 0xe8, 0x84, 0x80, 0x8b, 0xf5, + 0x4f, 0x08, 0x1f, 0x7c, 0xd0, 0xe0, 0xab, 0xcd, 0x1d, 0xa2, 0x46, 0x49, 0x48, 0x1b, 0x2d, 0xac, + 0x31, 0x47, 0xc1, 0x2f, 0x5c, 0x7d, 0xad, 0xd5, 0x65, 0x07, 0xe8, 0x50, 0x59, 0x27, 0xb0, 0x9f, + 0x11, 0xf9, 0x17, 0xc2, 0x47, 0x43, 0xf8, 0x77, 0xa4, 0x02, 0x75, 0x4d, 0x90, 0xba, 0x44, 0x26, + 0x25, 0x48, 0x85, 0xe5, 0x27, 0xf7, 0xa6, 0x1c, 0x47, 0x71, 0x07, 0x69, 0x4f, 0x37, 0x04, 0xc1, + 0x19, 0x72, 0x29, 0xf1, 0x3e, 0x99, 0xc0, 0x4f, 0x08, 0x4f, 0x3f, 0x17, 0x9a, 0x4d, 0x57, 0xb3, + 0xf0, 0x25, 0xa9, 0x4e, 0x59, 0x87, 0xbf, 0x8f, 0x0f, 0x79, 0x06, 0xe8, 0x77, 0x96, 0x40, 0x73, + 0x5d, 0x30, 0x98, 0x26, 0x53, 0x29, 0x0c, 0x12, 0xd5, 0x99, 0x7f, 0x20, 0x4c, 0x82, 0x94, 0x76, + 0x8e, 0x34, 0x93, 0x2d, 0x73, 0x86, 0x71, 0x87, 0xc8, 0xfd, 0x4e, 0x68, 0x6a, 0xfe, 0x4e, 0x3b, + 0x44, 0x94, 0xc9, 0xaa, 0x06, 0x82, 0xcc, 0xe6, 0x16, 0x9f, 0x3e, 0x1f, 0x45, 0xcf, 0x9e, 0x8f, + 0xa2, 0xcf, 0x9e, 0x8f, 0xa2, 0xef, 0xbc, 0x18, 0xdd, 0xf5, 0xec, 0xc5, 0xe8, 0xae, 0xbf, 0xbf, + 0x18, 0xdd, 0xf5, 0x68, 0xa2, 0xa2, 0xf3, 0x6a, 0x63, 0xad, 0xa0, 0x59, 0xeb, 0x7e, 0x57, 0xa6, + 0x55, 0x66, 0xc5, 0xa6, 0xdf, 0x23, 0x7f, 0x52, 0x63, 0xf6, 0xda, 0x5e, 0x71, 0x09, 0x9e, 0xfa, + 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xf0, 0x93, 0x1b, 0xe0, 0x31, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/crosschain/types/rate_limiter_flags.go b/x/crosschain/types/rate_limiter_flags.go index 0d4310ddc8..b30c474b15 100644 --- a/x/crosschain/types/rate_limiter_flags.go +++ b/x/crosschain/types/rate_limiter_flags.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" ) // Validate checks that the RateLimiterFlags is valid diff --git a/x/crosschain/types/rate_limiter_flags.pb.go b/x/crosschain/types/rate_limiter_flags.pb.go index f98d6575d4..c5d9bbf1a3 100644 --- a/x/crosschain/types/rate_limiter_flags.pb.go +++ b/x/crosschain/types/rate_limiter_flags.pb.go @@ -8,7 +8,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" io "io" math "math" math_bits "math/bits" @@ -214,35 +214,35 @@ func init() { } var fileDescriptor_9c435f4c2dabc0eb = []byte{ - // 435 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xce, 0x34, 0x69, 0xcd, 0x4e, 0x51, 0x64, 0x28, 0xb2, 0x04, 0xdc, 0x2e, 0x01, 0xeb, 0x7a, - 0xe8, 0xac, 0x46, 0xf0, 0xee, 0x46, 0x04, 0xd1, 0x8b, 0x83, 0x5e, 0xbc, 0x84, 0xc9, 0xec, 0x74, - 0x3b, 0x64, 0x77, 0x66, 0xd9, 0x19, 0xad, 0xed, 0xaf, 0xf0, 0x67, 0xf5, 0xd8, 0xa3, 0x88, 0x54, - 0x49, 0xfe, 0x88, 0xcc, 0xcc, 0x66, 0x1b, 0x24, 0x88, 0xf4, 0x92, 0xbc, 0x6f, 0x79, 0xdf, 0xfb, - 0xbe, 0xf7, 0xcd, 0x83, 0x2f, 0x2e, 0xb8, 0xa1, 0xec, 0x94, 0x0a, 0x99, 0xba, 0x4a, 0x35, 0x3c, - 0x65, 0x8d, 0xd2, 0xda, 0x7f, 0x6b, 0xa8, 0xe1, 0xb3, 0x52, 0x54, 0xc2, 0xf0, 0x66, 0x76, 0x52, - 0xd2, 0x42, 0xe3, 0xba, 0x51, 0x46, 0xa1, 0x87, 0x1d, 0x0f, 0xaf, 0x79, 0xf8, 0x86, 0x37, 0x3a, - 0x28, 0x54, 0xa1, 0x5c, 0x67, 0x6a, 0x2b, 0x4f, 0x1a, 0x1d, 0x6d, 0x11, 0xab, 0x17, 0x45, 0xca, - 0x94, 0x90, 0xee, 0xc7, 0xf7, 0x8d, 0x7f, 0x02, 0x78, 0x9f, 0x50, 0xc3, 0xdf, 0x79, 0xe1, 0xd7, - 0x56, 0x17, 0x85, 0xf0, 0x0e, 0x97, 0x74, 0x5e, 0xf2, 0x3c, 0x04, 0x31, 0x48, 0x86, 0x64, 0x0d, - 0xd1, 0x03, 0xb8, 0x77, 0x26, 0x64, 0xae, 0xce, 0xc2, 0x9d, 0x18, 0x24, 0x7d, 0xd2, 0x22, 0x34, - 0x85, 0x03, 0xeb, 0x3f, 0xec, 0xc7, 0x20, 0x09, 0xb2, 0xf4, 0xf2, 0xfa, 0xb0, 0xf7, 0xe3, 0xfa, - 0xf0, 0x71, 0x21, 0xcc, 0xe9, 0xe7, 0x39, 0x66, 0xaa, 0x4a, 0x99, 0xd2, 0x95, 0xd2, 0xed, 0xdf, - 0xb1, 0xce, 0x17, 0xa9, 0x39, 0xaf, 0xb9, 0xc6, 0x1f, 0x85, 0x34, 0xc4, 0x91, 0xd1, 0x7b, 0xb8, - 0xcf, 0x94, 0xfc, 0xc2, 0x1b, 0x2d, 0x94, 0xd4, 0xe1, 0x20, 0xee, 0x27, 0xfb, 0x93, 0x27, 0xf8, - 0x9f, 0xeb, 0xe3, 0x69, 0xc7, 0xc8, 0x06, 0x56, 0x96, 0x6c, 0xce, 0x18, 0x9f, 0x40, 0x78, 0xd3, - 0x80, 0x0e, 0xe0, 0xee, 0x45, 0xc3, 0x26, 0x4f, 0xdd, 0x56, 0x01, 0xf1, 0x00, 0x65, 0xad, 0xf7, - 0x1d, 0xe7, 0x1d, 0xb7, 0xde, 0x8f, 0xfe, 0xc3, 0xfb, 0x2b, 0xce, 0xbc, 0xf5, 0xf1, 0x2f, 0x00, - 0x83, 0x97, 0x5a, 0x73, 0x63, 0xb3, 0xb4, 0xf9, 0x39, 0x73, 0x6f, 0x7c, 0x7e, 0x7d, 0xb2, 0x86, - 0xd6, 0x01, 0xb5, 0x6d, 0x5e, 0x8c, 0x78, 0x80, 0x46, 0x70, 0x98, 0x73, 0x26, 0x2a, 0x5a, 0x6a, - 0x97, 0xe0, 0x5d, 0xd2, 0x61, 0x94, 0xc1, 0xc0, 0x3e, 0xd7, 0xcc, 0x2a, 0x86, 0x83, 0x18, 0x24, - 0xf7, 0x26, 0x8f, 0xb6, 0x45, 0x52, 0x2f, 0x0a, 0xec, 0xde, 0x75, 0xaa, 0x84, 0xfc, 0x70, 0x5e, - 0x73, 0x32, 0x64, 0x6d, 0xd5, 0x6d, 0xb8, 0x7b, 0xfb, 0x0d, 0xb3, 0xb7, 0x97, 0xcb, 0x08, 0x5c, - 0x2d, 0x23, 0xf0, 0x7b, 0x19, 0x81, 0x6f, 0xab, 0xa8, 0x77, 0xb5, 0x8a, 0x7a, 0xdf, 0x57, 0x51, - 0xef, 0xd3, 0xb3, 0x8d, 0x39, 0xd6, 0xce, 0xf1, 0x5f, 0x67, 0xf7, 0x75, 0xf3, 0xca, 0xdd, 0xd8, - 0xf9, 0x9e, 0x3b, 0xbe, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x20, 0xbc, 0x25, 0x58, 0x13, - 0x03, 0x00, 0x00, + // 437 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x41, 0x8b, 0x13, 0x31, + 0x14, 0x6e, 0xb6, 0xdd, 0xb5, 0xcd, 0xa2, 0x48, 0x58, 0x64, 0x28, 0x38, 0x3b, 0x14, 0x5c, 0xc7, + 0x43, 0x13, 0xa9, 0xe0, 0xdd, 0xa9, 0x28, 0x82, 0x17, 0x83, 0x5e, 0xbc, 0x94, 0x34, 0x93, 0x9d, + 0x0d, 0xed, 0x24, 0xc3, 0x24, 0xba, 0xee, 0xfe, 0x0a, 0x7f, 0xd6, 0x1e, 0xf7, 0x28, 0x22, 0xab, + 0xb4, 0x7f, 0x44, 0x92, 0x4c, 0x67, 0x7b, 0x28, 0x22, 0x7b, 0x69, 0xdf, 0x37, 0xbc, 0xef, 0x7d, + 0xdf, 0xfb, 0xf2, 0xe0, 0xcb, 0x4b, 0x61, 0x19, 0x3f, 0x63, 0x52, 0x11, 0x5f, 0xe9, 0x5a, 0x10, + 0x5e, 0x6b, 0x63, 0xc2, 0xb7, 0x9a, 0x59, 0x31, 0x5b, 0xca, 0x52, 0x5a, 0x51, 0xcf, 0x4e, 0x97, + 0xac, 0x30, 0xb8, 0xaa, 0xb5, 0xd5, 0xe8, 0x71, 0xcb, 0xc3, 0x1b, 0x1e, 0xbe, 0xe5, 0x0d, 0x8f, + 0x0a, 0x5d, 0x68, 0xdf, 0x49, 0x5c, 0x15, 0x48, 0xc3, 0x93, 0x1d, 0x62, 0xd5, 0xa2, 0x20, 0x5c, + 0x4b, 0xe5, 0x7f, 0x42, 0xdf, 0xe8, 0x17, 0x80, 0x0f, 0x29, 0xb3, 0xe2, 0x7d, 0x10, 0x7e, 0xe3, + 0x74, 0x51, 0x04, 0xef, 0x09, 0xc5, 0xe6, 0x4b, 0x91, 0x47, 0x20, 0x01, 0x69, 0x9f, 0x6e, 0x20, + 0x7a, 0x04, 0x0f, 0xce, 0xa5, 0xca, 0xf5, 0x79, 0xb4, 0x97, 0x80, 0xb4, 0x4b, 0x1b, 0x84, 0xa6, + 0xb0, 0xe7, 0xfc, 0x47, 0xdd, 0x04, 0xa4, 0x83, 0x8c, 0x5c, 0xdd, 0x1c, 0x77, 0x7e, 0xde, 0x1c, + 0x3f, 0x2d, 0xa4, 0x3d, 0xfb, 0x32, 0xc7, 0x5c, 0x97, 0x84, 0x6b, 0x53, 0x6a, 0xd3, 0xfc, 0x8d, + 0x4d, 0xbe, 0x20, 0xf6, 0xa2, 0x12, 0x06, 0x7f, 0x92, 0xca, 0x52, 0x4f, 0x46, 0x1f, 0xe0, 0x21, + 0xd7, 0xea, 0xab, 0xa8, 0x8d, 0xd4, 0xca, 0x44, 0xbd, 0xa4, 0x9b, 0x1e, 0x4e, 0x9e, 0xe1, 0x7f, + 0xae, 0x8f, 0xa7, 0x2d, 0x23, 0xeb, 0x39, 0x59, 0xba, 0x3d, 0x63, 0x74, 0x0a, 0xe1, 0x6d, 0x03, + 0x3a, 0x82, 0xfb, 0x97, 0x35, 0x9f, 0x3c, 0xf7, 0x5b, 0x0d, 0x68, 0x00, 0x28, 0x6b, 0xbc, 0xef, + 0x79, 0xef, 0xb8, 0xf1, 0x7e, 0xf2, 0x1f, 0xde, 0x5f, 0x0b, 0x1e, 0xac, 0x8f, 0x7e, 0x03, 0x38, + 0x78, 0x65, 0x8c, 0xb0, 0x2e, 0x4b, 0x97, 0x9f, 0x37, 0xf7, 0x2e, 0xe4, 0xd7, 0xa5, 0x1b, 0xe8, + 0x1c, 0x30, 0xd7, 0x16, 0xc4, 0x68, 0x00, 0x68, 0x08, 0xfb, 0xb9, 0xe0, 0xb2, 0x64, 0x4b, 0xe3, + 0x13, 0xbc, 0x4f, 0x5b, 0x8c, 0x32, 0x38, 0x70, 0xcf, 0x35, 0x73, 0x8a, 0x51, 0x2f, 0x01, 0xe9, + 0x83, 0xc9, 0x93, 0x5d, 0x91, 0x54, 0x8b, 0x02, 0xfb, 0x77, 0x9d, 0x6a, 0xa9, 0x3e, 0x5e, 0x54, + 0x82, 0xf6, 0x79, 0x53, 0xb5, 0x1b, 0xee, 0xdf, 0x7d, 0xc3, 0xec, 0xed, 0xd5, 0x2a, 0x06, 0xd7, + 0xab, 0x18, 0xfc, 0x59, 0xc5, 0xe0, 0xfb, 0x3a, 0xee, 0x5c, 0xaf, 0xe3, 0xce, 0x8f, 0x75, 0xdc, + 0xf9, 0x3c, 0xde, 0x9a, 0xe3, 0xec, 0x8c, 0xc3, 0xd9, 0x29, 0x9d, 0x0b, 0xf2, 0x6d, 0xfb, 0xc2, + 0xfd, 0xc8, 0xf9, 0x81, 0x3f, 0xbc, 0x17, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x00, 0x01, + 0xd6, 0x0f, 0x03, 0x00, 0x00, } func (m *RateLimiterFlags) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/rate_limiter_flags_test.go b/x/crosschain/types/rate_limiter_flags_test.go index 3f15cb2895..8531a34105 100644 --- a/x/crosschain/types/rate_limiter_flags_test.go +++ b/x/crosschain/types/rate_limiter_flags_test.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestRateLimiterFlags_Validate(t *testing.T) { diff --git a/x/crosschain/types/revert_options.go b/x/crosschain/types/revert_options.go index 1f07e96239..6cdb3040bf 100644 --- a/x/crosschain/types/revert_options.go +++ b/x/crosschain/types/revert_options.go @@ -6,7 +6,7 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/crypto" ) // NewEmptyRevertOptions initializes a new empty RevertOptions diff --git a/x/crosschain/types/revert_options_test.go b/x/crosschain/types/revert_options_test.go index 2b178e7c3f..46981855ea 100644 --- a/x/crosschain/types/revert_options_test.go +++ b/x/crosschain/types/revert_options_test.go @@ -2,9 +2,9 @@ package types_test import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" "testing" ) diff --git a/x/crosschain/types/status_test.go b/x/crosschain/types/status_test.go index 49ed1fc74f..88013a41a9 100644 --- a/x/crosschain/types/status_test.go +++ b/x/crosschain/types/status_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestStatus_AbortRefunded(t *testing.T) { diff --git a/x/crosschain/types/tx.pb.go b/x/crosschain/types/tx.pb.go index bbf88f017b..6c75354214 100644 --- a/x/crosschain/types/tx.pb.go +++ b/x/crosschain/types/tx.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - chains "github.com/zeta-chain/zetacore/pkg/chains" - coin "github.com/zeta-chain/zetacore/pkg/coin" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + chains "github.com/zeta-chain/node/pkg/chains" + coin "github.com/zeta-chain/node/pkg/coin" + proofs "github.com/zeta-chain/node/pkg/proofs" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -1706,119 +1706,119 @@ func init() { } var fileDescriptor_15f0860550897740 = []byte{ - // 1779 bytes of a gzipped FileDescriptorProto + // 1782 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8, 0x15, 0x37, 0xd7, 0xb2, 0x2c, 0x3d, 0xd9, 0xb2, 0xcd, 0x75, 0x6c, 0x99, 0x5e, 0xcb, 0x8e, 0xd2, - 0xb8, 0x46, 0x91, 0x48, 0x5e, 0x65, 0x9b, 0x6e, 0xbd, 0x45, 0xb7, 0xb1, 0x76, 0xe3, 0x75, 0x1b, - 0x25, 0x06, 0xd7, 0xd9, 0x7e, 0x5c, 0x08, 0x8a, 0x1c, 0xd3, 0x84, 0x25, 0x8e, 0xc0, 0x19, 0x29, + 0xb8, 0x46, 0x11, 0x4b, 0xae, 0xb2, 0x4d, 0xb7, 0xde, 0xa2, 0xdb, 0x58, 0xbb, 0xf1, 0xba, 0x88, + 0x12, 0x83, 0xeb, 0x6c, 0x3f, 0x2e, 0x04, 0x45, 0x8e, 0x69, 0xc2, 0x12, 0x47, 0xe0, 0x8c, 0xb4, 0x72, 0x50, 0xa0, 0x45, 0x81, 0x02, 0x3d, 0xb6, 0x45, 0x4f, 0x39, 0xf4, 0x56, 0xa0, 0xfd, 0x4f, 0x72, 0x0c, 0x7a, 0x2a, 0x7a, 0x08, 0x8a, 0xe4, 0xd4, 0x5b, 0xdb, 0x6b, 0x2f, 0x05, 0xdf, 0x0c, 0x19, 0x89, 0xfa, 0xb4, 0x8c, 0x62, 0x2f, 0x16, 0xe7, 0xf1, 0xfd, 0xde, 0xbc, 0xaf, 0x99, 0xf7, - 0x1e, 0x0d, 0xbb, 0xcf, 0x09, 0x37, 0xad, 0x73, 0xd3, 0xf5, 0x4a, 0xf8, 0x44, 0x7d, 0x52, 0xb2, + 0x1e, 0x0d, 0xbb, 0xcf, 0x09, 0x37, 0xad, 0x0b, 0xd3, 0xf5, 0x4a, 0xf8, 0x44, 0x7d, 0x52, 0xb2, 0x7c, 0xca, 0x98, 0xa0, 0xf1, 0x4e, 0xb1, 0xe9, 0x53, 0x4e, 0xd5, 0xad, 0x88, 0xaf, 0x18, 0xf2, 0x15, 0xdf, 0xf1, 0x69, 0xab, 0x0e, 0x75, 0x28, 0x72, 0x96, 0x82, 0x27, 0x01, 0xd2, 0xbe, 0x35, - 0x40, 0x78, 0xf3, 0xc2, 0x29, 0x21, 0x89, 0xc9, 0x1f, 0xc9, 0xbb, 0x3b, 0x8c, 0x97, 0xba, 0x1e, - 0xfe, 0x19, 0x23, 0xb3, 0xe9, 0x53, 0x7a, 0xc6, 0xe4, 0x8f, 0xe4, 0xbd, 0x3f, 0xda, 0x38, 0xdf, - 0xe4, 0xc4, 0xa8, 0xbb, 0x0d, 0x97, 0x13, 0xdf, 0x38, 0xab, 0x9b, 0x4e, 0x88, 0x2b, 0x8f, 0xc6, + 0x40, 0x78, 0xf3, 0xd2, 0x29, 0x21, 0x89, 0xc9, 0x1f, 0xc9, 0xbb, 0x3b, 0x8c, 0x97, 0xba, 0x1e, + 0xfe, 0x19, 0x23, 0xb3, 0xe9, 0x53, 0x7a, 0xce, 0xe4, 0x8f, 0xe4, 0x7d, 0x30, 0xda, 0x38, 0xdf, + 0xe4, 0xc4, 0xa8, 0xbb, 0x0d, 0x97, 0x13, 0xdf, 0x38, 0xaf, 0x9b, 0x4e, 0x88, 0x2b, 0x8f, 0xc6, 0xe1, 0xa3, 0x81, 0xcf, 0x46, 0xe8, 0xa0, 0xc2, 0xef, 0x15, 0x50, 0xab, 0xcc, 0xa9, 0xba, 0x4e, - 0x20, 0xf6, 0x94, 0xb1, 0x87, 0x2d, 0xcf, 0x66, 0x6a, 0x0e, 0xe6, 0x2d, 0x9f, 0x98, 0x9c, 0xfa, + 0x20, 0xf6, 0x8c, 0xb1, 0x47, 0x2d, 0xcf, 0x66, 0x6a, 0x0e, 0xe6, 0x2d, 0x9f, 0x98, 0x9c, 0xfa, 0x39, 0x65, 0x47, 0xd9, 0x4b, 0xeb, 0xe1, 0x52, 0xdd, 0x80, 0x94, 0x10, 0xe1, 0xda, 0xb9, 0xf7, - 0x76, 0x94, 0xbd, 0x59, 0x7d, 0x1e, 0xd7, 0xc7, 0xb6, 0x7a, 0x04, 0x49, 0xb3, 0x41, 0x5b, 0x1e, - 0xcf, 0xcd, 0x06, 0x98, 0xc3, 0xd2, 0xcb, 0xd7, 0xdb, 0x33, 0x7f, 0x7f, 0xbd, 0xfd, 0x4d, 0xc7, - 0xe5, 0xe7, 0xad, 0x5a, 0xd1, 0xa2, 0x8d, 0x92, 0x45, 0x59, 0x83, 0x32, 0xf9, 0x73, 0x97, 0xd9, - 0x17, 0x25, 0x7e, 0xd9, 0x24, 0xac, 0xf8, 0xd4, 0xf5, 0xb8, 0x2e, 0xe1, 0x85, 0x0f, 0x40, 0xeb, - 0xd7, 0x49, 0x27, 0xac, 0x49, 0x3d, 0x46, 0x0a, 0x8f, 0xe1, 0xfd, 0x2a, 0x73, 0x9e, 0x36, 0x6d, - 0xf1, 0xf2, 0x81, 0x6d, 0xfb, 0x84, 0x8d, 0x52, 0x79, 0x0b, 0x80, 0x33, 0x66, 0x34, 0x5b, 0xb5, - 0x0b, 0x72, 0x89, 0x4a, 0xa7, 0xf5, 0x34, 0x67, 0xec, 0x04, 0x09, 0x85, 0x2d, 0xd8, 0x1c, 0x20, - 0x2f, 0xda, 0xee, 0x8f, 0xef, 0xc1, 0x6a, 0x95, 0x39, 0x0f, 0x6c, 0xfb, 0xd8, 0xab, 0xd1, 0x96, - 0x67, 0x9f, 0xfa, 0xa6, 0x75, 0x41, 0xfc, 0xe9, 0x7c, 0xb4, 0x0e, 0xf3, 0xbc, 0x63, 0x9c, 0x9b, - 0xec, 0x5c, 0x38, 0x49, 0x4f, 0xf2, 0xce, 0x17, 0x26, 0x3b, 0x57, 0x0f, 0x21, 0x1d, 0xa4, 0x8b, - 0x11, 0xb8, 0x23, 0x97, 0xd8, 0x51, 0xf6, 0xb2, 0xe5, 0xdb, 0xc5, 0x01, 0xd9, 0xdb, 0xbc, 0x70, - 0x8a, 0x98, 0x57, 0x15, 0xea, 0x7a, 0xa7, 0x97, 0x4d, 0xa2, 0xa7, 0x2c, 0xf9, 0xa4, 0x1e, 0xc0, - 0x1c, 0x26, 0x52, 0x6e, 0x6e, 0x47, 0xd9, 0xcb, 0x94, 0xbf, 0x31, 0x0c, 0x2f, 0xb3, 0xed, 0x24, - 0xf8, 0xd1, 0x05, 0x24, 0x70, 0x52, 0xad, 0x4e, 0xad, 0x0b, 0xa1, 0x5b, 0x52, 0x38, 0x09, 0x29, - 0xa8, 0xde, 0x06, 0xa4, 0x78, 0xc7, 0x70, 0x3d, 0x9b, 0x74, 0x72, 0xf3, 0xc2, 0x24, 0xde, 0x39, - 0x0e, 0x96, 0x85, 0x3c, 0x7c, 0x30, 0xc8, 0x3f, 0x91, 0x03, 0xff, 0xaa, 0xc0, 0x4a, 0x95, 0x39, - 0x3f, 0x3e, 0x77, 0x39, 0xa9, 0xbb, 0x8c, 0x7f, 0xae, 0x57, 0xca, 0xfb, 0x23, 0xbc, 0x77, 0x0b, - 0x16, 0x89, 0x6f, 0x95, 0xf7, 0x0d, 0x53, 0x44, 0x42, 0x46, 0x6c, 0x01, 0x89, 0x61, 0xb4, 0xbb, - 0x5d, 0x3c, 0xdb, 0xeb, 0x62, 0x15, 0x12, 0x9e, 0xd9, 0x10, 0x4e, 0x4c, 0xeb, 0xf8, 0xac, 0xae, - 0x41, 0x92, 0x5d, 0x36, 0x6a, 0xb4, 0x8e, 0xae, 0x49, 0xeb, 0x72, 0xa5, 0x6a, 0x90, 0xb2, 0x89, - 0xe5, 0x36, 0xcc, 0x3a, 0x43, 0x9b, 0x17, 0xf5, 0x68, 0xad, 0x6e, 0x42, 0xda, 0x31, 0x99, 0x38, - 0x69, 0xd2, 0xe6, 0x94, 0x63, 0xb2, 0x47, 0xc1, 0xba, 0x60, 0xc0, 0x46, 0x9f, 0x4d, 0xa1, 0xc5, - 0x81, 0x05, 0xcf, 0x7b, 0x2c, 0x10, 0x16, 0x2e, 0x3c, 0xef, 0xb6, 0x60, 0x0b, 0xc0, 0xb2, 0x22, - 0x9f, 0xca, 0xac, 0x0c, 0x28, 0xc2, 0xab, 0xff, 0x56, 0xe0, 0x86, 0x70, 0xeb, 0x93, 0x16, 0xbf, - 0x7e, 0xde, 0xad, 0xc2, 0x9c, 0x47, 0x3d, 0x8b, 0xa0, 0xb3, 0x12, 0xba, 0x58, 0x74, 0x67, 0x63, - 0xa2, 0x27, 0x1b, 0xbf, 0x9e, 0x4c, 0xfa, 0x3e, 0x6c, 0x0d, 0x34, 0x39, 0x72, 0xec, 0x16, 0x80, - 0xcb, 0x0c, 0x9f, 0x34, 0x68, 0x9b, 0xd8, 0x68, 0x7d, 0x4a, 0x4f, 0xbb, 0x4c, 0x17, 0x84, 0x02, - 0x81, 0x5c, 0x95, 0x39, 0x62, 0xf5, 0xff, 0xf3, 0x5a, 0xa1, 0x00, 0x3b, 0xc3, 0xb6, 0x89, 0x92, - 0xfe, 0xcf, 0x0a, 0x2c, 0x55, 0x99, 0xf3, 0x15, 0xe5, 0xe4, 0xc8, 0x64, 0x27, 0xbe, 0x6b, 0x91, - 0xa9, 0x55, 0x68, 0x06, 0xe8, 0x50, 0x05, 0x5c, 0xa8, 0x37, 0x61, 0xa1, 0xe9, 0xbb, 0xd4, 0x77, - 0xf9, 0xa5, 0x71, 0x46, 0x08, 0x7a, 0x39, 0xa1, 0x67, 0x42, 0xda, 0x43, 0x82, 0x2c, 0x22, 0x0c, - 0x5e, 0xab, 0x51, 0x23, 0x3e, 0x06, 0x38, 0xa1, 0x67, 0x90, 0xf6, 0x18, 0x49, 0x3f, 0x4c, 0xa4, - 0xe6, 0x96, 0x93, 0x85, 0x0d, 0x58, 0x8f, 0x69, 0x1a, 0x59, 0xf1, 0xa7, 0x64, 0x64, 0x45, 0x68, - 0xe8, 0x08, 0x2b, 0x36, 0x01, 0xf3, 0x57, 0xc4, 0x5d, 0x24, 0x74, 0x2a, 0x20, 0x60, 0xd8, 0x3f, - 0x82, 0x35, 0x5a, 0x63, 0xc4, 0x6f, 0x13, 0xdb, 0xa0, 0x52, 0x56, 0xf7, 0x3d, 0xb8, 0x1a, 0xbe, - 0x0d, 0x37, 0x42, 0x54, 0x05, 0xf2, 0xfd, 0x28, 0x99, 0x5d, 0xc4, 0x75, 0xce, 0xb9, 0x34, 0x6b, - 0x33, 0x8e, 0x3e, 0xc4, 0x7c, 0x43, 0x16, 0xf5, 0x13, 0xd0, 0xfa, 0x85, 0x04, 0x47, 0xbb, 0xc5, - 0x88, 0x9d, 0x03, 0x14, 0xb0, 0x1e, 0x17, 0x70, 0x64, 0xb2, 0xa7, 0x8c, 0xd8, 0xea, 0x2f, 0x15, - 0xb8, 0xdd, 0x8f, 0x26, 0x67, 0x67, 0xc4, 0xe2, 0x6e, 0x9b, 0xa0, 0x1c, 0x11, 0xa0, 0x0c, 0x16, - 0xbd, 0xa2, 0x2c, 0x7a, 0xbb, 0x13, 0x14, 0xbd, 0x63, 0x8f, 0xeb, 0x37, 0xe3, 0x1b, 0x7f, 0x1e, - 0x8a, 0x8e, 0xf2, 0xe6, 0x64, 0xbc, 0x06, 0xe2, 0x92, 0x5a, 0x40, 0x53, 0x46, 0x4a, 0xc4, 0xdb, - 0x4b, 0xa5, 0x90, 0x6d, 0x9b, 0xf5, 0x16, 0x31, 0x7c, 0x62, 0x11, 0x37, 0x38, 0x4b, 0x78, 0x2d, - 0x1e, 0x7e, 0x71, 0xc5, 0x8a, 0xfd, 0x9f, 0xd7, 0xdb, 0x37, 0x2e, 0xcd, 0x46, 0xfd, 0xa0, 0xd0, - 0x2b, 0xae, 0xa0, 0x2f, 0x22, 0x41, 0x97, 0x6b, 0xf5, 0x33, 0x48, 0x32, 0x6e, 0xf2, 0x96, 0xb8, - 0x65, 0xb3, 0xe5, 0x3b, 0x43, 0x4b, 0x9b, 0x68, 0xae, 0x24, 0xf0, 0x4b, 0xc4, 0xe8, 0x12, 0xab, - 0xde, 0x86, 0x6c, 0x64, 0x3f, 0x32, 0xca, 0x0b, 0x64, 0x31, 0xa4, 0x56, 0x02, 0xa2, 0x7a, 0x07, - 0xd4, 0x88, 0x2d, 0x28, 0xfc, 0xe2, 0x08, 0xa7, 0xd0, 0x39, 0xcb, 0xe1, 0x9b, 0x53, 0xc6, 0x1e, - 0xe3, 0x1d, 0xd8, 0x53, 0x78, 0xd3, 0x53, 0x15, 0xde, 0xae, 0x23, 0x14, 0xfa, 0x3c, 0x3a, 0x42, - 0xff, 0x9c, 0x83, 0xac, 0x7c, 0x27, 0xeb, 0xe3, 0x88, 0x13, 0x14, 0x94, 0x29, 0xe2, 0xd9, 0xc4, - 0x97, 0xc7, 0x47, 0xae, 0xd4, 0x5d, 0x58, 0x12, 0x4f, 0x46, 0xac, 0xe8, 0x2d, 0x0a, 0x72, 0x45, - 0x5e, 0x16, 0x1a, 0xa4, 0x64, 0x08, 0x7c, 0x79, 0xa1, 0x47, 0xeb, 0xc0, 0x79, 0xe1, 0xb3, 0x74, - 0xde, 0x9c, 0x10, 0x11, 0x52, 0x85, 0xf3, 0xde, 0x35, 0x71, 0xc9, 0x6b, 0x35, 0x71, 0x81, 0x95, - 0x0d, 0xc2, 0x98, 0xe9, 0x08, 0xd7, 0xa7, 0xf5, 0x70, 0x19, 0xdc, 0x4c, 0xae, 0xd7, 0x75, 0x01, - 0xa4, 0xf1, 0x75, 0x46, 0xd2, 0xf0, 0xdc, 0xef, 0xc3, 0x6a, 0xc8, 0xd2, 0x73, 0xda, 0xc5, 0x61, - 0x55, 0xe5, 0xbb, 0xee, 0x43, 0xde, 0x53, 0xad, 0x33, 0xc8, 0x16, 0x55, 0xeb, 0xde, 0x18, 0x2f, - 0x4c, 0xd7, 0x5c, 0x6d, 0x42, 0x9a, 0x77, 0x0c, 0xea, 0xbb, 0x8e, 0xeb, 0xe5, 0x16, 0x85, 0x73, - 0x79, 0xe7, 0x09, 0xae, 0x83, 0x5b, 0xda, 0x64, 0x8c, 0xf0, 0x5c, 0x16, 0x5f, 0x88, 0x85, 0xba, - 0x0d, 0x19, 0xd2, 0x26, 0x1e, 0x97, 0xd5, 0x6e, 0x09, 0xb5, 0x02, 0x24, 0x61, 0xc1, 0x53, 0x7d, - 0xd8, 0xc0, 0x36, 0xdc, 0xa2, 0x75, 0xc3, 0xa2, 0x1e, 0xf7, 0x4d, 0x8b, 0x1b, 0x6d, 0xe2, 0x33, - 0x97, 0x7a, 0xb9, 0x65, 0xd4, 0xf3, 0x7e, 0x71, 0xe4, 0x08, 0x13, 0x94, 0x5e, 0xc4, 0x57, 0x24, - 0xfc, 0x2b, 0x81, 0xd6, 0xd7, 0x9b, 0x83, 0x5f, 0xa8, 0x3f, 0x0d, 0xf2, 0xa0, 0x4d, 0x7c, 0x6e, - 0xd0, 0x26, 0x77, 0xa9, 0xc7, 0x72, 0x2b, 0x58, 0xe3, 0xef, 0x8c, 0xd9, 0x48, 0x47, 0xd0, 0x13, - 0x81, 0x39, 0x4c, 0x04, 0x69, 0x11, 0xe4, 0x4e, 0x17, 0xb1, 0x90, 0x83, 0xb5, 0xde, 0x54, 0x8f, - 0x4e, 0xc1, 0x23, 0x6c, 0x01, 0x1f, 0xd4, 0xa8, 0xcf, 0xbf, 0xe4, 0x2d, 0xeb, 0xa2, 0x52, 0x39, - 0xfd, 0xc9, 0xe8, 0x8e, 0x7d, 0x54, 0x6f, 0xb4, 0x89, 0xcd, 0x57, 0xaf, 0xb4, 0x68, 0xab, 0x36, - 0xb6, 0xeb, 0x3a, 0x39, 0x6b, 0x79, 0x36, 0xb2, 0x10, 0xfb, 0x5a, 0xbb, 0x89, 0x83, 0x13, 0x48, - 0x8b, 0xda, 0x39, 0x51, 0xb1, 0x16, 0x05, 0x55, 0xf6, 0x73, 0xb2, 0x0d, 0xee, 0xdb, 0x37, 0xd2, - 0xeb, 0x85, 0x82, 0x5a, 0x8b, 0x39, 0x43, 0x37, 0x39, 0x79, 0x24, 0x46, 0xb8, 0x87, 0xc1, 0x04, - 0x37, 0x42, 0x3b, 0x0b, 0xd4, 0xfe, 0x89, 0x0f, 0xb5, 0xcc, 0x94, 0x4b, 0xe3, 0x62, 0x16, 0xdb, - 0x46, 0x86, 0x6d, 0xd9, 0x8f, 0xd1, 0x0b, 0xb7, 0xe0, 0xe6, 0x50, 0xdd, 0x22, 0x0b, 0xfe, 0xa5, - 0xe0, 0xa4, 0x24, 0xe7, 0x32, 0x6c, 0x79, 0x2b, 0x2d, 0xc6, 0xa9, 0x7d, 0x79, 0x8d, 0xa1, 0xb1, - 0x08, 0xef, 0x7b, 0xe4, 0x99, 0x61, 0x09, 0x41, 0x31, 0x17, 0xaf, 0x78, 0xe4, 0x99, 0xdc, 0x22, - 0x6c, 0x9b, 0xfb, 0xa6, 0x83, 0xc4, 0x80, 0xe9, 0xe0, 0xdd, 0x25, 0x36, 0x77, 0xbd, 0x49, 0xf4, - 0x33, 0xb8, 0x35, 0xc2, 0xe2, 0xee, 0xbe, 0xb4, 0x2b, 0x83, 0x94, 0x78, 0xbe, 0x36, 0xb0, 0x61, - 0x14, 0xde, 0xed, 0x16, 0x72, 0x62, 0xb6, 0x98, 0xac, 0x71, 0xd3, 0x37, 0x87, 0x81, 0x0c, 0x74, - 0x57, 0x4a, 0x17, 0x8b, 0xc2, 0x31, 0xec, 0x8d, 0xdb, 0x6e, 0x42, 0xcd, 0xcb, 0xff, 0xcd, 0xc2, - 0x6c, 0x95, 0x39, 0xea, 0x6f, 0x14, 0x50, 0x07, 0x8c, 0x22, 0x1f, 0x8d, 0xc9, 0xbf, 0x81, 0xdd, - 0xbc, 0xf6, 0xbd, 0x69, 0x50, 0x91, 0xc6, 0xbf, 0x56, 0x60, 0xa5, 0x7f, 0x18, 0xbf, 0x37, 0x91, - 0xcc, 0x5e, 0x90, 0xf6, 0xc9, 0x14, 0xa0, 0x48, 0x8f, 0xdf, 0x29, 0x70, 0x63, 0xf0, 0xa8, 0xf1, - 0x9d, 0xf1, 0x62, 0x07, 0x02, 0xb5, 0x4f, 0xa7, 0x04, 0x46, 0x3a, 0xb5, 0x61, 0xa1, 0x67, 0xe2, - 0x28, 0x8e, 0x17, 0xd8, 0xcd, 0xaf, 0xdd, 0xbf, 0x1a, 0x7f, 0x7c, 0xdf, 0x68, 0x46, 0x98, 0x70, - 0xdf, 0x90, 0x7f, 0xd2, 0x7d, 0xe3, 0xcd, 0x95, 0xca, 0x20, 0xd3, 0xdd, 0x58, 0xdd, 0x9d, 0x4c, - 0x8c, 0x64, 0xd7, 0xbe, 0x7d, 0x25, 0xf6, 0x68, 0xd3, 0x9f, 0x43, 0x36, 0xf6, 0x2d, 0x63, 0x7f, - 0xbc, 0xa0, 0x5e, 0x84, 0xf6, 0xf1, 0x55, 0x11, 0xd1, 0xee, 0xbf, 0x52, 0x60, 0xb9, 0xef, 0xdb, - 0x57, 0x79, 0xbc, 0xb8, 0x38, 0x46, 0x3b, 0xb8, 0x3a, 0x26, 0x52, 0xe2, 0x17, 0xb0, 0x14, 0xff, - 0x62, 0xf8, 0xe1, 0x78, 0x71, 0x31, 0x88, 0xf6, 0xdd, 0x2b, 0x43, 0xba, 0x63, 0x10, 0x6b, 0x26, - 0x26, 0x88, 0x41, 0x2f, 0x62, 0x92, 0x18, 0x0c, 0x6e, 0x31, 0xf0, 0x0a, 0xea, 0x6f, 0x30, 0xee, - 0x4d, 0x72, 0x7a, 0x63, 0xa0, 0x49, 0xae, 0xa0, 0xa1, 0x2d, 0x85, 0xfa, 0x07, 0x05, 0xd6, 0x86, - 0xf4, 0x13, 0x1f, 0x4f, 0x1a, 0xdd, 0x38, 0x52, 0xfb, 0xc1, 0xb4, 0xc8, 0x48, 0xad, 0x17, 0x0a, - 0xe4, 0x86, 0x36, 0x09, 0x07, 0x13, 0x07, 0xbd, 0x0f, 0xab, 0x1d, 0x4e, 0x8f, 0x8d, 0x94, 0xfb, - 0x8b, 0x02, 0x5b, 0xa3, 0x2b, 0xf1, 0xa7, 0x93, 0x3a, 0x60, 0x88, 0x00, 0xed, 0xe8, 0x9a, 0x02, - 0x42, 0x5d, 0x0f, 0x7f, 0xf4, 0xf2, 0x4d, 0x5e, 0x79, 0xf5, 0x26, 0xaf, 0xfc, 0xe3, 0x4d, 0x5e, - 0xf9, 0xed, 0xdb, 0xfc, 0xcc, 0xab, 0xb7, 0xf9, 0x99, 0xbf, 0xbd, 0xcd, 0xcf, 0xfc, 0xec, 0xc3, - 0xae, 0x46, 0x26, 0xd8, 0xe2, 0x6e, 0xec, 0xb3, 0x7f, 0xa7, 0xe7, 0xbf, 0x21, 0x41, 0x5f, 0x53, - 0x4b, 0xe2, 0x40, 0x70, 0xef, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0xaf, 0x76, 0x5a, 0x3b, - 0x19, 0x00, 0x00, + 0x76, 0x94, 0xbd, 0x59, 0x7d, 0x1e, 0xd7, 0x27, 0xb6, 0x7a, 0x0c, 0x49, 0xb3, 0x41, 0x5b, 0x1e, + 0xcf, 0xcd, 0x06, 0x98, 0xa3, 0xd2, 0xcb, 0xd7, 0xdb, 0x33, 0x7f, 0x7f, 0xbd, 0xfd, 0x4d, 0xc7, + 0xe5, 0x17, 0xad, 0x5a, 0xd1, 0xa2, 0x8d, 0x92, 0x45, 0x59, 0x83, 0x32, 0xf9, 0xb3, 0xcf, 0xec, + 0xcb, 0x12, 0xbf, 0x6a, 0x12, 0x56, 0x7c, 0xe6, 0x7a, 0x5c, 0x97, 0xf0, 0xc2, 0x07, 0xa0, 0xf5, + 0xeb, 0xa4, 0x13, 0xd6, 0xa4, 0x1e, 0x23, 0x85, 0x27, 0xf0, 0x7e, 0x95, 0x39, 0xcf, 0x9a, 0xb6, + 0x78, 0xf9, 0xd0, 0xb6, 0x7d, 0xc2, 0x46, 0xa9, 0xbc, 0x05, 0xc0, 0x19, 0x33, 0x9a, 0xad, 0xda, + 0x25, 0xb9, 0x42, 0xa5, 0xd3, 0x7a, 0x9a, 0x33, 0x76, 0x8a, 0x84, 0xc2, 0x16, 0x6c, 0x0e, 0x90, + 0x17, 0x6d, 0xf7, 0xc7, 0xf7, 0x60, 0xb5, 0xca, 0x9c, 0x87, 0xb6, 0x7d, 0xe2, 0xd5, 0x68, 0xcb, + 0xb3, 0xcf, 0x7c, 0xd3, 0xba, 0x24, 0xfe, 0x74, 0x3e, 0x5a, 0x87, 0x79, 0xde, 0x31, 0x2e, 0x4c, + 0x76, 0x21, 0x9c, 0xa4, 0x27, 0x79, 0xe7, 0x73, 0x93, 0x5d, 0xa8, 0x47, 0x90, 0x0e, 0xd2, 0xc5, + 0x08, 0xdc, 0x91, 0x4b, 0xec, 0x28, 0x7b, 0xd9, 0xf2, 0xdd, 0xe2, 0x80, 0xec, 0x6d, 0x5e, 0x3a, + 0x45, 0xcc, 0xab, 0x0a, 0x75, 0xbd, 0xb3, 0xab, 0x26, 0xd1, 0x53, 0x96, 0x7c, 0x52, 0x0f, 0x61, + 0x0e, 0x13, 0x29, 0x37, 0xb7, 0xa3, 0xec, 0x65, 0xca, 0xdf, 0x18, 0x86, 0x97, 0xd9, 0x76, 0x1a, + 0xfc, 0xe8, 0x02, 0x12, 0x38, 0xa9, 0x56, 0xa7, 0xd6, 0xa5, 0xd0, 0x2d, 0x29, 0x9c, 0x84, 0x14, + 0x54, 0x6f, 0x03, 0x52, 0xbc, 0x63, 0xb8, 0x9e, 0x4d, 0x3a, 0xb9, 0x79, 0x61, 0x12, 0xef, 0x9c, + 0x04, 0xcb, 0x42, 0x1e, 0x3e, 0x18, 0xe4, 0x9f, 0xc8, 0x81, 0x7f, 0x55, 0x60, 0xa5, 0xca, 0x9c, + 0x1f, 0x5f, 0xb8, 0x9c, 0xd4, 0x5d, 0xc6, 0x3f, 0xd3, 0x2b, 0xe5, 0x83, 0x11, 0xde, 0xbb, 0x03, + 0x8b, 0xc4, 0xb7, 0xca, 0x07, 0x86, 0x29, 0x22, 0x21, 0x23, 0xb6, 0x80, 0xc4, 0x30, 0xda, 0xdd, + 0x2e, 0x9e, 0xed, 0x75, 0xb1, 0x0a, 0x09, 0xcf, 0x6c, 0x08, 0x27, 0xa6, 0x75, 0x7c, 0x56, 0xd7, + 0x20, 0xc9, 0xae, 0x1a, 0x35, 0x5a, 0x47, 0xd7, 0xa4, 0x75, 0xb9, 0x52, 0x35, 0x48, 0xd9, 0xc4, + 0x72, 0x1b, 0x66, 0x9d, 0xa1, 0xcd, 0x8b, 0x7a, 0xb4, 0x56, 0x37, 0x21, 0xed, 0x98, 0x4c, 0x9c, + 0x34, 0x69, 0x73, 0xca, 0x31, 0xd9, 0xe3, 0x60, 0x5d, 0x30, 0x60, 0xa3, 0xcf, 0xa6, 0xd0, 0xe2, + 0xc0, 0x82, 0xe7, 0x3d, 0x16, 0x08, 0x0b, 0x17, 0x9e, 0x77, 0x5b, 0xb0, 0x05, 0x60, 0x59, 0x91, + 0x4f, 0x65, 0x56, 0x06, 0x14, 0xe1, 0xd5, 0x7f, 0x2b, 0x70, 0x4b, 0xb8, 0xf5, 0x69, 0x8b, 0xdf, + 0x3c, 0xef, 0x56, 0x61, 0xce, 0xa3, 0x9e, 0x45, 0xd0, 0x59, 0x09, 0x5d, 0x2c, 0xba, 0xb3, 0x31, + 0xd1, 0x93, 0x8d, 0x5f, 0x4f, 0x26, 0xfd, 0x00, 0xb6, 0x06, 0x9a, 0x1c, 0x39, 0x76, 0x0b, 0xc0, + 0x65, 0x86, 0x4f, 0x1a, 0xb4, 0x4d, 0x6c, 0xb4, 0x3e, 0xa5, 0xa7, 0x5d, 0xa6, 0x0b, 0x42, 0x81, + 0x40, 0xae, 0xca, 0x1c, 0xb1, 0xfa, 0xff, 0x79, 0xad, 0x50, 0x80, 0x9d, 0x61, 0xdb, 0x44, 0x49, + 0xff, 0x67, 0x05, 0x96, 0xaa, 0xcc, 0xf9, 0x92, 0x72, 0x72, 0x6c, 0xb2, 0x53, 0xdf, 0xb5, 0xc8, + 0xd4, 0x2a, 0x34, 0x03, 0x74, 0xa8, 0x02, 0x2e, 0xd4, 0xdb, 0xb0, 0xd0, 0xf4, 0x5d, 0xea, 0xbb, + 0xfc, 0xca, 0x38, 0x27, 0x04, 0xbd, 0x9c, 0xd0, 0x33, 0x21, 0xed, 0x11, 0x41, 0x16, 0x11, 0x06, + 0xaf, 0xd5, 0xa8, 0x11, 0x1f, 0x03, 0x9c, 0xd0, 0x33, 0x48, 0x7b, 0x82, 0xa4, 0x1f, 0x25, 0x52, + 0x73, 0xcb, 0xc9, 0xc2, 0x06, 0xac, 0xc7, 0x34, 0x8d, 0xac, 0xf8, 0x53, 0x32, 0xb2, 0x22, 0x34, + 0x74, 0x84, 0x15, 0x9b, 0x80, 0xf9, 0x2b, 0xe2, 0x2e, 0x12, 0x3a, 0x15, 0x10, 0x30, 0xec, 0x1f, + 0xc2, 0x1a, 0xad, 0x31, 0xe2, 0xb7, 0x89, 0x6d, 0x50, 0x29, 0xab, 0xfb, 0x1e, 0x5c, 0x0d, 0xdf, + 0x86, 0x1b, 0x21, 0xaa, 0x02, 0xf9, 0x7e, 0x94, 0xcc, 0x2e, 0xe2, 0x3a, 0x17, 0x5c, 0x9a, 0xb5, + 0x19, 0x47, 0x1f, 0x61, 0xbe, 0x21, 0x8b, 0xfa, 0x31, 0x68, 0xfd, 0x42, 0x82, 0xa3, 0xdd, 0x62, + 0xc4, 0xce, 0x01, 0x0a, 0x58, 0x8f, 0x0b, 0x38, 0x36, 0xd9, 0x33, 0x46, 0x6c, 0xf5, 0x97, 0x0a, + 0xdc, 0xed, 0x47, 0x93, 0xf3, 0x73, 0x62, 0x71, 0xb7, 0x4d, 0x50, 0x8e, 0x08, 0x50, 0x06, 0x8b, + 0x5e, 0x51, 0x16, 0xbd, 0xdd, 0x09, 0x8a, 0xde, 0x89, 0xc7, 0xf5, 0xdb, 0xf1, 0x8d, 0x3f, 0x0b, + 0x45, 0x47, 0x79, 0x73, 0x3a, 0x5e, 0x03, 0x71, 0x49, 0x2d, 0xa0, 0x29, 0x23, 0x25, 0xe2, 0xed, + 0xa5, 0x52, 0xc8, 0xb6, 0xcd, 0x7a, 0x8b, 0x18, 0x3e, 0xb1, 0x88, 0x1b, 0x9c, 0x25, 0xbc, 0x16, + 0x8f, 0x3e, 0xbf, 0x66, 0xc5, 0xfe, 0xcf, 0xeb, 0xed, 0x5b, 0x57, 0x66, 0xa3, 0x7e, 0x58, 0xe8, + 0x15, 0x57, 0xd0, 0x17, 0x91, 0xa0, 0xcb, 0xb5, 0xfa, 0x29, 0x24, 0x19, 0x37, 0x79, 0x4b, 0xdc, + 0xb2, 0xd9, 0xf2, 0xbd, 0xa1, 0xa5, 0x4d, 0x34, 0x57, 0x12, 0xf8, 0x05, 0x62, 0x74, 0x89, 0x55, + 0xef, 0x42, 0x36, 0xb2, 0x1f, 0x19, 0xe5, 0x05, 0xb2, 0x18, 0x52, 0x2b, 0x01, 0x51, 0xbd, 0x07, + 0x6a, 0xc4, 0x16, 0x14, 0x7e, 0x71, 0x84, 0x53, 0xe8, 0x9c, 0xe5, 0xf0, 0xcd, 0x19, 0x63, 0x4f, + 0xf0, 0x0e, 0xec, 0x29, 0xbc, 0xe9, 0xa9, 0x0a, 0x6f, 0xd7, 0x11, 0x0a, 0x7d, 0x1e, 0x1d, 0xa1, + 0x7f, 0xce, 0x41, 0x56, 0xbe, 0x93, 0xf5, 0x71, 0xc4, 0x09, 0x0a, 0xca, 0x14, 0xf1, 0x6c, 0xe2, + 0xcb, 0xe3, 0x23, 0x57, 0xea, 0x2e, 0x2c, 0x89, 0x27, 0x23, 0x56, 0xf4, 0x16, 0x05, 0xb9, 0x22, + 0x2f, 0x0b, 0x0d, 0x52, 0x32, 0x04, 0xbe, 0xbc, 0xd0, 0xa3, 0x75, 0xe0, 0xbc, 0xf0, 0x59, 0x3a, + 0x6f, 0x4e, 0x88, 0x08, 0xa9, 0xc2, 0x79, 0xef, 0x9a, 0xb8, 0xe4, 0x8d, 0x9a, 0xb8, 0xc0, 0xca, + 0x06, 0x61, 0xcc, 0x74, 0x84, 0xeb, 0xd3, 0x7a, 0xb8, 0x0c, 0x6e, 0x26, 0xd7, 0xeb, 0xba, 0x00, + 0xd2, 0xf8, 0x3a, 0x23, 0x69, 0x78, 0xee, 0x0f, 0x60, 0x35, 0x64, 0xe9, 0x39, 0xed, 0xe2, 0xb0, + 0xaa, 0xf2, 0x5d, 0xf7, 0x21, 0xef, 0xa9, 0xd6, 0x19, 0x64, 0x8b, 0xaa, 0x75, 0x6f, 0x8c, 0x17, + 0xa6, 0x6b, 0xae, 0x36, 0x21, 0xcd, 0x3b, 0x06, 0xf5, 0x5d, 0xc7, 0xf5, 0x72, 0x8b, 0xc2, 0xb9, + 0xbc, 0xf3, 0x14, 0xd7, 0xc1, 0x2d, 0x6d, 0x32, 0x46, 0x78, 0x2e, 0x8b, 0x2f, 0xc4, 0x42, 0xdd, + 0x86, 0x0c, 0x69, 0x13, 0x8f, 0xcb, 0x6a, 0xb7, 0x84, 0x5a, 0x01, 0x92, 0xb0, 0xe0, 0xa9, 0x3e, + 0x6c, 0x60, 0x1b, 0x6e, 0xd1, 0xba, 0x61, 0x51, 0x8f, 0xfb, 0xa6, 0xc5, 0x8d, 0x36, 0xf1, 0x99, + 0x4b, 0xbd, 0xdc, 0x32, 0xea, 0xf9, 0xa0, 0x38, 0x72, 0x84, 0x09, 0x4a, 0x2f, 0xe2, 0x2b, 0x12, + 0xfe, 0xa5, 0x40, 0xeb, 0xeb, 0xcd, 0xc1, 0x2f, 0xd4, 0x9f, 0x06, 0x79, 0xd0, 0x26, 0x3e, 0x37, + 0x68, 0x93, 0xbb, 0xd4, 0x63, 0xb9, 0x15, 0xac, 0xf1, 0xf7, 0xc6, 0x6c, 0xa4, 0x23, 0xe8, 0xa9, + 0xc0, 0x1c, 0x25, 0x82, 0xb4, 0x08, 0x72, 0xa7, 0x8b, 0x58, 0xc8, 0xc1, 0x5a, 0x6f, 0xaa, 0x47, + 0xa7, 0xe0, 0x31, 0xb6, 0x80, 0x0f, 0x6b, 0xd4, 0xe7, 0x5f, 0xf0, 0x96, 0x75, 0x59, 0xa9, 0x9c, + 0xfd, 0x64, 0x74, 0xc7, 0x3e, 0xaa, 0x37, 0xda, 0xc4, 0xe6, 0xab, 0x57, 0x5a, 0xb4, 0x55, 0x1b, + 0xdb, 0x75, 0x9d, 0x9c, 0xb7, 0x3c, 0x1b, 0x59, 0x88, 0x7d, 0xa3, 0xdd, 0xc4, 0xc1, 0x09, 0xa4, + 0x45, 0xed, 0x9c, 0xa8, 0x58, 0x8b, 0x82, 0x2a, 0xfb, 0x39, 0xd9, 0x06, 0xf7, 0xed, 0x1b, 0xe9, + 0xf5, 0x42, 0x41, 0xad, 0xc5, 0x9c, 0xa1, 0x9b, 0x9c, 0x3c, 0x16, 0x23, 0xdc, 0xa3, 0x60, 0x82, + 0x1b, 0xa1, 0x9d, 0x05, 0x6a, 0xff, 0xc4, 0x87, 0x5a, 0x66, 0xca, 0xa5, 0x71, 0x31, 0x8b, 0x6d, + 0x23, 0xc3, 0xb6, 0xec, 0xc7, 0xe8, 0x85, 0x3b, 0x70, 0x7b, 0xa8, 0x6e, 0x91, 0x05, 0xff, 0x52, + 0x70, 0x52, 0x92, 0x73, 0x19, 0xb6, 0xbc, 0x95, 0x16, 0xe3, 0xd4, 0xbe, 0xba, 0xc1, 0xd0, 0x58, + 0x84, 0xf7, 0x3d, 0xf2, 0x95, 0x61, 0x09, 0x41, 0x31, 0x17, 0xaf, 0x78, 0xe4, 0x2b, 0xb9, 0x45, + 0xd8, 0x36, 0xf7, 0x4d, 0x07, 0x89, 0x01, 0xd3, 0xc1, 0xbb, 0x4b, 0x6c, 0xee, 0x66, 0x93, 0xe8, + 0xa7, 0x70, 0x67, 0x84, 0xc5, 0xdd, 0x7d, 0x69, 0x57, 0x06, 0x29, 0xf1, 0x7c, 0x6d, 0x60, 0xc3, + 0x28, 0xbc, 0xdb, 0x2d, 0xe4, 0xd4, 0x6c, 0x31, 0x59, 0xe3, 0xa6, 0x6f, 0x0e, 0x03, 0x19, 0xe8, + 0xae, 0x94, 0x2e, 0x16, 0x85, 0x13, 0xd8, 0x1b, 0xb7, 0xdd, 0x84, 0x9a, 0x97, 0xff, 0x9b, 0x85, + 0xd9, 0x2a, 0x73, 0xd4, 0xdf, 0x28, 0xa0, 0x0e, 0x18, 0x45, 0x3e, 0x1c, 0x93, 0x7f, 0x03, 0xbb, + 0x79, 0xed, 0xfb, 0xd3, 0xa0, 0x22, 0x8d, 0x7f, 0xad, 0xc0, 0x4a, 0xff, 0x30, 0x7e, 0x7f, 0x22, + 0x99, 0xbd, 0x20, 0xed, 0xe3, 0x29, 0x40, 0x91, 0x1e, 0xbf, 0x53, 0xe0, 0xd6, 0xe0, 0x51, 0xe3, + 0xbb, 0xe3, 0xc5, 0x0e, 0x04, 0x6a, 0x9f, 0x4c, 0x09, 0x8c, 0x74, 0x6a, 0xc3, 0x42, 0xcf, 0xc4, + 0x51, 0x1c, 0x2f, 0xb0, 0x9b, 0x5f, 0x7b, 0x70, 0x3d, 0xfe, 0xf8, 0xbe, 0xd1, 0x8c, 0x30, 0xe1, + 0xbe, 0x21, 0xff, 0xa4, 0xfb, 0xc6, 0x9b, 0x2b, 0x95, 0x41, 0xa6, 0xbb, 0xb1, 0xda, 0x9f, 0x4c, + 0x8c, 0x64, 0xd7, 0xbe, 0x73, 0x2d, 0xf6, 0x68, 0xd3, 0x9f, 0x43, 0x36, 0xf6, 0x2d, 0xe3, 0x60, + 0xbc, 0xa0, 0x5e, 0x84, 0xf6, 0xd1, 0x75, 0x11, 0xd1, 0xee, 0xbf, 0x52, 0x60, 0xb9, 0xef, 0xdb, + 0x57, 0x79, 0xbc, 0xb8, 0x38, 0x46, 0x3b, 0xbc, 0x3e, 0x26, 0x52, 0xe2, 0x17, 0xb0, 0x14, 0xff, + 0x62, 0xf8, 0xed, 0xf1, 0xe2, 0x62, 0x10, 0xed, 0x7b, 0xd7, 0x86, 0x74, 0xc7, 0x20, 0xd6, 0x4c, + 0x4c, 0x10, 0x83, 0x5e, 0xc4, 0x24, 0x31, 0x18, 0xdc, 0x62, 0xe0, 0x15, 0xd4, 0xdf, 0x60, 0xdc, + 0x9f, 0xe4, 0xf4, 0xc6, 0x40, 0x93, 0x5c, 0x41, 0x43, 0x5b, 0x0a, 0xf5, 0x0f, 0x0a, 0xac, 0x0d, + 0xe9, 0x27, 0x3e, 0x9a, 0x34, 0xba, 0x71, 0xa4, 0xf6, 0xc3, 0x69, 0x91, 0x91, 0x5a, 0x2f, 0x14, + 0xc8, 0x0d, 0x6d, 0x12, 0x0e, 0x27, 0x0e, 0x7a, 0x1f, 0x56, 0x3b, 0x9a, 0x1e, 0x1b, 0x29, 0xf7, + 0x17, 0x05, 0xb6, 0x46, 0x57, 0xe2, 0x4f, 0x26, 0x75, 0xc0, 0x10, 0x01, 0xda, 0xf1, 0x0d, 0x05, + 0x84, 0xba, 0x1e, 0x1d, 0xbf, 0x7c, 0x93, 0x57, 0x5e, 0xbd, 0xc9, 0x2b, 0xff, 0x78, 0x93, 0x57, + 0x7e, 0xfb, 0x36, 0x3f, 0xf3, 0xea, 0x6d, 0x7e, 0xe6, 0x6f, 0x6f, 0xf3, 0x33, 0x3f, 0xdb, 0xef, + 0x6a, 0x64, 0x82, 0x2d, 0xf6, 0xc5, 0x27, 0x7e, 0x8f, 0xda, 0xa4, 0xd4, 0xe9, 0xf9, 0x4f, 0x48, + 0xd0, 0xd3, 0xd4, 0x92, 0x38, 0x0c, 0xdc, 0xff, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x52, + 0x23, 0x18, 0x37, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/crosschain/types/tx_body_verification.go b/x/crosschain/types/tx_body_verification.go index 84d71054f1..e0b62e83dc 100644 --- a/x/crosschain/types/tx_body_verification.go +++ b/x/crosschain/types/tx_body_verification.go @@ -9,9 +9,9 @@ import ( eth "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // VerifyInboundBody validates the tx body for an inbound diff --git a/x/crosschain/types/tx_body_verification_test.go b/x/crosschain/types/tx_body_verification_test.go index a34cb945b0..2cf93e2304 100644 --- a/x/crosschain/types/tx_body_verification_test.go +++ b/x/crosschain/types/tx_body_verification_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestVerifyInboundBody(t *testing.T) { diff --git a/x/crosschain/types/validate.go b/x/crosschain/types/validate.go index 1f1dd3814d..403dbe18ee 100644 --- a/x/crosschain/types/validate.go +++ b/x/crosschain/types/validate.go @@ -8,7 +8,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) // ValidateCCTXIndex validates the CCTX index diff --git a/x/crosschain/types/validate_test.go b/x/crosschain/types/validate_test.go index 0ab3e20885..d570df1d94 100644 --- a/x/crosschain/types/validate_test.go +++ b/x/crosschain/types/validate_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestValidateAddressForChain(t *testing.T) { diff --git a/x/emissions/abci.go b/x/emissions/abci.go index e063212471..25f6705e79 100644 --- a/x/emissions/abci.go +++ b/x/emissions/abci.go @@ -7,9 +7,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) func BeginBlocker(ctx sdk.Context, keeper keeper.Keeper) { diff --git a/x/emissions/abci_test.go b/x/emissions/abci_test.go index 849174642a..34a2ba41f1 100644 --- a/x/emissions/abci_test.go +++ b/x/emissions/abci_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - emissionsModule "github.com/zeta-chain/zetacore/x/emissions" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + emissionsModule "github.com/zeta-chain/node/x/emissions" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" ) func TestBeginBlocker(t *testing.T) { diff --git a/x/emissions/client/cli/query.go b/x/emissions/client/cli/query.go index 9ce7692962..066381d930 100644 --- a/x/emissions/client/cli/query.go +++ b/x/emissions/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/emissions/client/cli/query_get_emmisons_factors.go b/x/emissions/client/cli/query_get_emmisons_factors.go index ef19623975..c100c91cd1 100644 --- a/x/emissions/client/cli/query_get_emmisons_factors.go +++ b/x/emissions/client/cli/query_get_emmisons_factors.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func CmdGetEmmisonsFactors() *cobra.Command { diff --git a/x/emissions/client/cli/query_list_balances.go b/x/emissions/client/cli/query_list_balances.go index d16b0191dc..145ca10879 100644 --- a/x/emissions/client/cli/query_list_balances.go +++ b/x/emissions/client/cli/query_list_balances.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func CmdListPoolAddresses() *cobra.Command { diff --git a/x/emissions/client/cli/query_params.go b/x/emissions/client/cli/query_params.go index b65f31c127..a6b2d28ec9 100644 --- a/x/emissions/client/cli/query_params.go +++ b/x/emissions/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/emissions/client/cli/query_show_available_emissions.go b/x/emissions/client/cli/query_show_available_emissions.go index c7e17fe78e..2bc9a6751b 100644 --- a/x/emissions/client/cli/query_show_available_emissions.go +++ b/x/emissions/client/cli/query_show_available_emissions.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func CmdShowAvailableEmissions() *cobra.Command { diff --git a/x/emissions/client/cli/tx.go b/x/emissions/client/cli/tx.go index 46cf05a1f7..35cb506173 100644 --- a/x/emissions/client/cli/tx.go +++ b/x/emissions/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/emissions/client/cli/tx_withdraw_emissions..go b/x/emissions/client/cli/tx_withdraw_emissions..go index 67295b71d0..30cab88505 100644 --- a/x/emissions/client/cli/tx_withdraw_emissions..go +++ b/x/emissions/client/cli/tx_withdraw_emissions..go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func CmdWithdrawEmission() *cobra.Command { diff --git a/x/emissions/genesis.go b/x/emissions/genesis.go index b477c24ee8..0d4fa2b55b 100644 --- a/x/emissions/genesis.go +++ b/x/emissions/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) // InitGenesis initializes the emissions module's state from a provided genesis diff --git a/x/emissions/genesis_test.go b/x/emissions/genesis_test.go index 75f7c24038..42d945f5e6 100644 --- a/x/emissions/genesis_test.go +++ b/x/emissions/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/emissions" - "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/emissions" + "github.com/zeta-chain/node/x/emissions/types" ) func TestGenesis(t *testing.T) { diff --git a/x/emissions/keeper/block_rewards_components.go b/x/emissions/keeper/block_rewards_components.go index 207fb73c90..213f467b15 100644 --- a/x/emissions/keeper/block_rewards_components.go +++ b/x/emissions/keeper/block_rewards_components.go @@ -3,9 +3,9 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) GetBlockRewardComponents(ctx sdk.Context, params types.Params) (sdk.Dec, sdk.Dec, sdk.Dec) { diff --git a/x/emissions/keeper/block_rewards_components_test.go b/x/emissions/keeper/block_rewards_components_test.go index e256a8bb84..9027aee58c 100644 --- a/x/emissions/keeper/block_rewards_components_test.go +++ b/x/emissions/keeper/block_rewards_components_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - emissionskeeper "github.com/zeta-chain/zetacore/x/emissions/keeper" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + keepertest "github.com/zeta-chain/node/testutil/keeper" + emissionskeeper "github.com/zeta-chain/node/x/emissions/keeper" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_CalculateFixedValidatorRewards(t *testing.T) { diff --git a/x/emissions/keeper/grpc_query.go b/x/emissions/keeper/grpc_query.go index 60ce976846..e3e79700ce 100644 --- a/x/emissions/keeper/grpc_query.go +++ b/x/emissions/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/emissions/keeper/grpc_query_get_emmisons_factors.go b/x/emissions/keeper/grpc_query_get_emmisons_factors.go index 1959131a21..aedb21f654 100644 --- a/x/emissions/keeper/grpc_query_get_emmisons_factors.go +++ b/x/emissions/keeper/grpc_query_get_emmisons_factors.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) GetEmissionsFactors( diff --git a/x/emissions/keeper/grpc_query_get_emmisons_factors_test.go b/x/emissions/keeper/grpc_query_get_emmisons_factors_test.go index b0e832083e..57b92ccfa3 100644 --- a/x/emissions/keeper/grpc_query_get_emmisons_factors_test.go +++ b/x/emissions/keeper/grpc_query_get_emmisons_factors_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_GetEmissionsFactors(t *testing.T) { diff --git a/x/emissions/keeper/grpc_query_list_balances.go b/x/emissions/keeper/grpc_query_list_balances.go index f1d9c42aaf..9c359e473d 100644 --- a/x/emissions/keeper/grpc_query_list_balances.go +++ b/x/emissions/keeper/grpc_query_list_balances.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) ListPoolAddresses( diff --git a/x/emissions/keeper/grpc_query_list_balances_test.go b/x/emissions/keeper/grpc_query_list_balances_test.go index 5ec24f7c5e..d2f5ab9d67 100644 --- a/x/emissions/keeper/grpc_query_list_balances_test.go +++ b/x/emissions/keeper/grpc_query_list_balances_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_ListPoolAddresses(t *testing.T) { diff --git a/x/emissions/keeper/grpc_query_params.go b/x/emissions/keeper/grpc_query_params.go index 70c6de7f03..b2ad2c2777 100644 --- a/x/emissions/keeper/grpc_query_params.go +++ b/x/emissions/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/emissions/keeper/grpc_query_show_available_emissions.go b/x/emissions/keeper/grpc_query_show_available_emissions.go index 63b4c6a4eb..fe27555519 100644 --- a/x/emissions/keeper/grpc_query_show_available_emissions.go +++ b/x/emissions/keeper/grpc_query_show_available_emissions.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) ShowAvailableEmissions( diff --git a/x/emissions/keeper/grpc_query_show_available_emissions_test.go b/x/emissions/keeper/grpc_query_show_available_emissions_test.go index 9d78079108..5628b32f68 100644 --- a/x/emissions/keeper/grpc_query_show_available_emissions_test.go +++ b/x/emissions/keeper/grpc_query_show_available_emissions_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_ShowAvailableEmissions(t *testing.T) { diff --git a/x/emissions/keeper/keeper.go b/x/emissions/keeper/keeper.go index c066d47c78..39c1f19a22 100644 --- a/x/emissions/keeper/keeper.go +++ b/x/emissions/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) type ( diff --git a/x/emissions/keeper/migrator.go b/x/emissions/keeper/migrator.go index b31327f54d..c111e3e20c 100644 --- a/x/emissions/keeper/migrator.go +++ b/x/emissions/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/exported" - v3 "github.com/zeta-chain/zetacore/x/emissions/migrations/v3" + "github.com/zeta-chain/node/x/emissions/exported" + v3 "github.com/zeta-chain/node/x/emissions/migrations/v3" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/emissions/keeper/msg_server.go b/x/emissions/keeper/msg_server.go index 1a3e79d0d0..b52e5ebef5 100644 --- a/x/emissions/keeper/msg_server.go +++ b/x/emissions/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) type msgServer struct { diff --git a/x/emissions/keeper/msg_server_update_params.go b/x/emissions/keeper/msg_server_update_params.go index a91e1683be..49efe6671e 100644 --- a/x/emissions/keeper/msg_server_update_params.go +++ b/x/emissions/keeper/msg_server_update_params.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) // UpdateParams defines a governance operation for updating the x/emissions module parameters. diff --git a/x/emissions/keeper/msg_server_update_params_test.go b/x/emissions/keeper/msg_server_update_params_test.go index 4500ceac90..5e941f0609 100644 --- a/x/emissions/keeper/msg_server_update_params_test.go +++ b/x/emissions/keeper/msg_server_update_params_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) func TestMsgServer_UpdateParams(t *testing.T) { diff --git a/x/emissions/keeper/msg_server_withdraw_emissions.go b/x/emissions/keeper/msg_server_withdraw_emissions.go index cb7231fc33..74bb83bd8b 100644 --- a/x/emissions/keeper/msg_server_withdraw_emissions.go +++ b/x/emissions/keeper/msg_server_withdraw_emissions.go @@ -7,8 +7,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/x/emissions/types" ) // WithdrawEmission allows the user to withdraw from their withdrawable emissions. diff --git a/x/emissions/keeper/msg_server_withdraw_emissions_test.go b/x/emissions/keeper/msg_server_withdraw_emissions_test.go index 44834b8700..59479d81f3 100644 --- a/x/emissions/keeper/msg_server_withdraw_emissions_test.go +++ b/x/emissions/keeper/msg_server_withdraw_emissions_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) func TestMsgServer_WithdrawEmission(t *testing.T) { diff --git a/x/emissions/keeper/params.go b/x/emissions/keeper/params.go index 760f34cfba..9c24a10af1 100644 --- a/x/emissions/keeper/params.go +++ b/x/emissions/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) // GetParams get all parameters diff --git a/x/emissions/keeper/params_test.go b/x/emissions/keeper/params_test.go index 6e4bf4cb6e..84ad58a9b4 100644 --- a/x/emissions/keeper/params_test.go +++ b/x/emissions/keeper/params_test.go @@ -6,8 +6,8 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_GetParams(t *testing.T) { diff --git a/x/emissions/keeper/withdrawable_emissions.go b/x/emissions/keeper/withdrawable_emissions.go index e4edf60298..ab10febd3a 100644 --- a/x/emissions/keeper/withdrawable_emissions.go +++ b/x/emissions/keeper/withdrawable_emissions.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func (k Keeper) SetWithdrawableEmission(ctx sdk.Context, we types.WithdrawableEmissions) { diff --git a/x/emissions/keeper/withdrawable_emissions_test.go b/x/emissions/keeper/withdrawable_emissions_test.go index a9b7d3d5dd..7d13376eb1 100644 --- a/x/emissions/keeper/withdrawable_emissions_test.go +++ b/x/emissions/keeper/withdrawable_emissions_test.go @@ -6,9 +6,9 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" ) func Test_WithdrawableEmissions(t *testing.T) { diff --git a/x/emissions/migrations/v3/migrate.go b/x/emissions/migrations/v3/migrate.go index 17061abfed..5c38378f26 100644 --- a/x/emissions/migrations/v3/migrate.go +++ b/x/emissions/migrations/v3/migrate.go @@ -3,8 +3,8 @@ package v3 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/emissions/exported" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/exported" + "github.com/zeta-chain/node/x/emissions/types" ) type EmissionsKeeper interface { diff --git a/x/emissions/migrations/v3/migrate_test.go b/x/emissions/migrations/v3/migrate_test.go index 50c1ecd5d9..f47d8d7b02 100644 --- a/x/emissions/migrations/v3/migrate_test.go +++ b/x/emissions/migrations/v3/migrate_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/emissions/exported" - v3 "github.com/zeta-chain/zetacore/x/emissions/migrations/v3" - "github.com/zeta-chain/zetacore/x/emissions/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/emissions/exported" + v3 "github.com/zeta-chain/node/x/emissions/migrations/v3" + "github.com/zeta-chain/node/x/emissions/types" ) type mockSubspace struct { diff --git a/x/emissions/module.go b/x/emissions/module.go index 48a7a70749..ee739b615f 100644 --- a/x/emissions/module.go +++ b/x/emissions/module.go @@ -15,10 +15,10 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/emissions/client/cli" - "github.com/zeta-chain/zetacore/x/emissions/exported" - "github.com/zeta-chain/zetacore/x/emissions/keeper" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/client/cli" + "github.com/zeta-chain/node/x/emissions/exported" + "github.com/zeta-chain/node/x/emissions/keeper" + "github.com/zeta-chain/node/x/emissions/types" ) var ( diff --git a/x/emissions/types/distributions_test.go b/x/emissions/types/distributions_test.go index 5039d35082..1ab6649b8a 100644 --- a/x/emissions/types/distributions_test.go +++ b/x/emissions/types/distributions_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func TestKeeper_GetRewardsDistributions(t *testing.T) { diff --git a/x/emissions/types/events.pb.go b/x/emissions/types/events.pb.go index 20833b4f64..051691b4e9 100644 --- a/x/emissions/types/events.pb.go +++ b/x/emissions/types/events.pb.go @@ -258,38 +258,39 @@ func init() { } var fileDescriptor_75c76a0f1b5b68e9 = []byte{ - // 496 bytes of a gzipped FileDescriptorProto + // 499 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xb3, 0x69, 0x9b, 0x2a, 0x93, 0xd0, 0x46, 0xcb, 0x3f, 0x2b, 0x20, 0x27, 0xca, 0x01, - 0xd2, 0x8a, 0xda, 0x50, 0x8e, 0x88, 0x03, 0x91, 0x1a, 0x09, 0x84, 0x54, 0xc9, 0xc0, 0x85, 0x8b, - 0xb5, 0xb6, 0xb7, 0x8e, 0x55, 0xdb, 0x1b, 0xed, 0x6c, 0x02, 0xe5, 0x09, 0x38, 0xf2, 0x10, 0x1c, - 0x78, 0x94, 0x1e, 0x7b, 0x42, 0xc0, 0xa1, 0x42, 0xc9, 0x8b, 0x20, 0x6f, 0x6c, 0x37, 0x32, 0xa8, - 0x12, 0xa7, 0x6c, 0x3e, 0xfd, 0x3e, 0xcf, 0x7c, 0xbb, 0x33, 0xb0, 0xf7, 0x89, 0x2b, 0xe6, 0x4f, - 0x58, 0x94, 0xda, 0xfa, 0x24, 0x24, 0xb7, 0x79, 0x12, 0x21, 0x46, 0x22, 0x45, 0x9b, 0xcf, 0x79, - 0xaa, 0xd0, 0x9a, 0x4a, 0xa1, 0x04, 0xbd, 0x5f, 0xa2, 0x56, 0x81, 0x5a, 0x25, 0xda, 0xbd, 0x15, - 0x8a, 0x50, 0x68, 0xd0, 0xce, 0x4e, 0x2b, 0xcf, 0xe0, 0x3b, 0x81, 0xce, 0xb1, 0x87, 0x5c, 0xce, - 0xb9, 0x3c, 0xca, 0x59, 0x7a, 0x0c, 0x37, 0x0a, 0x9f, 0xab, 0xce, 0xa6, 0xdc, 0x20, 0x7d, 0x32, - 0xdc, 0x39, 0xdc, 0xb7, 0xae, 0x2b, 0x60, 0x15, 0xf6, 0xb7, 0x67, 0x53, 0xee, 0xb4, 0xf9, 0xda, - 0x3f, 0xba, 0x07, 0x1d, 0x91, 0x17, 0x71, 0x59, 0x10, 0x48, 0x8e, 0x68, 0xd4, 0xfb, 0x64, 0xd8, - 0x74, 0x76, 0x0b, 0xfd, 0xc5, 0x4a, 0xa6, 0x63, 0x68, 0xb0, 0x44, 0xcc, 0x52, 0x65, 0x6c, 0x64, - 0xc0, 0xc8, 0x3a, 0xbf, 0xec, 0xd5, 0x7e, 0x5d, 0xf6, 0x1e, 0x84, 0x91, 0x9a, 0xcc, 0x3c, 0xcb, - 0x17, 0x89, 0xed, 0x0b, 0x4c, 0x04, 0xe6, 0x3f, 0x07, 0x18, 0x9c, 0xda, 0x59, 0x97, 0x68, 0xbd, - 0x4c, 0x95, 0x93, 0xbb, 0x07, 0x9f, 0x09, 0xdc, 0x39, 0xca, 0x6e, 0xa7, 0x9a, 0x0e, 0x69, 0x1f, - 0xda, 0x09, 0x86, 0x3a, 0x99, 0x3b, 0x93, 0xb1, 0x4e, 0xd7, 0x74, 0x20, 0xc1, 0x30, 0x6b, 0xf6, - 0x9d, 0x8c, 0xe9, 0x6b, 0x68, 0x96, 0xb9, 0x8c, 0x7a, 0x7f, 0x63, 0xd8, 0x3a, 0xb4, 0xae, 0x0f, - 0x5f, 0xad, 0xe2, 0x5c, 0x7d, 0x60, 0xf0, 0xb3, 0x0e, 0x37, 0x75, 0x2b, 0xa3, 0x58, 0xf8, 0xa7, - 0xff, 0xd3, 0x47, 0x0f, 0x5a, 0x9e, 0x48, 0x03, 0xf7, 0x84, 0xf9, 0x4a, 0xc8, 0xfc, 0xca, 0x20, - 0x93, 0xc6, 0x5a, 0xa1, 0x0f, 0x61, 0x57, 0x72, 0x5d, 0x19, 0x0b, 0x48, 0x5f, 0x9b, 0xb3, 0x53, - 0xc8, 0x57, 0x60, 0x30, 0x93, 0x4c, 0x65, 0x4f, 0x9a, 0x83, 0x9b, 0x2b, 0xb0, 0x90, 0x73, 0xf0, - 0x39, 0xdc, 0x9b, 0xb3, 0x38, 0x0a, 0x98, 0x12, 0xd2, 0x95, 0xfc, 0x03, 0x93, 0x01, 0xba, 0x27, - 0x42, 0xba, 0x5e, 0xd6, 0xbc, 0xb1, 0xa5, 0x4d, 0x46, 0x89, 0x38, 0x2b, 0x62, 0x2c, 0xa4, 0x0e, - 0x47, 0x9f, 0x41, 0xb7, 0x7c, 0xe9, 0xbf, 0xdd, 0x0d, 0xed, 0xbe, 0x5b, 0x10, 0x55, 0xf3, 0x13, - 0xb8, 0xad, 0x10, 0xff, 0xe1, 0xdb, 0xd6, 0x3e, 0xaa, 0x10, 0x2b, 0x96, 0xfd, 0x47, 0xd0, 0x5e, - 0x9f, 0x3b, 0xda, 0x84, 0xad, 0x37, 0x31, 0xc3, 0x49, 0xa7, 0x46, 0x5b, 0xb0, 0x9d, 0xd3, 0x1d, - 0xd2, 0xdd, 0xfc, 0xf6, 0xd5, 0x24, 0xa3, 0x57, 0xe7, 0x0b, 0x93, 0x5c, 0x2c, 0x4c, 0xf2, 0x7b, - 0x61, 0x92, 0x2f, 0x4b, 0xb3, 0x76, 0xb1, 0x34, 0x6b, 0x3f, 0x96, 0x66, 0xed, 0xfd, 0xe3, 0xb5, - 0xf1, 0xca, 0x9e, 0xf7, 0xa0, 0xb2, 0x72, 0x1f, 0xd7, 0x96, 0x4e, 0x0f, 0x9b, 0xd7, 0xd0, 0x0b, - 0xf4, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x4b, 0xf9, 0xa8, 0xa1, 0x03, 0x00, 0x00, + 0xd2, 0xaa, 0xb5, 0x45, 0x39, 0x22, 0x0e, 0x44, 0x6a, 0x24, 0x24, 0xa4, 0x4a, 0x06, 0x2e, 0x5c, + 0xac, 0xb5, 0xbd, 0x75, 0xac, 0xda, 0xde, 0x68, 0x67, 0x13, 0x28, 0x4f, 0xc0, 0x91, 0x87, 0xe0, + 0xc0, 0xa3, 0xf4, 0xd8, 0x13, 0x02, 0x0e, 0x15, 0x4a, 0x5e, 0x04, 0x79, 0xfd, 0xa7, 0x51, 0x40, + 0x95, 0x7a, 0xca, 0xe6, 0xd3, 0xef, 0xf3, 0xcc, 0xb7, 0x3b, 0x03, 0x7b, 0x9f, 0xb9, 0x62, 0xfe, + 0x84, 0x45, 0xa9, 0xad, 0x4f, 0x42, 0x72, 0x9b, 0x27, 0x11, 0x62, 0x24, 0x52, 0xb4, 0xf9, 0x9c, + 0xa7, 0x0a, 0xad, 0xa9, 0x14, 0x4a, 0xd0, 0xc7, 0x15, 0x6a, 0x95, 0xa8, 0x55, 0xa1, 0xdd, 0x7b, + 0xa1, 0x08, 0x85, 0x06, 0xed, 0xec, 0x94, 0x7b, 0x06, 0x3f, 0x08, 0x74, 0x4e, 0x3c, 0xe4, 0x72, + 0xce, 0xe5, 0x71, 0xc1, 0xd2, 0x13, 0xb8, 0x53, 0xfa, 0x5c, 0x75, 0x3e, 0xe5, 0x06, 0xe9, 0x93, + 0xe1, 0xce, 0xd1, 0xbe, 0x75, 0x53, 0x01, 0xab, 0xb4, 0xbf, 0x3b, 0x9f, 0x72, 0xa7, 0xcd, 0x57, + 0xfe, 0xd1, 0x3d, 0xe8, 0x88, 0xa2, 0x88, 0xcb, 0x82, 0x40, 0x72, 0x44, 0xa3, 0xde, 0x27, 0xc3, + 0xa6, 0xb3, 0x5b, 0xea, 0xaf, 0x72, 0x99, 0x8e, 0xa1, 0xc1, 0x12, 0x31, 0x4b, 0x95, 0xb1, 0x91, + 0x01, 0x23, 0xeb, 0xe2, 0xaa, 0x57, 0xfb, 0x7d, 0xd5, 0x7b, 0x12, 0x46, 0x6a, 0x32, 0xf3, 0x2c, + 0x5f, 0x24, 0xb6, 0x2f, 0x30, 0x11, 0x58, 0xfc, 0x1c, 0x62, 0x70, 0x66, 0x67, 0x5d, 0xa2, 0xf5, + 0x3a, 0x55, 0x4e, 0xe1, 0x1e, 0x7c, 0x21, 0xf0, 0xe0, 0x38, 0xbb, 0x9d, 0xf5, 0x74, 0x48, 0xfb, + 0xd0, 0x4e, 0x30, 0xd4, 0xc9, 0xdc, 0x99, 0x8c, 0x75, 0xba, 0xa6, 0x03, 0x09, 0x86, 0x59, 0xb3, + 0xef, 0x65, 0x4c, 0xdf, 0x40, 0xb3, 0xca, 0x65, 0xd4, 0xfb, 0x1b, 0xc3, 0xd6, 0x91, 0x75, 0x73, + 0xf8, 0xf5, 0x2a, 0xce, 0xf5, 0x07, 0x06, 0xbf, 0xea, 0x70, 0x57, 0xb7, 0x32, 0x8a, 0x85, 0x7f, + 0x76, 0x9b, 0x3e, 0x7a, 0xd0, 0xf2, 0x44, 0x1a, 0xb8, 0xa7, 0xcc, 0x57, 0x42, 0x16, 0x57, 0x06, + 0x99, 0x34, 0xd6, 0x0a, 0x7d, 0x0a, 0xbb, 0x92, 0xeb, 0xca, 0x58, 0x42, 0xfa, 0xda, 0x9c, 0x9d, + 0x52, 0xbe, 0x06, 0x83, 0x99, 0x64, 0x2a, 0x7b, 0xd2, 0x02, 0xdc, 0xcc, 0xc1, 0x52, 0x2e, 0xc0, + 0x97, 0xf0, 0x68, 0xce, 0xe2, 0x28, 0x60, 0x4a, 0x48, 0x57, 0xf2, 0x8f, 0x4c, 0x06, 0xe8, 0x9e, + 0x0a, 0xe9, 0x7a, 0x59, 0xf3, 0xc6, 0x96, 0x36, 0x19, 0x15, 0xe2, 0xe4, 0xc4, 0x58, 0x48, 0x1d, + 0x8e, 0xbe, 0x80, 0x6e, 0xf5, 0xd2, 0xff, 0xba, 0x1b, 0xda, 0xfd, 0xb0, 0x24, 0xd6, 0xcd, 0xcf, + 0xe0, 0xbe, 0x42, 0xfc, 0x8f, 0x6f, 0x5b, 0xfb, 0xa8, 0x42, 0x5c, 0xb3, 0xec, 0x1f, 0x40, 0x7b, + 0x75, 0xee, 0x68, 0x13, 0xb6, 0xde, 0xc6, 0x0c, 0x27, 0x9d, 0x1a, 0x6d, 0xc1, 0x76, 0x41, 0x77, + 0x48, 0x77, 0xf3, 0xfb, 0x37, 0x93, 0x8c, 0xc6, 0x17, 0x0b, 0x93, 0x5c, 0x2e, 0x4c, 0xf2, 0x67, + 0x61, 0x92, 0xaf, 0x4b, 0xb3, 0x76, 0xb9, 0x34, 0x6b, 0x3f, 0x97, 0x66, 0xed, 0xc3, 0xc1, 0xca, + 0x78, 0x65, 0xcf, 0x7b, 0x98, 0xaf, 0x5c, 0x2a, 0x02, 0x6e, 0x7f, 0x5a, 0x59, 0x38, 0x3d, 0x68, + 0x5e, 0x43, 0x2f, 0xcf, 0xf3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x95, 0x91, 0x56, 0x9d, + 0x03, 0x00, 0x00, } func (m *ObserverEmission) Marshal() (dAtA []byte, err error) { diff --git a/x/emissions/types/expected_keepers.go b/x/emissions/types/expected_keepers.go index 7639bec2fc..bf67b183be 100644 --- a/x/emissions/types/expected_keepers.go +++ b/x/emissions/types/expected_keepers.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/emissions/types/genesis.pb.go b/x/emissions/types/genesis.pb.go index 01bcdc6621..88b37a5cc2 100644 --- a/x/emissions/types/genesis.pb.go +++ b/x/emissions/types/genesis.pb.go @@ -85,7 +85,7 @@ func init() { } var fileDescriptor_0951e5011ea80b97 = []byte{ - // 250 bytes of a gzipped FileDescriptorProto + // 255 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xaa, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x53, 0x73, 0x33, 0x8b, 0x8b, 0x33, 0xf3, 0xf3, 0x8a, 0xf5, 0xd3, 0x53, 0xf3, 0x52, 0x8b, 0x33, 0x8b, 0xf5, 0x0a, 0x8a, @@ -97,11 +97,11 @@ var fileDescriptor_0951e5011ea80b97 = []byte{ 0x51, 0x83, 0xdb, 0x48, 0x45, 0x0f, 0x9f, 0xdb, 0xf5, 0x02, 0xc0, 0x6a, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x14, 0xca, 0xe7, 0x12, 0x45, 0x76, 0x8a, 0x2b, 0x4c, 0xb5, 0x04, 0x93, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x31, 0x7e, 0x23, 0xc3, 0xb1, 0x69, 0x85, 0xda, 0x80, 0xdd, - 0x5c, 0x27, 0xaf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, - 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x48, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0x87, 0x98, 0x2e, 0x5a, 0xe0, 0x55, 0x20, - 0x05, 0x5f, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x60, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x2b, 0xcc, 0x87, 0x1c, 0xe0, 0x01, 0x00, 0x00, + 0x5c, 0x27, 0xb7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, + 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x49, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0x87, 0x98, 0x2e, 0x24, 0xf0, 0xf2, 0xf2, + 0x53, 0x52, 0xf5, 0x2b, 0x90, 0x82, 0xae, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x28, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0x8f, 0xc0, 0x73, 0xdc, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/emissions/types/genesis_test.go b/x/emissions/types/genesis_test.go index 42cfd14a06..29d62baea9 100644 --- a/x/emissions/types/genesis_test.go +++ b/x/emissions/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/x/emissions/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/emissions/types/message_update_params_test.go b/x/emissions/types/message_update_params_test.go index 65a594b61a..44b37e8fa2 100644 --- a/x/emissions/types/message_update_params_test.go +++ b/x/emissions/types/message_update_params_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/emissions/types" ) func TestMsgUpdateParams_ValidateBasic(t *testing.T) { diff --git a/x/emissions/types/message_withdraw_emissons_test.go b/x/emissions/types/message_withdraw_emissons_test.go index f5e529e694..339491bc92 100644 --- a/x/emissions/types/message_withdraw_emissons_test.go +++ b/x/emissions/types/message_withdraw_emissons_test.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types" + "github.com/zeta-chain/node/testutil/sample" + emissionstypes "github.com/zeta-chain/node/x/emissions/types" ) func TestMsgWithdrawEmission_ValidateBasic(t *testing.T) { diff --git a/x/emissions/types/params.pb.go b/x/emissions/types/params.pb.go index f447130f2d..5d73389603 100644 --- a/x/emissions/types/params.pb.go +++ b/x/emissions/types/params.pb.go @@ -142,36 +142,37 @@ func init() { } var fileDescriptor_259272924aec0acf = []byte{ - // 464 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6a, 0x14, 0x4d, - 0x10, 0xc0, 0x77, 0xbe, 0xec, 0xb7, 0x9a, 0x46, 0x0d, 0x8e, 0x31, 0x0c, 0x31, 0xce, 0x06, 0x91, - 0x10, 0x85, 0xcc, 0x08, 0x7a, 0x10, 0x4f, 0x3a, 0x41, 0x41, 0x41, 0x08, 0x1b, 0x4f, 0x5e, 0x9a, - 0x9e, 0x99, 0x76, 0xb6, 0xc9, 0x74, 0xd7, 0xd2, 0x55, 0xbb, 0x6c, 0x7c, 0x0a, 0x8f, 0x1e, 0x7d, - 0x9c, 0xdc, 0xcc, 0x51, 0x3c, 0x04, 0xd9, 0x7d, 0x11, 0x99, 0x9e, 0x3f, 0xac, 0xb2, 0x9e, 0xba, - 0xa9, 0xfa, 0xd5, 0x8f, 0xaa, 0xee, 0x62, 0x8f, 0x3e, 0x4b, 0x12, 0xd9, 0x58, 0x28, 0x13, 0xbb, - 0x1b, 0x58, 0x19, 0x4b, 0xad, 0x10, 0x15, 0x18, 0x8c, 0x27, 0xc2, 0x0a, 0x8d, 0xd1, 0xc4, 0x02, - 0x81, 0xbf, 0xd7, 0xa1, 0x51, 0x8b, 0x46, 0x1d, 0xba, 0xbb, 0x5d, 0x40, 0x01, 0x0e, 0x8c, 0xab, - 0x5b, 0x5d, 0xf3, 0xe0, 0x7b, 0x9f, 0x0d, 0x4e, 0x9c, 0xc4, 0x3f, 0x60, 0x5b, 0x5a, 0xcc, 0x79, - 0x0a, 0x26, 0xe7, 0x9f, 0x44, 0x46, 0x60, 0x03, 0x6f, 0xdf, 0x3b, 0xdc, 0x1c, 0xdd, 0xd4, 0x62, - 0x9e, 0x80, 0xc9, 0xdf, 0xb8, 0xa0, 0xe3, 0x94, 0xf9, 0x83, 0xfb, 0xaf, 0xe1, 0x94, 0x59, 0xe1, - 0x1e, 0xb2, 0x5b, 0x62, 0x56, 0xf0, 0xb4, 0x84, 0xec, 0x8c, 0x93, 0xd2, 0x32, 0xd8, 0x70, 0xd8, - 0x0d, 0x31, 0x2b, 0x92, 0x2a, 0xf8, 0x41, 0x69, 0xe9, 0x3f, 0x66, 0xb7, 0x49, 0xd8, 0x42, 0x52, - 0x2d, 0xb4, 0x82, 0x14, 0x04, 0x7d, 0x07, 0x6e, 0xd5, 0x89, 0x4a, 0x39, 0xaa, 0xc2, 0x7e, 0xc2, - 0xee, 0xcf, 0x44, 0xa9, 0x72, 0x41, 0x60, 0x79, 0x3b, 0x19, 0x9f, 0x48, 0x9b, 0x49, 0x43, 0xa2, - 0x90, 0xc1, 0xff, 0xae, 0xee, 0x5e, 0x07, 0xbd, 0x6e, 0x98, 0x93, 0x0e, 0xf1, 0x5f, 0xb2, 0x3d, - 0x48, 0x51, 0xda, 0x99, 0x5c, 0xaf, 0x18, 0x38, 0xc5, 0x6e, 0xcb, 0xac, 0x31, 0x1c, 0xb3, 0x90, - 0x10, 0x39, 0xaa, 0xc2, 0xfc, 0xc3, 0x71, 0xad, 0x6e, 0x83, 0x10, 0x4f, 0x1d, 0xb4, 0x46, 0xf2, - 0x9c, 0x05, 0xf9, 0xd4, 0x0d, 0x6b, 0x9a, 0x47, 0xe4, 0x19, 0x18, 0x24, 0x61, 0x28, 0xb8, 0xee, - 0xca, 0x77, 0xda, 0x7c, 0xfd, 0x9c, 0xc7, 0x4d, 0xd6, 0x4f, 0xd9, 0xdd, 0x6e, 0x00, 0x2c, 0x05, - 0x8e, 0xb9, 0xd0, 0x30, 0x35, 0x14, 0x6c, 0x56, 0x65, 0x49, 0x74, 0x71, 0x35, 0xec, 0xfd, 0xbc, - 0x1a, 0x1e, 0x14, 0x8a, 0xc6, 0xd3, 0x34, 0xca, 0x40, 0xc7, 0x19, 0xa0, 0x06, 0x6c, 0x8e, 0x23, - 0xcc, 0xcf, 0x62, 0x3a, 0x9f, 0x48, 0x8c, 0xde, 0x1a, 0x1a, 0xdd, 0x69, 0x65, 0xa7, 0x95, 0xeb, - 0x95, 0x53, 0xf9, 0xcf, 0xd8, 0x4e, 0x2a, 0xca, 0x12, 0x88, 0x6b, 0x41, 0x53, 0xab, 0xe8, 0xbc, - 0xfe, 0x46, 0x0c, 0xd8, 0xbe, 0x77, 0xb8, 0x31, 0xda, 0xae, 0xb3, 0xef, 0x9b, 0xa4, 0xfb, 0x4d, - 0x7c, 0xd1, 0xff, 0xfa, 0x6d, 0xd8, 0x4b, 0xde, 0x5d, 0x2c, 0x42, 0xef, 0x72, 0x11, 0x7a, 0xbf, - 0x16, 0xa1, 0xf7, 0x65, 0x19, 0xf6, 0x2e, 0x97, 0x61, 0xef, 0xc7, 0x32, 0xec, 0x7d, 0x7c, 0xb2, - 0xd2, 0x52, 0xb5, 0xa0, 0x47, 0x7f, 0xad, 0xf5, 0x7c, 0x65, 0xb1, 0x5d, 0x83, 0xe9, 0xc0, 0x2d, - 0xe9, 0xd3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x6f, 0x44, 0x4d, 0x05, 0x03, 0x00, 0x00, + // 465 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcd, 0x6a, 0x14, 0x41, + 0x10, 0x80, 0x77, 0xcc, 0xba, 0x9a, 0x46, 0x0d, 0x8e, 0x31, 0x0c, 0x31, 0xce, 0x06, 0x91, 0x10, + 0xc5, 0xcc, 0x1c, 0xf4, 0x20, 0x9e, 0x74, 0x82, 0x01, 0x0f, 0x42, 0xd8, 0x78, 0xf2, 0xd2, 0xf4, + 0xcc, 0xb4, 0xb3, 0x4d, 0xa6, 0xbb, 0x96, 0xae, 0xda, 0x65, 0xe3, 0x53, 0x78, 0xf4, 0xe8, 0xe3, + 0xe4, 0x66, 0x8e, 0xe2, 0x21, 0xc8, 0xee, 0x8b, 0xc8, 0xf4, 0xfc, 0xb0, 0xc2, 0x7a, 0xea, 0xa6, + 0xea, 0xab, 0x8f, 0xaa, 0xee, 0x62, 0xcf, 0xbe, 0x4a, 0x12, 0xd9, 0x58, 0x28, 0x13, 0xbb, 0x1b, + 0x58, 0x19, 0x4b, 0xad, 0x10, 0x15, 0x18, 0x8c, 0x27, 0xc2, 0x0a, 0x8d, 0xd1, 0xc4, 0x02, 0x81, + 0xbf, 0xd7, 0xa1, 0x51, 0x8b, 0x46, 0x1d, 0xba, 0xbb, 0x5d, 0x40, 0x01, 0x0e, 0x8c, 0xab, 0x5b, + 0x5d, 0xf3, 0xe4, 0x67, 0x9f, 0x0d, 0x4e, 0x9d, 0xc4, 0x3f, 0x60, 0x5b, 0x5a, 0xcc, 0x79, 0x0a, + 0x26, 0xe7, 0x5f, 0x44, 0x46, 0x60, 0x03, 0x6f, 0xdf, 0x3b, 0xdc, 0x1c, 0xdd, 0xd5, 0x62, 0x9e, + 0x80, 0xc9, 0x4f, 0x5c, 0xd0, 0x71, 0xca, 0xfc, 0xc3, 0xdd, 0x68, 0x38, 0x65, 0x56, 0xb8, 0xa7, + 0xec, 0x9e, 0x98, 0x15, 0x3c, 0x2d, 0x21, 0x3b, 0xe7, 0xa4, 0xb4, 0x0c, 0x36, 0x1c, 0x76, 0x47, + 0xcc, 0x8a, 0xa4, 0x0a, 0x7e, 0x52, 0x5a, 0xfa, 0xcf, 0xd9, 0x7d, 0x12, 0xb6, 0x90, 0x54, 0x0b, + 0xad, 0x20, 0x05, 0x41, 0xdf, 0x81, 0x5b, 0x75, 0xa2, 0x52, 0x8e, 0xaa, 0xb0, 0x9f, 0xb0, 0xc7, + 0x33, 0x51, 0xaa, 0x5c, 0x10, 0x58, 0xde, 0x4e, 0xc6, 0x27, 0xd2, 0x66, 0xd2, 0x90, 0x28, 0x64, + 0x70, 0xd3, 0xd5, 0x3d, 0xea, 0xa0, 0xf7, 0x0d, 0x73, 0xda, 0x21, 0xfe, 0x5b, 0xb6, 0x07, 0x29, + 0x4a, 0x3b, 0x93, 0xeb, 0x15, 0x03, 0xa7, 0xd8, 0x6d, 0x99, 0x35, 0x86, 0x63, 0x16, 0x12, 0x22, + 0x47, 0x55, 0x98, 0xff, 0x38, 0x6e, 0xd5, 0x6d, 0x10, 0xe2, 0x99, 0x83, 0xd6, 0x48, 0x5e, 0xb3, + 0x20, 0x9f, 0xba, 0x61, 0x4d, 0xf3, 0x88, 0x3c, 0x03, 0x83, 0x24, 0x0c, 0x05, 0xb7, 0x5d, 0xf9, + 0x4e, 0x9b, 0xaf, 0x9f, 0xf3, 0xb8, 0xc9, 0xfa, 0x29, 0x7b, 0xd8, 0x0d, 0x80, 0xa5, 0xc0, 0x31, + 0x17, 0x1a, 0xa6, 0x86, 0x82, 0xcd, 0xaa, 0x2c, 0x89, 0x2e, 0xaf, 0x87, 0xbd, 0xdf, 0xd7, 0xc3, + 0x83, 0x42, 0xd1, 0x78, 0x9a, 0x46, 0x19, 0xe8, 0x38, 0x03, 0xd4, 0x80, 0xcd, 0x71, 0x84, 0xf9, + 0x79, 0x4c, 0x17, 0x13, 0x89, 0xd1, 0x07, 0x43, 0xa3, 0x07, 0xad, 0xec, 0xac, 0x72, 0xbd, 0x73, + 0x2a, 0xff, 0x15, 0xdb, 0x49, 0x45, 0x59, 0x02, 0x71, 0x2d, 0x68, 0x6a, 0x15, 0x5d, 0xd4, 0xdf, + 0x88, 0x01, 0xdb, 0xf7, 0x0e, 0x37, 0x46, 0xdb, 0x75, 0xf6, 0x63, 0x93, 0x74, 0xbf, 0x89, 0x6f, + 0xfa, 0xdf, 0x7f, 0x0c, 0x7b, 0xc9, 0xc9, 0xe5, 0x22, 0xf4, 0xae, 0x16, 0xa1, 0xf7, 0x67, 0x11, + 0x7a, 0xdf, 0x96, 0x61, 0xef, 0x6a, 0x19, 0xf6, 0x7e, 0x2d, 0xc3, 0xde, 0xe7, 0x17, 0x2b, 0x2d, + 0x55, 0x0b, 0x7a, 0x54, 0xaf, 0xb5, 0x81, 0x5c, 0xc6, 0xf3, 0x95, 0xa5, 0x76, 0xcd, 0xa5, 0x03, + 0xb7, 0xa0, 0x2f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xee, 0x18, 0x01, 0xa3, 0x01, 0x03, 0x00, + 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/emissions/types/query.pb.go b/x/emissions/types/query.pb.go index 5dd799494a..4da7a2ed0d 100644 --- a/x/emissions/types/query.pb.go +++ b/x/emissions/types/query.pb.go @@ -409,49 +409,49 @@ func init() { } var fileDescriptor_cb9c0dfe78e2fb82 = []byte{ - // 661 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xd3, 0x4c, - 0x14, 0x8d, 0xfb, 0x7d, 0x04, 0x31, 0x48, 0x48, 0x4c, 0x4b, 0xa9, 0xac, 0xe2, 0x14, 0x13, 0x95, - 0xf2, 0xa8, 0xdd, 0x87, 0x84, 0x10, 0xd0, 0xaa, 0x8d, 0x04, 0x48, 0x3c, 0x44, 0x29, 0xb0, 0x80, - 0x8d, 0x35, 0x8e, 0x07, 0x67, 0x24, 0xdb, 0xe3, 0xfa, 0x8e, 0x5b, 0x0a, 0x62, 0xc3, 0x92, 0x15, - 0xa2, 0x7f, 0x87, 0x1f, 0x50, 0x76, 0x95, 0xd8, 0xb0, 0x02, 0xd4, 0xf0, 0x33, 0x58, 0xa0, 0x8c, - 0xc7, 0x26, 0x6f, 0x85, 0xb2, 0x9b, 0xc7, 0x39, 0xe7, 0x9e, 0x73, 0x7d, 0x47, 0x46, 0x73, 0xaf, - 0xa9, 0x20, 0xf5, 0x06, 0x61, 0x91, 0x2d, 0x57, 0x3c, 0xa1, 0x36, 0x0d, 0x19, 0x00, 0xe3, 0x11, - 0xd8, 0x5b, 0x29, 0x4d, 0x76, 0xad, 0x38, 0xe1, 0x82, 0xe3, 0xe9, 0x02, 0x69, 0xe5, 0x48, 0xab, - 0x40, 0xea, 0x97, 0xeb, 0x1c, 0x42, 0x0e, 0xb6, 0x4b, 0x80, 0x66, 0x34, 0x7b, 0x7b, 0xd1, 0xa5, - 0x82, 0x2c, 0xda, 0x31, 0xf1, 0x59, 0x44, 0x04, 0xe3, 0x51, 0xa6, 0xa4, 0x5f, 0x1a, 0x5a, 0x33, - 0x26, 0x09, 0x09, 0x41, 0x41, 0x27, 0x7c, 0xee, 0x73, 0xb9, 0xb4, 0x5b, 0x2b, 0x75, 0x3a, 0xed, - 0x73, 0xee, 0x07, 0xd4, 0x26, 0x31, 0xb3, 0x49, 0x14, 0x71, 0x21, 0xd5, 0x15, 0xc7, 0x9c, 0x40, - 0xf8, 0x71, 0xcb, 0xc0, 0x86, 0x14, 0xda, 0xa4, 0x5b, 0x29, 0x05, 0x61, 0x3e, 0x47, 0xe3, 0x1d, - 0xa7, 0x10, 0xf3, 0x08, 0x28, 0xae, 0xa1, 0x72, 0x56, 0x70, 0x4a, 0x9b, 0xd1, 0xe6, 0x4e, 0x2e, - 0x55, 0xad, 0x61, 0x31, 0xad, 0x8c, 0x5d, 0xfb, 0x7f, 0xff, 0x5b, 0xa5, 0xb4, 0xa9, 0x98, 0x66, - 0x05, 0x9d, 0x93, 0xd2, 0x0f, 0x18, 0x88, 0x0d, 0xce, 0x83, 0x75, 0xcf, 0x4b, 0x28, 0x00, 0x2d, - 0x6a, 0xff, 0xd2, 0x90, 0x31, 0x08, 0xa1, 0x7c, 0x3c, 0x43, 0x17, 0xd3, 0xc8, 0x63, 0x20, 0x12, - 0xe6, 0xa6, 0x82, 0x7a, 0x0e, 0x77, 0x81, 0x26, 0xdb, 0x34, 0x71, 0x5c, 0x12, 0x90, 0xa8, 0x4e, - 0xc1, 0x21, 0x19, 0x49, 0x1a, 0x3d, 0xb1, 0x59, 0xed, 0x80, 0x3f, 0x52, 0xe8, 0x9a, 0x02, 0xab, - 0x02, 0xf8, 0x3e, 0x32, 0x3b, 0x65, 0x05, 0x40, 0xaf, 0xe2, 0x98, 0x54, 0xac, 0x74, 0x20, 0x9f, - 0x02, 0x74, 0x8b, 0x5d, 0x43, 0x67, 0xf3, 0x4e, 0x38, 0x21, 0xf7, 0xd2, 0x80, 0x16, 0x0a, 0xff, - 0x49, 0x85, 0x33, 0xf9, 0xf5, 0x43, 0x79, 0xab, 0x78, 0xe6, 0x79, 0x54, 0x91, 0xe9, 0xef, 0x52, - 0x71, 0x3b, 0xef, 0xe4, 0x1d, 0x52, 0x17, 0x3c, 0x29, 0x3a, 0xf4, 0x51, 0x43, 0x33, 0x83, 0x31, - 0xaa, 0x47, 0xb3, 0xe8, 0x54, 0x42, 0x65, 0x4e, 0x75, 0xa5, 0x5a, 0xd1, 0x75, 0x8a, 0x0d, 0x84, - 0x5c, 0x1e, 0x79, 0x0a, 0x93, 0x85, 0x6b, 0x3b, 0x69, 0xe9, 0x78, 0x69, 0x22, 0x67, 0x46, 0x61, - 0x32, 0xfb, 0x5d, 0xa7, 0xe6, 0x2a, 0x32, 0xa5, 0xa7, 0x27, 0x0d, 0xbe, 0xb3, 0xbe, 0x4d, 0x58, - 0x40, 0xdc, 0x80, 0x16, 0xee, 0x94, 0x75, 0x3c, 0x85, 0x8e, 0x77, 0x7e, 0x99, 0x7c, 0x6b, 0xae, - 0xa0, 0x0b, 0x43, 0xf9, 0x2a, 0xd6, 0x24, 0x2a, 0x93, 0x90, 0xa7, 0x91, 0x50, 0x7c, 0xb5, 0x5b, - 0x7a, 0x5f, 0x46, 0xc7, 0x24, 0x1f, 0xef, 0x69, 0xa8, 0x9c, 0x4d, 0x1e, 0x5e, 0x18, 0x3e, 0x9f, - 0xbd, 0x83, 0xaf, 0x2f, 0xfe, 0x05, 0x23, 0x73, 0x64, 0x56, 0xdf, 0x7d, 0xf9, 0xb9, 0x37, 0x66, - 0xe0, 0x69, 0xf9, 0x3e, 0xe7, 0xb3, 0xa7, 0xda, 0xfd, 0x42, 0xf1, 0x27, 0x0d, 0x9d, 0xee, 0x19, - 0x68, 0x7c, 0x73, 0x84, 0x72, 0x83, 0x1e, 0x8a, 0x7e, 0xeb, 0x68, 0x64, 0x65, 0xfb, 0xaa, 0xb4, - 0x3d, 0x8b, 0xab, 0xfd, 0x6d, 0x07, 0x0c, 0x44, 0x3e, 0xb0, 0x14, 0xf0, 0x67, 0x0d, 0x8d, 0xf7, - 0x99, 0x36, 0xbc, 0x32, 0x82, 0x87, 0xc1, 0x93, 0xac, 0xaf, 0x1e, 0x95, 0xae, 0x42, 0x2c, 0xcb, - 0x10, 0xf3, 0xf8, 0x4a, 0xff, 0x10, 0x3e, 0x15, 0x4e, 0xb1, 0x73, 0x5e, 0x2a, 0xcf, 0xdf, 0x35, - 0x34, 0xd9, 0x7f, 0xca, 0xf0, 0xda, 0x08, 0x7e, 0x86, 0x0e, 0xb8, 0xbe, 0xfe, 0x0f, 0x0a, 0x2a, - 0xd4, 0x9a, 0x0c, 0x75, 0x03, 0x5f, 0xef, 0x1f, 0x0a, 0x1a, 0x7c, 0xc7, 0x21, 0x39, 0xfd, 0x4f, - 0x3e, 0xfb, 0x8d, 0xfa, 0x5c, 0x6f, 0x6b, 0xf7, 0xf6, 0x0f, 0x0d, 0xed, 0xe0, 0xd0, 0xd0, 0x7e, - 0x1c, 0x1a, 0xda, 0x87, 0xa6, 0x51, 0x3a, 0x68, 0x1a, 0xa5, 0xaf, 0x4d, 0xa3, 0xf4, 0x62, 0xc1, - 0x67, 0xa2, 0x91, 0xba, 0x56, 0x9d, 0x87, 0xed, 0xea, 0xc5, 0x9f, 0xe5, 0x55, 0x5b, 0x21, 0xb1, - 0x1b, 0x53, 0x70, 0xcb, 0xf2, 0x3f, 0xb1, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x47, 0x4f, 0xee, - 0x4e, 0xfc, 0x06, 0x00, 0x00, + // 663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x4f, 0xd4, 0x5e, + 0x14, 0x9d, 0xf2, 0xfb, 0x39, 0xc6, 0x67, 0x62, 0xe2, 0x03, 0x91, 0x4c, 0xb0, 0x83, 0x75, 0x82, + 0xa8, 0x30, 0x15, 0x48, 0x8c, 0x51, 0x21, 0x30, 0x89, 0xb8, 0x50, 0x23, 0xa2, 0x2e, 0x74, 0xd3, + 0xbc, 0x4e, 0xaf, 0x9d, 0x26, 0x9d, 0xde, 0xa1, 0xf7, 0x15, 0x44, 0xe3, 0xc6, 0xa5, 0x2b, 0x23, + 0x5f, 0xc7, 0x0f, 0x80, 0x3b, 0x12, 0x37, 0xae, 0xd4, 0x80, 0x1f, 0xc3, 0x85, 0xe1, 0xf5, 0xb5, + 0x32, 0xc3, 0xcc, 0x64, 0xc4, 0xdd, 0xfb, 0x73, 0xce, 0xb9, 0xe7, 0xdc, 0xde, 0x97, 0xb2, 0xa9, + 0xd7, 0x20, 0x45, 0xbd, 0x21, 0x82, 0xc8, 0x56, 0x2b, 0x8c, 0xc1, 0x86, 0x66, 0x40, 0x14, 0x60, + 0x44, 0xf6, 0x7a, 0x02, 0xf1, 0x56, 0xb5, 0x15, 0xa3, 0x44, 0x3e, 0x9e, 0x23, 0xab, 0x19, 0xb2, + 0x9a, 0x23, 0x4b, 0x57, 0xeb, 0x48, 0x4d, 0x24, 0xdb, 0x15, 0x04, 0x29, 0xcd, 0xde, 0x98, 0x75, + 0x41, 0x8a, 0x59, 0xbb, 0x25, 0xfc, 0x20, 0x12, 0x32, 0xc0, 0x28, 0x55, 0x2a, 0x5d, 0xe9, 0x5b, + 0xb3, 0x25, 0x62, 0xd1, 0x24, 0x0d, 0x1d, 0xf1, 0xd1, 0x47, 0xb5, 0xb4, 0x0f, 0x56, 0xfa, 0x74, + 0xdc, 0x47, 0xf4, 0x43, 0xb0, 0x45, 0x2b, 0xb0, 0x45, 0x14, 0xa1, 0x54, 0xea, 0x9a, 0x63, 0x8d, + 0x30, 0xfe, 0xf8, 0xc0, 0xc0, 0xaa, 0x12, 0x5a, 0x83, 0xf5, 0x04, 0x48, 0x5a, 0xcf, 0xd9, 0x70, + 0xdb, 0x29, 0xb5, 0x30, 0x22, 0xe0, 0x35, 0x56, 0x4c, 0x0b, 0x8e, 0x19, 0x13, 0xc6, 0xd4, 0xe9, + 0xb9, 0x4a, 0xb5, 0x5f, 0xcc, 0x6a, 0xca, 0xae, 0xfd, 0xbf, 0xf3, 0xad, 0x5c, 0x58, 0xd3, 0x4c, + 0xab, 0xcc, 0x2e, 0x28, 0xe9, 0x07, 0x01, 0xc9, 0x55, 0xc4, 0x70, 0xd9, 0xf3, 0x62, 0x20, 0x82, + 0xbc, 0xf6, 0x2f, 0x83, 0x99, 0xbd, 0x10, 0xda, 0xc7, 0x33, 0x76, 0x39, 0x89, 0xbc, 0x80, 0x64, + 0x1c, 0xb8, 0x89, 0x04, 0xcf, 0x41, 0x97, 0x20, 0xde, 0x80, 0xd8, 0x71, 0x45, 0x28, 0xa2, 0x3a, + 0x90, 0x23, 0x52, 0x92, 0x32, 0x7a, 0x6a, 0xad, 0xd2, 0x06, 0x7f, 0xa4, 0xd1, 0x35, 0x0d, 0xd6, + 0x05, 0xf8, 0x7d, 0x66, 0xb5, 0xcb, 0x4a, 0xa2, 0xa3, 0x8a, 0x43, 0x4a, 0xb1, 0xdc, 0x86, 0x7c, + 0x4a, 0xd4, 0x29, 0x76, 0x83, 0x9d, 0xcf, 0x3a, 0xe1, 0x34, 0xd1, 0x4b, 0x42, 0xc8, 0x15, 0xfe, + 0x53, 0x0a, 0xe7, 0xb2, 0xeb, 0x87, 0xea, 0x56, 0xf3, 0xac, 0x8b, 0xac, 0xac, 0xd2, 0xdf, 0x03, + 0x79, 0x37, 0xeb, 0xe4, 0x8a, 0xa8, 0x4b, 0x8c, 0xf3, 0x0e, 0x7d, 0x34, 0xd8, 0x44, 0x6f, 0x8c, + 0xee, 0xd1, 0x24, 0x3b, 0x13, 0x83, 0xca, 0xa9, 0xaf, 0x74, 0x2b, 0x3a, 0x4e, 0xb9, 0xc9, 0x98, + 0x8b, 0x91, 0xa7, 0x31, 0x69, 0xb8, 0x43, 0x27, 0x07, 0x3a, 0x5e, 0x12, 0xab, 0x99, 0xd1, 0x98, + 0xd4, 0x7e, 0xc7, 0xa9, 0xb5, 0xc8, 0x2c, 0xe5, 0xe9, 0x49, 0x03, 0x37, 0x97, 0x37, 0x44, 0x10, + 0x0a, 0x37, 0x84, 0xdc, 0x9d, 0xb6, 0xce, 0xc7, 0xd8, 0xc9, 0xf6, 0x2f, 0x93, 0x6d, 0xad, 0x05, + 0x76, 0xa9, 0x2f, 0x5f, 0xc7, 0x1a, 0x65, 0x45, 0xd1, 0xc4, 0x24, 0x92, 0x9a, 0xaf, 0x77, 0x73, + 0xef, 0x8b, 0xec, 0x84, 0xe2, 0xf3, 0x6d, 0x83, 0x15, 0xd3, 0xc9, 0xe3, 0xd7, 0xfb, 0xcf, 0xe7, + 0xd1, 0xc1, 0x2f, 0xcd, 0xfe, 0x05, 0x23, 0x75, 0x64, 0x55, 0xde, 0x7d, 0xf9, 0xb9, 0x3d, 0x64, + 0xf2, 0x71, 0xf5, 0x3e, 0x67, 0xd2, 0xa7, 0xda, 0xf9, 0x42, 0xf9, 0x27, 0x83, 0x9d, 0x3d, 0x32, + 0xd0, 0xfc, 0xf6, 0x00, 0xe5, 0x7a, 0x3d, 0x94, 0xd2, 0x9d, 0xe3, 0x91, 0xb5, 0xed, 0x69, 0x65, + 0x7b, 0x92, 0x57, 0xba, 0xdb, 0x0e, 0x03, 0x92, 0xd9, 0xc0, 0x02, 0xf1, 0xcf, 0x06, 0x1b, 0xee, + 0x32, 0x6d, 0x7c, 0x61, 0x00, 0x0f, 0xbd, 0x27, 0xb9, 0xb4, 0x78, 0x5c, 0xba, 0x0e, 0x31, 0xaf, + 0x42, 0xcc, 0xf0, 0x6b, 0xdd, 0x43, 0xf8, 0x20, 0x9d, 0x7c, 0xe7, 0xbc, 0xd4, 0x9e, 0xbf, 0x1b, + 0x6c, 0xb4, 0xfb, 0x94, 0xf1, 0xa5, 0x01, 0xfc, 0xf4, 0x1d, 0xf0, 0xd2, 0xf2, 0x3f, 0x28, 0xe8, + 0x50, 0x4b, 0x2a, 0xd4, 0x2d, 0x7e, 0xb3, 0x7b, 0x28, 0x6a, 0xe0, 0xa6, 0x23, 0x32, 0xfa, 0x9f, + 0x7c, 0xf6, 0x1b, 0xfd, 0xb9, 0xde, 0xd6, 0x56, 0x76, 0xf6, 0x4c, 0x63, 0x77, 0xcf, 0x34, 0x7e, + 0xec, 0x99, 0xc6, 0x87, 0x7d, 0xb3, 0xb0, 0xbb, 0x6f, 0x16, 0xbe, 0xee, 0x9b, 0x85, 0x17, 0xd3, + 0x7e, 0x20, 0x1b, 0x89, 0x5b, 0xad, 0x63, 0xf3, 0xb0, 0x7a, 0x84, 0x1e, 0xd8, 0xaf, 0x0e, 0x15, + 0x91, 0x5b, 0x2d, 0x20, 0xb7, 0xa8, 0xfe, 0x11, 0xf3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0f, + 0x1e, 0xc8, 0x24, 0xf8, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/emissions/types/tx.pb.go b/x/emissions/types/tx.pb.go index 53ecb580ff..47b8b3e625 100644 --- a/x/emissions/types/tx.pb.go +++ b/x/emissions/types/tx.pb.go @@ -210,30 +210,31 @@ func init() { } var fileDescriptor_fa84fc8dd79e3cdb = []byte{ - // 366 bytes of a gzipped FileDescriptorProto + // 369 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcb, 0x4a, 0xf3, 0x40, - 0x14, 0x4e, 0xfe, 0x5f, 0x2a, 0x1d, 0x05, 0x65, 0x14, 0xac, 0xb1, 0xa6, 0x12, 0x54, 0x74, 0xd1, - 0x89, 0x56, 0x5c, 0xb8, 0x0d, 0x28, 0x28, 0x14, 0x24, 0x20, 0x82, 0xbb, 0x69, 0x3a, 0x24, 0x41, - 0x92, 0x09, 0x73, 0xa6, 0xb4, 0x75, 0xe5, 0x23, 0xf8, 0x58, 0x5d, 0x76, 0x29, 0x2e, 0x8a, 0xb4, - 0xef, 0x21, 0x92, 0x5b, 0xad, 0x51, 0x2a, 0x5d, 0xe5, 0x64, 0xf2, 0xdd, 0x26, 0xe7, 0x43, 0x07, - 0x4f, 0x4c, 0x52, 0xc7, 0xa3, 0x7e, 0x68, 0x26, 0x13, 0x17, 0xcc, 0x64, 0x81, 0x0f, 0xe0, 0xf3, - 0x10, 0x4c, 0xd9, 0x23, 0x91, 0xe0, 0x92, 0xe3, 0xea, 0x14, 0x46, 0x72, 0x18, 0x99, 0xc2, 0xb4, - 0xe3, 0xb9, 0x22, 0x11, 0x15, 0x34, 0x80, 0x54, 0x48, 0xdb, 0x74, 0xb9, 0xcb, 0x93, 0xd1, 0x8c, - 0xa7, 0xf4, 0xd4, 0xe8, 0xa2, 0x8d, 0x26, 0xb8, 0xf7, 0xbe, 0xf4, 0xda, 0x82, 0x76, 0x2f, 0x33, - 0x2a, 0xae, 0xa0, 0x65, 0x47, 0x30, 0x2a, 0xb9, 0xa8, 0xa8, 0x7b, 0xea, 0x51, 0xd9, 0xce, 0x5f, - 0xf1, 0x15, 0x2a, 0xd1, 0x80, 0x77, 0x42, 0x59, 0xf9, 0x17, 0x7f, 0xb0, 0xc8, 0x60, 0x54, 0x53, - 0xde, 0x46, 0xb5, 0x43, 0xd7, 0x97, 0x5e, 0xa7, 0x45, 0x1c, 0x1e, 0x98, 0x0e, 0x87, 0x80, 0x43, - 0xf6, 0xa8, 0x43, 0xfb, 0xd1, 0x94, 0xfd, 0x88, 0x01, 0xb9, 0x0e, 0xa5, 0x9d, 0xb1, 0x8d, 0x5d, - 0xb4, 0xf3, 0x8b, 0xb1, 0xcd, 0x20, 0xe2, 0x21, 0x30, 0x03, 0xd0, 0x5a, 0x13, 0xdc, 0xbb, 0xa8, - 0x4d, 0x25, 0xbb, 0x4d, 0xae, 0x81, 0xab, 0xa8, 0x4c, 0x3b, 0xd2, 0xe3, 0xc2, 0x97, 0xfd, 0x2c, - 0xd5, 0xd7, 0x01, 0xb6, 0x50, 0x29, 0xbd, 0x6e, 0x92, 0x6b, 0xa5, 0xb1, 0x4f, 0xe6, 0xfd, 0x38, - 0x92, 0x6a, 0x5a, 0x4b, 0x71, 0x7a, 0x3b, 0x63, 0x1a, 0xdb, 0x68, 0xab, 0x60, 0x9a, 0xe7, 0x69, - 0x7c, 0xa8, 0xe8, 0x7f, 0x13, 0x5c, 0x2c, 0xd1, 0xea, 0xb7, 0x50, 0xf5, 0xf9, 0x36, 0x05, 0x39, - 0xed, 0x7c, 0x21, 0x78, 0xee, 0x8e, 0x9f, 0x55, 0xb4, 0xfe, 0x63, 0x47, 0xa7, 0x7f, 0x6a, 0x15, - 0x29, 0xda, 0xc5, 0xc2, 0x94, 0x3c, 0x82, 0x75, 0x33, 0x18, 0xeb, 0xea, 0x70, 0xac, 0xab, 0xef, - 0x63, 0x5d, 0x7d, 0x99, 0xe8, 0xca, 0x70, 0xa2, 0x2b, 0xaf, 0x13, 0x5d, 0x79, 0x38, 0x99, 0xd9, - 0x7c, 0x2c, 0x5a, 0x2f, 0xf4, 0xb1, 0x37, 0x5b, 0xeb, 0xb8, 0x07, 0xad, 0x52, 0xd2, 0xbd, 0xb3, - 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x6d, 0x2d, 0x1c, 0x03, 0x03, 0x00, 0x00, + 0x14, 0x4e, 0xfe, 0x5f, 0x2a, 0x1d, 0x05, 0x25, 0x0a, 0xd6, 0x58, 0x53, 0x09, 0x2a, 0x0a, 0x76, + 0x82, 0x15, 0x17, 0x6e, 0x03, 0x16, 0x5c, 0x14, 0x24, 0x20, 0x82, 0xbb, 0x69, 0x32, 0x24, 0x41, + 0x92, 0x13, 0x72, 0xa6, 0xb4, 0x75, 0xe5, 0x23, 0xf8, 0x58, 0x5d, 0x76, 0x29, 0x2e, 0x8a, 0xb4, + 0xef, 0x21, 0x92, 0x5b, 0xad, 0x55, 0x2a, 0x5d, 0xe5, 0x64, 0xf2, 0xdd, 0x26, 0xe7, 0x23, 0x47, + 0x4f, 0x5c, 0x30, 0xdb, 0x63, 0x7e, 0x68, 0xa4, 0x13, 0xc4, 0xdc, 0xe0, 0x81, 0x8f, 0xe8, 0x43, + 0x88, 0x86, 0xe8, 0xd1, 0x28, 0x06, 0x01, 0x4a, 0x75, 0x0a, 0xa3, 0x05, 0x8c, 0x4e, 0x61, 0xea, + 0xe9, 0x42, 0x91, 0x88, 0xc5, 0x2c, 0xc0, 0x4c, 0x48, 0xdd, 0x76, 0xc1, 0x85, 0x74, 0x34, 0x92, + 0x29, 0x3b, 0xd5, 0xbb, 0x64, 0xab, 0x85, 0xee, 0xbd, 0x2f, 0x3c, 0x27, 0x66, 0xdd, 0xeb, 0x9c, + 0xaa, 0x54, 0xc8, 0xaa, 0x1d, 0x73, 0x26, 0x20, 0xae, 0xc8, 0x07, 0xf2, 0x49, 0xd9, 0x2a, 0x5e, + 0x95, 0x26, 0x29, 0xb1, 0x00, 0x3a, 0xa1, 0xa8, 0xfc, 0x4b, 0x3e, 0x98, 0x74, 0x30, 0xaa, 0x49, + 0x6f, 0xa3, 0xda, 0xb1, 0xeb, 0x0b, 0xaf, 0xd3, 0xa6, 0x36, 0x04, 0x86, 0x0d, 0x18, 0x00, 0xe6, + 0x8f, 0x3a, 0x3a, 0x8f, 0x86, 0xe8, 0x47, 0x1c, 0xe9, 0x4d, 0x28, 0xac, 0x9c, 0xad, 0xef, 0x93, + 0xbd, 0x5f, 0x8c, 0x2d, 0x8e, 0x11, 0x84, 0xc8, 0x75, 0x24, 0x1b, 0x2d, 0x74, 0xef, 0x22, 0x87, + 0x09, 0x7e, 0x9b, 0x5e, 0x43, 0xa9, 0x92, 0x32, 0xeb, 0x08, 0x0f, 0x62, 0x5f, 0xf4, 0xf3, 0x54, + 0x5f, 0x07, 0x8a, 0x49, 0x4a, 0xd9, 0x75, 0xd3, 0x5c, 0x6b, 0x8d, 0x43, 0xba, 0xe8, 0xc7, 0xd1, + 0x4c, 0xd3, 0x5c, 0x49, 0xd2, 0x5b, 0x39, 0x53, 0xdf, 0x25, 0x3b, 0x73, 0xa6, 0x45, 0x9e, 0xc6, + 0x87, 0x4c, 0xfe, 0xb7, 0xd0, 0x55, 0x04, 0x59, 0xff, 0x16, 0xaa, 0xbe, 0xd8, 0x66, 0x4e, 0x4e, + 0xbd, 0x5c, 0x0a, 0x5e, 0xb8, 0x2b, 0xcf, 0x32, 0xd9, 0xfc, 0xb1, 0xa3, 0xf3, 0x3f, 0xb5, 0xe6, + 0x29, 0xea, 0xd5, 0xd2, 0x94, 0x22, 0x82, 0xd9, 0x1c, 0x8c, 0x35, 0x79, 0x38, 0xd6, 0xe4, 0xf7, + 0xb1, 0x26, 0xbf, 0x4c, 0x34, 0x69, 0x38, 0xd1, 0xa4, 0xd7, 0x89, 0x26, 0x3d, 0x9c, 0xcd, 0x6c, + 0x3e, 0x11, 0xad, 0x67, 0x7d, 0x0c, 0xc1, 0xe1, 0x46, 0x6f, 0xb6, 0xd2, 0x49, 0x07, 0xda, 0xa5, + 0xb4, 0x77, 0x17, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x76, 0x3e, 0xaa, 0xff, 0x02, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/emissions/types/withdrawable_emissions.pb.go b/x/emissions/types/withdrawable_emissions.pb.go index 314af20308..22cda65b14 100644 --- a/x/emissions/types/withdrawable_emissions.pb.go +++ b/x/emissions/types/withdrawable_emissions.pb.go @@ -78,7 +78,7 @@ func init() { } var fileDescriptor_bad7724b364d6473 = []byte{ - // 234 bytes of a gzipped FileDescriptorProto + // 239 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xac, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x53, 0x73, 0x33, 0x8b, 0x8b, 0x33, 0xf3, 0xf3, 0x8a, 0xf5, 0xcb, 0x33, 0x4b, 0x32, 0x52, 0x8a, 0x12, 0xcb, 0x13, 0x93, @@ -89,11 +89,11 @@ var fileDescriptor_bad7724b364d6473 = []byte{ 0x90, 0x1b, 0x17, 0x5b, 0x62, 0x6e, 0x7e, 0x69, 0x5e, 0x89, 0x04, 0x13, 0x48, 0xc2, 0x49, 0xef, 0xc4, 0x3d, 0x79, 0x86, 0x5b, 0xf7, 0xe4, 0xd5, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, - 0x49, 0x65, 0x41, 0x6a, 0xb1, 0x9e, 0x67, 0x5e, 0x49, 0x10, 0x54, 0xb7, 0x93, 0xd7, 0x89, 0x47, + 0x49, 0x65, 0x41, 0x6a, 0xb1, 0x9e, 0x67, 0x5e, 0x49, 0x10, 0x54, 0xb7, 0x93, 0xdb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, - 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0x20, 0x99, 0x04, 0xf2, 0x89, 0x2e, 0x5a, - 0x78, 0x54, 0x20, 0x85, 0x08, 0xd8, 0xdc, 0x24, 0x36, 0xb0, 0x6f, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x72, 0x96, 0xa7, 0xbf, 0x3e, 0x01, 0x00, 0x00, + 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0x20, 0x99, 0x04, 0xf2, 0x89, 0x2e, 0x24, + 0x3c, 0xf2, 0xf2, 0x53, 0x52, 0xf5, 0x2b, 0x90, 0x42, 0x03, 0x6c, 0x66, 0x12, 0x1b, 0xd8, 0x27, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x12, 0xc1, 0x14, 0xf9, 0x3a, 0x01, 0x00, 0x00, } func (m *WithdrawableEmissions) Marshal() (dAtA []byte, err error) { diff --git a/x/fungible/client/cli/query.go b/x/fungible/client/cli/query.go index eeb4104d52..2d785b020f 100644 --- a/x/fungible/client/cli/query.go +++ b/x/fungible/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/fungible/client/cli/query_code_hash.go b/x/fungible/client/cli/query_code_hash.go index 94d3cd61c7..ad6052f499 100644 --- a/x/fungible/client/cli/query_code_hash.go +++ b/x/fungible/client/cli/query_code_hash.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdQueryCodeHash() *cobra.Command { diff --git a/x/fungible/client/cli/query_foreign_coins.go b/x/fungible/client/cli/query_foreign_coins.go index ba57fa58b0..d269bc28ab 100644 --- a/x/fungible/client/cli/query_foreign_coins.go +++ b/x/fungible/client/cli/query_foreign_coins.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdListForeignCoins() *cobra.Command { diff --git a/x/fungible/client/cli/query_foreign_coins_test.go b/x/fungible/client/cli/query_foreign_coins_test.go index b2e2602f7c..dac3181acf 100644 --- a/x/fungible/client/cli/query_foreign_coins_test.go +++ b/x/fungible/client/cli/query_foreign_coins_test.go @@ -13,10 +13,10 @@ package cli_test // "google.golang.org/grpc/codes" // "google.golang.org/grpc/status" // -// "github.com/zeta-chain/zetacore/testutil/network" -// "github.com/zeta-chain/zetacore/testutil/nullify" -// "github.com/zeta-chain/zetacore/x/fungible/client/cli" -// "github.com/zeta-chain/zetacore/x/fungible/types" +// "github.com/zeta-chain/node/testutil/network" +// "github.com/zeta-chain/node/testutil/nullify" +// "github.com/zeta-chain/node/x/fungible/client/cli" +// "github.com/zeta-chain/node/x/fungible/types" //) // //// Prevent strconv unused error diff --git a/x/fungible/client/cli/query_gas_stability_pool.go b/x/fungible/client/cli/query_gas_stability_pool.go index 6d037da809..02771f820d 100644 --- a/x/fungible/client/cli/query_gas_stability_pool.go +++ b/x/fungible/client/cli/query_gas_stability_pool.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdGasStabilityPoolAddress() *cobra.Command { diff --git a/x/fungible/client/cli/query_system_contract.go b/x/fungible/client/cli/query_system_contract.go index b4e8f69023..7278932efd 100644 --- a/x/fungible/client/cli/query_system_contract.go +++ b/x/fungible/client/cli/query_system_contract.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdSystemContract() *cobra.Command { diff --git a/x/fungible/client/cli/tx.go b/x/fungible/client/cli/tx.go index 7e76661caf..4f26feb956 100644 --- a/x/fungible/client/cli/tx.go +++ b/x/fungible/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go b/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go index 6c49a5824d..c61f3dd74a 100644 --- a/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go +++ b/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdDeployFungibleCoinZRC4() *cobra.Command { diff --git a/x/fungible/client/cli/tx_deploy_system_contracts.go b/x/fungible/client/cli/tx_deploy_system_contracts.go index c31a19c888..872dd75035 100644 --- a/x/fungible/client/cli/tx_deploy_system_contracts.go +++ b/x/fungible/client/cli/tx_deploy_system_contracts.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdDeploySystemContracts() *cobra.Command { diff --git a/x/fungible/client/cli/tx_remove_foreign_coin.go b/x/fungible/client/cli/tx_remove_foreign_coin.go index c2b20e3947..5981e091d5 100644 --- a/x/fungible/client/cli/tx_remove_foreign_coin.go +++ b/x/fungible/client/cli/tx_remove_foreign_coin.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdRemoveForeignCoin() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_contract_bytecode.go b/x/fungible/client/cli/tx_update_contract_bytecode.go index 2b2077792c..0c635dd8d4 100644 --- a/x/fungible/client/cli/tx_update_contract_bytecode.go +++ b/x/fungible/client/cli/tx_update_contract_bytecode.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdUpdateContractBytecode() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_gateway_contract.go b/x/fungible/client/cli/tx_update_gateway_contract.go index 8941199788..46c250f4c6 100644 --- a/x/fungible/client/cli/tx_update_gateway_contract.go +++ b/x/fungible/client/cli/tx_update_gateway_contract.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdUpdateGatewayContract() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_system_contract.go b/x/fungible/client/cli/tx_update_system_contract.go index 4e4e9ea4f1..91275ac86d 100644 --- a/x/fungible/client/cli/tx_update_system_contract.go +++ b/x/fungible/client/cli/tx_update_system_contract.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdUpdateSystemContract() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go b/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go index 1524dbd0be..6844a6ddb7 100644 --- a/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go +++ b/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdUpdateZRC20LiquidityCap() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_zrc20_paused_status.go b/x/fungible/client/cli/tx_update_zrc20_paused_status.go index 553cf68545..797099c4ec 100644 --- a/x/fungible/client/cli/tx_update_zrc20_paused_status.go +++ b/x/fungible/client/cli/tx_update_zrc20_paused_status.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdPauseZRC20() *cobra.Command { diff --git a/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go b/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go index 693eafc3ca..61fc285327 100644 --- a/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go +++ b/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func CmdUpdateZRC20WithdrawFee() *cobra.Command { diff --git a/x/fungible/genesis.go b/x/fungible/genesis.go index be5d6f7555..783023b11f 100644 --- a/x/fungible/genesis.go +++ b/x/fungible/genesis.go @@ -3,8 +3,8 @@ package fungible import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) // InitGenesis initializes the fungible module's state from a provided genesis diff --git a/x/fungible/genesis_test.go b/x/fungible/genesis_test.go index 5fd1dfc408..aa24cf8a08 100644 --- a/x/fungible/genesis_test.go +++ b/x/fungible/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible" + "github.com/zeta-chain/node/x/fungible/types" ) func TestGenesis(t *testing.T) { diff --git a/x/fungible/keeper/deposits.go b/x/fungible/keeper/deposits.go index 4a05d1dcd3..48c1deb771 100644 --- a/x/fungible/keeper/deposits.go +++ b/x/fungible/keeper/deposits.go @@ -8,9 +8,9 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/x/fungible/types" ) // DepositCoinZeta immediately mints ZETA to the EVM account diff --git a/x/fungible/keeper/deposits_test.go b/x/fungible/keeper/deposits_test.go index 2f715bad30..f636ca19bd 100644 --- a/x/fungible/keeper/deposits_test.go +++ b/x/fungible/keeper/deposits_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/contracts" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/contracts" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_ZRC20DepositAndCallContract(t *testing.T) { diff --git a/x/fungible/keeper/evm.go b/x/fungible/keeper/evm.go index 07354b6bff..3f975a23ea 100644 --- a/x/fungible/keeper/evm.go +++ b/x/fungible/keeper/evm.go @@ -27,11 +27,11 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/server/config" - "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/server/config" + "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // TODO USE string constant diff --git a/x/fungible/keeper/evm_hooks.go b/x/fungible/keeper/evm_hooks.go index 3c03c8974a..03f1ecf6cd 100644 --- a/x/fungible/keeper/evm_hooks.go +++ b/x/fungible/keeper/evm_hooks.go @@ -8,7 +8,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) var _ evmtypes.EvmHooks = EVMHooks{} diff --git a/x/fungible/keeper/evm_hooks_test.go b/x/fungible/keeper/evm_hooks_test.go index 83e96d9aea..46ac7f8a15 100644 --- a/x/fungible/keeper/evm_hooks_test.go +++ b/x/fungible/keeper/evm_hooks_test.go @@ -6,9 +6,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_CheckPausedZRC20(t *testing.T) { diff --git a/x/fungible/keeper/evm_test.go b/x/fungible/keeper/evm_test.go index f80893d193..10b15e8401 100644 --- a/x/fungible/keeper/evm_test.go +++ b/x/fungible/keeper/evm_test.go @@ -21,15 +21,15 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/e2e/utils" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/server/config" - "github.com/zeta-chain/zetacore/testutil/contracts" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/server/config" + "github.com/zeta-chain/node/testutil/contracts" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) // get a valid chain id independently of the build flag diff --git a/x/fungible/keeper/foreign_coins.go b/x/fungible/keeper/foreign_coins.go index b86d6d4841..4dd5ac72a4 100644 --- a/x/fungible/keeper/foreign_coins.go +++ b/x/fungible/keeper/foreign_coins.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/fungible/types" ) // SetForeignCoins set a specific foreignCoins in the store from its index diff --git a/x/fungible/keeper/foreign_coins_test.go b/x/fungible/keeper/foreign_coins_test.go index 5b5ef5caed..d02c3a29c9 100644 --- a/x/fungible/keeper/foreign_coins_test.go +++ b/x/fungible/keeper/foreign_coins_test.go @@ -9,11 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func createNForeignCoins(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.ForeignCoins { diff --git a/x/fungible/keeper/gas_coin_and_pool.go b/x/fungible/keeper/gas_coin_and_pool.go index 877fae2edd..57133b0903 100644 --- a/x/fungible/keeper/gas_coin_and_pool.go +++ b/x/fungible/keeper/gas_coin_and_pool.go @@ -10,10 +10,10 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/fungible/types" - zetaObserverTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/fungible/types" + zetaObserverTypes "github.com/zeta-chain/node/x/observer/types" ) // SetupChainGasCoinAndPool setup gas ZRC20, and ZETA/gas pool for a chain diff --git a/x/fungible/keeper/gas_coin_and_pool_test.go b/x/fungible/keeper/gas_coin_and_pool_test.go index 2fc1929202..1b7315393c 100644 --- a/x/fungible/keeper/gas_coin_and_pool_test.go +++ b/x/fungible/keeper/gas_coin_and_pool_test.go @@ -16,11 +16,11 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" uniswapv2router02 "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) // setupGasCoin is a helper function to setup the gas coin for testing diff --git a/x/fungible/keeper/gas_price.go b/x/fungible/keeper/gas_price.go index 88ff0d6704..4eccdc9feb 100644 --- a/x/fungible/keeper/gas_price.go +++ b/x/fungible/keeper/gas_price.go @@ -8,7 +8,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" systemcontract "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // SetGasPrice sets gas price on the system contract in zEVM; return the gasUsed and error code diff --git a/x/fungible/keeper/gas_price_test.go b/x/fungible/keeper/gas_price_test.go index dec3c729e9..e48392eb45 100644 --- a/x/fungible/keeper/gas_price_test.go +++ b/x/fungible/keeper/gas_price_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_SetGasPrice(t *testing.T) { diff --git a/x/fungible/keeper/gas_stability_pool.go b/x/fungible/keeper/gas_stability_pool.go index 3e2a341d8b..2a68d68582 100644 --- a/x/fungible/keeper/gas_stability_pool.go +++ b/x/fungible/keeper/gas_stability_pool.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // EnsureGasStabilityPoolAccountCreated ensures the gas stability pool account exists diff --git a/x/fungible/keeper/gas_stability_pool_test.go b/x/fungible/keeper/gas_stability_pool_test.go index f72a344343..7105991a65 100644 --- a/x/fungible/keeper/gas_stability_pool_test.go +++ b/x/fungible/keeper/gas_stability_pool_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_EnsureGasStabilityPoolAccountCreated(t *testing.T) { diff --git a/x/fungible/keeper/grpc_query.go b/x/fungible/keeper/grpc_query.go index cfb87c3bfa..5de2cfbbac 100644 --- a/x/fungible/keeper/grpc_query.go +++ b/x/fungible/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/fungible/keeper/grpc_query_code_hash.go b/x/fungible/keeper/grpc_query_code_hash.go index cd80e49e79..df59f2421c 100644 --- a/x/fungible/keeper/grpc_query_code_hash.go +++ b/x/fungible/keeper/grpc_query_code_hash.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // CodeHash returns the code hash of an account if it exists diff --git a/x/fungible/keeper/grpc_query_code_hash_test.go b/x/fungible/keeper/grpc_query_code_hash_test.go index 7ef7ceaa25..452bbe3e39 100644 --- a/x/fungible/keeper/grpc_query_code_hash_test.go +++ b/x/fungible/keeper/grpc_query_code_hash_test.go @@ -6,9 +6,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_CodeHash(t *testing.T) { diff --git a/x/fungible/keeper/grpc_query_foreign_coins.go b/x/fungible/keeper/grpc_query_foreign_coins.go index 827ff5a9be..9fce1aa834 100644 --- a/x/fungible/keeper/grpc_query_foreign_coins.go +++ b/x/fungible/keeper/grpc_query_foreign_coins.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func (k Keeper) ForeignCoinsAll( diff --git a/x/fungible/keeper/grpc_query_foreign_coins_test.go b/x/fungible/keeper/grpc_query_foreign_coins_test.go index 76b4b2e7c0..6fd36fc4fd 100644 --- a/x/fungible/keeper/grpc_query_foreign_coins_test.go +++ b/x/fungible/keeper/grpc_query_foreign_coins_test.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/x/fungible/types" ) func TestForeignCoinsQuerySingle(t *testing.T) { diff --git a/x/fungible/keeper/grpc_query_gas_stability_pool.go b/x/fungible/keeper/grpc_query_gas_stability_pool.go index 3541aad8d4..81ef459674 100644 --- a/x/fungible/keeper/grpc_query_gas_stability_pool.go +++ b/x/fungible/keeper/grpc_query_gas_stability_pool.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func (k Keeper) GasStabilityPoolAddress( diff --git a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go index 1602416cac..08723fa4af 100644 --- a/x/fungible/keeper/grpc_query_gas_stability_pool_test.go +++ b/x/fungible/keeper/grpc_query_gas_stability_pool_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_GasStabilityPoolAddress(t *testing.T) { diff --git a/x/fungible/keeper/grpc_query_system_contract.go b/x/fungible/keeper/grpc_query_system_contract.go index 03a548d7d4..e051cc128c 100644 --- a/x/fungible/keeper/grpc_query_system_contract.go +++ b/x/fungible/keeper/grpc_query_system_contract.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func (k Keeper) SystemContract( diff --git a/x/fungible/keeper/grpc_query_system_contract_test.go b/x/fungible/keeper/grpc_query_system_contract_test.go index 78411a9584..b07af08d4b 100644 --- a/x/fungible/keeper/grpc_query_system_contract_test.go +++ b/x/fungible/keeper/grpc_query_system_contract_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_SystemContract(t *testing.T) { diff --git a/x/fungible/keeper/keeper.go b/x/fungible/keeper/keeper.go index 15d0575ead..ce1e9d5fdc 100644 --- a/x/fungible/keeper/keeper.go +++ b/x/fungible/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) type ( diff --git a/x/fungible/keeper/msg_server.go b/x/fungible/keeper/msg_server.go index f734d9959d..c0e86cb34e 100644 --- a/x/fungible/keeper/msg_server.go +++ b/x/fungible/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) type msgServer struct { diff --git a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go index 2784c59d28..bd0918afd3 100644 --- a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go +++ b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/coin" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // DeployFungibleCoinZRC20 deploys a fungible coin from a connected chains as a ZRC20 on ZetaChain. diff --git a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go index 903b63aa31..c849736883 100644 --- a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go +++ b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go @@ -8,13 +8,13 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" + observertypes "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_deploy_system_contract.go b/x/fungible/keeper/msg_server_deploy_system_contract.go index b7926b75c8..2251648edf 100644 --- a/x/fungible/keeper/msg_server_deploy_system_contract.go +++ b/x/fungible/keeper/msg_server_deploy_system_contract.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // DeploySystemContracts deploy new instances of the system contracts diff --git a/x/fungible/keeper/msg_server_deploy_system_contract_test.go b/x/fungible/keeper/msg_server_deploy_system_contract_test.go index 4a92926ec0..dd06a187c9 100644 --- a/x/fungible/keeper/msg_server_deploy_system_contract_test.go +++ b/x/fungible/keeper/msg_server_deploy_system_contract_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgServer_DeploySystemContracts(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_pause_zrc20.go b/x/fungible/keeper/msg_server_pause_zrc20.go index 0901cce964..c962783e96 100644 --- a/x/fungible/keeper/msg_server_pause_zrc20.go +++ b/x/fungible/keeper/msg_server_pause_zrc20.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // PauseZRC20 pauses a list of ZRC20 tokens diff --git a/x/fungible/keeper/msg_server_pause_zrc20_test.go b/x/fungible/keeper/msg_server_pause_zrc20_test.go index 4b672f3745..55f5c37363 100644 --- a/x/fungible/keeper/msg_server_pause_zrc20_test.go +++ b/x/fungible/keeper/msg_server_pause_zrc20_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_PauseZRC20(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_remove_foreign_coin.go b/x/fungible/keeper/msg_server_remove_foreign_coin.go index dbbcf36fe6..159006a56b 100644 --- a/x/fungible/keeper/msg_server_remove_foreign_coin.go +++ b/x/fungible/keeper/msg_server_remove_foreign_coin.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // RemoveForeignCoin removes a coin from the list of foreign coins in the diff --git a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go index 9e02d8a6f0..9b147ec8ff 100644 --- a/x/fungible/keeper/msg_server_remove_foreign_coin_test.go +++ b/x/fungible/keeper/msg_server_remove_foreign_coin_test.go @@ -6,11 +6,11 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgServer_RemoveForeignCoin(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go b/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go index e978d2a907..58468eafbc 100644 --- a/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go +++ b/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UpdateZRC20LiquidityCap updates the liquidity cap for a ZRC20 token. diff --git a/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap_test.go b/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap_test.go index 7282346d33..2111796967 100644 --- a/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap_test.go +++ b/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap_test.go @@ -6,11 +6,11 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgServer_UpdateZRC20LiquidityCap(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_unpause_zrc20.go b/x/fungible/keeper/msg_server_unpause_zrc20.go index 80a5541a73..b632cdec11 100644 --- a/x/fungible/keeper/msg_server_unpause_zrc20.go +++ b/x/fungible/keeper/msg_server_unpause_zrc20.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UnpauseZRC20 unpauses the ZRC20 token diff --git a/x/fungible/keeper/msg_server_unpause_zrc20_test.go b/x/fungible/keeper/msg_server_unpause_zrc20_test.go index e4e4a482f4..21a4664625 100644 --- a/x/fungible/keeper/msg_server_unpause_zrc20_test.go +++ b/x/fungible/keeper/msg_server_unpause_zrc20_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_UnpauseZRC20(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_update_contract_bytecode.go b/x/fungible/keeper/msg_server_update_contract_bytecode.go index 8dfa6a0ada..299a3ccd80 100644 --- a/x/fungible/keeper/msg_server_update_contract_bytecode.go +++ b/x/fungible/keeper/msg_server_update_contract_bytecode.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UpdateContractBytecode updates the bytecode of a contract from the bytecode diff --git a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go index a1f9cc4ddd..a863b24a82 100644 --- a/x/fungible/keeper/msg_server_update_contract_bytecode_test.go +++ b/x/fungible/keeper/msg_server_update_contract_bytecode_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/x/evm/statedb" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func codeHashFromAddress(t *testing.T, ctx sdk.Context, k *keeper.Keeper, contractAddr string) string { diff --git a/x/fungible/keeper/msg_server_update_gateway_contract.go b/x/fungible/keeper/msg_server_update_gateway_contract.go index 05ad086d75..0c806ada17 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UpdateGatewayContract updates the zevm gateway contract used by the ZetaChain protocol to read inbounds and process outbounds diff --git a/x/fungible/keeper/msg_server_update_gateway_contract_test.go b/x/fungible/keeper/msg_server_update_gateway_contract_test.go index f28b1921f3..b1ab5a7fbf 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract_test.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract_test.go @@ -2,16 +2,16 @@ package keeper_test import ( "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/pkg/chains" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/chains" "testing" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_UpdateGatewayContract(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_update_system_contract.go b/x/fungible/keeper/msg_server_update_system_contract.go index 750f0e44bf..868bf42f85 100644 --- a/x/fungible/keeper/msg_server_update_system_contract.go +++ b/x/fungible/keeper/msg_server_update_system_contract.go @@ -11,9 +11,9 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/coin" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UpdateSystemContract updates the system contract diff --git a/x/fungible/keeper/msg_server_update_system_contract_test.go b/x/fungible/keeper/msg_server_update_system_contract_test.go index 3e43c307db..0b996ece24 100644 --- a/x/fungible/keeper/msg_server_update_system_contract_test.go +++ b/x/fungible/keeper/msg_server_update_system_contract_test.go @@ -12,12 +12,12 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_UpdateSystemContract(t *testing.T) { diff --git a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go index 479877b84d..7797318364 100644 --- a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go +++ b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" ) // UpdateZRC20WithdrawFee updates the withdraw fee and gas limit of a zrc20 token diff --git a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go index 7b7dc14b4e..b7c3ecfb85 100644 --- a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go +++ b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go @@ -12,11 +12,11 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) { diff --git a/x/fungible/keeper/system_contract.go b/x/fungible/keeper/system_contract.go index 03f864afc5..cba3cc09b3 100644 --- a/x/fungible/keeper/system_contract.go +++ b/x/fungible/keeper/system_contract.go @@ -13,7 +13,7 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // SetSystemContract set system contract in the store diff --git a/x/fungible/keeper/system_contract_test.go b/x/fungible/keeper/system_contract_test.go index 4bbb957562..2f599a9a02 100644 --- a/x/fungible/keeper/system_contract_test.go +++ b/x/fungible/keeper/system_contract_test.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_GetSystemContract(t *testing.T) { diff --git a/x/fungible/keeper/v2_deposits.go b/x/fungible/keeper/v2_deposits.go index 1f431e8a70..16001d2f58 100644 --- a/x/fungible/keeper/v2_deposits.go +++ b/x/fungible/keeper/v2_deposits.go @@ -10,7 +10,7 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" "github.com/zeta-chain/protocol-contracts/v2/pkg/systemcontract.sol" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/coin" ) // ProcessV2Deposit handles a deposit from an inbound tx with protocol version 2 diff --git a/x/fungible/keeper/v2_deposits_test.go b/x/fungible/keeper/v2_deposits_test.go index acf11bf7ae..e470480776 100644 --- a/x/fungible/keeper/v2_deposits_test.go +++ b/x/fungible/keeper/v2_deposits_test.go @@ -4,13 +4,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/contracts/testdappv2" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/contracts/testdappv2" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" "math/big" "testing" ) diff --git a/x/fungible/keeper/v2_evm.go b/x/fungible/keeper/v2_evm.go index b5eab2ac8d..364c857bdc 100644 --- a/x/fungible/keeper/v2_evm.go +++ b/x/fungible/keeper/v2_evm.go @@ -11,8 +11,8 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/fungible/types" ) // CallUpdateGatewayAddress calls the updateGatewayAddress function on the ZRC20 contract diff --git a/x/fungible/keeper/zeta.go b/x/fungible/keeper/zeta.go index 7dfde65ca7..bc15a06e44 100644 --- a/x/fungible/keeper/zeta.go +++ b/x/fungible/keeper/zeta.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/x/fungible/types" ) // MintZetaToEVMAccount mints ZETA (gas token) to the given address diff --git a/x/fungible/keeper/zeta_test.go b/x/fungible/keeper/zeta_test.go index d315690df9..62e41700c1 100644 --- a/x/fungible/keeper/zeta_test.go +++ b/x/fungible/keeper/zeta_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - testkeeper "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + testkeeper "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_MintZetaToEVMAccount(t *testing.T) { diff --git a/x/fungible/keeper/zevm_message_passing_test.go b/x/fungible/keeper/zevm_message_passing_test.go index 96a4762583..f68fec1f62 100644 --- a/x/fungible/keeper/zevm_message_passing_test.go +++ b/x/fungible/keeper/zevm_message_passing_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" "github.com/zeta-chain/ethermint/x/evm/statedb" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/testutil/contracts" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/testutil/contracts" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestKeeper_ZEVMDepositAndCallContract(t *testing.T) { diff --git a/x/fungible/module.go b/x/fungible/module.go index b79481a9a2..fcec27c9d4 100644 --- a/x/fungible/module.go +++ b/x/fungible/module.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/fungible/client/cli" - "github.com/zeta-chain/zetacore/x/fungible/keeper" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/client/cli" + "github.com/zeta-chain/node/x/fungible/keeper" + "github.com/zeta-chain/node/x/fungible/types" ) var ( diff --git a/x/fungible/module_simulation.go b/x/fungible/module_simulation.go index a55870a742..e502102502 100644 --- a/x/fungible/module_simulation.go +++ b/x/fungible/module_simulation.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) // GenerateGenesisState creates a randomized GenState of the module diff --git a/x/fungible/types/events.pb.go b/x/fungible/types/events.pb.go index 6e4d5784c0..cedb96ea39 100644 --- a/x/fungible/types/events.pb.go +++ b/x/fungible/types/events.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" io "io" math "math" math_bits "math/bits" @@ -680,55 +680,56 @@ func init() { } var fileDescriptor_1e6611815bc2713b = []byte{ - // 766 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0x4d, 0x6e, 0xd3, 0x40, - 0x14, 0xae, 0x9b, 0x36, 0x6d, 0xa6, 0x3f, 0x49, 0xad, 0x08, 0x99, 0x14, 0x45, 0x55, 0xa0, 0x10, - 0x2a, 0x48, 0xaa, 0x70, 0x02, 0x5a, 0x68, 0xa9, 0xc4, 0x02, 0x05, 0x0a, 0x52, 0x37, 0xd6, 0xc4, - 0x7e, 0x75, 0xac, 0xda, 0x33, 0x96, 0x67, 0x12, 0xd7, 0x3d, 0x05, 0x4b, 0x0e, 0xc1, 0x09, 0xe0, - 0x02, 0x2c, 0x2b, 0xb1, 0x61, 0x89, 0xda, 0x4b, 0xb0, 0x44, 0x33, 0x1e, 0x3b, 0x76, 0x69, 0xab, - 0x96, 0x05, 0x12, 0x9b, 0x68, 0xde, 0xe4, 0x9b, 0xf7, 0xbe, 0xf7, 0xf9, 0x7b, 0x33, 0xa8, 0x7d, - 0x02, 0x1c, 0x5b, 0x43, 0xec, 0x92, 0xae, 0x5c, 0xd1, 0x10, 0xba, 0x87, 0x23, 0xe2, 0xb8, 0x03, - 0x0f, 0xba, 0x30, 0x06, 0xc2, 0x59, 0x27, 0x08, 0x29, 0xa7, 0xfa, 0x6a, 0x86, 0xec, 0xa4, 0xc8, - 0x4e, 0x8a, 0x6c, 0x3c, 0xb8, 0x2e, 0x0d, 0x3f, 0x4e, 0x52, 0x34, 0xea, 0x0e, 0x75, 0xa8, 0x5c, - 0x76, 0xc5, 0x4a, 0xed, 0x3e, 0xbc, 0xe4, 0x6c, 0x70, 0xe4, 0x74, 0x2d, 0xea, 0x12, 0xf9, 0x93, - 0xe0, 0x5a, 0x5f, 0x34, 0xd4, 0x78, 0x29, 0x18, 0xbd, 0x8d, 0x19, 0x07, 0x7f, 0x9b, 0x12, 0x1e, - 0x62, 0x8b, 0xef, 0x07, 0x36, 0xe6, 0x60, 0xeb, 0x6b, 0x68, 0xd1, 0x67, 0x8e, 0xc9, 0xe3, 0x00, - 0xcc, 0x51, 0xe8, 0x19, 0xda, 0x9a, 0xd6, 0xae, 0xf4, 0x91, 0xcf, 0x9c, 0x77, 0x71, 0x00, 0xfb, - 0xa1, 0xa7, 0x6f, 0xa2, 0x3a, 0x81, 0xc8, 0xb4, 0xd4, 0x41, 0x13, 0xdb, 0x76, 0x08, 0x8c, 0x19, - 0xd3, 0x12, 0xa9, 0x13, 0x88, 0xd2, 0x9c, 0xcf, 0x93, 0x7f, 0xc4, 0x09, 0xea, 0xd9, 0x7f, 0x9e, - 0x28, 0x25, 0x27, 0xa8, 0x67, 0x5f, 0x3c, 0x71, 0x07, 0x95, 0x99, 0xeb, 0x10, 0x08, 0x8d, 0x19, - 0x89, 0x51, 0x51, 0xeb, 0xf3, 0x34, 0xd2, 0x25, 0xf9, 0x83, 0xfe, 0x76, 0x6f, 0xf3, 0x05, 0x04, - 0x1e, 0x8d, 0x6f, 0x44, 0xfa, 0x2e, 0x9a, 0x97, 0xda, 0x98, 0xae, 0x2d, 0x89, 0x96, 0xfa, 0x73, - 0x32, 0xde, 0xb3, 0xf5, 0x06, 0x9a, 0x4f, 0x99, 0x29, 0x46, 0x59, 0xac, 0xeb, 0x68, 0x86, 0x60, - 0x1f, 0x14, 0x0b, 0xb9, 0x96, 0xdc, 0x62, 0x7f, 0x40, 0x3d, 0x63, 0x56, 0x71, 0x93, 0x91, 0xc8, - 0x63, 0x83, 0xe5, 0xfa, 0xd8, 0x63, 0x46, 0x59, 0x96, 0xc8, 0x62, 0x7d, 0x0b, 0x55, 0xc4, 0x27, - 0x90, 0x0c, 0x8d, 0xb9, 0x35, 0xad, 0xbd, 0xdc, 0x5b, 0xef, 0x5c, 0xe2, 0x84, 0xe0, 0xc8, 0xe9, - 0xc8, 0x6f, 0xb5, 0x4d, 0x5d, 0x22, 0xb8, 0x0b, 0x2e, 0xc9, 0x4a, 0xaf, 0xa3, 0x59, 0x08, 0xad, - 0xde, 0xa6, 0x31, 0x2f, 0xcb, 0x26, 0x81, 0xbe, 0x8a, 0x2a, 0x0e, 0x66, 0xa6, 0xe7, 0xfa, 0x2e, - 0x37, 0x2a, 0x49, 0x59, 0x07, 0xb3, 0xd7, 0x22, 0x6e, 0xfd, 0x9a, 0x46, 0xf7, 0x26, 0x72, 0x7d, - 0x70, 0xf9, 0xd0, 0x0e, 0x71, 0xb4, 0x03, 0x70, 0xf3, 0xaf, 0x7d, 0x8d, 0x70, 0x85, 0xa6, 0x4a, - 0x7f, 0xd7, 0xd4, 0x7d, 0xb4, 0x74, 0x22, 0xfa, 0xc8, 0x3c, 0x91, 0x28, 0xbd, 0x28, 0x37, 0x53, - 0x37, 0xb4, 0x51, 0x4d, 0xf8, 0x27, 0x52, 0xfc, 0xcd, 0x43, 0x00, 0xa5, 0xfd, 0x32, 0xf5, 0xec, - 0x5c, 0x5b, 0x02, 0x29, 0xbc, 0x59, 0x40, 0x96, 0x13, 0x24, 0x81, 0x28, 0x8f, 0x9c, 0x38, 0x6c, - 0x2e, 0xef, 0x30, 0xbd, 0x85, 0x96, 0x44, 0xad, 0x89, 0xa6, 0x89, 0xda, 0x0b, 0xd4, 0xb3, 0x77, - 0x95, 0xac, 0x02, 0x23, 0xaa, 0x14, 0x75, 0xaf, 0xf4, 0x17, 0x08, 0x44, 0x29, 0xa6, 0x35, 0x42, - 0xb5, 0x89, 0xf2, 0x6f, 0xf0, 0x88, 0xdd, 0x48, 0xed, 0x47, 0xa8, 0x5a, 0x90, 0x03, 0xc4, 0x58, - 0x95, 0x04, 0xfd, 0xbc, 0x20, 0x90, 0x1f, 0x90, 0x52, 0x61, 0x40, 0xa2, 0xfc, 0x7c, 0xec, 0x93, - 0xe0, 0x9f, 0x15, 0xfe, 0x94, 0x5a, 0xad, 0x78, 0xad, 0xb0, 0x5b, 0xcc, 0xe8, 0x13, 0xa4, 0x8f, - 0x88, 0xcb, 0x22, 0x1c, 0x98, 0xe3, 0x9e, 0x79, 0x88, 0x2d, 0x4e, 0xc3, 0x58, 0x5d, 0x2b, 0x35, - 0xf5, 0xcf, 0xfb, 0xde, 0x4e, 0xb2, 0x2f, 0xc6, 0x21, 0x12, 0x16, 0x53, 0x3c, 0x92, 0x40, 0xdf, - 0x40, 0x2b, 0xb9, 0x1c, 0x21, 0x1d, 0xf1, 0xec, 0x0e, 0xa9, 0x66, 0x29, 0xfa, 0x72, 0x5b, 0x5f, - 0x47, 0xcb, 0x16, 0x25, 0x04, 0x44, 0x3e, 0xf3, 0x04, 0xc6, 0xbe, 0x32, 0xd5, 0x52, 0xb6, 0x7b, - 0x00, 0x63, 0x5f, 0x48, 0xc3, 0x64, 0x4f, 0xd9, 0x05, 0x96, 0x5a, 0x8a, 0x15, 0x5a, 0xbd, 0xca, - 0x52, 0xad, 0xef, 0x1a, 0xaa, 0x4b, 0x69, 0xb6, 0x62, 0x0e, 0x16, 0xb5, 0x6f, 0x31, 0x7d, 0x8f, - 0x51, 0xed, 0x8a, 0x7b, 0xb6, 0x6a, 0x5d, 0xb8, 0x32, 0x37, 0xd0, 0x8a, 0x30, 0xe5, 0x40, 0xd5, - 0x30, 0x87, 0x98, 0x0d, 0x95, 0x36, 0x55, 0x02, 0x51, 0x5a, 0xfb, 0x15, 0x66, 0x43, 0x81, 0x15, - 0x26, 0x2f, 0x62, 0x95, 0x4a, 0xd4, 0xb3, 0x0b, 0xd8, 0x49, 0x57, 0xb3, 0x85, 0xae, 0xbe, 0x6a, - 0x68, 0x55, 0x76, 0xb5, 0x8b, 0x39, 0x44, 0x38, 0xfe, 0xaf, 0x1e, 0x92, 0xad, 0xbd, 0x6f, 0x67, - 0x4d, 0xed, 0xf4, 0xac, 0xa9, 0xfd, 0x3c, 0x6b, 0x6a, 0x1f, 0xcf, 0x9b, 0x53, 0xa7, 0xe7, 0xcd, - 0xa9, 0x1f, 0xe7, 0xcd, 0xa9, 0x83, 0xae, 0xe3, 0xf2, 0xe1, 0x68, 0xd0, 0xb1, 0xa8, 0x2f, 0x1f, - 0xd2, 0xa7, 0x17, 0xde, 0xd4, 0xe3, 0xdc, 0x8b, 0x1c, 0x07, 0xc0, 0x06, 0x65, 0xf9, 0xae, 0x3e, - 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x11, 0xe2, 0x57, 0x41, 0x04, 0x08, 0x00, 0x00, + // 771 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xad, 0x9b, 0x36, 0x6d, 0xa6, 0x3f, 0x49, 0xad, 0xe8, 0x93, 0xbf, 0x14, 0x45, 0x55, 0xa0, + 0x10, 0x0a, 0x24, 0x55, 0x78, 0x02, 0x5a, 0xda, 0x82, 0xc4, 0x02, 0x05, 0x0a, 0x52, 0x37, 0xd6, + 0xc4, 0xbe, 0x75, 0xac, 0xda, 0x33, 0x96, 0x67, 0x12, 0xd7, 0x7d, 0x0a, 0x96, 0x3c, 0x04, 0x4f, + 0x00, 0x2f, 0xc0, 0xb2, 0x12, 0x1b, 0x96, 0xa8, 0x7d, 0x09, 0x96, 0x68, 0xc6, 0x63, 0xc7, 0x2e, + 0x6d, 0xd5, 0xb2, 0x40, 0x62, 0x13, 0xcd, 0x9d, 0x9c, 0xb9, 0xf7, 0xdc, 0xe3, 0x73, 0x67, 0x50, + 0xfb, 0x04, 0x38, 0xb6, 0x86, 0xd8, 0x25, 0x5d, 0xb9, 0xa2, 0x21, 0x74, 0x0f, 0x47, 0xc4, 0x71, + 0x07, 0x1e, 0x74, 0x61, 0x0c, 0x84, 0xb3, 0x4e, 0x10, 0x52, 0x4e, 0xf5, 0xd5, 0x0c, 0xd9, 0x49, + 0x91, 0x9d, 0x14, 0xd9, 0xb8, 0x77, 0x5d, 0x1a, 0x7e, 0x9c, 0xa4, 0x68, 0xd4, 0x1d, 0xea, 0x50, + 0xb9, 0xec, 0x8a, 0x95, 0xda, 0xbd, 0x7f, 0xc9, 0xd9, 0xe0, 0xc8, 0xe9, 0x5a, 0xd4, 0x25, 0xf2, + 0x27, 0xc1, 0xb5, 0x3e, 0x6b, 0xa8, 0xb1, 0x23, 0x18, 0xbd, 0x89, 0x19, 0x07, 0x7f, 0x9b, 0x12, + 0x1e, 0x62, 0x8b, 0xef, 0x07, 0x36, 0xe6, 0x60, 0xeb, 0x6b, 0x68, 0xd1, 0x67, 0x8e, 0xc9, 0xe3, + 0x00, 0xcc, 0x51, 0xe8, 0x19, 0xda, 0x9a, 0xd6, 0xae, 0xf4, 0x91, 0xcf, 0x9c, 0xb7, 0x71, 0x00, + 0xfb, 0xa1, 0xa7, 0x6f, 0xa2, 0x3a, 0x81, 0xc8, 0xb4, 0xd4, 0x41, 0x13, 0xdb, 0x76, 0x08, 0x8c, + 0x19, 0xd3, 0x12, 0xa9, 0x13, 0x88, 0xd2, 0x9c, 0xcf, 0x92, 0x7f, 0xc4, 0x09, 0xea, 0xd9, 0xbf, + 0x9f, 0x28, 0x25, 0x27, 0xa8, 0x67, 0x5f, 0x3c, 0xf1, 0x1f, 0x2a, 0x33, 0xd7, 0x21, 0x10, 0x1a, + 0x33, 0x12, 0xa3, 0xa2, 0xd6, 0xa7, 0x69, 0xa4, 0x4b, 0xf2, 0x07, 0xfd, 0xed, 0xde, 0xe6, 0x73, + 0x08, 0x3c, 0x1a, 0xdf, 0x88, 0xf4, 0xff, 0x68, 0x5e, 0x6a, 0x63, 0xba, 0xb6, 0x24, 0x5a, 0xea, + 0xcf, 0xc9, 0xf8, 0xa5, 0xad, 0x37, 0xd0, 0x7c, 0xca, 0x4c, 0x31, 0xca, 0x62, 0x5d, 0x47, 0x33, + 0x04, 0xfb, 0xa0, 0x58, 0xc8, 0xb5, 0xe4, 0x16, 0xfb, 0x03, 0xea, 0x19, 0xb3, 0x8a, 0x9b, 0x8c, + 0x44, 0x1e, 0x1b, 0x2c, 0xd7, 0xc7, 0x1e, 0x33, 0xca, 0xb2, 0x44, 0x16, 0xeb, 0x5b, 0xa8, 0x22, + 0x3e, 0x81, 0x64, 0x68, 0xcc, 0xad, 0x69, 0xed, 0xe5, 0xde, 0x7a, 0xe7, 0x12, 0x27, 0x04, 0x47, + 0x4e, 0x47, 0x7e, 0xab, 0x6d, 0xea, 0x12, 0xc1, 0x5d, 0x70, 0x49, 0x56, 0x7a, 0x1d, 0xcd, 0x42, + 0x68, 0xf5, 0x36, 0x8d, 0x79, 0x59, 0x36, 0x09, 0xf4, 0x55, 0x54, 0x71, 0x30, 0x33, 0x3d, 0xd7, + 0x77, 0xb9, 0x51, 0x49, 0xca, 0x3a, 0x98, 0xbd, 0x12, 0x71, 0xeb, 0xe7, 0x34, 0xba, 0x33, 0x91, + 0xeb, 0xbd, 0xcb, 0x87, 0x76, 0x88, 0xa3, 0x5d, 0x80, 0x9b, 0x7f, 0xed, 0x6b, 0x84, 0x2b, 0x34, + 0x55, 0xfa, 0xb3, 0xa6, 0xee, 0xa2, 0xa5, 0x13, 0xd1, 0x47, 0xe6, 0x89, 0x44, 0xe9, 0x45, 0xb9, + 0x99, 0xba, 0xa1, 0x8d, 0x6a, 0xc2, 0x3f, 0x91, 0xe2, 0x6f, 0x1e, 0x02, 0x28, 0xed, 0x97, 0xa9, + 0x67, 0xe7, 0xda, 0x12, 0x48, 0xe1, 0xcd, 0x02, 0xb2, 0x9c, 0x20, 0x09, 0x44, 0x79, 0xe4, 0xc4, + 0x61, 0x73, 0x79, 0x87, 0xe9, 0x2d, 0xb4, 0x24, 0x6a, 0x4d, 0x34, 0x4d, 0xd4, 0x5e, 0xa0, 0x9e, + 0xbd, 0xa7, 0x64, 0x15, 0x18, 0x51, 0xa5, 0xa8, 0x7b, 0xa5, 0xbf, 0x40, 0x20, 0x4a, 0x31, 0xad, + 0x11, 0xaa, 0x4d, 0x94, 0x7f, 0x8d, 0x47, 0xec, 0x46, 0x6a, 0x3f, 0x40, 0xd5, 0x82, 0x1c, 0x20, + 0xc6, 0xaa, 0x24, 0xe8, 0xe7, 0x05, 0x81, 0xfc, 0x80, 0x94, 0x0a, 0x03, 0x12, 0xe5, 0xe7, 0x63, + 0x9f, 0x04, 0x7f, 0xad, 0xf0, 0xc7, 0xd4, 0x6a, 0xc5, 0x6b, 0x85, 0xdd, 0x62, 0x46, 0x1f, 0x23, + 0x7d, 0x44, 0x5c, 0x16, 0xe1, 0xc0, 0x1c, 0xf7, 0xcc, 0x43, 0x6c, 0x71, 0x1a, 0xc6, 0xea, 0x5a, + 0xa9, 0xa9, 0x7f, 0xde, 0xf5, 0x76, 0x93, 0x7d, 0x31, 0x0e, 0x91, 0xb0, 0x98, 0xe2, 0x91, 0x04, + 0xfa, 0x06, 0x5a, 0xc9, 0xe5, 0x08, 0xe9, 0x88, 0x67, 0x77, 0x48, 0x35, 0x4b, 0xd1, 0x97, 0xdb, + 0xfa, 0x3a, 0x5a, 0xb6, 0x28, 0x21, 0x20, 0xf2, 0x99, 0x27, 0x30, 0xf6, 0x95, 0xa9, 0x96, 0xb2, + 0xdd, 0x03, 0x18, 0xfb, 0x42, 0x1a, 0x26, 0x7b, 0xca, 0x2e, 0xb0, 0xd4, 0x52, 0xac, 0xd0, 0xea, + 0x55, 0x96, 0x6a, 0x7d, 0xd3, 0x50, 0x5d, 0x4a, 0xb3, 0x15, 0x73, 0xb0, 0xa8, 0x7d, 0x8b, 0xe9, + 0x7b, 0x88, 0x6a, 0x57, 0xdc, 0xb3, 0x55, 0xeb, 0xc2, 0x95, 0xb9, 0x81, 0x56, 0x84, 0x29, 0x07, + 0xaa, 0x86, 0x39, 0xc4, 0x6c, 0xa8, 0xb4, 0xa9, 0x12, 0x88, 0xd2, 0xda, 0x2f, 0x30, 0x1b, 0x0a, + 0xac, 0x30, 0x79, 0x11, 0xab, 0x54, 0xa2, 0x9e, 0x5d, 0xc0, 0x4e, 0xba, 0x9a, 0x2d, 0x74, 0xf5, + 0x45, 0x43, 0xab, 0xb2, 0xab, 0x3d, 0xcc, 0x21, 0xc2, 0xf1, 0x3f, 0xf5, 0x90, 0x6c, 0xed, 0x7c, + 0x3d, 0x6b, 0x6a, 0xa7, 0x67, 0x4d, 0xed, 0xc7, 0x59, 0x53, 0xfb, 0x70, 0xde, 0x9c, 0x3a, 0x3d, + 0x6f, 0x4e, 0x7d, 0x3f, 0x6f, 0x4e, 0x1d, 0x3c, 0x72, 0x5c, 0x3e, 0x1c, 0x0d, 0x3a, 0x16, 0xf5, + 0xe5, 0x43, 0xfa, 0x24, 0x79, 0x53, 0x09, 0xb5, 0xa1, 0x7b, 0x9c, 0x7b, 0x8d, 0xe3, 0x00, 0xd8, + 0xa0, 0x2c, 0xdf, 0xd4, 0xa7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xfc, 0xcd, 0xad, 0x00, + 0x08, 0x00, 0x00, } func (m *EventSystemContractUpdated) Marshal() (dAtA []byte, err error) { diff --git a/x/fungible/types/evm_test.go b/x/fungible/types/evm_test.go index b375d0c5ef..c86e0b757e 100644 --- a/x/fungible/types/evm_test.go +++ b/x/fungible/types/evm_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func TestIsContractReverted(t *testing.T) { diff --git a/x/fungible/types/expected_keepers.go b/x/fungible/types/expected_keepers.go index a719bef123..c8dc02f013 100644 --- a/x/fungible/types/expected_keepers.go +++ b/x/fungible/types/expected_keepers.go @@ -12,7 +12,7 @@ import ( "github.com/zeta-chain/ethermint/x/evm/statedb" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/fungible/types/foreign_coins.pb.go b/x/fungible/types/foreign_coins.pb.go index 9465b0f222..e0aa05b97e 100644 --- a/x/fungible/types/foreign_coins.pb.go +++ b/x/fungible/types/foreign_coins.pb.go @@ -8,7 +8,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" io "io" math "math" math_bits "math/bits" @@ -144,34 +144,35 @@ func init() { } var fileDescriptor_ef0f11d2d9d015ac = []byte{ - // 429 bytes of a gzipped FileDescriptorProto + // 433 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xcf, 0x6a, 0xdb, 0x30, - 0x1c, 0x8e, 0x96, 0x34, 0x73, 0xb4, 0xb6, 0x0c, 0x11, 0x8a, 0x48, 0xc1, 0x35, 0x83, 0x6d, 0xbe, - 0xd4, 0x1a, 0xdd, 0x5e, 0x60, 0x09, 0x0c, 0x0a, 0x3b, 0x99, 0xee, 0xb2, 0x8b, 0x51, 0x24, 0x55, - 0x15, 0xb1, 0x2d, 0xcd, 0x52, 0x60, 0xe9, 0x53, 0xec, 0xbe, 0x17, 0xea, 0xb1, 0xc7, 0xb1, 0x43, - 0x19, 0xc9, 0x8b, 0x0c, 0xc9, 0xae, 0x37, 0x4a, 0x2e, 0xf6, 0xef, 0xfb, 0xfd, 0xf9, 0xbe, 0xdf, - 0x27, 0x09, 0x92, 0x5b, 0xe1, 0x28, 0xbb, 0xa1, 0xaa, 0x6e, 0x23, 0xdd, 0x08, 0x72, 0xbd, 0xae, - 0xa5, 0x5a, 0x96, 0x82, 0x5c, 0xeb, 0x46, 0x28, 0x59, 0x17, 0x4c, 0xab, 0xda, 0x66, 0xa6, 0xd1, - 0x4e, 0xa3, 0xd3, 0x7e, 0x20, 0x7b, 0x1c, 0xc8, 0x1e, 0x07, 0x66, 0x53, 0xa9, 0xa5, 0x0e, 0x7d, - 0xc4, 0x47, 0xed, 0xc8, 0xec, 0xcd, 0x1e, 0x0d, 0xb3, 0x92, 0xc4, 0xd3, 0x86, 0x4f, 0xdb, 0xf7, - 0xea, 0xe7, 0x10, 0x1e, 0x7e, 0x6a, 0x25, 0x17, 0x5e, 0x11, 0x7d, 0x80, 0x27, 0xb7, 0x0d, 0xbb, - 0x78, 0x57, 0x30, 0x5d, 0xbb, 0x86, 0x32, 0x57, 0x50, 0xce, 0x1b, 0x61, 0x2d, 0x7e, 0x96, 0x80, - 0x74, 0x92, 0x4f, 0x43, 0x75, 0xd1, 0x15, 0x3f, 0xb6, 0x35, 0x34, 0x85, 0x07, 0xd4, 0x5a, 0xe1, - 0xf0, 0x30, 0x34, 0xb5, 0x00, 0xa5, 0xf0, 0x65, 0x6f, 0xc7, 0xaf, 0x52, 0x28, 0x8e, 0x47, 0x09, - 0x48, 0x87, 0xf9, 0x71, 0x97, 0x5f, 0xf8, 0xf4, 0x25, 0x47, 0x33, 0x18, 0x71, 0xc1, 0x54, 0x45, - 0x4b, 0x8b, 0x0f, 0x12, 0x90, 0x1e, 0xe5, 0x3d, 0x46, 0x08, 0x8e, 0x6a, 0x5a, 0x09, 0x3c, 0x0e, - 0xd4, 0x21, 0x46, 0x27, 0x70, 0x6c, 0x37, 0xd5, 0x52, 0x97, 0xf8, 0x79, 0xc8, 0x76, 0x08, 0xcd, - 0xe1, 0xc4, 0x9b, 0x2b, 0xdc, 0xc6, 0x08, 0x1c, 0x25, 0x20, 0x3d, 0xbe, 0x78, 0x9d, 0xed, 0x39, - 0x3d, 0xb3, 0x92, 0x59, 0x38, 0x05, 0x6f, 0xfa, 0x6a, 0x63, 0x44, 0x1e, 0xb1, 0x2e, 0x42, 0xa7, - 0x70, 0x22, 0xa9, 0x2d, 0x4a, 0x55, 0x29, 0x87, 0x27, 0x09, 0x48, 0x47, 0x79, 0x24, 0xa9, 0xfd, - 0xec, 0xb1, 0x17, 0x36, 0x74, 0x6d, 0x05, 0xc7, 0x30, 0x01, 0x69, 0x94, 0x77, 0x08, 0x5d, 0xc1, - 0xa3, 0x52, 0x7d, 0x5b, 0x2b, 0xae, 0xdc, 0xa6, 0x60, 0xd4, 0xe0, 0x17, 0x7e, 0xaf, 0x39, 0xb9, - 0x7b, 0x38, 0x1b, 0xfc, 0x7e, 0x38, 0x7b, 0x2b, 0x95, 0xbb, 0x59, 0x2f, 0x33, 0xa6, 0x2b, 0xc2, - 0xb4, 0xad, 0xb4, 0xed, 0x7e, 0xe7, 0x96, 0xaf, 0x88, 0xdf, 0xd6, 0x66, 0x5f, 0x54, 0xed, 0xf2, - 0xc3, 0x9e, 0x65, 0x41, 0xcd, 0xfc, 0xf2, 0x6e, 0x1b, 0x83, 0xfb, 0x6d, 0x0c, 0xfe, 0x6c, 0x63, - 0xf0, 0x63, 0x17, 0x0f, 0xee, 0x77, 0xf1, 0xe0, 0xd7, 0x2e, 0x1e, 0x7c, 0x25, 0xff, 0x11, 0x7a, - 0x57, 0xe7, 0x4f, 0xee, 0xfa, 0xfb, 0xbf, 0x17, 0x15, 0xd8, 0x97, 0xe3, 0x70, 0xdf, 0xef, 0xff, - 0x06, 0x00, 0x00, 0xff, 0xff, 0x19, 0x0a, 0x23, 0xcc, 0x7d, 0x02, 0x00, 0x00, + 0x1c, 0x8e, 0x96, 0x34, 0x73, 0xb4, 0xb6, 0x0c, 0x11, 0x8a, 0x48, 0xc1, 0x35, 0x83, 0x6d, 0x86, + 0x51, 0x6b, 0x74, 0x7b, 0x81, 0x25, 0x6c, 0x30, 0xd8, 0xc9, 0x74, 0x97, 0x5d, 0x8c, 0x22, 0xa9, + 0xaa, 0x88, 0x6d, 0x69, 0x96, 0x02, 0x4b, 0x9f, 0x62, 0xf7, 0xbd, 0x50, 0x8f, 0x3d, 0x8e, 0x1d, + 0xca, 0x48, 0x5e, 0x64, 0x48, 0x76, 0xbd, 0x1e, 0x72, 0xb1, 0x7f, 0xdf, 0xef, 0xcf, 0xf7, 0xfd, + 0x3e, 0x49, 0x90, 0xdc, 0x08, 0x47, 0xd9, 0x35, 0x55, 0x75, 0x1b, 0xe9, 0x46, 0x90, 0xab, 0x75, + 0x2d, 0xd5, 0xb2, 0x14, 0xe4, 0x4a, 0x37, 0x42, 0xc9, 0xba, 0x60, 0x5a, 0xd5, 0x36, 0x33, 0x8d, + 0x76, 0x1a, 0x9d, 0xf6, 0x03, 0xd9, 0xc3, 0x40, 0xf6, 0x30, 0x30, 0x9b, 0x4a, 0x2d, 0x75, 0xe8, + 0x23, 0x3e, 0x6a, 0x47, 0x66, 0xaf, 0xf6, 0x68, 0x98, 0x95, 0x24, 0x9e, 0x36, 0x7c, 0xda, 0xbe, + 0x17, 0xbf, 0x86, 0xf0, 0xf0, 0x53, 0x2b, 0xb9, 0xf0, 0x8a, 0xe8, 0x3d, 0x3c, 0xb9, 0x69, 0xd8, + 0xc5, 0xdb, 0x82, 0xe9, 0xda, 0x35, 0x94, 0xb9, 0x82, 0x72, 0xde, 0x08, 0x6b, 0xf1, 0x93, 0x04, + 0xa4, 0x93, 0x7c, 0x1a, 0xaa, 0x8b, 0xae, 0xf8, 0xa1, 0xad, 0xa1, 0x29, 0x3c, 0xa0, 0xd6, 0x0a, + 0x87, 0x87, 0xa1, 0xa9, 0x05, 0x28, 0x85, 0xcf, 0x7b, 0x3b, 0x7e, 0x95, 0x42, 0x71, 0x3c, 0x4a, + 0x40, 0x3a, 0xcc, 0x8f, 0xbb, 0xfc, 0xc2, 0xa7, 0x3f, 0x73, 0x34, 0x83, 0x11, 0x17, 0x4c, 0x55, + 0xb4, 0xb4, 0xf8, 0x20, 0x01, 0xe9, 0x51, 0xde, 0x63, 0x84, 0xe0, 0xa8, 0xa6, 0x95, 0xc0, 0xe3, + 0x40, 0x1d, 0x62, 0x74, 0x02, 0xc7, 0x76, 0x53, 0x2d, 0x75, 0x89, 0x9f, 0x86, 0x6c, 0x87, 0xd0, + 0x1c, 0x4e, 0xbc, 0xb9, 0xc2, 0x6d, 0x8c, 0xc0, 0x51, 0x02, 0xd2, 0xe3, 0x8b, 0x97, 0xd9, 0x9e, + 0xd3, 0x33, 0x2b, 0x99, 0x85, 0x53, 0xf0, 0xa6, 0x2f, 0x37, 0x46, 0xe4, 0x11, 0xeb, 0x22, 0x74, + 0x0a, 0x27, 0x92, 0xda, 0xa2, 0x54, 0x95, 0x72, 0x78, 0x92, 0x80, 0x74, 0x94, 0x47, 0x92, 0xda, + 0x2f, 0x1e, 0x7b, 0x61, 0x43, 0xd7, 0x56, 0x70, 0x0c, 0x13, 0x90, 0x46, 0x79, 0x87, 0xd0, 0x25, + 0x3c, 0x2a, 0xd5, 0xf7, 0xb5, 0xe2, 0xca, 0x6d, 0x0a, 0x46, 0x0d, 0x7e, 0xe6, 0xf7, 0x9a, 0x93, + 0xdb, 0xfb, 0xb3, 0xc1, 0x9f, 0xfb, 0xb3, 0xd7, 0x52, 0xb9, 0xeb, 0xf5, 0x32, 0x63, 0xba, 0x22, + 0x4c, 0xdb, 0x4a, 0xdb, 0xee, 0x77, 0x6e, 0xf9, 0x8a, 0xf8, 0x6d, 0x6d, 0xf6, 0x55, 0xd5, 0x2e, + 0x3f, 0xec, 0x59, 0x16, 0xd4, 0xcc, 0x3f, 0xde, 0x6e, 0x63, 0x70, 0xb7, 0x8d, 0xc1, 0xdf, 0x6d, + 0x0c, 0x7e, 0xee, 0xe2, 0xc1, 0xdd, 0x2e, 0x1e, 0xfc, 0xde, 0xc5, 0x83, 0x6f, 0x6f, 0x1e, 0x11, + 0x7a, 0x57, 0xe7, 0xed, 0x5d, 0xd7, 0x9a, 0x0b, 0xf2, 0xe3, 0xff, 0x6b, 0x0a, 0xcc, 0xcb, 0x71, + 0xb8, 0xeb, 0x77, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0x43, 0xca, 0xb7, 0x79, 0x02, 0x00, + 0x00, } func (m *ForeignCoins) Marshal() (dAtA []byte, err error) { diff --git a/x/fungible/types/gas_stablity_pool_test.go b/x/fungible/types/gas_stablity_pool_test.go index 6b3e0dcdac..983f9b04a9 100644 --- a/x/fungible/types/gas_stablity_pool_test.go +++ b/x/fungible/types/gas_stablity_pool_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func TestGetGasStabilityPoolAddress(t *testing.T) { diff --git a/x/fungible/types/genesis.pb.go b/x/fungible/types/genesis.pb.go index 99e7e5bda1..d926fdc8f1 100644 --- a/x/fungible/types/genesis.pb.go +++ b/x/fungible/types/genesis.pb.go @@ -85,7 +85,7 @@ func init() { } var fileDescriptor_75c5ed54ff19cb38 = []byte{ - // 262 bytes of a gzipped FileDescriptorProto + // 267 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xac, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0xd3, 0x4a, 0xf3, 0xd2, 0x33, 0x93, 0x72, 0x52, 0xf5, 0xd3, 0x53, 0xf3, 0x52, 0x8b, 0x33, 0x8b, 0xf5, 0x0a, 0x8a, 0xf2, @@ -97,12 +97,12 @@ var fileDescriptor_75c5ed54ff19cb38 = []byte{ 0x00, 0x6a, 0xa1, 0x33, 0xc8, 0x3e, 0x9f, 0xcc, 0xe2, 0x12, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x4d, 0x3d, 0x3c, 0x5e, 0xd0, 0x73, 0x43, 0xd2, 0xe4, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x86, 0x41, 0x42, 0xc1, 0x5c, 0x7c, 0x10, 0xc7, 0x39, 0x43, 0xdd, 0x26, 0xc1, 0xac, 0xc0, - 0xa8, 0xc1, 0x6d, 0xa4, 0x8d, 0xd7, 0xe8, 0x60, 0x14, 0x2d, 0x41, 0x68, 0x46, 0x38, 0x79, 0x9e, + 0xa8, 0xc1, 0x6d, 0xa4, 0x8d, 0xd7, 0xe8, 0x60, 0x14, 0x2d, 0x41, 0x68, 0x46, 0x38, 0xb9, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, - 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x7e, 0x7a, 0x66, 0x49, 0x46, 0x69, - 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0x38, 0x98, 0x74, 0xd1, 0x42, 0xac, 0x02, 0x11, 0x66, 0x25, 0x95, - 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x40, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xb1, - 0x05, 0xa7, 0xd8, 0x01, 0x00, 0x00, + 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, + 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0x38, 0x98, 0x74, 0x21, 0x21, 0x96, 0x97, 0x9f, 0x92, 0xaa, 0x5f, + 0x81, 0x08, 0xaf, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x80, 0x18, 0x03, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x97, 0x4b, 0x1e, 0x90, 0xd4, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/fungible/types/genesis_test.go b/x/fungible/types/genesis_test.go index 9113eb1a6b..5eb76be252 100644 --- a/x/fungible/types/genesis_test.go +++ b/x/fungible/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/fungible/types/message_deploy_fungible_coin_zrc20.go b/x/fungible/types/message_deploy_fungible_coin_zrc20.go index 6d7b06a8fa..01193b8ec7 100644 --- a/x/fungible/types/message_deploy_fungible_coin_zrc20.go +++ b/x/fungible/types/message_deploy_fungible_coin_zrc20.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/coin" ) const TypeMsgDeployFungibleCoinZRC20 = "deploy_fungible_coin_zrc_20" diff --git a/x/fungible/types/message_deploy_fungible_coin_zrc20_test.go b/x/fungible/types/message_deploy_fungible_coin_zrc20_test.go index 8b69f28b98..0de8e2da8b 100644 --- a/x/fungible/types/message_deploy_fungible_coin_zrc20_test.go +++ b/x/fungible/types/message_deploy_fungible_coin_zrc20_test.go @@ -8,9 +8,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgDeployFungibleCoinZRC4_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_deploy_system_contracts_test.go b/x/fungible/types/message_deploy_system_contracts_test.go index 3bf1b44dcc..b4da19e06a 100644 --- a/x/fungible/types/message_deploy_system_contracts_test.go +++ b/x/fungible/types/message_deploy_system_contracts_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgDeploySystemContract_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_pause_zrc20_test.go b/x/fungible/types/message_pause_zrc20_test.go index a6b6e1fda8..3efb9716a4 100644 --- a/x/fungible/types/message_pause_zrc20_test.go +++ b/x/fungible/types/message_pause_zrc20_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgPauseZRC20_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_remove_foreign_coin_test.go b/x/fungible/types/message_remove_foreign_coin_test.go index 5c26ecf519..4831473f2f 100644 --- a/x/fungible/types/message_remove_foreign_coin_test.go +++ b/x/fungible/types/message_remove_foreign_coin_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgRemoveForeignCoin_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_unpause_zrc20_test.go b/x/fungible/types/message_unpause_zrc20_test.go index 3a959ab459..af5d4c12ca 100644 --- a/x/fungible/types/message_unpause_zrc20_test.go +++ b/x/fungible/types/message_unpause_zrc20_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgUnpauseZRC20_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_update_contract_bytecode_test.go b/x/fungible/types/message_update_contract_bytecode_test.go index 4555d20a5e..7b9d2b79fb 100644 --- a/x/fungible/types/message_update_contract_bytecode_test.go +++ b/x/fungible/types/message_update_contract_bytecode_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgUpdateContractBytecode_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_update_gateway_contract_test.go b/x/fungible/types/message_update_gateway_contract_test.go index f1c143591d..919e634187 100644 --- a/x/fungible/types/message_update_gateway_contract_test.go +++ b/x/fungible/types/message_update_gateway_contract_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgUpdateGatewayContract_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_update_system_contract_test.go b/x/fungible/types/message_update_system_contract_test.go index b8d6e089e2..cf33ecdbde 100644 --- a/x/fungible/types/message_update_system_contract_test.go +++ b/x/fungible/types/message_update_system_contract_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgUpdateSystemContract_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/message_update_zrc20_liquidity_cap_test.go b/x/fungible/types/message_update_zrc20_liquidity_cap_test.go index c072a96472..ea6fc50a38 100644 --- a/x/fungible/types/message_update_zrc20_liquidity_cap_test.go +++ b/x/fungible/types/message_update_zrc20_liquidity_cap_test.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestNewMsgUpdateZRC20LiquidityCap_ValidateBasics(t *testing.T) { diff --git a/x/fungible/types/message_update_zrc20_withdraw_fee_test.go b/x/fungible/types/message_update_zrc20_withdraw_fee_test.go index b9b660df1f..6a1c1dbdc0 100644 --- a/x/fungible/types/message_update_zrc20_withdraw_fee_test.go +++ b/x/fungible/types/message_update_zrc20_withdraw_fee_test.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/fungible/types" ) func TestMsgUpdateZRC20WithdrawFee_ValidateBasic(t *testing.T) { diff --git a/x/fungible/types/query.pb.go b/x/fungible/types/query.pb.go index 9b5e70a96f..1c7589ab9d 100644 --- a/x/fungible/types/query.pb.go +++ b/x/fungible/types/query.pb.go @@ -723,61 +723,62 @@ func init() { } var fileDescriptor_9cd9a7c9e94d3c90 = []byte{ - // 863 bytes of a gzipped FileDescriptorProto + // 868 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x41, 0x4f, 0xdb, 0x48, - 0x14, 0x8e, 0x61, 0xd9, 0x84, 0x81, 0x65, 0xa5, 0x11, 0xab, 0x65, 0x0d, 0x9b, 0xec, 0x5a, 0x14, - 0x68, 0x4a, 0x6d, 0x12, 0x2a, 0x95, 0xd2, 0xa8, 0x6a, 0x92, 0x0a, 0x8a, 0xd4, 0x03, 0x0d, 0xa7, - 0xf6, 0x12, 0x4d, 0x9c, 0xc1, 0xb1, 0xe4, 0x78, 0x42, 0xc6, 0x41, 0xa4, 0x11, 0x97, 0xfe, 0x82, - 0x4a, 0xfd, 0x09, 0xfd, 0x07, 0xbd, 0xf4, 0xd2, 0x1f, 0xc0, 0x11, 0xa9, 0x52, 0xd5, 0x5e, 0xaa, - 0x36, 0xf4, 0x47, 0xf4, 0x58, 0x65, 0xfc, 0x6c, 0x92, 0x60, 0x27, 0x69, 0xb8, 0x79, 0xc6, 0xef, - 0x7b, 0xef, 0xfb, 0xde, 0x9b, 0xf9, 0x6c, 0xb4, 0xfa, 0x82, 0x3a, 0x44, 0xaf, 0x10, 0xd3, 0xd6, - 0xc4, 0x13, 0xab, 0x53, 0xed, 0xb0, 0x61, 0x1b, 0x66, 0xc9, 0xa2, 0xda, 0x51, 0x83, 0xd6, 0x9b, - 0x6a, 0xad, 0xce, 0x1c, 0x86, 0x17, 0xfd, 0x40, 0xd5, 0x0b, 0x54, 0xbd, 0x40, 0x39, 0xa9, 0x33, - 0x5e, 0x65, 0x5c, 0x2b, 0x11, 0x0e, 0x28, 0xed, 0x38, 0x55, 0xa2, 0x0e, 0x49, 0x69, 0x35, 0x62, - 0x98, 0x36, 0x71, 0x4c, 0x66, 0xbb, 0x89, 0x64, 0x6d, 0x50, 0xc5, 0x43, 0x56, 0xa7, 0xa6, 0x61, - 0x17, 0x75, 0x66, 0xda, 0x1c, 0x00, 0xa9, 0x41, 0x00, 0xde, 0xe4, 0x0e, 0xad, 0x16, 0x75, 0x66, - 0x3b, 0x75, 0xa2, 0x3b, 0x00, 0x99, 0x37, 0x98, 0xc1, 0xc4, 0xa3, 0xd6, 0x79, 0x82, 0xdd, 0x25, - 0x83, 0x31, 0xc3, 0xa2, 0x1a, 0xa9, 0x99, 0x1a, 0xb1, 0x6d, 0xe6, 0x08, 0x5a, 0x50, 0x46, 0xd9, - 0x44, 0x8b, 0x4f, 0x3b, 0xcc, 0x77, 0xa9, 0xb3, 0xe3, 0xb2, 0xc8, 0x77, 0x48, 0x14, 0xe8, 0x51, - 0x83, 0x72, 0x07, 0xcf, 0xa3, 0x29, 0xd3, 0x2e, 0xd3, 0x93, 0x05, 0xe9, 0x3f, 0x69, 0x6d, 0xba, - 0xe0, 0x2e, 0x14, 0x8e, 0x96, 0x82, 0x41, 0xbc, 0xc6, 0x6c, 0x4e, 0xf1, 0x01, 0x9a, 0x3d, 0xec, - 0xda, 0x17, 0xe0, 0x99, 0xf4, 0x4d, 0x75, 0x40, 0x33, 0xd5, 0xee, 0x44, 0xb9, 0xdf, 0xce, 0xbe, - 0x24, 0x22, 0x85, 0x9e, 0x24, 0x0a, 0x05, 0xa6, 0x59, 0xcb, 0x0a, 0x62, 0xba, 0x83, 0xd0, 0x65, - 0xd3, 0xa1, 0xe2, 0x8a, 0xea, 0x4e, 0x48, 0xed, 0x4c, 0x48, 0x75, 0xe7, 0x0a, 0x13, 0x52, 0xf7, - 0x89, 0x41, 0x01, 0x5b, 0xe8, 0x42, 0x2a, 0xef, 0x25, 0x10, 0x77, 0xa5, 0x4e, 0xa8, 0xb8, 0xc9, - 0x6b, 0x8b, 0xc3, 0xbb, 0x3d, 0xec, 0x27, 0x04, 0xfb, 0xd5, 0xa1, 0xec, 0x5d, 0x46, 0x3d, 0xf4, - 0x13, 0xe8, 0x5f, 0x6f, 0x34, 0x07, 0xe2, 0x90, 0xe4, 0xe1, 0x8c, 0x80, 0x56, 0xa5, 0x85, 0xe2, - 0x61, 0x01, 0x20, 0xf0, 0x19, 0x9a, 0xeb, 0x7d, 0x03, 0xdd, 0xbc, 0x35, 0x50, 0x62, 0x2f, 0x04, - 0x44, 0xf6, 0x25, 0x52, 0xfe, 0x47, 0x09, 0xaf, 0xf8, 0x2e, 0xe1, 0x07, 0x0e, 0x29, 0x99, 0x96, - 0xe9, 0x34, 0xf7, 0x19, 0xb3, 0xb2, 0xe5, 0x72, 0x9d, 0x72, 0xae, 0x1c, 0xa1, 0xd5, 0x21, 0x21, - 0x3e, 0xd1, 0x1b, 0x68, 0xce, 0xed, 0x50, 0x91, 0xb8, 0x6f, 0xe0, 0x94, 0xfe, 0xe1, 0xee, 0x42, - 0x38, 0x4e, 0xa0, 0x19, 0x7a, 0x5c, 0xf5, 0x63, 0x26, 0x44, 0x0c, 0xa2, 0xc7, 0x55, 0xaf, 0x64, - 0x26, 0x9c, 0x55, 0x8e, 0x58, 0xc4, 0xd6, 0x29, 0xfe, 0x07, 0xc5, 0x84, 0xf0, 0xa2, 0x59, 0x16, - 0x45, 0x26, 0x0b, 0x51, 0xb1, 0xde, 0x2b, 0x2b, 0xf9, 0x70, 0xc2, 0x80, 0xf6, 0x09, 0x2f, 0xa0, - 0x68, 0xc9, 0xdd, 0x02, 0x16, 0xde, 0xd2, 0x6f, 0x4c, 0xd6, 0xb2, 0x42, 0x92, 0x28, 0x9f, 0x25, - 0x28, 0x14, 0x1e, 0xe3, 0x17, 0xb2, 0x51, 0x0c, 0x32, 0x7b, 0xe7, 0xf3, 0xc9, 0xc0, 0xe1, 0x8d, - 0x98, 0x57, 0x85, 0x35, 0x4c, 0xd7, 0xaf, 0x21, 0x3f, 0x40, 0xd1, 0xe1, 0x9d, 0x1a, 0x20, 0x7f, - 0x03, 0xcd, 0x0b, 0x0a, 0x79, 0x56, 0xa6, 0x8f, 0x09, 0xaf, 0x78, 0x97, 0x7a, 0x01, 0x45, 0x7b, - 0x47, 0xeb, 0x2d, 0x95, 0x3b, 0xe8, 0xaf, 0x3e, 0x04, 0x48, 0x5f, 0x44, 0xd3, 0x3a, 0x2b, 0xd3, - 0x62, 0x85, 0xf0, 0x0a, 0x80, 0x62, 0x3a, 0x04, 0xa5, 0x7f, 0x20, 0x34, 0x25, 0x60, 0xf8, 0x9d, - 0x84, 0x66, 0xbb, 0x6f, 0x25, 0xde, 0x1a, 0xde, 0xa0, 0x60, 0x8f, 0x94, 0xef, 0x8d, 0x81, 0x74, - 0xc9, 0x2a, 0xe9, 0x97, 0x1f, 0xbe, 0xbf, 0x9e, 0x58, 0xc7, 0x49, 0xe1, 0xf1, 0xb7, 0x5d, 0xbb, - 0x0f, 0xfe, 0x2c, 0x68, 0x2d, 0xe1, 0xbd, 0xa7, 0xf8, 0xad, 0x84, 0xfe, 0xec, 0x4e, 0x96, 0xb5, - 0xac, 0x51, 0xc8, 0x07, 0xdb, 0xe6, 0x28, 0xe4, 0x43, 0x8c, 0x50, 0x49, 0x0a, 0xf2, 0xcb, 0x58, - 0x19, 0x4e, 0xbe, 0xd3, 0xee, 0x3e, 0x2f, 0xc0, 0xdb, 0x23, 0xb5, 0x2d, 0xd0, 0xc4, 0xe4, 0xfb, - 0x63, 0x61, 0x81, 0xf7, 0xba, 0xe0, 0xbd, 0x82, 0x97, 0x03, 0x79, 0xf7, 0x7d, 0x5a, 0xf1, 0x47, - 0x09, 0xfd, 0x1d, 0x62, 0x44, 0x38, 0x33, 0x12, 0x8d, 0x10, 0xb4, 0xfc, 0xe8, 0x3a, 0x68, 0x5f, - 0xcd, 0x5d, 0xa1, 0x26, 0x85, 0xb5, 0x40, 0x35, 0x06, 0xe1, 0x45, 0xee, 0xc1, 0x8b, 0x35, 0xc6, - 0x2c, 0xcf, 0x07, 0xf1, 0xb7, 0x00, 0x61, 0xde, 0x25, 0x1e, 0x4f, 0x18, 0xa0, 0xc7, 0x14, 0xd6, - 0xe7, 0x35, 0x4a, 0x4e, 0x08, 0xcb, 0xe0, 0xed, 0x51, 0x85, 0x81, 0x99, 0x68, 0x2d, 0xcf, 0x7f, - 0x4e, 0x71, 0x5b, 0x42, 0x72, 0x48, 0x9d, 0xce, 0xb5, 0xc9, 0x5c, 0xc7, 0x14, 0x47, 0x91, 0x39, - 0xdc, 0x52, 0x95, 0x87, 0x42, 0xe6, 0x36, 0xde, 0xea, 0x96, 0x79, 0xf5, 0x8f, 0x2f, 0x5c, 0x2f, - 0x7e, 0x23, 0xa1, 0x98, 0x67, 0x83, 0x38, 0x35, 0x9c, 0x54, 0x9f, 0xc9, 0xca, 0xe9, 0x5f, 0x81, - 0x00, 0xeb, 0x0d, 0xc1, 0x3a, 0x89, 0xd7, 0x02, 0x87, 0xe3, 0x1b, 0xb0, 0xd6, 0x82, 0xd3, 0x76, - 0x9a, 0xdb, 0x3b, 0x6b, 0xc7, 0xa5, 0xf3, 0x76, 0x5c, 0xfa, 0xda, 0x8e, 0x4b, 0xaf, 0x2e, 0xe2, - 0x91, 0xf3, 0x8b, 0x78, 0xe4, 0xd3, 0x45, 0x3c, 0xf2, 0x5c, 0x33, 0x4c, 0xa7, 0xd2, 0x28, 0xa9, - 0x3a, 0xab, 0x06, 0xf6, 0xe0, 0xe4, 0x32, 0xb1, 0xd3, 0xac, 0x51, 0x5e, 0xfa, 0x5d, 0xfc, 0xba, - 0x6e, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x02, 0x7a, 0x14, 0xc6, 0x0b, 0x00, 0x00, + 0x14, 0x8e, 0x61, 0xd9, 0x84, 0x81, 0x65, 0xa5, 0x11, 0xab, 0x65, 0x0d, 0x9b, 0xec, 0x5a, 0x2c, + 0xb0, 0x81, 0xb5, 0x49, 0x58, 0x69, 0x59, 0x36, 0x5a, 0x6d, 0x92, 0x2d, 0xb4, 0x52, 0x0f, 0x34, + 0x9c, 0xda, 0x4b, 0x34, 0xb1, 0x07, 0xc7, 0x92, 0xe3, 0x09, 0x19, 0x07, 0x91, 0x46, 0x5c, 0xfa, + 0x0b, 0x2a, 0xf5, 0x27, 0xf4, 0x1f, 0xf4, 0xd2, 0x4b, 0x7f, 0x00, 0x47, 0xa4, 0x4a, 0x55, 0x7b, + 0xa9, 0xda, 0xd0, 0x1f, 0xd1, 0x63, 0x95, 0xf1, 0xb3, 0x49, 0x82, 0x9d, 0xa4, 0xe1, 0xe6, 0x19, + 0xbf, 0xef, 0xbd, 0xef, 0x7b, 0x6f, 0xe6, 0xb3, 0xd1, 0xfa, 0x63, 0xea, 0x12, 0xbd, 0x4a, 0x2c, + 0x47, 0x13, 0x4f, 0xac, 0x41, 0xb5, 0xe3, 0xa6, 0x63, 0x5a, 0x15, 0x9b, 0x6a, 0x27, 0x4d, 0xda, + 0x68, 0xa9, 0xf5, 0x06, 0x73, 0x19, 0x5e, 0x0e, 0x02, 0x55, 0x3f, 0x50, 0xf5, 0x03, 0xe5, 0xb4, + 0xce, 0x78, 0x8d, 0x71, 0xad, 0x42, 0x38, 0xa0, 0xb4, 0xd3, 0x4c, 0x85, 0xba, 0x24, 0xa3, 0xd5, + 0x89, 0x69, 0x39, 0xc4, 0xb5, 0x98, 0xe3, 0x25, 0x92, 0xb5, 0x61, 0x15, 0x8f, 0x59, 0x83, 0x5a, + 0xa6, 0x53, 0xd6, 0x99, 0xe5, 0x70, 0x00, 0x64, 0x86, 0x01, 0x78, 0x8b, 0xbb, 0xb4, 0x56, 0xd6, + 0x99, 0xe3, 0x36, 0x88, 0xee, 0x02, 0x64, 0xd1, 0x64, 0x26, 0x13, 0x8f, 0x5a, 0xf7, 0x09, 0x76, + 0x57, 0x4c, 0xc6, 0x4c, 0x9b, 0x6a, 0xa4, 0x6e, 0x69, 0xc4, 0x71, 0x98, 0x2b, 0x68, 0x41, 0x19, + 0x65, 0x07, 0x2d, 0x3f, 0xe8, 0x32, 0x3f, 0xa0, 0xee, 0xbe, 0xc7, 0xa2, 0xd8, 0x25, 0x51, 0xa2, + 0x27, 0x4d, 0xca, 0x5d, 0xbc, 0x88, 0x66, 0x2c, 0xc7, 0xa0, 0x67, 0x4b, 0xd2, 0x2f, 0xd2, 0xc6, + 0x6c, 0xc9, 0x5b, 0x28, 0x1c, 0xad, 0x84, 0x83, 0x78, 0x9d, 0x39, 0x9c, 0xe2, 0x23, 0x34, 0x7f, + 0xdc, 0xb3, 0x2f, 0xc0, 0x73, 0xd9, 0xdf, 0xd5, 0x21, 0xcd, 0x54, 0x7b, 0x13, 0x15, 0xbe, 0xb9, + 0x78, 0x9f, 0x8a, 0x95, 0xfa, 0x92, 0x28, 0x14, 0x98, 0xe6, 0x6d, 0x3b, 0x8c, 0xe9, 0x3e, 0x42, + 0xd7, 0x4d, 0x87, 0x8a, 0x6b, 0xaa, 0x37, 0x21, 0xb5, 0x3b, 0x21, 0xd5, 0x9b, 0x2b, 0x4c, 0x48, + 0x3d, 0x24, 0x26, 0x05, 0x6c, 0xa9, 0x07, 0xa9, 0xbc, 0x92, 0x40, 0xdc, 0x8d, 0x3a, 0x91, 0xe2, + 0xa6, 0x6f, 0x2d, 0x0e, 0x1f, 0xf4, 0xb1, 0x9f, 0x12, 0xec, 0xd7, 0x47, 0xb2, 0xf7, 0x18, 0xf5, + 0xd1, 0x4f, 0xa1, 0x9f, 0xfd, 0xd1, 0x1c, 0x89, 0x43, 0x52, 0x84, 0x33, 0x02, 0x5a, 0x95, 0x36, + 0x4a, 0x46, 0x05, 0x80, 0xc0, 0x87, 0x68, 0xa1, 0xff, 0x0d, 0x74, 0x73, 0x73, 0xa8, 0xc4, 0x7e, + 0x08, 0x88, 0x1c, 0x48, 0xa4, 0xfc, 0x8a, 0x52, 0x7e, 0xf1, 0x03, 0xc2, 0x8f, 0x5c, 0x52, 0xb1, + 0x6c, 0xcb, 0x6d, 0x1d, 0x32, 0x66, 0xe7, 0x0d, 0xa3, 0x41, 0x39, 0x57, 0x4e, 0xd0, 0xfa, 0x88, + 0x90, 0x80, 0xe8, 0x6f, 0x68, 0xc1, 0xeb, 0x50, 0x99, 0x78, 0x6f, 0xe0, 0x94, 0x7e, 0xe7, 0xed, + 0x42, 0x38, 0x4e, 0xa1, 0x39, 0x7a, 0x5a, 0x0b, 0x62, 0xa6, 0x44, 0x0c, 0xa2, 0xa7, 0x35, 0xbf, + 0x64, 0x2e, 0x9a, 0x55, 0x81, 0xd8, 0xc4, 0xd1, 0x29, 0xfe, 0x09, 0x25, 0x84, 0xf0, 0xb2, 0x65, + 0x88, 0x22, 0xd3, 0xa5, 0xb8, 0x58, 0xdf, 0x33, 0x94, 0x62, 0x34, 0x61, 0x40, 0x07, 0x84, 0x97, + 0x50, 0xbc, 0xe2, 0x6d, 0x01, 0x0b, 0x7f, 0x19, 0x34, 0x26, 0x6f, 0xdb, 0x11, 0x49, 0x94, 0x77, + 0x12, 0x14, 0x8a, 0x8e, 0x09, 0x0a, 0x39, 0x28, 0x01, 0x99, 0xfd, 0xf3, 0x79, 0x7f, 0xe8, 0xf0, + 0xc6, 0xcc, 0xab, 0xc2, 0x1a, 0xa6, 0x1b, 0xd4, 0x90, 0xff, 0x45, 0xf1, 0xd1, 0x9d, 0x1a, 0x22, + 0x7f, 0x1b, 0x2d, 0x0a, 0x0a, 0x45, 0x66, 0xd0, 0xbb, 0x84, 0x57, 0xfd, 0x4b, 0xbd, 0x84, 0xe2, + 0xfd, 0xa3, 0xf5, 0x97, 0xca, 0x9f, 0xe8, 0x87, 0x01, 0x04, 0x48, 0x5f, 0x46, 0xb3, 0x3a, 0x33, + 0x68, 0xb9, 0x4a, 0x78, 0x15, 0x40, 0x09, 0x1d, 0x82, 0xb2, 0x9f, 0x11, 0x9a, 0x11, 0x30, 0xfc, + 0x52, 0x42, 0xf3, 0xbd, 0xb7, 0x12, 0xef, 0x8e, 0x6e, 0x50, 0xb8, 0x47, 0xca, 0x7f, 0x4f, 0x80, + 0xf4, 0xc8, 0x2a, 0xd9, 0x27, 0xaf, 0x3f, 0x3d, 0x9b, 0xda, 0xc2, 0x69, 0xe1, 0xf1, 0x7f, 0x78, + 0x76, 0x1f, 0xfe, 0x59, 0xd0, 0xda, 0xc2, 0x7b, 0xcf, 0xf1, 0x0b, 0x09, 0x7d, 0xdf, 0x9b, 0x2c, + 0x6f, 0xdb, 0xe3, 0x90, 0x0f, 0xb7, 0xcd, 0x71, 0xc8, 0x47, 0x18, 0xa1, 0x92, 0x16, 0xe4, 0x57, + 0xb1, 0x32, 0x9a, 0x7c, 0xb7, 0xdd, 0x03, 0x5e, 0x80, 0xf7, 0xc6, 0x6a, 0x5b, 0xa8, 0x89, 0xc9, + 0xff, 0x4c, 0x84, 0x05, 0xde, 0x5b, 0x82, 0xf7, 0x1a, 0x5e, 0x0d, 0xe5, 0x3d, 0xf0, 0x69, 0xc5, + 0x6f, 0x24, 0xf4, 0x63, 0x84, 0x11, 0xe1, 0xdc, 0x58, 0x34, 0x22, 0xd0, 0xf2, 0xff, 0xb7, 0x41, + 0x07, 0x6a, 0xfe, 0x12, 0x6a, 0x32, 0x58, 0x0b, 0x55, 0x63, 0x12, 0x5e, 0xe6, 0x3e, 0xbc, 0x5c, + 0x67, 0xcc, 0xf6, 0x7d, 0x10, 0x7f, 0x0c, 0x11, 0xe6, 0x5f, 0xe2, 0xc9, 0x84, 0x01, 0x7a, 0x42, + 0x61, 0x03, 0x5e, 0xa3, 0x14, 0x84, 0xb0, 0x1c, 0xde, 0x1b, 0x57, 0x18, 0x98, 0x89, 0xd6, 0xf6, + 0xfd, 0xe7, 0x1c, 0x77, 0x24, 0x24, 0x47, 0xd4, 0xe9, 0x5e, 0x9b, 0xdc, 0x6d, 0x4c, 0x71, 0x1c, + 0x99, 0xa3, 0x2d, 0x55, 0xf9, 0x4f, 0xc8, 0xdc, 0xc3, 0xbb, 0xbd, 0x32, 0x6f, 0xfe, 0xf1, 0x45, + 0xeb, 0xc5, 0xcf, 0x25, 0x94, 0xf0, 0x6d, 0x10, 0x67, 0x46, 0x93, 0x1a, 0x30, 0x59, 0x39, 0xfb, + 0x35, 0x10, 0x60, 0xbd, 0x2d, 0x58, 0xa7, 0xf1, 0x46, 0xe8, 0x70, 0x02, 0x03, 0xd6, 0xda, 0x70, + 0xda, 0xce, 0x0b, 0x77, 0x2e, 0x3a, 0x49, 0xe9, 0xb2, 0x93, 0x94, 0x3e, 0x74, 0x92, 0xd2, 0xd3, + 0xab, 0x64, 0xec, 0xf2, 0x2a, 0x19, 0x7b, 0x7b, 0x95, 0x8c, 0x3d, 0xda, 0x34, 0x2d, 0xb7, 0xda, + 0xac, 0xa8, 0x3a, 0xab, 0xf5, 0x66, 0x73, 0x98, 0x41, 0xb5, 0xb3, 0xeb, 0xa4, 0x6e, 0xab, 0x4e, + 0x79, 0xe5, 0x5b, 0xf1, 0xdb, 0xba, 0xf3, 0x25, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xea, 0xc3, 0xa0, + 0xc2, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/fungible/types/system_contract.pb.go b/x/fungible/types/system_contract.pb.go index ef9c5ba15f..63917ddfd3 100644 --- a/x/fungible/types/system_contract.pb.go +++ b/x/fungible/types/system_contract.pb.go @@ -92,7 +92,7 @@ func init() { } var fileDescriptor_98608b52bf5b9ddd = []byte{ - // 226 bytes of a gzipped FileDescriptorProto + // 230 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xac, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0xd3, 0x4a, 0xf3, 0xd2, 0x33, 0x93, 0x72, 0x52, 0xf5, 0x8b, 0x2b, 0x8b, 0x4b, 0x52, 0x73, 0xe3, 0x93, 0xf3, 0xf3, 0x4a, @@ -102,12 +102,12 @@ var fileDescriptor_98608b52bf5b9ddd = []byte{ 0x4c, 0x97, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0xe2, 0x2b, 0x46, 0x55, 0xa8, 0xca, 0xc5, 0x97, 0x9c, 0x9f, 0x97, 0x97, 0x9a, 0x5c, 0x92, 0x5f, 0x14, 0x5f, 0x95, 0x5a, 0x96, 0x2b, 0xc1, 0x04, 0x56, 0xc7, 0x0b, 0x17, 0x8d, 0x4a, 0x2d, 0xcb, 0x15, 0x92, 0xe0, 0x62, 0x4f, 0x4f, 0x2c, 0x49, - 0x2d, 0x4f, 0xac, 0x94, 0x60, 0x06, 0xcb, 0xc3, 0xb8, 0x4e, 0x9e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, + 0x2d, 0x4f, 0xac, 0x94, 0x60, 0x06, 0xcb, 0xc3, 0xb8, 0x4e, 0xae, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, - 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9f, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, - 0x0b, 0xf6, 0xbc, 0x2e, 0x5a, 0x38, 0x54, 0x20, 0x42, 0xa2, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, - 0x0d, 0xec, 0x1b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x26, 0x8e, 0xa4, 0xee, 0x35, 0x01, - 0x00, 0x00, + 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, + 0x0b, 0xf6, 0xbc, 0x2e, 0x24, 0x1c, 0xf2, 0xf2, 0x53, 0x52, 0xf5, 0x2b, 0x10, 0xa1, 0x50, 0x52, + 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x89, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x35, + 0xf5, 0x35, 0x31, 0x01, 0x00, 0x00, } func (m *SystemContract) Marshal() (dAtA []byte, err error) { diff --git a/x/fungible/types/tx.pb.go b/x/fungible/types/tx.pb.go index f5c3778af3..fbffdb97b3 100644 --- a/x/fungible/types/tx.pb.go +++ b/x/fungible/types/tx.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - coin "github.com/zeta-chain/zetacore/pkg/coin" + coin "github.com/zeta-chain/node/pkg/coin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -1037,73 +1037,73 @@ func init() { } var fileDescriptor_7bea9688d1d01113 = []byte{ - // 1047 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0xdb, 0x36, - 0x14, 0x8e, 0x92, 0xe6, 0xef, 0x2c, 0x4e, 0x32, 0xc2, 0x6d, 0x14, 0xa5, 0x70, 0x5a, 0x35, 0x6b, - 0xb3, 0x62, 0xb5, 0x3b, 0x2f, 0x5d, 0x31, 0x60, 0x6d, 0xb1, 0x78, 0x4d, 0x57, 0xa0, 0x06, 0x06, - 0x35, 0xe9, 0xb0, 0xdc, 0x08, 0x8c, 0xc4, 0xc8, 0x42, 0x6c, 0x51, 0x13, 0xe5, 0xb9, 0xee, 0xdd, - 0x80, 0x5d, 0x15, 0x18, 0x50, 0x60, 0x0f, 0xb0, 0x67, 0xd8, 0x5b, 0xf4, 0xb2, 0x97, 0xc3, 0x30, - 0x14, 0x43, 0x72, 0xb7, 0xa7, 0x18, 0x48, 0x49, 0xac, 0x64, 0x5b, 0xb6, 0xe3, 0xf6, 0x26, 0x11, - 0xe9, 0xf3, 0x7d, 0xfc, 0x78, 0x78, 0xce, 0x47, 0x09, 0xb6, 0x5e, 0x90, 0x10, 0x5b, 0x0d, 0xec, - 0x7a, 0x15, 0xf1, 0x44, 0x03, 0x52, 0x39, 0x6e, 0x7b, 0x8e, 0x7b, 0xd4, 0x24, 0x95, 0xf0, 0x79, - 0xd9, 0x0f, 0x68, 0x48, 0xd1, 0x86, 0x8c, 0x2a, 0x27, 0x51, 0xe5, 0x24, 0x4a, 0x2b, 0x3a, 0xd4, - 0xa1, 0x22, 0xae, 0xc2, 0x9f, 0x22, 0x88, 0x76, 0x7d, 0x00, 0xb1, 0x7f, 0xe2, 0x54, 0x2c, 0xea, - 0x7a, 0xe2, 0x4f, 0x14, 0xa7, 0xef, 0x80, 0x5a, 0x67, 0xce, 0xb7, 0xc4, 0x6f, 0xd2, 0xee, 0xd3, - 0x2e, 0x0b, 0x49, 0xab, 0x46, 0xbd, 0x30, 0xc0, 0x56, 0xc8, 0x90, 0x0a, 0xf3, 0x56, 0x40, 0x70, - 0x48, 0x03, 0x55, 0xb9, 0xa2, 0x6c, 0x2f, 0x1a, 0xc9, 0x50, 0xff, 0x47, 0x81, 0x2b, 0x79, 0x30, - 0x83, 0x30, 0x9f, 0x7a, 0x8c, 0xa0, 0x9b, 0xb0, 0xda, 0xf6, 0x5c, 0xd6, 0xc1, 0xfe, 0xb3, 0xea, - 0x1e, 0xb6, 0x42, 0x1a, 0x74, 0x63, 0x9e, 0xbe, 0x79, 0x54, 0x84, 0xd9, 0x0e, 0xd7, 0xa9, 0x4e, - 0x8b, 0x80, 0x68, 0x80, 0xb6, 0x61, 0x45, 0x46, 0x1a, 0xb4, 0x1d, 0x92, 0x40, 0x9d, 0x11, 0xbf, - 0xf7, 0x4e, 0xa3, 0x2d, 0x28, 0x58, 0xd4, 0xf3, 0x08, 0x67, 0x3b, 0x7c, 0xf8, 0xac, 0xae, 0x5e, - 0x10, 0x71, 0xd9, 0x49, 0x74, 0x1d, 0x96, 0x59, 0x46, 0xac, 0x3a, 0x2b, 0xc2, 0x7a, 0x66, 0xf5, - 0x97, 0xd3, 0xb0, 0x5e, 0x67, 0xce, 0x81, 0x6f, 0xe3, 0x90, 0x1c, 0x1a, 0xb5, 0xea, 0xed, 0x1f, - 0xdc, 0xb0, 0x61, 0x07, 0xb8, 0xb3, 0x47, 0x48, 0x7e, 0x5a, 0xd0, 0x35, 0x28, 0xbc, 0x08, 0xac, - 0xea, 0x6d, 0x13, 0xdb, 0x76, 0x40, 0x18, 0x8b, 0x77, 0xb3, 0x24, 0x26, 0xbf, 0x89, 0xe6, 0xd0, - 0x8f, 0xb0, 0xea, 0x91, 0x8e, 0xd9, 0x89, 0x19, 0xcd, 0x63, 0x42, 0xd4, 0x39, 0x1e, 0xb7, 0x5b, - 0x79, 0xfd, 0x76, 0x73, 0xea, 0xef, 0xb7, 0x9b, 0x37, 0x1c, 0x37, 0x6c, 0xb4, 0x8f, 0xca, 0x16, - 0x6d, 0x55, 0x2c, 0xca, 0x5a, 0x94, 0xc5, 0xff, 0x6e, 0x31, 0xfb, 0xa4, 0x12, 0x76, 0x7d, 0xc2, - 0xca, 0x07, 0xae, 0x17, 0x1a, 0xcb, 0x1e, 0xe9, 0xa4, 0x95, 0x3d, 0x85, 0x02, 0xa7, 0x76, 0x30, - 0x33, 0x9b, 0x6e, 0xcb, 0x0d, 0xd5, 0xf9, 0xc9, 0x78, 0x3f, 0xf2, 0x48, 0xe7, 0x11, 0x66, 0x4f, - 0x38, 0x87, 0x7e, 0x0d, 0xae, 0xe6, 0xe6, 0x22, 0x39, 0x6b, 0x3d, 0x80, 0x35, 0x19, 0x94, 0xad, - 0x87, 0x21, 0xe9, 0xba, 0x07, 0x1b, 0x5c, 0x6e, 0x94, 0x7c, 0xd3, 0x8a, 0x01, 0x3d, 0xc9, 0x53, - 0x3d, 0xd2, 0xc9, 0x32, 0xc6, 0x89, 0xd4, 0xaf, 0xc2, 0x66, 0xce, 0x9a, 0x52, 0xd6, 0x1f, 0xd3, - 0xa0, 0xc9, 0x3a, 0xdd, 0x8b, 0x3b, 0xa6, 0x46, 0x5d, 0x4f, 0x6c, 0x64, 0x88, 0xb4, 0x22, 0xcc, - 0x3e, 0xe4, 0x21, 0x49, 0x3d, 0x8a, 0x01, 0xda, 0x86, 0xd5, 0x63, 0x1a, 0x10, 0xd7, 0xf1, 0x4c, - 0xd1, 0x5a, 0xa6, 0x6b, 0x8b, 0x82, 0x9c, 0x31, 0x96, 0xe3, 0xf9, 0x1a, 0x9f, 0x7e, 0x6c, 0x23, - 0x0d, 0x16, 0x6c, 0x62, 0xb9, 0x2d, 0xdc, 0x64, 0xa2, 0x14, 0x0b, 0x86, 0x1c, 0x23, 0x04, 0x17, - 0x3c, 0xdc, 0x22, 0x71, 0xed, 0x89, 0x67, 0x74, 0x09, 0xe6, 0x58, 0xb7, 0x75, 0x44, 0x9b, 0x51, - 0x29, 0x18, 0xf1, 0x08, 0xed, 0xc2, 0x22, 0x6f, 0x56, 0x93, 0x1f, 0x8e, 0x38, 0xcd, 0xe5, 0xea, - 0x27, 0xe5, 0x01, 0x6e, 0xe0, 0x9f, 0x38, 0x65, 0xd1, 0xd5, 0x7c, 0x73, 0xfb, 0x5d, 0x9f, 0x18, - 0x0b, 0x56, 0xfc, 0x84, 0x36, 0x60, 0xf1, 0x5d, 0x45, 0x2c, 0x08, 0xb9, 0x0b, 0x4e, 0x72, 0xba, - 0xf7, 0x41, 0xcf, 0x4f, 0x90, 0x6c, 0x65, 0x15, 0xe6, 0x93, 0x53, 0x89, 0x13, 0x15, 0x0f, 0xf5, - 0x03, 0x28, 0xd6, 0x99, 0x63, 0x90, 0x16, 0xfd, 0x99, 0xec, 0xc5, 0x39, 0xa0, 0xae, 0xf7, 0x9e, - 0x4d, 0xa2, 0x97, 0xe0, 0xf2, 0x20, 0x5a, 0x79, 0xb0, 0xbf, 0x2a, 0xa9, 0x0e, 0x4d, 0x8e, 0x7d, - 0xb7, 0x1b, 0x12, 0x8b, 0xda, 0xc3, 0x3a, 0xf4, 0x53, 0x58, 0xcd, 0xa9, 0xb3, 0x15, 0x2b, 0x5b, - 0x5e, 0x48, 0x8f, 0x9a, 0x89, 0x13, 0x9a, 0x0d, 0xcc, 0x1a, 0xb1, 0xf5, 0xf0, 0xde, 0xa8, 0x51, - 0x9b, 0x7c, 0x87, 0x59, 0x23, 0xd3, 0x1b, 0xbd, 0x2a, 0xa4, 0xd6, 0x3f, 0x15, 0x51, 0x84, 0xa9, - 0x0e, 0x7a, 0xe2, 0xfe, 0xd4, 0x76, 0x6d, 0x37, 0xec, 0xd6, 0xb0, 0xff, 0xbe, 0x76, 0xb2, 0x0f, - 0x85, 0x66, 0x42, 0x67, 0x5a, 0xd8, 0x8f, 0x64, 0x9e, 0xbf, 0xe7, 0x97, 0x9a, 0x29, 0x51, 0xfa, - 0x96, 0x28, 0x8b, 0x1c, 0xc9, 0x72, 0x67, 0x06, 0x14, 0xea, 0xcc, 0xf9, 0x1e, 0xb7, 0x19, 0x19, - 0xd5, 0x50, 0x37, 0x60, 0x25, 0xb3, 0x17, 0xc2, 0x77, 0x33, 0xc3, 0xbd, 0x37, 0xbd, 0x1b, 0xc2, - 0xf4, 0x35, 0xb8, 0x98, 0xe1, 0x94, 0x8b, 0xed, 0xc3, 0x0a, 0x97, 0xe4, 0xf9, 0x1f, 0x74, 0xb9, - 0xf5, 0xc8, 0xb8, 0x52, 0xac, 0x72, 0xc1, 0xb6, 0xb8, 0x1a, 0xa3, 0x1c, 0x3c, 0xc2, 0x21, 0xe9, - 0xe0, 0xee, 0x18, 0xa6, 0xf6, 0x00, 0x2e, 0x47, 0x1e, 0x2c, 0x00, 0x79, 0xae, 0xb6, 0x2e, 0x1c, - 0x36, 0xc3, 0x99, 0x94, 0xbe, 0x2e, 0xae, 0xd6, 0x81, 0xcb, 0x26, 0xd2, 0xaa, 0xff, 0x01, 0xcc, - 0xd4, 0x99, 0x83, 0x7e, 0x53, 0xe0, 0xe2, 0xe0, 0xbb, 0xfb, 0x4e, 0x79, 0xc8, 0x3b, 0x43, 0x39, - 0xef, 0xee, 0xd6, 0xee, 0x4d, 0x04, 0x93, 0x3e, 0xf1, 0xbb, 0x02, 0x6b, 0x79, 0x66, 0x7b, 0x77, - 0x3c, 0xea, 0x3e, 0xa0, 0xf6, 0x60, 0x42, 0xa0, 0x54, 0xf5, 0x8b, 0x02, 0x1f, 0xf7, 0x3b, 0xd4, - 0xe7, 0xa3, 0x68, 0xfb, 0x20, 0xda, 0x57, 0xe7, 0x86, 0x48, 0x0d, 0x2f, 0x15, 0x28, 0x0e, 0xbc, - 0x1e, 0x77, 0x46, 0x71, 0x0e, 0x42, 0x69, 0x5f, 0x4f, 0x82, 0x92, 0x62, 0x5e, 0x29, 0x70, 0x29, - 0xc7, 0x3a, 0xbf, 0x1c, 0x8f, 0xb8, 0x17, 0xa7, 0xdd, 0x9f, 0x0c, 0x37, 0x40, 0x52, 0xdf, 0xfb, - 0xd6, 0x98, 0x92, 0x7a, 0x71, 0xe3, 0x4a, 0xca, 0x7b, 0xa7, 0x11, 0xc5, 0x9c, 0x67, 0xda, 0x77, - 0xcf, 0xc1, 0x9d, 0x06, 0x8e, 0x2e, 0xe6, 0x11, 0x9e, 0x8b, 0x9a, 0x00, 0x29, 0xc3, 0xbd, 0x39, - 0x8a, 0xee, 0x5d, 0xac, 0x56, 0x1d, 0x3f, 0x56, 0xae, 0x16, 0xc0, 0x52, 0xc6, 0x71, 0x3f, 0x1b, - 0x29, 0x3f, 0x15, 0xad, 0xed, 0x9c, 0x27, 0x5a, 0xae, 0xc9, 0x4d, 0x6d, 0xb0, 0xeb, 0xde, 0x19, - 0x2f, 0x79, 0x3d, 0xb0, 0xd1, 0xa6, 0x36, 0xd4, 0x6c, 0x77, 0x1f, 0xbf, 0x3e, 0x2d, 0x29, 0x6f, - 0x4e, 0x4b, 0xca, 0xbf, 0xa7, 0x25, 0xe5, 0xd5, 0x59, 0x69, 0xea, 0xcd, 0x59, 0x69, 0xea, 0xaf, - 0xb3, 0xd2, 0xd4, 0x61, 0x25, 0x75, 0xb9, 0x72, 0xe2, 0x5b, 0x3d, 0x1f, 0x5c, 0xcf, 0x53, 0xdf, - 0x72, 0xfc, 0xa6, 0x3d, 0x9a, 0x13, 0x1f, 0x5d, 0x5f, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x47, - 0x87, 0xc9, 0xcd, 0xf7, 0x0d, 0x00, 0x00, + // 1052 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x6e, 0xdb, 0x46, + 0x17, 0x35, 0xed, 0xf8, 0xef, 0x7e, 0x96, 0xed, 0x6f, 0xa0, 0xc4, 0x34, 0x1d, 0xc8, 0x09, 0xe3, + 0x26, 0x6e, 0xda, 0x48, 0xa9, 0xea, 0x34, 0x28, 0xd0, 0x24, 0xa8, 0x55, 0x3b, 0x2d, 0x10, 0x01, + 0x05, 0x63, 0xa7, 0xa8, 0x37, 0xc4, 0x98, 0x1c, 0x53, 0x84, 0xa5, 0x19, 0x96, 0x43, 0x55, 0x51, + 0x76, 0x05, 0xba, 0x0a, 0x50, 0x20, 0x40, 0x1f, 0xa0, 0xcf, 0xd0, 0xb7, 0xc8, 0x32, 0xcb, 0xa2, + 0x28, 0x82, 0xc2, 0xde, 0xf5, 0x29, 0x8a, 0x19, 0xfe, 0x84, 0x94, 0x44, 0x49, 0x56, 0xba, 0xb1, + 0x39, 0xa3, 0x7b, 0xce, 0x9c, 0xb9, 0x73, 0xef, 0x19, 0x12, 0xb6, 0x5e, 0x90, 0x00, 0x5b, 0x0d, + 0xec, 0xd2, 0x8a, 0x7c, 0x62, 0x3e, 0xa9, 0x9c, 0xb4, 0xa9, 0xe3, 0x1e, 0x37, 0x49, 0x25, 0x78, + 0x5e, 0xf6, 0x7c, 0x16, 0x30, 0xb4, 0x91, 0x44, 0x95, 0xe3, 0xa8, 0x72, 0x1c, 0xa5, 0x15, 0x1d, + 0xe6, 0x30, 0x19, 0x57, 0x11, 0x4f, 0x21, 0x44, 0xbb, 0x39, 0x80, 0xd8, 0x3b, 0x75, 0x2a, 0x16, + 0x73, 0xa9, 0xfc, 0x13, 0xc6, 0xe9, 0x3b, 0xa0, 0xd6, 0xb9, 0xf3, 0x15, 0xf1, 0x9a, 0xac, 0xfb, + 0xb4, 0xcb, 0x03, 0xd2, 0xaa, 0x31, 0x1a, 0xf8, 0xd8, 0x0a, 0x38, 0x52, 0x61, 0xde, 0xf2, 0x09, + 0x0e, 0x98, 0xaf, 0x2a, 0xd7, 0x94, 0xed, 0x45, 0x23, 0x1e, 0xea, 0x7f, 0x29, 0x70, 0x2d, 0x0f, + 0x66, 0x10, 0xee, 0x31, 0xca, 0x09, 0xba, 0x0d, 0xab, 0x6d, 0xea, 0xf2, 0x0e, 0xf6, 0x9e, 0x55, + 0xf7, 0xb1, 0x15, 0x30, 0xbf, 0x1b, 0xf1, 0xf4, 0xcd, 0xa3, 0x22, 0xcc, 0x76, 0x84, 0x4e, 0x75, + 0x5a, 0x06, 0x84, 0x03, 0xb4, 0x0d, 0x2b, 0x49, 0xa4, 0xc1, 0xda, 0x01, 0xf1, 0xd5, 0x19, 0xf9, + 0x7b, 0xef, 0x34, 0xda, 0x82, 0x82, 0xc5, 0x28, 0x25, 0x82, 0xed, 0x68, 0xef, 0x59, 0x5d, 0xbd, + 0x24, 0xe3, 0xb2, 0x93, 0xe8, 0x26, 0x2c, 0xf3, 0x8c, 0x58, 0x75, 0x56, 0x86, 0xf5, 0xcc, 0xea, + 0x2f, 0xa7, 0x61, 0xbd, 0xce, 0x9d, 0x43, 0xcf, 0xc6, 0x01, 0x39, 0x32, 0x6a, 0xd5, 0xbb, 0xdf, + 0xb9, 0x41, 0xc3, 0xf6, 0x71, 0x67, 0x9f, 0x90, 0xfc, 0xb4, 0xa0, 0x1b, 0x50, 0x78, 0xe1, 0x5b, + 0xd5, 0xbb, 0x26, 0xb6, 0x6d, 0x9f, 0x70, 0x1e, 0xed, 0x66, 0x49, 0x4e, 0x7e, 0x19, 0xce, 0xa1, + 0xef, 0x61, 0x95, 0x92, 0x8e, 0xd9, 0x89, 0x18, 0xcd, 0x13, 0x42, 0xd4, 0x39, 0x11, 0xb7, 0x5b, + 0x79, 0xfd, 0x76, 0x73, 0xea, 0xcf, 0xb7, 0x9b, 0xb7, 0x1c, 0x37, 0x68, 0xb4, 0x8f, 0xcb, 0x16, + 0x6b, 0x55, 0x2c, 0xc6, 0x5b, 0x8c, 0x47, 0xff, 0xee, 0x70, 0xfb, 0xb4, 0x12, 0x74, 0x3d, 0xc2, + 0xcb, 0x87, 0x2e, 0x0d, 0x8c, 0x65, 0x4a, 0x3a, 0x69, 0x65, 0x4f, 0xa1, 0x20, 0xa8, 0x1d, 0xcc, + 0xcd, 0xa6, 0xdb, 0x72, 0x03, 0x75, 0x7e, 0x32, 0xde, 0xff, 0x51, 0xd2, 0x79, 0x8c, 0xf9, 0x13, + 0xc1, 0xa1, 0xdf, 0x80, 0xeb, 0xb9, 0xb9, 0x88, 0xcf, 0x5a, 0xf7, 0x61, 0x2d, 0x09, 0xca, 0xd6, + 0xc3, 0x90, 0x74, 0x3d, 0x80, 0x0d, 0x21, 0x37, 0x4c, 0xbe, 0x69, 0x45, 0x80, 0x9e, 0xe4, 0xa9, + 0x94, 0x74, 0xb2, 0x8c, 0x51, 0x22, 0xf5, 0xeb, 0xb0, 0x99, 0xb3, 0x66, 0x22, 0xeb, 0xb7, 0x69, + 0xd0, 0x92, 0x3a, 0xdd, 0x8f, 0x3a, 0xa6, 0xc6, 0x5c, 0x2a, 0x37, 0x32, 0x44, 0x5a, 0x11, 0x66, + 0xf7, 0x44, 0x48, 0x5c, 0x8f, 0x72, 0x80, 0xb6, 0x61, 0xf5, 0x84, 0xf9, 0xc4, 0x75, 0xa8, 0x29, + 0x5b, 0xcb, 0x74, 0x6d, 0x59, 0x90, 0x33, 0xc6, 0x72, 0x34, 0x5f, 0x13, 0xd3, 0xdf, 0xd8, 0x48, + 0x83, 0x05, 0x9b, 0x58, 0x6e, 0x0b, 0x37, 0xb9, 0x2c, 0xc5, 0x82, 0x91, 0x8c, 0x11, 0x82, 0x4b, + 0x14, 0xb7, 0x48, 0x54, 0x7b, 0xf2, 0x19, 0x5d, 0x81, 0x39, 0xde, 0x6d, 0x1d, 0xb3, 0x66, 0x58, + 0x0a, 0x46, 0x34, 0x42, 0xbb, 0xb0, 0x28, 0x9a, 0xd5, 0x14, 0x87, 0x23, 0x4f, 0x73, 0xb9, 0xfa, + 0x41, 0x79, 0x80, 0x1b, 0x78, 0xa7, 0x4e, 0x59, 0x76, 0xb5, 0xd8, 0xdc, 0x41, 0xd7, 0x23, 0xc6, + 0x82, 0x15, 0x3d, 0xa1, 0x0d, 0x58, 0x7c, 0x57, 0x11, 0x0b, 0x52, 0xee, 0x82, 0x13, 0x9f, 0xee, + 0x43, 0xd0, 0xf3, 0x13, 0x94, 0xb4, 0xb2, 0x0a, 0xf3, 0xf1, 0xa9, 0x44, 0x89, 0x8a, 0x86, 0xfa, + 0x21, 0x14, 0xeb, 0xdc, 0x31, 0x48, 0x8b, 0xfd, 0x48, 0xf6, 0xa3, 0x1c, 0x30, 0x97, 0xbe, 0x67, + 0x93, 0xe8, 0x25, 0xb8, 0x3a, 0x88, 0x36, 0x39, 0xd8, 0x9f, 0x95, 0x54, 0x87, 0xc6, 0xc7, 0xbe, + 0xdb, 0x0d, 0x88, 0xc5, 0xec, 0x61, 0x1d, 0xfa, 0x21, 0xac, 0xe6, 0xd4, 0xd9, 0x8a, 0x95, 0x2d, + 0x2f, 0xa4, 0x87, 0xcd, 0x24, 0x08, 0xcd, 0x06, 0xe6, 0x8d, 0xc8, 0x7a, 0x44, 0x6f, 0xd4, 0x98, + 0x4d, 0xbe, 0xc6, 0xbc, 0x91, 0xe9, 0x8d, 0x5e, 0x15, 0x89, 0xd6, 0xdf, 0x15, 0x59, 0x84, 0xa9, + 0x0e, 0x7a, 0xe2, 0xfe, 0xd0, 0x76, 0x6d, 0x37, 0xe8, 0xd6, 0xb0, 0xf7, 0xbe, 0x76, 0x72, 0x00, + 0x85, 0x66, 0x4c, 0x67, 0x5a, 0xd8, 0x0b, 0x65, 0x5e, 0xbc, 0xe7, 0x97, 0x9a, 0x29, 0x51, 0xfa, + 0x96, 0x2c, 0x8b, 0x1c, 0xc9, 0xc9, 0xce, 0x0c, 0x28, 0xd4, 0xb9, 0xf3, 0x2d, 0x6e, 0x73, 0x32, + 0xaa, 0xa1, 0x6e, 0xc1, 0x4a, 0x66, 0x2f, 0x44, 0xec, 0x66, 0x46, 0x78, 0x6f, 0x7a, 0x37, 0x84, + 0xeb, 0x6b, 0x70, 0x39, 0xc3, 0x99, 0x2c, 0x76, 0x00, 0x2b, 0x42, 0x12, 0xf5, 0xfe, 0xd3, 0xe5, + 0xd6, 0x43, 0xe3, 0x4a, 0xb1, 0x26, 0x0b, 0xb6, 0xe5, 0xd5, 0x18, 0xe6, 0xe0, 0x31, 0x0e, 0x48, + 0x07, 0x77, 0xc7, 0x30, 0xb5, 0x47, 0x70, 0x35, 0xf4, 0x60, 0x09, 0xc8, 0x73, 0xb5, 0x75, 0xe9, + 0xb0, 0x19, 0xce, 0xb8, 0xf4, 0x75, 0x79, 0xb5, 0x0e, 0x5c, 0x36, 0x96, 0x56, 0xfd, 0x07, 0x60, + 0xa6, 0xce, 0x1d, 0xf4, 0x8b, 0x02, 0x97, 0x07, 0xdf, 0xdd, 0xf7, 0xca, 0x43, 0xde, 0x19, 0xca, + 0x79, 0x77, 0xb7, 0xf6, 0x60, 0x22, 0x58, 0xe2, 0x13, 0xbf, 0x2a, 0xb0, 0x96, 0x67, 0xb6, 0xf7, + 0xc7, 0xa3, 0xee, 0x03, 0x6a, 0x8f, 0x26, 0x04, 0x26, 0xaa, 0x7e, 0x52, 0xe0, 0xff, 0xfd, 0x0e, + 0xf5, 0xc9, 0x28, 0xda, 0x3e, 0x88, 0xf6, 0xf9, 0x85, 0x21, 0x89, 0x86, 0x97, 0x0a, 0x14, 0x07, + 0x5e, 0x8f, 0x3b, 0xa3, 0x38, 0x07, 0xa1, 0xb4, 0x2f, 0x26, 0x41, 0x25, 0x62, 0x5e, 0x29, 0x70, + 0x25, 0xc7, 0x3a, 0x3f, 0x1b, 0x8f, 0xb8, 0x17, 0xa7, 0x3d, 0x9c, 0x0c, 0x37, 0x40, 0x52, 0xdf, + 0xfb, 0xd6, 0x98, 0x92, 0x7a, 0x71, 0xe3, 0x4a, 0xca, 0x7b, 0xa7, 0x91, 0xc5, 0x9c, 0x67, 0xda, + 0xf7, 0x2f, 0xc0, 0x9d, 0x06, 0x8e, 0x2e, 0xe6, 0x11, 0x9e, 0x8b, 0x9a, 0x00, 0x29, 0xc3, 0xbd, + 0x3d, 0x8a, 0xee, 0x5d, 0xac, 0x56, 0x1d, 0x3f, 0x36, 0x59, 0xcd, 0x87, 0xa5, 0x8c, 0xe3, 0x7e, + 0x3c, 0x52, 0x7e, 0x2a, 0x5a, 0xdb, 0xb9, 0x48, 0x74, 0xb2, 0xa6, 0x30, 0xb5, 0xc1, 0xae, 0x7b, + 0x6f, 0xbc, 0xe4, 0xf5, 0xc0, 0x46, 0x9b, 0xda, 0x50, 0xb3, 0xdd, 0xdd, 0x7b, 0x7d, 0x56, 0x52, + 0xde, 0x9c, 0x95, 0x94, 0xbf, 0xcf, 0x4a, 0xca, 0xab, 0xf3, 0xd2, 0xd4, 0x9b, 0xf3, 0xd2, 0xd4, + 0x1f, 0xe7, 0xa5, 0xa9, 0xa3, 0x8f, 0x52, 0x97, 0xab, 0x20, 0xbe, 0x13, 0x7e, 0x70, 0x51, 0x66, + 0x93, 0xca, 0xf3, 0xd4, 0x77, 0x9c, 0xb8, 0x65, 0x8f, 0xe7, 0xe4, 0x07, 0xd7, 0xa7, 0xff, 0x06, + 0x00, 0x00, 0xff, 0xff, 0x17, 0x9a, 0xd9, 0x4c, 0xf3, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/fungible/types/zrc20_test.go b/x/fungible/types/zrc20_test.go index ca74e8c6ad..8c001ac0d5 100644 --- a/x/fungible/types/zrc20_test.go +++ b/x/fungible/types/zrc20_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/fungible/types" + "github.com/zeta-chain/node/x/fungible/types" ) func TestNewZRC20Data(t *testing.T) { diff --git a/x/ibccrosschain/client/cli/query.go b/x/ibccrosschain/client/cli/query.go index 1c8e81aec9..e726da5ead 100644 --- a/x/ibccrosschain/client/cli/query.go +++ b/x/ibccrosschain/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) // GetQueryCmd returns the cli query commands for ibccrosschain module diff --git a/x/ibccrosschain/client/cli/tx.go b/x/ibccrosschain/client/cli/tx.go index cc92e0ea95..a2f2f15ab1 100644 --- a/x/ibccrosschain/client/cli/tx.go +++ b/x/ibccrosschain/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) // GetTxCmd returns the transaction commands for ibccrosschain module diff --git a/x/ibccrosschain/genesis.go b/x/ibccrosschain/genesis.go index 9f32a2e2de..6b1da809ea 100644 --- a/x/ibccrosschain/genesis.go +++ b/x/ibccrosschain/genesis.go @@ -3,8 +3,8 @@ package ibccrosschain import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/keeper" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) // InitGenesis initializes the ibccrosschain module's state from a provided genesis state diff --git a/x/ibccrosschain/ibc_module.go b/x/ibccrosschain/ibc_module.go index b745e2910f..8b43aa0bd0 100644 --- a/x/ibccrosschain/ibc_module.go +++ b/x/ibccrosschain/ibc_module.go @@ -7,7 +7,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" + "github.com/zeta-chain/node/x/ibccrosschain/keeper" ) var ( diff --git a/x/ibccrosschain/keeper/grpc_query.go b/x/ibccrosschain/keeper/grpc_query.go index 414ad58269..4118511d6b 100644 --- a/x/ibccrosschain/keeper/grpc_query.go +++ b/x/ibccrosschain/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ibccrosschain/keeper/keeper.go b/x/ibccrosschain/keeper/keeper.go index 1e7f567b49..51f1844b86 100644 --- a/x/ibccrosschain/keeper/keeper.go +++ b/x/ibccrosschain/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) // Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine diff --git a/x/ibccrosschain/keeper/msg_server.go b/x/ibccrosschain/keeper/msg_server.go index c74fd04024..b9563a3394 100644 --- a/x/ibccrosschain/keeper/msg_server.go +++ b/x/ibccrosschain/keeper/msg_server.go @@ -1,6 +1,6 @@ package keeper -import "github.com/zeta-chain/zetacore/x/ibccrosschain/types" +import "github.com/zeta-chain/node/x/ibccrosschain/types" type msgServer struct { Keeper diff --git a/x/ibccrosschain/module.go b/x/ibccrosschain/module.go index acc7be0423..9d90446107 100644 --- a/x/ibccrosschain/module.go +++ b/x/ibccrosschain/module.go @@ -14,9 +14,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/ibccrosschain/client/cli" - "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper" - "github.com/zeta-chain/zetacore/x/ibccrosschain/types" + "github.com/zeta-chain/node/x/ibccrosschain/client/cli" + "github.com/zeta-chain/node/x/ibccrosschain/keeper" + "github.com/zeta-chain/node/x/ibccrosschain/types" ) var ( diff --git a/x/ibccrosschain/types/genesis.pb.go b/x/ibccrosschain/types/genesis.pb.go index 57b37f942e..08b3281f09 100644 --- a/x/ibccrosschain/types/genesis.pb.go +++ b/x/ibccrosschain/types/genesis.pb.go @@ -69,17 +69,18 @@ func init() { } var fileDescriptor_787966a214cc1ca3 = []byte{ - // 158 bytes of a gzipped FileDescriptorProto + // 163 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xab, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x33, 0x93, 0x92, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0xc2, 0xe9, 0xa9, 0x79, 0xa9, 0xc5, 0x99, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x0a, 0x70, 0xf5, 0x7a, 0x30, 0xf5, 0x7a, 0x28, 0xea, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x8a, 0xf5, 0x41, 0x2c, 0x88, 0x3e, 0x25, 0x3e, 0x2e, 0x1e, 0x77, 0x88, - 0x41, 0xc1, 0x25, 0x89, 0x25, 0xa9, 0x4e, 0x7e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, + 0x41, 0xc1, 0x25, 0x89, 0x25, 0xa9, 0x4e, 0x5e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, - 0xc7, 0x10, 0x65, 0x92, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x76, 0x92, - 0x2e, 0x9a, 0xeb, 0x2a, 0xd0, 0xdc, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xb6, 0xc6, - 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x7b, 0x9e, 0xb1, 0xd0, 0x00, 0x00, 0x00, + 0xc7, 0x10, 0x65, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x76, 0x92, + 0x2e, 0xc4, 0x19, 0x79, 0xf9, 0x29, 0xa9, 0xfa, 0x15, 0x68, 0x6e, 0x2b, 0xa9, 0x2c, 0x48, 0x2d, + 0x4e, 0x62, 0x03, 0x5b, 0x61, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x55, 0x2e, 0x66, 0xcc, + 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibccrosschain/types/query.pb.go b/x/ibccrosschain/types/query.pb.go index b2cefa7ab1..788da3e1d1 100644 --- a/x/ibccrosschain/types/query.pb.go +++ b/x/ibccrosschain/types/query.pb.go @@ -28,16 +28,16 @@ func init() { } var fileDescriptor_0e06553cbe2eb6e6 = []byte{ - // 138 bytes of a gzipped FileDescriptorProto + // 143 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xa9, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x33, 0x93, 0x92, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0xc2, 0x85, 0xa5, 0xa9, 0x45, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x0a, 0x70, 0xd5, 0x7a, 0x30, 0xd5, 0x7a, 0x28, 0xaa, 0x8d, 0xd8, 0xb9, 0x58, 0x03, - 0x41, 0x1a, 0x9c, 0xfc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, - 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x24, - 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x6c, 0xa7, 0x2e, 0x9a, 0xf5, 0x15, - 0x68, 0x0e, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xbb, 0xc0, 0x18, 0x10, 0x00, 0x00, - 0xff, 0xff, 0x03, 0xc2, 0x92, 0x0e, 0xb1, 0x00, 0x00, 0x00, + 0x41, 0x1a, 0x9c, 0xbc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, + 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x20, + 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x17, 0x6c, 0xa7, 0x2e, 0xc4, 0x9e, 0xbc, + 0xfc, 0x94, 0x54, 0xfd, 0x0a, 0x34, 0xcb, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xb6, + 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x56, 0xe6, 0x3f, 0x78, 0xad, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibccrosschain/types/tx.pb.go b/x/ibccrosschain/types/tx.pb.go index 3f79c86c94..839762c013 100644 --- a/x/ibccrosschain/types/tx.pb.go +++ b/x/ibccrosschain/types/tx.pb.go @@ -29,17 +29,17 @@ func init() { } var fileDescriptor_3618214015c2c1fb = []byte{ - // 147 bytes of a gzipped FileDescriptorProto + // 152 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xac, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x33, 0x93, 0x92, 0x93, 0x8b, 0xf2, 0x8b, 0x8b, 0x21, 0xc2, 0x25, 0x15, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x0a, 0x70, 0xa5, 0x7a, 0x30, 0xa5, 0x7a, 0x28, 0x4a, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x8a, - 0xf5, 0x41, 0x2c, 0x88, 0x3e, 0x23, 0x56, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0x27, 0xbf, 0x13, 0x8f, + 0xf5, 0x41, 0x2c, 0x88, 0x3e, 0x23, 0x56, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0x27, 0xaf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, - 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, - 0x4b, 0xce, 0xcf, 0x05, 0x3b, 0x42, 0x17, 0xcd, 0x3d, 0x15, 0xe8, 0x2e, 0xaa, 0x2c, 0x48, 0x2d, - 0x4e, 0x62, 0x03, 0x9b, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x51, 0x12, 0x34, 0xc2, - 0x00, 0x00, 0x00, + 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, + 0x4b, 0xce, 0xcf, 0x05, 0x3b, 0x42, 0x17, 0x62, 0x71, 0x5e, 0x7e, 0x4a, 0xaa, 0x7e, 0x05, 0xba, + 0x6b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x26, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x18, 0x70, 0xed, 0xb7, 0xbe, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lightclient/client/cli/query.go b/x/lightclient/client/cli/query.go index b0fe0e7f38..4de22473e5 100644 --- a/x/lightclient/client/cli/query.go +++ b/x/lightclient/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/lightclient/client/cli/query_block_header.go b/x/lightclient/client/cli/query_block_header.go index 16281c4d05..eed608c23c 100644 --- a/x/lightclient/client/cli/query_block_header.go +++ b/x/lightclient/client/cli/query_block_header.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) func CmdListBlockHeader() *cobra.Command { diff --git a/x/lightclient/client/cli/query_chain_state.go b/x/lightclient/client/cli/query_chain_state.go index 283b699fe2..2c5313f464 100644 --- a/x/lightclient/client/cli/query_chain_state.go +++ b/x/lightclient/client/cli/query_chain_state.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) func CmdListChainState() *cobra.Command { diff --git a/x/lightclient/client/cli/query_verification_flags.go b/x/lightclient/client/cli/query_verification_flags.go index 112aac151e..3b6ca798e3 100644 --- a/x/lightclient/client/cli/query_verification_flags.go +++ b/x/lightclient/client/cli/query_verification_flags.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) func CmdShowHeaderHeaderSupportedChains() *cobra.Command { diff --git a/x/lightclient/client/cli/tx.go b/x/lightclient/client/cli/tx.go index 41dbb09c56..a0e7475454 100644 --- a/x/lightclient/client/cli/tx.go +++ b/x/lightclient/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/lightclient/client/cli/tx_disable_verification_flags.go b/x/lightclient/client/cli/tx_disable_verification_flags.go index 41ba1203a6..c49c68c327 100644 --- a/x/lightclient/client/cli/tx_disable_verification_flags.go +++ b/x/lightclient/client/cli/tx_disable_verification_flags.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) func CmdDisableVerificationFlags() *cobra.Command { diff --git a/x/lightclient/client/cli/tx_enable_verification_flags.go b/x/lightclient/client/cli/tx_enable_verification_flags.go index d8866c7400..ff8c0d91c6 100644 --- a/x/lightclient/client/cli/tx_enable_verification_flags.go +++ b/x/lightclient/client/cli/tx_enable_verification_flags.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) func CmdEnableVerificationFlags() *cobra.Command { diff --git a/x/lightclient/genesis.go b/x/lightclient/genesis.go index 13742d9281..3eacd20bf6 100644 --- a/x/lightclient/genesis.go +++ b/x/lightclient/genesis.go @@ -3,8 +3,8 @@ package lightclient import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/lightclient/keeper" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/keeper" + "github.com/zeta-chain/node/x/lightclient/types" ) // InitGenesis initializes the lightclient module's state from a provided genesis state diff --git a/x/lightclient/genesis_test.go b/x/lightclient/genesis_test.go index 69409ec911..6589ae9f53 100644 --- a/x/lightclient/genesis_test.go +++ b/x/lightclient/genesis_test.go @@ -5,13 +5,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestGenesis(t *testing.T) { diff --git a/x/lightclient/keeper/block_header.go b/x/lightclient/keeper/block_header.go index 4e4cc6089e..eccab74224 100644 --- a/x/lightclient/keeper/block_header.go +++ b/x/lightclient/keeper/block_header.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" ) // GetAllBlockHeaders returns all block headers diff --git a/x/lightclient/keeper/block_header_test.go b/x/lightclient/keeper/block_header_test.go index e8cf036d91..2af5636efc 100644 --- a/x/lightclient/keeper/block_header_test.go +++ b/x/lightclient/keeper/block_header_test.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) // readReceipt reads a receipt from a file. diff --git a/x/lightclient/keeper/block_header_verification.go b/x/lightclient/keeper/block_header_verification.go index c06609a0d0..bc31d88aa8 100644 --- a/x/lightclient/keeper/block_header_verification.go +++ b/x/lightclient/keeper/block_header_verification.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // SetBlockHeaderVerification sets BlockHeaderVerification settings for all chains diff --git a/x/lightclient/keeper/block_header_verification_test.go b/x/lightclient/keeper/block_header_verification_test.go index 4ca08a224e..2ee1072910 100644 --- a/x/lightclient/keeper/block_header_verification_test.go +++ b/x/lightclient/keeper/block_header_verification_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_GetBlockHeaderVerification(t *testing.T) { diff --git a/x/lightclient/keeper/chain_state.go b/x/lightclient/keeper/chain_state.go index 2e439a0657..e00d5565af 100644 --- a/x/lightclient/keeper/chain_state.go +++ b/x/lightclient/keeper/chain_state.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // GetAllChainStates returns all chain states diff --git a/x/lightclient/keeper/chain_state_test.go b/x/lightclient/keeper/chain_state_test.go index 4ad91e167a..416c213beb 100644 --- a/x/lightclient/keeper/chain_state_test.go +++ b/x/lightclient/keeper/chain_state_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) // TestKeeper_GetChainState tests get, and set chain state diff --git a/x/lightclient/keeper/grpc_query.go b/x/lightclient/keeper/grpc_query.go index e1aee5607e..f9c79cf79d 100644 --- a/x/lightclient/keeper/grpc_query.go +++ b/x/lightclient/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/lightclient/keeper/grpc_query_block_header.go b/x/lightclient/keeper/grpc_query_block_header.go index 2f4a1945ef..c48a803ece 100644 --- a/x/lightclient/keeper/grpc_query_block_header.go +++ b/x/lightclient/keeper/grpc_query_block_header.go @@ -8,8 +8,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" ) // BlockHeaderAll queries all block headers diff --git a/x/lightclient/keeper/grpc_query_block_header_test.go b/x/lightclient/keeper/grpc_query_block_header_test.go index 0ccc6b81ce..96513a1989 100644 --- a/x/lightclient/keeper/grpc_query_block_header_test.go +++ b/x/lightclient/keeper/grpc_query_block_header_test.go @@ -7,11 +7,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_BlockHeaderAll(t *testing.T) { diff --git a/x/lightclient/keeper/grpc_query_chain_state.go b/x/lightclient/keeper/grpc_query_chain_state.go index 1c648a5b2a..ee4d045118 100644 --- a/x/lightclient/keeper/grpc_query_chain_state.go +++ b/x/lightclient/keeper/grpc_query_chain_state.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // ChainStateAll queries all chain statess diff --git a/x/lightclient/keeper/grpc_query_chain_state_test.go b/x/lightclient/keeper/grpc_query_chain_state_test.go index 542cf0d8aa..cc03e14260 100644 --- a/x/lightclient/keeper/grpc_query_chain_state_test.go +++ b/x/lightclient/keeper/grpc_query_chain_state_test.go @@ -7,10 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_ChainStateAll(t *testing.T) { diff --git a/x/lightclient/keeper/grpc_query_header_enabled_chains.go b/x/lightclient/keeper/grpc_query_header_enabled_chains.go index 7408923ad8..6b1aa3a514 100644 --- a/x/lightclient/keeper/grpc_query_header_enabled_chains.go +++ b/x/lightclient/keeper/grpc_query_header_enabled_chains.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // HeaderSupportedChains implements the Query/HeaderEnabledChains gRPC method diff --git a/x/lightclient/keeper/grpc_query_header_enabled_chains_test.go b/x/lightclient/keeper/grpc_query_header_enabled_chains_test.go index 6747510fb3..e3f75d9ece 100644 --- a/x/lightclient/keeper/grpc_query_header_enabled_chains_test.go +++ b/x/lightclient/keeper/grpc_query_header_enabled_chains_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_HeaderSupportedChains(t *testing.T) { diff --git a/x/lightclient/keeper/grpc_query_prove.go b/x/lightclient/keeper/grpc_query_prove.go index b231906501..7b6668de10 100644 --- a/x/lightclient/keeper/grpc_query_prove.go +++ b/x/lightclient/keeper/grpc_query_prove.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" ) // Prove checks two things: diff --git a/x/lightclient/keeper/grpc_query_prove_test.go b/x/lightclient/keeper/grpc_query_prove_test.go index 5cbc78befd..3b5b7d29ba 100644 --- a/x/lightclient/keeper/grpc_query_prove_test.go +++ b/x/lightclient/keeper/grpc_query_prove_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) // TODO: Add test for Bitcoin proof verification diff --git a/x/lightclient/keeper/keeper.go b/x/lightclient/keeper/keeper.go index c37b0be358..07c558bc52 100644 --- a/x/lightclient/keeper/keeper.go +++ b/x/lightclient/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine diff --git a/x/lightclient/keeper/msg_server.go b/x/lightclient/keeper/msg_server.go index 6f67361196..4dc584a8d6 100644 --- a/x/lightclient/keeper/msg_server.go +++ b/x/lightclient/keeper/msg_server.go @@ -1,6 +1,6 @@ package keeper -import "github.com/zeta-chain/zetacore/x/lightclient/types" +import "github.com/zeta-chain/node/x/lightclient/types" type msgServer struct { Keeper diff --git a/x/lightclient/keeper/msg_server_disable_block_header_verification._test.go b/x/lightclient/keeper/msg_server_disable_block_header_verification._test.go index c3f9f9d52a..65d1fade1f 100644 --- a/x/lightclient/keeper/msg_server_disable_block_header_verification._test.go +++ b/x/lightclient/keeper/msg_server_disable_block_header_verification._test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/lightclient/keeper" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/lightclient/keeper" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestMsgServer_DisableVerificationFlags(t *testing.T) { diff --git a/x/lightclient/keeper/msg_server_disable_block_header_verification.go b/x/lightclient/keeper/msg_server_disable_block_header_verification.go index c38bac327b..d65dbaf6e5 100644 --- a/x/lightclient/keeper/msg_server_disable_block_header_verification.go +++ b/x/lightclient/keeper/msg_server_disable_block_header_verification.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/lightclient/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // DisableHeaderVerification disables the verification flags for the given chain IDs diff --git a/x/lightclient/keeper/msg_server_enable_block_header_verification.go b/x/lightclient/keeper/msg_server_enable_block_header_verification.go index 0b0613c8e2..b055fd33a6 100644 --- a/x/lightclient/keeper/msg_server_enable_block_header_verification.go +++ b/x/lightclient/keeper/msg_server_enable_block_header_verification.go @@ -6,8 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/lightclient/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/lightclient/types" ) // EnableHeaderVerification enables the verification flags for the given chain IDs diff --git a/x/lightclient/keeper/msg_server_enable_block_header_verification_test.go b/x/lightclient/keeper/msg_server_enable_block_header_verification_test.go index 96c5444123..95dae36e0e 100644 --- a/x/lightclient/keeper/msg_server_enable_block_header_verification_test.go +++ b/x/lightclient/keeper/msg_server_enable_block_header_verification_test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/lightclient/keeper" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/lightclient/keeper" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestMsgServer_EnableVerificationFlags(t *testing.T) { diff --git a/x/lightclient/keeper/proof.go b/x/lightclient/keeper/proof.go index ddc26eb12f..0c8ed48899 100644 --- a/x/lightclient/keeper/proof.go +++ b/x/lightclient/keeper/proof.go @@ -4,9 +4,9 @@ import ( cosmoserror "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" ) // VerifyProof verifies the merkle proof for a given chain and block header diff --git a/x/lightclient/keeper/proof_test.go b/x/lightclient/keeper/proof_test.go index b7d8be2101..4b9ebe1cc2 100644 --- a/x/lightclient/keeper/proof_test.go +++ b/x/lightclient/keeper/proof_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestKeeper_VerifyProof(t *testing.T) { diff --git a/x/lightclient/module.go b/x/lightclient/module.go index c5bb382236..321eb9de29 100644 --- a/x/lightclient/module.go +++ b/x/lightclient/module.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/lightclient/client/cli" - "github.com/zeta-chain/zetacore/x/lightclient/keeper" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/x/lightclient/client/cli" + "github.com/zeta-chain/node/x/lightclient/keeper" + "github.com/zeta-chain/node/x/lightclient/types" ) var ( diff --git a/x/lightclient/types/block_header_verification.pb.go b/x/lightclient/types/block_header_verification.pb.go index 8f3f5ee419..de846026c8 100644 --- a/x/lightclient/types/block_header_verification.pb.go +++ b/x/lightclient/types/block_header_verification.pb.go @@ -131,25 +131,25 @@ func init() { } var fileDescriptor_deea61e47e024601 = []byte{ - // 281 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xab, 0x4a, 0x2d, 0x49, - 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x73, 0x32, 0xd3, 0x33, - 0x4a, 0x92, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0xf4, 0x93, 0x72, 0xf2, 0x93, 0xb3, 0xe3, 0x33, 0x52, - 0x13, 0x53, 0x52, 0x8b, 0xe2, 0xcb, 0x52, 0x8b, 0x32, 0xd3, 0x32, 0x93, 0x13, 0x4b, 0x32, 0xf3, - 0xf3, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0xe0, 0xfa, 0xf5, 0x60, 0xfa, 0xf5, 0x90, - 0xf4, 0x4b, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x95, 0xea, 0x83, 0x58, 0x10, 0x5d, 0x4a, 0xde, - 0x5c, 0x22, 0x1e, 0x60, 0x23, 0x83, 0x4b, 0x0b, 0x0a, 0xf2, 0x8b, 0x4a, 0x52, 0x53, 0x9c, 0x41, - 0x46, 0x08, 0x49, 0x72, 0x71, 0x80, 0xcd, 0x8a, 0xcf, 0x4c, 0x91, 0x60, 0x54, 0x60, 0xd4, 0x60, - 0x0e, 0x62, 0x07, 0xf3, 0x3d, 0x53, 0x84, 0x24, 0xb8, 0xd8, 0x53, 0xf3, 0x12, 0x93, 0x72, 0x52, - 0x53, 0x24, 0x98, 0x14, 0x18, 0x35, 0x38, 0x82, 0x60, 0x5c, 0xa5, 0x5e, 0x46, 0x2e, 0x71, 0x27, - 0x90, 0x33, 0x21, 0x46, 0x86, 0x21, 0x39, 0x52, 0xa8, 0x88, 0x4b, 0x1c, 0xea, 0xf6, 0x62, 0x98, - 0x4d, 0xf1, 0x60, 0x13, 0x8b, 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x4c, 0xf4, 0xf0, 0x7b, - 0x40, 0x0f, 0x9b, 0x3b, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x12, 0xcd, 0xc0, 0x22, 0x57, - 0xec, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, - 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x46, 0xe9, 0x99, - 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xe0, 0xd0, 0xd6, 0x45, 0x0b, 0xf8, 0x0a, 0x94, - 0xa0, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x87, 0x98, 0x31, 0x20, 0x00, 0x00, 0xff, - 0xff, 0xf3, 0x4c, 0xcf, 0xdf, 0xa9, 0x01, 0x00, 0x00, + // 286 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4b, 0xc4, 0x30, + 0x14, 0xc7, 0x1b, 0x4f, 0xbc, 0x23, 0x6e, 0xe5, 0xe4, 0xaa, 0x43, 0x2c, 0x37, 0x75, 0x31, 0x05, + 0x75, 0x76, 0xa8, 0xcb, 0x89, 0x5b, 0x05, 0x07, 0x97, 0xd2, 0x36, 0xcf, 0x36, 0x58, 0xfb, 0x4a, + 0x9a, 0x13, 0xf5, 0x3b, 0x08, 0x7e, 0xac, 0x1b, 0x6f, 0x74, 0x12, 0x69, 0xbf, 0x88, 0x34, 0xb5, + 0x72, 0xc2, 0xe1, 0xf6, 0x1e, 0xc9, 0xff, 0x97, 0x7f, 0x7e, 0xf4, 0xe2, 0x15, 0x74, 0x9c, 0xe6, + 0xb1, 0x2c, 0x7d, 0x33, 0xa1, 0x02, 0xbf, 0x90, 0x59, 0xae, 0xd3, 0x42, 0x42, 0xa9, 0xfd, 0xa4, + 0xc0, 0xf4, 0x21, 0xca, 0x21, 0x16, 0xa0, 0xa2, 0x27, 0x50, 0xf2, 0x5e, 0xa6, 0xb1, 0x96, 0x58, + 0xf2, 0x4a, 0xa1, 0x46, 0x9b, 0xfd, 0xe6, 0xf9, 0x90, 0xe7, 0x1b, 0xf9, 0xa3, 0x69, 0x86, 0x19, + 0x9a, 0xab, 0x7e, 0x37, 0xf5, 0xa9, 0xf9, 0x35, 0x9d, 0x2e, 0x0c, 0xf2, 0x66, 0x59, 0x55, 0xa8, + 0x34, 0x88, 0xcb, 0x0e, 0x61, 0x1f, 0xd2, 0x89, 0x61, 0x45, 0x52, 0x38, 0xc4, 0x25, 0xde, 0x28, + 0x1c, 0x9b, 0xfd, 0x4a, 0xd8, 0x0e, 0x1d, 0x43, 0x19, 0x27, 0x05, 0x08, 0x67, 0xc7, 0x25, 0xde, + 0x24, 0x1c, 0xd6, 0xf9, 0x1b, 0xa1, 0xb3, 0xa0, 0xab, 0xd9, 0x23, 0x6f, 0x37, 0x4a, 0xda, 0x8a, + 0xce, 0x7e, 0xba, 0xd7, 0xc3, 0x4b, 0x91, 0x21, 0xd6, 0x0e, 0x71, 0x47, 0xde, 0xfe, 0xe9, 0x39, + 0xff, 0xff, 0x03, 0x7c, 0x5b, 0xcf, 0x60, 0x77, 0xf5, 0x79, 0x6c, 0x85, 0x07, 0xf9, 0x96, 0xb3, + 0x3a, 0x58, 0xac, 0x1a, 0x46, 0xd6, 0x0d, 0x23, 0x5f, 0x0d, 0x23, 0xef, 0x2d, 0xb3, 0xd6, 0x2d, + 0xb3, 0x3e, 0x5a, 0x66, 0xdd, 0xf1, 0x4c, 0xea, 0x7c, 0x99, 0xf0, 0x14, 0x1f, 0x8d, 0xed, 0x93, + 0x5e, 0x7c, 0x89, 0x02, 0xfc, 0xe7, 0x3f, 0xda, 0xf5, 0x4b, 0x05, 0x75, 0xb2, 0x67, 0x6c, 0x9d, + 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x4b, 0xb4, 0x68, 0xa5, 0x01, 0x00, 0x00, } func (m *HeaderSupportedChain) Marshal() (dAtA []byte, err error) { diff --git a/x/lightclient/types/block_header_verification_test.go b/x/lightclient/types/block_header_verification_test.go index 01745c7e35..9fd28cab30 100644 --- a/x/lightclient/types/block_header_verification_test.go +++ b/x/lightclient/types/block_header_verification_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestBlockHeaderVerification_Validate(t *testing.T) { diff --git a/x/lightclient/types/chain_state.pb.go b/x/lightclient/types/chain_state.pb.go index 83632be913..90aa6b3746 100644 --- a/x/lightclient/types/chain_state.pb.go +++ b/x/lightclient/types/chain_state.pb.go @@ -101,7 +101,7 @@ func init() { } var fileDescriptor_b3bf7caa9a4cb463 = []byte{ - // 256 bytes of a gzipped FileDescriptorProto + // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xa8, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x73, 0x32, 0xd3, 0x33, 0x4a, 0x92, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0xf4, 0xc1, 0x52, 0xf1, 0xc5, 0x25, 0x89, 0x25, 0xa9, @@ -113,11 +113,12 @@ var fileDescriptor_b3bf7caa9a4cb463 = []byte{ 0x10, 0x41, 0x0f, 0xb0, 0x98, 0x90, 0x3a, 0x17, 0x7f, 0x6a, 0x62, 0x51, 0x4e, 0x26, 0x92, 0x32, 0x66, 0xb0, 0x32, 0x3e, 0x98, 0x30, 0x54, 0xa1, 0x16, 0x97, 0x20, 0xd4, 0xb4, 0xa4, 0x9c, 0xfc, 0xe4, 0xec, 0xf8, 0x8c, 0xc4, 0xe2, 0x0c, 0x09, 0x16, 0x05, 0x46, 0x0d, 0x9e, 0x20, 0x7e, 0x88, - 0x84, 0x13, 0x48, 0xdc, 0x23, 0xb1, 0x38, 0xc3, 0xc9, 0xe7, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, + 0x84, 0x13, 0x48, 0xdc, 0x23, 0xb1, 0x38, 0xc3, 0xc9, 0xe3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, - 0x8f, 0xe5, 0x18, 0xa2, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, - 0xc1, 0xa4, 0x8b, 0x16, 0x62, 0x15, 0x28, 0x61, 0x56, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, - 0xf6, 0xb8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xca, 0xc8, 0xb1, 0x2d, 0x62, 0x01, 0x00, 0x00, + 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xc1, + 0xc1, 0xa4, 0x0b, 0x09, 0xb1, 0xbc, 0xfc, 0x94, 0x54, 0xfd, 0x0a, 0x94, 0xf0, 0x2a, 0xa9, 0x2c, + 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xda, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x46, 0xbc, + 0x5c, 0x5e, 0x01, 0x00, 0x00, } func (m *ChainState) Marshal() (dAtA []byte, err error) { diff --git a/x/lightclient/types/expected_keepers.go b/x/lightclient/types/expected_keepers.go index 71f83b2c49..c6f61276a0 100644 --- a/x/lightclient/types/expected_keepers.go +++ b/x/lightclient/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) type AuthorityKeeper interface { diff --git a/x/lightclient/types/genesis.go b/x/lightclient/types/genesis.go index b796c678d5..7eaff3a63b 100644 --- a/x/lightclient/types/genesis.go +++ b/x/lightclient/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/zeta-chain/zetacore/pkg/proofs" + "github.com/zeta-chain/node/pkg/proofs" ) // DefaultGenesis returns the default lightclient genesis state diff --git a/x/lightclient/types/genesis.pb.go b/x/lightclient/types/genesis.pb.go index 8a26b985a5..202c37803e 100644 --- a/x/lightclient/types/genesis.pb.go +++ b/x/lightclient/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + proofs "github.com/zeta-chain/node/pkg/proofs" io "io" math "math" math_bits "math/bits" @@ -94,27 +94,28 @@ func init() { } var fileDescriptor_57c7baf4497aa1be = []byte{ - // 320 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xa9, 0x4a, 0x2d, 0x49, - 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x73, 0x32, 0xd3, 0x33, - 0x4a, 0x92, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0xf4, 0xd3, 0x53, 0xf3, 0x52, 0x8b, 0x33, 0x8b, 0xf5, - 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0xe0, 0xaa, 0xf5, 0x60, 0xaa, 0xf5, 0x90, 0x54, 0x4b, - 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x95, 0xea, 0x83, 0x58, 0x10, 0x5d, 0x52, 0x76, 0x04, 0xec, - 0x48, 0xca, 0xc9, 0x4f, 0xce, 0x8e, 0xcf, 0x48, 0x4d, 0x4c, 0x49, 0x2d, 0x8a, 0x2f, 0x4b, 0x2d, - 0xca, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x83, 0xea, 0x37, 0x20, 0xa0, 0x1f, 0x2c, - 0x15, 0x5f, 0x5c, 0x92, 0x58, 0x92, 0x0a, 0xd5, 0xa1, 0x85, 0x45, 0x47, 0x41, 0x76, 0xba, 0x7e, - 0x41, 0x51, 0x7e, 0x7e, 0x5a, 0x31, 0x94, 0x82, 0xa8, 0x55, 0xda, 0xca, 0xc4, 0xc5, 0xe3, 0x0e, - 0xf1, 0x65, 0x30, 0xc8, 0x08, 0xa1, 0x50, 0x2e, 0x5e, 0x64, 0x17, 0x15, 0x4b, 0x30, 0x2a, 0x30, - 0x6b, 0x70, 0x1b, 0x69, 0xe9, 0x61, 0xf1, 0x7c, 0x41, 0x76, 0xba, 0x1e, 0xd4, 0x34, 0x27, 0x90, - 0x1e, 0x0f, 0xb0, 0x16, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x78, 0x92, 0x10, 0x42, 0xc5, - 0x42, 0xc1, 0x5c, 0x3c, 0x48, 0x0e, 0x2d, 0x96, 0x60, 0xc2, 0x6d, 0x2a, 0x92, 0xe7, 0xf4, 0x9c, - 0x41, 0x52, 0x60, 0x87, 0x41, 0x4d, 0xe5, 0x4e, 0x86, 0x8b, 0x14, 0x0b, 0x55, 0x72, 0x49, 0xe2, - 0x0c, 0x3d, 0x09, 0x66, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x73, 0x42, 0x36, 0x20, 0x39, 0x3c, 0x0c, - 0x49, 0x3b, 0xd4, 0x3a, 0xf1, 0x24, 0x1c, 0xd2, 0x3e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, - 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, - 0x2c, 0xc7, 0x10, 0x65, 0x94, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0e, - 0x7e, 0x5d, 0xb4, 0x98, 0xa8, 0x40, 0x89, 0xbd, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, - 0x64, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x02, 0xe7, 0xb3, 0x90, 0x02, 0x00, 0x00, + // 325 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x31, 0x4e, 0xc3, 0x30, + 0x14, 0x86, 0x93, 0x16, 0x31, 0xa4, 0x65, 0x89, 0x90, 0x08, 0x1d, 0x4c, 0xc5, 0x54, 0x55, 0x60, + 0xa3, 0x32, 0xb0, 0x31, 0x94, 0x81, 0xce, 0x54, 0x30, 0xb0, 0x44, 0x89, 0xeb, 0x3a, 0x56, 0x42, + 0x1c, 0xc5, 0x06, 0x51, 0x4e, 0xc1, 0x65, 0xb8, 0x43, 0xc7, 0x8e, 0x4c, 0x08, 0x25, 0x17, 0x41, + 0x71, 0x4c, 0x31, 0x52, 0xa3, 0x4c, 0xb6, 0xfc, 0xfe, 0xef, 0x7f, 0xff, 0xf3, 0x73, 0xce, 0xde, + 0x88, 0x0c, 0x70, 0x14, 0xb0, 0x14, 0xa9, 0x1b, 0xcf, 0x09, 0x4a, 0x18, 0x8d, 0x24, 0x4e, 0x18, + 0x49, 0x25, 0xa2, 0x24, 0x25, 0x82, 0x09, 0x98, 0xe5, 0x5c, 0x72, 0x17, 0x6c, 0xd5, 0xf0, 0x57, + 0x0d, 0x0d, 0xf5, 0xe0, 0x90, 0x72, 0xca, 0x95, 0x14, 0x55, 0xb7, 0x9a, 0x1a, 0x5c, 0xb7, 0xf4, + 0x08, 0x13, 0x8e, 0x63, 0x3f, 0x22, 0xc1, 0x82, 0xe4, 0xfe, 0x0b, 0xc9, 0xd9, 0x92, 0xe1, 0x40, + 0x32, 0x9e, 0x6a, 0xfe, 0xa2, 0x85, 0x57, 0x25, 0x5f, 0xc8, 0x40, 0x12, 0x4d, 0x8c, 0x77, 0x10, + 0x59, 0x4c, 0x51, 0x96, 0x73, 0xbe, 0x14, 0xfa, 0xa8, 0xb5, 0xa7, 0x1f, 0x1d, 0xa7, 0x7f, 0x5b, + 0x4f, 0x39, 0xaf, 0x2c, 0xdc, 0x7b, 0xe7, 0xc0, 0x4c, 0x24, 0x3c, 0x7b, 0xd8, 0x1d, 0xf5, 0x26, + 0x63, 0xb8, 0x63, 0xf8, 0x2c, 0xa6, 0x50, 0xbb, 0x4d, 0x2b, 0x66, 0xa6, 0x90, 0xe9, 0xde, 0xfa, + 0xeb, 0xc4, 0xba, 0xeb, 0x87, 0x7f, 0x4f, 0xc2, 0x9d, 0x3b, 0x7d, 0x23, 0xa8, 0xf0, 0x3a, 0xcd, + 0xae, 0xc6, 0x70, 0xf0, 0xa6, 0x2a, 0xa9, 0x60, 0xda, 0xb5, 0x87, 0xb7, 0x2f, 0xc2, 0x5d, 0x39, + 0xc7, 0x8d, 0xbf, 0xe7, 0x75, 0x87, 0xf6, 0xa8, 0x37, 0xb9, 0x6a, 0xeb, 0x60, 0x04, 0x7f, 0x30, + 0x70, 0xdd, 0xee, 0x28, 0x6c, 0x28, 0xcf, 0xd6, 0x05, 0xb0, 0x37, 0x05, 0xb0, 0xbf, 0x0b, 0x60, + 0xbf, 0x97, 0xc0, 0xda, 0x94, 0xc0, 0xfa, 0x2c, 0x81, 0xf5, 0x08, 0x29, 0x93, 0xd1, 0x73, 0x08, + 0x31, 0x7f, 0x52, 0xdf, 0x7f, 0x5e, 0x6f, 0x22, 0xe5, 0x0b, 0x82, 0x5e, 0xff, 0x6d, 0x4e, 0xae, + 0x32, 0x22, 0xc2, 0x7d, 0xb5, 0x88, 0xcb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xef, 0xd4, 0x05, + 0x10, 0x8c, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/lightclient/types/genesis_test.go b/x/lightclient/types/genesis_test.go index 74ec63b21c..915982ee1c 100644 --- a/x/lightclient/types/genesis_test.go +++ b/x/lightclient/types/genesis_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/lightclient/types/message_disable_verification_flags_test.go b/x/lightclient/types/message_disable_verification_flags_test.go index 8efb9d4c04..d248d21d44 100644 --- a/x/lightclient/types/message_disable_verification_flags_test.go +++ b/x/lightclient/types/message_disable_verification_flags_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestMsgDisableHeaderVerification_ValidateBasic(t *testing.T) { diff --git a/x/lightclient/types/message_enable_verification_flags_test.go b/x/lightclient/types/message_enable_verification_flags_test.go index 2f738f36f0..66f0b1f057 100644 --- a/x/lightclient/types/message_enable_verification_flags_test.go +++ b/x/lightclient/types/message_enable_verification_flags_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/lightclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/lightclient/types" ) func TestMsgEnableHeaderVerification_ValidateBasic(t *testing.T) { diff --git a/x/lightclient/types/query.pb.go b/x/lightclient/types/query.pb.go index df137c4cfd..f0362eeb41 100644 --- a/x/lightclient/types/query.pb.go +++ b/x/lightclient/types/query.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + proofs "github.com/zeta-chain/node/pkg/proofs" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -703,63 +703,63 @@ func init() { var fileDescriptor_1ff0d7827c501c48 = []byte{ // 929 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x8f, 0xdb, 0x44, - 0x14, 0xc7, 0x77, 0xba, 0x4d, 0x7f, 0xbc, 0x6c, 0x91, 0x98, 0xb6, 0xea, 0xd6, 0xd0, 0xec, 0xd6, - 0x65, 0x69, 0x15, 0xb4, 0x76, 0x13, 0x4a, 0x11, 0xa9, 0x04, 0x6c, 0x10, 0x2c, 0x15, 0x20, 0x6d, - 0x5d, 0x71, 0xe1, 0x12, 0x39, 0xce, 0xd4, 0xb6, 0xd6, 0xf5, 0xb8, 0x9e, 0x49, 0x94, 0x52, 0xf5, - 0xc2, 0x5f, 0x80, 0x40, 0x48, 0xfc, 0x1f, 0x5c, 0x2a, 0x21, 0x84, 0xc4, 0xa9, 0x37, 0x56, 0xe2, - 0x00, 0x27, 0x84, 0x76, 0xf9, 0x43, 0x90, 0x67, 0x26, 0xeb, 0x49, 0xd6, 0xd9, 0x38, 0x61, 0x4f, - 0xf1, 0x8f, 0x79, 0xef, 0x7d, 0xbe, 0xdf, 0x79, 0x79, 0x63, 0xa8, 0x7f, 0x4d, 0xb8, 0xeb, 0x05, - 0x6e, 0x18, 0xdb, 0xe2, 0x8a, 0xa6, 0xc4, 0x8e, 0x42, 0x3f, 0xe0, 0x5e, 0x14, 0x92, 0x98, 0xdb, - 0x4f, 0xfa, 0x24, 0x7d, 0x6a, 0x25, 0x29, 0xe5, 0x14, 0xd7, 0x0e, 0xd7, 0x5a, 0xa3, 0xb5, 0x96, - 0xb6, 0xd6, 0xa8, 0x7b, 0x94, 0x3d, 0xa6, 0xcc, 0xee, 0xba, 0x8c, 0xc8, 0x40, 0x7b, 0xd0, 0xe8, - 0x12, 0xee, 0x36, 0xec, 0xc4, 0xf5, 0xc3, 0xd8, 0xe5, 0x21, 0x8d, 0x65, 0x2e, 0xe3, 0x92, 0x4f, - 0x7d, 0x2a, 0x2e, 0xed, 0xec, 0x4a, 0x3d, 0x7d, 0xdd, 0xa7, 0xd4, 0x8f, 0x88, 0xed, 0x26, 0xa1, - 0xed, 0xc6, 0x31, 0xe5, 0x22, 0x84, 0xa9, 0xb7, 0xef, 0xcf, 0x60, 0xed, 0x46, 0xd4, 0xdb, 0xed, - 0x04, 0xc4, 0xed, 0x91, 0xb4, 0x33, 0x20, 0x69, 0xf8, 0x28, 0xf4, 0xf4, 0x9a, 0xb7, 0x67, 0xc4, - 0x8b, 0x57, 0x1d, 0xc6, 0x5d, 0x4e, 0x54, 0x44, 0x91, 0x3b, 0xc9, 0xae, 0x6f, 0x27, 0x29, 0xa5, - 0x8f, 0x98, 0xfa, 0x91, 0x6b, 0xcd, 0x1e, 0x18, 0x0f, 0x32, 0xcd, 0x5b, 0x51, 0xd4, 0xce, 0x40, - 0x3e, 0x15, 0x1c, 0x0e, 0x79, 0xd2, 0x27, 0x8c, 0xe3, 0x4f, 0x00, 0x72, 0x0f, 0x56, 0xd1, 0x3a, - 0xba, 0x55, 0x6d, 0xbe, 0x69, 0x49, 0xc3, 0xac, 0xcc, 0x30, 0x4b, 0x3a, 0xad, 0x0c, 0xb3, 0x76, - 0x5c, 0x9f, 0xa8, 0x58, 0x47, 0x8b, 0x34, 0x7f, 0x41, 0xf0, 0x5a, 0x61, 0x19, 0x96, 0xd0, 0x98, - 0x11, 0xfc, 0x25, 0x5c, 0xd0, 0x6d, 0x60, 0xab, 0x68, 0x7d, 0xf9, 0x56, 0xb5, 0x59, 0xb7, 0x0a, - 0xf6, 0x2e, 0xd9, 0xf5, 0x2d, 0x25, 0x41, 0x4b, 0xd5, 0x3e, 0xfd, 0xf2, 0xef, 0xb5, 0x25, 0x67, - 0xa5, 0x9b, 0x3f, 0x62, 0x78, 0x7b, 0x0c, 0xff, 0x94, 0xc0, 0xbf, 0x39, 0x13, 0x5f, 0x32, 0x8d, - 0xf1, 0xdf, 0x53, 0x2e, 0x6d, 0x13, 0x5e, 0xe0, 0xd2, 0x35, 0x00, 0x45, 0xef, 0xb2, 0x40, 0xb8, - 0xb4, 0xe2, 0x9c, 0x97, 0x20, 0x2e, 0x0b, 0xcc, 0x48, 0x69, 0x9f, 0x0c, 0x56, 0xda, 0xbf, 0x80, - 0x15, 0x5d, 0xbb, 0x72, 0x79, 0x0e, 0xe9, 0x4e, 0x55, 0x13, 0x6d, 0x7a, 0x70, 0x75, 0xe4, 0xf4, - 0x47, 0x59, 0xf4, 0xc3, 0xac, 0x31, 0x4e, 0x7a, 0x3f, 0x5f, 0xa0, 0xbc, 0x6d, 0xf4, 0x2a, 0x4a, - 0xd2, 0x03, 0xa8, 0x6a, 0x5d, 0x79, 0xdc, 0x66, 0x6a, 0x8d, 0x6c, 0xe5, 0x89, 0xd4, 0x66, 0x82, - 0x77, 0xf8, 0xe4, 0xe4, 0xb6, 0xf2, 0xae, 0xf2, 0x67, 0x9b, 0xf0, 0xa3, 0xfe, 0x5c, 0x85, 0x73, - 0x12, 0x3c, 0xec, 0x09, 0x77, 0x96, 0x9d, 0xb3, 0xe2, 0xfe, 0x7e, 0xcf, 0x0c, 0xf3, 0x16, 0x28, - 0x50, 0xfc, 0xd9, 0xa4, 0x62, 0x34, 0x9f, 0x62, 0x5d, 0x6b, 0xf6, 0x6f, 0x79, 0x55, 0xd4, 0xda, - 0x49, 0xe9, 0xa0, 0x04, 0x1b, 0xbe, 0x02, 0x67, 0xf9, 0x50, 0x76, 0x5f, 0xe6, 0xcc, 0x79, 0xe7, - 0x0c, 0x1f, 0x66, 0xad, 0x87, 0x5b, 0x50, 0x11, 0xfd, 0xb2, 0xba, 0x2c, 0x80, 0xde, 0x98, 0xd1, - 0x54, 0x3b, 0xd9, 0x8f, 0x23, 0x43, 0x26, 0xba, 0xfa, 0xb4, 0xc8, 0x9b, 0x77, 0x75, 0x86, 0xc3, - 0x87, 0x9d, 0x30, 0xee, 0x91, 0xe1, 0x6a, 0x45, 0xe2, 0xf0, 0xe1, 0xfd, 0xec, 0xd6, 0xac, 0x03, - 0xd6, 0xf1, 0x95, 0x45, 0x97, 0xa0, 0x32, 0x70, 0x23, 0x05, 0x7f, 0xce, 0x91, 0x37, 0xe6, 0x0d, - 0xb8, 0x2e, 0xd6, 0xca, 0xee, 0x7d, 0xd8, 0x4f, 0x12, 0x9a, 0x72, 0xd2, 0x13, 0xce, 0x30, 0x25, - 0xdd, 0xfc, 0x11, 0x81, 0x79, 0xdc, 0x2a, 0x55, 0x21, 0x85, 0x2b, 0x6a, 0x8c, 0xb2, 0xd1, 0x8a, - 0x8e, 0x10, 0x3b, 0x9a, 0x27, 0x77, 0x66, 0x6d, 0x48, 0x51, 0x7e, 0xd5, 0x8c, 0x97, 0x83, 0xa2, - 0xda, 0xe6, 0x75, 0x58, 0xd3, 0xc8, 0x3e, 0x8e, 0xdd, 0x6e, 0x34, 0x49, 0xff, 0x1d, 0x82, 0xf5, - 0xe9, 0x6b, 0x14, 0x7b, 0x0c, 0xaa, 0x40, 0x87, 0xc8, 0xf7, 0x27, 0x47, 0x7e, 0x31, 0x38, 0x5a, - 0xb7, 0xf9, 0x2b, 0x40, 0x45, 0x40, 0xe1, 0x17, 0x08, 0x5e, 0xd1, 0xa6, 0xc9, 0x56, 0x14, 0xe1, - 0xd6, 0xac, 0x6a, 0xd3, 0x8f, 0x0c, 0xe3, 0xde, 0x42, 0xb1, 0xd2, 0x05, 0x73, 0xf3, 0x9b, 0x3f, - 0xfe, 0xfd, 0xfe, 0xd4, 0x4d, 0xbc, 0x21, 0x0e, 0xae, 0x4d, 0x79, 0x86, 0x4d, 0x3b, 0x2c, 0x19, - 0xfe, 0x0d, 0x41, 0x55, 0x4b, 0x53, 0x92, 0xbb, 0x70, 0x88, 0x97, 0xe4, 0x2e, 0x9e, 0xe1, 0x66, - 0x4b, 0x70, 0xdf, 0xc1, 0xcd, 0x52, 0xdc, 0xf6, 0xb3, 0xfc, 0x8f, 0xf5, 0x1c, 0xff, 0x84, 0xe0, - 0x42, 0x3e, 0x08, 0x32, 0xfb, 0xdf, 0x2b, 0x6b, 0xe1, 0x91, 0x01, 0x66, 0xb4, 0x16, 0x09, 0x55, - 0x22, 0xde, 0x12, 0x22, 0x36, 0xf0, 0x8d, 0x69, 0x22, 0xb4, 0x09, 0x87, 0x7f, 0x46, 0x00, 0x79, - 0x8e, 0x92, 0xc8, 0x45, 0x33, 0xd7, 0x68, 0x2d, 0x12, 0xaa, 0x90, 0xef, 0x0a, 0xe4, 0xdb, 0xd8, - 0x2a, 0x81, 0x6c, 0x3f, 0x1b, 0x8d, 0xcf, 0xe7, 0xf8, 0x07, 0x04, 0x15, 0x31, 0x9d, 0x70, 0xa3, - 0x54, 0x75, 0x7d, 0x10, 0x1b, 0xcd, 0x79, 0x42, 0x14, 0xe8, 0x86, 0x00, 0x5d, 0xc3, 0xd7, 0xa6, - 0x81, 0x26, 0x82, 0xe6, 0x4f, 0x04, 0x97, 0x0b, 0x67, 0x1c, 0xde, 0x2a, 0x55, 0xf4, 0xb8, 0x29, - 0x6a, 0xb4, 0xff, 0x4f, 0x0a, 0xa5, 0xe3, 0x5d, 0xa1, 0xa3, 0x81, 0xed, 0x69, 0x3a, 0xa6, 0x0c, - 0x60, 0xfc, 0x3b, 0x82, 0x8b, 0x05, 0xf3, 0x0f, 0x7f, 0x30, 0x07, 0x54, 0xd1, 0x74, 0x35, 0x3e, - 0x5c, 0x3c, 0x81, 0xd2, 0xf4, 0x8e, 0xd0, 0x64, 0xe3, 0xcd, 0x19, 0x9a, 0xc6, 0x07, 0x73, 0xfb, - 0xf3, 0x97, 0xfb, 0x35, 0xb4, 0xb7, 0x5f, 0x43, 0xff, 0xec, 0xd7, 0xd0, 0xb7, 0x07, 0xb5, 0xa5, - 0xbd, 0x83, 0xda, 0xd2, 0x5f, 0x07, 0xb5, 0xa5, 0xaf, 0x9a, 0x7e, 0xc8, 0x83, 0x7e, 0xd7, 0xf2, - 0xe8, 0x63, 0x3d, 0xe5, 0xe1, 0xb7, 0xf8, 0x70, 0x2c, 0x3b, 0x7f, 0x9a, 0x10, 0xd6, 0x3d, 0x23, - 0x3e, 0xc7, 0xdf, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x8a, 0xbd, 0xa3, 0xda, 0x0c, 0x00, + 0x14, 0xc7, 0x77, 0xba, 0x4d, 0x7f, 0xbc, 0x6c, 0x91, 0x98, 0xb6, 0x6a, 0x6a, 0x68, 0x76, 0xeb, + 0xb2, 0xb4, 0x0a, 0x5a, 0xbb, 0x09, 0xa5, 0x88, 0x54, 0x02, 0x36, 0x08, 0xb6, 0x15, 0x42, 0xda, + 0xba, 0xe2, 0xc2, 0x25, 0x72, 0x9c, 0xa9, 0x6d, 0xad, 0xeb, 0x71, 0x3d, 0x93, 0x28, 0xa5, 0xea, + 0x85, 0xbf, 0x00, 0x81, 0x90, 0xf8, 0x3f, 0xb8, 0x54, 0x42, 0x08, 0x89, 0x53, 0x6f, 0x54, 0xe2, + 0x00, 0x27, 0x84, 0x76, 0xf9, 0x43, 0x90, 0x67, 0x26, 0xf5, 0x24, 0xeb, 0x6c, 0x9c, 0xb0, 0xa7, + 0xf8, 0xc7, 0xbc, 0xf7, 0x3e, 0xdf, 0xef, 0x3c, 0xbf, 0x09, 0x34, 0xbe, 0x26, 0xdc, 0xf5, 0x02, + 0x37, 0x8c, 0x6d, 0x71, 0x45, 0x53, 0x62, 0x47, 0xa1, 0x1f, 0x70, 0x2f, 0x0a, 0x49, 0xcc, 0xed, + 0xc7, 0x03, 0x92, 0x3e, 0xb1, 0x92, 0x94, 0x72, 0x8a, 0xeb, 0xaf, 0xd6, 0x5a, 0xe3, 0xb5, 0x96, + 0xb6, 0xd6, 0x68, 0x78, 0x94, 0x3d, 0xa2, 0xcc, 0xee, 0xb9, 0x8c, 0xc8, 0x40, 0x7b, 0xd8, 0xec, + 0x11, 0xee, 0x36, 0xed, 0xc4, 0xf5, 0xc3, 0xd8, 0xe5, 0x21, 0x8d, 0x65, 0x2e, 0xe3, 0x82, 0x4f, + 0x7d, 0x2a, 0x2e, 0xed, 0xec, 0x4a, 0x3d, 0x7d, 0xd3, 0xa7, 0xd4, 0x8f, 0x88, 0xed, 0x26, 0xa1, + 0xed, 0xc6, 0x31, 0xe5, 0x22, 0x84, 0xa9, 0xb7, 0x1f, 0xce, 0x61, 0xed, 0x45, 0xd4, 0xdb, 0xeb, + 0x06, 0xc4, 0xed, 0x93, 0xb4, 0x3b, 0x24, 0x69, 0xf8, 0x30, 0xf4, 0xf4, 0x9a, 0x37, 0xe7, 0xc4, + 0x8b, 0x57, 0x5d, 0xc6, 0x5d, 0x4e, 0x54, 0x44, 0x91, 0x3b, 0xc9, 0x9e, 0x6f, 0x27, 0x29, 0xa5, + 0x0f, 0x99, 0xfa, 0x91, 0x6b, 0xcd, 0x3e, 0x18, 0xf7, 0x33, 0xcd, 0xdb, 0x51, 0xd4, 0xc9, 0x40, + 0xee, 0x0a, 0x0e, 0x87, 0x3c, 0x1e, 0x10, 0xc6, 0xf1, 0x67, 0x00, 0xb9, 0x07, 0x35, 0xb4, 0x81, + 0x6e, 0x54, 0x5b, 0x6f, 0x5b, 0xd2, 0x30, 0x2b, 0x33, 0xcc, 0x92, 0x4e, 0x2b, 0xc3, 0xac, 0x5d, + 0xd7, 0x27, 0x2a, 0xd6, 0xd1, 0x22, 0xcd, 0x5f, 0x10, 0xbc, 0x51, 0x58, 0x86, 0x25, 0x34, 0x66, + 0x04, 0x7f, 0x09, 0xe7, 0x74, 0x1b, 0x58, 0x0d, 0x6d, 0xac, 0xde, 0xa8, 0xb6, 0x1a, 0x56, 0xc1, + 0xde, 0x25, 0x7b, 0xbe, 0xa5, 0x24, 0x68, 0xa9, 0x3a, 0x27, 0x5f, 0xfc, 0xbd, 0xbe, 0xe2, 0xac, + 0xf5, 0xf2, 0x47, 0x0c, 0xef, 0x4c, 0xe0, 0x9f, 0x10, 0xf8, 0xd7, 0xe7, 0xe2, 0x4b, 0xa6, 0x09, + 0xfe, 0x3b, 0xca, 0xa5, 0x1d, 0xc2, 0x0b, 0x5c, 0xba, 0x02, 0xa0, 0xe8, 0x5d, 0x16, 0x08, 0x97, + 0xd6, 0x9c, 0xb3, 0x12, 0xc4, 0x65, 0x81, 0x19, 0x29, 0xed, 0xd3, 0xc1, 0x4a, 0xfb, 0x17, 0xb0, + 0xa6, 0x6b, 0x57, 0x2e, 0x2f, 0x20, 0xdd, 0xa9, 0x6a, 0xa2, 0x4d, 0x0f, 0x2e, 0x8f, 0x9d, 0xfe, + 0x24, 0x8b, 0x7e, 0x90, 0x35, 0xc6, 0x71, 0xef, 0xe7, 0x73, 0x94, 0xb7, 0x8d, 0x5e, 0x45, 0x49, + 0xba, 0x0f, 0x55, 0xad, 0x2b, 0x8f, 0xda, 0x4c, 0xad, 0x91, 0xad, 0x3c, 0x91, 0xda, 0x4c, 0xf0, + 0x5e, 0x3d, 0x39, 0xbe, 0xad, 0xbc, 0xad, 0xfc, 0xd9, 0x21, 0xfc, 0xb0, 0x3f, 0x97, 0xe1, 0x8c, + 0x04, 0x0f, 0xfb, 0xc2, 0x9d, 0x55, 0xe7, 0xb4, 0xb8, 0xbf, 0xd7, 0x37, 0xc3, 0xbc, 0x05, 0x0a, + 0x14, 0x7f, 0x3e, 0xad, 0x18, 0x2d, 0xa6, 0x58, 0xd7, 0x9a, 0x7d, 0x2d, 0xaf, 0x8b, 0x5a, 0xbb, + 0x29, 0x1d, 0x96, 0x60, 0xc3, 0x97, 0xe0, 0x34, 0x1f, 0xc9, 0xee, 0xcb, 0x9c, 0x39, 0xeb, 0x9c, + 0xe2, 0xa3, 0xac, 0xf5, 0x70, 0x1b, 0x2a, 0xa2, 0x5f, 0x6a, 0xab, 0x02, 0xe8, 0xad, 0x39, 0x4d, + 0xb5, 0x9b, 0xfd, 0x38, 0x32, 0x64, 0xaa, 0xab, 0x4f, 0x8a, 0xbc, 0x79, 0x57, 0x67, 0x38, 0x7c, + 0xd4, 0x0d, 0xe3, 0x3e, 0x19, 0xd5, 0x2a, 0x12, 0x87, 0x8f, 0xee, 0x65, 0xb7, 0x66, 0x03, 0xb0, + 0x8e, 0xaf, 0x2c, 0xba, 0x00, 0x95, 0xa1, 0x1b, 0x29, 0xf8, 0x33, 0x8e, 0xbc, 0x31, 0xaf, 0xc1, + 0x55, 0xb1, 0x56, 0x76, 0xef, 0x83, 0x41, 0x92, 0xd0, 0x94, 0x93, 0xbe, 0x70, 0x86, 0x29, 0xe9, + 0xe6, 0x8f, 0x08, 0xcc, 0xa3, 0x56, 0xa9, 0x0a, 0x29, 0x5c, 0x52, 0x63, 0x94, 0x8d, 0x57, 0x74, + 0x85, 0xd8, 0xf1, 0x3c, 0xb9, 0x35, 0x6f, 0x43, 0x8a, 0xf2, 0xab, 0x66, 0xbc, 0x18, 0x14, 0xd5, + 0x36, 0xaf, 0xc2, 0xba, 0x46, 0xf6, 0x69, 0xec, 0xf6, 0xa2, 0x69, 0xfa, 0xef, 0x10, 0x6c, 0xcc, + 0x5e, 0xa3, 0xd8, 0x63, 0x50, 0x05, 0xba, 0x44, 0xbe, 0x3f, 0x3e, 0xf2, 0xf3, 0xc1, 0xe1, 0xba, + 0xad, 0x5f, 0x01, 0x2a, 0x02, 0x0a, 0x3f, 0x47, 0xf0, 0x9a, 0x36, 0x4d, 0xb6, 0xa3, 0x08, 0xb7, + 0xe7, 0x55, 0x9b, 0x7d, 0x64, 0x18, 0x77, 0x96, 0x8a, 0x95, 0x2e, 0x98, 0x5b, 0xdf, 0xfc, 0xf1, + 0xef, 0xf7, 0x27, 0xae, 0xe3, 0x4d, 0x71, 0x70, 0x6d, 0xc9, 0x33, 0x6c, 0xd6, 0x61, 0xc9, 0xf0, + 0x6f, 0x08, 0xaa, 0x5a, 0x9a, 0x92, 0xdc, 0x85, 0x43, 0xbc, 0x24, 0x77, 0xf1, 0x0c, 0x37, 0xdb, + 0x82, 0xfb, 0x16, 0x6e, 0x95, 0xe2, 0xb6, 0x9f, 0xe6, 0x1f, 0xd6, 0x33, 0xfc, 0x13, 0x82, 0x73, + 0xf9, 0x20, 0xc8, 0xec, 0xff, 0xa0, 0xac, 0x85, 0x87, 0x06, 0x98, 0xd1, 0x5e, 0x26, 0x54, 0x89, + 0x78, 0x47, 0x88, 0xd8, 0xc4, 0xd7, 0x66, 0x89, 0xd0, 0x26, 0x1c, 0xfe, 0x19, 0x01, 0xe4, 0x39, + 0x4a, 0x22, 0x17, 0xcd, 0x5c, 0xa3, 0xbd, 0x4c, 0xa8, 0x42, 0xbe, 0x2d, 0x90, 0x6f, 0x62, 0xab, + 0x04, 0xb2, 0xfd, 0x74, 0x3c, 0x3e, 0x9f, 0xe1, 0x1f, 0x10, 0x54, 0xc4, 0x74, 0xc2, 0xcd, 0x52, + 0xd5, 0xf5, 0x41, 0x6c, 0xb4, 0x16, 0x09, 0x51, 0xa0, 0x9b, 0x02, 0x74, 0x1d, 0x5f, 0x99, 0x05, + 0x9a, 0x08, 0x9a, 0x3f, 0x11, 0x5c, 0x2c, 0x9c, 0x71, 0x78, 0xbb, 0x54, 0xd1, 0xa3, 0xa6, 0xa8, + 0xd1, 0xf9, 0x3f, 0x29, 0x94, 0x8e, 0xf7, 0x85, 0x8e, 0x26, 0xb6, 0x67, 0xe9, 0x98, 0x31, 0x80, + 0xf1, 0xef, 0x08, 0xce, 0x17, 0xcc, 0x3f, 0xfc, 0xd1, 0x02, 0x50, 0x45, 0xd3, 0xd5, 0xf8, 0x78, + 0xf9, 0x04, 0x4a, 0xd3, 0x7b, 0x42, 0x93, 0x8d, 0xb7, 0xe6, 0x68, 0x9a, 0x1c, 0xcc, 0x9d, 0xbb, + 0x2f, 0xf6, 0xeb, 0xe8, 0xe5, 0x7e, 0x1d, 0xfd, 0xb3, 0x5f, 0x47, 0xdf, 0x1e, 0xd4, 0x57, 0x5e, + 0x1e, 0xd4, 0x57, 0xfe, 0x3a, 0xa8, 0xaf, 0x7c, 0x65, 0xf9, 0x21, 0x0f, 0x06, 0x3d, 0xcb, 0xa3, + 0x8f, 0xf4, 0x94, 0x31, 0xed, 0x13, 0x7b, 0x34, 0x91, 0x99, 0x3f, 0x49, 0x08, 0xeb, 0x9d, 0x12, + 0x7f, 0xc5, 0xdf, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xc6, 0xb3, 0x80, 0x2a, 0xd6, 0x0c, 0x00, 0x00, } diff --git a/x/lightclient/types/tx.pb.go b/x/lightclient/types/tx.pb.go index ccf010fdc1..f5522b99a8 100644 --- a/x/lightclient/types/tx.pb.go +++ b/x/lightclient/types/tx.pb.go @@ -216,7 +216,7 @@ func init() { } var fileDescriptor_6fec9f445d2bf2d1 = []byte{ - // 329 bytes of a gzipped FileDescriptorProto + // 334 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xaf, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x73, 0x32, 0xd3, 0x33, 0x4a, 0x92, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0xf4, 0x4b, 0x2a, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, @@ -233,11 +233,11 @@ var fileDescriptor_6fec9f445d2bf2d1 = []byte{ 0x98, 0xb8, 0x98, 0x7d, 0x8b, 0xd3, 0x85, 0xe6, 0x30, 0x72, 0x49, 0xe0, 0x0c, 0x0f, 0x6b, 0x3d, 0xfc, 0xb1, 0xa4, 0x87, 0xc7, 0xbf, 0x52, 0xce, 0x14, 0x68, 0x86, 0x39, 0x53, 0x68, 0x3e, 0x23, 0x97, 0x24, 0xee, 0xa0, 0xb2, 0x21, 0xc2, 0x0a, 0x9c, 0xba, 0xa5, 0x5c, 0x28, 0xd1, 0x0d, 0x73, - 0xa1, 0x93, 0xcf, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, - 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa5, 0x67, - 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x53, 0xab, 0x2e, 0x5a, 0xc2, 0xad, 0x40, - 0xcd, 0x19, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x74, 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, - 0xff, 0x4e, 0x32, 0x22, 0x91, 0x48, 0x03, 0x00, 0x00, + 0xa1, 0x93, 0xc7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, + 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa5, 0x67, + 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x53, 0xab, 0x2e, 0x24, 0xe1, 0xe6, 0xe5, + 0xa7, 0xa4, 0xea, 0x57, 0xa0, 0xe6, 0x8a, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x1a, 0x35, + 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xd2, 0xa9, 0x28, 0x44, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lightclient/types/verification_flags.go b/x/lightclient/types/verification_flags.go index a421e47479..bc15e1931e 100644 --- a/x/lightclient/types/verification_flags.go +++ b/x/lightclient/types/verification_flags.go @@ -1,6 +1,6 @@ package types -import "github.com/zeta-chain/zetacore/pkg/chains" +import "github.com/zeta-chain/node/pkg/chains" func DefaultBlockHeaderVerification() BlockHeaderVerification { return BlockHeaderVerification{ diff --git a/x/lightclient/types/verification_flags_test.go b/x/lightclient/types/verification_flags_test.go index 2986d9ceef..e5b64f1ee2 100644 --- a/x/lightclient/types/verification_flags_test.go +++ b/x/lightclient/types/verification_flags_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func TestDefaultVerificationFlags(t *testing.T) { diff --git a/x/observer/abci.go b/x/observer/abci.go index d57fbf5894..3f56252329 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { diff --git a/x/observer/abci_test.go b/x/observer/abci_test.go index 8885d436b6..11909e3766 100644 --- a/x/observer/abci_test.go +++ b/x/observer/abci_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer" + "github.com/zeta-chain/node/x/observer/types" ) func TestBeginBlocker(t *testing.T) { diff --git a/x/observer/client/cli/query.go b/x/observer/client/cli/query.go index 39f43847a7..65ebf2076a 100644 --- a/x/observer/client/cli/query.go +++ b/x/observer/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/observer/client/cli/query_ballot.go b/x/observer/client/cli/query_ballot.go index 55f2ebdab5..6d724a3571 100644 --- a/x/observer/client/cli/query_ballot.go +++ b/x/observer/client/cli/query_ballot.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdBallotByIdentifier() *cobra.Command { diff --git a/x/observer/client/cli/query_blame.go b/x/observer/client/cli/query_blame.go index 9d173f0a00..65a44f8dfb 100644 --- a/x/observer/client/cli/query_blame.go +++ b/x/observer/client/cli/query_blame.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdBlameByIdentifier() *cobra.Command { diff --git a/x/observer/client/cli/query_chain_nonce.go b/x/observer/client/cli/query_chain_nonce.go index f5e303dbaa..a38ebd0dea 100644 --- a/x/observer/client/cli/query_chain_nonce.go +++ b/x/observer/client/cli/query_chain_nonce.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdListChainNonces() *cobra.Command { diff --git a/x/observer/client/cli/query_chain_params.go b/x/observer/client/cli/query_chain_params.go index 3652dbf411..fb7a96b39c 100644 --- a/x/observer/client/cli/query_chain_params.go +++ b/x/observer/client/cli/query_chain_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdGetChainParamsForChain() *cobra.Command { diff --git a/x/observer/client/cli/query_get_tss_address.go b/x/observer/client/cli/query_get_tss_address.go index 8e9b92d8bb..c26e5a28d0 100644 --- a/x/observer/client/cli/query_get_tss_address.go +++ b/x/observer/client/cli/query_get_tss_address.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdGetTssAddress() *cobra.Command { diff --git a/x/observer/client/cli/query_keygen.go b/x/observer/client/cli/query_keygen.go index 5140bc82cf..f654170a68 100644 --- a/x/observer/client/cli/query_keygen.go +++ b/x/observer/client/cli/query_keygen.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdShowKeygen() *cobra.Command { diff --git a/x/observer/client/cli/query_node_account.go b/x/observer/client/cli/query_node_account.go index dd811dbe66..cd58500500 100644 --- a/x/observer/client/cli/query_node_account.go +++ b/x/observer/client/cli/query_node_account.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdListNodeAccount() *cobra.Command { diff --git a/x/observer/client/cli/query_observers.go b/x/observer/client/cli/query_observers.go index 721a0b12a6..bf47d41c80 100644 --- a/x/observer/client/cli/query_observers.go +++ b/x/observer/client/cli/query_observers.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdObserverSet() *cobra.Command { diff --git a/x/observer/client/cli/query_pending_nonces.go b/x/observer/client/cli/query_pending_nonces.go index 5cf9493d3d..48e683b69f 100644 --- a/x/observer/client/cli/query_pending_nonces.go +++ b/x/observer/client/cli/query_pending_nonces.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdListPendingNonces() *cobra.Command { diff --git a/x/observer/client/cli/query_permission_flags.go b/x/observer/client/cli/query_permission_flags.go index 588fa70067..40530998f0 100644 --- a/x/observer/client/cli/query_permission_flags.go +++ b/x/observer/client/cli/query_permission_flags.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdShowCrosschainFlags() *cobra.Command { diff --git a/x/observer/client/cli/query_show_observer_count.go b/x/observer/client/cli/query_show_observer_count.go index 0f5f6039b0..14e767c1b2 100644 --- a/x/observer/client/cli/query_show_observer_count.go +++ b/x/observer/client/cli/query_show_observer_count.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdShowObserverCount() *cobra.Command { diff --git a/x/observer/client/cli/query_supported_chains.go b/x/observer/client/cli/query_supported_chains.go index 93a1294015..f2e89808f0 100644 --- a/x/observer/client/cli/query_supported_chains.go +++ b/x/observer/client/cli/query_supported_chains.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdGetSupportedChains() *cobra.Command { diff --git a/x/observer/client/cli/query_tss.go b/x/observer/client/cli/query_tss.go index 28e29ea7ca..d936c6e188 100644 --- a/x/observer/client/cli/query_tss.go +++ b/x/observer/client/cli/query_tss.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdShowTSS() *cobra.Command { diff --git a/x/observer/client/cli/query_tss_fund_migrator.go b/x/observer/client/cli/query_tss_fund_migrator.go index a5483fde51..b2ff995214 100644 --- a/x/observer/client/cli/query_tss_fund_migrator.go +++ b/x/observer/client/cli/query_tss_fund_migrator.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdGetTssFundsMigrator() *cobra.Command { diff --git a/x/observer/client/cli/tx.go b/x/observer/client/cli/tx.go index 815bfb21f8..471adf7ce0 100644 --- a/x/observer/client/cli/tx.go +++ b/x/observer/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/observer/client/cli/tx_add_observer.go b/x/observer/client/cli/tx_add_observer.go index b55606c1d1..1f03610b14 100644 --- a/x/observer/client/cli/tx_add_observer.go +++ b/x/observer/client/cli/tx_add_observer.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdAddObserver() *cobra.Command { diff --git a/x/observer/client/cli/tx_disable_cctx_flags.go b/x/observer/client/cli/tx_disable_cctx_flags.go index be88aada31..1b36959ab1 100644 --- a/x/observer/client/cli/tx_disable_cctx_flags.go +++ b/x/observer/client/cli/tx_disable_cctx_flags.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdDisableCCTX() *cobra.Command { diff --git a/x/observer/client/cli/tx_enable_cctx_flags.go b/x/observer/client/cli/tx_enable_cctx_flags.go index d4371118bd..208a6b5997 100644 --- a/x/observer/client/cli/tx_enable_cctx_flags.go +++ b/x/observer/client/cli/tx_enable_cctx_flags.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdEnableCCTX() *cobra.Command { diff --git a/x/observer/client/cli/tx_remove_chain_params.go b/x/observer/client/cli/tx_remove_chain_params.go index 49f4fb6f47..0dff553922 100644 --- a/x/observer/client/cli/tx_remove_chain_params.go +++ b/x/observer/client/cli/tx_remove_chain_params.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdRemoveChainParams() *cobra.Command { diff --git a/x/observer/client/cli/tx_reset_chain_nonces.go b/x/observer/client/cli/tx_reset_chain_nonces.go index 3363eead31..2c4c45ecff 100644 --- a/x/observer/client/cli/tx_reset_chain_nonces.go +++ b/x/observer/client/cli/tx_reset_chain_nonces.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdResetChainNonces() *cobra.Command { diff --git a/x/observer/client/cli/tx_update_chain_params.go b/x/observer/client/cli/tx_update_chain_params.go index d677801c6a..16020c506f 100644 --- a/x/observer/client/cli/tx_update_chain_params.go +++ b/x/observer/client/cli/tx_update_chain_params.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdUpdateChainParams() *cobra.Command { diff --git a/x/observer/client/cli/tx_update_gas_price_increase_flags.go b/x/observer/client/cli/tx_update_gas_price_increase_flags.go index 98d156435a..b2938bd87f 100644 --- a/x/observer/client/cli/tx_update_gas_price_increase_flags.go +++ b/x/observer/client/cli/tx_update_gas_price_increase_flags.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdUpdateGasPriceIncreaseFlags() *cobra.Command { diff --git a/x/observer/client/cli/tx_update_keygen.go b/x/observer/client/cli/tx_update_keygen.go index c826d23f87..6072c741f0 100644 --- a/x/observer/client/cli/tx_update_keygen.go +++ b/x/observer/client/cli/tx_update_keygen.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdUpdateKeygen() *cobra.Command { diff --git a/x/observer/client/cli/tx_update_observer.go b/x/observer/client/cli/tx_update_observer.go index 47b1bd5259..40d509b2db 100644 --- a/x/observer/client/cli/tx_update_observer.go +++ b/x/observer/client/cli/tx_update_observer.go @@ -10,7 +10,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdUpdateObserver() *cobra.Command { diff --git a/x/observer/client/cli/tx_vote_blame.go b/x/observer/client/cli/tx_vote_blame.go index 7406359c10..db4aadb1a0 100644 --- a/x/observer/client/cli/tx_vote_blame.go +++ b/x/observer/client/cli/tx_vote_blame.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" "gitlab.com/thorchain/tss/go-tss/blame" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func CmdVoteBlame() *cobra.Command { diff --git a/x/observer/client/cli/tx_vote_tss.go b/x/observer/client/cli/tx_vote_tss.go index ce6591c749..e913032306 100644 --- a/x/observer/client/cli/tx_vote_tss.go +++ b/x/observer/client/cli/tx_vote_tss.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" ) func CmdVoteTSS() *cobra.Command { diff --git a/x/observer/genesis.go b/x/observer/genesis.go index 366424a062..46ed737b6f 100644 --- a/x/observer/genesis.go +++ b/x/observer/genesis.go @@ -3,9 +3,9 @@ package observer import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) // InitGenesis initializes the observer module's state from a provided genesis diff --git a/x/observer/genesis_test.go b/x/observer/genesis_test.go index 69ce974136..096dc0db43 100644 --- a/x/observer/genesis_test.go +++ b/x/observer/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/nullify" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/nullify" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer" + "github.com/zeta-chain/node/x/observer/types" ) func TestGenesis(t *testing.T) { diff --git a/x/observer/keeper/ballot.go b/x/observer/keeper/ballot.go index 7a42532ab3..799f5c8281 100644 --- a/x/observer/keeper/ballot.go +++ b/x/observer/keeper/ballot.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetBallot(ctx sdk.Context, ballot *types.Ballot) { diff --git a/x/observer/keeper/ballot_test.go b/x/observer/keeper/ballot_test.go index 95ec24363e..2f88571558 100644 --- a/x/observer/keeper/ballot_test.go +++ b/x/observer/keeper/ballot_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetBallot(t *testing.T) { diff --git a/x/observer/keeper/blame.go b/x/observer/keeper/blame.go index 20b8170bf0..e637ec4ee2 100644 --- a/x/observer/keeper/blame.go +++ b/x/observer/keeper/blame.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetBlame(ctx sdk.Context, blame types.Blame) { diff --git a/x/observer/keeper/blame_test.go b/x/observer/keeper/blame_test.go index 94e7a1edf8..59394edceb 100644 --- a/x/observer/keeper/blame_test.go +++ b/x/observer/keeper/blame_test.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetBlame(t *testing.T) { diff --git a/x/observer/keeper/chain_nonces.go b/x/observer/keeper/chain_nonces.go index f923aef0f1..31c1be905a 100644 --- a/x/observer/keeper/chain_nonces.go +++ b/x/observer/keeper/chain_nonces.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // ChainNonces methods diff --git a/x/observer/keeper/chain_nonces_test.go b/x/observer/keeper/chain_nonces_test.go index f3caa3097e..0c83f58c07 100644 --- a/x/observer/keeper/chain_nonces_test.go +++ b/x/observer/keeper/chain_nonces_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_GetChainNonces(t *testing.T) { diff --git a/x/observer/keeper/chain_params.go b/x/observer/keeper/chain_params.go index 9dc862dd98..429667fb1f 100644 --- a/x/observer/keeper/chain_params.go +++ b/x/observer/keeper/chain_params.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetChainParamsList(ctx sdk.Context, chainParams types.ChainParamsList) { diff --git a/x/observer/keeper/chain_params_test.go b/x/observer/keeper/chain_params_test.go index 733fafc0b8..6c3282023f 100644 --- a/x/observer/keeper/chain_params_test.go +++ b/x/observer/keeper/chain_params_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetSupportedChainFromChainID(t *testing.T) { diff --git a/x/observer/keeper/crosschain_flags.go b/x/observer/keeper/crosschain_flags.go index f23a9fd843..254cfb56bf 100644 --- a/x/observer/keeper/crosschain_flags.go +++ b/x/observer/keeper/crosschain_flags.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // SetCrosschainFlags set the crosschain flags in the store diff --git a/x/observer/keeper/crosschain_flags_test.go b/x/observer/keeper/crosschain_flags_test.go index 630e893a1c..4f0b605a58 100644 --- a/x/observer/keeper/crosschain_flags_test.go +++ b/x/observer/keeper/crosschain_flags_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_IsInboundEnabled(t *testing.T) { diff --git a/x/observer/keeper/events.go b/x/observer/keeper/events.go index 3332f7edaa..d1ddbc44ff 100644 --- a/x/observer/keeper/events.go +++ b/x/observer/keeper/events.go @@ -6,7 +6,7 @@ import ( types2 "github.com/coinbase/rosetta-sdk-go/types" sdk "github.com/cosmos/cosmos-sdk/types" - types "github.com/zeta-chain/zetacore/x/observer/types" + types "github.com/zeta-chain/node/x/observer/types" ) func EmitEventBallotCreated(ctx sdk.Context, ballot types.Ballot, observationHash, observationChain string) { diff --git a/x/observer/keeper/grpc_query.go b/x/observer/keeper/grpc_query.go index 1516cf46b3..95f58a70c5 100644 --- a/x/observer/keeper/grpc_query.go +++ b/x/observer/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/observer/keeper/grpc_query_ballot.go b/x/observer/keeper/grpc_query_ballot.go index 85463af55a..75ffd6ff07 100644 --- a/x/observer/keeper/grpc_query_ballot.go +++ b/x/observer/keeper/grpc_query_ballot.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) HasVoted(goCtx context.Context, req *types.QueryHasVotedRequest) (*types.QueryHasVotedResponse, error) { diff --git a/x/observer/keeper/grpc_query_ballot_test.go b/x/observer/keeper/grpc_query_ballot_test.go index 2282723f38..fe34971a64 100644 --- a/x/observer/keeper/grpc_query_ballot_test.go +++ b/x/observer/keeper/grpc_query_ballot_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_HasVoted(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_blame.go b/x/observer/keeper/grpc_query_blame.go index 8a73d839d2..cf232b9729 100644 --- a/x/observer/keeper/grpc_query_blame.go +++ b/x/observer/keeper/grpc_query_blame.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) BlameByIdentifier( diff --git a/x/observer/keeper/grpc_query_blame_test.go b/x/observer/keeper/grpc_query_blame_test.go index 1d5ed6900f..c8086d7be4 100644 --- a/x/observer/keeper/grpc_query_blame_test.go +++ b/x/observer/keeper/grpc_query_blame_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_BlameByIdentifier(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_chain_params.go b/x/observer/keeper/grpc_query_chain_params.go index 5985fd5516..05ce4968a7 100644 --- a/x/observer/keeper/grpc_query_chain_params.go +++ b/x/observer/keeper/grpc_query_chain_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) GetChainParamsForChain( diff --git a/x/observer/keeper/grpc_query_chain_params_test.go b/x/observer/keeper/grpc_query_chain_params_test.go index c417e19b56..8852afe534 100644 --- a/x/observer/keeper/grpc_query_chain_params_test.go +++ b/x/observer/keeper/grpc_query_chain_params_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetChainParamsForChain(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_crosschain_flags.go b/x/observer/keeper/grpc_query_crosschain_flags.go index 4051666d35..d1cdbfb407 100644 --- a/x/observer/keeper/grpc_query_crosschain_flags.go +++ b/x/observer/keeper/grpc_query_crosschain_flags.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) CrosschainFlags( diff --git a/x/observer/keeper/grpc_query_crosschain_flags_test.go b/x/observer/keeper/grpc_query_crosschain_flags_test.go index 3e15548687..551353582a 100644 --- a/x/observer/keeper/grpc_query_crosschain_flags_test.go +++ b/x/observer/keeper/grpc_query_crosschain_flags_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_CrosschainFlags(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_keygen.go b/x/observer/keeper/grpc_query_keygen.go index cf33d949b6..bd59e7ab63 100644 --- a/x/observer/keeper/grpc_query_keygen.go +++ b/x/observer/keeper/grpc_query_keygen.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) Keygen(c context.Context, _ *types.QueryGetKeygenRequest) (*types.QueryGetKeygenResponse, error) { diff --git a/x/observer/keeper/grpc_query_keygen_test.go b/x/observer/keeper/grpc_query_keygen_test.go index 0c68bce737..3bd49f9464 100644 --- a/x/observer/keeper/grpc_query_keygen_test.go +++ b/x/observer/keeper/grpc_query_keygen_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_Keygen(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_node_account.go b/x/observer/keeper/grpc_query_node_account.go index 49222a8b1f..4609d3f58b 100644 --- a/x/observer/keeper/grpc_query_node_account.go +++ b/x/observer/keeper/grpc_query_node_account.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) NodeAccountAll( diff --git a/x/observer/keeper/grpc_query_node_account_test.go b/x/observer/keeper/grpc_query_node_account_test.go index de2fe756c2..6c7894974e 100644 --- a/x/observer/keeper/grpc_query_node_account_test.go +++ b/x/observer/keeper/grpc_query_node_account_test.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestNodeAccountQuerySingle(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_nonces.go b/x/observer/keeper/grpc_query_nonces.go index bf0d9e44ab..7a2a08d37b 100644 --- a/x/observer/keeper/grpc_query_nonces.go +++ b/x/observer/keeper/grpc_query_nonces.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // Chain nonces queries diff --git a/x/observer/keeper/grpc_query_nonces_test.go b/x/observer/keeper/grpc_query_nonces_test.go index 148511eb79..8ae23e8110 100644 --- a/x/observer/keeper/grpc_query_nonces_test.go +++ b/x/observer/keeper/grpc_query_nonces_test.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestChainNoncesQuerySingle(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_observer.go b/x/observer/keeper/grpc_query_observer.go index 5ae55ab30a..25ed686f0b 100644 --- a/x/observer/keeper/grpc_query_observer.go +++ b/x/observer/keeper/grpc_query_observer.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) ShowObserverCount( diff --git a/x/observer/keeper/grpc_query_observer_test.go b/x/observer/keeper/grpc_query_observer_test.go index ca29b47940..6f22cf5f41 100644 --- a/x/observer/keeper/grpc_query_observer_test.go +++ b/x/observer/keeper/grpc_query_observer_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_ShowObserverCount(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_supported_chain.go b/x/observer/keeper/grpc_query_supported_chain.go index f9f8b2f688..10d9123b3a 100644 --- a/x/observer/keeper/grpc_query_supported_chain.go +++ b/x/observer/keeper/grpc_query_supported_chain.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SupportedChains( diff --git a/x/observer/keeper/grpc_query_supported_chain_test.go b/x/observer/keeper/grpc_query_supported_chain_test.go index 0cdc276c9d..6cc98caf4f 100644 --- a/x/observer/keeper/grpc_query_supported_chain_test.go +++ b/x/observer/keeper/grpc_query_supported_chain_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" ) func TestKeeper_SupportedChains(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_tss.go b/x/observer/keeper/grpc_query_tss.go index 6223d7c425..5ad108d06e 100644 --- a/x/observer/keeper/grpc_query_tss.go +++ b/x/observer/keeper/grpc_query_tss.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/observer/types" ) // TSS returns the tss address for the current tss only diff --git a/x/observer/keeper/grpc_query_tss_funds_migrator_info.go b/x/observer/keeper/grpc_query_tss_funds_migrator_info.go index 88558fd23a..2a5c403f48 100644 --- a/x/observer/keeper/grpc_query_tss_funds_migrator_info.go +++ b/x/observer/keeper/grpc_query_tss_funds_migrator_info.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" ) // TssFundsMigratorInfo queries a tss fund migrator info diff --git a/x/observer/keeper/grpc_query_tss_funds_migrator_test.go b/x/observer/keeper/grpc_query_tss_funds_migrator_test.go index 3882079f5d..4372ec3d46 100644 --- a/x/observer/keeper/grpc_query_tss_funds_migrator_test.go +++ b/x/observer/keeper/grpc_query_tss_funds_migrator_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_TssFundsMigratorInfo(t *testing.T) { diff --git a/x/observer/keeper/grpc_query_tss_test.go b/x/observer/keeper/grpc_query_tss_test.go index 372a271de9..da78b66925 100644 --- a/x/observer/keeper/grpc_query_tss_test.go +++ b/x/observer/keeper/grpc_query_tss_test.go @@ -9,11 +9,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestTSSQuerySingle(t *testing.T) { diff --git a/x/observer/keeper/hooks.go b/x/observer/keeper/hooks.go index afe6b9eb91..ec002b5a2f 100644 --- a/x/observer/keeper/hooks.go +++ b/x/observer/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) var _ types.StakingHooks = Hooks{} diff --git a/x/observer/keeper/hooks_test.go b/x/observer/keeper/hooks_test.go index a00549f05b..7b5ef7ed64 100644 --- a/x/observer/keeper/hooks_test.go +++ b/x/observer/keeper/hooks_test.go @@ -8,9 +8,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_NotImplementedHooks(t *testing.T) { diff --git a/x/observer/keeper/keeper.go b/x/observer/keeper/keeper.go index 1b26fd3af3..ad7fa984c9 100644 --- a/x/observer/keeper/keeper.go +++ b/x/observer/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) type ( diff --git a/x/observer/keeper/keygen.go b/x/observer/keeper/keygen.go index 8ff3d8b4e2..328a259127 100644 --- a/x/observer/keeper/keygen.go +++ b/x/observer/keeper/keygen.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // SetKeygen set keygen in the store diff --git a/x/observer/keeper/keygen_test.go b/x/observer/keeper/keygen_test.go index ef9a5e6991..35d6b4c486 100644 --- a/x/observer/keeper/keygen_test.go +++ b/x/observer/keeper/keygen_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) // Keeper Tests diff --git a/x/observer/keeper/last_observer_count.go b/x/observer/keeper/last_observer_count.go index 53c1f1419e..1bdec8df0e 100644 --- a/x/observer/keeper/last_observer_count.go +++ b/x/observer/keeper/last_observer_count.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetLastObserverCount(ctx sdk.Context, lbc *types.LastObserverCount) { diff --git a/x/observer/keeper/migrator.go b/x/observer/keeper/migrator.go index 0e6b2eccd9..f6ee68c594 100644 --- a/x/observer/keeper/migrator.go +++ b/x/observer/keeper/migrator.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v8 "github.com/zeta-chain/zetacore/x/observer/migrations/v8" + v8 "github.com/zeta-chain/node/x/observer/migrations/v8" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/observer/keeper/msg_server.go b/x/observer/keeper/msg_server.go index 32f8a012de..94ab70204c 100644 --- a/x/observer/keeper/msg_server.go +++ b/x/observer/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) type msgServer struct { diff --git a/x/observer/keeper/msg_server_add_observer.go b/x/observer/keeper/msg_server_add_observer.go index 2c7368eade..d40f92e5aa 100644 --- a/x/observer/keeper/msg_server_add_observer.go +++ b/x/observer/keeper/msg_server_add_observer.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/crypto" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/crypto" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // AddObserver adds an observer address to the observer set diff --git a/x/observer/keeper/msg_server_add_observer_test.go b/x/observer/keeper/msg_server_add_observer_test.go index 183a97c8e8..4555682210 100644 --- a/x/observer/keeper/msg_server_add_observer_test.go +++ b/x/observer/keeper/msg_server_add_observer_test.go @@ -7,11 +7,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_AddObserver(t *testing.T) { diff --git a/x/observer/keeper/msg_server_disable_cctx_flags.go b/x/observer/keeper/msg_server_disable_cctx_flags.go index 82b1438652..bd5a0a9f17 100644 --- a/x/observer/keeper/msg_server_disable_cctx_flags.go +++ b/x/observer/keeper/msg_server_disable_cctx_flags.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // DisableCCTX disables the IsInboundEnabled and IsOutboundEnabled flags. These flags control the creation of inbounds and outbounds. diff --git a/x/observer/keeper/msg_server_disable_cctx_flags_test.go b/x/observer/keeper/msg_server_disable_cctx_flags_test.go index 74ec5cb14a..07211ae188 100644 --- a/x/observer/keeper/msg_server_disable_cctx_flags_test.go +++ b/x/observer/keeper/msg_server_disable_cctx_flags_test.go @@ -6,11 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_MsgDisableCCTX(t *testing.T) { diff --git a/x/observer/keeper/msg_server_enable_cctx_flags.go b/x/observer/keeper/msg_server_enable_cctx_flags.go index 4df76a29a8..27c001f265 100644 --- a/x/observer/keeper/msg_server_enable_cctx_flags.go +++ b/x/observer/keeper/msg_server_enable_cctx_flags.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // EnableCCTX enables the IsInboundEnabled and IsOutboundEnabled flags.These flags control the creation of inbounds and outbounds. diff --git a/x/observer/keeper/msg_server_enable_cctx_flags_test.go b/x/observer/keeper/msg_server_enable_cctx_flags_test.go index d09ea79262..e6e7475360 100644 --- a/x/observer/keeper/msg_server_enable_cctx_flags_test.go +++ b/x/observer/keeper/msg_server_enable_cctx_flags_test.go @@ -6,11 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_EnableCCTX(t *testing.T) { diff --git a/x/observer/keeper/msg_server_remove_chain_params.go b/x/observer/keeper/msg_server_remove_chain_params.go index b8e419b121..1b52acc390 100644 --- a/x/observer/keeper/msg_server_remove_chain_params.go +++ b/x/observer/keeper/msg_server_remove_chain_params.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // RemoveChainParams removes chain parameters for a specific chain. diff --git a/x/observer/keeper/msg_server_remove_chain_params_test.go b/x/observer/keeper/msg_server_remove_chain_params_test.go index c7b60d7c07..3168547996 100644 --- a/x/observer/keeper/msg_server_remove_chain_params_test.go +++ b/x/observer/keeper/msg_server_remove_chain_params_test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_RemoveChainParams(t *testing.T) { diff --git a/x/observer/keeper/msg_server_reset_chain_nonces.go b/x/observer/keeper/msg_server_reset_chain_nonces.go index 4b8b7b2f42..29887ffda3 100644 --- a/x/observer/keeper/msg_server_reset_chain_nonces.go +++ b/x/observer/keeper/msg_server_reset_chain_nonces.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // ResetChainNonces handles resetting chain nonces diff --git a/x/observer/keeper/msg_server_reset_chain_nonces_test.go b/x/observer/keeper/msg_server_reset_chain_nonces_test.go index 594697501d..5a1ce9d976 100644 --- a/x/observer/keeper/msg_server_reset_chain_nonces_test.go +++ b/x/observer/keeper/msg_server_reset_chain_nonces_test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_ResetChainNonces(t *testing.T) { diff --git a/x/observer/keeper/msg_server_update_chain_params.go b/x/observer/keeper/msg_server_update_chain_params.go index 3e4e3faf4f..e350b4efcc 100644 --- a/x/observer/keeper/msg_server_update_chain_params.go +++ b/x/observer/keeper/msg_server_update_chain_params.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // UpdateChainParams updates chain parameters for a specific chain, or add a new one. diff --git a/x/observer/keeper/msg_server_update_chain_params_test.go b/x/observer/keeper/msg_server_update_chain_params_test.go index d8ad61820d..1c83f9e282 100644 --- a/x/observer/keeper/msg_server_update_chain_params_test.go +++ b/x/observer/keeper/msg_server_update_chain_params_test.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_UpdateChainParams(t *testing.T) { diff --git a/x/observer/keeper/msg_server_update_gas_price_increase_flags.go b/x/observer/keeper/msg_server_update_gas_price_increase_flags.go index 203e289c43..f1a1ac6c3d 100644 --- a/x/observer/keeper/msg_server_update_gas_price_increase_flags.go +++ b/x/observer/keeper/msg_server_update_gas_price_increase_flags.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // UpdateGasPriceIncreaseFlags updates the GasPriceIncreaseFlags. These flags control the increase of gas prices. diff --git a/x/observer/keeper/msg_server_update_gas_price_increase_flags_test.go b/x/observer/keeper/msg_server_update_gas_price_increase_flags_test.go index 7fe99dc47d..1a0395b95e 100644 --- a/x/observer/keeper/msg_server_update_gas_price_increase_flags_test.go +++ b/x/observer/keeper/msg_server_update_gas_price_increase_flags_test.go @@ -6,11 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_UpdateGasPriceIncreaseFlags(t *testing.T) { diff --git a/x/observer/keeper/msg_server_update_keygen.go b/x/observer/keeper/msg_server_update_keygen.go index 343c8a8019..1d8c53413d 100644 --- a/x/observer/keeper/msg_server_update_keygen.go +++ b/x/observer/keeper/msg_server_update_keygen.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // UpdateKeygen updates the block height of the keygen and sets the status to diff --git a/x/observer/keeper/msg_server_update_keygen_test.go b/x/observer/keeper/msg_server_update_keygen_test.go index 966f4a2588..12c595f1a6 100644 --- a/x/observer/keeper/msg_server_update_keygen_test.go +++ b/x/observer/keeper/msg_server_update_keygen_test.go @@ -6,11 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_UpdateKeygen(t *testing.T) { diff --git a/x/observer/keeper/msg_server_update_observer.go b/x/observer/keeper/msg_server_update_observer.go index f7686c4782..2e60b291fb 100644 --- a/x/observer/keeper/msg_server_update_observer.go +++ b/x/observer/keeper/msg_server_update_observer.go @@ -6,8 +6,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - "github.com/zeta-chain/zetacore/x/observer/types" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/observer/types" ) // UpdateObserver handles updating an observer address diff --git a/x/observer/keeper/msg_server_update_observer_test.go b/x/observer/keeper/msg_server_update_observer_test.go index 66e646eb53..aa7f9fea2f 100644 --- a/x/observer/keeper/msg_server_update_observer_test.go +++ b/x/observer/keeper/msg_server_update_observer_test.go @@ -10,10 +10,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_UpdateObserver(t *testing.T) { diff --git a/x/observer/keeper/msg_server_vote_blame.go b/x/observer/keeper/msg_server_vote_blame.go index 61cbce01db..74a3654657 100644 --- a/x/observer/keeper/msg_server_vote_blame.go +++ b/x/observer/keeper/msg_server_vote_blame.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - crosschainTypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/x/observer/types" + crosschainTypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/x/observer/types" ) const voteBlameID = "Vote Blame" diff --git a/x/observer/keeper/msg_server_vote_blame_test.go b/x/observer/keeper/msg_server_vote_blame_test.go index c051c56fd6..d180ffa981 100644 --- a/x/observer/keeper/msg_server_vote_blame_test.go +++ b/x/observer/keeper/msg_server_vote_blame_test.go @@ -9,10 +9,10 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_VoteBlame(t *testing.T) { diff --git a/x/observer/keeper/msg_server_vote_block_header.go b/x/observer/keeper/msg_server_vote_block_header.go index b4e0d57d0d..cbaa68878f 100644 --- a/x/observer/keeper/msg_server_vote_block_header.go +++ b/x/observer/keeper/msg_server_vote_block_header.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - "github.com/zeta-chain/zetacore/x/observer/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + "github.com/zeta-chain/node/x/observer/types" ) const voteBlockHeaderID = "Vote BlockHeader" diff --git a/x/observer/keeper/msg_server_vote_block_header_test.go b/x/observer/keeper/msg_server_vote_block_header_test.go index 7ce0144e5f..3ae8815213 100644 --- a/x/observer/keeper/msg_server_vote_block_header_test.go +++ b/x/observer/keeper/msg_server_vote_block_header_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - mocks "github.com/zeta-chain/zetacore/testutil/keeper/mocks/observer" - "github.com/zeta-chain/zetacore/testutil/sample" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + keepertest "github.com/zeta-chain/node/testutil/keeper" + mocks "github.com/zeta-chain/node/testutil/keeper/mocks/observer" + "github.com/zeta-chain/node/testutil/sample" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func mockCheckNewBlockHeader(m *mocks.ObserverLightclientKeeper, err error) { diff --git a/x/observer/keeper/msg_server_vote_tss.go b/x/observer/keeper/msg_server_vote_tss.go index 9455dfa25b..9b39174fd4 100644 --- a/x/observer/keeper/msg_server_vote_tss.go +++ b/x/observer/keeper/msg_server_vote_tss.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common/math" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" ) const voteTSSid = "Vote TSS" diff --git a/x/observer/keeper/msg_server_vote_tss_test.go b/x/observer/keeper/msg_server_vote_tss_test.go index 2d9466e89c..b1b61eb14b 100644 --- a/x/observer/keeper/msg_server_vote_tss_test.go +++ b/x/observer/keeper/msg_server_vote_tss_test.go @@ -8,11 +8,11 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgServer_VoteTSS(t *testing.T) { diff --git a/x/observer/keeper/node_account.go b/x/observer/keeper/node_account.go index 988a9a4a70..06bf44bd1e 100644 --- a/x/observer/keeper/node_account.go +++ b/x/observer/keeper/node_account.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // SetNodeAccount set a specific nodeAccount in the store from its index diff --git a/x/observer/keeper/node_account_test.go b/x/observer/keeper/node_account_test.go index e81b4552fe..fdee1f2c43 100644 --- a/x/observer/keeper/node_account_test.go +++ b/x/observer/keeper/node_account_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) // Keeper Tests diff --git a/x/observer/keeper/nonce_to_cctx.go b/x/observer/keeper/nonce_to_cctx.go index 8042a6df28..3a96a8acbf 100644 --- a/x/observer/keeper/nonce_to_cctx.go +++ b/x/observer/keeper/nonce_to_cctx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // NonceToCctx methods diff --git a/x/observer/keeper/nonce_to_cctx_test.go b/x/observer/keeper/nonce_to_cctx_test.go index 510030a00c..0e7bfbc99f 100644 --- a/x/observer/keeper/nonce_to_cctx_test.go +++ b/x/observer/keeper/nonce_to_cctx_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetNonceToCctx(t *testing.T) { diff --git a/x/observer/keeper/nonces_test.go b/x/observer/keeper/nonces_test.go index fd76949f9a..7e0e7fa021 100644 --- a/x/observer/keeper/nonces_test.go +++ b/x/observer/keeper/nonces_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestChainNoncesGet(t *testing.T) { diff --git a/x/observer/keeper/observer_set.go b/x/observer/keeper/observer_set.go index 4a6a7044f1..5fb8676e55 100644 --- a/x/observer/keeper/observer_set.go +++ b/x/observer/keeper/observer_set.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetObserverSet(ctx sdk.Context, om types.ObserverSet) { diff --git a/x/observer/keeper/observer_set_test.go b/x/observer/keeper/observer_set_test.go index 41366943f4..36cc789e4a 100644 --- a/x/observer/keeper/observer_set_test.go +++ b/x/observer/keeper/observer_set_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_GetObserverSet(t *testing.T) { diff --git a/x/observer/keeper/pending_nonces.go b/x/observer/keeper/pending_nonces.go index 611a098042..f371edf84b 100644 --- a/x/observer/keeper/pending_nonces.go +++ b/x/observer/keeper/pending_nonces.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // PendingNonces methods diff --git a/x/observer/keeper/pending_nonces_test.go b/x/observer/keeper/pending_nonces_test.go index a92155584c..d2e2207d54 100644 --- a/x/observer/keeper/pending_nonces_test.go +++ b/x/observer/keeper/pending_nonces_test.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_PendingNoncesAll(t *testing.T) { diff --git a/x/observer/keeper/tss.go b/x/observer/keeper/tss.go index 1d885a68cf..92db492352 100644 --- a/x/observer/keeper/tss.go +++ b/x/observer/keeper/tss.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) // AppendTss appends a tss to the TSSHistoryKey store and update the current TSS to the latest one diff --git a/x/observer/keeper/tss_funds_migrator.go b/x/observer/keeper/tss_funds_migrator.go index 72c34397aa..97fa400691 100644 --- a/x/observer/keeper/tss_funds_migrator.go +++ b/x/observer/keeper/tss_funds_migrator.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func (k Keeper) SetFundMigrator(ctx sdk.Context, fm types.TssFundMigratorInfo) { diff --git a/x/observer/keeper/tss_funds_migrator_test.go b/x/observer/keeper/tss_funds_migrator_test.go index ec7ad852da..1979511ab9 100644 --- a/x/observer/keeper/tss_funds_migrator_test.go +++ b/x/observer/keeper/tss_funds_migrator_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" ) func TestKeeper_GetTssFundMigrator(t *testing.T) { diff --git a/x/observer/keeper/tss_test.go b/x/observer/keeper/tss_test.go index 2340c6e6dc..c72ce797c5 100644 --- a/x/observer/keeper/tss_test.go +++ b/x/observer/keeper/tss_test.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_GetTSS(t *testing.T) { diff --git a/x/observer/keeper/vote_inbound.go b/x/observer/keeper/vote_inbound.go index 2a2bc8a66b..6d6a6ce7db 100644 --- a/x/observer/keeper/vote_inbound.go +++ b/x/observer/keeper/vote_inbound.go @@ -4,8 +4,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/observer/types" ) // VoteOnInboundBallot casts a vote on an inbound transaction observed on a connected chain. If this diff --git a/x/observer/keeper/vote_inbound_test.go b/x/observer/keeper/vote_inbound_test.go index 99951e287c..cbb08b6b87 100644 --- a/x/observer/keeper/vote_inbound_test.go +++ b/x/observer/keeper/vote_inbound_test.go @@ -6,11 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_VoteOnInboundBallot(t *testing.T) { diff --git a/x/observer/keeper/vote_outbound.go b/x/observer/keeper/vote_outbound.go index 5713ee2bf1..7fa42367b2 100644 --- a/x/observer/keeper/vote_outbound.go +++ b/x/observer/keeper/vote_outbound.go @@ -4,8 +4,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + observertypes "github.com/zeta-chain/node/x/observer/types" ) // VoteOnOutboundBallot casts a vote on an outbound transaction observed on a connected chain (after diff --git a/x/observer/keeper/vote_outbound_test.go b/x/observer/keeper/vote_outbound_test.go index bc88b21303..aa57101f81 100644 --- a/x/observer/keeper/vote_outbound_test.go +++ b/x/observer/keeper/vote_outbound_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestKeeper_VoteOnOutboundBallot(t *testing.T) { diff --git a/x/observer/keeper/voting.go b/x/observer/keeper/voting.go index d340f0bf32..1f624da5aa 100644 --- a/x/observer/keeper/voting.go +++ b/x/observer/keeper/voting.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/x/observer/keeper/voting_test.go b/x/observer/keeper/voting_test.go index d50e6e5f80..2d56b2f14d 100644 --- a/x/observer/keeper/voting_test.go +++ b/x/observer/keeper/voting_test.go @@ -10,11 +10,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) // setSupportedChain sets the supported chains for the observer module diff --git a/x/observer/migrations/v8/migrate.go b/x/observer/migrations/v8/migrate.go index 8ab6926205..5373aee5dd 100644 --- a/x/observer/migrations/v8/migrate.go +++ b/x/observer/migrations/v8/migrate.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) type observerKeeper interface { diff --git a/x/observer/migrations/v8/migrate_test.go b/x/observer/migrations/v8/migrate_test.go index 8c1993496b..129c9f8d97 100644 --- a/x/observer/migrations/v8/migrate_test.go +++ b/x/observer/migrations/v8/migrate_test.go @@ -4,11 +4,11 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - keepertest "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/x/observer/keeper" - v8 "github.com/zeta-chain/zetacore/x/observer/migrations/v8" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + keepertest "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/x/observer/keeper" + v8 "github.com/zeta-chain/node/x/observer/migrations/v8" + "github.com/zeta-chain/node/x/observer/types" "testing" ) diff --git a/x/observer/module.go b/x/observer/module.go index 0b18315ab4..41724bc8b1 100644 --- a/x/observer/module.go +++ b/x/observer/module.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/client/cli" - "github.com/zeta-chain/zetacore/x/observer/keeper" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/client/cli" + "github.com/zeta-chain/node/x/observer/keeper" + "github.com/zeta-chain/node/x/observer/types" ) var ( diff --git a/x/observer/module_simulation.go b/x/observer/module_simulation.go index 0ae96a3186..555532c090 100644 --- a/x/observer/module_simulation.go +++ b/x/observer/module_simulation.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) const ( diff --git a/x/observer/types/ballot.pb.go b/x/observer/types/ballot.pb.go index daeb4c0ac8..46d4a4d9e3 100644 --- a/x/observer/types/ballot.pb.go +++ b/x/observer/types/ballot.pb.go @@ -240,41 +240,42 @@ func init() { } var fileDescriptor_18c7141b763f2e87 = []byte{ - // 540 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x8d, 0x93, 0x26, 0x34, 0x4b, 0x69, 0xc2, 0x12, 0x45, 0x56, 0x10, 0x6e, 0x14, 0x89, 0xca, - 0x84, 0xd6, 0x96, 0x0a, 0x37, 0x6e, 0x01, 0x45, 0x44, 0x42, 0x05, 0xdc, 0x0a, 0x54, 0x38, 0x58, - 0x8e, 0x3d, 0xc4, 0x2b, 0x5c, 0x6f, 0xb4, 0xbb, 0xa9, 0xda, 0x7c, 0x05, 0x1f, 0xc1, 0x81, 0x4f, - 0xe9, 0xb1, 0x47, 0xc4, 0xa1, 0x82, 0xe4, 0x47, 0xd0, 0xee, 0xda, 0xad, 0x41, 0x51, 0x4e, 0xbb, - 0x33, 0xf3, 0xe6, 0xcd, 0xec, 0xbc, 0x1d, 0x64, 0xcf, 0x41, 0x04, 0x61, 0x1c, 0x90, 0xd4, 0x55, - 0x37, 0xca, 0xc0, 0xa5, 0x63, 0x0e, 0xec, 0x0c, 0x98, 0x3b, 0x0e, 0x92, 0x84, 0x0a, 0x67, 0xca, - 0xa8, 0xa0, 0xf8, 0xe1, 0x0d, 0xd2, 0xc9, 0x91, 0x4e, 0x8e, 0xec, 0xb4, 0x26, 0x74, 0x42, 0x15, - 0xce, 0x95, 0x37, 0x9d, 0xd2, 0xe9, 0xaf, 0x23, 0xcf, 0x2f, 0x1a, 0xdb, 0xfb, 0x53, 0x41, 0xb5, - 0x81, 0xaa, 0x87, 0x5b, 0xa8, 0x4a, 0xd2, 0x08, 0xce, 0x4d, 0xa3, 0x6b, 0xd8, 0x75, 0x4f, 0x1b, - 0xf8, 0x29, 0xba, 0xaf, 0xfb, 0xf1, 0x49, 0x04, 0xa9, 0x20, 0x5f, 0x08, 0x30, 0xb3, 0xac, 0x10, - 0x4d, 0x1d, 0x18, 0xdd, 0xf8, 0xf1, 0x23, 0x84, 0xce, 0xa8, 0x00, 0xe6, 0x27, 0x84, 0x0b, 0xb3, - 0xd2, 0xad, 0xd8, 0x75, 0xaf, 0xae, 0x3c, 0x6f, 0x08, 0x17, 0xf8, 0x05, 0xaa, 0x4a, 0x83, 0x9b, - 0x1b, 0xdd, 0x8a, 0xbd, 0x7d, 0xf0, 0xd8, 0x59, 0xf3, 0x36, 0xe7, 0x03, 0x15, 0x70, 0x7c, 0x31, - 0x05, 0x4f, 0xe7, 0xe0, 0x8f, 0xa8, 0xa9, 0x63, 0x81, 0x20, 0x34, 0xf5, 0xc5, 0xc5, 0x14, 0xcc, - 0x6a, 0xd7, 0xb0, 0xb7, 0x0f, 0xf6, 0xd6, 0xf2, 0xbc, 0xbd, 0x4d, 0x52, 0x74, 0x0d, 0xfa, 0xaf, - 0x03, 0x9f, 0xa0, 0xec, 0x21, 0xbe, 0x88, 0x19, 0xf0, 0x98, 0x26, 0x91, 0x59, 0x93, 0x0f, 0x1c, - 0x38, 0x97, 0xd7, 0x3b, 0xa5, 0x5f, 0xd7, 0x3b, 0xbb, 0x13, 0x22, 0xe2, 0xd9, 0xd8, 0x09, 0xe9, - 0xa9, 0x1b, 0x52, 0x7e, 0x4a, 0x79, 0x76, 0xec, 0xf3, 0xe8, 0xab, 0x2b, 0x3b, 0xe1, 0xce, 0x2b, - 0x08, 0xbd, 0x86, 0xe6, 0x39, 0xce, 0x69, 0xf0, 0x21, 0xba, 0x97, 0x51, 0x73, 0x11, 0x88, 0x19, - 0x37, 0xef, 0xa8, 0x86, 0x9f, 0xac, 0x6d, 0x58, 0xcb, 0x71, 0xa4, 0x12, 0xbc, 0xad, 0x71, 0xc1, - 0xc2, 0xcf, 0x51, 0x3b, 0xe3, 0x0b, 0x19, 0xe8, 0x39, 0xc4, 0x40, 0x26, 0xb1, 0x30, 0x37, 0xbb, - 0x86, 0x5d, 0xf1, 0x5a, 0x3a, 0xfa, 0x32, 0x0b, 0xbe, 0x56, 0xb1, 0xde, 0x67, 0xf4, 0x40, 0x73, - 0x4a, 0x11, 0x86, 0x94, 0x69, 0x37, 0x6e, 0xa3, 0x5a, 0x96, 0x6c, 0xa8, 0xe4, 0xcc, 0xc2, 0x7b, - 0x08, 0x6b, 0x1a, 0xee, 0xab, 0x2f, 0xa0, 0xc5, 0x2c, 0x2b, 0x31, 0xb3, 0x49, 0xf1, 0x91, 0x0c, - 0x48, 0xba, 0xfe, 0x7b, 0xb4, 0x99, 0x2b, 0x85, 0xdb, 0x08, 0x1f, 0xcd, 0xc2, 0x10, 0x38, 0x2f, - 0x0c, 0xbd, 0x59, 0x92, 0xfe, 0x61, 0x40, 0x92, 0x19, 0x83, 0xa2, 0xdf, 0xc0, 0x0d, 0x74, 0xf7, - 0x90, 0x8a, 0x13, 0x10, 0x92, 0x21, 0x6a, 0x96, 0x3b, 0x1b, 0x3f, 0xbe, 0x5b, 0x46, 0x7f, 0x8e, - 0xb6, 0x8a, 0x33, 0xc0, 0xbb, 0xa8, 0xa7, 0xed, 0x21, 0x49, 0x83, 0x84, 0xcc, 0x21, 0xf2, 0x57, - 0x96, 0x59, 0x81, 0x5b, 0x59, 0xb6, 0x85, 0x9a, 0x1a, 0x37, 0x4a, 0xdf, 0x31, 0x3a, 0x61, 0xc0, - 0x79, 0x5e, 0x7b, 0x30, 0xba, 0x5c, 0x58, 0xc6, 0xd5, 0xc2, 0x32, 0x7e, 0x2f, 0x2c, 0xe3, 0xdb, - 0xd2, 0x2a, 0x5d, 0x2d, 0xad, 0xd2, 0xcf, 0xa5, 0x55, 0xfa, 0xe4, 0x16, 0x3e, 0x81, 0x14, 0x6d, - 0xff, 0xbf, 0x0d, 0x3b, 0xbf, 0xdd, 0x31, 0xf5, 0x23, 0xc6, 0x35, 0xb5, 0x61, 0xcf, 0xfe, 0x06, - 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf7, 0x30, 0x7b, 0xec, 0x03, 0x00, 0x00, + // 545 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0x8e, 0x93, 0x26, 0x7f, 0xb3, 0x7f, 0x69, 0xc2, 0x12, 0x45, 0x56, 0x10, 0x6e, 0x14, 0x89, + 0xca, 0xa4, 0xad, 0x2d, 0x15, 0x6e, 0xdc, 0x02, 0x44, 0x44, 0x42, 0x05, 0xdc, 0x0a, 0x54, 0x38, + 0x58, 0x8e, 0x3d, 0xc4, 0x2b, 0x5c, 0x6f, 0xb4, 0xbb, 0xa9, 0xda, 0x3c, 0x05, 0x0f, 0xc1, 0x81, + 0x47, 0xe9, 0xb1, 0x47, 0xc4, 0xa1, 0x82, 0xe4, 0x45, 0xd0, 0xee, 0xda, 0xad, 0x91, 0xa2, 0x9c, + 0x76, 0x67, 0xe6, 0x9b, 0x6f, 0x66, 0xe7, 0xdb, 0x41, 0xf6, 0x1c, 0x44, 0x10, 0xc6, 0x01, 0x49, + 0x5d, 0x75, 0xa3, 0x0c, 0x5c, 0x3a, 0xe6, 0xc0, 0xce, 0x81, 0xb9, 0xe3, 0x20, 0x49, 0xa8, 0x70, + 0xa6, 0x8c, 0x0a, 0x8a, 0x1f, 0xde, 0x22, 0x9d, 0x1c, 0xe9, 0xe4, 0xc8, 0x4e, 0x6b, 0x42, 0x27, + 0x54, 0xe1, 0x5c, 0x79, 0xd3, 0x29, 0x9d, 0xfe, 0x3a, 0xf2, 0xfc, 0xa2, 0xb1, 0xbd, 0x3f, 0x15, + 0x54, 0x1b, 0xa8, 0x7a, 0xb8, 0x85, 0xaa, 0x24, 0x8d, 0xe0, 0xc2, 0x34, 0xba, 0x86, 0x5d, 0xf7, + 0xb4, 0x81, 0xf7, 0xd0, 0x7d, 0xdd, 0x8f, 0x4f, 0x22, 0x48, 0x05, 0xf9, 0x42, 0x80, 0x99, 0x65, + 0x85, 0x68, 0xea, 0xc0, 0xe8, 0xd6, 0x8f, 0x1f, 0x21, 0x74, 0x4e, 0x05, 0x30, 0x3f, 0x21, 0x5c, + 0x98, 0x95, 0x6e, 0xc5, 0xae, 0x7b, 0x75, 0xe5, 0x79, 0x43, 0xb8, 0xc0, 0xcf, 0x51, 0x55, 0x1a, + 0xdc, 0xdc, 0xe8, 0x56, 0xec, 0xed, 0xc3, 0xc7, 0xce, 0x9a, 0xb7, 0x39, 0x1f, 0xa8, 0x80, 0x93, + 0xcb, 0x29, 0x78, 0x3a, 0x07, 0x7f, 0x44, 0x4d, 0x1d, 0x0b, 0x04, 0xa1, 0xa9, 0x2f, 0x2e, 0xa7, + 0x60, 0x56, 0xbb, 0x86, 0xbd, 0x7d, 0xb8, 0xbf, 0x96, 0xe7, 0xed, 0x5d, 0x92, 0xa2, 0x6b, 0xd0, + 0x7f, 0x1d, 0xf8, 0x14, 0x65, 0x0f, 0xf1, 0x45, 0xcc, 0x80, 0xc7, 0x34, 0x89, 0xcc, 0x9a, 0x7c, + 0xe0, 0xc0, 0xb9, 0xba, 0xd9, 0x29, 0xfd, 0xba, 0xd9, 0xd9, 0x9d, 0x10, 0x11, 0xcf, 0xc6, 0x4e, + 0x48, 0xcf, 0xdc, 0x90, 0xf2, 0x33, 0xca, 0xb3, 0xe3, 0x80, 0x47, 0x5f, 0x5d, 0xd9, 0x09, 0x77, + 0x5e, 0x42, 0xe8, 0x35, 0x34, 0xcf, 0x49, 0x4e, 0x83, 0x8f, 0xd0, 0xbd, 0x8c, 0x9a, 0x8b, 0x40, + 0xcc, 0xb8, 0xf9, 0x9f, 0x6a, 0xf8, 0xc9, 0xda, 0x86, 0xb5, 0x1c, 0xc7, 0x2a, 0xc1, 0xdb, 0x1a, + 0x17, 0x2c, 0xfc, 0x0c, 0xb5, 0x33, 0xbe, 0x90, 0x81, 0x9e, 0x43, 0x0c, 0x64, 0x12, 0x0b, 0x73, + 0xb3, 0x6b, 0xd8, 0x15, 0xaf, 0xa5, 0xa3, 0x2f, 0xb2, 0xe0, 0x6b, 0x15, 0xeb, 0x7d, 0x46, 0x0f, + 0x34, 0xa7, 0x14, 0x61, 0x48, 0x99, 0x76, 0xe3, 0x36, 0xaa, 0x65, 0xc9, 0x86, 0x4a, 0xce, 0x2c, + 0xbc, 0x8f, 0xb0, 0xa6, 0xe1, 0xbe, 0xfa, 0x02, 0x5a, 0xcc, 0xb2, 0x12, 0x33, 0x9b, 0x14, 0x1f, + 0xc9, 0x80, 0xa4, 0xeb, 0xbf, 0x47, 0x9b, 0xb9, 0x52, 0xb8, 0x8d, 0xf0, 0xf1, 0x2c, 0x0c, 0x81, + 0xf3, 0xc2, 0xd0, 0x9b, 0x25, 0xe9, 0x1f, 0x06, 0x24, 0x99, 0x31, 0x28, 0xfa, 0x0d, 0xdc, 0x40, + 0xff, 0x1f, 0x51, 0x71, 0x0a, 0x42, 0x32, 0x44, 0xcd, 0x72, 0x67, 0xe3, 0xc7, 0x77, 0xcb, 0xe8, + 0xcf, 0xd1, 0x56, 0x71, 0x06, 0x78, 0x17, 0xf5, 0xb4, 0x3d, 0x24, 0x69, 0x90, 0x90, 0x39, 0x44, + 0xfe, 0xca, 0x32, 0x2b, 0x70, 0x2b, 0xcb, 0xb6, 0x50, 0x53, 0xe3, 0x46, 0xe9, 0x3b, 0x46, 0x27, + 0x0c, 0x38, 0xcf, 0x6b, 0x0f, 0x5e, 0x5d, 0x2d, 0x2c, 0xe3, 0x7a, 0x61, 0x19, 0xbf, 0x17, 0x96, + 0xf1, 0x6d, 0x69, 0x95, 0xae, 0x97, 0x56, 0xe9, 0xe7, 0xd2, 0x2a, 0x7d, 0xda, 0x2b, 0x7c, 0x02, + 0x29, 0xda, 0x81, 0xde, 0xb0, 0x94, 0x46, 0xe0, 0x5e, 0xdc, 0xed, 0x97, 0xfa, 0x0d, 0xe3, 0x9a, + 0xda, 0xae, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x75, 0x1d, 0x77, 0xe8, 0x03, 0x00, + 0x00, } func (m *Ballot) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/blame.pb.go b/x/observer/types/blame.pb.go index ede43964f2..0b34a06784 100644 --- a/x/observer/types/blame.pb.go +++ b/x/observer/types/blame.pb.go @@ -152,26 +152,26 @@ func init() { } var fileDescriptor_43b03381a0168e22 = []byte{ - // 294 bytes of a gzipped FileDescriptorProto + // 296 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0x17, 0x6b, 0x27, 0x8d, 0x3a, 0x21, 0x08, 0x16, 0xc5, 0x50, 0x07, 0xb2, 0x22, 0x98, - 0x82, 0x1e, 0xbc, 0x0f, 0x2f, 0x22, 0x78, 0xa8, 0x37, 0x2f, 0x25, 0x59, 0x9f, 0x5d, 0x71, 0x6b, - 0x4a, 0x9a, 0xca, 0x2a, 0xf8, 0x1d, 0xfc, 0x58, 0x1e, 0x77, 0xf4, 0x28, 0xed, 0x17, 0x91, 0xa5, - 0xab, 0x82, 0x87, 0xdd, 0x5e, 0x7e, 0xf9, 0xf3, 0xfe, 0xbc, 0x1f, 0x1e, 0xbd, 0x81, 0xe6, 0x93, - 0x29, 0x4f, 0xb3, 0xc0, 0x4c, 0x52, 0x41, 0x20, 0x45, 0x01, 0xea, 0x15, 0x54, 0x20, 0x66, 0x7c, - 0x0e, 0x2c, 0x57, 0x52, 0x4b, 0x72, 0xf2, 0x1b, 0x64, 0x5d, 0x90, 0x75, 0xc1, 0xe3, 0x8b, 0x4d, - 0x5b, 0xba, 0xa1, 0x5d, 0x34, 0x4c, 0xf0, 0xf6, 0x83, 0x8c, 0x81, 0x1c, 0xe1, 0x9d, 0xbc, 0x14, - 0xd1, 0x0b, 0x54, 0x2e, 0xf2, 0x90, 0xef, 0x84, 0xfd, 0xbc, 0x14, 0xf7, 0x50, 0x91, 0x53, 0x8c, - 0x4d, 0x71, 0x14, 0x73, 0xcd, 0xdd, 0x2d, 0x0f, 0xf9, 0x7b, 0xa1, 0x63, 0xc8, 0x2d, 0xd7, 0x9c, - 0x8c, 0xf0, 0x41, 0xfb, 0x5d, 0xa4, 0x49, 0xc6, 0x75, 0xa9, 0xc0, 0xb5, 0x4c, 0x66, 0x60, 0xf0, - 0x63, 0x47, 0x87, 0xef, 0xd8, 0x1e, 0xaf, 0x08, 0x39, 0xc4, 0x76, 0x9a, 0xc5, 0xb0, 0x58, 0xf7, - 0xb4, 0x0f, 0x72, 0x8e, 0x07, 0xcf, 0x3c, 0x9d, 0x95, 0x0a, 0x22, 0x05, 0xbc, 0x90, 0x99, 0xa9, - 0x72, 0xc2, 0xfd, 0x35, 0x0d, 0x0d, 0x24, 0x37, 0xd8, 0xce, 0x64, 0x0c, 0x85, 0x6b, 0x79, 0x96, - 0xbf, 0x7b, 0x75, 0xc6, 0x36, 0x78, 0x60, 0xab, 0xc3, 0xc2, 0x36, 0x3f, 0xbe, 0xfb, 0xac, 0x29, - 0x5a, 0xd6, 0x14, 0x7d, 0xd7, 0x14, 0x7d, 0x34, 0xb4, 0xb7, 0x6c, 0x68, 0xef, 0xab, 0xa1, 0xbd, - 0xa7, 0x20, 0x49, 0xf5, 0xb4, 0x14, 0x6c, 0x22, 0xe7, 0x46, 0xd7, 0xe5, 0x3f, 0x73, 0x8b, 0x3f, - 0x77, 0xba, 0xca, 0xa1, 0x10, 0x7d, 0x63, 0xee, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x32, - 0xa0, 0x8a, 0xad, 0x01, 0x00, 0x00, + 0x18, 0x86, 0x17, 0x67, 0x27, 0x8d, 0x3a, 0x21, 0x08, 0x16, 0xc5, 0x50, 0x07, 0xb2, 0xa2, 0x98, + 0x82, 0x1e, 0xbc, 0x0f, 0x3d, 0x09, 0x1e, 0xea, 0xcd, 0x4b, 0x49, 0xd6, 0xcf, 0xae, 0xb8, 0x35, + 0x25, 0x4d, 0x65, 0x15, 0xfc, 0x0f, 0xfe, 0x2c, 0x8f, 0x3b, 0x7a, 0x94, 0xf6, 0x8f, 0x48, 0xd3, + 0x55, 0x6f, 0xbb, 0x7d, 0x79, 0xf2, 0xe6, 0x7b, 0xc9, 0x83, 0xc7, 0xef, 0xa0, 0xf9, 0x74, 0xc6, + 0x93, 0xd4, 0x37, 0x93, 0x54, 0xe0, 0x4b, 0x91, 0x83, 0x7a, 0x03, 0xe5, 0x8b, 0x39, 0x5f, 0x00, + 0xcb, 0x94, 0xd4, 0x92, 0x9c, 0xfc, 0x05, 0x59, 0x17, 0x64, 0x5d, 0xf0, 0xf8, 0x62, 0xd3, 0x96, + 0x6e, 0x68, 0x17, 0x8d, 0x62, 0xbc, 0xfd, 0x28, 0x23, 0x20, 0x47, 0x78, 0x27, 0x2b, 0x44, 0xf8, + 0x0a, 0xa5, 0x83, 0x5c, 0xe4, 0xd9, 0xc1, 0x20, 0x2b, 0xc4, 0x03, 0x94, 0xe4, 0x14, 0x63, 0x53, + 0x1c, 0x46, 0x5c, 0x73, 0x67, 0xcb, 0x45, 0xde, 0x5e, 0x60, 0x1b, 0x72, 0xc7, 0x35, 0x27, 0x63, + 0x7c, 0xd0, 0x5e, 0xe7, 0x49, 0x9c, 0x72, 0x5d, 0x28, 0x70, 0xfa, 0x26, 0x33, 0x34, 0xf8, 0xa9, + 0xa3, 0xa3, 0x0f, 0x6c, 0x4d, 0x1a, 0x42, 0x0e, 0xb1, 0x95, 0xa4, 0x11, 0x2c, 0xd7, 0x3d, 0xed, + 0x81, 0x9c, 0xe3, 0xe1, 0x0b, 0x4f, 0xe6, 0x85, 0x82, 0x50, 0x01, 0xcf, 0x65, 0x6a, 0xaa, 0xec, + 0x60, 0x7f, 0x4d, 0x03, 0x03, 0xc9, 0x2d, 0xb6, 0x52, 0x19, 0x41, 0xee, 0xf4, 0xdd, 0xbe, 0xb7, + 0x7b, 0x7d, 0xc6, 0x36, 0x78, 0x60, 0xcd, 0xc7, 0x82, 0x36, 0x3f, 0xb9, 0xff, 0xaa, 0x28, 0x5a, + 0x55, 0x14, 0xfd, 0x54, 0x14, 0x7d, 0xd6, 0xb4, 0xb7, 0xaa, 0x69, 0xef, 0xbb, 0xa6, 0xbd, 0xe7, + 0xcb, 0x38, 0xd1, 0xb3, 0x42, 0xb0, 0xa9, 0x5c, 0x18, 0x5d, 0x57, 0xad, 0xb9, 0xe6, 0x99, 0xbf, + 0xfc, 0xf7, 0xa6, 0xcb, 0x0c, 0x72, 0x31, 0x30, 0xd6, 0x6e, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xe4, 0x3c, 0xf5, 0x08, 0xa9, 0x01, 0x00, 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/chain_nonces.pb.go b/x/observer/types/chain_nonces.pb.go index e450e70f5b..70be3e4026 100644 --- a/x/observer/types/chain_nonces.pb.go +++ b/x/observer/types/chain_nonces.pb.go @@ -118,24 +118,25 @@ func init() { } var fileDescriptor_d8bc11608907ed56 = []byte{ - // 272 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xbd, 0x4e, 0xc3, 0x30, - 0x14, 0x85, 0xeb, 0xa6, 0x69, 0xc1, 0x0c, 0x48, 0x56, 0x07, 0x03, 0x92, 0x15, 0x31, 0x65, 0xc1, - 0x1e, 0x78, 0x83, 0xb2, 0xd0, 0x85, 0x21, 0x23, 0x0b, 0xca, 0xcf, 0xc5, 0xb1, 0x04, 0x76, 0x65, - 0x1b, 0x54, 0xfa, 0x14, 0x3c, 0x0d, 0xcf, 0xc0, 0xd8, 0x91, 0x11, 0x25, 0x2f, 0x82, 0xec, 0x10, - 0x90, 0xba, 0xdd, 0x73, 0x74, 0xce, 0xbd, 0x57, 0x1f, 0xe6, 0x3b, 0xf0, 0x65, 0xdd, 0x96, 0x4a, - 0x8b, 0x38, 0x19, 0x0b, 0xc2, 0x54, 0x0e, 0xec, 0x2b, 0x58, 0x11, 0xfd, 0x07, 0x6d, 0x74, 0x0d, - 0x8e, 0x6f, 0xac, 0xf1, 0x86, 0x5c, 0xfc, 0xe5, 0xf9, 0x98, 0xe7, 0x63, 0xfe, 0x7c, 0x29, 0x8d, - 0x34, 0x31, 0x27, 0xc2, 0x34, 0x54, 0x2e, 0x3f, 0x10, 0x3e, 0xb9, 0x09, 0x8d, 0xbb, 0xb8, 0x88, - 0x50, 0xbc, 0xa8, 0x2d, 0x94, 0xde, 0x58, 0x8a, 0x32, 0x94, 0x1f, 0x17, 0xa3, 0x24, 0x14, 0xa7, - 0x4a, 0x37, 0xb0, 0xa5, 0xd3, 0xe0, 0xaf, 0xa6, 0x14, 0x15, 0x83, 0x41, 0xce, 0xf0, 0xd1, 0xf0, - 0x8c, 0x6a, 0x68, 0x92, 0xa1, 0x3c, 0x29, 0x16, 0x51, 0xaf, 0x1b, 0xb2, 0xc4, 0x69, 0xfc, 0x90, - 0xce, 0x32, 0x94, 0xcf, 0x8a, 0x41, 0x84, 0x23, 0x4e, 0x49, 0x0d, 0xd6, 0xd1, 0x34, 0x4b, 0xc2, - 0x91, 0x5f, 0x49, 0x72, 0x7c, 0xfa, 0xa8, 0x74, 0xf9, 0xa4, 0x76, 0xd0, 0xdc, 0x82, 0x92, 0xad, - 0xa7, 0xf3, 0xd8, 0x3c, 0xb4, 0x57, 0xeb, 0xcf, 0x8e, 0xa1, 0x7d, 0xc7, 0xd0, 0x77, 0xc7, 0xd0, - 0x7b, 0xcf, 0x26, 0xfb, 0x9e, 0x4d, 0xbe, 0x7a, 0x36, 0xb9, 0x17, 0x52, 0xf9, 0xf6, 0xa5, 0xe2, - 0xb5, 0x79, 0x8e, 0xd8, 0xae, 0x0e, 0x08, 0x6e, 0xff, 0x19, 0xfa, 0xb7, 0x0d, 0xb8, 0x6a, 0x1e, - 0x51, 0x5c, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x59, 0x6a, 0x82, 0x3e, 0x6f, 0x01, 0x00, 0x00, + // 277 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xcf, 0x4a, 0xc4, 0x30, + 0x10, 0xc6, 0x37, 0xdb, 0xed, 0xae, 0xc6, 0x83, 0x10, 0xf6, 0x10, 0x15, 0x42, 0xf1, 0x54, 0x10, + 0xdb, 0x83, 0x6f, 0xb0, 0x22, 0xe8, 0xc5, 0x43, 0x8f, 0x5e, 0xa4, 0x7f, 0xc6, 0x36, 0xa0, 0x99, + 0x25, 0x89, 0xb2, 0xee, 0x53, 0xf8, 0x34, 0x3e, 0x83, 0xc7, 0x3d, 0x7a, 0x94, 0xf6, 0x45, 0x24, + 0x89, 0x55, 0xf0, 0x36, 0xdf, 0xc7, 0xf7, 0xcd, 0x0c, 0x3f, 0x9a, 0x6d, 0xc1, 0x96, 0x75, 0x57, + 0x4a, 0x95, 0xfb, 0x09, 0x35, 0xe4, 0x58, 0x19, 0xd0, 0x2f, 0xa0, 0x73, 0xef, 0xdf, 0x2b, 0x54, + 0x35, 0x98, 0x6c, 0xad, 0xd1, 0x22, 0x3b, 0xf9, 0xcd, 0x67, 0x63, 0x3e, 0x1b, 0xf3, 0xc7, 0xcb, + 0x16, 0x5b, 0xf4, 0xb9, 0xdc, 0x4d, 0xa1, 0x72, 0xfa, 0x4e, 0xe8, 0xc1, 0xa5, 0x6b, 0xdc, 0xfa, + 0x45, 0x8c, 0xd3, 0x45, 0xad, 0xa1, 0xb4, 0xa8, 0x39, 0x49, 0x48, 0xba, 0x5f, 0x8c, 0x92, 0x71, + 0x1a, 0x4b, 0xd5, 0xc0, 0x86, 0x4f, 0x9d, 0xbf, 0x9a, 0x72, 0x52, 0x04, 0x83, 0x1d, 0xd1, 0xbd, + 0xf0, 0x8c, 0x6c, 0x78, 0x94, 0x90, 0x34, 0x2a, 0x16, 0x5e, 0xdf, 0x34, 0x6c, 0x49, 0x63, 0xff, + 0x21, 0x9f, 0x25, 0x24, 0x9d, 0x15, 0x41, 0xb8, 0x23, 0x46, 0xb6, 0x0a, 0xb4, 0xe1, 0x71, 0x12, + 0xb9, 0x23, 0x3f, 0x92, 0xa5, 0xf4, 0xf0, 0x41, 0xaa, 0xf2, 0x51, 0x6e, 0xa1, 0xb9, 0x06, 0xd9, + 0x76, 0x96, 0xcf, 0x7d, 0xf3, 0xbf, 0xbd, 0xba, 0xfa, 0xe8, 0x05, 0xd9, 0xf5, 0x82, 0x7c, 0xf5, + 0x82, 0xbc, 0x0d, 0x62, 0xb2, 0x1b, 0xc4, 0xe4, 0x73, 0x10, 0x93, 0xbb, 0xb3, 0x56, 0xda, 0xee, + 0xb9, 0xca, 0x6a, 0x7c, 0xf2, 0xd8, 0xce, 0x03, 0x41, 0x85, 0x0d, 0xe4, 0x9b, 0x3f, 0x7e, 0xf6, + 0x75, 0x0d, 0xa6, 0x9a, 0x7b, 0x0c, 0x17, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xa1, 0x0d, + 0xd7, 0x6b, 0x01, 0x00, 0x00, } func (m *ChainNonces) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/chain_params.go b/x/observer/types/chain_params.go index d1bc9f1b3b..d9d1cc2294 100644 --- a/x/observer/types/chain_params.go +++ b/x/observer/types/chain_params.go @@ -9,9 +9,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethchains "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - solanacontracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + solanacontracts "github.com/zeta-chain/node/pkg/contracts/solana" ) var ( diff --git a/x/observer/types/chain_params_test.go b/x/observer/types/chain_params_test.go index 64c27d5757..bad7a4e487 100644 --- a/x/observer/types/chain_params_test.go +++ b/x/observer/types/chain_params_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/suite" . "gopkg.in/check.v1" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func TestChainParamsList_Validate(t *testing.T) { diff --git a/x/observer/types/crosschain_flags.pb.go b/x/observer/types/crosschain_flags.pb.go index d6fe8eb849..f13b80ce2b 100644 --- a/x/observer/types/crosschain_flags.pb.go +++ b/x/observer/types/crosschain_flags.pb.go @@ -238,33 +238,34 @@ func init() { } var fileDescriptor_f617dc4ef266f323 = []byte{ - // 415 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x53, 0x5d, 0x6b, 0xd4, 0x40, - 0x14, 0xcd, 0x6c, 0x55, 0xca, 0x2c, 0xa5, 0x3a, 0xba, 0x18, 0x2b, 0xa4, 0x61, 0x9f, 0x82, 0xe8, - 0x44, 0xe2, 0x8b, 0xcf, 0xad, 0x1f, 0x04, 0x2a, 0x2e, 0x79, 0xf4, 0x45, 0x26, 0x93, 0xdb, 0x49, - 0x20, 0x9d, 0x59, 0x66, 0x26, 0x25, 0xeb, 0xaf, 0xf0, 0x51, 0xfc, 0x45, 0x7d, 0xec, 0x8b, 0x20, - 0x08, 0x2a, 0xbb, 0x7f, 0x44, 0x3a, 0x71, 0xab, 0xcd, 0x46, 0x7f, 0x40, 0xdf, 0x6e, 0xee, 0x39, - 0x27, 0x67, 0xe6, 0x9e, 0xb9, 0x38, 0xf9, 0x00, 0x96, 0xf1, 0x92, 0x55, 0x32, 0x76, 0x95, 0xd2, - 0x10, 0xab, 0xdc, 0x80, 0x3e, 0x05, 0x1d, 0x73, 0xad, 0x8c, 0x71, 0xe0, 0xfb, 0xe3, 0x9a, 0x09, - 0x43, 0xe7, 0x5a, 0x59, 0x45, 0x1e, 0x5e, 0x6a, 0xe8, 0x5a, 0x43, 0xd7, 0x9a, 0xbd, 0x7b, 0x42, - 0x09, 0xe5, 0x78, 0xf1, 0x45, 0xd5, 0x49, 0xf6, 0x02, 0xa1, 0x94, 0xa8, 0x21, 0x76, 0x5f, 0x79, - 0x73, 0x1c, 0x17, 0x8d, 0x66, 0xb6, 0x52, 0xb2, 0xc3, 0xa7, 0x9f, 0x47, 0x78, 0xf2, 0x9a, 0x99, - 0x99, 0xae, 0x38, 0xa4, 0x92, 0x6b, 0x60, 0x06, 0x5e, 0x5d, 0x58, 0x92, 0x10, 0x8f, 0x61, 0xae, - 0x78, 0x79, 0x04, 0x52, 0xd8, 0xd2, 0x47, 0x21, 0x8a, 0xb6, 0xb2, 0xbf, 0x5b, 0x24, 0xc5, 0x3b, - 0x1a, 0xac, 0x5e, 0xa4, 0xd2, 0x82, 0x3e, 0x65, 0xb5, 0x3f, 0x0a, 0x51, 0x34, 0x4e, 0x1e, 0xd0, - 0xce, 0x93, 0xae, 0x3d, 0xe9, 0x8b, 0xdf, 0x9e, 0x07, 0xdb, 0x67, 0xdf, 0xf7, 0xbd, 0x4f, 0x3f, - 0xf6, 0x51, 0x76, 0x55, 0x49, 0x9e, 0xe3, 0xfb, 0xa2, 0x77, 0x8a, 0x19, 0x68, 0x0e, 0xd2, 0xfa, - 0x5b, 0x21, 0x8a, 0x76, 0xb2, 0x7f, 0xc1, 0xe4, 0x29, 0xbe, 0xdb, 0x87, 0xde, 0xb0, 0xd6, 0xbf, - 0xe1, 0x54, 0x43, 0x10, 0x89, 0xf0, 0xee, 0x09, 0x6b, 0x67, 0x20, 0x8b, 0x4a, 0x8a, 0x43, 0x6e, - 0x5b, 0xe3, 0xdf, 0x74, 0xec, 0x7e, 0x7b, 0xfa, 0x05, 0xe1, 0xdd, 0xc3, 0xcb, 0x28, 0xba, 0xb1, - 0x3c, 0xc2, 0xb7, 0x2b, 0x93, 0xca, 0x5c, 0x35, 0xb2, 0x78, 0x29, 0x59, 0x5e, 0x43, 0xe1, 0x66, - 0xb3, 0x9d, 0x6d, 0xf4, 0xc9, 0x63, 0x7c, 0xa7, 0x32, 0x6f, 0x1b, 0x7b, 0x85, 0x3c, 0x72, 0xe4, - 0x4d, 0x80, 0x94, 0x78, 0x22, 0x86, 0x92, 0x70, 0x13, 0x18, 0x27, 0x09, 0xfd, 0x4f, 0xfa, 0x74, - 0x30, 0xc3, 0x6c, 0xf8, 0x87, 0xd3, 0x6f, 0x08, 0x4f, 0x8e, 0x40, 0x30, 0xbe, 0xb8, 0x86, 0xb7, - 0x3b, 0x48, 0xcf, 0x96, 0x01, 0x3a, 0x5f, 0x06, 0xe8, 0xe7, 0x32, 0x40, 0x1f, 0x57, 0x81, 0x77, - 0xbe, 0x0a, 0xbc, 0xaf, 0xab, 0xc0, 0x7b, 0x17, 0x8b, 0xca, 0x96, 0x4d, 0x4e, 0xb9, 0x3a, 0x71, - 0x4b, 0xf7, 0xa4, 0xb7, 0x7f, 0xed, 0x9f, 0x0d, 0xb4, 0x8b, 0x39, 0x98, 0xfc, 0x96, 0x7b, 0xc2, - 0xcf, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x66, 0xc2, 0x71, 0x2b, 0xad, 0x03, 0x00, 0x00, + // 419 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x53, 0x4d, 0x6f, 0xd4, 0x30, + 0x10, 0x8d, 0xb7, 0x80, 0x2a, 0xaf, 0xaa, 0x82, 0x61, 0x45, 0x28, 0x52, 0x1a, 0xed, 0x29, 0xe2, + 0xc3, 0x41, 0xe1, 0xc2, 0xb9, 0xa5, 0xa0, 0x48, 0x45, 0xac, 0x72, 0xe4, 0x82, 0x1c, 0x67, 0xea, + 0x44, 0x4a, 0xed, 0x95, 0xed, 0x54, 0x59, 0x7e, 0x05, 0x47, 0xc4, 0x2f, 0xea, 0xb1, 0x17, 0x24, + 0x24, 0x24, 0x40, 0xbb, 0x7f, 0x04, 0xd5, 0x61, 0x0b, 0xbb, 0x1b, 0xf8, 0x01, 0xbd, 0x4d, 0xe6, + 0xbd, 0x97, 0x67, 0xcf, 0xf3, 0xe0, 0xe4, 0x03, 0x58, 0xc6, 0x4b, 0x56, 0xc9, 0xd8, 0x55, 0x4a, + 0x43, 0xac, 0x72, 0x03, 0xfa, 0x0c, 0x74, 0xcc, 0xb5, 0x32, 0xc6, 0x81, 0xef, 0x4f, 0x6a, 0x26, + 0x0c, 0x9d, 0x6a, 0x65, 0x15, 0x79, 0x78, 0xa5, 0xa1, 0x4b, 0x0d, 0x5d, 0x6a, 0xf6, 0xee, 0x09, + 0x25, 0x94, 0xe3, 0xc5, 0x97, 0x55, 0x27, 0xd9, 0x0b, 0x84, 0x52, 0xa2, 0x86, 0xd8, 0x7d, 0xe5, + 0xcd, 0x49, 0x5c, 0x34, 0x9a, 0xd9, 0x4a, 0xc9, 0x0e, 0x1f, 0x7f, 0x1e, 0xe0, 0xd1, 0x6b, 0x66, + 0x26, 0xba, 0xe2, 0x90, 0x4a, 0xae, 0x81, 0x19, 0x78, 0x75, 0x69, 0x49, 0x42, 0x3c, 0x84, 0xa9, + 0xe2, 0xe5, 0x31, 0x48, 0x61, 0x4b, 0x1f, 0x85, 0x28, 0xda, 0xca, 0xfe, 0x6e, 0x91, 0x14, 0xef, + 0x68, 0xb0, 0x7a, 0x96, 0x4a, 0x0b, 0xfa, 0x8c, 0xd5, 0xfe, 0x20, 0x44, 0xd1, 0x30, 0x79, 0x40, + 0x3b, 0x4f, 0xba, 0xf4, 0xa4, 0x2f, 0x7f, 0x7b, 0x1e, 0x6c, 0x9f, 0x7f, 0xdf, 0xf7, 0x3e, 0xfd, + 0xd8, 0x47, 0xd9, 0xaa, 0x92, 0xbc, 0xc0, 0xf7, 0xc5, 0xda, 0x29, 0x26, 0xa0, 0x39, 0x48, 0xeb, + 0x6f, 0x85, 0x28, 0xda, 0xc9, 0xfe, 0x05, 0x93, 0x67, 0xf8, 0xee, 0x3a, 0xf4, 0x86, 0xb5, 0xfe, + 0x0d, 0xa7, 0xea, 0x83, 0x48, 0x84, 0x77, 0x4f, 0x59, 0x3b, 0x01, 0x59, 0x54, 0x52, 0x1c, 0x72, + 0xdb, 0x1a, 0xff, 0xa6, 0x63, 0xaf, 0xb7, 0xc7, 0x5f, 0x10, 0xde, 0x3d, 0xbc, 0x8a, 0xa2, 0x1b, + 0xcb, 0x23, 0x7c, 0xbb, 0x32, 0xa9, 0xcc, 0x55, 0x23, 0x8b, 0x23, 0xc9, 0xf2, 0x1a, 0x0a, 0x37, + 0x9b, 0xed, 0x6c, 0xa3, 0x4f, 0x9e, 0xe0, 0x3b, 0x95, 0x79, 0xdb, 0xd8, 0x15, 0xf2, 0xc0, 0x91, + 0x37, 0x01, 0x52, 0xe2, 0x91, 0xe8, 0x4b, 0xc2, 0x4d, 0x60, 0x98, 0x24, 0xf4, 0x3f, 0xe9, 0xd3, + 0xde, 0x0c, 0xb3, 0xfe, 0x1f, 0x8e, 0xbf, 0x21, 0x3c, 0x3a, 0x06, 0xc1, 0xf8, 0xec, 0x1a, 0xde, + 0xee, 0xe0, 0xe8, 0x7c, 0x1e, 0xa0, 0x8b, 0x79, 0x80, 0x7e, 0xce, 0x03, 0xf4, 0x71, 0x11, 0x78, + 0x17, 0x8b, 0xc0, 0xfb, 0xba, 0x08, 0xbc, 0x77, 0x8f, 0x45, 0x65, 0xcb, 0x26, 0xa7, 0x5c, 0x9d, + 0xba, 0xa5, 0x7b, 0xda, 0xed, 0x9f, 0x54, 0x05, 0xc4, 0xed, 0x9f, 0xed, 0xb3, 0xb3, 0x29, 0x98, + 0xfc, 0x96, 0x7b, 0xbe, 0xcf, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x51, 0x22, 0x6b, 0xce, 0xa9, + 0x03, 0x00, 0x00, } func (m *GasPriceIncreaseFlags) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/crosschain_flags_test.go b/x/observer/types/crosschain_flags_test.go index 967a6ada27..318df40e24 100644 --- a/x/observer/types/crosschain_flags_test.go +++ b/x/observer/types/crosschain_flags_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func TestDefaultDefaultCrosschainFlags(t *testing.T) { diff --git a/x/observer/types/events.pb.go b/x/observer/types/events.pb.go index e1dde9feb0..7fe970546f 100644 --- a/x/observer/types/events.pb.go +++ b/x/observer/types/events.pb.go @@ -421,44 +421,44 @@ func init() { } var fileDescriptor_067e682d8234d605 = []byte{ - // 582 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0x6e, 0xb6, 0x81, 0xc0, 0x1d, 0xac, 0x8d, 0x18, 0xcb, 0x8a, 0x14, 0xb6, 0x4a, 0x48, 0x63, - 0x40, 0x2a, 0x95, 0x13, 0x88, 0x0b, 0x2d, 0x63, 0x54, 0x20, 0x36, 0x55, 0x9b, 0x84, 0xb8, 0x44, - 0x4e, 0xf2, 0x96, 0x44, 0x4d, 0xed, 0xca, 0x76, 0x06, 0xe5, 0xce, 0x15, 0xb8, 0xf2, 0x2b, 0xf8, - 0x1b, 0x1c, 0x77, 0xe4, 0xc0, 0x01, 0xb5, 0x7f, 0x04, 0xd9, 0x4e, 0xd2, 0x42, 0xab, 0xaa, 0xb7, - 0xdd, 0xac, 0xf7, 0xbe, 0xef, 0xf3, 0xf7, 0x3d, 0x27, 0x0f, 0xed, 0x7d, 0x02, 0x81, 0xfd, 0x08, - 0xc7, 0xa4, 0xa1, 0x4e, 0x94, 0x41, 0x83, 0x7a, 0x1c, 0xd8, 0x39, 0xb0, 0x06, 0x9c, 0x03, 0x11, - 0xdc, 0x19, 0x30, 0x2a, 0xa8, 0x79, 0xa7, 0x40, 0x3a, 0x39, 0xd2, 0xc9, 0x91, 0xb5, 0x5b, 0x21, - 0x0d, 0xa9, 0xc2, 0x35, 0xe4, 0x49, 0x53, 0x6a, 0xcd, 0x45, 0xe2, 0x3e, 0xa3, 0x9c, 0xab, 0xa6, - 0x7b, 0x96, 0xe0, 0x30, 0xbb, 0xa6, 0xb6, 0xbf, 0x88, 0x93, 0x1f, 0x34, 0xb6, 0xfe, 0xdb, 0x40, - 0xe6, 0x81, 0xf4, 0xd8, 0xc2, 0x49, 0x42, 0x45, 0x9b, 0x01, 0x16, 0x10, 0x98, 0x3b, 0x68, 0xbd, - 0xcf, 0x43, 0x57, 0x0c, 0x07, 0xe0, 0xa6, 0x2c, 0xb1, 0x8c, 0x1d, 0x63, 0xef, 0x7a, 0x17, 0xf5, - 0x79, 0x78, 0x32, 0x1c, 0xc0, 0x29, 0x4b, 0xcc, 0x07, 0xa8, 0xea, 0x29, 0x8a, 0x1b, 0x07, 0x40, - 0x44, 0x7c, 0x16, 0x03, 0xb3, 0x56, 0x14, 0xac, 0xa2, 0x1b, 0x9d, 0xa2, 0x6e, 0xde, 0x47, 0x15, - 0x7d, 0x2f, 0x16, 0x31, 0x25, 0x6e, 0x84, 0x79, 0x64, 0xad, 0x2a, 0xec, 0xc6, 0x54, 0xfd, 0x15, - 0xe6, 0x91, 0xd4, 0x9d, 0x86, 0xaa, 0x18, 0xd6, 0x9a, 0xd6, 0x9d, 0x6a, 0xb4, 0x65, 0xdd, 0xbc, - 0x8b, 0xca, 0x99, 0x09, 0xe9, 0xd4, 0xba, 0xa2, 0x5d, 0xea, 0x92, 0x34, 0x5a, 0xff, 0x6c, 0xa0, - 0x2d, 0x15, 0xef, 0x35, 0x0c, 0x43, 0x20, 0xad, 0x84, 0xfa, 0xbd, 0xd3, 0x41, 0xb0, 0x64, 0xc6, - 0x5d, 0xb4, 0xde, 0x53, 0x3c, 0xd7, 0x93, 0xc4, 0x2c, 0x5e, 0xb9, 0x37, 0xd1, 0x32, 0xef, 0xa1, - 0x9b, 0x19, 0x64, 0x90, 0x7a, 0x3d, 0x18, 0xf2, 0x2c, 0xd7, 0x0d, 0x5d, 0x3d, 0xd6, 0xc5, 0xfa, - 0xf7, 0x15, 0xb4, 0xa9, 0x7c, 0xbc, 0x85, 0x0f, 0x47, 0xd9, 0x0b, 0x3c, 0x0f, 0x82, 0xa5, 0x5c, - 0x14, 0xc3, 0x03, 0xe6, 0xe2, 0x20, 0x60, 0xc0, 0x79, 0xe6, 0x64, 0x83, 0x4e, 0xa4, 0x64, 0xd9, - 0x7c, 0x86, 0x6a, 0xea, 0xc5, 0x93, 0x18, 0x88, 0x70, 0x43, 0x86, 0x89, 0x00, 0x28, 0x48, 0xda, - 0x99, 0x35, 0x41, 0x1c, 0x6a, 0x40, 0xce, 0x7e, 0x8a, 0xb6, 0xe7, 0xb0, 0x75, 0xae, 0xec, 0x09, - 0xb6, 0x66, 0xc8, 0x3a, 0xa1, 0xf9, 0x04, 0x6d, 0x17, 0x26, 0x13, 0xcc, 0x85, 0x9e, 0x98, 0xeb, - 0xd3, 0x94, 0x08, 0xf5, 0x2e, 0x6b, 0xdd, 0xdb, 0x39, 0xe0, 0x0d, 0xe6, 0x42, 0x4d, 0xaf, 0x2d, - 0xbb, 0xf5, 0xaf, 0x06, 0xaa, 0xaa, 0xd9, 0xb4, 0xdb, 0x27, 0xef, 0x5e, 0xc4, 0x1c, 0x7b, 0xc9, - 0x52, 0x73, 0xd9, 0x47, 0x95, 0x98, 0x77, 0x88, 0x47, 0x53, 0x12, 0x1c, 0x10, 0xc5, 0x52, 0x73, - 0xb9, 0xd6, 0x9d, 0xa9, 0x9b, 0x0f, 0x51, 0x35, 0xe6, 0x47, 0xa9, 0xf8, 0x07, 0xbc, 0xaa, 0xc0, - 0xb3, 0x8d, 0xfa, 0x17, 0x03, 0x55, 0x0a, 0x47, 0xb9, 0xc4, 0x65, 0x1a, 0xfa, 0x61, 0xa0, 0x5d, - 0x65, 0xe8, 0x10, 0xf3, 0x63, 0x16, 0xfb, 0xd0, 0x21, 0x3e, 0x03, 0xcc, 0xe1, 0xa5, 0xfc, 0xed, - 0x97, 0xff, 0xa0, 0x23, 0xb4, 0x19, 0xce, 0x53, 0x50, 0x36, 0xcb, 0xcd, 0xa6, 0xb3, 0x60, 0x41, - 0x39, 0x73, 0xef, 0xee, 0xce, 0x17, 0x6c, 0x75, 0x7e, 0x8e, 0x6c, 0xe3, 0x62, 0x64, 0x1b, 0x7f, - 0x46, 0xb6, 0xf1, 0x6d, 0x6c, 0x97, 0x2e, 0xc6, 0x76, 0xe9, 0xd7, 0xd8, 0x2e, 0xbd, 0x6f, 0x84, - 0xb1, 0x88, 0x52, 0xcf, 0xf1, 0x69, 0x5f, 0xad, 0xa7, 0x47, 0xff, 0x6d, 0xaa, 0x8f, 0x93, 0x5d, - 0x25, 0x93, 0x70, 0xef, 0xaa, 0xda, 0x54, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x12, 0xe0, - 0x05, 0x6e, 0x68, 0x05, 0x00, 0x00, + // 586 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0x41, 0x6f, 0xd3, 0x4c, + 0x10, 0x8d, 0xdb, 0x7e, 0x9f, 0x60, 0x53, 0x68, 0x62, 0x51, 0xea, 0x06, 0xc9, 0xb4, 0x91, 0x90, + 0x4a, 0x0b, 0x8e, 0x14, 0x4e, 0x20, 0x2e, 0x24, 0x84, 0x12, 0x81, 0x68, 0x15, 0xb5, 0x12, 0xe2, + 0x62, 0xad, 0xed, 0xa9, 0x6d, 0xc5, 0xd9, 0x8d, 0x76, 0xd7, 0x85, 0x70, 0xe7, 0x0a, 0x5c, 0xf9, + 0x15, 0xfc, 0x0d, 0x8e, 0x3d, 0x72, 0xe0, 0x80, 0x92, 0x3f, 0x82, 0x76, 0xd7, 0x76, 0x82, 0x12, + 0x45, 0xb9, 0x71, 0x5b, 0xcd, 0xbc, 0xf7, 0xf6, 0xbd, 0x59, 0x7b, 0xd0, 0xc1, 0x47, 0x10, 0xd8, + 0x8f, 0x70, 0x4c, 0x1a, 0xea, 0x44, 0x19, 0x34, 0xa8, 0xc7, 0x81, 0x5d, 0x02, 0x6b, 0xc0, 0x25, + 0x10, 0xc1, 0x9d, 0x21, 0xa3, 0x82, 0x9a, 0x77, 0x0a, 0xa4, 0x93, 0x23, 0x9d, 0x1c, 0x59, 0xbb, + 0x15, 0xd2, 0x90, 0x2a, 0x5c, 0x43, 0x9e, 0x34, 0xa5, 0xd6, 0x5c, 0x26, 0xee, 0x33, 0xca, 0xb9, + 0x6a, 0xba, 0x17, 0x09, 0x0e, 0xb3, 0x6b, 0x6a, 0x87, 0xcb, 0x38, 0xf9, 0x41, 0x63, 0xeb, 0xbf, + 0x0c, 0x64, 0x76, 0xa4, 0xc7, 0x16, 0x4e, 0x12, 0x2a, 0xda, 0x0c, 0xb0, 0x80, 0xc0, 0xdc, 0x43, + 0x9b, 0x03, 0x1e, 0xba, 0x62, 0x34, 0x04, 0x37, 0x65, 0x89, 0x65, 0xec, 0x19, 0x07, 0xd7, 0x7b, + 0x68, 0xc0, 0xc3, 0xb3, 0xd1, 0x10, 0xce, 0x59, 0x62, 0x1e, 0xa1, 0xaa, 0xa7, 0x28, 0x6e, 0x1c, + 0x00, 0x11, 0xf1, 0x45, 0x0c, 0xcc, 0x5a, 0x53, 0xb0, 0x8a, 0x6e, 0x74, 0x8b, 0xba, 0x79, 0x1f, + 0x55, 0xf4, 0xbd, 0x58, 0xc4, 0x94, 0xb8, 0x11, 0xe6, 0x91, 0xb5, 0xae, 0xb0, 0x5b, 0x33, 0xf5, + 0x97, 0x98, 0x47, 0x52, 0x77, 0x16, 0xaa, 0x62, 0x58, 0x1b, 0x5a, 0x77, 0xa6, 0xd1, 0x96, 0x75, + 0xf3, 0x2e, 0x2a, 0x67, 0x26, 0xa4, 0x53, 0xeb, 0x3f, 0xed, 0x52, 0x97, 0xa4, 0xd1, 0xfa, 0x27, + 0x03, 0xed, 0xa8, 0x78, 0xaf, 0x60, 0x14, 0x02, 0x69, 0x25, 0xd4, 0xef, 0x9f, 0x0f, 0x83, 0x15, + 0x33, 0xee, 0xa3, 0xcd, 0xbe, 0xe2, 0xb9, 0x9e, 0x24, 0x66, 0xf1, 0xca, 0xfd, 0xa9, 0x96, 0x79, + 0x0f, 0xdd, 0xcc, 0x20, 0xc3, 0xd4, 0xeb, 0xc3, 0x88, 0x67, 0xb9, 0x6e, 0xe8, 0xea, 0xa9, 0x2e, + 0xd6, 0xbf, 0xad, 0xa1, 0x6d, 0xe5, 0xe3, 0x0d, 0xbc, 0x3f, 0xc9, 0x5e, 0xe0, 0x59, 0x10, 0xac, + 0xe4, 0xa2, 0x18, 0x1e, 0x30, 0x17, 0x07, 0x01, 0x03, 0xce, 0x33, 0x27, 0x5b, 0x74, 0x2a, 0x25, + 0xcb, 0xe6, 0x53, 0x54, 0x53, 0x2f, 0x9e, 0xc4, 0x40, 0x84, 0x1b, 0x32, 0x4c, 0x04, 0x40, 0x41, + 0xd2, 0xce, 0xac, 0x29, 0xe2, 0x58, 0x03, 0x72, 0xf6, 0x13, 0xb4, 0xbb, 0x80, 0xad, 0x73, 0x65, + 0x4f, 0xb0, 0x33, 0x47, 0xd6, 0x09, 0xcd, 0xc7, 0x68, 0xb7, 0x30, 0x99, 0x60, 0x2e, 0xf4, 0xc4, + 0x5c, 0x9f, 0xa6, 0x44, 0xa8, 0x77, 0xd9, 0xe8, 0xdd, 0xce, 0x01, 0xaf, 0x31, 0x17, 0x6a, 0x7a, + 0x6d, 0xd9, 0xad, 0x7f, 0x31, 0x50, 0x55, 0xcd, 0xa6, 0xdd, 0x3e, 0x7b, 0xfb, 0x3c, 0xe6, 0xd8, + 0x4b, 0x56, 0x9a, 0xcb, 0x21, 0xaa, 0xc4, 0xbc, 0x4b, 0x3c, 0x9a, 0x92, 0xa0, 0x43, 0x14, 0x4b, + 0xcd, 0xe5, 0x5a, 0x6f, 0xae, 0x6e, 0x3e, 0x40, 0xd5, 0x98, 0x9f, 0xa4, 0xe2, 0x2f, 0xf0, 0xba, + 0x02, 0xcf, 0x37, 0xea, 0x9f, 0x0d, 0x54, 0x29, 0x1c, 0xe5, 0x12, 0xff, 0xd2, 0xd0, 0x77, 0x03, + 0xed, 0x2b, 0x43, 0xc7, 0x98, 0x9f, 0xb2, 0xd8, 0x87, 0x2e, 0xf1, 0x19, 0x60, 0x0e, 0x2f, 0xe4, + 0x6f, 0xbf, 0xfa, 0x07, 0x1d, 0xa1, 0xed, 0x70, 0x91, 0x82, 0xb2, 0x59, 0x6e, 0x36, 0x9d, 0x25, + 0x0b, 0xca, 0x59, 0x78, 0x77, 0x6f, 0xb1, 0x60, 0xab, 0xf3, 0x63, 0x6c, 0x1b, 0x57, 0x63, 0xdb, + 0xf8, 0x3d, 0xb6, 0x8d, 0xaf, 0x13, 0xbb, 0x74, 0x35, 0xb1, 0x4b, 0x3f, 0x27, 0x76, 0xe9, 0xdd, + 0x51, 0x18, 0x8b, 0x28, 0xf5, 0x1c, 0x9f, 0x0e, 0xd4, 0x7a, 0x7a, 0xa8, 0x37, 0x15, 0xa1, 0x01, + 0x34, 0x3e, 0x4c, 0xf7, 0x94, 0x4c, 0xc1, 0xbd, 0xff, 0xd5, 0x96, 0x7a, 0xf4, 0x27, 0x00, 0x00, + 0xff, 0xff, 0xfb, 0x7d, 0x42, 0xa2, 0x64, 0x05, 0x00, 0x00, } func (m *EventBallotCreated) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/expected_keepers.go b/x/observer/types/expected_keepers.go index 4a556d4fa4..2cf2b9ac75 100644 --- a/x/observer/types/expected_keepers.go +++ b/x/observer/types/expected_keepers.go @@ -5,9 +5,9 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + authoritytypes "github.com/zeta-chain/node/x/authority/types" ) type StakingKeeper interface { diff --git a/x/observer/types/genesis.pb.go b/x/observer/types/genesis.pb.go index b6e05e456f..12d65ad082 100644 --- a/x/observer/types/genesis.pb.go +++ b/x/observer/types/genesis.pb.go @@ -189,47 +189,47 @@ func init() { } var fileDescriptor_7679b0952a0823f4 = []byte{ - // 639 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcb, 0x6e, 0x13, 0x3d, - 0x18, 0x4d, 0xfe, 0xf6, 0x6f, 0xa9, 0xd3, 0x36, 0xad, 0x61, 0x61, 0x15, 0x69, 0xa8, 0x8a, 0x10, - 0xa1, 0x82, 0x99, 0x2a, 0xb0, 0x43, 0x2c, 0x68, 0xa5, 0x96, 0x8a, 0x52, 0x60, 0x52, 0x09, 0x89, - 0x45, 0x47, 0x8e, 0xe3, 0x4c, 0x46, 0x4c, 0xec, 0x68, 0xec, 0xa0, 0x84, 0xa7, 0xe0, 0x49, 0x78, - 0x8e, 0x2e, 0xbb, 0x64, 0x85, 0x50, 0xf2, 0x22, 0x68, 0x7c, 0x49, 0x32, 0x59, 0xb8, 0xb3, 0xb3, - 0x3e, 0x9f, 0x73, 0x74, 0xbe, 0x2b, 0x78, 0xf6, 0x83, 0x4a, 0x4c, 0x7a, 0x38, 0x61, 0x81, 0x7a, - 0xf1, 0x8c, 0x06, 0xbc, 0x2d, 0x68, 0xf6, 0x9d, 0x66, 0x41, 0x4c, 0x19, 0x15, 0x89, 0xf0, 0x07, - 0x19, 0x97, 0x1c, 0x3e, 0x9c, 0x41, 0x7d, 0x0b, 0xf5, 0x2d, 0x74, 0xef, 0x41, 0xcc, 0x63, 0xae, - 0x70, 0x41, 0xfe, 0xd2, 0x94, 0xbd, 0x86, 0x4b, 0xbd, 0x8d, 0xd3, 0x94, 0x4b, 0x83, 0x7c, 0xea, - 0x44, 0xa6, 0xb8, 0x4f, 0x0d, 0xd0, 0x77, 0x01, 0x55, 0x3c, 0x62, 0x9c, 0x11, 0x6a, 0x5c, 0xef, - 0x35, 0x9d, 0xf8, 0x8c, 0x0b, 0xa1, 0x49, 0xdd, 0x14, 0xc7, 0xa2, 0x8c, 0xed, 0x6f, 0x74, 0x1c, - 0x53, 0x56, 0xc6, 0x0d, 0xe3, 0x1d, 0x1a, 0x61, 0x42, 0xf8, 0x90, 0xd9, 0x34, 0x03, 0x37, 0x9e, - 0x11, 0x1a, 0x49, 0x1e, 0x11, 0x22, 0x47, 0x86, 0x70, 0xe8, 0x22, 0xd8, 0x47, 0x19, 0xdb, 0x03, - 0x9c, 0xe1, 0xbe, 0x4d, 0xf0, 0xc8, 0x89, 0xa4, 0xac, 0x93, 0xb0, 0xb8, 0x58, 0xc6, 0x27, 0x2e, - 0x86, 0x14, 0x16, 0xf6, 0xea, 0x0e, 0x58, 0xd4, 0x1d, 0xb2, 0x8e, 0x88, 0xfa, 0x49, 0x9c, 0x61, - 0xc9, 0x8d, 0xf1, 0x83, 0x5f, 0x1b, 0x60, 0xf3, 0x4c, 0xcf, 0x5a, 0x4b, 0x62, 0x49, 0xe1, 0x1b, - 0xb0, 0xae, 0xa7, 0x43, 0xa0, 0xea, 0xfe, 0x4a, 0xa3, 0xd6, 0x7c, 0xec, 0x3b, 0x86, 0xcf, 0x3f, - 0x56, 0xd8, 0xd0, 0x72, 0xe0, 0x05, 0xd8, 0xb0, 0x7f, 0x02, 0xfd, 0xb7, 0x5f, 0x6d, 0xd4, 0x9a, - 0x0d, 0xa7, 0xc0, 0x47, 0xf3, 0x68, 0x51, 0x79, 0xbc, 0x7a, 0xf3, 0xe7, 0x51, 0x25, 0x9c, 0x0b, - 0xc0, 0x10, 0xd4, 0xf3, 0x4e, 0xbe, 0xd5, 0x8d, 0xbc, 0x48, 0x84, 0x44, 0x2b, 0xca, 0x94, 0x5b, - 0xf3, 0x72, 0xce, 0x09, 0x97, 0x05, 0xe0, 0x17, 0xb0, 0xb3, 0x3c, 0x7b, 0x68, 0x55, 0x19, 0x7d, - 0xee, 0x14, 0x3d, 0x99, 0x91, 0x4e, 0x73, 0x4e, 0x58, 0x27, 0xc5, 0x00, 0x7c, 0x0d, 0xd6, 0x74, - 0xa7, 0xd1, 0xff, 0x4a, 0xce, 0x5d, 0xb8, 0x4f, 0x0a, 0x1a, 0x1a, 0x4a, 0x4e, 0xd6, 0xd3, 0x8d, - 0xd6, 0x4a, 0x90, 0xdf, 0x2b, 0x68, 0x68, 0x28, 0xf0, 0x1a, 0xdc, 0x4f, 0xb1, 0x90, 0x91, 0xfd, - 0x8f, 0x54, 0xb6, 0x68, 0x5d, 0x29, 0xf9, 0x4e, 0xa5, 0x0b, 0x2c, 0xa4, 0x6d, 0xc1, 0x89, 0x2a, - 0xd8, 0x6e, 0xba, 0x1c, 0x82, 0xd7, 0x60, 0x57, 0x57, 0x4b, 0x9b, 0x8d, 0xd2, 0xbc, 0x11, 0xf7, - 0xca, 0xd4, 0x2c, 0x8f, 0xeb, 0x4c, 0xf3, 0xda, 0x9b, 0x06, 0xd7, 0x49, 0x31, 0x0c, 0x9b, 0x60, - 0x45, 0x0a, 0x81, 0x36, 0x94, 0xe2, 0xbe, 0x53, 0xf1, 0xaa, 0xd5, 0x0a, 0x73, 0x30, 0x3c, 0x03, - 0xb5, 0x7c, 0xa8, 0x7b, 0x89, 0x90, 0x3c, 0x1b, 0x23, 0xa0, 0xc6, 0xe2, 0x4e, 0xae, 0x71, 0x00, - 0xa4, 0x10, 0xef, 0x34, 0x13, 0x76, 0x00, 0xb4, 0xdb, 0x31, 0x5b, 0x0e, 0x81, 0x6a, 0x4a, 0xef, - 0xc8, 0xad, 0x27, 0xc4, 0xe9, 0x90, 0x75, 0x3e, 0x18, 0xd2, 0x39, 0xeb, 0x72, 0xa3, 0xbf, 0x23, - 0x8b, 0x5f, 0xb9, 0x5d, 0xa0, 0x4e, 0xa9, 0xae, 0xdd, 0xa6, 0x52, 0x3f, 0x70, 0x6f, 0x56, 0x0e, - 0xb7, 0x2b, 0xa1, 0xb8, 0x66, 0x7c, 0xb7, 0x8b, 0x57, 0x02, 0x6d, 0x29, 0xb1, 0x43, 0xf7, 0xb4, - 0x69, 0xca, 0xa5, 0x62, 0x18, 0xd1, 0xad, 0xc1, 0x62, 0x10, 0x7e, 0x06, 0x9b, 0x8b, 0x37, 0x1c, - 0x6d, 0x97, 0x58, 0x34, 0xd5, 0xdf, 0x82, 0x68, 0x8d, 0xcc, 0x43, 0x30, 0x04, 0x5b, 0x85, 0xc3, - 0x8a, 0xea, 0xa5, 0x96, 0x97, 0x11, 0x7a, 0xc5, 0x4f, 0x88, 0x1c, 0x59, 0x4d, 0xb6, 0x10, 0x3a, - 0xbf, 0x99, 0x78, 0xd5, 0xdb, 0x89, 0x57, 0xfd, 0x3b, 0xf1, 0xaa, 0x3f, 0xa7, 0x5e, 0xe5, 0x76, - 0xea, 0x55, 0x7e, 0x4f, 0xbd, 0xca, 0xd7, 0x20, 0x4e, 0x64, 0x6f, 0xd8, 0xf6, 0x09, 0xef, 0xab, - 0x0b, 0xf8, 0x62, 0xe9, 0x18, 0x8e, 0x16, 0xce, 0xe1, 0x78, 0x40, 0x45, 0x7b, 0x4d, 0x9d, 0xc0, - 0x97, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xa4, 0xcf, 0x4a, 0x89, 0x07, 0x00, 0x00, + // 640 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x4e, 0x13, 0x41, + 0x1c, 0x6e, 0x05, 0x41, 0xa6, 0x40, 0x61, 0xf4, 0x30, 0xc1, 0x64, 0x25, 0x18, 0x63, 0x45, 0xdd, + 0x25, 0xd5, 0x9b, 0xf1, 0x20, 0x44, 0xd0, 0x88, 0xa8, 0x5b, 0x12, 0x13, 0x0f, 0x6c, 0xa6, 0xd3, + 0x61, 0xd9, 0xb8, 0x9d, 0x69, 0x76, 0xa6, 0x06, 0x7c, 0x0a, 0x9f, 0xc4, 0xe7, 0xe0, 0xc8, 0xd1, + 0x93, 0x31, 0xf4, 0x45, 0xcc, 0xfc, 0x6b, 0xbb, 0x3d, 0x0c, 0x7b, 0x9b, 0xfc, 0xe6, 0xfb, 0xbe, + 0x7c, 0xbf, 0xbf, 0xe0, 0xc9, 0x4f, 0x2a, 0x31, 0x39, 0xc3, 0x19, 0x8b, 0xf4, 0x8b, 0x17, 0x34, + 0xe2, 0x5d, 0x41, 0x8b, 0x1f, 0xb4, 0x88, 0x52, 0xca, 0xa8, 0xc8, 0x44, 0x38, 0x28, 0xb8, 0xe4, + 0xf0, 0xfe, 0x18, 0x1a, 0x3a, 0x68, 0xe8, 0xa0, 0x1b, 0xf7, 0x52, 0x9e, 0x72, 0x8d, 0x8b, 0xd4, + 0xcb, 0x50, 0x36, 0x5a, 0x3e, 0xf5, 0x2e, 0xce, 0x73, 0x2e, 0x2d, 0xf2, 0xb1, 0x17, 0x99, 0xe3, + 0x3e, 0xb5, 0xc0, 0xd0, 0x07, 0xd4, 0xf1, 0x84, 0x71, 0x46, 0xa8, 0x75, 0xbd, 0xd1, 0xf6, 0xe2, + 0x0b, 0x2e, 0x84, 0x21, 0x9d, 0xe6, 0x38, 0x15, 0x55, 0x6c, 0x7f, 0xa7, 0x17, 0x29, 0x65, 0x55, + 0xdc, 0x30, 0xde, 0xa3, 0x09, 0x26, 0x84, 0x0f, 0x99, 0x4b, 0x33, 0xf2, 0xe3, 0x19, 0xa1, 0x89, + 0xe4, 0x09, 0x21, 0xf2, 0xdc, 0x12, 0xb6, 0x7d, 0x04, 0xf7, 0xa8, 0x62, 0x7b, 0x80, 0x0b, 0xdc, + 0x77, 0x09, 0xee, 0x78, 0x91, 0x94, 0xf5, 0x32, 0x96, 0x96, 0xcb, 0xf8, 0xc8, 0xc7, 0x90, 0xc2, + 0xc1, 0x5e, 0xde, 0x00, 0x4b, 0x4e, 0x87, 0xac, 0x27, 0x92, 0x7e, 0x96, 0x16, 0x58, 0x72, 0x6b, + 0x7c, 0xeb, 0xf7, 0x12, 0x58, 0x3e, 0x30, 0xb3, 0xd6, 0x91, 0x58, 0x52, 0xf8, 0x1a, 0x2c, 0x9a, + 0xe9, 0x10, 0xa8, 0xbe, 0x39, 0xd7, 0x6a, 0xb4, 0x1f, 0x86, 0x9e, 0xe1, 0x0b, 0x77, 0x35, 0x36, + 0x76, 0x1c, 0x78, 0x08, 0x96, 0xdc, 0x9f, 0x40, 0xb7, 0x36, 0xeb, 0xad, 0x46, 0xbb, 0xe5, 0x15, + 0xf8, 0x64, 0x1f, 0x1d, 0x2a, 0x77, 0xe7, 0x2f, 0xff, 0x3e, 0xa8, 0xc5, 0x13, 0x01, 0x18, 0x83, + 0xa6, 0xea, 0xe4, 0x1b, 0xd3, 0xc8, 0xc3, 0x4c, 0x48, 0x34, 0xa7, 0x4d, 0xf9, 0x35, 0x8f, 0x26, + 0x9c, 0x78, 0x56, 0x00, 0x7e, 0x05, 0x6b, 0xb3, 0xb3, 0x87, 0xe6, 0xb5, 0xd1, 0x67, 0x5e, 0xd1, + 0xbd, 0x31, 0x69, 0x5f, 0x71, 0xe2, 0x26, 0x29, 0x07, 0xe0, 0x2b, 0xb0, 0x60, 0x3a, 0x8d, 0x6e, + 0x6b, 0x39, 0x7f, 0xe1, 0x3e, 0x6b, 0x68, 0x6c, 0x29, 0x8a, 0x6c, 0xa6, 0x1b, 0x2d, 0x54, 0x20, + 0x7f, 0xd0, 0xd0, 0xd8, 0x52, 0xe0, 0x09, 0xb8, 0x9b, 0x63, 0x21, 0x13, 0xf7, 0x9f, 0xe8, 0x6c, + 0xd1, 0xa2, 0x56, 0x0a, 0xbd, 0x4a, 0x87, 0x58, 0x48, 0xd7, 0x82, 0x3d, 0x5d, 0xb0, 0xf5, 0x7c, + 0x36, 0x04, 0x4f, 0xc0, 0xba, 0xa9, 0x96, 0x31, 0x9b, 0xe4, 0xaa, 0x11, 0x77, 0xaa, 0xd4, 0x4c, + 0xc5, 0x4d, 0xa6, 0xaa, 0xf6, 0xb6, 0xc1, 0x4d, 0x52, 0x0e, 0xc3, 0x36, 0x98, 0x93, 0x42, 0xa0, + 0x25, 0xad, 0xb8, 0xe9, 0x55, 0x3c, 0xee, 0x74, 0x62, 0x05, 0x86, 0x07, 0xa0, 0xa1, 0x86, 0xfa, + 0x2c, 0x13, 0x92, 0x17, 0x17, 0x08, 0xe8, 0xb1, 0xb8, 0x91, 0x6b, 0x1d, 0x00, 0x29, 0xc4, 0x3b, + 0xc3, 0x84, 0x3d, 0x00, 0xdd, 0x76, 0x8c, 0x97, 0x43, 0xa0, 0x86, 0xd6, 0xdb, 0xf1, 0xeb, 0x09, + 0xb1, 0x3f, 0x64, 0xbd, 0x8f, 0x96, 0xf4, 0x9e, 0x9d, 0x72, 0xab, 0xbf, 0x26, 0xcb, 0x5f, 0xca, + 0x2e, 0xd0, 0xa7, 0xd4, 0xd4, 0x6e, 0x59, 0xab, 0x6f, 0xf9, 0x37, 0x4b, 0xc1, 0xdd, 0x4a, 0x68, + 0xae, 0x1d, 0xdf, 0xd5, 0xf2, 0x95, 0x40, 0x2b, 0x5a, 0x6c, 0xdb, 0x3f, 0x6d, 0x86, 0x72, 0xa4, + 0x19, 0x56, 0x74, 0x65, 0x30, 0x1d, 0x84, 0x5f, 0xc0, 0xf2, 0xf4, 0x0d, 0x47, 0xab, 0x15, 0x16, + 0x4d, 0xf7, 0xb7, 0x24, 0xda, 0x20, 0x93, 0x10, 0x8c, 0xc1, 0x4a, 0xe9, 0xb0, 0xa2, 0x66, 0xa5, + 0xe5, 0x65, 0x84, 0x1e, 0xf3, 0x3d, 0x22, 0xcf, 0x9d, 0x26, 0x9b, 0x0a, 0xbd, 0xbd, 0xbc, 0x0e, + 0xea, 0x57, 0xd7, 0x41, 0xfd, 0xdf, 0x75, 0x50, 0xff, 0x35, 0x0a, 0x6a, 0x57, 0xa3, 0xa0, 0xf6, + 0x67, 0x14, 0xd4, 0xbe, 0x3d, 0x4d, 0x33, 0x79, 0x36, 0xec, 0x86, 0x84, 0xf7, 0xf5, 0x05, 0x7c, + 0x6e, 0x8e, 0xa1, 0xda, 0xff, 0xe8, 0x7c, 0xea, 0x14, 0x5e, 0x0c, 0xa8, 0xe8, 0x2e, 0xe8, 0xf3, + 0xf7, 0xe2, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xb9, 0x0b, 0x93, 0x85, 0x07, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/genesis_test.go b/x/observer/types/genesis_test.go index b85e33dc0d..48ed8d0e7c 100644 --- a/x/observer/types/genesis_test.go +++ b/x/observer/types/genesis_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/observer/types/keygen.pb.go b/x/observer/types/keygen.pb.go index 9ed0cd39d5..835418d430 100644 --- a/x/observer/types/keygen.pb.go +++ b/x/observer/types/keygen.pb.go @@ -121,7 +121,7 @@ func init() { } var fileDescriptor_e9d0b438d0ca0d23 = []byte{ - // 294 bytes of a gzipped FileDescriptorProto + // 298 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xa8, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0xf3, 0x93, 0x8a, 0x53, 0x8b, 0xca, 0x52, 0x8b, 0xf4, 0xb3, 0x53, 0x2b, 0xd3, 0x53, 0xf3, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, @@ -135,12 +135,12 @@ var fileDescriptor_e9d0b438d0ca0d23 = []byte{ 0x2c, 0xa4, 0xe5, 0xc3, 0xc5, 0x83, 0x6c, 0x83, 0x90, 0x20, 0x17, 0x6f, 0x40, 0x6a, 0x5e, 0x4a, 0x66, 0x5e, 0x3a, 0x44, 0x58, 0x80, 0x01, 0x24, 0xe4, 0x9d, 0x5a, 0xe9, 0x9e, 0x9a, 0x17, 0x5c, 0x9a, 0x9c, 0x9c, 0x5a, 0x5c, 0x2c, 0xc0, 0x28, 0x24, 0x00, 0xd6, 0xe5, 0x9e, 0x9a, 0xe7, 0x96, - 0x98, 0x99, 0x93, 0x9a, 0x22, 0xc0, 0x2c, 0xc5, 0xb2, 0x62, 0x89, 0x1c, 0xa3, 0x93, 0xe7, 0x89, + 0x98, 0x99, 0x93, 0x9a, 0x22, 0xc0, 0x2c, 0xc5, 0xb2, 0x62, 0x89, 0x1c, 0xa3, 0x93, 0xeb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, - 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, - 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x43, 0x57, 0x17, 0x2d, 0xa0, 0x2b, 0x10, 0x41, 0x5d, 0x52, 0x59, - 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x37, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x0d, - 0xf6, 0x55, 0x96, 0x01, 0x00, 0x00, + 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, + 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0x43, 0x57, 0x17, 0x12, 0xd0, 0x79, 0xf9, 0x29, 0xa9, 0xfa, 0x15, + 0x88, 0x60, 0x2e, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x87, 0x99, 0x31, 0x20, 0x00, 0x00, + 0xff, 0xff, 0x3d, 0x2b, 0xce, 0xa9, 0x92, 0x01, 0x00, 0x00, } func (m *Keygen) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/message_add_observer.go b/x/observer/types/message_add_observer.go index 19a58eef0a..4c854348ca 100644 --- a/x/observer/types/message_add_observer.go +++ b/x/observer/types/message_add_observer.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/pkg/crypto" ) const TypeMsgAddObserver = "add_observer" diff --git a/x/observer/types/message_add_observer_test.go b/x/observer/types/message_add_observer_test.go index 32645d9371..d79beb99f6 100644 --- a/x/observer/types/message_add_observer_test.go +++ b/x/observer/types/message_add_observer_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgAddObserver_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_disable_cctx_flags_test.go b/x/observer/types/message_disable_cctx_flags_test.go index 8a394a2bac..4920961767 100644 --- a/x/observer/types/message_disable_cctx_flags_test.go +++ b/x/observer/types/message_disable_cctx_flags_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgDisableCCTX_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_enable_cctx_flags_test.go b/x/observer/types/message_enable_cctx_flags_test.go index f1121c5fce..ca47a79bc1 100644 --- a/x/observer/types/message_enable_cctx_flags_test.go +++ b/x/observer/types/message_enable_cctx_flags_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgEnableCCTX_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_remove_chain_params_test.go b/x/observer/types/message_remove_chain_params_test.go index 69f8f83103..083ccfd7e9 100644 --- a/x/observer/types/message_remove_chain_params_test.go +++ b/x/observer/types/message_remove_chain_params_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgRemoveChainParams_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_reset_chain_nonces_test.go b/x/observer/types/message_reset_chain_nonces_test.go index 41da6643d2..09b5a27961 100644 --- a/x/observer/types/message_reset_chain_nonces_test.go +++ b/x/observer/types/message_reset_chain_nonces_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgResetChainNonces_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_update_chain_params_test.go b/x/observer/types/message_update_chain_params_test.go index 69dd70ced8..71dfb224df 100644 --- a/x/observer/types/message_update_chain_params_test.go +++ b/x/observer/types/message_update_chain_params_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgUpdateChainParams_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_update_gas_price_increase_flags_test.go b/x/observer/types/message_update_gas_price_increase_flags_test.go index 17f110958c..4afee953e5 100644 --- a/x/observer/types/message_update_gas_price_increase_flags_test.go +++ b/x/observer/types/message_update_gas_price_increase_flags_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgUpdateGasPriceIncreaseFlags_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_update_keygen_test.go b/x/observer/types/message_update_keygen_test.go index 08476bb0e8..cdba799a30 100644 --- a/x/observer/types/message_update_keygen_test.go +++ b/x/observer/types/message_update_keygen_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgUpdateKeygen_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_update_observer_test.go b/x/observer/types/message_update_observer_test.go index d27cf0e19a..a07fbf107d 100644 --- a/x/observer/types/message_update_observer_test.go +++ b/x/observer/types/message_update_observer_test.go @@ -7,8 +7,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestNewMsgUpdateObserver_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_vote_blame_test.go b/x/observer/types/message_vote_blame_test.go index 6385621a12..f7cd5c7eb4 100644 --- a/x/observer/types/message_vote_blame_test.go +++ b/x/observer/types/message_vote_blame_test.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestNewMsgVoteBlameMsg_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_vote_block_header.go b/x/observer/types/message_vote_block_header.go index 383ed6464c..b386e47e13 100644 --- a/x/observer/types/message_vote_block_header.go +++ b/x/observer/types/message_vote_block_header.go @@ -6,7 +6,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/proofs" + "github.com/zeta-chain/node/pkg/proofs" ) var _ sdk.Msg = &MsgVoteBlockHeader{} diff --git a/x/observer/types/message_vote_block_header_test.go b/x/observer/types/message_vote_block_header_test.go index 763114c122..88d27b039d 100644 --- a/x/observer/types/message_vote_block_header_test.go +++ b/x/observer/types/message_vote_block_header_test.go @@ -10,11 +10,11 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/testutil/keeper" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/testutil/keeper" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgVoteBlockHeader_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/message_vote_tss.go b/x/observer/types/message_vote_tss.go index fa10c4ad37..c03661f3b4 100644 --- a/x/observer/types/message_vote_tss.go +++ b/x/observer/types/message_vote_tss.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) const TypeMsgVoteTSS = "VoteTSS" diff --git a/x/observer/types/message_vote_tss_test.go b/x/observer/types/message_vote_tss_test.go index 232d945190..36f9018d7d 100644 --- a/x/observer/types/message_vote_tss_test.go +++ b/x/observer/types/message_vote_tss_test.go @@ -7,9 +7,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestMsgVoteTSS_ValidateBasic(t *testing.T) { diff --git a/x/observer/types/node_account.pb.go b/x/observer/types/node_account.pb.go index 53781a796f..014e260015 100644 --- a/x/observer/types/node_account.pb.go +++ b/x/observer/types/node_account.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - crypto "github.com/zeta-chain/zetacore/pkg/crypto" + crypto "github.com/zeta-chain/node/pkg/crypto" io "io" math "math" math_bits "math/bits" @@ -139,31 +139,31 @@ func init() { } var fileDescriptor_67bb97178fb2bc84 = []byte{ - // 378 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcd, 0x8a, 0xdb, 0x30, - 0x10, 0xc7, 0xad, 0x7c, 0x35, 0x91, 0xdb, 0xd4, 0x88, 0x1e, 0x8c, 0x0b, 0x26, 0xf4, 0xd0, 0x9a, - 0x40, 0x65, 0x48, 0x9f, 0x20, 0xa5, 0x50, 0x4a, 0x21, 0x04, 0x87, 0x52, 0xe8, 0xa5, 0x48, 0xd6, - 0xe0, 0x18, 0xa7, 0x92, 0x91, 0xe5, 0xb4, 0xee, 0x53, 0xf4, 0x21, 0x7a, 0xd8, 0x47, 0xd9, 0x63, - 0x8e, 0x7b, 0x5c, 0x92, 0xdb, 0x3e, 0xc5, 0x12, 0xe7, 0x6b, 0x37, 0x84, 0x3d, 0x69, 0x34, 0xf3, - 0xfb, 0x33, 0xd2, 0xfc, 0x07, 0xd3, 0xbf, 0x60, 0x58, 0x3c, 0x67, 0xa9, 0x0c, 0xeb, 0x48, 0x69, - 0x08, 0x15, 0x2f, 0x40, 0x2f, 0x41, 0x87, 0x52, 0x09, 0xf8, 0xc9, 0xe2, 0x58, 0x95, 0xd2, 0xd0, - 0x5c, 0x2b, 0xa3, 0xc8, 0xeb, 0x23, 0x4f, 0x0f, 0x3c, 0x3d, 0xf0, 0xde, 0xab, 0x44, 0x25, 0xaa, - 0xe6, 0xc2, 0x6d, 0xb4, 0x93, 0x78, 0xc3, 0x0b, 0x2d, 0xf2, 0x2c, 0x09, 0x63, 0x5d, 0xe5, 0x46, - 0xed, 0x8f, 0x1d, 0xfb, 0xe6, 0x0e, 0x61, 0x7b, 0xa2, 0x04, 0x8c, 0x77, 0x4d, 0x89, 0x87, 0xbb, - 0x2a, 0x07, 0xcd, 0x8c, 0xd2, 0x2e, 0x1a, 0xa0, 0xa0, 0x17, 0x1d, 0xef, 0xe4, 0x2d, 0xee, 0x27, - 0x9a, 0x49, 0x03, 0x30, 0x16, 0x42, 0x43, 0x51, 0xb8, 0x8d, 0x9a, 0x38, 0xcb, 0x92, 0x09, 0x7e, - 0xb1, 0xcf, 0x4c, 0x4b, 0x9e, 0x41, 0xe5, 0x36, 0x07, 0x28, 0xb0, 0x47, 0x01, 0xbd, 0xf0, 0x95, - 0x3c, 0x4b, 0xe8, 0xfe, 0x41, 0xd3, 0x92, 0x7f, 0x85, 0x6a, 0x06, 0x26, 0x7a, 0x2c, 0x27, 0x9f, - 0x31, 0xde, 0x0e, 0x66, 0x66, 0x98, 0x29, 0x0b, 0xb7, 0x35, 0x40, 0x41, 0x7f, 0xf4, 0x8e, 0x3e, - 0x31, 0x17, 0x3a, 0x39, 0xe2, 0xd1, 0x03, 0xe9, 0x90, 0x63, 0x7c, 0xaa, 0x10, 0x1b, 0x3f, 0xfb, - 0x26, 0x33, 0xa9, 0x7e, 0x4b, 0xc7, 0x22, 0x2f, 0xb1, 0xfd, 0x7d, 0x9e, 0x1a, 0x58, 0xa4, 0x85, - 0x01, 0xe1, 0xa0, 0x6d, 0x75, 0x66, 0x98, 0x14, 0xbc, 0x72, 0x1a, 0xa4, 0x87, 0xdb, 0x11, 0x30, - 0x51, 0x39, 0x4d, 0x82, 0x71, 0x67, 0x1c, 0x9b, 0x74, 0x09, 0x4e, 0x8b, 0x3c, 0xc7, 0xdd, 0x4f, - 0x69, 0xc1, 0xf8, 0x02, 0x84, 0xd3, 0xf6, 0x5a, 0x57, 0xff, 0x7d, 0xf4, 0xf1, 0xcb, 0xf5, 0xda, - 0x47, 0xab, 0xb5, 0x8f, 0x6e, 0xd7, 0x3e, 0xfa, 0xb7, 0xf1, 0xad, 0xd5, 0xc6, 0xb7, 0x6e, 0x36, - 0xbe, 0xf5, 0x23, 0x4c, 0x52, 0x33, 0x2f, 0x39, 0x8d, 0xd5, 0xaf, 0xda, 0x97, 0xf7, 0x67, 0x16, - 0xfd, 0x39, 0xed, 0x81, 0xa9, 0x72, 0x28, 0x78, 0xa7, 0xb6, 0xe8, 0xc3, 0x7d, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x03, 0x08, 0x21, 0xe1, 0x33, 0x02, 0x00, 0x00, + // 379 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcd, 0xaa, 0xd3, 0x40, + 0x14, 0xc7, 0x33, 0xfd, 0xb2, 0x9d, 0x68, 0x0d, 0x83, 0x8b, 0x10, 0x21, 0x14, 0x17, 0x1a, 0x2a, + 0x4e, 0xa0, 0x3e, 0x41, 0x45, 0x71, 0x21, 0x94, 0x92, 0x22, 0x82, 0x1b, 0x99, 0xc9, 0x1c, 0xd2, + 0x90, 0x3a, 0x13, 0x26, 0x93, 0x6a, 0x7c, 0x0a, 0x1f, 0xc2, 0x85, 0x8f, 0xe2, 0xb2, 0x4b, 0x97, + 0xd2, 0xee, 0x7c, 0x0a, 0x49, 0xd2, 0x0f, 0xef, 0xa5, 0xdc, 0xd5, 0x9c, 0x39, 0xe7, 0xf7, 0xe7, + 0x9c, 0x39, 0xff, 0xc1, 0xf4, 0x1b, 0x18, 0x16, 0xaf, 0x59, 0x2a, 0xc3, 0x26, 0x52, 0x1a, 0x42, + 0xc5, 0x0b, 0xd0, 0x5b, 0xd0, 0xa1, 0x54, 0x02, 0x3e, 0xb1, 0x38, 0x56, 0xa5, 0x34, 0x34, 0xd7, + 0xca, 0x28, 0xf2, 0xf8, 0xcc, 0xd3, 0x13, 0x4f, 0x4f, 0xbc, 0xf7, 0x28, 0x51, 0x89, 0x6a, 0xb8, + 0xb0, 0x8e, 0x5a, 0x89, 0x37, 0xbd, 0xd2, 0x22, 0xcf, 0x92, 0x30, 0xd6, 0x55, 0x6e, 0xd4, 0xf1, + 0x68, 0xd9, 0x27, 0x7f, 0x11, 0xb6, 0x17, 0x4a, 0xc0, 0xbc, 0x6d, 0x4a, 0x3c, 0x3c, 0x54, 0x39, + 0x68, 0x66, 0x94, 0x76, 0xd1, 0x04, 0x05, 0xa3, 0xe8, 0x7c, 0x27, 0x4f, 0xf1, 0x38, 0xd1, 0x4c, + 0x1a, 0x80, 0xb9, 0x10, 0x1a, 0x8a, 0xc2, 0xed, 0x34, 0xc4, 0xad, 0x2c, 0x59, 0xe0, 0x07, 0xc7, + 0xcc, 0xb2, 0xe4, 0x19, 0x54, 0x6e, 0x77, 0x82, 0x02, 0x7b, 0x16, 0xd0, 0x2b, 0x4f, 0xc9, 0xb3, + 0x84, 0x1e, 0x07, 0x5a, 0x96, 0xfc, 0x1d, 0x54, 0x2b, 0x30, 0xd1, 0x4d, 0x39, 0x79, 0x8b, 0x71, + 0xbd, 0x98, 0x95, 0x61, 0xa6, 0x2c, 0xdc, 0xde, 0x04, 0x05, 0xe3, 0xd9, 0x33, 0x7a, 0xc7, 0x5e, + 0xe8, 0xe2, 0x8c, 0x47, 0xff, 0x49, 0xa7, 0x1c, 0xe3, 0x4b, 0x85, 0xd8, 0xf8, 0xde, 0x7b, 0x99, + 0x49, 0xf5, 0x45, 0x3a, 0x16, 0x79, 0x88, 0xed, 0x0f, 0xeb, 0xd4, 0xc0, 0x26, 0x2d, 0x0c, 0x08, + 0x07, 0xd5, 0xd5, 0x95, 0x61, 0x52, 0xf0, 0xca, 0xe9, 0x90, 0x11, 0xee, 0x47, 0xc0, 0x44, 0xe5, + 0x74, 0x09, 0xc6, 0x83, 0x79, 0x6c, 0xd2, 0x2d, 0x38, 0x3d, 0x72, 0x1f, 0x0f, 0x5f, 0xa7, 0x05, + 0xe3, 0x1b, 0x10, 0x4e, 0xdf, 0xeb, 0xfd, 0xfc, 0xe1, 0xa3, 0x57, 0x6f, 0x7e, 0xed, 0x7d, 0xb4, + 0xdb, 0xfb, 0xe8, 0xcf, 0xde, 0x47, 0xdf, 0x0f, 0xbe, 0xb5, 0x3b, 0xf8, 0xd6, 0xef, 0x83, 0x6f, + 0x7d, 0x7c, 0x9e, 0xa4, 0x66, 0x5d, 0x72, 0x1a, 0xab, 0xcf, 0x8d, 0x2f, 0x2f, 0x5a, 0x8b, 0xea, + 0xf9, 0xc2, 0xaf, 0x97, 0x3f, 0x60, 0xaa, 0x1c, 0x0a, 0x3e, 0x68, 0xec, 0x79, 0xf9, 0x2f, 0x00, + 0x00, 0xff, 0xff, 0x76, 0x26, 0x93, 0x70, 0x2f, 0x02, 0x00, 0x00, } func (m *NodeAccount) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/nonce_to_cctx.pb.go b/x/observer/types/nonce_to_cctx.pb.go index 66d6270e5f..b40cf34afb 100644 --- a/x/observer/types/nonce_to_cctx.pb.go +++ b/x/observer/types/nonce_to_cctx.pb.go @@ -101,7 +101,7 @@ func init() { } var fileDescriptor_fa2847eea8b274b8 = []byte{ - // 229 bytes of a gzipped FileDescriptorProto + // 233 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xaf, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0x83, 0xb0, 0xf2, 0x8b, 0x52, 0xf5, 0xf3, 0x93, 0x8a, 0x53, 0x8b, 0xca, 0x52, 0x8b, 0xf4, 0xf3, 0xf2, 0xf3, 0x92, 0x53, 0xe3, 0x4b, 0xf2, 0xe3, 0x93, 0x93, 0x4b, @@ -111,12 +111,12 @@ var fileDescriptor_fa2847eea8b274b8 = []byte{ 0xfd, 0xf1, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0xec, 0x60, 0xbe, 0x67, 0x8a, 0x90, 0x08, 0x17, 0x2b, 0xd8, 0x4e, 0x09, 0x26, 0xb0, 0x38, 0x84, 0x23, 0x24, 0xc3, 0xc5, 0x09, 0x72, 0x80, 0x67, 0x5e, 0x4a, 0x6a, 0x85, 0x04, 0xb3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x42, 0x40, - 0x48, 0x80, 0x8b, 0xb9, 0xa4, 0xb8, 0x58, 0x82, 0x05, 0x2c, 0x0e, 0x62, 0x3a, 0x79, 0x9e, 0x78, + 0x48, 0x80, 0x8b, 0xb9, 0xa4, 0xb8, 0x58, 0x82, 0x05, 0x2c, 0x0e, 0x62, 0x3a, 0xb9, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, - 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x7e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, - 0x5e, 0x72, 0x7e, 0x2e, 0xd8, 0xbb, 0xba, 0x68, 0x3e, 0xaf, 0x40, 0xf8, 0xbd, 0xa4, 0xb2, 0x20, - 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x03, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x31, 0x2e, 0xbb, - 0xcf, 0x27, 0x01, 0x00, 0x00, + 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, + 0x5e, 0x72, 0x7e, 0x2e, 0xd8, 0xbb, 0xba, 0x10, 0x9f, 0xe7, 0xe5, 0xa7, 0xa4, 0xea, 0x57, 0x20, + 0xfc, 0x5d, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xbd, 0x31, 0x20, 0x00, 0x00, 0xff, + 0xff, 0x37, 0x66, 0x3a, 0xb3, 0x23, 0x01, 0x00, 0x00, } func (m *NonceToCctx) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/observer.pb.go b/x/observer/types/observer.pb.go index 2d21b13149..708892f91b 100644 --- a/x/observer/types/observer.pb.go +++ b/x/observer/types/observer.pb.go @@ -193,30 +193,30 @@ func init() { } var fileDescriptor_05af1bc65780862e = []byte{ - // 367 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x51, 0xcf, 0x8a, 0xda, 0x40, - 0x1c, 0xce, 0xa8, 0x2d, 0x38, 0xd6, 0x1a, 0x07, 0x0b, 0x62, 0x21, 0x88, 0xbd, 0x88, 0xb4, 0x09, - 0xb4, 0x4f, 0xd0, 0x4a, 0x69, 0xa5, 0x82, 0x90, 0x28, 0x85, 0x5e, 0x64, 0x92, 0x4c, 0x93, 0x01, - 0x33, 0x13, 0x32, 0xbf, 0x14, 0xd3, 0xa7, 0xe8, 0x43, 0xf4, 0xb0, 0x8f, 0xb2, 0x47, 0x8f, 0x7b, - 0x5c, 0xf4, 0x45, 0x96, 0x49, 0x76, 0x5c, 0xd8, 0xdb, 0xf7, 0xfd, 0xbe, 0x3f, 0xbf, 0xc3, 0x87, - 0x17, 0x7f, 0x19, 0xd0, 0x28, 0xa5, 0x5c, 0x78, 0x35, 0x92, 0x05, 0xf3, 0x64, 0xa8, 0x58, 0xf1, - 0x87, 0x15, 0x57, 0xe0, 0xe6, 0x85, 0x04, 0x49, 0xde, 0x5e, 0xbd, 0xae, 0xf1, 0xba, 0xc6, 0x32, - 0x19, 0x25, 0x32, 0x91, 0xb5, 0xcf, 0xd3, 0xa8, 0x89, 0xcc, 0x3e, 0xe2, 0xde, 0xe6, 0xd1, 0x11, - 0x30, 0x20, 0xef, 0x70, 0xdf, 0x04, 0xf6, 0x07, 0xae, 0x60, 0x8c, 0xa6, 0xed, 0x79, 0xd7, 0x7f, - 0x65, 0x8e, 0x6b, 0xae, 0x60, 0xf6, 0x13, 0x0f, 0xd7, 0x54, 0x81, 0xc9, 0x2d, 0x65, 0x29, 0x80, - 0x8c, 0xf0, 0x8b, 0x48, 0x83, 0x31, 0x9a, 0xa2, 0x79, 0xc7, 0x6f, 0x08, 0x79, 0x8f, 0xc9, 0x81, - 0x2a, 0xd8, 0x47, 0x29, 0x15, 0x09, 0xdb, 0xa7, 0x8c, 0x27, 0x29, 0x8c, 0x5b, 0x53, 0x34, 0x6f, - 0xfb, 0xb6, 0x56, 0x96, 0xb5, 0xf0, 0xbd, 0xbe, 0x2f, 0x0e, 0x78, 0xd0, 0x94, 0x52, 0xe0, 0x52, - 0x6c, 0xab, 0x9c, 0x91, 0x37, 0x78, 0xf8, 0x35, 0xcb, 0xa1, 0x32, 0xcf, 0xf4, 0xd1, 0xb6, 0x48, - 0x1f, 0x77, 0x57, 0x22, 0x94, 0xa5, 0x88, 0xb7, 0x47, 0x1b, 0x91, 0xd7, 0x18, 0x6f, 0x4a, 0x30, - 0xbc, 0xa5, 0xe5, 0x6d, 0x10, 0xfc, 0x60, 0xd5, 0x37, 0x26, 0xec, 0xb6, 0x96, 0x1b, 0x1a, 0xf0, - 0x44, 0xd8, 0x9d, 0x49, 0xe7, 0xe6, 0xbf, 0x83, 0x16, 0x6b, 0x3c, 0x32, 0xad, 0xbb, 0x3c, 0xa6, - 0xc0, 0x7c, 0x46, 0x95, 0x14, 0x3a, 0xbc, 0x13, 0x31, 0xfb, 0xcd, 0x05, 0x8b, 0x6d, 0xab, 0x0e, - 0xcb, 0x2c, 0x54, 0x20, 0x35, 0x47, 0x64, 0x80, 0x7b, 0x9f, 0xe3, 0x8c, 0x8b, 0x26, 0x63, 0xb7, - 0x9a, 0xb6, 0x2f, 0xab, 0xdb, 0xb3, 0x83, 0x4e, 0x67, 0x07, 0xdd, 0x9f, 0x1d, 0xf4, 0xef, 0xe2, - 0x58, 0xa7, 0x8b, 0x63, 0xdd, 0x5d, 0x1c, 0xeb, 0x97, 0x97, 0x70, 0x48, 0xcb, 0xd0, 0x8d, 0x64, - 0x56, 0x4f, 0xf8, 0xe1, 0xd9, 0x9a, 0xc7, 0xa7, 0x3d, 0xa1, 0xca, 0x99, 0x0a, 0x5f, 0xd6, 0xd3, - 0x7c, 0x7a, 0x08, 0x00, 0x00, 0xff, 0xff, 0x30, 0x6b, 0xf8, 0xf8, 0xfb, 0x01, 0x00, 0x00, + // 368 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0xcd, 0xaa, 0xd3, 0x40, + 0x14, 0xce, 0xb4, 0x55, 0xb8, 0x73, 0xbd, 0xde, 0x74, 0xa8, 0x50, 0x2a, 0x84, 0x52, 0x37, 0xa5, + 0x6a, 0x02, 0xfa, 0x04, 0x5a, 0x8a, 0x8a, 0x85, 0x42, 0xd2, 0x22, 0xb8, 0x29, 0x93, 0xe4, 0x98, + 0x0c, 0x34, 0x33, 0x21, 0x73, 0x22, 0x8d, 0x4f, 0xe1, 0x43, 0xb8, 0xf0, 0x51, 0x5c, 0x76, 0xe9, + 0x52, 0xda, 0x17, 0x91, 0x49, 0x9c, 0xba, 0xfb, 0xbe, 0xf3, 0xfd, 0x9c, 0xc5, 0x47, 0x17, 0xdf, + 0x00, 0x79, 0x92, 0x73, 0x21, 0x83, 0x16, 0xa9, 0x0a, 0x02, 0x15, 0x6b, 0xa8, 0xbe, 0x42, 0x75, + 0x05, 0x7e, 0x59, 0x29, 0x54, 0xec, 0xe9, 0xd5, 0xeb, 0x5b, 0xaf, 0x6f, 0x2d, 0x93, 0x51, 0xa6, + 0x32, 0xd5, 0xfa, 0x02, 0x83, 0xba, 0xc8, 0xec, 0x15, 0xbd, 0xdd, 0xfc, 0x73, 0x44, 0x80, 0xec, + 0x19, 0xbd, 0xb3, 0x81, 0xfd, 0x41, 0x68, 0x1c, 0x93, 0x69, 0x7f, 0x7e, 0x13, 0x3e, 0xb2, 0xc7, + 0xb5, 0xd0, 0x38, 0xfb, 0x44, 0x87, 0x6b, 0xae, 0xd1, 0xe6, 0x96, 0xaa, 0x96, 0xc8, 0x46, 0xf4, + 0x41, 0x62, 0xc0, 0x98, 0x4c, 0xc9, 0x7c, 0x10, 0x76, 0x84, 0xbd, 0xa0, 0xec, 0xc0, 0x35, 0xee, + 0x93, 0x9c, 0xcb, 0x0c, 0xf6, 0x39, 0x88, 0x2c, 0xc7, 0x71, 0x6f, 0x4a, 0xe6, 0xfd, 0xd0, 0x35, + 0xca, 0xb2, 0x15, 0xde, 0xb7, 0xf7, 0xc5, 0x81, 0xde, 0x77, 0xa5, 0x1c, 0x85, 0x92, 0xdb, 0xa6, + 0x04, 0xf6, 0x84, 0x0e, 0x57, 0x45, 0x89, 0x8d, 0x7d, 0x66, 0x8e, 0xae, 0xc3, 0xee, 0xe8, 0xcd, + 0x07, 0x19, 0xab, 0x5a, 0xa6, 0xdb, 0xa3, 0x4b, 0xd8, 0x63, 0x4a, 0x37, 0x35, 0x5a, 0xde, 0x33, + 0xf2, 0x36, 0x8a, 0x3e, 0x42, 0xf3, 0x0e, 0xa4, 0xdb, 0x37, 0x72, 0x47, 0x23, 0x91, 0x49, 0x77, + 0x30, 0x19, 0xfc, 0xfc, 0xe1, 0x91, 0xc5, 0x9a, 0x8e, 0x6c, 0xeb, 0xae, 0x4c, 0x39, 0x42, 0x08, + 0x5c, 0x2b, 0x69, 0xc2, 0x3b, 0x99, 0xc2, 0x17, 0x21, 0x21, 0x75, 0x9d, 0x36, 0xac, 0x8a, 0x58, + 0xa3, 0x32, 0x9c, 0xb0, 0x7b, 0x7a, 0xfb, 0x26, 0x2d, 0x84, 0xec, 0x32, 0x6e, 0xaf, 0x6b, 0x7b, + 0xbb, 0xfa, 0x75, 0xf6, 0xc8, 0xe9, 0xec, 0x91, 0x3f, 0x67, 0x8f, 0x7c, 0xbf, 0x78, 0xce, 0xe9, + 0xe2, 0x39, 0xbf, 0x2f, 0x9e, 0xf3, 0xf9, 0x79, 0x26, 0x30, 0xaf, 0x63, 0x3f, 0x51, 0x45, 0x3b, + 0xe1, 0xcb, 0x6e, 0x4d, 0xa9, 0x52, 0x08, 0x8e, 0xff, 0xb7, 0xc4, 0xa6, 0x04, 0x1d, 0x3f, 0x6c, + 0x67, 0x79, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x31, 0x47, 0x22, 0x5f, 0xf7, 0x01, 0x00, 0x00, } func (m *ObserverSet) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/observer_set.go b/x/observer/types/observer_set.go index db9473f187..6c9f53d909 100644 --- a/x/observer/types/observer_set.go +++ b/x/observer/types/observer_set.go @@ -4,7 +4,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func (m *ObserverSet) Len() int { diff --git a/x/observer/types/observer_set_test.go b/x/observer/types/observer_set_test.go index 8344757b18..b75c23c185 100644 --- a/x/observer/types/observer_set_test.go +++ b/x/observer/types/observer_set_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestObserverSet_Validate(t *testing.T) { diff --git a/x/observer/types/params.pb.go b/x/observer/types/params.pb.go index 98b425f77e..4661d8e98e 100644 --- a/x/observer/types/params.pb.go +++ b/x/observer/types/params.pb.go @@ -267,47 +267,48 @@ func init() { } var fileDescriptor_e7fa4666eddf88e5 = []byte{ - // 636 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x41, 0x4f, 0xd4, 0x4e, - 0x18, 0xc6, 0xb7, 0xff, 0xe5, 0x8f, 0x30, 0x0b, 0xbb, 0xd0, 0xa0, 0x16, 0x48, 0xca, 0x4a, 0xa2, - 0x36, 0x24, 0xb4, 0x06, 0x3d, 0x2a, 0x89, 0x2c, 0x17, 0x22, 0x46, 0x52, 0xf0, 0xa0, 0x07, 0x27, - 0xb3, 0xd3, 0xa1, 0x9d, 0x6c, 0xdb, 0x77, 0x33, 0x33, 0x05, 0xd6, 0x4f, 0xe1, 0xc7, 0xe2, 0xe0, - 0x81, 0xa3, 0xf1, 0x40, 0x0c, 0x7c, 0x11, 0xd3, 0xe9, 0x74, 0x59, 0xc1, 0x70, 0xf0, 0xb4, 0xd3, - 0xf7, 0xf9, 0x3d, 0x4f, 0x67, 0xfa, 0xbe, 0x3b, 0xc8, 0xfb, 0xca, 0x14, 0xa1, 0x09, 0xe1, 0x79, - 0xa0, 0x57, 0x20, 0x58, 0x00, 0x7d, 0xc9, 0xc4, 0x09, 0x13, 0xc1, 0x90, 0x08, 0x92, 0x49, 0x7f, - 0x28, 0x40, 0x81, 0xbd, 0x3a, 0x26, 0xfd, 0x9a, 0xf4, 0x6b, 0x72, 0x65, 0x29, 0x86, 0x18, 0x34, - 0x17, 0x94, 0xab, 0xca, 0xb2, 0xb2, 0x71, 0x5f, 0x78, 0xbd, 0xa8, 0xd8, 0xf5, 0x2f, 0xa8, 0xd3, - 0x2b, 0xc9, 0x03, 0xfd, 0xce, 0x7d, 0x2e, 0x95, 0xfd, 0x0e, 0xcd, 0x69, 0x33, 0xae, 0xf6, 0xe1, - 0x58, 0xdd, 0xa6, 0xd7, 0xda, 0xf2, 0xfc, 0x7b, 0x36, 0xe2, 0x4f, 0x64, 0x84, 0x2d, 0x7a, 0xf3, - 0xb0, 0xfe, 0x7d, 0x1a, 0xb5, 0x26, 0x44, 0x7b, 0x19, 0xcd, 0x54, 0xe1, 0x3c, 0x72, 0x5a, 0x5d, - 0xcb, 0x6b, 0x86, 0x0f, 0xf4, 0xf3, 0x5e, 0x64, 0x6f, 0x22, 0x9b, 0x42, 0x7e, 0xcc, 0x45, 0x46, - 0x14, 0x87, 0x1c, 0x53, 0x28, 0x72, 0xe5, 0x58, 0x5d, 0xcb, 0x9b, 0x0a, 0x17, 0x27, 0x95, 0x5e, - 0x29, 0xd8, 0x1e, 0x5a, 0x88, 0x89, 0xc4, 0x43, 0xc1, 0x29, 0xc3, 0x8a, 0xd3, 0x01, 0x13, 0xce, - 0x7f, 0x1a, 0x6e, 0xc7, 0x44, 0x1e, 0x94, 0xe5, 0x23, 0x5d, 0xb5, 0x9f, 0xa2, 0x36, 0xcf, 0xfb, - 0x50, 0xe4, 0x51, 0xcd, 0x35, 0x35, 0x37, 0x6f, 0xaa, 0x06, 0x7b, 0x8e, 0x3a, 0x50, 0xa8, 0x3f, - 0xb8, 0xa9, 0x2a, 0xaf, 0x2e, 0x1b, 0x70, 0x03, 0x2d, 0x9e, 0x12, 0x45, 0x13, 0x5c, 0xa8, 0x33, - 0xa8, 0xd1, 0xff, 0x35, 0xda, 0xd1, 0xc2, 0x47, 0x75, 0x06, 0x86, 0x7d, 0x83, 0x74, 0x03, 0xb1, - 0x82, 0x01, 0x2b, 0x8f, 0x94, 0x2b, 0x41, 0xa8, 0xc2, 0x24, 0x8a, 0x04, 0x93, 0xd2, 0x99, 0xe9, - 0x5a, 0xde, 0x6c, 0xe8, 0x94, 0xc8, 0x51, 0x49, 0xf4, 0x0c, 0xf0, 0xb6, 0xd2, 0xed, 0xd7, 0x68, - 0x85, 0x42, 0x9e, 0x33, 0xaa, 0x40, 0xdc, 0x75, 0xcf, 0x56, 0xee, 0x31, 0x71, 0xdb, 0xdd, 0x43, - 0x2e, 0x13, 0x74, 0xeb, 0x05, 0xa6, 0x85, 0x54, 0x10, 0x8d, 0xee, 0x26, 0x20, 0x9d, 0xb0, 0xaa, - 0xa9, 0x5e, 0x05, 0xfd, 0x65, 0x0b, 0xe3, 0xcf, 0x22, 0x69, 0xc2, 0xa2, 0x22, 0x65, 0x98, 0xe7, - 0x8a, 0x89, 0x13, 0x92, 0x3a, 0x73, 0xba, 0x87, 0x4e, 0x4d, 0x1c, 0x1a, 0x60, 0xcf, 0xe8, 0xf6, - 0x36, 0x5a, 0xbd, 0xeb, 0x4e, 0x01, 0x06, 0x24, 0x61, 0x24, 0x72, 0xe6, 0xb5, 0x7d, 0xf9, 0xb6, - 0x7d, 0xbf, 0x06, 0xec, 0x4f, 0x68, 0xa1, 0x4f, 0xd2, 0x14, 0x14, 0x56, 0x89, 0x60, 0x32, 0x81, - 0x34, 0x72, 0xda, 0xe5, 0xa6, 0x77, 0xfc, 0xf3, 0xcb, 0xb5, 0xc6, 0xcf, 0xcb, 0xb5, 0x67, 0x31, - 0x57, 0x49, 0xd1, 0xf7, 0x29, 0x64, 0x01, 0x05, 0x99, 0x81, 0x34, 0x3f, 0x9b, 0x32, 0x1a, 0x04, - 0x6a, 0x34, 0x64, 0xd2, 0xdf, 0x65, 0x34, 0xec, 0x54, 0x39, 0x47, 0x75, 0x8c, 0x7d, 0x8c, 0x1e, - 0x67, 0x3c, 0xc7, 0xf5, 0x0c, 0xe3, 0x88, 0xa5, 0x2c, 0xd6, 0x03, 0xe6, 0x74, 0xfe, 0xe9, 0x0d, - 0x0f, 0x33, 0x9e, 0x7f, 0x30, 0x69, 0xbb, 0xe3, 0x30, 0xfb, 0x09, 0x9a, 0xe3, 0x12, 0xcb, 0x62, - 0x38, 0x04, 0xa1, 0x58, 0xe4, 0x2c, 0x74, 0x2d, 0x6f, 0x26, 0x6c, 0x71, 0x79, 0x58, 0x97, 0xca, - 0xd1, 0x8b, 0x89, 0x62, 0xa7, 0x64, 0x34, 0xee, 0xcc, 0xa2, 0xee, 0x4c, 0xdb, 0x94, 0x4d, 0x33, - 0xd6, 0xb7, 0xd1, 0xb4, 0xf9, 0x23, 0xbd, 0x42, 0x8f, 0xcc, 0x87, 0xc9, 0x88, 0x2a, 0x04, 0x57, - 0x23, 0xdc, 0x4f, 0x81, 0x0e, 0xa4, 0x1e, 0xee, 0x66, 0xb8, 0x54, 0xa9, 0xef, 0x8d, 0xb8, 0xa3, - 0xb5, 0x9d, 0xbd, 0xf3, 0x2b, 0xd7, 0xba, 0xb8, 0x72, 0xad, 0x5f, 0x57, 0xae, 0xf5, 0xed, 0xda, - 0x6d, 0x5c, 0x5c, 0xbb, 0x8d, 0x1f, 0xd7, 0x6e, 0xe3, 0x73, 0x30, 0x71, 0xc8, 0x72, 0x1c, 0x37, - 0x6f, 0x5d, 0x20, 0x67, 0x37, 0x57, 0x88, 0x3e, 0x71, 0x7f, 0x5a, 0x5f, 0x20, 0x2f, 0x7f, 0x07, - 0x00, 0x00, 0xff, 0xff, 0xf4, 0x06, 0xb1, 0x0a, 0xcb, 0x04, 0x00, 0x00, + // 642 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x4e, 0xdb, 0x4a, + 0x14, 0x86, 0xe3, 0x1b, 0x2e, 0x17, 0x26, 0x90, 0x80, 0xc5, 0xbd, 0xd7, 0x80, 0x64, 0x52, 0xa4, + 0xb6, 0x16, 0x15, 0x76, 0x45, 0xbb, 0x6c, 0x91, 0x4a, 0xe8, 0x02, 0x95, 0xaa, 0xc8, 0xd0, 0x45, + 0xbb, 0xe8, 0x68, 0x32, 0x1e, 0xec, 0x51, 0x6c, 0x9f, 0x68, 0x66, 0x0c, 0xa4, 0x4f, 0xd1, 0xc7, + 0x62, 0xd1, 0x05, 0xcb, 0xaa, 0x0b, 0x54, 0xc1, 0x8b, 0x54, 0x1e, 0x8f, 0x43, 0x0a, 0x15, 0x8b, + 0xae, 0x32, 0x3e, 0xff, 0xf7, 0xff, 0x9e, 0xf1, 0x39, 0x19, 0xe4, 0x7d, 0x66, 0x8a, 0xd0, 0x84, + 0xf0, 0x3c, 0xd0, 0x2b, 0x10, 0x2c, 0x80, 0xbe, 0x64, 0xe2, 0x84, 0x89, 0x60, 0x48, 0x04, 0xc9, + 0xa4, 0x3f, 0x14, 0xa0, 0xc0, 0x5e, 0x1d, 0x93, 0x7e, 0x4d, 0xfa, 0x35, 0xb9, 0xb2, 0x14, 0x43, + 0x0c, 0x9a, 0x0b, 0xca, 0x55, 0x65, 0x59, 0xd9, 0xb8, 0x2f, 0xbc, 0x5e, 0x54, 0xec, 0xfa, 0x27, + 0xd4, 0xe9, 0x95, 0xe4, 0x81, 0x7e, 0xe7, 0x3e, 0x97, 0xca, 0x7e, 0x83, 0xe6, 0xb4, 0x19, 0x57, + 0xfb, 0x70, 0xac, 0x6e, 0xd3, 0x6b, 0x6d, 0x79, 0xfe, 0x3d, 0x1b, 0xf1, 0x27, 0x32, 0xc2, 0x16, + 0xbd, 0x79, 0x58, 0xff, 0x3a, 0x8d, 0x5a, 0x13, 0xa2, 0xbd, 0x8c, 0x66, 0xaa, 0x70, 0x1e, 0x39, + 0xad, 0xae, 0xe5, 0x35, 0xc3, 0x7f, 0xf4, 0xf3, 0x5e, 0x64, 0x6f, 0x22, 0x9b, 0x42, 0x7e, 0xcc, + 0x45, 0x46, 0x14, 0x87, 0x1c, 0x53, 0x28, 0x72, 0xe5, 0x58, 0x5d, 0xcb, 0x9b, 0x0a, 0x17, 0x27, + 0x95, 0x5e, 0x29, 0xd8, 0x1e, 0x5a, 0x88, 0x89, 0xc4, 0x43, 0xc1, 0x29, 0xc3, 0x8a, 0xd3, 0x01, + 0x13, 0xce, 0x5f, 0x1a, 0x6e, 0xc7, 0x44, 0x1e, 0x94, 0xe5, 0x23, 0x5d, 0xb5, 0x1f, 0xa2, 0x36, + 0xcf, 0xfb, 0x50, 0xe4, 0x51, 0xcd, 0x35, 0x35, 0x37, 0x6f, 0xaa, 0x06, 0x7b, 0x8c, 0x3a, 0x50, + 0xa8, 0x5f, 0xb8, 0xa9, 0x2a, 0xaf, 0x2e, 0x1b, 0x70, 0x03, 0x2d, 0x9e, 0x12, 0x45, 0x13, 0x5c, + 0xa8, 0x33, 0xa8, 0xd1, 0xbf, 0x35, 0xda, 0xd1, 0xc2, 0x7b, 0x75, 0x06, 0x86, 0x7d, 0x89, 0x74, + 0x03, 0xb1, 0x82, 0x01, 0x2b, 0x8f, 0x94, 0x2b, 0x41, 0xa8, 0xc2, 0x24, 0x8a, 0x04, 0x93, 0xd2, + 0x99, 0xe9, 0x5a, 0xde, 0x6c, 0xe8, 0x94, 0xc8, 0x51, 0x49, 0xf4, 0x0c, 0xf0, 0xaa, 0xd2, 0xed, + 0x17, 0x68, 0x85, 0x42, 0x9e, 0x33, 0xaa, 0x40, 0xdc, 0x75, 0xcf, 0x56, 0xee, 0x31, 0x71, 0xdb, + 0xdd, 0x43, 0x2e, 0x13, 0x74, 0xeb, 0x29, 0xa6, 0x85, 0x54, 0x10, 0x8d, 0xee, 0x26, 0x20, 0x9d, + 0xb0, 0xaa, 0xa9, 0x5e, 0x05, 0xfd, 0x66, 0x0b, 0xe3, 0xcf, 0x22, 0x69, 0xc2, 0xa2, 0x22, 0x65, + 0x98, 0xe7, 0x8a, 0x89, 0x13, 0x92, 0x3a, 0x73, 0xba, 0x87, 0x4e, 0x4d, 0x1c, 0x1a, 0x60, 0xcf, + 0xe8, 0xf6, 0x36, 0x5a, 0xbd, 0xeb, 0x4e, 0x01, 0x06, 0x24, 0x61, 0x24, 0x72, 0xe6, 0xb5, 0x7d, + 0xf9, 0xb6, 0x7d, 0xbf, 0x06, 0xec, 0x0f, 0x68, 0xa1, 0x4f, 0xd2, 0x14, 0x14, 0x56, 0x89, 0x60, + 0x32, 0x81, 0x34, 0x72, 0xda, 0xe5, 0xa6, 0x77, 0xfc, 0xf3, 0xcb, 0xb5, 0xc6, 0xf7, 0xcb, 0xb5, + 0x47, 0x31, 0x57, 0x49, 0xd1, 0xf7, 0x29, 0x64, 0x01, 0x05, 0x99, 0x81, 0x34, 0x3f, 0x9b, 0x32, + 0x1a, 0x04, 0x6a, 0x34, 0x64, 0xd2, 0xdf, 0x65, 0x34, 0xec, 0x54, 0x39, 0x47, 0x75, 0x8c, 0x7d, + 0x8c, 0xfe, 0xcf, 0x78, 0x8e, 0xeb, 0x19, 0xc6, 0x11, 0x4b, 0x59, 0xac, 0x07, 0xcc, 0xe9, 0xfc, + 0xd1, 0x1b, 0xfe, 0xcd, 0x78, 0xfe, 0xce, 0xa4, 0xed, 0x8e, 0xc3, 0xec, 0x07, 0x68, 0x8e, 0x4b, + 0x2c, 0x8b, 0xe1, 0x10, 0x84, 0x62, 0x91, 0xb3, 0xd0, 0xb5, 0xbc, 0x99, 0xb0, 0xc5, 0xe5, 0x61, + 0x5d, 0x2a, 0x47, 0x2f, 0x26, 0x8a, 0x9d, 0x92, 0xd1, 0xb8, 0x33, 0x8b, 0xba, 0x33, 0x6d, 0x53, + 0x36, 0xcd, 0x58, 0xdf, 0x46, 0xd3, 0xe6, 0x8f, 0xf4, 0x1c, 0xfd, 0x67, 0x3e, 0x4c, 0x46, 0x54, + 0x21, 0xb8, 0x1a, 0xe1, 0x7e, 0x0a, 0x74, 0x20, 0xf5, 0x70, 0x37, 0xc3, 0xa5, 0x4a, 0x7d, 0x6b, + 0xc4, 0x1d, 0xad, 0xed, 0xbc, 0x3e, 0xbf, 0x72, 0xad, 0x8b, 0x2b, 0xd7, 0xfa, 0x71, 0xe5, 0x5a, + 0x5f, 0xae, 0xdd, 0xc6, 0xc5, 0xb5, 0xdb, 0xf8, 0x76, 0xed, 0x36, 0x3e, 0x3e, 0x99, 0x38, 0x64, + 0x39, 0x8e, 0x9b, 0xd5, 0x05, 0x92, 0x43, 0xc4, 0x82, 0xb3, 0x9b, 0xeb, 0x43, 0x9f, 0xb6, 0x3f, + 0xad, 0x2f, 0x8f, 0x67, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0xb1, 0xf1, 0x72, 0xc7, 0x04, + 0x00, 0x00, } func (m *ChainParamsList) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/parsers.go b/x/observer/types/parsers.go index 27cd73df74..5243ba7965 100644 --- a/x/observer/types/parsers.go +++ b/x/observer/types/parsers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) func ConvertReceiveStatusToVoteType(status chains.ReceiveStatus) VoteType { diff --git a/x/observer/types/parsers_test.go b/x/observer/types/parsers_test.go index 34c24672aa..4f900a3603 100644 --- a/x/observer/types/parsers_test.go +++ b/x/observer/types/parsers_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/observer/types" ) func TestConvertReceiveStatusToVoteType(t *testing.T) { diff --git a/x/observer/types/pending_nonces.pb.go b/x/observer/types/pending_nonces.pb.go index 237cf239cb..b40806273d 100644 --- a/x/observer/types/pending_nonces.pb.go +++ b/x/observer/types/pending_nonces.pb.go @@ -101,7 +101,7 @@ func init() { } var fileDescriptor_1777a9d0f7831696 = []byte{ - // 239 bytes of a gzipped FileDescriptorProto + // 244 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xa8, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0xf3, 0x93, 0x8a, 0x53, 0x8b, 0xca, 0x52, 0x8b, 0xf4, 0x0b, 0x52, 0xf3, 0x52, 0x32, 0xf3, 0xd2, 0xe3, 0xf3, 0xf2, 0xf3, @@ -112,11 +112,12 @@ var fileDescriptor_1777a9d0f7831696 = []byte{ 0xcb, 0x85, 0x64, 0xb9, 0xb8, 0x20, 0x92, 0x19, 0x99, 0xe9, 0x19, 0x12, 0x4c, 0x60, 0x59, 0x88, 0x72, 0x8f, 0xcc, 0xf4, 0x0c, 0x21, 0x49, 0x2e, 0x0e, 0xb0, 0xed, 0xf1, 0x99, 0x29, 0x12, 0xcc, 0x60, 0x49, 0x76, 0x30, 0xdf, 0x33, 0x45, 0x48, 0x80, 0x8b, 0xb9, 0xa4, 0xb8, 0x58, 0x82, 0x45, - 0x81, 0x51, 0x83, 0x33, 0x08, 0xc4, 0x74, 0xf2, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, + 0x81, 0x51, 0x83, 0x33, 0x08, 0xc4, 0x74, 0x72, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xfd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xb0, 0xcf, - 0x75, 0xd1, 0x02, 0xa1, 0x02, 0x11, 0x0c, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xbf, - 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xd7, 0x4c, 0xfa, 0x32, 0x01, 0x00, 0x00, + 0x39, 0x86, 0x28, 0xed, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xb0, 0xcf, + 0x75, 0x21, 0x81, 0x90, 0x97, 0x9f, 0x92, 0xaa, 0x5f, 0x81, 0x08, 0x82, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0xb0, 0x3f, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xd0, 0x6b, 0x91, + 0x2e, 0x01, 0x00, 0x00, } func (m *PendingNonces) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/query.pb.go b/x/observer/types/query.pb.go index 5145570cae..4f0216d03c 100644 --- a/x/observer/types/query.pb.go +++ b/x/observer/types/query.pb.go @@ -10,8 +10,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - chains "github.com/zeta-chain/zetacore/pkg/chains" - _ "github.com/zeta-chain/zetacore/pkg/proofs" + chains "github.com/zeta-chain/node/pkg/chains" + _ "github.com/zeta-chain/node/pkg/proofs" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -2301,151 +2301,151 @@ func init() { } var fileDescriptor_25b2aa420449a0c0 = []byte{ - // 2297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcf, 0x6f, 0xdc, 0xc6, - 0x15, 0x36, 0xad, 0x44, 0x91, 0x9e, 0x6c, 0xfd, 0x18, 0xcb, 0xb6, 0xb2, 0x76, 0x64, 0x99, 0x92, - 0x63, 0x59, 0x96, 0x96, 0xb6, 0xec, 0xd4, 0xbf, 0xe2, 0xd8, 0x5a, 0x37, 0x92, 0xec, 0x24, 0xb6, - 0xb3, 0xeb, 0x36, 0x80, 0xd1, 0x76, 0xcb, 0xdd, 0x9d, 0xdd, 0x65, 0x4d, 0x71, 0x36, 0x9c, 0x91, - 0x93, 0x8d, 0x2a, 0xa0, 0xe8, 0xad, 0x39, 0x14, 0x05, 0x0a, 0xb4, 0xb7, 0xa2, 0x40, 0xd1, 0x63, - 0x81, 0x22, 0x40, 0xd0, 0x02, 0x45, 0x0f, 0x39, 0x35, 0x87, 0x1e, 0x52, 0xb4, 0x28, 0x7a, 0x6a, - 0x03, 0xbb, 0x7f, 0x48, 0xc1, 0xe1, 0xe3, 0x2e, 0xc9, 0x25, 0xb9, 0xb3, 0xb2, 0x7a, 0xda, 0xe5, - 0xf0, 0xbd, 0x37, 0xdf, 0xf7, 0x38, 0xf3, 0xe6, 0xe3, 0x0c, 0xe1, 0xec, 0x27, 0x54, 0x98, 0xd5, - 0xa6, 0x69, 0x39, 0x86, 0xfc, 0xc7, 0x5c, 0x6a, 0xb0, 0x0a, 0xa7, 0xee, 0x53, 0xea, 0x1a, 0x1f, - 0x6e, 0x53, 0xb7, 0x9d, 0x6f, 0xb9, 0x4c, 0x30, 0x72, 0xa2, 0x63, 0x98, 0x0f, 0x0c, 0xf3, 0x81, - 0x61, 0x6e, 0xa9, 0xca, 0xf8, 0x16, 0xe3, 0x46, 0xc5, 0xe4, 0xd4, 0xf7, 0x32, 0x9e, 0x5e, 0xac, - 0x50, 0x61, 0x5e, 0x34, 0x5a, 0x66, 0xc3, 0x72, 0x4c, 0x61, 0x31, 0xc7, 0x0f, 0x94, 0x9b, 0x6e, - 0xb0, 0x06, 0x93, 0x7f, 0x0d, 0xef, 0x1f, 0xb6, 0x9e, 0x6c, 0x30, 0xd6, 0xb0, 0xa9, 0x61, 0xb6, - 0x2c, 0xc3, 0x74, 0x1c, 0x26, 0xa4, 0x0b, 0xc7, 0xbb, 0x8b, 0x59, 0x28, 0x2b, 0xa6, 0x6d, 0x33, - 0x81, 0x96, 0x99, 0x7c, 0x2a, 0xb6, 0xb9, 0x45, 0xd1, 0x30, 0x9f, 0x65, 0x28, 0xdb, 0xcb, 0x0e, - 0x73, 0xaa, 0x34, 0x80, 0xb0, 0x9a, 0x69, 0xef, 0x32, 0xce, 0x7d, 0xa7, 0xba, 0x6d, 0x36, 0x94, - 0x60, 0x3f, 0xa1, 0xed, 0x06, 0x75, 0x54, 0xd0, 0x38, 0xac, 0x46, 0xcb, 0x66, 0xb5, 0xca, 0xb6, - 0x9d, 0x80, 0xe6, 0x52, 0x96, 0x7d, 0xf0, 0x47, 0x05, 0x45, 0xcb, 0x74, 0xcd, 0xad, 0x00, 0xef, - 0x85, 0x4c, 0x4b, 0xea, 0xd4, 0x2c, 0xa7, 0x11, 0xcd, 0xca, 0x99, 0x2c, 0x0f, 0xc1, 0x79, 0x06, - 0xdc, 0xd6, 0x93, 0x86, 0x9f, 0x67, 0x8e, 0x3f, 0x7d, 0x6c, 0x5b, 0x2e, 0x63, 0x75, 0x8e, 0x3f, - 0x68, 0x7b, 0xb9, 0x4f, 0xf7, 0xe5, 0xfa, 0xb6, 0x53, 0xe3, 0xe5, 0x2d, 0xab, 0xe1, 0x9a, 0x82, - 0x61, 0x42, 0xf4, 0x33, 0x30, 0xff, 0xbe, 0x37, 0x46, 0x1f, 0x71, 0xbe, 0xee, 0xdd, 0x7f, 0x0f, - 0x6f, 0xdf, 0x75, 0xea, 0x6c, 0xcd, 0xb6, 0x8b, 0xf4, 0xc3, 0x6d, 0xca, 0x85, 0xfe, 0x53, 0x0d, - 0x16, 0xb2, 0xed, 0x78, 0x8b, 0x39, 0x9c, 0x92, 0x3a, 0x1c, 0xe9, 0xed, 0x8b, 0xcf, 0x68, 0x73, - 0x43, 0x8b, 0x63, 0xab, 0x17, 0xf2, 0x19, 0x13, 0x27, 0x8f, 0xa1, 0xc3, 0x91, 0x0b, 0x2f, 0x7d, - 0xf9, 0xef, 0x53, 0x07, 0x8a, 0x53, 0x22, 0xd6, 0x2b, 0xd7, 0x6f, 0xc2, 0x5c, 0x2a, 0x1e, 0x04, - 0x4d, 0x5e, 0x85, 0x11, 0x7f, 0x1c, 0x5a, 0xb5, 0x19, 0x6d, 0x4e, 0x5b, 0x1c, 0x2a, 0xbe, 0x22, - 0xaf, 0xef, 0xd6, 0xf4, 0x9f, 0x68, 0x70, 0x3a, 0xc3, 0x1f, 0xc9, 0xd4, 0x80, 0xf4, 0x92, 0x91, - 0xa1, 0xf6, 0xce, 0x65, 0x32, 0xce, 0x45, 0xbf, 0x02, 0x39, 0x09, 0x65, 0x83, 0x8a, 0x3b, 0x5e, - 0xb8, 0xfb, 0x72, 0x50, 0x29, 0x90, 0x60, 0x70, 0x22, 0xd1, 0x11, 0xd1, 0x3f, 0x84, 0xb1, 0x50, - 0x33, 0xc2, 0x5e, 0xcc, 0x84, 0x1d, 0xb2, 0x47, 0xb8, 0xe1, 0x10, 0x7a, 0x0d, 0x91, 0xae, 0xd9, - 0x76, 0x02, 0xd2, 0x75, 0x80, 0x6e, 0x81, 0xc3, 0xee, 0x5e, 0xcf, 0xfb, 0xd5, 0x30, 0xef, 0x55, - 0xc3, 0xbc, 0x5f, 0x43, 0xb1, 0x1a, 0xe6, 0x1f, 0x9a, 0x0d, 0x8a, 0xbe, 0xc5, 0x90, 0xa7, 0xfe, - 0x47, 0x0d, 0x79, 0xc5, 0xbb, 0x49, 0xe3, 0x35, 0xf4, 0x82, 0xbc, 0xc8, 0x46, 0x04, 0xf9, 0x41, - 0x89, 0xfc, 0x6c, 0x5f, 0xe4, 0x3e, 0x9c, 0x08, 0xf4, 0x3a, 0x9c, 0x0c, 0x90, 0x3f, 0xf4, 0x4b, - 0xc4, 0xff, 0x27, 0x45, 0x5f, 0x68, 0xf0, 0x5a, 0x4a, 0x47, 0x98, 0xa4, 0x0f, 0x60, 0x3c, 0x5a, - 0xa4, 0x30, 0x4f, 0x4b, 0x99, 0x79, 0x8a, 0xc4, 0xc2, 0x4c, 0x1d, 0x6e, 0x85, 0x1b, 0xf7, 0x2f, - 0x57, 0xc1, 0x0c, 0x8e, 0xf6, 0xd9, 0x96, 0xcf, 0x45, 0x61, 0xf0, 0xff, 0x10, 0x27, 0x70, 0xb2, - 0x7b, 0x46, 0x16, 0xb4, 0x7d, 0xc8, 0x82, 0x3e, 0x0d, 0x24, 0x98, 0x7a, 0x8f, 0x4a, 0xa5, 0xa0, - 0x4a, 0x3e, 0x80, 0x23, 0x91, 0x56, 0x44, 0x71, 0x15, 0x86, 0x1e, 0x95, 0x4a, 0xd8, 0xf5, 0x5c, - 0x76, 0xdd, 0x28, 0x95, 0xb0, 0x43, 0xcf, 0x45, 0x7f, 0x1b, 0x5e, 0xed, 0x04, 0xe4, 0x7c, 0xad, - 0x56, 0x73, 0x29, 0xef, 0x0c, 0xa6, 0x45, 0x98, 0xac, 0x58, 0xa2, 0xca, 0x2c, 0xa7, 0xdc, 0x49, - 0xd2, 0x41, 0x99, 0xa4, 0x71, 0x6c, 0xbf, 0x83, 0xb9, 0xba, 0xdd, 0xad, 0x30, 0xe1, 0x30, 0x08, - 0x6f, 0x12, 0x86, 0xa8, 0x68, 0x4a, 0x78, 0xa3, 0x45, 0xef, 0xaf, 0xd7, 0x52, 0x11, 0x55, 0x19, - 0x6c, 0xb4, 0xe8, 0xfd, 0xd5, 0x3f, 0xd5, 0x60, 0xa9, 0x37, 0x44, 0xa1, 0xbd, 0x6e, 0x39, 0xa6, - 0x6d, 0x7d, 0x42, 0x6b, 0x9b, 0xd4, 0x6a, 0x34, 0x45, 0x00, 0x6d, 0x15, 0x8e, 0xd6, 0x83, 0x3b, - 0x65, 0x8f, 0x65, 0xb9, 0x29, 0xef, 0xe3, 0x43, 0x3c, 0xd2, 0xb9, 0xf9, 0x98, 0x0a, 0xd3, 0x77, - 0x1d, 0x80, 0xce, 0xfb, 0x70, 0x5e, 0x09, 0xcb, 0x00, 0xfc, 0xbe, 0x0f, 0xc7, 0x82, 0xe5, 0x60, - 0xd3, 0xe2, 0x82, 0xb9, 0xed, 0xfd, 0x9e, 0xb2, 0xbf, 0xd5, 0xe0, 0x78, 0x4f, 0x17, 0x88, 0x70, - 0x0d, 0x46, 0xbc, 0x75, 0xc6, 0xb6, 0xb8, 0xc0, 0x69, 0xaa, 0x3a, 0x4a, 0x5e, 0x11, 0x9c, 0xbf, - 0x6b, 0x71, 0xb1, 0x7f, 0xd3, 0xb2, 0x09, 0xd3, 0x12, 0xe6, 0xa6, 0xc9, 0xbf, 0xcd, 0x04, 0xad, - 0x05, 0x79, 0x38, 0x0f, 0x53, 0xbe, 0xb8, 0x2c, 0x5b, 0x35, 0xea, 0x08, 0xab, 0x6e, 0x51, 0x17, - 0x73, 0x3a, 0xe9, 0xdf, 0xb8, 0xdb, 0x69, 0x27, 0xf3, 0x70, 0xf8, 0x29, 0x13, 0xd4, 0x2d, 0x9b, - 0xfe, 0xc3, 0xc1, 0x54, 0x1f, 0x92, 0x8d, 0xf8, 0xc0, 0xf4, 0xcb, 0x70, 0x34, 0xd6, 0x13, 0xa6, - 0xe3, 0x04, 0x8c, 0x36, 0x4d, 0x5e, 0xf6, 0x8c, 0xfd, 0x69, 0x3f, 0x52, 0x1c, 0x69, 0xa2, 0x91, - 0xfe, 0x1e, 0xcc, 0x4a, 0xaf, 0x82, 0xec, 0xb3, 0xd0, 0xee, 0xf6, 0xba, 0x17, 0xa4, 0xba, 0x80, - 0x51, 0x2f, 0xae, 0x2b, 0x93, 0xd8, 0x03, 0x5b, 0xeb, 0x85, 0x4d, 0x0a, 0x30, 0xea, 0x5d, 0x97, - 0x45, 0xbb, 0x45, 0x25, 0xaf, 0xf1, 0xd5, 0x33, 0x99, 0x4f, 0xcb, 0x8b, 0xff, 0xa8, 0xdd, 0xa2, - 0xc5, 0x91, 0xa7, 0xf8, 0x4f, 0xff, 0xc3, 0x41, 0x38, 0x95, 0xca, 0x02, 0xb3, 0x30, 0x50, 0xc2, - 0xdf, 0x82, 0x61, 0x09, 0xd2, 0xcb, 0xf4, 0x90, 0x1c, 0xa1, 0xfd, 0x10, 0x49, 0xc6, 0x45, 0xf4, - 0x22, 0x1f, 0xc0, 0xa4, 0x7f, 0x57, 0x0e, 0x02, 0x9f, 0xdb, 0x90, 0xe4, 0xb6, 0x9c, 0x19, 0xe9, - 0x41, 0xd7, 0x49, 0x52, 0x9c, 0x60, 0xd1, 0x06, 0x72, 0x1f, 0x0e, 0x23, 0x0b, 0x2e, 0x4c, 0xb1, - 0xcd, 0x67, 0x5e, 0x92, 0x51, 0xcf, 0x65, 0x46, 0xf5, 0xb3, 0x52, 0x92, 0x0e, 0xc5, 0x43, 0x95, - 0xd0, 0x95, 0x4e, 0x60, 0x52, 0x26, 0xee, 0x01, 0xda, 0x96, 0xa8, 0xd0, 0xaf, 0xc2, 0x4c, 0xbc, - 0xad, 0x93, 0xc5, 0x93, 0x30, 0x1a, 0x84, 0xf5, 0x97, 0xc0, 0xd1, 0x62, 0xb7, 0x41, 0x3f, 0x86, - 0x83, 0xbd, 0xb4, 0xdd, 0x6a, 0x31, 0x57, 0xd0, 0x9a, 0x2c, 0x31, 0x5c, 0xaf, 0xe0, 0x3a, 0x1e, - 0x6b, 0xef, 0x44, 0x2d, 0xc0, 0xb0, 0xaf, 0xd3, 0x71, 0xba, 0x2e, 0x24, 0xd1, 0x69, 0x3d, 0x69, - 0xe4, 0x51, 0xcd, 0x4b, 0x77, 0x9c, 0xb2, 0xe8, 0xa9, 0xdf, 0x02, 0x3d, 0xa2, 0xde, 0x1e, 0xca, - 0xb7, 0x8f, 0x75, 0xe6, 0xaa, 0xae, 0x80, 0x2e, 0x4a, 0xf7, 0xb4, 0x00, 0x88, 0xf5, 0x1d, 0x38, - 0xe4, 0x47, 0xf0, 0x5f, 0x6f, 0xd4, 0x75, 0xa0, 0x1f, 0xaf, 0x38, 0x56, 0xed, 0x5e, 0xe8, 0x27, - 0x63, 0x5a, 0x15, 0x6d, 0x70, 0xfd, 0x73, 0x62, 0x82, 0x34, 0xb8, 0x8b, 0x48, 0x1e, 0x24, 0x22, - 0x59, 0x56, 0x45, 0x22, 0x07, 0x6c, 0x04, 0xcd, 0x6a, 0x17, 0xcd, 0x7d, 0x56, 0xa3, 0x6b, 0xfe, - 0x6b, 0x61, 0x90, 0xba, 0x69, 0x78, 0xd9, 0x72, 0x6a, 0xf4, 0x63, 0x9c, 0x34, 0xfe, 0x85, 0xfe, - 0x83, 0x2e, 0xc6, 0x88, 0x4f, 0x37, 0x5b, 0xe1, 0x57, 0x4c, 0xa5, 0x6c, 0x85, 0xe3, 0x8c, 0x39, - 0xdd, 0x8b, 0xb0, 0x5e, 0x4e, 0xc0, 0xb7, 0x5f, 0x2b, 0xcb, 0x67, 0x21, 0xbd, 0x9c, 0x44, 0xe9, - 0x1e, 0x8c, 0x85, 0x9a, 0x95, 0xf4, 0x72, 0x84, 0x51, 0xe8, 0x62, 0xff, 0x96, 0x99, 0x39, 0x2c, - 0xe3, 0xde, 0x50, 0xe9, 0x6c, 0x18, 0xac, 0xdb, 0x66, 0xa3, 0x33, 0x98, 0x7e, 0xa4, 0x61, 0x8d, - 0x4c, 0x32, 0x41, 0x6a, 0xdf, 0x85, 0xc9, 0xf8, 0x76, 0x83, 0xda, 0xa8, 0x8a, 0xc6, 0xc3, 0x99, - 0x39, 0x51, 0x8d, 0x36, 0xeb, 0xc7, 0x71, 0x85, 0xda, 0xa0, 0xe2, 0x1d, 0xb9, 0x43, 0x11, 0x60, - 0xfb, 0x16, 0xca, 0x85, 0xd0, 0x0d, 0x44, 0x74, 0x03, 0x86, 0xfd, 0xcd, 0x0c, 0xc4, 0x31, 0x9f, - 0x89, 0x03, 0x9d, 0xd1, 0x45, 0x3f, 0x85, 0xaa, 0xbe, 0xd4, 0x64, 0x1f, 0x05, 0xc5, 0xec, 0x4e, - 0x68, 0xc8, 0x78, 0x39, 0x99, 0x4d, 0xb3, 0x40, 0x00, 0xdf, 0x83, 0x23, 0xb6, 0xc9, 0x45, 0x39, - 0xe8, 0xa3, 0x1c, 0x1e, 0xc7, 0xf9, 0x4c, 0x34, 0xef, 0x9a, 0x5c, 0x44, 0x83, 0x4e, 0xd9, 0xf1, - 0x26, 0xfd, 0x1e, 0x62, 0x2c, 0xd8, 0xe6, 0x16, 0x4d, 0x5a, 0x7e, 0xcf, 0xc1, 0xa4, 0xdc, 0x5b, - 0xea, 0x5d, 0xb6, 0x26, 0x64, 0x7b, 0x68, 0xf1, 0xad, 0x06, 0x6b, 0x79, 0x6f, 0xac, 0x8e, 0x32, - 0x02, 0x0c, 0xe6, 0xd4, 0x19, 0x92, 0xd0, 0xb3, 0xd7, 0x0e, 0xcf, 0xbc, 0x38, 0xea, 0x77, 0xe5, - 0xd4, 0x99, 0x4e, 0xbb, 0xb3, 0xc3, 0xbf, 0x47, 0xab, 0xcc, 0xad, 0xed, 0xfb, 0x2b, 0xd9, 0xef, - 0xb5, 0xee, 0xbb, 0x5f, 0xb4, 0x1f, 0xa4, 0xb2, 0x11, 0xa3, 0x32, 0xa4, 0x46, 0x05, 0xc7, 0x66, - 0x97, 0xd0, 0xfe, 0xcd, 0xc1, 0x12, 0xbe, 0x81, 0x61, 0xfa, 0x65, 0xa9, 0x5d, 0x73, 0x6a, 0xf2, - 0x15, 0xa7, 0xff, 0xfa, 0xe3, 0xd5, 0x57, 0xf9, 0x52, 0x85, 0x2a, 0xdd, 0xbf, 0xd0, 0xeb, 0xf8, - 0x5e, 0x96, 0x1c, 0x34, 0xe5, 0xb1, 0x0e, 0x0d, 0xfc, 0x58, 0x57, 0x7f, 0xb3, 0x00, 0x2f, 0xcb, - 0x8e, 0xc8, 0x9f, 0x35, 0x18, 0x09, 0x34, 0x24, 0xb9, 0x98, 0x19, 0x25, 0x49, 0xd9, 0xe6, 0x56, - 0x07, 0x71, 0xf1, 0x09, 0xe8, 0xf7, 0x7e, 0xfc, 0xf7, 0xff, 0xfe, 0xfc, 0xe0, 0x37, 0x49, 0x41, - 0xee, 0xb5, 0xad, 0xf8, 0xdb, 0x6e, 0x9d, 0xdd, 0xb6, 0x8e, 0x7a, 0x35, 0x76, 0x7a, 0x24, 0xdc, - 0xae, 0xb1, 0x13, 0xd1, 0x98, 0xbb, 0xe4, 0x9f, 0x1a, 0x90, 0x5e, 0x1d, 0x48, 0x6e, 0xf4, 0x87, - 0x95, 0xaa, 0x81, 0x73, 0x6f, 0xee, 0xcd, 0x19, 0xd9, 0xbd, 0x2d, 0xd9, 0xdd, 0x22, 0x37, 0x13, - 0xd9, 0x21, 0xa5, 0x4a, 0x3b, 0xc4, 0x2a, 0x89, 0x28, 0xf9, 0x95, 0x06, 0x63, 0x21, 0x4d, 0x46, - 0x56, 0xfa, 0x83, 0x0a, 0x99, 0xe7, 0xde, 0x18, 0xc8, 0xbc, 0x03, 0xfe, 0x9c, 0x04, 0x3f, 0x4f, - 0x4e, 0x27, 0x82, 0xef, 0x94, 0x45, 0x4e, 0x05, 0xf9, 0x9d, 0x06, 0x13, 0x31, 0x89, 0xa7, 0x32, - 0x80, 0x62, 0x2e, 0xb9, 0x6b, 0x03, 0xbb, 0x74, 0xc0, 0x2e, 0x4b, 0xb0, 0xaf, 0x93, 0x85, 0x44, - 0xb0, 0x3c, 0x86, 0xed, 0x3f, 0x1a, 0x1c, 0x4b, 0x56, 0x7b, 0xe4, 0x56, 0x7f, 0x0c, 0x99, 0x42, - 0x33, 0x77, 0x7b, 0xef, 0x01, 0x90, 0x4b, 0x41, 0x72, 0x79, 0x93, 0x5c, 0x4f, 0xe4, 0xd2, 0xa0, - 0xa2, 0x1c, 0x56, 0x7f, 0xe5, 0x3a, 0x73, 0xfd, 0x06, 0x63, 0x27, 0xa8, 0x30, 0xbb, 0xe4, 0x33, - 0x0d, 0xc6, 0xa3, 0xdd, 0x90, 0x2b, 0x83, 0x02, 0x0b, 0x18, 0x5d, 0x1d, 0xdc, 0x11, 0x99, 0xac, - 0x48, 0x26, 0x67, 0xc9, 0x19, 0x25, 0x26, 0x1e, 0xe8, 0x88, 0x48, 0x52, 0x43, 0xdc, 0xab, 0x08, - 0x15, 0x11, 0x27, 0x68, 0x3c, 0xfd, 0x82, 0x44, 0xbc, 0x44, 0x16, 0x13, 0x11, 0x87, 0x34, 0xa9, - 0xb1, 0x23, 0x65, 0xf0, 0xae, 0x37, 0xf6, 0xc7, 0x43, 0x91, 0xd6, 0x6c, 0x5b, 0x05, 0x77, 0xa2, - 0x92, 0x55, 0xc1, 0x9d, 0xac, 0x4d, 0xf5, 0x45, 0x89, 0x5b, 0x27, 0x73, 0xfd, 0x70, 0x93, 0x3f, - 0x69, 0x30, 0x11, 0x93, 0x6d, 0x2a, 0x25, 0x32, 0x55, 0x5f, 0xaa, 0x94, 0xc8, 0x74, 0xe5, 0xd9, - 0x67, 0x88, 0xc4, 0x45, 0x29, 0xf9, 0x85, 0x06, 0xc3, 0xbe, 0xd8, 0x23, 0xab, 0x4a, 0xfd, 0x46, - 0xf4, 0x66, 0xee, 0xd2, 0x40, 0x3e, 0x08, 0x71, 0x5e, 0x42, 0x7c, 0x8d, 0x9c, 0x48, 0x84, 0xe8, - 0x4b, 0x4e, 0xf2, 0x17, 0x0d, 0xa6, 0x7a, 0xc4, 0x24, 0xb9, 0xae, 0x50, 0xd1, 0x52, 0x34, 0x6a, - 0xee, 0xc6, 0x9e, 0x7c, 0x11, 0xf3, 0x35, 0x89, 0xf9, 0x12, 0xb9, 0x18, 0xc6, 0xdc, 0x7b, 0x9c, - 0xc5, 0x9b, 0xec, 0xa3, 0x98, 0xc2, 0x25, 0x7f, 0xd3, 0x60, 0xaa, 0x47, 0x48, 0xaa, 0x30, 0x49, - 0x53, 0xb2, 0x2a, 0x4c, 0x52, 0x95, 0xab, 0x7e, 0x47, 0x32, 0xb9, 0x49, 0x6e, 0x24, 0xaf, 0xa1, - 0x52, 0xfd, 0xc4, 0x97, 0xd0, 0x98, 0x6c, 0xde, 0xf5, 0xa4, 0x0d, 0xd9, 0xa0, 0x22, 0x26, 0x29, - 0x89, 0xda, 0x7c, 0x4b, 0x50, 0xbb, 0x2a, 0x4b, 0x55, 0x8a, 0x7e, 0xd5, 0x57, 0x25, 0xa1, 0x65, - 0xb2, 0x94, 0x5a, 0x14, 0x4d, 0xdb, 0x2e, 0xfb, 0x1c, 0x5c, 0x04, 0xfa, 0xb5, 0x06, 0x47, 0x65, - 0x30, 0x1e, 0x53, 0x82, 0xe4, 0xa6, 0x72, 0x6e, 0x93, 0x64, 0x69, 0xee, 0xad, 0xbd, 0xba, 0x23, - 0x99, 0x4d, 0x49, 0xa6, 0x40, 0x6e, 0x67, 0x3f, 0x1d, 0x7f, 0x0a, 0x9b, 0x4e, 0xcd, 0x3f, 0x3e, - 0x08, 0xad, 0x54, 0xc6, 0x8e, 0x6c, 0xd9, 0x25, 0x5f, 0x68, 0x70, 0x38, 0xb2, 0x11, 0x4d, 0xbe, - 0xa1, 0x34, 0x59, 0x7b, 0xf6, 0xf3, 0x73, 0x57, 0x06, 0xf6, 0x43, 0x32, 0xb7, 0x24, 0x99, 0x6b, - 0xe4, 0x4a, 0xea, 0x93, 0x11, 0x9c, 0x07, 0x7a, 0xd3, 0xd8, 0x89, 0xef, 0xb2, 0xef, 0x92, 0x5f, - 0x1e, 0x84, 0xd9, 0xec, 0xcd, 0x74, 0xb2, 0x31, 0x20, 0xb8, 0xb4, 0xa3, 0x81, 0xdc, 0xe6, 0x8b, - 0x07, 0x42, 0xda, 0x15, 0x49, 0xfb, 0x3b, 0xe4, 0xb1, 0x0a, 0xed, 0x72, 0x53, 0xee, 0xb9, 0x5b, - 0x55, 0xd3, 0x36, 0x76, 0x12, 0xcf, 0x26, 0x76, 0x93, 0x32, 0xf3, 0xa9, 0x26, 0xcf, 0x6e, 0x88, - 0xa1, 0x86, 0xba, 0x73, 0x14, 0x94, 0xbb, 0xa0, 0xee, 0x80, 0x74, 0xe6, 0x24, 0x9d, 0x1c, 0x99, - 0x49, 0xa4, 0xe3, 0x81, 0xf8, 0xb5, 0x06, 0xd0, 0x3d, 0x3d, 0x20, 0x0a, 0x8b, 0x42, 0xcf, 0x71, - 0x46, 0xee, 0xf2, 0x60, 0x4e, 0x88, 0xed, 0xac, 0xc4, 0x76, 0x9a, 0x9c, 0x4a, 0xc4, 0x26, 0xba, - 0x98, 0x3e, 0xd7, 0x60, 0x32, 0x72, 0x7c, 0xe6, 0xe9, 0x0a, 0xb5, 0xa2, 0x93, 0x74, 0x60, 0x9a, - 0xbb, 0xbe, 0x17, 0x57, 0x04, 0xbd, 0x24, 0x41, 0x2f, 0x10, 0x3d, 0x11, 0x74, 0xf4, 0x54, 0xf3, - 0xaf, 0x1a, 0x4c, 0x27, 0x9d, 0x24, 0xaa, 0xd4, 0xa9, 0x8c, 0x03, 0x4c, 0x95, 0x3a, 0x95, 0x75, - 0x80, 0xa9, 0xbf, 0x21, 0x39, 0x18, 0x64, 0xa5, 0x3f, 0x87, 0xb0, 0x8c, 0xfe, 0x5c, 0x8b, 0x9c, - 0x91, 0x0f, 0xa2, 0xa1, 0xa3, 0xf9, 0xbf, 0x3a, 0xb8, 0x23, 0x22, 0xbf, 0x24, 0x91, 0xaf, 0x90, - 0xf3, 0xc9, 0x02, 0xa9, 0xeb, 0x11, 0xc6, 0xed, 0x89, 0xd2, 0x50, 0x30, 0x75, 0x51, 0xba, 0x37, - 0xe8, 0xc9, 0x1f, 0x18, 0xf4, 0x11, 0xa5, 0x21, 0xe8, 0x9e, 0x7a, 0x9a, 0x4e, 0xfa, 0x82, 0x44, - 0x65, 0xd8, 0x64, 0x7c, 0xb9, 0xa2, 0x32, 0x6c, 0xb2, 0x3e, 0x5c, 0xe9, 0xf3, 0x3a, 0xd0, 0x90, - 0xf5, 0x35, 0xe2, 0x4d, 0xfe, 0xa1, 0xc1, 0xf1, 0x94, 0x6f, 0x7b, 0xc8, 0xed, 0xbd, 0xa1, 0xe9, - 0x7e, 0x3e, 0x94, 0x5b, 0x7b, 0x81, 0x08, 0x48, 0xe9, 0xb2, 0xa4, 0x94, 0x27, 0xcb, 0x69, 0x94, - 0xd6, 0x6c, 0x3b, 0x1e, 0x83, 0x17, 0xee, 0x7e, 0xf9, 0x6c, 0x56, 0xfb, 0xea, 0xd9, 0xac, 0xf6, - 0xf5, 0xb3, 0x59, 0xed, 0x67, 0xcf, 0x67, 0x0f, 0x7c, 0xf5, 0x7c, 0xf6, 0xc0, 0xbf, 0x9e, 0xcf, - 0x1e, 0x78, 0x6c, 0x34, 0x2c, 0xd1, 0xdc, 0xae, 0xe4, 0xab, 0x6c, 0x2b, 0x51, 0x6b, 0x7e, 0x1c, - 0xaa, 0x6f, 0xed, 0x16, 0xe5, 0x95, 0x61, 0xf9, 0xc1, 0xd4, 0xa5, 0xff, 0x05, 0x00, 0x00, 0xff, - 0xff, 0xa9, 0xf2, 0x5d, 0x0c, 0x26, 0x28, 0x00, 0x00, + // 2300 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcf, 0x6f, 0x1b, 0xc7, + 0x15, 0xf6, 0x4a, 0x89, 0x22, 0x8d, 0x6c, 0xfd, 0x18, 0xcb, 0xb6, 0x42, 0x3b, 0xb2, 0xbc, 0x92, + 0x63, 0x59, 0x96, 0xb8, 0xb6, 0xec, 0xd4, 0xbf, 0xe2, 0xd8, 0xa2, 0x6b, 0x49, 0x76, 0x12, 0xdb, + 0x21, 0xdd, 0x06, 0x30, 0xda, 0xb2, 0x4b, 0xee, 0x90, 0xdc, 0x7a, 0xb5, 0xc3, 0xec, 0x8c, 0x9c, + 0x30, 0xaa, 0x80, 0xa2, 0xb7, 0xe6, 0x50, 0x14, 0x28, 0xd0, 0xde, 0x8a, 0x02, 0x45, 0x8f, 0x05, + 0x8a, 0x00, 0x41, 0x0b, 0x14, 0x3d, 0xe4, 0xd4, 0x1c, 0x7a, 0x48, 0xd1, 0xa2, 0xe8, 0xa9, 0x35, + 0xec, 0xfe, 0x21, 0xc5, 0xce, 0xbc, 0x25, 0x77, 0x97, 0xbb, 0xcb, 0x21, 0xad, 0x9e, 0xc8, 0x9d, + 0x99, 0xf7, 0xe6, 0xfb, 0xde, 0xce, 0xbc, 0xf9, 0x66, 0x66, 0xd1, 0x99, 0x4f, 0x09, 0x37, 0xab, + 0x0d, 0xd3, 0x76, 0x0d, 0xf1, 0x8f, 0x7a, 0xc4, 0xa0, 0x15, 0x46, 0xbc, 0xa7, 0xc4, 0x33, 0x3e, + 0xda, 0x21, 0x5e, 0x2b, 0xdf, 0xf4, 0x28, 0xa7, 0xf8, 0x78, 0xbb, 0x61, 0x3e, 0x68, 0x98, 0x0f, + 0x1a, 0xe6, 0x96, 0xab, 0x94, 0x6d, 0x53, 0x66, 0x54, 0x4c, 0x46, 0xa4, 0x95, 0xf1, 0xf4, 0x42, + 0x85, 0x70, 0xf3, 0x82, 0xd1, 0x34, 0xeb, 0xb6, 0x6b, 0x72, 0x9b, 0xba, 0xd2, 0x51, 0x6e, 0xa6, + 0x4e, 0xeb, 0x54, 0xfc, 0x35, 0xfc, 0x7f, 0x50, 0x7a, 0xa2, 0x4e, 0x69, 0xdd, 0x21, 0x86, 0xd9, + 0xb4, 0x0d, 0xd3, 0x75, 0x29, 0x17, 0x26, 0x0c, 0x6a, 0x97, 0xb2, 0x50, 0x56, 0x4c, 0xc7, 0xa1, + 0x1c, 0x5a, 0x66, 0xf2, 0xa9, 0x38, 0xe6, 0x36, 0x81, 0x86, 0xf9, 0xac, 0x86, 0xa2, 0xbc, 0xec, + 0x52, 0xb7, 0x4a, 0x02, 0x08, 0x6b, 0x99, 0xed, 0x3d, 0xca, 0x98, 0x34, 0xaa, 0x39, 0x66, 0x5d, + 0x09, 0xf6, 0x13, 0xd2, 0xaa, 0x13, 0x57, 0x05, 0x8d, 0x4b, 0x2d, 0x52, 0x36, 0xab, 0x55, 0xba, + 0xe3, 0x06, 0x34, 0x97, 0xb3, 0xda, 0x07, 0x7f, 0x54, 0x50, 0x34, 0x4d, 0xcf, 0xdc, 0x0e, 0xf0, + 0x9e, 0xcf, 0x6c, 0x49, 0x5c, 0xcb, 0x76, 0xeb, 0xd1, 0xa8, 0x9c, 0xce, 0xb2, 0xe0, 0x8c, 0x65, + 0xc0, 0x6d, 0x3e, 0xa9, 0xcb, 0x38, 0x33, 0xf8, 0xe9, 0xd1, 0xb6, 0xe9, 0x51, 0x5a, 0x63, 0xf0, + 0x03, 0x6d, 0x2f, 0xf5, 0xe8, 0xbe, 0x5c, 0xdb, 0x71, 0x2d, 0x56, 0xde, 0xb6, 0xeb, 0x9e, 0xc9, + 0x29, 0x04, 0x44, 0x3f, 0x8d, 0x16, 0x3e, 0xf0, 0xc7, 0xe8, 0x23, 0xc6, 0x36, 0xfc, 0xfa, 0xf7, + 0xa1, 0xfa, 0xae, 0x5b, 0xa3, 0xeb, 0x8e, 0x53, 0x24, 0x1f, 0xed, 0x10, 0xc6, 0xf5, 0x9f, 0x6a, + 0x68, 0x31, 0xbb, 0x1d, 0x6b, 0x52, 0x97, 0x11, 0x5c, 0x43, 0x87, 0xbb, 0xfb, 0x62, 0xb3, 0xda, + 0xfc, 0xf0, 0xd2, 0xf8, 0xda, 0xf9, 0x7c, 0xc6, 0xc4, 0xc9, 0x83, 0xeb, 0xb0, 0xe7, 0xc2, 0x2b, + 0x5f, 0xfd, 0xfb, 0xe4, 0x81, 0xe2, 0x34, 0x8f, 0xf5, 0xca, 0xf4, 0x1b, 0x68, 0x3e, 0x15, 0x0f, + 0x80, 0xc6, 0xaf, 0xa3, 0x51, 0x39, 0x0e, 0x6d, 0x6b, 0x56, 0x9b, 0xd7, 0x96, 0x86, 0x8b, 0xaf, + 0x89, 0xe7, 0xbb, 0x96, 0xfe, 0x13, 0x0d, 0x9d, 0xca, 0xb0, 0x07, 0x32, 0x16, 0xc2, 0xdd, 0x64, + 0x84, 0xab, 0xc1, 0xb9, 0x4c, 0xc5, 0xb9, 0xe8, 0x97, 0x51, 0x4e, 0x40, 0xd9, 0x24, 0xfc, 0xb6, + 0xef, 0xee, 0xbe, 0x18, 0x54, 0x0a, 0x24, 0x28, 0x3a, 0x9e, 0x68, 0x08, 0xe8, 0x1f, 0xa2, 0xf1, + 0x50, 0x31, 0xc0, 0x5e, 0xca, 0x84, 0x1d, 0x6a, 0x0f, 0x70, 0xc3, 0x2e, 0x74, 0x0b, 0x90, 0xae, + 0x3b, 0x4e, 0x02, 0xd2, 0x0d, 0x84, 0x3a, 0x09, 0x0e, 0xba, 0x7b, 0x33, 0x2f, 0xb3, 0x61, 0xde, + 0xcf, 0x86, 0x79, 0x99, 0x43, 0x21, 0x1b, 0xe6, 0x1f, 0x9a, 0x75, 0x02, 0xb6, 0xc5, 0x90, 0xa5, + 0xfe, 0x47, 0x0d, 0x78, 0xc5, 0xbb, 0x49, 0xe3, 0x35, 0xfc, 0x92, 0xbc, 0xf0, 0x66, 0x04, 0xf9, + 0x90, 0x40, 0x7e, 0xa6, 0x27, 0x72, 0x09, 0x27, 0x02, 0xbd, 0x86, 0x4e, 0x04, 0xc8, 0x1f, 0xca, + 0x14, 0xf1, 0xff, 0x09, 0xd1, 0x97, 0x1a, 0x7a, 0x23, 0xa5, 0x23, 0x08, 0xd2, 0x87, 0x68, 0x22, + 0x9a, 0xa4, 0x20, 0x4e, 0xcb, 0x99, 0x71, 0x8a, 0xf8, 0x82, 0x48, 0x1d, 0x6a, 0x86, 0x0b, 0xf7, + 0x2f, 0x56, 0xc1, 0x0c, 0x8e, 0xf6, 0xd9, 0x12, 0xef, 0x45, 0x61, 0xf0, 0xff, 0x10, 0x26, 0x70, + 0xb2, 0x79, 0x46, 0x14, 0xb4, 0x7d, 0x88, 0x82, 0x3e, 0x83, 0x70, 0x30, 0xf5, 0x1e, 0x95, 0x4a, + 0x41, 0x96, 0x7c, 0x80, 0x0e, 0x47, 0x4a, 0x01, 0xc5, 0x15, 0x34, 0xfc, 0xa8, 0x54, 0x82, 0xae, + 0xe7, 0xb3, 0xf3, 0x46, 0xa9, 0x04, 0x1d, 0xfa, 0x26, 0xfa, 0x1d, 0xf4, 0x7a, 0xdb, 0x21, 0x63, + 0xeb, 0x96, 0xe5, 0x11, 0xd6, 0x1e, 0x4c, 0x4b, 0x68, 0xaa, 0x62, 0xf3, 0x2a, 0xb5, 0xdd, 0x72, + 0x3b, 0x48, 0x43, 0x22, 0x48, 0x13, 0x50, 0x7e, 0x1b, 0x62, 0x75, 0xab, 0x93, 0x61, 0xc2, 0x6e, + 0x00, 0xde, 0x14, 0x1a, 0x26, 0xbc, 0x21, 0xe0, 0x8d, 0x15, 0xfd, 0xbf, 0x7e, 0x49, 0x85, 0x57, + 0x85, 0xb3, 0xb1, 0xa2, 0xff, 0x57, 0xff, 0x4c, 0x43, 0xcb, 0xdd, 0x2e, 0x0a, 0xad, 0x0d, 0xdb, + 0x35, 0x1d, 0xfb, 0x53, 0x62, 0x6d, 0x11, 0xbb, 0xde, 0xe0, 0x01, 0xb4, 0x35, 0x74, 0xa4, 0x16, + 0xd4, 0x94, 0x7d, 0x96, 0xe5, 0x86, 0xa8, 0x87, 0x97, 0x78, 0xb8, 0x5d, 0xf9, 0x98, 0x70, 0x53, + 0x9a, 0xf6, 0x41, 0xe7, 0x03, 0x74, 0x4e, 0x09, 0x4b, 0x1f, 0xfc, 0xbe, 0x8f, 0x8e, 0x06, 0xcb, + 0xc1, 0x96, 0xcd, 0x38, 0xf5, 0x5a, 0xfb, 0x3d, 0x65, 0x7f, 0xab, 0xa1, 0x63, 0x5d, 0x5d, 0x00, + 0xc2, 0x75, 0x34, 0xea, 0xaf, 0x33, 0x8e, 0xcd, 0x38, 0x4c, 0x53, 0xd5, 0x51, 0xf2, 0x1a, 0x67, + 0xec, 0x3d, 0x9b, 0xf1, 0xfd, 0x9b, 0x96, 0x0d, 0x34, 0x23, 0x60, 0x6e, 0x99, 0xec, 0xdb, 0x94, + 0x13, 0x2b, 0x88, 0xc3, 0x39, 0x34, 0x2d, 0xc5, 0x65, 0xd9, 0xb6, 0x88, 0xcb, 0xed, 0x9a, 0x4d, + 0x3c, 0x88, 0xe9, 0x94, 0xac, 0xb8, 0xdb, 0x2e, 0xc7, 0x0b, 0xe8, 0xd0, 0x53, 0xca, 0x89, 0x57, + 0x36, 0xe5, 0xcb, 0x81, 0x50, 0x1f, 0x14, 0x85, 0xf0, 0xc2, 0xf4, 0x4b, 0xe8, 0x48, 0xac, 0x27, + 0x08, 0xc7, 0x71, 0x34, 0xd6, 0x30, 0x59, 0xd9, 0x6f, 0x2c, 0xa7, 0xfd, 0x68, 0x71, 0xb4, 0x01, + 0x8d, 0xf4, 0xf7, 0xd1, 0x9c, 0xb0, 0x2a, 0x88, 0x3e, 0x0b, 0xad, 0x4e, 0xaf, 0x83, 0x20, 0xd5, + 0x39, 0x1a, 0xf3, 0xfd, 0x7a, 0x22, 0x88, 0x5d, 0xb0, 0xb5, 0x6e, 0xd8, 0xb8, 0x80, 0xc6, 0xfc, + 0xe7, 0x32, 0x6f, 0x35, 0x89, 0xe0, 0x35, 0xb1, 0x76, 0x3a, 0xf3, 0x6d, 0xf9, 0xfe, 0x1f, 0xb5, + 0x9a, 0xa4, 0x38, 0xfa, 0x14, 0xfe, 0xe9, 0x7f, 0x18, 0x42, 0x27, 0x53, 0x59, 0x40, 0x14, 0xfa, + 0x0a, 0xf8, 0x3b, 0x68, 0x44, 0x80, 0xf4, 0x23, 0x3d, 0x2c, 0x46, 0x68, 0x2f, 0x44, 0x82, 0x71, + 0x11, 0xac, 0xf0, 0x87, 0x68, 0x4a, 0xd6, 0x8a, 0x41, 0x20, 0xb9, 0x0d, 0x0b, 0x6e, 0x2b, 0x99, + 0x9e, 0x1e, 0x74, 0x8c, 0x04, 0xc5, 0x49, 0x1a, 0x2d, 0xc0, 0xf7, 0xd1, 0x21, 0x60, 0xc1, 0xb8, + 0xc9, 0x77, 0xd8, 0xec, 0x2b, 0xc2, 0xeb, 0xd9, 0x4c, 0xaf, 0x32, 0x2a, 0x25, 0x61, 0x50, 0x3c, + 0x58, 0x09, 0x3d, 0xe9, 0x18, 0x4d, 0x89, 0xc0, 0x3d, 0x80, 0xb6, 0x25, 0xc2, 0xf5, 0x2b, 0x68, + 0x36, 0x5e, 0xd6, 0x8e, 0xe2, 0x09, 0x34, 0x16, 0xb8, 0x95, 0x4b, 0xe0, 0x58, 0xb1, 0x53, 0xa0, + 0x1f, 0x85, 0xc1, 0x5e, 0xda, 0x69, 0x36, 0xa9, 0xc7, 0x89, 0x25, 0x52, 0x0c, 0xd3, 0x2b, 0xb0, + 0x8e, 0xc7, 0xca, 0xdb, 0x5e, 0x0b, 0x68, 0x44, 0xea, 0x74, 0x98, 0xae, 0x8b, 0x49, 0x74, 0x9a, + 0x4f, 0xea, 0x79, 0x50, 0xf3, 0xc2, 0x1c, 0xa6, 0x2c, 0x58, 0xea, 0x37, 0x91, 0x1e, 0x51, 0x6f, + 0x0f, 0xc5, 0xee, 0x63, 0x83, 0x7a, 0xaa, 0x2b, 0xa0, 0x07, 0xd2, 0x3d, 0xcd, 0x01, 0x60, 0x7d, + 0x17, 0x1d, 0x94, 0x1e, 0xe4, 0xf6, 0x46, 0x5d, 0x07, 0x4a, 0x7f, 0xc5, 0xf1, 0x6a, 0xe7, 0x41, + 0x3f, 0x11, 0xd3, 0xaa, 0xd0, 0x06, 0xd6, 0x3f, 0x37, 0x26, 0x48, 0x83, 0x5a, 0x40, 0xf2, 0x20, + 0x11, 0xc9, 0x8a, 0x2a, 0x12, 0x31, 0x60, 0x23, 0x68, 0xd6, 0x3a, 0x68, 0xee, 0x53, 0x8b, 0xac, + 0xcb, 0x6d, 0x61, 0x10, 0xba, 0x19, 0xf4, 0xaa, 0xed, 0x5a, 0xe4, 0x13, 0x98, 0x34, 0xf2, 0x41, + 0xff, 0x41, 0x07, 0x63, 0xc4, 0xa6, 0x13, 0xad, 0xf0, 0x16, 0x53, 0x29, 0x5a, 0x61, 0x3f, 0xe3, + 0x6e, 0xe7, 0x21, 0xac, 0x97, 0x13, 0xf0, 0xed, 0xd7, 0xca, 0xf2, 0x79, 0x48, 0x2f, 0x27, 0x51, + 0xba, 0x87, 0xc6, 0x43, 0xc5, 0x4a, 0x7a, 0x39, 0xc2, 0x28, 0xf4, 0xb0, 0x7f, 0xcb, 0xcc, 0x3c, + 0xa4, 0x71, 0x7f, 0xa8, 0xb4, 0x0f, 0x0c, 0x36, 0x1c, 0xb3, 0xde, 0x1e, 0x4c, 0x3f, 0xd2, 0x20, + 0x47, 0x26, 0x35, 0x01, 0x6a, 0xdf, 0x45, 0x53, 0xf1, 0xe3, 0x06, 0xb5, 0x51, 0x15, 0xf5, 0x07, + 0x33, 0x73, 0xb2, 0x1a, 0x2d, 0xd6, 0x8f, 0xc1, 0x0a, 0xb5, 0x49, 0xf8, 0xbb, 0xe2, 0x84, 0x22, + 0xc0, 0xf6, 0x2d, 0x90, 0x0b, 0xa1, 0x0a, 0x40, 0x74, 0x1d, 0x8d, 0xc8, 0xc3, 0x0c, 0xc0, 0xb1, + 0x90, 0x89, 0x03, 0x8c, 0xc1, 0x44, 0x3f, 0x09, 0xaa, 0xbe, 0xd4, 0xa0, 0x1f, 0x07, 0xc9, 0xec, + 0x76, 0x68, 0xc8, 0xf8, 0x31, 0x99, 0x4b, 0x6b, 0x01, 0x00, 0xbe, 0x87, 0x0e, 0x3b, 0x26, 0xe3, + 0xe5, 0xa0, 0x8f, 0x72, 0x78, 0x1c, 0xe7, 0x33, 0xd1, 0xbc, 0x67, 0x32, 0x1e, 0x75, 0x3a, 0xed, + 0xc4, 0x8b, 0xf4, 0x7b, 0x80, 0xb1, 0xe0, 0x98, 0xdb, 0x24, 0x69, 0xf9, 0x3d, 0x8b, 0xa6, 0xc4, + 0xd9, 0x52, 0xf7, 0xb2, 0x35, 0x29, 0xca, 0x43, 0x8b, 0x6f, 0x35, 0x58, 0xcb, 0xbb, 0x7d, 0xb5, + 0x95, 0x11, 0x02, 0x67, 0x6e, 0x8d, 0x02, 0x09, 0x3d, 0x7b, 0xed, 0xf0, 0x9b, 0x17, 0xc7, 0x64, + 0x57, 0x6e, 0x8d, 0xea, 0xa4, 0x33, 0x3b, 0x64, 0x1d, 0xa9, 0x52, 0xcf, 0xda, 0xf7, 0x2d, 0xd9, + 0xef, 0xb5, 0xce, 0xde, 0x2f, 0xda, 0x0f, 0x50, 0xd9, 0x8c, 0x51, 0x19, 0x56, 0xa3, 0x02, 0x63, + 0xb3, 0x43, 0x68, 0xff, 0xe6, 0x60, 0x09, 0x76, 0x60, 0x10, 0x7e, 0x91, 0x6a, 0xd7, 0x5d, 0x4b, + 0x6c, 0x71, 0x7a, 0xaf, 0x3f, 0x7e, 0x7e, 0x15, 0x9b, 0x2a, 0x50, 0xe9, 0xf2, 0x41, 0xaf, 0xc1, + 0xbe, 0x2c, 0xd9, 0x69, 0xca, 0x6b, 0x1d, 0xee, 0xfb, 0xb5, 0xae, 0xfd, 0x66, 0x11, 0xbd, 0x2a, + 0x3a, 0xc2, 0x7f, 0xd6, 0xd0, 0x68, 0xa0, 0x21, 0xf1, 0x85, 0x4c, 0x2f, 0x49, 0xca, 0x36, 0xb7, + 0xd6, 0x8f, 0x89, 0x24, 0xa0, 0xdf, 0xfb, 0xf1, 0xdf, 0xff, 0xfb, 0xf3, 0xa1, 0x6f, 0xe2, 0x82, + 0x38, 0x6b, 0x5b, 0x95, 0xc7, 0x6e, 0xed, 0xd3, 0xb6, 0xb6, 0x7a, 0x35, 0x76, 0xbb, 0x24, 0xdc, + 0x9e, 0xb1, 0x1b, 0xd1, 0x98, 0x7b, 0xf8, 0x9f, 0x1a, 0xc2, 0xdd, 0x3a, 0x10, 0x5f, 0xef, 0x0d, + 0x2b, 0x55, 0x03, 0xe7, 0xde, 0x1e, 0xcc, 0x18, 0xd8, 0xdd, 0x11, 0xec, 0x6e, 0xe2, 0x1b, 0x89, + 0xec, 0x80, 0x52, 0xa5, 0x15, 0x62, 0x95, 0x44, 0x14, 0xff, 0x4a, 0x43, 0xe3, 0x21, 0x4d, 0x86, + 0x57, 0x7b, 0x83, 0x0a, 0x35, 0xcf, 0xbd, 0xd5, 0x57, 0xf3, 0x36, 0xf8, 0xb3, 0x02, 0xfc, 0x02, + 0x3e, 0x95, 0x08, 0xbe, 0x9d, 0x16, 0x19, 0xe1, 0xf8, 0x77, 0x1a, 0x9a, 0x8c, 0x49, 0x3c, 0x95, + 0x01, 0x14, 0x33, 0xc9, 0x5d, 0xed, 0xdb, 0xa4, 0x0d, 0x76, 0x45, 0x80, 0x7d, 0x13, 0x2f, 0x26, + 0x82, 0x65, 0x31, 0x6c, 0xff, 0xd1, 0xd0, 0xd1, 0x64, 0xb5, 0x87, 0x6f, 0xf6, 0xc6, 0x90, 0x29, + 0x34, 0x73, 0xb7, 0x06, 0x77, 0x00, 0x5c, 0x0a, 0x82, 0xcb, 0xdb, 0xf8, 0x5a, 0x22, 0x97, 0x3a, + 0xe1, 0xe5, 0xb0, 0xfa, 0x2b, 0xd7, 0xa8, 0x27, 0x0b, 0x8c, 0xdd, 0x20, 0xc3, 0xec, 0xe1, 0xcf, + 0x35, 0x34, 0x11, 0xed, 0x06, 0x5f, 0xee, 0x17, 0x58, 0xc0, 0xe8, 0x4a, 0xff, 0x86, 0xc0, 0x64, + 0x55, 0x30, 0x39, 0x83, 0x4f, 0x2b, 0x31, 0xf1, 0x41, 0x47, 0x44, 0x92, 0x1a, 0xe2, 0x6e, 0x45, + 0xa8, 0x88, 0x38, 0x41, 0xe3, 0xe9, 0xe7, 0x05, 0xe2, 0x65, 0xbc, 0x94, 0x88, 0x38, 0xa4, 0x49, + 0x8d, 0x5d, 0x21, 0x83, 0xf7, 0xfc, 0xb1, 0x3f, 0x11, 0xf2, 0xb4, 0xee, 0x38, 0x2a, 0xb8, 0x13, + 0x95, 0xac, 0x0a, 0xee, 0x64, 0x6d, 0xaa, 0x2f, 0x09, 0xdc, 0x3a, 0x9e, 0xef, 0x85, 0x1b, 0xff, + 0x49, 0x43, 0x93, 0x31, 0xd9, 0xa6, 0x92, 0x22, 0x53, 0xf5, 0xa5, 0x4a, 0x8a, 0x4c, 0x57, 0x9e, + 0x3d, 0x86, 0x48, 0x5c, 0x94, 0xe2, 0x5f, 0x68, 0x68, 0x44, 0x8a, 0x3d, 0xbc, 0xa6, 0xd4, 0x6f, + 0x44, 0x6f, 0xe6, 0x2e, 0xf6, 0x65, 0x03, 0x10, 0x17, 0x04, 0xc4, 0x37, 0xf0, 0xf1, 0x44, 0x88, + 0x52, 0x72, 0xe2, 0xbf, 0x68, 0x68, 0xba, 0x4b, 0x4c, 0xe2, 0x6b, 0x0a, 0x19, 0x2d, 0x45, 0xa3, + 0xe6, 0xae, 0x0f, 0x64, 0x0b, 0x98, 0xaf, 0x0a, 0xcc, 0x17, 0xf1, 0x85, 0x30, 0xe6, 0xee, 0xeb, + 0x2c, 0xd6, 0xa0, 0x1f, 0xc7, 0x14, 0x2e, 0xfe, 0x9b, 0x86, 0xa6, 0xbb, 0x84, 0xa4, 0x0a, 0x93, + 0x34, 0x25, 0xab, 0xc2, 0x24, 0x55, 0xb9, 0xea, 0xb7, 0x05, 0x93, 0x1b, 0xf8, 0x7a, 0xf2, 0x1a, + 0x2a, 0xd4, 0x4f, 0x7c, 0x09, 0x8d, 0xc9, 0xe6, 0x3d, 0x5f, 0xda, 0xe0, 0x4d, 0xc2, 0x63, 0x92, + 0x12, 0xab, 0xcd, 0xb7, 0x04, 0xb5, 0xab, 0xb2, 0x54, 0xa5, 0xe8, 0x57, 0x7d, 0x4d, 0x10, 0x5a, + 0xc1, 0xcb, 0xa9, 0x49, 0xd1, 0x74, 0x9c, 0xb2, 0xe4, 0xe0, 0x01, 0xd0, 0x67, 0x1a, 0x3a, 0x22, + 0x9c, 0xb1, 0x98, 0x12, 0xc4, 0x37, 0x94, 0x63, 0x9b, 0x24, 0x4b, 0x73, 0xef, 0x0c, 0x6a, 0x0e, + 0x64, 0xb6, 0x04, 0x99, 0x02, 0xbe, 0x95, 0xfd, 0x76, 0xe4, 0x14, 0x36, 0x5d, 0x4b, 0x5e, 0x1f, + 0x84, 0x56, 0x2a, 0x63, 0x57, 0x94, 0xec, 0xe1, 0x2f, 0x35, 0x74, 0x28, 0x72, 0x10, 0x8d, 0xbf, + 0xa1, 0x34, 0x59, 0xbb, 0xce, 0xf3, 0x73, 0x97, 0xfb, 0xb6, 0x03, 0x32, 0x37, 0x05, 0x99, 0xab, + 0xf8, 0x72, 0xea, 0x9b, 0xe1, 0x8c, 0x05, 0x7a, 0xd3, 0xd8, 0x8d, 0x9f, 0xb2, 0xef, 0xe1, 0x5f, + 0x0e, 0xa1, 0xb9, 0xec, 0xc3, 0x74, 0xbc, 0xd9, 0x27, 0xb8, 0xb4, 0xab, 0x81, 0xdc, 0xd6, 0xcb, + 0x3b, 0x02, 0xda, 0x15, 0x41, 0xfb, 0x3b, 0xf8, 0xb1, 0x0a, 0xed, 0x72, 0x43, 0x9c, 0xb9, 0xdb, + 0x55, 0xd3, 0x31, 0x76, 0x13, 0xef, 0x26, 0xf6, 0x92, 0x22, 0xf3, 0x99, 0x26, 0xee, 0x6e, 0xb0, + 0xa1, 0x86, 0xba, 0x7d, 0x15, 0x94, 0x3b, 0xaf, 0x6e, 0x00, 0x74, 0xe6, 0x05, 0x9d, 0x1c, 0x9e, + 0x4d, 0xa4, 0xe3, 0x83, 0xf8, 0xb5, 0x86, 0x50, 0xe7, 0xf6, 0x00, 0x2b, 0x2c, 0x0a, 0x5d, 0xd7, + 0x19, 0xb9, 0x4b, 0xfd, 0x19, 0x01, 0xb6, 0x33, 0x02, 0xdb, 0x29, 0x7c, 0x32, 0x11, 0x1b, 0xef, + 0x60, 0xfa, 0x42, 0x43, 0x53, 0x91, 0xeb, 0x33, 0x5f, 0x57, 0xa8, 0x25, 0x9d, 0xa4, 0x0b, 0xd3, + 0xdc, 0xb5, 0x41, 0x4c, 0x01, 0xf4, 0xb2, 0x00, 0xbd, 0x88, 0xf5, 0x44, 0xd0, 0xd1, 0x5b, 0xcd, + 0xbf, 0x6a, 0x68, 0x26, 0xe9, 0x26, 0x51, 0x25, 0x4f, 0x65, 0x5c, 0x60, 0xaa, 0xe4, 0xa9, 0xac, + 0x0b, 0x4c, 0xfd, 0x2d, 0xc1, 0xc1, 0xc0, 0xab, 0xbd, 0x39, 0x84, 0x65, 0xf4, 0x17, 0x5a, 0xe4, + 0x8e, 0xbc, 0x1f, 0x0d, 0x1d, 0x8d, 0xff, 0x95, 0xfe, 0x0d, 0x01, 0xf9, 0x45, 0x81, 0x7c, 0x15, + 0x9f, 0x4b, 0x16, 0x48, 0x1d, 0x8b, 0x30, 0x6e, 0x5f, 0x94, 0x86, 0x9c, 0xa9, 0x8b, 0xd2, 0xc1, + 0xa0, 0x27, 0x7f, 0x60, 0xd0, 0x43, 0x94, 0x86, 0xa0, 0xfb, 0xea, 0x69, 0x26, 0xe9, 0x0b, 0x12, + 0x95, 0x61, 0x93, 0xf1, 0xe5, 0x8a, 0xca, 0xb0, 0xc9, 0xfa, 0x70, 0xa5, 0xc7, 0x76, 0xa0, 0x2e, + 0xf2, 0x6b, 0xc4, 0x1a, 0xff, 0x43, 0x43, 0xc7, 0x52, 0xbe, 0xed, 0xc1, 0xb7, 0x06, 0x43, 0xd3, + 0xf9, 0x7c, 0x28, 0xb7, 0xfe, 0x12, 0x1e, 0x80, 0xd2, 0x25, 0x41, 0x29, 0x8f, 0x57, 0xd2, 0x28, + 0xad, 0x3b, 0x4e, 0xdc, 0x07, 0x2b, 0xdc, 0xf9, 0xea, 0xf9, 0x9c, 0xf6, 0xf5, 0xf3, 0x39, 0xed, + 0xd9, 0xf3, 0x39, 0xed, 0x67, 0x2f, 0xe6, 0x0e, 0x7c, 0xfd, 0x62, 0xee, 0xc0, 0xbf, 0x5e, 0xcc, + 0x1d, 0x78, 0x7c, 0xae, 0x6e, 0xf3, 0xc6, 0x4e, 0x25, 0x5f, 0xa5, 0xdb, 0x61, 0x8f, 0xfe, 0x96, + 0xc3, 0xf8, 0x24, 0x94, 0xdb, 0x5a, 0x4d, 0xc2, 0x2a, 0x23, 0xe2, 0x63, 0xa9, 0x8b, 0xff, 0x0b, + 0x00, 0x00, 0xff, 0xff, 0x77, 0x67, 0x2d, 0x08, 0x22, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/observer/types/tss.pb.go b/x/observer/types/tss.pb.go index 0adbd741ef..560fb683d8 100644 --- a/x/observer/types/tss.pb.go +++ b/x/observer/types/tss.pb.go @@ -108,26 +108,26 @@ func init() { } var fileDescriptor_0d5940b469d46916 = []byte{ - // 289 bytes of a gzipped FileDescriptorProto + // 292 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x4a, 0xf3, 0x40, - 0x14, 0x46, 0x3b, 0xe4, 0xff, 0x2b, 0x9d, 0x95, 0x4c, 0x2b, 0x14, 0xc5, 0xa1, 0x08, 0x42, 0x11, - 0x4c, 0x8a, 0x3e, 0x81, 0x6e, 0x54, 0x70, 0x21, 0xad, 0xab, 0x6e, 0xca, 0x24, 0xb9, 0x26, 0x43, - 0x6b, 0x26, 0xcc, 0xbd, 0x15, 0xd3, 0xa7, 0xf0, 0xb1, 0x5c, 0x76, 0xe9, 0x52, 0x92, 0x8d, 0x8f, - 0x21, 0x9d, 0x10, 0x2d, 0xea, 0xee, 0x72, 0xcf, 0xf9, 0x36, 0x87, 0x1f, 0xaf, 0x80, 0x54, 0x94, - 0x2a, 0x9d, 0x05, 0xee, 0x32, 0x16, 0x02, 0x13, 0x22, 0xd8, 0x27, 0xb0, 0x01, 0x21, 0xfa, 0xb9, - 0x35, 0x64, 0xc4, 0xc1, 0x97, 0xe6, 0x37, 0x9a, 0xdf, 0x68, 0xfb, 0xbd, 0xc4, 0x24, 0xc6, 0x79, - 0xc1, 0xe6, 0xaa, 0x27, 0x47, 0x1f, 0x8c, 0x7b, 0xf7, 0x93, 0x89, 0x38, 0xe4, 0x9c, 0x10, 0x67, - 0xf9, 0x32, 0x9c, 0x43, 0xd1, 0xf7, 0x06, 0x6c, 0xd8, 0x19, 0x77, 0x08, 0xf1, 0xce, 0x3d, 0xc4, - 0x88, 0xf7, 0x1c, 0x56, 0x96, 0x74, 0xa4, 0x73, 0x95, 0xd1, 0x6c, 0xa1, 0x91, 0xfa, 0xff, 0x06, - 0xde, 0xb0, 0x33, 0x16, 0x1b, 0xf1, 0x1b, 0xdd, 0x6a, 0x24, 0x71, 0xc6, 0xf7, 0x4c, 0x0e, 0x56, - 0x91, 0xb1, 0x33, 0x15, 0xc7, 0x16, 0x10, 0xeb, 0xc9, 0x7f, 0x37, 0xe9, 0x36, 0xf0, 0xa2, 0x66, - 0x6e, 0x33, 0xe2, 0xdd, 0x07, 0x9d, 0xa9, 0x85, 0x5e, 0x41, 0x3c, 0x05, 0x52, 0xd7, 0xa0, 0x93, - 0x94, 0xfa, 0xed, 0x01, 0x1b, 0x7a, 0xe3, 0xbf, 0x90, 0x38, 0xe1, 0xbb, 0x73, 0x28, 0xae, 0x20, - 0xdb, 0xd2, 0x77, 0x9c, 0xfe, 0xeb, 0x7f, 0x79, 0xf3, 0x5a, 0x4a, 0xb6, 0x2e, 0x25, 0x7b, 0x2f, - 0x25, 0x7b, 0xa9, 0x64, 0x6b, 0x5d, 0xc9, 0xd6, 0x5b, 0x25, 0x5b, 0xd3, 0x20, 0xd1, 0x94, 0x2e, - 0x43, 0x3f, 0x32, 0x8f, 0xae, 0xef, 0xe9, 0x8f, 0xd4, 0xcf, 0x5b, 0xb1, 0x8b, 0x1c, 0x30, 0x6c, - 0xbb, 0x78, 0xe7, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0x2e, 0xd2, 0x45, 0x98, 0x01, 0x00, - 0x00, + 0x14, 0x46, 0x3b, 0xe4, 0xff, 0x2b, 0x9d, 0x95, 0x4c, 0x2b, 0x14, 0xc5, 0xa1, 0x08, 0x42, 0x51, + 0x4c, 0x8a, 0x3e, 0x81, 0x82, 0xe8, 0xc2, 0x85, 0xb4, 0xae, 0xba, 0x29, 0x93, 0xe4, 0x9a, 0x0c, + 0xad, 0x99, 0x30, 0xf7, 0x56, 0x4c, 0x9f, 0xc2, 0xc7, 0x72, 0xd9, 0xa5, 0x4b, 0x49, 0x36, 0x3e, + 0x86, 0x74, 0x42, 0xb4, 0xa0, 0xbb, 0xcb, 0x3d, 0xe7, 0xdb, 0x1c, 0x7e, 0xbc, 0x02, 0x52, 0x51, + 0xaa, 0x74, 0x16, 0xb8, 0xcb, 0x58, 0x08, 0x4c, 0x88, 0x60, 0x9f, 0xc1, 0x06, 0x84, 0xe8, 0xe7, + 0xd6, 0x90, 0x11, 0x07, 0xdf, 0x9a, 0xdf, 0x68, 0x7e, 0xa3, 0xed, 0xf7, 0x12, 0x93, 0x18, 0xe7, + 0x05, 0x9b, 0xab, 0x9e, 0x1c, 0x7d, 0x32, 0xee, 0x3d, 0x4c, 0x26, 0xe2, 0x90, 0x73, 0x42, 0x9c, + 0xe5, 0xcb, 0x70, 0x0e, 0x45, 0xdf, 0x1b, 0xb0, 0x61, 0x67, 0xdc, 0x21, 0xc4, 0x7b, 0xf7, 0x10, + 0x23, 0xde, 0x73, 0x58, 0x59, 0xd2, 0x91, 0xce, 0x55, 0x46, 0xb3, 0x85, 0x46, 0xea, 0xff, 0x1b, + 0x78, 0xc3, 0xce, 0x58, 0x6c, 0xc4, 0x1f, 0x74, 0xa7, 0x91, 0xc4, 0x39, 0xdf, 0x33, 0x39, 0x58, + 0x45, 0xc6, 0xce, 0x54, 0x1c, 0x5b, 0x40, 0xac, 0x27, 0xff, 0xdd, 0xa4, 0xdb, 0xc0, 0xcb, 0x9a, + 0xb9, 0xcd, 0x88, 0x77, 0x1f, 0x75, 0xa6, 0x16, 0x7a, 0x05, 0xf1, 0x14, 0x48, 0xdd, 0x82, 0x4e, + 0x52, 0xea, 0xb7, 0x07, 0x6c, 0xe8, 0x8d, 0xff, 0x42, 0xe2, 0x84, 0xef, 0xce, 0xa1, 0xb8, 0x81, + 0x6c, 0x4b, 0xdf, 0x71, 0xfa, 0xaf, 0xff, 0xd5, 0xf5, 0x5b, 0x29, 0xd9, 0xba, 0x94, 0xec, 0xa3, + 0x94, 0xec, 0xb5, 0x92, 0xad, 0x75, 0x25, 0x5b, 0xef, 0x95, 0x6c, 0x4d, 0x4f, 0x13, 0x4d, 0xe9, + 0x32, 0xf4, 0x23, 0xf3, 0xe4, 0xfa, 0x9e, 0xd5, 0xa9, 0x33, 0x13, 0x43, 0xf0, 0xb2, 0x15, 0xba, + 0xc8, 0x01, 0xc3, 0xb6, 0x0b, 0x77, 0xf1, 0x15, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x27, 0xf4, 0x48, + 0x94, 0x01, 0x00, 0x00, } func (m *TSS) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/tss_funds_migrator.pb.go b/x/observer/types/tss_funds_migrator.pb.go index 4f031d477e..049ea39362 100644 --- a/x/observer/types/tss_funds_migrator.pb.go +++ b/x/observer/types/tss_funds_migrator.pb.go @@ -84,7 +84,7 @@ func init() { } var fileDescriptor_82eb7fa25833bded = []byte{ - // 231 bytes of a gzipped FileDescriptorProto + // 236 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xa9, 0x4a, 0x2d, 0x49, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0xf3, 0x93, 0x8a, 0x53, 0x8b, 0xca, 0x52, 0x8b, 0xf4, 0x4b, 0x8a, 0x8b, 0xe3, 0xd3, 0x4a, 0xf3, 0x52, 0x8a, 0xe3, 0x73, @@ -95,11 +95,11 @@ var fileDescriptor_82eb7fa25833bded = []byte{ 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xd8, 0xc1, 0x7c, 0xcf, 0x14, 0x21, 0x03, 0x2e, 0x11, 0x88, 0xb5, 0x99, 0xf9, 0x79, 0xf1, 0xc9, 0xc9, 0x25, 0x15, 0xf1, 0x99, 0x79, 0x29, 0xa9, 0x15, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x42, 0x70, 0x39, 0xe7, 0xe4, 0x92, 0x0a, 0x4f, 0x90, 0x8c, - 0x93, 0xe7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, - 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa7, 0x67, 0x96, - 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0xfd, 0xa9, 0x8b, 0xe6, 0xe5, 0x0a, 0x24, 0x4f, - 0x57, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x5d, 0x6d, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x19, - 0x3c, 0x7f, 0xa6, 0x20, 0x01, 0x00, 0x00, + 0x93, 0xeb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, + 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa7, 0x67, 0x96, + 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0x82, 0xfd, 0xa9, 0x0b, 0xf1, 0x72, 0x5e, 0x7e, 0x4a, + 0xaa, 0x7e, 0x05, 0x92, 0x87, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x2e, 0x36, 0x06, 0x04, + 0x00, 0x00, 0xff, 0xff, 0x5b, 0x11, 0xb2, 0x47, 0x1c, 0x01, 0x00, 0x00, } func (m *TssFundMigratorInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/tx.pb.go b/x/observer/types/tx.pb.go index a0328fa65d..d95a91e2ee 100644 --- a/x/observer/types/tx.pb.go +++ b/x/observer/types/tx.pb.go @@ -9,8 +9,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - chains "github.com/zeta-chain/zetacore/pkg/chains" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + chains "github.com/zeta-chain/node/pkg/chains" + proofs "github.com/zeta-chain/node/pkg/proofs" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -1272,86 +1272,86 @@ func init() { } var fileDescriptor_eda6e3b1d16a4021 = []byte{ - // 1258 bytes of a gzipped FileDescriptorProto + // 1262 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xdb, 0xc6, 0x13, 0x37, 0xff, 0xce, 0xc3, 0x1e, 0x59, 0xb2, 0xc3, 0xbf, 0x93, 0xc8, 0x74, 0xa3, 0x06, 0x44, - 0xe2, 0x28, 0x69, 0x2a, 0xd9, 0x4a, 0xd1, 0xe7, 0xc9, 0x8f, 0xc6, 0x76, 0x53, 0xc7, 0x06, 0xe5, - 0x06, 0x45, 0x2e, 0xc4, 0x8a, 0x5c, 0x53, 0xac, 0xa9, 0x5d, 0x81, 0x4b, 0xf9, 0x91, 0x06, 0x05, - 0x7a, 0x2c, 0xd0, 0x43, 0x3f, 0x40, 0x81, 0xde, 0xfb, 0x0d, 0xda, 0x73, 0x0f, 0xe9, 0x2d, 0xc7, - 0x9e, 0x8a, 0xc2, 0x3e, 0xf5, 0x5b, 0x14, 0xdc, 0x5d, 0xae, 0x9e, 0xa6, 0xa4, 0x14, 0x3d, 0x49, - 0x9c, 0xfd, 0xfd, 0x66, 0x7e, 0xb3, 0x3b, 0x3b, 0x43, 0xc2, 0x9d, 0x17, 0x38, 0x42, 0x4e, 0x1d, - 0xf9, 0xa4, 0xcc, 0xff, 0xd1, 0x10, 0x97, 0x69, 0x8d, 0xe1, 0xf0, 0x08, 0x87, 0xe5, 0xe8, 0xa4, - 0xd4, 0x0c, 0x69, 0x44, 0xf5, 0x45, 0x85, 0x2a, 0x25, 0xa8, 0x52, 0x82, 0x32, 0xe6, 0x3d, 0xea, - 0x51, 0x8e, 0x2b, 0xc7, 0xff, 0x04, 0xc5, 0xb8, 0x97, 0xe6, 0xb8, 0x16, 0xa0, 0x06, 0x96, 0xc0, - 0x4a, 0x1a, 0xd0, 0x09, 0x29, 0x63, 0x7c, 0xd1, 0x3e, 0x08, 0x90, 0xc7, 0x24, 0xe7, 0x41, 0x1a, - 0x27, 0xf9, 0x23, 0xb1, 0xc5, 0x34, 0x6c, 0x13, 0x85, 0xa8, 0x91, 0x78, 0x5d, 0x4e, 0x45, 0x62, - 0xe2, 0xfa, 0xc4, 0xb3, 0x09, 0x25, 0x0e, 0x4e, 0x18, 0x77, 0x53, 0x77, 0x8f, 0xa5, 0xc9, 0x6d, - 0x1e, 0x7a, 0x65, 0x6e, 0x62, 0xf2, 0x67, 0x08, 0xb6, 0x19, 0x52, 0x7a, 0xc0, 0xe4, 0x8f, 0xc0, - 0x9a, 0x7f, 0x6b, 0x70, 0x6d, 0x87, 0x79, 0x5f, 0x34, 0x5d, 0x14, 0xe1, 0x5d, 0x19, 0x57, 0xcf, - 0xc3, 0x55, 0x27, 0xc4, 0x28, 0xa2, 0x61, 0x5e, 0xbb, 0xad, 0x15, 0xa7, 0xad, 0xe4, 0x51, 0x5f, - 0x86, 0x79, 0x1a, 0xb8, 0x76, 0xa2, 0xd0, 0x46, 0xae, 0x1b, 0x62, 0xc6, 0xf2, 0xff, 0xe3, 0x30, - 0x9d, 0x06, 0x6e, 0xe2, 0x64, 0x55, 0xac, 0xc4, 0x0c, 0x82, 0x8f, 0xfb, 0x19, 0x93, 0x82, 0x41, - 0xf0, 0x71, 0x2f, 0xe3, 0x19, 0x64, 0x5b, 0x5c, 0x8f, 0x1d, 0x62, 0xc4, 0x28, 0xc9, 0x5f, 0xba, - 0xad, 0x15, 0x73, 0x95, 0x95, 0x52, 0x4a, 0x09, 0x95, 0x12, 0x27, 0x22, 0x13, 0x8b, 0x13, 0xad, + 0xe2, 0x28, 0x8f, 0x4a, 0xb1, 0x52, 0xf4, 0x79, 0xf2, 0x23, 0xb1, 0xdd, 0xd4, 0xb1, 0x41, 0xb9, + 0x41, 0x91, 0x0b, 0xb1, 0x22, 0xd7, 0x14, 0x6b, 0x6a, 0x57, 0xe0, 0x52, 0x7e, 0xa4, 0x41, 0x81, + 0x1e, 0x0b, 0xf4, 0xd0, 0x0f, 0x50, 0xa0, 0xf7, 0x7e, 0x83, 0xf6, 0xdc, 0x43, 0x7a, 0xcb, 0xb1, + 0xa7, 0xa2, 0xb0, 0x4f, 0xfd, 0x16, 0x05, 0x77, 0x97, 0xab, 0xa7, 0x29, 0x29, 0x45, 0x4f, 0x12, + 0x67, 0x7f, 0xbf, 0x99, 0xdf, 0xec, 0xce, 0xce, 0x90, 0x70, 0xeb, 0x25, 0x8e, 0x90, 0x53, 0x47, + 0x3e, 0x29, 0xf3, 0x7f, 0x34, 0xc4, 0x65, 0x5a, 0x63, 0x38, 0x3c, 0xc4, 0x61, 0x39, 0x3a, 0x2e, + 0x35, 0x43, 0x1a, 0x51, 0x7d, 0x51, 0xa1, 0x4a, 0x09, 0xaa, 0x94, 0xa0, 0x8c, 0x79, 0x8f, 0x7a, + 0x94, 0xe3, 0xca, 0xf1, 0x3f, 0x41, 0x31, 0xee, 0xa4, 0x39, 0xae, 0x05, 0xa8, 0x81, 0x25, 0xb0, + 0x92, 0x06, 0x74, 0x42, 0xca, 0x18, 0x5f, 0xb4, 0xf7, 0x03, 0xe4, 0x31, 0xc9, 0xb9, 0x97, 0xc6, + 0x49, 0xfe, 0x48, 0x6c, 0x31, 0x0d, 0xdb, 0x44, 0x21, 0x6a, 0x24, 0x5e, 0x1f, 0xa6, 0x22, 0x31, + 0x71, 0x7d, 0xe2, 0xd9, 0x84, 0x12, 0x07, 0x27, 0x8c, 0xdb, 0xa9, 0xbb, 0xc7, 0xd2, 0xe4, 0x36, + 0x0f, 0xbc, 0x32, 0x37, 0x31, 0xf9, 0x33, 0x04, 0xdb, 0x0c, 0x29, 0xdd, 0x67, 0xf2, 0x47, 0x60, + 0xcd, 0xbf, 0x35, 0xb8, 0xb2, 0xcd, 0xbc, 0x2f, 0x9a, 0x2e, 0x8a, 0xf0, 0x8e, 0x8c, 0xab, 0xe7, + 0xe1, 0xb2, 0x13, 0x62, 0x14, 0xd1, 0x30, 0xaf, 0xdd, 0xd4, 0x8a, 0xd3, 0x56, 0xf2, 0xa8, 0x3f, + 0x84, 0x79, 0x1a, 0xb8, 0x76, 0xa2, 0xd0, 0x46, 0xae, 0x1b, 0x62, 0xc6, 0xf2, 0xff, 0xe3, 0x30, + 0x9d, 0x06, 0x6e, 0xe2, 0x64, 0x45, 0xac, 0xc4, 0x0c, 0x82, 0x8f, 0xfa, 0x19, 0x93, 0x82, 0x41, + 0xf0, 0x51, 0x2f, 0xe3, 0x39, 0x64, 0x5b, 0x5c, 0x8f, 0x1d, 0x62, 0xc4, 0x28, 0xc9, 0x5f, 0xb8, + 0xa9, 0x15, 0x73, 0x95, 0xe5, 0x52, 0x4a, 0x09, 0x95, 0x12, 0x27, 0x22, 0x13, 0x8b, 0x13, 0xad, 0x99, 0x56, 0xc7, 0x93, 0xb9, 0x08, 0x0b, 0x7d, 0xa9, 0x5a, 0x98, 0x35, 0x29, 0x61, 0xd8, 0xfc, - 0x5d, 0x03, 0x7d, 0x87, 0x79, 0xcf, 0x68, 0x84, 0xd7, 0x02, 0xea, 0x1c, 0x6e, 0x61, 0xe4, 0xa6, - 0xee, 0xc4, 0x02, 0x4c, 0x89, 0xaa, 0xf2, 0x5d, 0x9e, 0xfd, 0xa4, 0x75, 0x95, 0x3f, 0x6f, 0xbb, - 0xfa, 0x2d, 0x80, 0x5a, 0xec, 0xc3, 0xae, 0x23, 0x56, 0xe7, 0x89, 0xce, 0x58, 0xd3, 0xdc, 0xb2, - 0x85, 0x58, 0x5d, 0xbf, 0x01, 0x57, 0xea, 0xd8, 0xf7, 0xea, 0x11, 0x4f, 0x6c, 0xd2, 0x92, 0x4f, - 0xfa, 0x66, 0x6c, 0x8f, 0xa3, 0xe6, 0x2f, 0xdf, 0xd6, 0x8a, 0x99, 0xca, 0xfd, 0x41, 0x09, 0x37, - 0x0f, 0xbd, 0x92, 0x3c, 0x41, 0x21, 0x71, 0x03, 0x45, 0x68, 0xed, 0xd2, 0xab, 0x3f, 0xdf, 0x9e, - 0xb0, 0x24, 0xdd, 0xfc, 0x0a, 0x8c, 0xfe, 0x54, 0x92, 0x4c, 0xf5, 0xbb, 0x90, 0xab, 0xa1, 0x20, - 0xa0, 0x91, 0xcd, 0x53, 0xc1, 0x2e, 0xcf, 0x6c, 0xca, 0xca, 0x0a, 0xeb, 0xba, 0x30, 0xc6, 0xb0, - 0x23, 0x1a, 0x61, 0xfb, 0xc0, 0x27, 0x28, 0xf0, 0x5f, 0x60, 0x91, 0xe5, 0x94, 0x95, 0x8d, 0xad, - 0x8f, 0x13, 0xa3, 0xf9, 0x12, 0xe6, 0xd5, 0xa6, 0xae, 0xc7, 0x52, 0xf7, 0xf8, 0x7d, 0x48, 0xd9, + 0x5d, 0x03, 0x7d, 0x9b, 0x79, 0xcf, 0x69, 0x84, 0x57, 0x03, 0xea, 0x1c, 0x6c, 0x62, 0xe4, 0xa6, + 0xee, 0xc4, 0x02, 0x4c, 0x89, 0xaa, 0xf2, 0x5d, 0x9e, 0xfd, 0xa4, 0x75, 0x99, 0x3f, 0x6f, 0xb9, + 0xfa, 0x0d, 0x80, 0x5a, 0xec, 0xc3, 0xae, 0x23, 0x56, 0xe7, 0x89, 0xce, 0x58, 0xd3, 0xdc, 0xb2, + 0x89, 0x58, 0x5d, 0xbf, 0x06, 0x97, 0xea, 0xd8, 0xf7, 0xea, 0x11, 0x4f, 0x6c, 0xd2, 0x92, 0x4f, + 0xfa, 0x46, 0x6c, 0x8f, 0xa3, 0xe6, 0x2f, 0xde, 0xd4, 0x8a, 0x99, 0xca, 0xdd, 0x41, 0x09, 0x37, + 0x0f, 0xbc, 0x92, 0x3c, 0x41, 0x21, 0x71, 0x1d, 0x45, 0x68, 0xf5, 0xc2, 0xeb, 0x3f, 0xdf, 0x9d, + 0xb0, 0x24, 0xdd, 0xfc, 0x0a, 0x8c, 0xfe, 0x54, 0x92, 0x4c, 0xf5, 0xdb, 0x90, 0xab, 0xa1, 0x20, + 0xa0, 0x91, 0xcd, 0x53, 0xc1, 0x2e, 0xcf, 0x6c, 0xca, 0xca, 0x0a, 0xeb, 0x9a, 0x30, 0xc6, 0xb0, + 0x43, 0x1a, 0x61, 0x7b, 0xdf, 0x27, 0x28, 0xf0, 0x5f, 0x62, 0x91, 0xe5, 0x94, 0x95, 0x8d, 0xad, + 0x4f, 0x12, 0xa3, 0xf9, 0x0a, 0xe6, 0xd5, 0xa6, 0xae, 0xc5, 0x52, 0x77, 0xf9, 0x7d, 0x48, 0xd9, 0xb8, 0xcf, 0x20, 0xe3, 0xb4, 0x81, 0xdc, 0x6b, 0xa6, 0x52, 0x4c, 0x3d, 0xdc, 0x0e, 0xc7, 0x56, - 0x27, 0xd9, 0x2c, 0xc0, 0x5b, 0x83, 0xa2, 0xab, 0x53, 0x7d, 0xc2, 0xd5, 0x59, 0xb8, 0x41, 0x8f, - 0x46, 0x54, 0x77, 0xf1, 0xb1, 0xca, 0x60, 0x7d, 0xce, 0x54, 0xb0, 0xdf, 0x34, 0xc8, 0xed, 0x30, - 0x6f, 0xd5, 0x75, 0x47, 0xb8, 0x48, 0xf7, 0x61, 0xee, 0x82, 0x4b, 0x34, 0x4b, 0x7b, 0xee, 0xc3, - 0xc7, 0xb0, 0xc0, 0xb7, 0x24, 0xf0, 0x31, 0x89, 0x6c, 0x2f, 0x44, 0x24, 0xc2, 0xd8, 0x6e, 0xb6, - 0x6a, 0x87, 0xf8, 0x54, 0x5e, 0xa3, 0x9b, 0x6d, 0xc0, 0xa6, 0x58, 0xdf, 0xe3, 0xcb, 0xfa, 0x0a, - 0x5c, 0x47, 0xae, 0x6b, 0x13, 0xea, 0x62, 0x1b, 0x39, 0x0e, 0x6d, 0x91, 0xc8, 0xa6, 0x24, 0x38, - 0xe5, 0xa5, 0x37, 0x65, 0xe9, 0xc8, 0x75, 0x9f, 0x52, 0x17, 0xaf, 0x8a, 0xa5, 0x5d, 0x12, 0x9c, - 0x9a, 0x79, 0xb8, 0xd1, 0x9d, 0x85, 0x4a, 0xf0, 0x7b, 0x0d, 0x66, 0x54, 0x61, 0xa1, 0x06, 0x7e, - 0xb3, 0xdb, 0xb1, 0x19, 0xdf, 0x0e, 0xd4, 0xc0, 0xb6, 0x4f, 0x0e, 0x28, 0xd7, 0x9f, 0xa9, 0x98, - 0xa9, 0xc7, 0xcf, 0x83, 0xc9, 0x1a, 0x9f, 0xe6, 0xdc, 0x6d, 0x72, 0x40, 0xcd, 0x1b, 0xfc, 0x70, - 0x95, 0x1a, 0x25, 0x73, 0x15, 0x66, 0x55, 0x51, 0x3c, 0xc1, 0xa7, 0x1e, 0x26, 0x29, 0x42, 0xe7, - 0xe1, 0x32, 0xbf, 0x99, 0x52, 0xa5, 0x78, 0x30, 0x17, 0xe0, 0x66, 0x8f, 0x0b, 0xe5, 0xfd, 0x47, - 0x0d, 0xfe, 0xcf, 0xcb, 0x80, 0xe1, 0x88, 0x57, 0xc1, 0x53, 0xde, 0xce, 0xdf, 0x6c, 0x2f, 0x96, - 0x60, 0x56, 0x2c, 0xf1, 0x99, 0x60, 0x07, 0xf4, 0x98, 0x6f, 0xc8, 0xa4, 0x95, 0x75, 0x94, 0xeb, - 0xcf, 0xe9, 0xb1, 0x5e, 0x84, 0xb9, 0x4e, 0x5c, 0xdd, 0xf7, 0xea, 0xb2, 0x79, 0xe4, 0xda, 0xc0, - 0x2d, 0xdf, 0xab, 0x9b, 0xb7, 0x60, 0x71, 0x80, 0x3a, 0xa5, 0xfe, 0x17, 0x0d, 0x40, 0x6e, 0xda, - 0x7e, 0xb5, 0x9a, 0x22, 0xfa, 0x16, 0x40, 0xc4, 0x58, 0x52, 0x65, 0xa2, 0x32, 0xa7, 0x23, 0xc6, - 0x64, 0x5d, 0x3d, 0x04, 0xfd, 0x90, 0xef, 0x8b, 0x1d, 0x1f, 0x97, 0x2d, 0xfb, 0x99, 0xd0, 0x3e, - 0x27, 0x56, 0x9e, 0xe3, 0x08, 0x6d, 0x89, 0xce, 0xb6, 0x01, 0x57, 0x58, 0x84, 0xa2, 0x16, 0x93, - 0xad, 0xfc, 0xe1, 0x45, 0x9d, 0x4d, 0xce, 0x31, 0x0b, 0x3b, 0xd8, 0x3f, 0xc2, 0x55, 0xce, 0xb1, - 0x24, 0xd7, 0xfc, 0xae, 0xdd, 0xa2, 0xf7, 0xab, 0xd5, 0xff, 0xa6, 0x9f, 0xc5, 0x30, 0x99, 0x18, - 0x6b, 0x39, 0x4e, 0x32, 0xa8, 0xa6, 0xac, 0xac, 0xb0, 0x56, 0x85, 0xd1, 0x3c, 0x86, 0xec, 0x0e, - 0xf3, 0x3e, 0x25, 0xa8, 0x16, 0xe0, 0xf5, 0xf5, 0xfd, 0x2f, 0x53, 0x76, 0xf2, 0x0e, 0x64, 0x31, - 0xc7, 0x6d, 0x93, 0x1a, 0x6d, 0x11, 0x15, 0xb7, 0xcb, 0xa8, 0x2f, 0x41, 0x4e, 0x18, 0x76, 0x5b, - 0x91, 0x80, 0x89, 0xb8, 0x3d, 0x56, 0xf3, 0x26, 0x5c, 0xef, 0x0a, 0xac, 0x4e, 0xf6, 0x25, 0x6f, - 0x3e, 0x1b, 0x3e, 0x1b, 0x41, 0xd2, 0x12, 0xe4, 0x5c, 0x01, 0xec, 0xd6, 0xd4, 0x63, 0xd5, 0x8b, - 0x30, 0x2b, 0x2d, 0x3d, 0xaa, 0x7a, 0xcd, 0xb2, 0x69, 0x74, 0x44, 0x57, 0xba, 0x7e, 0xd6, 0xa0, - 0xa0, 0xee, 0xd2, 0x26, 0x62, 0x7b, 0xa1, 0xef, 0xe0, 0x6d, 0x12, 0x4b, 0x61, 0xf8, 0x71, 0xfc, - 0x46, 0x96, 0x22, 0x94, 0xc0, 0x75, 0x6f, 0x10, 0x45, 0x4e, 0x8d, 0x4a, 0x6a, 0xdb, 0x18, 0x18, - 0x4c, 0xb6, 0x91, 0xc1, 0x6e, 0xcd, 0x22, 0x2c, 0xa5, 0x6b, 0x4d, 0xd2, 0xaa, 0xfc, 0x9a, 0x81, - 0xc9, 0x1d, 0xe6, 0xe9, 0x14, 0x32, 0x9d, 0x0d, 0xff, 0x9d, 0x54, 0x45, 0xdd, 0x7d, 0xd5, 0x78, - 0x34, 0x06, 0x58, 0x95, 0xfb, 0x09, 0xe4, 0x7a, 0xde, 0xd6, 0x4a, 0xc3, 0xdc, 0x74, 0xe3, 0x8d, - 0xf7, 0xc7, 0xc3, 0xab, 0xc8, 0xdf, 0x6a, 0x70, 0xad, 0x7f, 0xd0, 0xaf, 0x8c, 0xe6, 0xad, 0x83, - 0x62, 0x7c, 0x34, 0x36, 0xa5, 0x4b, 0x43, 0xff, 0x38, 0x1f, 0xaa, 0xa1, 0x8f, 0x32, 0x5c, 0xc3, - 0x85, 0x73, 0x5e, 0xf7, 0x61, 0xba, 0x3d, 0x02, 0xef, 0x0f, 0xf3, 0xa3, 0xa0, 0xc6, 0xca, 0xc8, - 0x50, 0x15, 0x2a, 0x84, 0x99, 0xae, 0x39, 0xf6, 0x70, 0xb4, 0x9d, 0x13, 0x68, 0xe3, 0xbd, 0x71, - 0xd0, 0x2a, 0xe6, 0xd7, 0x30, 0xdb, 0xfb, 0x16, 0x5c, 0x1e, 0x4d, 0xb9, 0x22, 0x18, 0x1f, 0x8c, - 0x49, 0x50, 0xc1, 0xbf, 0x81, 0xb9, 0xbe, 0xc9, 0xba, 0x3c, 0xfc, 0xa8, 0xba, 0x19, 0xc6, 0x87, - 0xe3, 0x32, 0x54, 0x7c, 0x07, 0xae, 0x26, 0xb3, 0xf1, 0xde, 0x28, 0x39, 0xec, 0x57, 0xab, 0x46, - 0x79, 0x44, 0xa0, 0x0a, 0x12, 0x00, 0x74, 0x4c, 0x8e, 0x07, 0xc3, 0xe8, 0x6d, 0xac, 0x51, 0x19, - 0x1d, 0xab, 0xa2, 0x51, 0xc8, 0x74, 0x4e, 0x85, 0xa1, 0x1d, 0xaa, 0x03, 0x3c, 0xbc, 0x43, 0x0d, - 0xe8, 0xf8, 0xfa, 0x4f, 0x1a, 0x2c, 0xa6, 0xb5, 0xfb, 0x4f, 0x46, 0x2b, 0xcb, 0x81, 0x64, 0x63, - 0xfd, 0x5f, 0x90, 0x13, 0x85, 0x6b, 0xdb, 0xaf, 0xce, 0x0a, 0xda, 0xeb, 0xb3, 0x82, 0xf6, 0xd7, - 0x59, 0x41, 0xfb, 0xe1, 0xbc, 0x30, 0xf1, 0xfa, 0xbc, 0x30, 0xf1, 0xc7, 0x79, 0x61, 0xe2, 0x79, - 0xd9, 0xf3, 0xa3, 0x7a, 0xab, 0x56, 0x72, 0x68, 0x83, 0x7f, 0x3c, 0xbf, 0xdb, 0xf3, 0x1d, 0x7d, - 0xd2, 0xf1, 0x71, 0x7e, 0xda, 0xc4, 0xac, 0x76, 0x85, 0x7f, 0x47, 0x3f, 0xfa, 0x27, 0x00, 0x00, - 0xff, 0xff, 0x9a, 0x8b, 0x97, 0x08, 0x06, 0x11, 0x00, 0x00, + 0x27, 0xd9, 0x2c, 0xc0, 0x3b, 0x83, 0xa2, 0xab, 0x53, 0x7d, 0xca, 0xd5, 0x59, 0xb8, 0x41, 0x0f, + 0x47, 0x54, 0x77, 0xfe, 0xb1, 0xca, 0x60, 0x7d, 0xce, 0x54, 0xb0, 0xdf, 0x34, 0xc8, 0x6d, 0x33, + 0x6f, 0xc5, 0x75, 0x47, 0xb8, 0x48, 0x77, 0x61, 0xee, 0x9c, 0x4b, 0x34, 0x4b, 0x7b, 0xee, 0xc3, + 0x27, 0xb0, 0xc0, 0xb7, 0x24, 0xf0, 0x31, 0x89, 0x6c, 0x2f, 0x44, 0x24, 0xc2, 0xd8, 0x6e, 0xb6, + 0x6a, 0x07, 0xf8, 0x44, 0x5e, 0xa3, 0xeb, 0x6d, 0xc0, 0x86, 0x58, 0xdf, 0xe5, 0xcb, 0xfa, 0x32, + 0x5c, 0x45, 0xae, 0x6b, 0x13, 0xea, 0x62, 0x1b, 0x39, 0x0e, 0x6d, 0x91, 0xc8, 0xa6, 0x24, 0x38, + 0xe1, 0xa5, 0x37, 0x65, 0xe9, 0xc8, 0x75, 0x9f, 0x51, 0x17, 0xaf, 0x88, 0xa5, 0x1d, 0x12, 0x9c, + 0x98, 0x79, 0xb8, 0xd6, 0x9d, 0x85, 0x4a, 0xf0, 0x7b, 0x0d, 0x66, 0x54, 0x61, 0xa1, 0x06, 0x7e, + 0xbb, 0xdb, 0xb1, 0x11, 0xdf, 0x0e, 0xd4, 0xc0, 0xb6, 0x4f, 0xf6, 0x29, 0xd7, 0x9f, 0xa9, 0x98, + 0xa9, 0xc7, 0xcf, 0x83, 0xc9, 0x1a, 0x9f, 0xe6, 0xdc, 0x2d, 0xb2, 0x4f, 0xcd, 0x6b, 0xfc, 0x70, + 0x95, 0x1a, 0x25, 0x73, 0x05, 0x66, 0x55, 0x51, 0x3c, 0xc5, 0x27, 0x1e, 0x26, 0x29, 0x42, 0xe7, + 0xe1, 0x22, 0xbf, 0x99, 0x52, 0xa5, 0x78, 0x30, 0x17, 0xe0, 0x7a, 0x8f, 0x0b, 0xe5, 0xfd, 0x47, + 0x0d, 0xfe, 0xcf, 0xcb, 0x80, 0xe1, 0x88, 0x57, 0xc1, 0x33, 0xde, 0xce, 0xdf, 0x6e, 0x2f, 0x96, + 0x60, 0x56, 0x2c, 0xf1, 0x99, 0x60, 0x07, 0xf4, 0x88, 0x6f, 0xc8, 0xa4, 0x95, 0x75, 0x94, 0xeb, + 0xcf, 0xe9, 0x91, 0x5e, 0x84, 0xb9, 0x4e, 0x5c, 0xdd, 0xf7, 0xea, 0xb2, 0x79, 0xe4, 0xda, 0xc0, + 0x4d, 0xdf, 0xab, 0x9b, 0x37, 0x60, 0x71, 0x80, 0x3a, 0xa5, 0xfe, 0x17, 0x0d, 0x40, 0x6e, 0xda, + 0x5e, 0xb5, 0x9a, 0x22, 0xfa, 0x06, 0x40, 0xc4, 0x58, 0x52, 0x65, 0xa2, 0x32, 0xa7, 0x23, 0xc6, + 0x64, 0x5d, 0x3d, 0x00, 0xfd, 0x80, 0xef, 0x8b, 0x1d, 0x1f, 0x97, 0x2d, 0xfb, 0x99, 0xd0, 0x3e, + 0x27, 0x56, 0x5e, 0xe0, 0x08, 0x6d, 0x8a, 0xce, 0xb6, 0x0e, 0x97, 0x58, 0x84, 0xa2, 0x16, 0x93, + 0xad, 0xfc, 0xc1, 0x79, 0x9d, 0x4d, 0xce, 0x31, 0x0b, 0x3b, 0xd8, 0x3f, 0xc4, 0x55, 0xce, 0xb1, + 0x24, 0xd7, 0xfc, 0xae, 0xdd, 0xa2, 0xf7, 0xaa, 0xd5, 0xff, 0xa6, 0x9f, 0xc5, 0x30, 0x99, 0x18, + 0x6b, 0x39, 0x4e, 0x32, 0xa8, 0xa6, 0xac, 0xac, 0xb0, 0x56, 0x85, 0xd1, 0x3c, 0x82, 0xec, 0x36, + 0xf3, 0x1e, 0x13, 0x54, 0x0b, 0xf0, 0xda, 0xda, 0xde, 0x97, 0x29, 0x3b, 0x79, 0x0b, 0xb2, 0x98, + 0xe3, 0xb6, 0x48, 0x8d, 0xb6, 0x88, 0x8a, 0xdb, 0x65, 0xd4, 0x97, 0x20, 0x27, 0x0c, 0x3b, 0xad, + 0x48, 0xc0, 0x44, 0xdc, 0x1e, 0xab, 0x79, 0x1d, 0xae, 0x76, 0x05, 0x56, 0x27, 0xfb, 0x8a, 0x37, + 0x9f, 0x75, 0x9f, 0x8d, 0x20, 0x69, 0x09, 0x72, 0xae, 0x00, 0x76, 0x6b, 0xea, 0xb1, 0xea, 0x45, + 0x98, 0x95, 0x96, 0x1e, 0x55, 0xbd, 0x66, 0xd9, 0x34, 0x3a, 0xa2, 0x2b, 0x5d, 0x3f, 0x6b, 0x50, + 0x50, 0x77, 0x69, 0x03, 0xb1, 0xdd, 0xd0, 0x77, 0xf0, 0x16, 0x89, 0xa5, 0x30, 0xfc, 0x24, 0x7e, + 0x23, 0x4b, 0x11, 0x4a, 0xe0, 0xaa, 0x37, 0x88, 0x22, 0xa7, 0x46, 0x25, 0xb5, 0x6d, 0x0c, 0x0c, + 0x26, 0xdb, 0xc8, 0x60, 0xb7, 0x66, 0x11, 0x96, 0xd2, 0xb5, 0x26, 0x69, 0x55, 0x7e, 0xcd, 0xc0, + 0xe4, 0x36, 0xf3, 0x74, 0x0a, 0x99, 0xce, 0x86, 0x7f, 0x3f, 0x55, 0x51, 0x77, 0x5f, 0x35, 0x1e, + 0x8d, 0x01, 0x56, 0xe5, 0x7e, 0x0c, 0xb9, 0x9e, 0xb7, 0xb5, 0xd2, 0x30, 0x37, 0xdd, 0x78, 0xe3, + 0x83, 0xf1, 0xf0, 0x2a, 0xf2, 0xb7, 0x1a, 0x5c, 0xe9, 0x1f, 0xf4, 0xcb, 0xa3, 0x79, 0xeb, 0xa0, + 0x18, 0x1f, 0x8f, 0x4d, 0xe9, 0xd2, 0xd0, 0x3f, 0xce, 0x87, 0x6a, 0xe8, 0xa3, 0x0c, 0xd7, 0x70, + 0xee, 0x9c, 0xd7, 0x7d, 0x98, 0x6e, 0x8f, 0xc0, 0xbb, 0xc3, 0xfc, 0x28, 0xa8, 0xb1, 0x3c, 0x32, + 0x54, 0x85, 0x0a, 0x61, 0xa6, 0x6b, 0x8e, 0x3d, 0x18, 0x6d, 0xe7, 0x04, 0xda, 0x78, 0x7f, 0x1c, + 0xb4, 0x8a, 0xf9, 0x35, 0xcc, 0xf6, 0xbe, 0x05, 0x97, 0x47, 0x53, 0xae, 0x08, 0xc6, 0x87, 0x63, + 0x12, 0x54, 0xf0, 0x6f, 0x60, 0xae, 0x6f, 0xb2, 0x3e, 0x1c, 0x7e, 0x54, 0xdd, 0x0c, 0xe3, 0xa3, + 0x71, 0x19, 0x2a, 0xbe, 0x03, 0x97, 0x93, 0xd9, 0x78, 0x67, 0x94, 0x1c, 0xf6, 0xaa, 0x55, 0xa3, + 0x3c, 0x22, 0x50, 0x05, 0x09, 0x00, 0x3a, 0x26, 0xc7, 0xbd, 0x61, 0xf4, 0x36, 0xd6, 0xa8, 0x8c, + 0x8e, 0x55, 0xd1, 0x28, 0x64, 0x3a, 0xa7, 0xc2, 0xd0, 0x0e, 0xd5, 0x01, 0x1e, 0xde, 0xa1, 0x06, + 0x74, 0x7c, 0xfd, 0x27, 0x0d, 0x16, 0xd3, 0xda, 0xfd, 0xa7, 0xa3, 0x95, 0xe5, 0x40, 0xb2, 0xb1, + 0xf6, 0x2f, 0xc8, 0x89, 0xc2, 0xd5, 0xc7, 0xaf, 0x4f, 0x0b, 0xda, 0x9b, 0xd3, 0x82, 0xf6, 0xd7, + 0x69, 0x41, 0xfb, 0xe1, 0xac, 0x30, 0xf1, 0xe6, 0xac, 0x30, 0xf1, 0xc7, 0x59, 0x61, 0xe2, 0xc5, + 0x7d, 0xcf, 0x8f, 0xea, 0xad, 0x5a, 0xc9, 0xa1, 0x0d, 0xfe, 0xf1, 0xfc, 0x9e, 0xf8, 0x8e, 0x8e, + 0xdf, 0x9f, 0xcb, 0xc7, 0x1d, 0x1f, 0xe6, 0x27, 0x4d, 0xcc, 0x6a, 0x97, 0xf8, 0x37, 0xf4, 0xa3, + 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x65, 0x57, 0x89, 0x92, 0x02, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/observer/types/utils_test.go b/x/observer/types/utils_test.go index 26a9867d2e..9a379ac495 100644 --- a/x/observer/types/utils_test.go +++ b/x/observer/types/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "gitlab.com/thorchain/tss/go-tss/blame" - "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/x/observer/types" ) func TestConvertNodes(t *testing.T) { diff --git a/zetaclient/authz/authz_signer.go b/zetaclient/authz/authz_signer.go index 7f9dc4d471..aff00cc9c0 100644 --- a/zetaclient/authz/authz_signer.go +++ b/zetaclient/authz/authz_signer.go @@ -5,8 +5,8 @@ package authz import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/pkg/authz" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/authz" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // Signer represents a signer for a grantee key diff --git a/zetaclient/chains/base/logger.go b/zetaclient/chains/base/logger.go index 94579df5ae..c70c1fd738 100644 --- a/zetaclient/chains/base/logger.go +++ b/zetaclient/chains/base/logger.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) const ( diff --git a/zetaclient/chains/base/logger_test.go b/zetaclient/chains/base/logger_test.go index 07c0941f5a..571a84ee7d 100644 --- a/zetaclient/chains/base/logger_test.go +++ b/zetaclient/chains/base/logger_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/config" ) func TestInitLogger(t *testing.T) { diff --git a/zetaclient/chains/base/observer.go b/zetaclient/chains/base/observer.go index cf5491366b..3ea4fb423e 100644 --- a/zetaclient/chains/base/observer.go +++ b/zetaclient/chains/base/observer.go @@ -12,15 +12,15 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/logs" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/logs" + "github.com/zeta-chain/node/zetaclient/metrics" + clienttypes "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) const ( diff --git a/zetaclient/chains/base/observer_test.go b/zetaclient/chains/base/observer_test.go index 009d9a53cf..15689b6788 100644 --- a/zetaclient/chains/base/observer_test.go +++ b/zetaclient/chains/base/observer_test.go @@ -10,17 +10,17 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // createObserver creates a new observer for testing diff --git a/zetaclient/chains/base/signer.go b/zetaclient/chains/base/signer.go index 781288b513..71cebaf47a 100644 --- a/zetaclient/chains/base/signer.go +++ b/zetaclient/chains/base/signer.go @@ -3,10 +3,10 @@ package base import ( "sync" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/logs" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/logs" + "github.com/zeta-chain/node/zetaclient/metrics" ) // Signer is the base structure for grouping the common logic between chain signers. diff --git a/zetaclient/chains/base/signer_test.go b/zetaclient/chains/base/signer_test.go index dde542a4a0..7b3e4b72e2 100644 --- a/zetaclient/chains/base/signer_test.go +++ b/zetaclient/chains/base/signer_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // createSigner creates a new signer for testing diff --git a/zetaclient/chains/bitcoin/fee.go b/zetaclient/chains/bitcoin/fee.go index 3293727b47..7b396a87a3 100644 --- a/zetaclient/chains/bitcoin/fee.go +++ b/zetaclient/chains/bitcoin/fee.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/rpc" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - clientcommon "github.com/zeta-chain/zetacore/zetaclient/common" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/rpc" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + clientcommon "github.com/zeta-chain/node/zetaclient/common" ) const ( diff --git a/zetaclient/chains/bitcoin/fee_test.go b/zetaclient/chains/bitcoin/fee_test.go index 3c754d17db..a5a03f82fc 100644 --- a/zetaclient/chains/bitcoin/fee_test.go +++ b/zetaclient/chains/bitcoin/fee_test.go @@ -13,7 +13,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) const ( diff --git a/zetaclient/chains/bitcoin/observer/inbound.go b/zetaclient/chains/bitcoin/observer/inbound.go index 99a11e373f..5985d6f574 100644 --- a/zetaclient/chains/bitcoin/observer/inbound.go +++ b/zetaclient/chains/bitcoin/observer/inbound.go @@ -14,16 +14,16 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/compliance" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // WatchInbound watches Bitcoin chain for inbounds on a ticker diff --git a/zetaclient/chains/bitcoin/observer/inbound_test.go b/zetaclient/chains/bitcoin/observer/inbound_test.go index ec121bd9af..9c7512826f 100644 --- a/zetaclient/chains/bitcoin/observer/inbound_test.go +++ b/zetaclient/chains/bitcoin/observer/inbound_test.go @@ -16,12 +16,12 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - clientcommon "github.com/zeta-chain/zetacore/zetaclient/common" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + clientcommon "github.com/zeta-chain/node/zetaclient/common" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // createRPCClientAndLoadTx is a helper function to load raw tx and feed it to mock rpc client diff --git a/zetaclient/chains/bitcoin/observer/observer.go b/zetaclient/chains/bitcoin/observer/observer.go index dea0ff7216..4f3ad4ea28 100644 --- a/zetaclient/chains/bitcoin/observer/observer.go +++ b/zetaclient/chains/bitcoin/observer/observer.go @@ -19,15 +19,15 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/pkg/chains" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/pkg/chains" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/metrics" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) const ( diff --git a/zetaclient/chains/bitcoin/observer/observer_test.go b/zetaclient/chains/bitcoin/observer/observer_test.go index c873dfb8d7..e4502d4b11 100644 --- a/zetaclient/chains/bitcoin/observer/observer_test.go +++ b/zetaclient/chains/bitcoin/observer/observer_test.go @@ -11,18 +11,18 @@ import ( "github.com/btcsuite/btcd/wire" lru "github.com/hashicorp/golang-lru" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/db" "gorm.io/gorm" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) var ( diff --git a/zetaclient/chains/bitcoin/observer/outbound.go b/zetaclient/chains/bitcoin/observer/outbound.go index 55b56f7a83..01b1d16609 100644 --- a/zetaclient/chains/bitcoin/observer/outbound.go +++ b/zetaclient/chains/bitcoin/observer/outbound.go @@ -11,16 +11,16 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/rpc" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/rpc" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/compliance" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // WatchOutbound watches Bitcoin chain for outgoing txs status diff --git a/zetaclient/chains/bitcoin/observer/outbound_test.go b/zetaclient/chains/bitcoin/observer/outbound_test.go index b1f7ae309b..e9d30bd886 100644 --- a/zetaclient/chains/bitcoin/observer/outbound_test.go +++ b/zetaclient/chains/bitcoin/observer/outbound_test.go @@ -9,12 +9,12 @@ import ( "github.com/btcsuite/btcd/btcjson" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/db" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // the relative path to the testdata directory diff --git a/zetaclient/chains/bitcoin/observer/witness.go b/zetaclient/chains/bitcoin/observer/witness.go index 0af55c62a9..142e6e796a 100644 --- a/zetaclient/chains/bitcoin/observer/witness.go +++ b/zetaclient/chains/bitcoin/observer/witness.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // GetBtcEventWithWitness either returns a valid BTCInboundEvent or nil. diff --git a/zetaclient/chains/bitcoin/observer/witness_test.go b/zetaclient/chains/bitcoin/observer/witness_test.go index 4e93fb5cf1..e85ffa9912 100644 --- a/zetaclient/chains/bitcoin/observer/witness_test.go +++ b/zetaclient/chains/bitcoin/observer/witness_test.go @@ -8,12 +8,12 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - clientcommon "github.com/zeta-chain/zetacore/zetaclient/common" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + clientcommon "github.com/zeta-chain/node/zetaclient/common" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func TestParseScriptFromWitness(t *testing.T) { diff --git a/zetaclient/chains/bitcoin/rpc/rpc.go b/zetaclient/chains/bitcoin/rpc/rpc.go index 29972aa26d..c70b7a4275 100644 --- a/zetaclient/chains/bitcoin/rpc/rpc.go +++ b/zetaclient/chains/bitcoin/rpc/rpc.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" ) // NewRPCClient creates a new RPC client by the given config. diff --git a/zetaclient/chains/bitcoin/rpc/rpc_live_test.go b/zetaclient/chains/bitcoin/rpc/rpc_live_test.go index d82e3c0833..e2f44066c4 100644 --- a/zetaclient/chains/bitcoin/rpc/rpc_live_test.go +++ b/zetaclient/chains/bitcoin/rpc/rpc_live_test.go @@ -19,13 +19,13 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/rpc" - "github.com/zeta-chain/zetacore/zetaclient/common" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/rpc" + "github.com/zeta-chain/node/zetaclient/common" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" ) // createRPCClient creates a new Bitcoin RPC client for given chainID diff --git a/zetaclient/chains/bitcoin/signer/signer.go b/zetaclient/chains/bitcoin/signer/signer.go index b49278d25c..daa56d2da3 100644 --- a/zetaclient/chains/bitcoin/signer/signer.go +++ b/zetaclient/chains/bitcoin/signer/signer.go @@ -18,18 +18,18 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/compliance" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" ) const ( diff --git a/zetaclient/chains/bitcoin/signer/signer_keysign_test.go b/zetaclient/chains/bitcoin/signer/signer_keysign_test.go index 0d1ec42431..c55a98dd56 100644 --- a/zetaclient/chains/bitcoin/signer/signer_keysign_test.go +++ b/zetaclient/chains/bitcoin/signer/signer_keysign_test.go @@ -16,9 +16,9 @@ import ( "github.com/btcsuite/btcutil" "github.com/stretchr/testify/suite" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) type BTCSignTestSuite struct { diff --git a/zetaclient/chains/bitcoin/signer/signer_test.go b/zetaclient/chains/bitcoin/signer/signer_test.go index 39728899be..6e13ea0902 100644 --- a/zetaclient/chains/bitcoin/signer/signer_test.go +++ b/zetaclient/chains/bitcoin/signer/signer_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/require" . "gopkg.in/check.v1" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) type BTCSignerSuite struct { diff --git a/zetaclient/chains/bitcoin/tx_script.go b/zetaclient/chains/bitcoin/tx_script.go index 8c0ebf5ff4..dcb6899e58 100644 --- a/zetaclient/chains/bitcoin/tx_script.go +++ b/zetaclient/chains/bitcoin/tx_script.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/ripemd160" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" ) const ( diff --git a/zetaclient/chains/bitcoin/tx_script_test.go b/zetaclient/chains/bitcoin/tx_script_test.go index f1b17f2119..68910fd49f 100644 --- a/zetaclient/chains/bitcoin/tx_script_test.go +++ b/zetaclient/chains/bitcoin/tx_script_test.go @@ -10,9 +10,9 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/zetaclient/testutils" ) // the relative path to the testdata directory diff --git a/zetaclient/chains/evm/cctx.go b/zetaclient/chains/evm/cctx.go index df8515e175..019dbfe3a0 100644 --- a/zetaclient/chains/evm/cctx.go +++ b/zetaclient/chains/evm/cctx.go @@ -1,8 +1,8 @@ package evm import ( - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" ) // OutboundType enumerate the different types of outbound transactions diff --git a/zetaclient/chains/evm/observer/inbound.go b/zetaclient/chains/evm/observer/inbound.go index 5d72d0a6e7..d412c9b0e0 100644 --- a/zetaclient/chains/evm/observer/inbound.go +++ b/zetaclient/chains/evm/observer/inbound.go @@ -20,19 +20,19 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.non-eth.sol" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/pkg/ticker" - "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/pkg/ticker" + "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/compliance" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/metrics" + clienttypes "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // WatchInbound watches evm chain for incoming txs and post votes to zetacore diff --git a/zetaclient/chains/evm/observer/inbound_test.go b/zetaclient/chains/evm/observer/inbound_test.go index 26290fc6c0..861d31928c 100644 --- a/zetaclient/chains/evm/observer/inbound_test.go +++ b/zetaclient/chains/evm/observer/inbound_test.go @@ -10,17 +10,17 @@ import ( "github.com/onrik/ethrpc" "github.com/rs/zerolog" "github.com/stretchr/testify/require" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/keys" - - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/keys" + + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) func Test_CheckAndVoteInboundTokenZeta(t *testing.T) { diff --git a/zetaclient/chains/evm/observer/observer.go b/zetaclient/chains/evm/observer/observer.go index 6dd1234018..afe116c95e 100644 --- a/zetaclient/chains/evm/observer/observer.go +++ b/zetaclient/chains/evm/observer/observer.go @@ -20,14 +20,14 @@ import ( erc20custodyv2 "github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/pkg/bg" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/pkg/bg" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/metrics" ) var _ interfaces.ChainObserver = (*Observer)(nil) diff --git a/zetaclient/chains/evm/observer/observer_db_test.go b/zetaclient/chains/evm/observer/observer_db_test.go index 524bdb5cf5..0b337c5980 100644 --- a/zetaclient/chains/evm/observer/observer_db_test.go +++ b/zetaclient/chains/evm/observer/observer_db_test.go @@ -12,7 +12,7 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) const TempSQLiteDbPath = "file::memory:?cache=shared" diff --git a/zetaclient/chains/evm/observer/observer_gas.go b/zetaclient/chains/evm/observer/observer_gas.go index 311ea187b9..754f0349c5 100644 --- a/zetaclient/chains/evm/observer/observer_gas.go +++ b/zetaclient/chains/evm/observer/observer_gas.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) // WatchGasPrice watches evm chain for gas prices and post to zetacore diff --git a/zetaclient/chains/evm/observer/observer_gas_test.go b/zetaclient/chains/evm/observer/observer_gas_test.go index 3a416f1733..26de2fd46e 100644 --- a/zetaclient/chains/evm/observer/observer_gas_test.go +++ b/zetaclient/chains/evm/observer/observer_gas_test.go @@ -8,8 +8,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func TestPostGasPrice(t *testing.T) { diff --git a/zetaclient/chains/evm/observer/observer_test.go b/zetaclient/chains/evm/observer/observer_test.go index 69ff6a977d..61c1c25ecb 100644 --- a/zetaclient/chains/evm/observer/observer_test.go +++ b/zetaclient/chains/evm/observer/observer_test.go @@ -13,23 +13,23 @@ import ( "github.com/onrik/ethrpc" "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/ptr" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/keys" - - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/ptr" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/keys" + + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/evm/observer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // the relative path to the testdata directory diff --git a/zetaclient/chains/evm/observer/outbound.go b/zetaclient/chains/evm/observer/outbound.go index 2a10ffc5af..fbecca5b4c 100644 --- a/zetaclient/chains/evm/observer/outbound.go +++ b/zetaclient/chains/evm/observer/outbound.go @@ -18,17 +18,17 @@ import ( erc20custodyv2 "github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/logs" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/compliance" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/logs" + clienttypes "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // WatchOutbound watches evm chain for outgoing txs status diff --git a/zetaclient/chains/evm/observer/outbound_test.go b/zetaclient/chains/evm/observer/outbound_test.go index 68b3da13ae..400f589fff 100644 --- a/zetaclient/chains/evm/observer/outbound_test.go +++ b/zetaclient/chains/evm/observer/outbound_test.go @@ -7,15 +7,15 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/rs/zerolog" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/chains/evm/observer" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.non-eth.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" ) // getContractsByChainID is a helper func to get contracts and addresses by chainID diff --git a/zetaclient/chains/evm/observer/v2_inbound.go b/zetaclient/chains/evm/observer/v2_inbound.go index 88ddcf8017..8259abf28b 100644 --- a/zetaclient/chains/evm/observer/v2_inbound.go +++ b/zetaclient/chains/evm/observer/v2_inbound.go @@ -12,15 +12,15 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/compliance" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // checkEventProcessability checks if the event is processable diff --git a/zetaclient/chains/evm/observer/v2_outbound.go b/zetaclient/chains/evm/observer/v2_outbound.go index 3ad5a33601..34da226a86 100644 --- a/zetaclient/chains/evm/observer/v2_outbound.go +++ b/zetaclient/chains/evm/observer/v2_outbound.go @@ -13,9 +13,9 @@ import ( "github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" ) // parseOutboundEventV2 parses an event from an outbound with protocol contract v2 diff --git a/zetaclient/chains/evm/rpc/rpc.go b/zetaclient/chains/evm/rpc/rpc.go index 6fcc3d007c..17f39b3a1c 100644 --- a/zetaclient/chains/evm/rpc/rpc.go +++ b/zetaclient/chains/evm/rpc/rpc.go @@ -6,7 +6,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // IsTxConfirmed checks if the transaction is confirmed with given confirmations diff --git a/zetaclient/chains/evm/rpc/rpc_live_test.go b/zetaclient/chains/evm/rpc/rpc_live_test.go index 0c420c830e..584b089d31 100644 --- a/zetaclient/chains/evm/rpc/rpc_live_test.go +++ b/zetaclient/chains/evm/rpc/rpc_live_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm/rpc" + "github.com/zeta-chain/node/zetaclient/chains/evm/rpc" "testing" ) diff --git a/zetaclient/chains/evm/signer/gas.go b/zetaclient/chains/evm/signer/gas.go index 575f004eb7..932900f46c 100644 --- a/zetaclient/chains/evm/signer/gas.go +++ b/zetaclient/chains/evm/signer/gas.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) const ( diff --git a/zetaclient/chains/evm/signer/gas_test.go b/zetaclient/chains/evm/signer/gas_test.go index d68d8c26af..5b75ad39bf 100644 --- a/zetaclient/chains/evm/signer/gas_test.go +++ b/zetaclient/chains/evm/signer/gas_test.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestGasFromCCTX(t *testing.T) { diff --git a/zetaclient/chains/evm/signer/outbound_data.go b/zetaclient/chains/evm/signer/outbound_data.go index 3af1338b6b..8315b89d94 100644 --- a/zetaclient/chains/evm/signer/outbound_data.go +++ b/zetaclient/chains/evm/signer/outbound_data.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/x/crosschain/types" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" + zctx "github.com/zeta-chain/node/zetaclient/context" ) // OutboundData is a data structure containing input fields used to construct each type of transaction. diff --git a/zetaclient/chains/evm/signer/outbound_data_test.go b/zetaclient/chains/evm/signer/outbound_data_test.go index 2f53bab028..b59b08ac46 100644 --- a/zetaclient/chains/evm/signer/outbound_data_test.go +++ b/zetaclient/chains/evm/signer/outbound_data_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/x/crosschain/types" ) func TestNewOutboundData(t *testing.T) { diff --git a/zetaclient/chains/evm/signer/outbound_tracker_reporter.go b/zetaclient/chains/evm/signer/outbound_tracker_reporter.go index 7a9b6bcfa2..d4562cee9b 100644 --- a/zetaclient/chains/evm/signer/outbound_tracker_reporter.go +++ b/zetaclient/chains/evm/signer/outbound_tracker_reporter.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm/rpc" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/logs" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/chains/evm/rpc" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/logs" ) // reportToOutboundTracker reports outboundHash to tracker only when tx receipt is available diff --git a/zetaclient/chains/evm/signer/sign.go b/zetaclient/chains/evm/signer/sign.go index b524849786..6e5c188d02 100644 --- a/zetaclient/chains/evm/signer/sign.go +++ b/zetaclient/chains/evm/signer/sign.go @@ -10,7 +10,7 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" connectorevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.base.sol" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/chains/evm" ) // SignConnectorOnReceive diff --git a/zetaclient/chains/evm/signer/sign_test.go b/zetaclient/chains/evm/signer/sign_test.go index e8fdca3f24..d3dc206341 100644 --- a/zetaclient/chains/evm/signer/sign_test.go +++ b/zetaclient/chains/evm/signer/sign_test.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" "math/big" "testing" ) diff --git a/zetaclient/chains/evm/signer/signer.go b/zetaclient/chains/evm/signer/signer.go index a25c3962f5..0f63554e8a 100644 --- a/zetaclient/chains/evm/signer/signer.go +++ b/zetaclient/chains/evm/signer/signer.go @@ -20,18 +20,18 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/logs" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/compliance" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/logs" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/zetaclient/zetacore" ) const ( diff --git a/zetaclient/chains/evm/signer/signer_admin.go b/zetaclient/chains/evm/signer/signer_admin.go index 6c6d8db2d2..07055d4170 100644 --- a/zetaclient/chains/evm/signer/signer_admin.go +++ b/zetaclient/chains/evm/signer/signer_admin.go @@ -10,7 +10,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" - "github.com/zeta-chain/zetacore/pkg/constant" + "github.com/zeta-chain/node/pkg/constant" ) // SignAdminTx signs a admin cmd transaction based on the given command diff --git a/zetaclient/chains/evm/signer/signer_admin_test.go b/zetaclient/chains/evm/signer/signer_admin_test.go index e1f45d168a..7a19df94d7 100644 --- a/zetaclient/chains/evm/signer/signer_admin_test.go +++ b/zetaclient/chains/evm/signer/signer_admin_test.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" "math/big" "testing" ) diff --git a/zetaclient/chains/evm/signer/signer_test.go b/zetaclient/chains/evm/signer/signer_test.go index 3297a301f3..b954a4624c 100644 --- a/zetaclient/chains/evm/signer/signer_test.go +++ b/zetaclient/chains/evm/signer/signer_test.go @@ -11,22 +11,22 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/rs/zerolog" "github.com/stretchr/testify/require" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/keys" - - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + observertypes "github.com/zeta-chain/node/x/observer/types" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/keys" + + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/evm/observer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) var ( diff --git a/zetaclient/chains/evm/signer/v2_signer.go b/zetaclient/chains/evm/signer/v2_signer.go index 00f9c2197d..2de0ecc9d5 100644 --- a/zetaclient/chains/evm/signer/v2_signer.go +++ b/zetaclient/chains/evm/signer/v2_signer.go @@ -6,8 +6,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" + "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" ) // SignOutboundFromCCTXV2 signs an outbound transaction from a CCTX with protocol contract v2 diff --git a/zetaclient/chains/evm/validation_test.go b/zetaclient/chains/evm/validation_test.go index 8077f8ab4e..f53c765d0a 100644 --- a/zetaclient/chains/evm/validation_test.go +++ b/zetaclient/chains/evm/validation_test.go @@ -10,9 +10,9 @@ import ( "github.com/onrik/ethrpc" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/zetaclient/chains/evm" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/zetaclient/chains/evm" + "github.com/zeta-chain/node/zetaclient/testutils" ) // the relative path to the testdata directory diff --git a/zetaclient/chains/interfaces/interfaces.go b/zetaclient/chains/interfaces/interfaces.go index f3189deee2..6767711d5a 100644 --- a/zetaclient/chains/interfaces/interfaces.go +++ b/zetaclient/chains/interfaces/interfaces.go @@ -20,13 +20,13 @@ import ( "github.com/rs/zerolog" "gitlab.com/thorchain/tss/go-tss/blame" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - keyinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + keyinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" ) type Order string diff --git a/zetaclient/chains/solana/observer/inbound.go b/zetaclient/chains/solana/observer/inbound.go index 4f2eccbd35..d9819bd53c 100644 --- a/zetaclient/chains/solana/observer/inbound.go +++ b/zetaclient/chains/solana/observer/inbound.go @@ -13,15 +13,15 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - solanacontracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - solanarpc "github.com/zeta-chain/zetacore/zetaclient/chains/solana/rpc" - "github.com/zeta-chain/zetacore/zetaclient/compliance" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + solanacontracts "github.com/zeta-chain/node/pkg/contracts/solana" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + solanarpc "github.com/zeta-chain/node/zetaclient/chains/solana/rpc" + "github.com/zeta-chain/node/zetaclient/compliance" + zctx "github.com/zeta-chain/node/zetaclient/context" + clienttypes "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) const ( diff --git a/zetaclient/chains/solana/observer/inbound_test.go b/zetaclient/chains/solana/observer/inbound_test.go index 2ead330d12..0a4738738b 100644 --- a/zetaclient/chains/solana/observer/inbound_test.go +++ b/zetaclient/chains/solana/observer/inbound_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/solana/observer" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/solana/observer" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) var ( diff --git a/zetaclient/chains/solana/observer/inbound_tracker.go b/zetaclient/chains/solana/observer/inbound_tracker.go index be5b6bf38d..70b6e9702f 100644 --- a/zetaclient/chains/solana/observer/inbound_tracker.go +++ b/zetaclient/chains/solana/observer/inbound_tracker.go @@ -8,8 +8,8 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/pkg/errors" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + zctx "github.com/zeta-chain/node/zetaclient/context" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) // WatchInboundTracker watches zetacore for Solana inbound trackers diff --git a/zetaclient/chains/solana/observer/observer.go b/zetaclient/chains/solana/observer/observer.go index ad135aeecf..721e93e1df 100644 --- a/zetaclient/chains/solana/observer/observer.go +++ b/zetaclient/chains/solana/observer/observer.go @@ -7,14 +7,14 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/pkg/chains" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/pkg/chains" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/metrics" ) var _ interfaces.ChainObserver = (*Observer)(nil) diff --git a/zetaclient/chains/solana/observer/observer_gas.go b/zetaclient/chains/solana/observer/observer_gas.go index a323da16ec..80747e2efb 100644 --- a/zetaclient/chains/solana/observer/observer_gas.go +++ b/zetaclient/chains/solana/observer/observer_gas.go @@ -7,8 +7,8 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/pkg/errors" - zetamath "github.com/zeta-chain/zetacore/pkg/math" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + zetamath "github.com/zeta-chain/node/pkg/math" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) const ( diff --git a/zetaclient/chains/solana/observer/observer_test.go b/zetaclient/chains/solana/observer/observer_test.go index 5b2576e66d..4e6ac48446 100644 --- a/zetaclient/chains/solana/observer/observer_test.go +++ b/zetaclient/chains/solana/observer/observer_test.go @@ -4,16 +4,16 @@ import ( "testing" "github.com/stretchr/testify/require" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/keys" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/keys" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/chains/solana/observer" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/solana/observer" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) // MockSolanaObserver creates a mock Solana observer with custom chain, TSS, params etc diff --git a/zetaclient/chains/solana/observer/outbound.go b/zetaclient/chains/solana/observer/outbound.go index 396e49df1c..b4f7125e45 100644 --- a/zetaclient/chains/solana/observer/outbound.go +++ b/zetaclient/chains/solana/observer/outbound.go @@ -11,15 +11,15 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/logs" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" - "github.com/zeta-chain/zetacore/zetaclient/zetacore" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/logs" + clienttypes "github.com/zeta-chain/node/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/zetacore" ) // WatchOutbound watches solana chain for outgoing txs status diff --git a/zetaclient/chains/solana/observer/outbound_test.go b/zetaclient/chains/solana/observer/outbound_test.go index 654fa8f4ee..abbcb2430b 100644 --- a/zetaclient/chains/solana/observer/outbound_test.go +++ b/zetaclient/chains/solana/observer/outbound_test.go @@ -9,16 +9,16 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/chains/solana/observer" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/solana/observer" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) const ( diff --git a/zetaclient/chains/solana/rpc/rpc.go b/zetaclient/chains/solana/rpc/rpc.go index d83846f1e1..a689ebe7c8 100644 --- a/zetaclient/chains/solana/rpc/rpc.go +++ b/zetaclient/chains/solana/rpc/rpc.go @@ -7,7 +7,7 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) const ( diff --git a/zetaclient/chains/solana/rpc/rpc_live_test.go b/zetaclient/chains/solana/rpc/rpc_live_test.go index c8455588ff..c04e13d171 100644 --- a/zetaclient/chains/solana/rpc/rpc_live_test.go +++ b/zetaclient/chains/solana/rpc/rpc_live_test.go @@ -8,7 +8,7 @@ import ( "github.com/gagliardetto/solana-go" solanarpc "github.com/gagliardetto/solana-go/rpc" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/chains/solana/rpc" + "github.com/zeta-chain/node/zetaclient/chains/solana/rpc" ) // Test_SolanaRPCLive is a phony test to run all live tests diff --git a/zetaclient/chains/solana/signer/outbound_tracker_reporter.go b/zetaclient/chains/solana/signer/outbound_tracker_reporter.go index 0a5fb6432e..74d2b7eb52 100644 --- a/zetaclient/chains/solana/signer/outbound_tracker_reporter.go +++ b/zetaclient/chains/solana/signer/outbound_tracker_reporter.go @@ -8,9 +8,9 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/logs" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/logs" ) const ( diff --git a/zetaclient/chains/solana/signer/signer.go b/zetaclient/chains/solana/signer/signer.go index 2b766a49f5..449c9495af 100644 --- a/zetaclient/chains/solana/signer/signer.go +++ b/zetaclient/chains/solana/signer/signer.go @@ -8,17 +8,17 @@ import ( "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/rpc" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" ) var _ interfaces.ChainSigner = (*Signer)(nil) diff --git a/zetaclient/chains/solana/signer/signer_test.go b/zetaclient/chains/solana/signer/signer_test.go index f3e1799d61..c27fb06f7c 100644 --- a/zetaclient/chains/solana/signer/signer_test.go +++ b/zetaclient/chains/solana/signer/signer_test.go @@ -9,16 +9,16 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/testutil/sample" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/chains/solana/signer" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/testutil/sample" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/solana/signer" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func Test_NewSigner(t *testing.T) { diff --git a/zetaclient/chains/solana/signer/withdraw.go b/zetaclient/chains/solana/signer/withdraw.go index 8b91dc8f23..03d2c03213 100644 --- a/zetaclient/chains/solana/signer/withdraw.go +++ b/zetaclient/chains/solana/signer/withdraw.go @@ -8,9 +8,9 @@ import ( "github.com/gagliardetto/solana-go/rpc" "github.com/near/borsh-go" - "github.com/zeta-chain/zetacore/pkg/chains" - contracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/chains" + contracts "github.com/zeta-chain/node/pkg/contracts/solana" + "github.com/zeta-chain/node/x/crosschain/types" ) // SignMsgWithdraw signs a withdraw message (for gateway withdraw/withdraw_spl instruction) with TSS. diff --git a/zetaclient/compliance/compliance.go b/zetaclient/compliance/compliance.go index 71bd250b9e..163cca65e4 100644 --- a/zetaclient/compliance/compliance.go +++ b/zetaclient/compliance/compliance.go @@ -7,11 +7,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/config" - clienttypes "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/config" + clienttypes "github.com/zeta-chain/node/zetaclient/types" ) // IsCctxRestricted returns true if the cctx involves restricted addresses diff --git a/zetaclient/compliance/compliance_test.go b/zetaclient/compliance/compliance_test.go index 0f587ceb20..fd86cab2ea 100644 --- a/zetaclient/compliance/compliance_test.go +++ b/zetaclient/compliance/compliance_test.go @@ -6,9 +6,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" ) func TestCctxRestricted(t *testing.T) { diff --git a/zetaclient/config/config_chain.go b/zetaclient/config/config_chain.go index 826253d71e..194346168a 100644 --- a/zetaclient/config/config_chain.go +++ b/zetaclient/config/config_chain.go @@ -3,7 +3,7 @@ package config import ( "sync" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) const ( diff --git a/zetaclient/config/types.go b/zetaclient/config/types.go index 8c85c0e7cb..4cafe0a9f7 100644 --- a/zetaclient/config/types.go +++ b/zetaclient/config/types.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) // KeyringBackend is the type of keyring backend to use for the hotkey diff --git a/zetaclient/config/types_test.go b/zetaclient/config/types_test.go index 6b83e19f17..e63684db28 100644 --- a/zetaclient/config/types_test.go +++ b/zetaclient/config/types_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) func Test_GetRelayerKeyPath(t *testing.T) { diff --git a/zetaclient/context/app.go b/zetaclient/context/app.go index e3a219f00b..8474c3ec87 100644 --- a/zetaclient/context/app.go +++ b/zetaclient/context/app.go @@ -12,9 +12,9 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - "github.com/zeta-chain/zetacore/pkg/chains" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/pkg/chains" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/config" ) // AppContext represents application (zetaclient) context. diff --git a/zetaclient/context/app_test.go b/zetaclient/context/app_test.go index d3bba4f041..c0b2fd7126 100644 --- a/zetaclient/context/app_test.go +++ b/zetaclient/context/app_test.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/config" "golang.org/x/exp/maps" ) diff --git a/zetaclient/context/chain.go b/zetaclient/context/chain.go index 4271fdb46e..946dbae598 100644 --- a/zetaclient/context/chain.go +++ b/zetaclient/context/chain.go @@ -8,8 +8,8 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - "github.com/zeta-chain/zetacore/pkg/chains" - observer "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/node/pkg/chains" + observer "github.com/zeta-chain/node/x/observer/types" ) // ChainRegistry is a registry of supported chains diff --git a/zetaclient/context/chain_test.go b/zetaclient/context/chain_test.go index 29d1ecef7c..8151b8e5eb 100644 --- a/zetaclient/context/chain_test.go +++ b/zetaclient/context/chain_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - observer "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + observer "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func TestChainRegistry(t *testing.T) { diff --git a/zetaclient/context/context_test.go b/zetaclient/context/context_test.go index d0f623a86f..ad6129157d 100644 --- a/zetaclient/context/context_test.go +++ b/zetaclient/context/context_test.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/context" ) func TestFromContext(t *testing.T) { diff --git a/zetaclient/db/db.go b/zetaclient/db/db.go index 49a3b50b3f..3e44b08069 100644 --- a/zetaclient/db/db.go +++ b/zetaclient/db/db.go @@ -11,7 +11,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/types" ) // SqliteInMemory is a special string to use in-memory database. diff --git a/zetaclient/db/db_test.go b/zetaclient/db/db_test.go index da5ab2f6ff..c736b859b9 100644 --- a/zetaclient/db/db_test.go +++ b/zetaclient/db/db_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/zetaclient/types" ) func TestNew(t *testing.T) { diff --git a/zetaclient/keys/keys.go b/zetaclient/keys/keys.go index 0fdef6c204..1049b58d7f 100644 --- a/zetaclient/keys/keys.go +++ b/zetaclient/keys/keys.go @@ -16,10 +16,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/rs/zerolog/log" - "github.com/zeta-chain/zetacore/pkg/cosmos" - zetacrypto "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" + "github.com/zeta-chain/node/pkg/cosmos" + zetacrypto "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/keys/interfaces" ) var ( diff --git a/zetaclient/keys/keys_test.go b/zetaclient/keys/keys_test.go index 6f47c673d0..0812c727f6 100644 --- a/zetaclient/keys/keys_test.go +++ b/zetaclient/keys/keys_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" . "gopkg.in/check.v1" - "github.com/zeta-chain/zetacore/cmd" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/cmd" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) type KeysSuite struct{} diff --git a/zetaclient/keys/relayer_key.go b/zetaclient/keys/relayer_key.go index 935d11ac84..c0b5ae29bc 100644 --- a/zetaclient/keys/relayer_key.go +++ b/zetaclient/keys/relayer_key.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - zetaos "github.com/zeta-chain/zetacore/pkg/os" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + zetaos "github.com/zeta-chain/node/pkg/os" ) // RelayerKey is the structure that holds the relayer private key diff --git a/zetaclient/keys/relayer_key_test.go b/zetaclient/keys/relayer_key_test.go index 08e82863d1..9336f4069d 100644 --- a/zetaclient/keys/relayer_key_test.go +++ b/zetaclient/keys/relayer_key_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/testutil/sample" - "github.com/zeta-chain/zetacore/zetaclient/keys" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/testutil/sample" + "github.com/zeta-chain/node/zetaclient/keys" ) // createRelayerKeyFile creates a relayer key file for testing diff --git a/zetaclient/maintenance/tss_listener.go b/zetaclient/maintenance/tss_listener.go index e42ead57c4..e8c71e9bae 100644 --- a/zetaclient/maintenance/tss_listener.go +++ b/zetaclient/maintenance/tss_listener.go @@ -8,10 +8,10 @@ import ( "cosmossdk.io/errors" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/pkg/retry" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/pkg/retry" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) const tssListenerTicker = 5 * time.Second diff --git a/zetaclient/metrics/metrics_test.go b/zetaclient/metrics/metrics_test.go index 239a6391c4..dff41d94c8 100644 --- a/zetaclient/metrics/metrics_test.go +++ b/zetaclient/metrics/metrics_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" . "gopkg.in/check.v1" ) diff --git a/zetaclient/metrics/telemetry.go b/zetaclient/metrics/telemetry.go index 7a2f9c9243..d0cd85b538 100644 --- a/zetaclient/metrics/telemetry.go +++ b/zetaclient/metrics/telemetry.go @@ -13,9 +13,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/constant" - "github.com/zeta-chain/zetacore/zetaclient/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/zetaclient/types" ) // TelemetryServer provides http endpoint for Tss server diff --git a/zetaclient/orchestrator/bootstap_test.go b/zetaclient/orchestrator/bootstap_test.go index bac8507f7c..0d7d27c347 100644 --- a/zetaclient/orchestrator/bootstap_test.go +++ b/zetaclient/orchestrator/bootstap_test.go @@ -7,17 +7,17 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/ptr" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" - "github.com/zeta-chain/zetacore/zetaclient/testutils/testrpc" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/ptr" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/zetaclient/testutils/testrpc" ) const solanaGatewayAddress = "2kJndCL9NBR36ySiQ4bmArs4YgWQu67LmCDfLzk5Gb7s" diff --git a/zetaclient/orchestrator/bootstrap.go b/zetaclient/orchestrator/bootstrap.go index 238652f931..9040133c35 100644 --- a/zetaclient/orchestrator/bootstrap.go +++ b/zetaclient/orchestrator/bootstrap.go @@ -9,19 +9,19 @@ import ( solrpc "github.com/gagliardetto/solana-go/rpc" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - btcobserver "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/rpc" - btcsigner "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/signer" - evmobserver "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer" - evmsigner "github.com/zeta-chain/zetacore/zetaclient/chains/evm/signer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - solbserver "github.com/zeta-chain/zetacore/zetaclient/chains/solana/observer" - solanasigner "github.com/zeta-chain/zetacore/zetaclient/chains/solana/signer" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/db" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/chains/base" + btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/bitcoin/rpc" + btcsigner "github.com/zeta-chain/node/zetaclient/chains/bitcoin/signer" + evmobserver "github.com/zeta-chain/node/zetaclient/chains/evm/observer" + evmsigner "github.com/zeta-chain/node/zetaclient/chains/evm/signer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + solbserver "github.com/zeta-chain/node/zetaclient/chains/solana/observer" + solanasigner "github.com/zeta-chain/node/zetaclient/chains/solana/signer" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/db" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/metrics" ) // btcDatabaseFilename is the Bitcoin database file name now used in mainnet, diff --git a/zetaclient/orchestrator/orchestrator.go b/zetaclient/orchestrator/orchestrator.go index 7c7df03ca8..a44f7e80c3 100644 --- a/zetaclient/orchestrator/orchestrator.go +++ b/zetaclient/orchestrator/orchestrator.go @@ -14,19 +14,19 @@ import ( "github.com/rs/zerolog" "github.com/samber/lo" - "github.com/zeta-chain/zetacore/pkg/bg" - "github.com/zeta-chain/zetacore/pkg/constant" - zetamath "github.com/zeta-chain/zetacore/pkg/math" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/base" - btcobserver "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - solanaobserver "github.com/zeta-chain/zetacore/zetaclient/chains/solana/observer" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/metrics" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" - "github.com/zeta-chain/zetacore/zetaclient/ratelimiter" + "github.com/zeta-chain/node/pkg/bg" + "github.com/zeta-chain/node/pkg/constant" + zetamath "github.com/zeta-chain/node/pkg/math" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/base" + btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + solanaobserver "github.com/zeta-chain/node/zetaclient/chains/solana/observer" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/zetaclient/ratelimiter" ) const ( diff --git a/zetaclient/orchestrator/orchestrator_test.go b/zetaclient/orchestrator/orchestrator_test.go index 21d3998a84..b15b93bb54 100644 --- a/zetaclient/orchestrator/orchestrator_test.go +++ b/zetaclient/orchestrator/orchestrator_test.go @@ -10,19 +10,19 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - solanacontracts "github.com/zeta-chain/zetacore/pkg/contracts/solana" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/testutils" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + zctx "github.com/zeta-chain/node/zetaclient/context" + + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + solanacontracts "github.com/zeta-chain/node/pkg/contracts/solana" + "github.com/zeta-chain/node/testutil/sample" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/testutils" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func Test_GetUpdatedSigner(t *testing.T) { diff --git a/zetaclient/ratelimiter/rate_limiter.go b/zetaclient/ratelimiter/rate_limiter.go index e3c69898fa..446d2b6e4a 100644 --- a/zetaclient/ratelimiter/rate_limiter.go +++ b/zetaclient/ratelimiter/rate_limiter.go @@ -5,7 +5,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // Input is the input data for the rate limiter diff --git a/zetaclient/ratelimiter/rate_limiter_test.go b/zetaclient/ratelimiter/rate_limiter_test.go index 6ac0265754..62457780a8 100644 --- a/zetaclient/ratelimiter/rate_limiter_test.go +++ b/zetaclient/ratelimiter/rate_limiter_test.go @@ -7,12 +7,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/testutil/sample" - crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/ratelimiter" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/testutil/sample" + crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/ratelimiter" ) func Test_NewInput(t *testing.T) { diff --git a/zetaclient/testdata/cctx/all_cctxs.go b/zetaclient/testdata/cctx/all_cctxs.go index efc114f962..b6eeacb6aa 100644 --- a/zetaclient/testdata/cctx/all_cctxs.go +++ b/zetaclient/testdata/cctx/all_cctxs.go @@ -1,8 +1,8 @@ package cctx import ( - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // CCtxByNonceMap maps the [chainID, nonce] to the cross chain transaction diff --git a/zetaclient/testdata/cctx/chain_1337_cctx_14.go b/zetaclient/testdata/cctx/chain_1337_cctx_14.go index 3822c07f22..634a0346a4 100644 --- a/zetaclient/testdata/cctx/chain_1337_cctx_14.go +++ b/zetaclient/testdata/cctx/chain_1337_cctx_14.go @@ -3,7 +3,7 @@ package cctx import ( sdkmath "cosmossdk.io/math" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // This cctx was generated in local e2e tests, see original json text attached at end of file diff --git a/zetaclient/testdata/cctx/chain_1_cctx_6270.go b/zetaclient/testdata/cctx/chain_1_cctx_6270.go index 1b6948d085..7692837803 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_6270.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_6270.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/1/6270 diff --git a/zetaclient/testdata/cctx/chain_1_cctx_7260.go b/zetaclient/testdata/cctx/chain_1_cctx_7260.go index 239a510fd5..7704acf0f7 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_7260.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_7260.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/1/7260 diff --git a/zetaclient/testdata/cctx/chain_1_cctx_8014.go b/zetaclient/testdata/cctx/chain_1_cctx_8014.go index eaa4067cc2..2a4901d407 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_8014.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_8014.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/1/8014 diff --git a/zetaclient/testdata/cctx/chain_1_cctx_9718.go b/zetaclient/testdata/cctx/chain_1_cctx_9718.go index af337f12a6..526518f445 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_9718.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_9718.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/1/9718 diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go index fefbc9cad9..c59632355f 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_ERC20_0x4ea69a0e2ff36f7548ab75791c3b990e076e2a4bffeb616035b239b7d33843da.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/0xd326700a1931f28853f44f8462f72588f94b1f248214d59a23c3e1b141ff5ede diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go index ef095d996d..673ff70433 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Gas_0xeaec67d5dd5d85f27b21bef83e01cbdf59154fd793ea7a22c297f7c3a722c532.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/0x0210925c7dceeff563e6e240d6d650a5f0e8fca6f5b76044a6cf106d21f27098 diff --git a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go index f655dcc508..900fb63d24 100644 --- a/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go +++ b/zetaclient/testdata/cctx/chain_1_cctx_inbound_Zeta_0xf3935200c80f98502d5edc7e871ffc40ca898e134525c42c2ae3cbc5725f9d76.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/0x477544c4b8c8be544b23328b21286125c89cd6bb5d1d6d388d91eea8ea1a6f1f diff --git a/zetaclient/testdata/cctx/chain_56_cctx_68270.go b/zetaclient/testdata/cctx/chain_56_cctx_68270.go index e492de434e..c74daef92a 100644 --- a/zetaclient/testdata/cctx/chain_56_cctx_68270.go +++ b/zetaclient/testdata/cctx/chain_56_cctx_68270.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/56/68270 diff --git a/zetaclient/testdata/cctx/chain_8332_cctx_148.go b/zetaclient/testdata/cctx/chain_8332_cctx_148.go index 258eea5a3c..f69c76cf1e 100644 --- a/zetaclient/testdata/cctx/chain_8332_cctx_148.go +++ b/zetaclient/testdata/cctx/chain_8332_cctx_148.go @@ -3,8 +3,8 @@ package cctx import ( sdkmath "cosmossdk.io/math" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" ) // https://zetachain-mainnet-archive.allthatnode.com:1317/zeta-chain/crosschain/cctx/8332/148 diff --git a/zetaclient/testutils/constant.go b/zetaclient/testutils/constant.go index a5af7f7d09..38a5aae275 100644 --- a/zetaclient/testutils/constant.go +++ b/zetaclient/testutils/constant.go @@ -3,7 +3,7 @@ package testutils import ( ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/chains" + "github.com/zeta-chain/node/pkg/chains" ) const ( diff --git a/zetaclient/testutils/mocks/btc_rpc.go b/zetaclient/testutils/mocks/btc_rpc.go index 6809de664a..b4291a8d07 100644 --- a/zetaclient/testutils/mocks/btc_rpc.go +++ b/zetaclient/testutils/mocks/btc_rpc.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // EvmClient interface diff --git a/zetaclient/testutils/mocks/chain_clients.go b/zetaclient/testutils/mocks/chain_clients.go index 0c02dff5ca..94f636bf4e 100644 --- a/zetaclient/testutils/mocks/chain_clients.go +++ b/zetaclient/testutils/mocks/chain_clients.go @@ -3,9 +3,9 @@ package mocks import ( "context" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // ---------------------------------------------------------------------------- diff --git a/zetaclient/testutils/mocks/chain_params.go b/zetaclient/testutils/mocks/chain_params.go index a23010372a..15568c6e61 100644 --- a/zetaclient/testutils/mocks/chain_params.go +++ b/zetaclient/testutils/mocks/chain_params.go @@ -8,9 +8,9 @@ import ( "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.non-eth.sol" - "github.com/zeta-chain/zetacore/pkg/constant" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/constant" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/testutils" ) func MockChainParams(chainID int64, confirmation uint64) observertypes.ChainParams { diff --git a/zetaclient/testutils/mocks/chain_signer.go b/zetaclient/testutils/mocks/chain_signer.go index cb8080a958..cc0c65457f 100644 --- a/zetaclient/testutils/mocks/chain_signer.go +++ b/zetaclient/testutils/mocks/chain_signer.go @@ -5,10 +5,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/outboundprocessor" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/outboundprocessor" ) // ---------------------------------------------------------------------------- diff --git a/zetaclient/testutils/mocks/evm_json_rpc.go b/zetaclient/testutils/mocks/evm_json_rpc.go index f3e3676e25..5199b60a84 100644 --- a/zetaclient/testutils/mocks/evm_json_rpc.go +++ b/zetaclient/testutils/mocks/evm_json_rpc.go @@ -5,7 +5,7 @@ import ( "github.com/onrik/ethrpc" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) // EvmClient interface diff --git a/zetaclient/testutils/mocks/evm_rpc.go b/zetaclient/testutils/mocks/evm_rpc.go index 5cf856e16f..d004d88b71 100644 --- a/zetaclient/testutils/mocks/evm_rpc.go +++ b/zetaclient/testutils/mocks/evm_rpc.go @@ -9,7 +9,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "golang.org/x/net/context" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" ) const EVMRPCEnabled = "MockEVMRPCEnabled" diff --git a/zetaclient/testutils/mocks/tss_signer.go b/zetaclient/testutils/mocks/tss_signer.go index b4f989aaf4..344a683256 100644 --- a/zetaclient/testutils/mocks/tss_signer.go +++ b/zetaclient/testutils/mocks/tss_signer.go @@ -11,9 +11,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/testutils" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/testutils" ) // TestPrivateKey is a random private key for testing diff --git a/zetaclient/testutils/mocks/zetacore_client.go b/zetaclient/testutils/mocks/zetacore_client.go index 5efe76aeba..864b130560 100644 --- a/zetaclient/testutils/mocks/zetacore_client.go +++ b/zetaclient/testutils/mocks/zetacore_client.go @@ -3,26 +3,26 @@ package mocks import ( - chains "github.com/zeta-chain/zetacore/pkg/chains" + chains "github.com/zeta-chain/node/pkg/chains" blame "gitlab.com/thorchain/tss/go-tss/blame" context "context" - interfaces "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" + interfaces "github.com/zeta-chain/node/zetaclient/chains/interfaces" - keysinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" + keysinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" math "cosmossdk.io/math" mock "github.com/stretchr/testify/mock" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/node/x/observer/types" - proofs "github.com/zeta-chain/zetacore/pkg/proofs" + proofs "github.com/zeta-chain/node/pkg/proofs" - types "github.com/zeta-chain/zetacore/x/crosschain/types" + types "github.com/zeta-chain/node/x/crosschain/types" zerolog "github.com/rs/zerolog" ) diff --git a/zetaclient/testutils/mocks/zetacore_client_opts.go b/zetaclient/testutils/mocks/zetacore_client_opts.go index 7e1e0c2392..503264d867 100644 --- a/zetaclient/testutils/mocks/zetacore_client_opts.go +++ b/zetaclient/testutils/mocks/zetacore_client_opts.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/mock" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - keyinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + keyinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" ) var errSomethingIsWrong = errors.New("oopsie") diff --git a/zetaclient/testutils/testdata.go b/zetaclient/testutils/testdata.go index 146a73e243..75ff5b6d2a 100644 --- a/zetaclient/testutils/testdata.go +++ b/zetaclient/testutils/testdata.go @@ -13,10 +13,10 @@ import ( "github.com/onrik/ethrpc" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/pkg/coin" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/config" - testcctx "github.com/zeta-chain/zetacore/zetaclient/testdata/cctx" + "github.com/zeta-chain/node/pkg/coin" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/config" + testcctx "github.com/zeta-chain/node/zetaclient/testdata/cctx" ) const ( diff --git a/zetaclient/testutils/testdata_naming.go b/zetaclient/testutils/testdata_naming.go index 10a705ccef..be09b0b0fa 100644 --- a/zetaclient/testutils/testdata_naming.go +++ b/zetaclient/testutils/testdata_naming.go @@ -3,7 +3,7 @@ package testutils import ( "fmt" - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/coin" ) // FileNameEVMBlock returns unified archive file name for block diff --git a/zetaclient/testutils/testrpc/rpc_btc.go b/zetaclient/testutils/testrpc/rpc_btc.go index ec43242944..059dd25621 100644 --- a/zetaclient/testutils/testrpc/rpc_btc.go +++ b/zetaclient/testutils/testrpc/rpc_btc.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) // BtcServer represents httptest for Bitcoin RPC. diff --git a/zetaclient/testutils/testrpc/rpc_solana.go b/zetaclient/testutils/testrpc/rpc_solana.go index 7487f7fb6a..c8ed5ce4cc 100644 --- a/zetaclient/testutils/testrpc/rpc_solana.go +++ b/zetaclient/testutils/testrpc/rpc_solana.go @@ -3,7 +3,7 @@ package testrpc import ( "testing" - "github.com/zeta-chain/zetacore/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/config" ) // SolanaServer represents httptest for SOL RPC. diff --git a/zetaclient/tss/concurrent_keysigns_tracker.go b/zetaclient/tss/concurrent_keysigns_tracker.go index d232dfa831..7a8f8f4b45 100644 --- a/zetaclient/tss/concurrent_keysigns_tracker.go +++ b/zetaclient/tss/concurrent_keysigns_tracker.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/zetaclient/metrics" ) // ConcurrentKeysignsTracker keeps track of concurrent keysigns performed by go-tss diff --git a/zetaclient/tss/tss_signer.go b/zetaclient/tss/tss_signer.go index 22026da5b4..2b75474e9b 100644 --- a/zetaclient/tss/tss_signer.go +++ b/zetaclient/tss/tss_signer.go @@ -28,14 +28,14 @@ import ( "gitlab.com/thorchain/tss/go-tss/tss" "gitlab.com/thorchain/tss/tss-lib/ecdsa/keygen" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/cosmos" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/metrics" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/cosmos" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/metrics" ) const ( diff --git a/zetaclient/tss/tss_signer_test.go b/zetaclient/tss/tss_signer_test.go index 5e214cf7b1..e6ffb8262f 100644 --- a/zetaclient/tss/tss_signer_test.go +++ b/zetaclient/tss/tss_signer_test.go @@ -10,9 +10,9 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/cmd" - "github.com/zeta-chain/zetacore/pkg/cosmos" - "github.com/zeta-chain/zetacore/pkg/crypto" + "github.com/zeta-chain/node/cmd" + "github.com/zeta-chain/node/pkg/cosmos" + "github.com/zeta-chain/node/pkg/crypto" ) func setupConfig() { diff --git a/zetaclient/types/event.go b/zetaclient/types/event.go index 1f498af67f..a0313236e6 100644 --- a/zetaclient/types/event.go +++ b/zetaclient/types/event.go @@ -1,7 +1,7 @@ package types import ( - "github.com/zeta-chain/zetacore/pkg/coin" + "github.com/zeta-chain/node/pkg/coin" ) // InboundEvent represents an inbound event diff --git a/zetaclient/zetacore/broadcast.go b/zetaclient/zetacore/broadcast.go index 7096f4f1e8..a1b0d4484e 100644 --- a/zetaclient/zetacore/broadcast.go +++ b/zetaclient/zetacore/broadcast.go @@ -16,10 +16,10 @@ import ( "github.com/rs/zerolog/log" flag "github.com/spf13/pflag" - "github.com/zeta-chain/zetacore/app/ante" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - "github.com/zeta-chain/zetacore/zetaclient/authz" - "github.com/zeta-chain/zetacore/zetaclient/hsm" + "github.com/zeta-chain/node/app/ante" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/zetaclient/authz" + "github.com/zeta-chain/node/zetaclient/hsm" ) // paying 50% more than the current base gas price to buffer for potential block-by-block diff --git a/zetaclient/zetacore/broadcast_test.go b/zetaclient/zetacore/broadcast_test.go index 80299c7ba5..97f335abfd 100644 --- a/zetaclient/zetacore/broadcast_test.go +++ b/zetaclient/zetacore/broadcast_test.go @@ -14,11 +14,11 @@ import ( "go.nhat.io/grpcmock" "go.nhat.io/grpcmock/planner" - "github.com/zeta-chain/zetacore/pkg/chains" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + observerTypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) func TestHandleBroadcastError(t *testing.T) { diff --git a/zetaclient/zetacore/client.go b/zetaclient/zetacore/client.go index dc5a888678..9ad91002ce 100644 --- a/zetaclient/zetacore/client.go +++ b/zetaclient/zetacore/client.go @@ -17,15 +17,15 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/pkg/authz" - "github.com/zeta-chain/zetacore/pkg/chains" - zetacore_rpc "github.com/zeta-chain/zetacore/pkg/rpc" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" - "github.com/zeta-chain/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - keyinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + zetacore_rpc "github.com/zeta-chain/node/pkg/rpc" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + keyinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" ) var _ interfaces.ZetacoreClient = &Client{} diff --git a/zetaclient/zetacore/client_cosmos.go b/zetaclient/zetacore/client_cosmos.go index 815615c3bd..fe5c3dbf1d 100644 --- a/zetaclient/zetacore/client_cosmos.go +++ b/zetaclient/zetacore/client_cosmos.go @@ -10,7 +10,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" + "github.com/zeta-chain/node/cmd/zetacored/config" ) // GetGenesisSupply returns the genesis supply. diff --git a/zetaclient/zetacore/client_monitor.go b/zetaclient/zetacore/client_monitor.go index 51d4f17168..90b720d0b9 100644 --- a/zetaclient/zetacore/client_monitor.go +++ b/zetaclient/zetacore/client_monitor.go @@ -8,8 +8,8 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/pkg/errors" - "github.com/zeta-chain/zetacore/pkg/retry" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/node/pkg/retry" + "github.com/zeta-chain/node/x/crosschain/types" ) // MonitorVoteOutboundResult monitors the result of a vote outbound tx diff --git a/zetaclient/zetacore/client_test.go b/zetaclient/zetacore/client_test.go index 723f29084d..060d96515d 100644 --- a/zetaclient/zetacore/client_test.go +++ b/zetaclient/zetacore/client_test.go @@ -15,14 +15,14 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/require" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" - keyinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" + keyinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" "go.nhat.io/grpcmock" "go.nhat.io/grpcmock/planner" - "github.com/zeta-chain/zetacore/cmd/zetacored/config" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/cmd/zetacored/config" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) const skipMethod = "skip" diff --git a/zetaclient/zetacore/client_vote.go b/zetaclient/zetacore/client_vote.go index 4883eb7677..e631923964 100644 --- a/zetaclient/zetacore/client_vote.go +++ b/zetaclient/zetacore/client_vote.go @@ -6,12 +6,12 @@ import ( "github.com/pkg/errors" "gitlab.com/thorchain/tss/go-tss/blame" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/pkg/retry" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/pkg/retry" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + zctx "github.com/zeta-chain/node/zetaclient/context" ) // PostVoteBlockHeader posts a vote on an observed block header diff --git a/zetaclient/zetacore/client_worker.go b/zetaclient/zetacore/client_worker.go index fcf02766a0..c5dcaa248d 100644 --- a/zetaclient/zetacore/client_worker.go +++ b/zetaclient/zetacore/client_worker.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" - appcontext "github.com/zeta-chain/zetacore/zetaclient/context" + appcontext "github.com/zeta-chain/node/zetaclient/context" ) var logSampler = &zerolog.BasicSampler{N: 10} diff --git a/zetaclient/zetacore/tx.go b/zetaclient/zetacore/tx.go index 2d63f4a3fd..64379bad2a 100644 --- a/zetaclient/zetacore/tx.go +++ b/zetaclient/zetacore/tx.go @@ -9,12 +9,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/proofs" - "github.com/zeta-chain/zetacore/x/crosschain/types" - clientauthz "github.com/zeta-chain/zetacore/zetaclient/authz" - clientcommon "github.com/zeta-chain/zetacore/zetaclient/common" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/crosschain/types" + clientauthz "github.com/zeta-chain/node/zetaclient/authz" + clientcommon "github.com/zeta-chain/node/zetaclient/common" ) // GetInboundVoteMessage returns a new MsgVoteInbound diff --git a/zetaclient/zetacore/tx_test.go b/zetaclient/zetacore/tx_test.go index a87ed8404e..b58981f67b 100644 --- a/zetaclient/zetacore/tx_test.go +++ b/zetaclient/zetacore/tx_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/zeta-chain/zetacore/testutil/sample" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" + "github.com/zeta-chain/node/testutil/sample" + authoritytypes "github.com/zeta-chain/node/x/authority/types" "cosmossdk.io/math" sdktypes "github.com/cosmos/cosmos-sdk/types" @@ -19,20 +19,20 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" + zctx "github.com/zeta-chain/node/zetaclient/context" "gitlab.com/thorchain/tss/go-tss/blame" "go.nhat.io/grpcmock" "go.nhat.io/grpcmock/planner" - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/pkg/coin" - "github.com/zeta-chain/zetacore/pkg/proofs" - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types" - observertypes "github.com/zeta-chain/zetacore/x/observer/types" - "github.com/zeta-chain/zetacore/zetaclient/config" - "github.com/zeta-chain/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/pkg/proofs" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + lightclienttypes "github.com/zeta-chain/node/x/lightclient/types" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/config" + "github.com/zeta-chain/node/zetaclient/keys" + "github.com/zeta-chain/node/zetaclient/testutils/mocks" ) const (