From f0158da121619a114a27293cb4f82d7426d69bc0 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Thu, 29 Aug 2024 10:29:27 -0700 Subject: [PATCH] chore: use github.com/zeta-chain/node import path --- app/ante/ante.go | 5 +- app/ante/ante_test.go | 10 ++-- app/ante/handler_options.go | 3 +- app/ante/system_tx_priority_decorator_test.go | 6 +-- app/ante/vesting_test.go | 6 +-- app/app.go | 47 +++++++++---------- app/init_genesis.go | 13 +++-- app/prefix.go | 3 +- app/setup_handlers.go | 9 ++-- app/upgrade_tracker_test.go | 4 +- cmd/zetaclientd-supervisor/lib.go | 3 +- cmd/zetaclientd-supervisor/main.go | 7 ++- cmd/zetaclientd/debug.go | 17 ++++--- cmd/zetaclientd/encrypt_tss.go | 3 +- cmd/zetaclientd/hsm.go | 7 ++- cmd/zetaclientd/import_relayer_keys.go | 9 ++-- cmd/zetaclientd/init.go | 5 +- cmd/zetaclientd/keygen_tss.go | 15 +++--- cmd/zetaclientd/main.go | 5 +- cmd/zetaclientd/p2p_diagnostics.go | 7 ++- cmd/zetaclientd/start.go | 27 +++++------ cmd/zetaclientd/start_utils.go | 3 +- cmd/zetaclientd/utils.go | 9 ++-- cmd/zetaclientd/version.go | 3 +- cmd/zetacore_utils/main.go | 3 +- cmd/zetacored/add_observer_list.go | 11 ++--- cmd/zetacored/collect_observer_info.go | 3 +- cmd/zetacored/flags_test.go | 2 +- cmd/zetacored/get_pubkey.go | 5 +- cmd/zetacored/main.go | 5 +- cmd/zetacored/parse_genesis.go | 11 ++--- cmd/zetacored/parse_genesis_test.go | 14 +++--- cmd/zetacored/parsers_test.go | 4 +- cmd/zetacored/root.go | 11 ++--- cmd/zetae2e/balances.go | 9 ++-- cmd/zetae2e/bitcoin_address.go | 9 ++-- cmd/zetae2e/config/clients.go | 13 +++-- cmd/zetae2e/config/config.go | 4 +- cmd/zetae2e/config/config_test.go | 2 +- cmd/zetae2e/config/contracts.go | 13 +++-- cmd/zetae2e/init.go | 5 +- cmd/zetae2e/list_tests.go | 5 +- cmd/zetae2e/local/admin.go | 7 ++- cmd/zetae2e/local/bitcoin.go | 7 ++- cmd/zetae2e/local/config.go | 5 +- cmd/zetae2e/local/erc20.go | 7 ++- cmd/zetae2e/local/ethereum.go | 7 ++- cmd/zetae2e/local/local.go | 21 ++++----- cmd/zetae2e/local/migration.go | 7 ++- cmd/zetae2e/local/misc.go | 7 ++- cmd/zetae2e/local/monitor_priority_txs.go | 3 +- cmd/zetae2e/local/performance.go | 7 ++- cmd/zetae2e/local/precompiles.go | 7 ++- cmd/zetae2e/local/solana.go | 7 ++- cmd/zetae2e/local/test_runner.go | 6 +-- cmd/zetae2e/local/tss_migration.go | 9 ++-- cmd/zetae2e/local/v2.go | 7 ++- cmd/zetae2e/local/zeta.go | 7 ++- cmd/zetae2e/local/zevm_mp.go | 7 ++- cmd/zetae2e/root.go | 3 +- cmd/zetae2e/run.go | 11 ++--- cmd/zetae2e/setup_bitcoin.go | 9 ++-- cmd/zetae2e/show_tss.go | 9 ++-- cmd/zetae2e/stress.go | 15 +++--- cmd/zetatool/filterdeposit/btc.go | 5 +- cmd/zetatool/filterdeposit/evm.go | 7 ++- cmd/zetatool/filterdeposit/filterdeposit.go | 5 +- .../filterdeposit/filterdeposit_test.go | 6 +-- cmd/zetatool/main.go | 5 +- docs/main.go | 3 +- e2e/e2etests/e2etests.go | 2 +- e2e/e2etests/helpers.go | 9 ++-- e2e/e2etests/test_admin_transactions.go | 15 +++--- e2e/e2etests/test_bitcoin_deposit.go | 7 ++- e2e/e2etests/test_bitcoin_deposit_refund.go | 9 ++-- .../test_bitcoin_withdraw_invalid_address.go | 5 +- e2e/e2etests/test_bitcoin_withdraw_legacy.go | 3 +- .../test_bitcoin_withdraw_multiple.go | 5 +- e2e/e2etests/test_bitcoin_withdraw_p2sh.go | 3 +- e2e/e2etests/test_bitcoin_withdraw_p2wsh.go | 3 +- ...est_bitcoin_withdraw_restricted_address.go | 7 ++- e2e/e2etests/test_bitcoin_withdraw_segwit.go | 3 +- e2e/e2etests/test_bitcoin_withdraw_taproot.go | 5 +- e2e/e2etests/test_context_upgrade.go | 5 +- e2e/e2etests/test_crosschain_swap.go | 7 ++- e2e/e2etests/test_deploy_contract.go | 7 ++- e2e/e2etests/test_donation.go | 7 ++- e2e/e2etests/test_erc20_deposit.go | 5 +- e2e/e2etests/test_erc20_deposit_refund.go | 7 ++- .../test_erc20_deposit_restricted_address.go | 5 +- e2e/e2etests/test_erc20_multiple_deposits.go | 7 ++- e2e/e2etests/test_erc20_multiple_withdraws.go | 7 ++- e2e/e2etests/test_erc20_withdraw.go | 5 +- e2e/e2etests/test_eth_deposit.go | 5 +- e2e/e2etests/test_eth_deposit_call.go | 9 ++-- .../test_eth_deposit_liquidity_cap.go | 9 ++-- e2e/e2etests/test_eth_deposit_refund.go | 7 ++- e2e/e2etests/test_eth_withdraw.go | 7 ++- .../test_eth_withdraw_restricted_address.go | 9 ++-- .../test_message_passing_evm_to_zevm.go | 9 ++-- ...test_message_passing_evm_to_zevm_revert.go | 9 ++-- ...message_passing_evm_to_zevm_revert_fail.go | 9 ++-- .../test_message_passing_external_chains.go | 7 ++- ..._message_passing_external_chains_revert.go | 9 ++-- ...age_passing_external_chains_revert_fail.go | 7 ++- .../test_message_passing_zevm_to_evm.go | 9 ++-- ...test_message_passing_zevm_to_evm_revert.go | 9 ++-- ...message_passing_zevm_to_evm_revert_fail.go | 9 ++-- e2e/e2etests/test_migrate_chain_support.go | 19 ++++---- .../test_migrate_erc20_custody_funds.go | 11 ++--- e2e/e2etests/test_migrate_tss.go | 13 +++-- e2e/e2etests/test_mytest.go | 2 +- .../test_operation_add_liquidity_erc20.go | 3 +- .../test_operation_add_liquidity_eth.go | 3 +- e2e/e2etests/test_pause_erc20_custody.go | 9 ++-- e2e/e2etests/test_pause_zrc20.go | 13 +++-- e2e/e2etests/test_precompiles_prototype.go | 5 +- e2e/e2etests/test_rate_limiter.go | 7 ++- e2e/e2etests/test_solana_deposit.go | 7 ++- e2e/e2etests/test_solana_deposit_call.go | 9 ++-- e2e/e2etests/test_solana_deposit_refund.go | 9 ++-- e2e/e2etests/test_solana_withdraw.go | 3 +- e2e/e2etests/test_stress_btc_deposit.go | 7 ++- e2e/e2etests/test_stress_btc_withdraw.go | 7 ++- e2e/e2etests/test_stress_eth_deposit.go | 7 ++- e2e/e2etests/test_stress_eth_withdraw.go | 7 ++- .../test_update_bytecode_connector.go | 11 ++--- e2e/e2etests/test_update_bytecode_zrc20.go | 13 +++-- e2e/e2etests/test_v2_erc20_deposit.go | 7 ++- .../test_v2_erc20_deposit_and_call.go | 7 ++- .../test_v2_erc20_deposit_and_call_revert.go | 9 ++-- ...erc20_deposit_and_call_revert_with_call.go | 7 ++- e2e/e2etests/test_v2_erc20_withdraw.go | 7 ++- .../test_v2_erc20_withdraw_and_call.go | 7 ++- .../test_v2_erc20_withdraw_and_call_revert.go | 9 ++-- ...rc20_withdraw_and_call_revert_with_call.go | 7 ++- e2e/e2etests/test_v2_eth_deposit.go | 7 ++- e2e/e2etests/test_v2_eth_deposit_and_call.go | 7 ++- .../test_v2_eth_deposit_and_call_revert.go | 9 ++-- ...2_eth_deposit_and_call_revert_with_call.go | 7 ++- e2e/e2etests/test_v2_eth_withdraw.go | 7 ++- e2e/e2etests/test_v2_eth_withdraw_and_call.go | 7 ++- .../test_v2_eth_withdraw_and_call_revert.go | 9 ++-- ..._eth_withdraw_and_call_revert_with_call.go | 7 ++- e2e/e2etests/test_v2_evm_to_zevm_call.go | 7 ++- e2e/e2etests/test_v2_zevm_to_evm_call.go | 7 ++- e2e/e2etests/test_whitelist_erc20.go | 13 +++-- e2e/e2etests/test_zeta_deposit.go | 5 +- e2e/e2etests/test_zeta_deposit_new_address.go | 7 ++- .../test_zeta_deposit_restricted_address.go | 5 +- e2e/e2etests/test_zeta_withdraw.go | 7 ++- .../test_zeta_withdraw_bitcoin_revert.go | 7 ++- e2e/e2etests/test_zrc20_swap.go | 5 +- e2e/runner/accounting.go | 5 +- e2e/runner/admin_evm.go | 3 +- e2e/runner/bitcoin.go | 15 +++--- e2e/runner/evm.go | 3 +- e2e/runner/liquidity.go | 3 +- e2e/runner/logger.go | 3 +- e2e/runner/report.go | 7 ++- e2e/runner/runner.go | 25 +++++----- e2e/runner/setup_evm.go | 15 +++--- e2e/runner/setup_solana.go | 5 +- e2e/runner/setup_zeta.go | 17 ++++--- e2e/runner/solana.go | 7 ++- e2e/runner/testdapp.go | 3 +- e2e/runner/trackers.go | 3 +- e2e/runner/v2_evm.go | 3 +- e2e/runner/v2_setup_evm.go | 9 ++-- e2e/runner/v2_setup_zeta.go | 9 ++-- e2e/runner/zeta.go | 7 ++- e2e/txserver/zeta_tx_server.go | 21 ++++----- e2e/utils/contracts.go | 3 +- e2e/utils/require.go | 3 +- e2e/utils/zetacore.go | 3 +- go.mod | 2 +- go.sum | 11 +++++ pkg/chains/chain_filters_test.go | 2 +- pkg/chains/chain_test.go | 4 +- pkg/chains/chains_test.go | 4 +- pkg/chains/status_test.go | 2 +- pkg/contracts/solana/gateway_message_test.go | 4 +- pkg/contracts/solana/instruction_test.go | 2 +- pkg/crypto/address.go | 3 +- pkg/crypto/address_test.go | 2 +- pkg/crypto/aes256_gcm_test.go | 2 +- pkg/crypto/privkey_test.go | 2 +- pkg/crypto/pubkey.go | 5 +- pkg/crypto/pubkey_test.go | 4 +- pkg/crypto/tss.go | 3 +- pkg/crypto/tss_test.go | 2 +- pkg/mempool/custom_proposal_handler_test.go | 2 +- pkg/mempool/priority_nonce_mempool_test.go | 4 +- pkg/os/console_test.go | 2 +- pkg/os/path_test.go | 4 +- pkg/proofs/bitcoin/proof_test.go | 2 +- pkg/proofs/ethereum/proof_test.go | 2 +- pkg/proofs/headers.go | 5 +- pkg/proofs/headers_test.go | 2 +- pkg/proofs/proof.go | 5 +- pkg/proofs/proof_test.go | 6 +-- pkg/proofs/proofs.pb.go | 4 +- precompiles/precompiles.go | 5 +- precompiles/precompiles_test.go | 2 +- precompiles/prototype/prototype.go | 5 +- precompiles/prototype/prototype_test.go | 4 +- rpc/apis.go | 19 ++++---- rpc/backend/account_info.go | 3 +- rpc/backend/account_info_test.go | 4 +- rpc/backend/backend.go | 5 +- rpc/backend/backend_suite_test.go | 4 +- rpc/backend/blocks.go | 3 +- rpc/backend/blocks_test.go | 6 +-- rpc/backend/call_tx.go | 3 +- rpc/backend/call_tx_test.go | 4 +- rpc/backend/chain_info.go | 3 +- rpc/backend/chain_info_test.go | 4 +- rpc/backend/client_test.go | 4 +- rpc/backend/evm_query_client_test.go | 4 +- rpc/backend/feemarket_query_client_test.go | 4 +- rpc/backend/filters_test.go | 4 +- rpc/backend/node_info.go | 3 +- rpc/backend/node_info_test.go | 2 +- rpc/backend/sign_tx_test.go | 2 +- rpc/backend/tracing.go | 3 +- rpc/backend/tracing_test.go | 2 +- rpc/backend/tx_info.go | 3 +- rpc/backend/tx_info_test.go | 6 +-- rpc/backend/utils.go | 3 +- rpc/namespaces/ethereum/debug/api.go | 7 ++- rpc/namespaces/ethereum/debug/trace.go | 3 +- rpc/namespaces/ethereum/debug/utils.go | 3 +- rpc/namespaces/ethereum/eth/api.go | 5 +- rpc/namespaces/ethereum/eth/filters/api.go | 3 +- .../ethereum/eth/filters/filter_system.go | 3 +- .../ethereum/eth/filters/filters.go | 5 +- rpc/namespaces/ethereum/miner/api.go | 3 +- rpc/namespaces/ethereum/personal/api.go | 3 +- rpc/namespaces/ethereum/txpool/api.go | 3 +- rpc/namespaces/ethereum/web3/api.go | 3 +- rpc/websockets.go | 9 ++-- server/json_rpc.go | 5 +- server/start.go | 7 ++- server/util.go | 3 +- testutil/keeper/authority.go | 9 ++-- testutil/keeper/codec.go | 9 ++-- testutil/keeper/config.go | 13 +++-- testutil/keeper/crosschain.go | 29 ++++++------ testutil/keeper/emissions.go | 7 ++- testutil/keeper/fungible.go | 23 +++++---- testutil/keeper/ibccrosschain.go | 7 ++- testutil/keeper/keeper.go | 45 +++++++++--------- testutil/keeper/lightclient.go | 7 ++- testutil/keeper/mocks/crosschain/authority.go | 2 +- testutil/keeper/mocks/crosschain/fungible.go | 6 +-- .../keeper/mocks/crosschain/lightclient.go | 2 +- testutil/keeper/mocks/crosschain/observer.go | 6 +-- testutil/keeper/mocks/emissions/observer.go | 2 +- testutil/keeper/mocks/fungible/authority.go | 2 +- testutil/keeper/mocks/fungible/observer.go | 2 +- .../keeper/mocks/lightclient/authority.go | 2 +- testutil/keeper/mocks/mocks.go | 12 ++--- testutil/keeper/mocks/observer/authority.go | 4 +- testutil/keeper/mocks/observer/lightclient.go | 2 +- testutil/keeper/observer.go | 7 ++- testutil/network/genesis_state.go | 15 +++--- testutil/network/network_setup.go | 3 +- testutil/sample/authority.go | 5 +- testutil/sample/crosschain.go | 7 ++- testutil/sample/crypto.go | 5 +- testutil/sample/emissions.go | 3 +- testutil/sample/fungible.go | 6 +-- testutil/sample/lightclient.go | 11 ++--- testutil/sample/observer.go | 9 ++-- testutil/sample/sample.go | 5 +- testutil/sample/zetaclient.go | 4 +- testutil/simapp/simapp.go | 7 ++- x/authority/client/cli/query.go | 3 +- .../client/cli/query_authorization_list.go | 3 +- x/authority/client/cli/query_chain_info.go | 3 +- x/authority/client/cli/query_policies.go | 3 +- x/authority/client/cli/tx.go | 3 +- .../client/cli/tx_add_authorization.go | 3 +- .../client/cli/tx_add_authorizations_test.go | 4 +- .../client/cli/tx_remove_authorization.go | 3 +- .../client/cli/tx_update_chain_info.go | 3 +- .../client/cli/tx_update_chain_info_test.go | 6 +-- x/authority/client/cli/tx_update_policies.go | 3 +- .../client/cli/tx_update_policies_test.go | 6 +-- x/authority/genesis.go | 5 +- x/authority/genesis_test.go | 10 ++-- x/authority/keeper/authorization_list.go | 3 +- x/authority/keeper/authorization_list_test.go | 8 ++-- x/authority/keeper/chain_info.go | 5 +- x/authority/keeper/chain_info_test.go | 4 +- x/authority/keeper/grpc_query.go | 2 +- .../keeper/grpc_query_authorization_list.go | 3 +- .../grpc_query_authothorization_list_test.go | 6 +-- x/authority/keeper/grpc_query_chain_info.go | 5 +- .../keeper/grpc_query_chain_info_test.go | 8 ++-- x/authority/keeper/grpc_query_policies.go | 3 +- .../keeper/grpc_query_policies_test.go | 6 +-- x/authority/keeper/keeper.go | 3 +- x/authority/keeper/migrator.go | 3 +- x/authority/keeper/msg_server.go | 2 +- .../keeper/msg_server_add_authorization.go | 3 +- .../msg_server_add_authorization_test.go | 8 ++-- .../keeper/msg_server_remove_authorization.go | 3 +- .../msg_server_remove_authorization_test.go | 8 ++-- .../keeper/msg_server_update_chain_info.go | 3 +- .../msg_server_update_chain_info_test.go | 8 ++-- .../keeper/msg_server_update_policies.go | 3 +- .../keeper/msg_server_update_policies_test.go | 8 ++-- x/authority/keeper/policies.go | 3 +- x/authority/keeper/policies_test.go | 4 +- x/authority/migrations/v2/migrate.go | 3 +- x/authority/migrations/v2/migrate_test.go | 6 +-- x/authority/module.go | 7 ++- x/authority/types/authorization_list_test.go | 10 ++-- x/authority/types/chain_info.go | 2 +- x/authority/types/chain_info.pb.go | 2 +- x/authority/types/chain_info_test.go | 6 +-- x/authority/types/genesis_test.go | 6 +-- .../types/message_add_authorizations_test.go | 4 +- .../message_remove_authorizations_test.go | 4 +- .../types/message_update_chain_info_test.go | 6 +-- .../types/message_update_policies_test.go | 4 +- x/authority/types/policies_test.go | 6 +-- x/authority/types/policy_type_test.go | 2 +- x/crosschain/client/cli/cli_gas_price.go | 3 +- .../client/cli/cli_last_block_height.go | 3 +- x/crosschain/client/cli/cli_refund_aborted.go | 3 +- x/crosschain/client/cli/cli_tss.go | 3 +- .../client/cli/cli_whitelist_erc20.go | 3 +- x/crosschain/client/cli/cli_zeta_height.go | 3 +- x/crosschain/client/cli/query.go | 3 +- x/crosschain/client/cli/query_cctx.go | 3 +- .../client/cli/query_cctx_rate_limit.go | 3 +- .../client/cli/query_inbound_hash_to_cctx.go | 3 +- .../client/cli/query_inbound_tracker.go | 3 +- .../client/cli/query_outbound_tracker.go | 3 +- .../client/cli/query_rate_limiter_flags.go | 3 +- .../client/cli/query_zeta_accounting.go | 3 +- x/crosschain/client/cli/tx.go | 3 +- .../client/cli/tx_add_inbound_tracker.go | 5 +- .../client/cli/tx_add_outbound_tracker.go | 3 +- .../client/cli/tx_remove_outbound_tracker.go | 3 +- x/crosschain/client/cli/tx_vote_inbound.go | 5 +- x/crosschain/client/cli/tx_vote_outbound.go | 7 ++- x/crosschain/client/cli/tx_vote_stuck_cctx.go | 3 +- x/crosschain/genesis.go | 5 +- x/crosschain/genesis_test.go | 10 ++-- x/crosschain/keeper/abci.go | 9 ++-- x/crosschain/keeper/abci_test.go | 12 ++--- x/crosschain/keeper/cctx.go | 7 ++- x/crosschain/keeper/cctx_gateway_observers.go | 5 +- x/crosschain/keeper/cctx_gateway_zevm.go | 3 +- x/crosschain/keeper/cctx_gateways.go | 5 +- .../cctx_orchestrator_validate_inbound.go | 9 ++-- ...cctx_orchestrator_validate_inbound_test.go | 14 +++--- .../cctx_orchestrator_validate_outbound.go | 11 ++--- ...ctx_orchestrator_validate_outbound_test.go | 16 +++---- x/crosschain/keeper/cctx_test.go | 10 ++-- x/crosschain/keeper/cctx_utils.go | 9 ++-- x/crosschain/keeper/cctx_utils_test.go | 18 +++---- x/crosschain/keeper/events.go | 3 +- x/crosschain/keeper/evm_deposit.go | 9 ++-- x/crosschain/keeper/evm_deposit_test.go | 10 ++-- x/crosschain/keeper/evm_hooks.go | 17 ++++--- x/crosschain/keeper/evm_hooks_test.go | 18 +++---- x/crosschain/keeper/finalized_inbounds.go | 3 +- .../keeper/finalized_inbounds_test.go | 6 +-- x/crosschain/keeper/foreign_coins.go | 3 +- x/crosschain/keeper/foreign_coins_test.go | 4 +- x/crosschain/keeper/gas_payment.go | 11 ++--- x/crosschain/keeper/gas_payment_test.go | 14 +++--- x/crosschain/keeper/gas_price.go | 5 +- x/crosschain/keeper/gas_price_test.go | 6 +-- x/crosschain/keeper/grpc_query.go | 2 +- x/crosschain/keeper/grpc_query_cctx.go | 5 +- .../keeper/grpc_query_cctx_rate_limit.go | 7 ++- .../keeper/grpc_query_cctx_rate_limit_test.go | 14 +++--- x/crosschain/keeper/grpc_query_cctx_test.go | 10 ++-- x/crosschain/keeper/grpc_query_gas_price.go | 3 +- .../keeper/grpc_query_gas_price_test.go | 4 +- .../keeper/grpc_query_inbound_hash_to_cctx.go | 3 +- .../grpc_query_inbound_hash_to_cctx_test.go | 10 ++-- .../keeper/grpc_query_inbound_tracker.go | 3 +- .../keeper/grpc_query_inbound_tracker_test.go | 10 ++-- .../keeper/grpc_query_last_block_height.go | 3 +- .../grpc_query_last_block_height_test.go | 4 +- .../keeper/grpc_query_last_zeta_height.go | 3 +- .../grpc_query_last_zeta_height_test.go | 4 +- x/crosschain/keeper/grpc_query_legacy.go | 2 +- .../keeper/grpc_query_outbound_tracker.go | 3 +- .../grpc_query_outbound_tracker_test.go | 4 +- .../keeper/grpc_query_rate_limiter_flags.go | 3 +- .../grpc_query_rate_limiter_flags_test.go | 6 +-- .../keeper/grpc_query_zeta_conversion_rate.go | 7 ++- .../grpc_query_zeta_conversion_rate_test.go | 6 +-- x/crosschain/keeper/inbound_hash_to_cctx.go | 3 +- .../keeper/inbound_hash_to_cctx_test.go | 8 ++-- x/crosschain/keeper/inbound_tracker.go | 3 +- x/crosschain/keeper/inbound_tracker_test.go | 10 ++-- x/crosschain/keeper/initiate_outbound.go | 5 +- x/crosschain/keeper/initiate_outbound_test.go | 16 +++---- x/crosschain/keeper/keeper.go | 3 +- x/crosschain/keeper/last_block_height.go | 3 +- x/crosschain/keeper/last_block_height_test.go | 6 +-- x/crosschain/keeper/migrator.go | 9 ++-- x/crosschain/keeper/msg_server.go | 2 +- .../keeper/msg_server_abort_stuck_cctx.go | 5 +- .../msg_server_abort_stuck_cctx_test.go | 10 ++-- .../keeper/msg_server_add_inbound_tracker.go | 7 ++- .../msg_server_add_inbound_tracker_test.go | 18 +++---- .../keeper/msg_server_add_outbound_tracker.go | 9 ++-- .../msg_server_add_outbound_tracker_test.go | 16 +++---- .../msg_server_migrate_erc20_custody_funds.go | 5 +- ...server_migrate_erc20_custody_funds_test.go | 16 +++---- .../keeper/msg_server_migrate_tss_funds.go | 7 ++- .../msg_server_migrate_tss_funds_test.go | 16 +++---- .../keeper/msg_server_refund_aborted_tx.go | 7 ++- .../msg_server_refund_aborted_tx_test.go | 18 +++---- .../msg_server_remove_outbound_tracker.go | 5 +- ...msg_server_remove_outbound_tracker_test.go | 10 ++-- ...erver_update_erc20_custody_pause_status.go | 5 +- ..._update_erc20_custody_pause_status_test.go | 16 +++---- .../msg_server_update_rate_limiter_flags.go | 5 +- ...g_server_update_rate_limiter_flags_test.go | 10 ++-- x/crosschain/keeper/msg_server_update_tss.go | 7 ++- .../keeper/msg_server_update_tss_test.go | 16 +++---- .../keeper/msg_server_vote_gas_price.go | 7 ++- .../keeper/msg_server_vote_gas_price_test.go | 10 ++-- .../keeper/msg_server_vote_inbound_tx.go | 3 +- .../keeper/msg_server_vote_inbound_tx_test.go | 14 +++--- .../keeper/msg_server_vote_outbound_tx.go | 5 +- .../msg_server_vote_outbound_tx_test.go | 14 +++--- .../keeper/msg_server_whitelist_erc20.go | 9 ++-- .../keeper/msg_server_whitelist_erc20_test.go | 14 +++--- x/crosschain/keeper/outbound_tracker.go | 3 +- x/crosschain/keeper/outbound_tracker_test.go | 8 ++-- x/crosschain/keeper/rate_limiter_flags.go | 3 +- .../keeper/rate_limiter_flags_test.go | 12 ++--- x/crosschain/keeper/refund.go | 7 ++- x/crosschain/keeper/refund_test.go | 12 ++--- x/crosschain/keeper/utils_test.go | 18 +++---- x/crosschain/keeper/v2_zevm_inbound.go | 11 ++--- x/crosschain/keeper/zeta_accounting.go | 3 +- x/crosschain/keeper/zeta_accounting_test.go | 4 +- x/crosschain/migrations/v2/migrate.go | 5 +- x/crosschain/migrations/v3/migrate.go | 5 +- x/crosschain/migrations/v4/migrate.go | 9 ++-- x/crosschain/migrations/v4/migrate_test.go | 16 +++---- x/crosschain/migrations/v5/migrate.go | 7 ++- x/crosschain/migrations/v5/migrate_test.go | 16 +++---- x/crosschain/module.go | 7 ++- x/crosschain/module_simulation.go | 3 +- x/crosschain/types/authz.go | 3 +- x/crosschain/types/authz_test.go | 2 +- x/crosschain/types/cctx.go | 3 +- x/crosschain/types/cctx_test.go | 12 ++--- x/crosschain/types/cmd_cctxs.go | 11 ++--- x/crosschain/types/cmd_cctxs_test.go | 12 ++--- x/crosschain/types/cross_chain_tx.pb.go | 2 +- x/crosschain/types/expected_keepers.go | 11 ++--- x/crosschain/types/genesis_test.go | 4 +- x/crosschain/types/inbound_params_test.go | 2 +- x/crosschain/types/inbound_tracker.pb.go | 2 +- .../types/message_abort_stuck_cctx_test.go | 4 +- .../types/message_add_inbound_tracker.go | 3 +- .../types/message_add_inbound_tracker_test.go | 8 ++-- .../types/message_add_outbound_tracker.go | 3 +- .../message_add_outbound_tracker_test.go | 4 +- ...essage_migrate_erc20_custody_funds_test.go | 8 ++-- .../types/message_migrate_tss_funds_test.go | 8 ++-- .../types/message_refund_aborted_test.go | 4 +- .../message_remove_outbound_tracker_test.go | 4 +- ..._update_erc20_custody_pause_status_test.go | 8 ++-- .../message_update_rate_limiter_flags_test.go | 4 +- .../types/message_update_tss_address.go | 3 +- .../types/message_update_tss_address_test.go | 6 +-- x/crosschain/types/message_vote_gas_price.go | 3 +- .../types/message_vote_gas_price_test.go | 6 +-- x/crosschain/types/message_vote_inbound.go | 5 +- .../types/message_vote_inbound_test.go | 8 ++-- x/crosschain/types/message_vote_outbound.go | 7 ++- .../types/message_vote_outbound_test.go | 10 ++-- x/crosschain/types/message_whitelist_erc20.go | 3 +- .../types/message_whitelist_erc20_test.go | 6 +-- x/crosschain/types/outbound_params_test.go | 2 +- x/crosschain/types/rate_limiter_flags.go | 3 +- x/crosschain/types/rate_limiter_flags.pb.go | 2 +- x/crosschain/types/rate_limiter_flags_test.go | 8 ++-- x/crosschain/types/revert_options.go | 3 +- x/crosschain/types/revert_options_test.go | 6 +-- x/crosschain/types/status_test.go | 2 +- x/crosschain/types/tx.pb.go | 6 +-- x/crosschain/types/tx_body_verification.go | 7 ++- .../types/tx_body_verification_test.go | 10 ++-- x/crosschain/types/validate.go | 3 +- x/crosschain/types/validate_test.go | 6 +-- x/emissions/abci.go | 7 ++- x/emissions/abci_test.go | 14 +++--- x/emissions/client/cli/query.go | 3 +- .../client/cli/query_get_emmisons_factors.go | 3 +- x/emissions/client/cli/query_list_balances.go | 3 +- x/emissions/client/cli/query_params.go | 3 +- .../cli/query_show_available_emissions.go | 3 +- x/emissions/client/cli/tx.go | 3 +- .../client/cli/tx_withdraw_emissions..go | 3 +- x/emissions/genesis.go | 5 +- x/emissions/genesis_test.go | 10 ++-- .../keeper/block_rewards_components.go | 7 ++- .../keeper/block_rewards_components_test.go | 8 ++-- x/emissions/keeper/grpc_query.go | 2 +- .../keeper/grpc_query_get_emmisons_factors.go | 3 +- .../grpc_query_get_emmisons_factors_test.go | 4 +- .../keeper/grpc_query_list_balances.go | 3 +- .../keeper/grpc_query_list_balances_test.go | 4 +- x/emissions/keeper/grpc_query_params.go | 3 +- .../grpc_query_show_available_emissions.go | 5 +- ...rpc_query_show_available_emissions_test.go | 8 ++-- x/emissions/keeper/keeper.go | 3 +- x/emissions/keeper/migrator.go | 5 +- x/emissions/keeper/msg_server.go | 2 +- .../keeper/msg_server_update_params.go | 3 +- .../keeper/msg_server_update_params_test.go | 8 ++-- .../keeper/msg_server_withdraw_emissions.go | 5 +- .../msg_server_withdraw_emissions_test.go | 10 ++-- x/emissions/keeper/params.go | 3 +- x/emissions/keeper/params_test.go | 4 +- x/emissions/keeper/withdrawable_emissions.go | 3 +- .../keeper/withdrawable_emissions_test.go | 6 +-- x/emissions/migrations/v3/migrate.go | 5 +- x/emissions/migrations/v3/migrate_test.go | 8 ++-- x/emissions/module.go | 9 ++-- x/emissions/types/distributions_test.go | 2 +- x/emissions/types/expected_keepers.go | 3 +- x/emissions/types/genesis_test.go | 2 +- .../types/message_update_params_test.go | 4 +- .../types/message_withdraw_emissons_test.go | 4 +- x/fungible/client/cli/query.go | 3 +- x/fungible/client/cli/query_code_hash.go | 3 +- x/fungible/client/cli/query_foreign_coins.go | 3 +- .../client/cli/query_gas_stability_pool.go | 3 +- .../client/cli/query_system_contract.go | 3 +- x/fungible/client/cli/tx.go | 3 +- .../cli/tx_deploy_fungible_coin_zrc_4.go | 5 +- .../client/cli/tx_deploy_system_contracts.go | 3 +- .../client/cli/tx_remove_foreign_coin.go | 3 +- .../client/cli/tx_update_contract_bytecode.go | 3 +- .../client/cli/tx_update_gateway_contract.go | 3 +- .../client/cli/tx_update_system_contract.go | 3 +- .../cli/tx_update_zrc20_liquidity_cap.go | 3 +- .../cli/tx_update_zrc20_paused_status.go | 3 +- .../cli/tx_update_zrc20_withdraw_fee.go | 3 +- x/fungible/genesis.go | 5 +- x/fungible/genesis_test.go | 10 ++-- x/fungible/keeper/deposits.go | 7 ++- x/fungible/keeper/deposits_test.go | 16 +++---- x/fungible/keeper/evm.go | 11 ++--- x/fungible/keeper/evm_hooks.go | 3 +- x/fungible/keeper/evm_hooks_test.go | 6 +-- x/fungible/keeper/evm_test.go | 18 +++---- x/fungible/keeper/foreign_coins.go | 5 +- x/fungible/keeper/foreign_coins_test.go | 10 ++-- x/fungible/keeper/gas_coin_and_pool.go | 9 ++-- x/fungible/keeper/gas_coin_and_pool_test.go | 10 ++-- x/fungible/keeper/gas_price.go | 3 +- x/fungible/keeper/gas_price_test.go | 8 ++-- x/fungible/keeper/gas_stability_pool.go | 3 +- x/fungible/keeper/gas_stability_pool_test.go | 4 +- x/fungible/keeper/grpc_query.go | 2 +- x/fungible/keeper/grpc_query_code_hash.go | 3 +- .../keeper/grpc_query_code_hash_test.go | 6 +-- x/fungible/keeper/grpc_query_foreign_coins.go | 3 +- .../keeper/grpc_query_foreign_coins_test.go | 6 +-- .../keeper/grpc_query_gas_stability_pool.go | 3 +- .../grpc_query_gas_stability_pool_test.go | 6 +-- .../keeper/grpc_query_system_contract.go | 3 +- .../keeper/grpc_query_system_contract_test.go | 6 +-- x/fungible/keeper/keeper.go | 3 +- x/fungible/keeper/msg_server.go | 2 +- .../msg_server_deploy_fungible_coin_zrc20.go | 7 ++- ..._server_deploy_fungible_coin_zrc20_test.go | 14 +++--- .../msg_server_deploy_system_contract.go | 5 +- .../msg_server_deploy_system_contract_test.go | 10 ++-- x/fungible/keeper/msg_server_pause_zrc20.go | 5 +- .../keeper/msg_server_pause_zrc20_test.go | 10 ++-- .../keeper/msg_server_remove_foreign_coin.go | 5 +- .../msg_server_remove_foreign_coin_test.go | 10 ++-- .../msg_server_udpate_zrc20_liquidity_cap.go | 5 +- ..._server_udpate_zrc20_liquidity_cap_test.go | 10 ++-- x/fungible/keeper/msg_server_unpause_zrc20.go | 5 +- .../keeper/msg_server_unpause_zrc20_test.go | 10 ++-- .../msg_server_update_contract_bytecode.go | 5 +- ...sg_server_update_contract_bytecode_test.go | 14 +++--- .../msg_server_update_gateway_contract.go | 5 +- ...msg_server_update_gateway_contract_test.go | 10 ++-- .../msg_server_update_system_contract.go | 7 ++- .../msg_server_update_system_contract_test.go | 12 ++--- .../msg_server_update_zrc20_withdraw_fee.go | 5 +- ...g_server_update_zrc20_withdraw_fee_test.go | 10 ++-- x/fungible/keeper/system_contract.go | 3 +- x/fungible/keeper/system_contract_test.go | 6 +-- x/fungible/keeper/v2_deposits.go | 3 +- x/fungible/keeper/v2_deposits_test.go | 14 +++--- x/fungible/keeper/v2_evm.go | 5 +- x/fungible/keeper/zeta.go | 5 +- x/fungible/keeper/zeta_test.go | 8 ++-- .../keeper/zevm_message_passing_test.go | 10 ++-- x/fungible/module.go | 7 ++- x/fungible/module_simulation.go | 3 +- x/fungible/types/events.pb.go | 2 +- x/fungible/types/evm_test.go | 2 +- x/fungible/types/expected_keepers.go | 3 +- x/fungible/types/foreign_coins.pb.go | 2 +- x/fungible/types/gas_stablity_pool_test.go | 2 +- x/fungible/types/genesis_test.go | 2 +- .../message_deploy_fungible_coin_zrc20.go | 3 +- ...message_deploy_fungible_coin_zrc20_test.go | 6 +-- .../message_deploy_system_contracts_test.go | 4 +- x/fungible/types/message_pause_zrc20_test.go | 4 +- .../types/message_remove_foreign_coin_test.go | 4 +- .../types/message_unpause_zrc20_test.go | 4 +- .../message_update_contract_bytecode_test.go | 4 +- .../message_update_gateway_contract_test.go | 4 +- .../message_update_system_contract_test.go | 4 +- ...message_update_zrc20_liquidity_cap_test.go | 4 +- .../message_update_zrc20_withdraw_fee_test.go | 4 +- x/fungible/types/tx.pb.go | 2 +- x/fungible/types/zrc20_test.go | 2 +- x/ibccrosschain/client/cli/query.go | 3 +- x/ibccrosschain/client/cli/tx.go | 3 +- x/ibccrosschain/genesis.go | 5 +- x/ibccrosschain/ibc_module.go | 3 +- x/ibccrosschain/keeper/grpc_query.go | 2 +- x/ibccrosschain/keeper/keeper.go | 3 +- x/ibccrosschain/keeper/msg_server.go | 2 +- x/ibccrosschain/module.go | 7 ++- x/lightclient/client/cli/query.go | 3 +- .../client/cli/query_block_header.go | 3 +- x/lightclient/client/cli/query_chain_state.go | 3 +- .../client/cli/query_verification_flags.go | 3 +- x/lightclient/client/cli/tx.go | 3 +- .../cli/tx_disable_verification_flags.go | 3 +- .../cli/tx_enable_verification_flags.go | 3 +- x/lightclient/genesis.go | 5 +- x/lightclient/genesis_test.go | 14 +++--- x/lightclient/keeper/block_header.go | 5 +- x/lightclient/keeper/block_header_test.go | 10 ++-- .../keeper/block_header_verification.go | 3 +- .../keeper/block_header_verification_test.go | 8 ++-- x/lightclient/keeper/chain_state.go | 3 +- x/lightclient/keeper/chain_state_test.go | 4 +- x/lightclient/keeper/grpc_query.go | 2 +- .../keeper/grpc_query_block_header.go | 5 +- .../keeper/grpc_query_block_header_test.go | 10 ++-- .../keeper/grpc_query_chain_state.go | 3 +- .../keeper/grpc_query_chain_state_test.go | 8 ++-- .../grpc_query_header_enabled_chains.go | 3 +- .../grpc_query_header_enabled_chains_test.go | 6 +-- x/lightclient/keeper/grpc_query_prove.go | 7 ++- x/lightclient/keeper/grpc_query_prove_test.go | 8 ++-- x/lightclient/keeper/keeper.go | 3 +- x/lightclient/keeper/msg_server.go | 2 +- ...disable_block_header_verification._test.go | 12 ++--- ...erver_disable_block_header_verification.go | 5 +- ...server_enable_block_header_verification.go | 5 +- ...r_enable_block_header_verification_test.go | 12 ++--- x/lightclient/keeper/proof.go | 7 ++- x/lightclient/keeper/proof_test.go | 10 ++-- x/lightclient/module.go | 7 ++- .../types/block_header_verification_test.go | 6 +-- x/lightclient/types/expected_keepers.go | 3 +- x/lightclient/types/genesis.go | 2 +- x/lightclient/types/genesis.pb.go | 2 +- x/lightclient/types/genesis_test.go | 8 ++-- ...message_disable_verification_flags_test.go | 6 +-- .../message_enable_verification_flags_test.go | 6 +-- x/lightclient/types/query.pb.go | 2 +- x/lightclient/types/verification_flags.go | 2 +- .../types/verification_flags_test.go | 2 +- x/observer/abci.go | 5 +- x/observer/abci_test.go | 8 ++-- x/observer/client/cli/query.go | 3 +- x/observer/client/cli/query_ballot.go | 3 +- x/observer/client/cli/query_blame.go | 3 +- x/observer/client/cli/query_chain_nonce.go | 3 +- x/observer/client/cli/query_chain_params.go | 3 +- .../client/cli/query_get_tss_address.go | 3 +- x/observer/client/cli/query_keygen.go | 3 +- x/observer/client/cli/query_node_account.go | 3 +- x/observer/client/cli/query_observers.go | 3 +- x/observer/client/cli/query_pending_nonces.go | 3 +- .../client/cli/query_permission_flags.go | 3 +- .../client/cli/query_show_observer_count.go | 3 +- .../client/cli/query_supported_chains.go | 3 +- x/observer/client/cli/query_tss.go | 3 +- .../client/cli/query_tss_fund_migrator.go | 3 +- x/observer/client/cli/tx.go | 3 +- x/observer/client/cli/tx_add_observer.go | 3 +- .../client/cli/tx_disable_cctx_flags.go | 3 +- x/observer/client/cli/tx_enable_cctx_flags.go | 3 +- .../client/cli/tx_remove_chain_params.go | 3 +- .../client/cli/tx_reset_chain_nonces.go | 3 +- .../client/cli/tx_update_chain_params.go | 3 +- .../cli/tx_update_gas_price_increase_flags.go | 3 +- x/observer/client/cli/tx_update_keygen.go | 3 +- x/observer/client/cli/tx_update_observer.go | 3 +- x/observer/client/cli/tx_vote_blame.go | 3 +- x/observer/client/cli/tx_vote_tss.go | 5 +- x/observer/genesis.go | 7 ++- x/observer/genesis_test.go | 10 ++-- x/observer/keeper/ballot.go | 3 +- x/observer/keeper/ballot_test.go | 6 +-- x/observer/keeper/blame.go | 3 +- x/observer/keeper/blame_test.go | 6 +-- x/observer/keeper/chain_nonces.go | 3 +- x/observer/keeper/chain_nonces_test.go | 4 +- x/observer/keeper/chain_params.go | 5 +- x/observer/keeper/chain_params_test.go | 8 ++-- x/observer/keeper/crosschain_flags.go | 3 +- x/observer/keeper/crosschain_flags_test.go | 4 +- x/observer/keeper/events.go | 3 +- x/observer/keeper/grpc_query.go | 2 +- x/observer/keeper/grpc_query_ballot.go | 3 +- x/observer/keeper/grpc_query_ballot_test.go | 6 +-- x/observer/keeper/grpc_query_blame.go | 3 +- x/observer/keeper/grpc_query_blame_test.go | 6 +-- x/observer/keeper/grpc_query_chain_params.go | 3 +- .../keeper/grpc_query_chain_params_test.go | 6 +-- .../keeper/grpc_query_crosschain_flags.go | 3 +- .../grpc_query_crosschain_flags_test.go | 4 +- x/observer/keeper/grpc_query_keygen.go | 3 +- x/observer/keeper/grpc_query_keygen_test.go | 4 +- x/observer/keeper/grpc_query_node_account.go | 3 +- .../keeper/grpc_query_node_account_test.go | 4 +- x/observer/keeper/grpc_query_nonces.go | 3 +- x/observer/keeper/grpc_query_nonces_test.go | 6 +-- x/observer/keeper/grpc_query_observer.go | 3 +- x/observer/keeper/grpc_query_observer_test.go | 6 +-- .../keeper/grpc_query_supported_chain.go | 3 +- .../keeper/grpc_query_supported_chain_test.go | 4 +- x/observer/keeper/grpc_query_tss.go | 7 ++- .../grpc_query_tss_funds_migrator_info.go | 5 +- .../grpc_query_tss_funds_migrator_test.go | 8 ++-- x/observer/keeper/grpc_query_tss_test.go | 10 ++-- x/observer/keeper/hooks.go | 3 +- x/observer/keeper/hooks_test.go | 6 +-- x/observer/keeper/keeper.go | 3 +- x/observer/keeper/keygen.go | 3 +- x/observer/keeper/keygen_test.go | 6 +-- x/observer/keeper/last_observer_count.go | 3 +- x/observer/keeper/migrator.go | 3 +- x/observer/keeper/msg_server.go | 2 +- x/observer/keeper/msg_server_add_observer.go | 7 ++- .../keeper/msg_server_add_observer_test.go | 10 ++-- .../keeper/msg_server_disable_cctx_flags.go | 5 +- .../msg_server_disable_cctx_flags_test.go | 10 ++-- .../keeper/msg_server_enable_cctx_flags.go | 5 +- .../msg_server_enable_cctx_flags_test.go | 10 ++-- .../keeper/msg_server_remove_chain_params.go | 5 +- .../msg_server_remove_chain_params_test.go | 12 ++--- .../keeper/msg_server_reset_chain_nonces.go | 5 +- .../msg_server_reset_chain_nonces_test.go | 12 ++--- .../keeper/msg_server_update_chain_params.go | 5 +- .../msg_server_update_chain_params_test.go | 12 ++--- ..._server_update_gas_price_increase_flags.go | 5 +- ...er_update_gas_price_increase_flags_test.go | 10 ++-- x/observer/keeper/msg_server_update_keygen.go | 5 +- .../keeper/msg_server_update_keygen_test.go | 10 ++-- .../keeper/msg_server_update_observer.go | 5 +- .../keeper/msg_server_update_observer_test.go | 8 ++-- x/observer/keeper/msg_server_vote_blame.go | 5 +- .../keeper/msg_server_vote_blame_test.go | 8 ++-- .../keeper/msg_server_vote_block_header.go | 5 +- .../msg_server_vote_block_header_test.go | 16 +++---- x/observer/keeper/msg_server_vote_tss.go | 5 +- x/observer/keeper/msg_server_vote_tss_test.go | 10 ++-- x/observer/keeper/node_account.go | 3 +- x/observer/keeper/node_account_test.go | 6 +-- x/observer/keeper/nonce_to_cctx.go | 3 +- x/observer/keeper/nonce_to_cctx_test.go | 6 +-- x/observer/keeper/nonces_test.go | 4 +- x/observer/keeper/observer_set.go | 3 +- x/observer/keeper/observer_set_test.go | 6 +-- x/observer/keeper/pending_nonces.go | 3 +- x/observer/keeper/pending_nonces_test.go | 8 ++-- x/observer/keeper/tss.go | 3 +- x/observer/keeper/tss_funds_migrator.go | 3 +- x/observer/keeper/tss_funds_migrator_test.go | 4 +- x/observer/keeper/tss_test.go | 6 +-- x/observer/keeper/vote_inbound.go | 5 +- x/observer/keeper/vote_inbound_test.go | 10 ++-- x/observer/keeper/vote_outbound.go | 5 +- x/observer/keeper/vote_outbound_test.go | 8 ++-- x/observer/keeper/voting.go | 5 +- x/observer/keeper/voting_test.go | 10 ++-- x/observer/migrations/v8/migrate.go | 3 +- x/observer/migrations/v8/migrate_test.go | 10 ++-- x/observer/module.go | 7 ++- x/observer/module_simulation.go | 3 +- x/observer/types/chain_params.go | 7 ++- x/observer/types/chain_params_test.go | 2 +- x/observer/types/crosschain_flags_test.go | 2 +- x/observer/types/expected_keepers.go | 7 ++- x/observer/types/genesis_test.go | 4 +- x/observer/types/message_add_observer.go | 3 +- x/observer/types/message_add_observer_test.go | 4 +- .../types/message_disable_cctx_flags_test.go | 4 +- .../types/message_enable_cctx_flags_test.go | 4 +- .../types/message_remove_chain_params_test.go | 6 +-- .../types/message_reset_chain_nonces_test.go | 6 +-- .../types/message_update_chain_params_test.go | 6 +-- ...ge_update_gas_price_increase_flags_test.go | 4 +- .../types/message_update_keygen_test.go | 4 +- .../types/message_update_observer_test.go | 4 +- x/observer/types/message_vote_blame_test.go | 6 +-- x/observer/types/message_vote_block_header.go | 3 +- .../types/message_vote_block_header_test.go | 10 ++-- x/observer/types/message_vote_tss.go | 3 +- x/observer/types/message_vote_tss_test.go | 6 +-- x/observer/types/node_account.pb.go | 2 +- x/observer/types/observer_set.go | 3 +- x/observer/types/observer_set_test.go | 6 +-- x/observer/types/parsers.go | 3 +- x/observer/types/parsers_test.go | 6 +-- x/observer/types/query.pb.go | 4 +- x/observer/types/tx.pb.go | 4 +- x/observer/types/utils_test.go | 2 +- zetaclient/authz/authz_signer.go | 5 +- zetaclient/chains/base/logger.go | 3 +- zetaclient/chains/base/logger_test.go | 6 +-- zetaclient/chains/base/observer.go | 19 ++++---- zetaclient/chains/base/observer_test.go | 22 ++++----- zetaclient/chains/base/signer.go | 8 ++-- zetaclient/chains/base/signer_test.go | 8 ++-- zetaclient/chains/bitcoin/fee.go | 9 ++-- zetaclient/chains/bitcoin/fee_test.go | 2 +- zetaclient/chains/bitcoin/observer/inbound.go | 21 ++++----- .../chains/bitcoin/observer/inbound_test.go | 12 ++--- .../chains/bitcoin/observer/observer.go | 19 ++++---- .../chains/bitcoin/observer/observer_test.go | 20 ++++---- .../chains/bitcoin/observer/outbound.go | 21 ++++----- .../chains/bitcoin/observer/outbound_test.go | 10 ++-- zetaclient/chains/bitcoin/observer/witness.go | 5 +- .../chains/bitcoin/observer/witness_test.go | 12 ++--- zetaclient/chains/bitcoin/rpc/rpc.go | 5 +- .../chains/bitcoin/rpc/rpc_live_test.go | 14 +++--- zetaclient/chains/bitcoin/signer/signer.go | 25 +++++----- .../bitcoin/signer/signer_keysign_test.go | 6 +-- .../chains/bitcoin/signer/signer_test.go | 10 ++-- zetaclient/chains/bitcoin/tx_script.go | 5 +- zetaclient/chains/bitcoin/tx_script_test.go | 6 +-- zetaclient/chains/evm/cctx.go | 4 +- zetaclient/chains/evm/observer/inbound.go | 27 +++++------ .../chains/evm/observer/inbound_test.go | 22 ++++----- zetaclient/chains/evm/observer/observer.go | 17 ++++--- .../chains/evm/observer/observer_db_test.go | 2 +- .../chains/evm/observer/observer_gas.go | 3 +- .../chains/evm/observer/observer_gas_test.go | 4 +- .../chains/evm/observer/observer_test.go | 34 +++++++------- zetaclient/chains/evm/observer/outbound.go | 23 +++++---- .../chains/evm/observer/outbound_test.go | 14 +++--- zetaclient/chains/evm/observer/v2_inbound.go | 19 ++++---- zetaclient/chains/evm/observer/v2_outbound.go | 7 ++- zetaclient/chains/evm/rpc/rpc.go | 3 +- zetaclient/chains/evm/rpc/rpc_live_test.go | 2 +- zetaclient/chains/evm/signer/gas.go | 3 +- zetaclient/chains/evm/signer/gas_test.go | 2 +- zetaclient/chains/evm/signer/outbound_data.go | 7 ++- .../chains/evm/signer/outbound_data_test.go | 2 +- .../evm/signer/outbound_tracker_reporter.go | 11 ++--- zetaclient/chains/evm/signer/sign.go | 3 +- zetaclient/chains/evm/signer/sign_test.go | 2 +- zetaclient/chains/evm/signer/signer.go | 25 +++++----- zetaclient/chains/evm/signer/signer_admin.go | 3 +- .../chains/evm/signer/signer_admin_test.go | 6 +-- zetaclient/chains/evm/signer/signer_test.go | 32 ++++++------- zetaclient/chains/evm/signer/v2_signer.go | 5 +- zetaclient/chains/evm/validation_test.go | 6 +-- zetaclient/chains/interfaces/interfaces.go | 15 +++--- zetaclient/chains/solana/observer/inbound.go | 19 ++++---- .../chains/solana/observer/inbound_test.go | 24 +++++----- .../chains/solana/observer/inbound_tracker.go | 5 +- zetaclient/chains/solana/observer/observer.go | 17 ++++--- .../chains/solana/observer/observer_gas.go | 5 +- .../chains/solana/observer/observer_test.go | 18 +++---- zetaclient/chains/solana/observer/outbound.go | 19 ++++---- .../chains/solana/observer/outbound_test.go | 20 ++++---- zetaclient/chains/solana/rpc/rpc.go | 3 +- zetaclient/chains/solana/rpc/rpc_live_test.go | 2 +- .../signer/outbound_tracker_reporter.go | 7 ++- zetaclient/chains/solana/signer/signer.go | 23 +++++---- .../chains/solana/signer/signer_test.go | 20 ++++---- zetaclient/chains/solana/signer/withdraw.go | 7 ++- zetaclient/compliance/compliance.go | 11 ++--- zetaclient/compliance/compliance_test.go | 6 +-- zetaclient/config/config_chain.go | 2 +- zetaclient/config/types.go | 2 +- zetaclient/context/app.go | 7 ++- zetaclient/context/app_test.go | 6 +-- zetaclient/context/chain.go | 5 +- zetaclient/context/chain_test.go | 6 +-- zetaclient/context/context_test.go | 4 +- zetaclient/db/db.go | 3 +- zetaclient/db/db_test.go | 2 +- zetaclient/keys/keys.go | 9 ++-- zetaclient/keys/keys_test.go | 6 +-- zetaclient/keys/relayer_key.go | 7 ++- zetaclient/keys/relayer_key_test.go | 8 ++-- zetaclient/maintenance/tss_listener.go | 9 ++-- zetaclient/metrics/metrics_test.go | 2 +- zetaclient/metrics/telemetry.go | 7 ++- zetaclient/orchestrator/bootstap_test.go | 22 ++++----- zetaclient/orchestrator/bootstrap.go | 27 +++++------ zetaclient/orchestrator/orchestrator.go | 27 +++++------ zetaclient/orchestrator/orchestrator_test.go | 26 +++++----- zetaclient/ratelimiter/rate_limiter.go | 3 +- zetaclient/ratelimiter/rate_limiter_test.go | 12 ++--- zetaclient/testdata/cctx/all_cctxs.go | 4 +- .../testdata/cctx/chain_1337_cctx_14.go | 2 +- zetaclient/testdata/cctx/chain_1_cctx_6270.go | 4 +- zetaclient/testdata/cctx/chain_1_cctx_7260.go | 4 +- zetaclient/testdata/cctx/chain_1_cctx_8014.go | 4 +- zetaclient/testdata/cctx/chain_1_cctx_9718.go | 4 +- ...c3b990e076e2a4bffeb616035b239b7d33843da.go | 4 +- ...e01cbdf59154fd793ea7a22c297f7c3a722c532.go | 4 +- ...71ffc40ca898e134525c42c2ae3cbc5725f9d76.go | 4 +- .../testdata/cctx/chain_56_cctx_68270.go | 4 +- .../testdata/cctx/chain_8332_cctx_148.go | 4 +- zetaclient/testutils/constant.go | 3 +- zetaclient/testutils/mocks/btc_rpc.go | 3 +- zetaclient/testutils/mocks/chain_clients.go | 6 +-- zetaclient/testutils/mocks/chain_params.go | 7 ++- zetaclient/testutils/mocks/chain_signer.go | 9 ++-- zetaclient/testutils/mocks/evm_json_rpc.go | 3 +- zetaclient/testutils/mocks/evm_rpc.go | 3 +- zetaclient/testutils/mocks/tss_signer.go | 7 ++- zetaclient/testutils/mocks/zetacore_client.go | 14 +++--- .../testutils/mocks/zetacore_client_opts.go | 7 ++- zetaclient/testutils/testdata.go | 9 ++-- zetaclient/testutils/testdata_naming.go | 2 +- zetaclient/testutils/testrpc/rpc_btc.go | 3 +- zetaclient/testutils/testrpc/rpc_solana.go | 2 +- zetaclient/tss/concurrent_keysigns_tracker.go | 3 +- zetaclient/tss/tss_signer.go | 17 ++++--- zetaclient/tss/tss_signer_test.go | 6 +-- zetaclient/types/event.go | 2 +- zetaclient/zetacore/broadcast.go | 9 ++-- zetaclient/zetacore/broadcast_test.go | 10 ++-- zetaclient/zetacore/client.go | 23 +++++---- zetaclient/zetacore/client_monitor.go | 5 +- zetaclient/zetacore/client_query_authority.go | 4 +- zetaclient/zetacore/client_query_cosmos.go | 3 +- .../zetacore/client_query_crosschain.go | 7 ++- .../zetacore/client_query_lightclient.go | 5 +- zetaclient/zetacore/client_query_observer.go | 7 ++- .../zetacore/client_query_tendermint.go | 3 +- zetaclient/zetacore/client_query_test.go | 24 +++++----- zetaclient/zetacore/client_vote.go | 13 +++-- zetaclient/zetacore/client_worker.go | 3 +- zetaclient/zetacore/tx.go | 13 +++-- zetaclient/zetacore/tx_test.go | 24 +++++----- 965 files changed, 2857 insertions(+), 3424 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 7c7be0604c..03cd3b8d42 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -26,9 +26,8 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" "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..b330727036 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -32,8 +32,7 @@ import ( ethante "github.com/zeta-chain/ethermint/app/ante" 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..9e9e5c3439 100644 --- a/app/app.go +++ b/app/app.go @@ -88,30 +88,29 @@ import ( "github.com/zeta-chain/ethermint/x/feemarket" 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 diff --git a/app/init_genesis.go b/app/init_genesis.go index a8765c28d7..072d344d57 100644 --- a/app/init_genesis.go +++ b/app/init_genesis.go @@ -18,13 +18,12 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" 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..0655f26ac5 100644 --- a/app/prefix.go +++ b/app/prefix.go @@ -3,8 +3,7 @@ package app 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..22f83c97a5 100644 --- a/app/setup_handlers.go +++ b/app/setup_handlers.go @@ -18,12 +18,11 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/cosmos-sdk/x/upgrade/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" "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" ) 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..b9b77dd669 100644 --- a/cmd/zetaclientd-supervisor/lib.go +++ b/cmd/zetaclientd-supervisor/lib.go @@ -16,10 +16,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/hashicorp/go-getter" "github.com/rs/zerolog" + "github.com/zeta-chain/node/zetaclient/config" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - - "github.com/zeta-chain/zetacore/zetaclient/config" ) const zetaclientdBinaryName = "zetaclientd" diff --git a/cmd/zetaclientd-supervisor/main.go b/cmd/zetaclientd-supervisor/main.go index 756a9138da..40dd0877b9 100644 --- a/cmd/zetaclientd-supervisor/main.go +++ b/cmd/zetaclientd-supervisor/main.go @@ -12,11 +12,10 @@ import ( "time" "cosmossdk.io/errors" + "github.com/zeta-chain/node/app" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/zetaclient/config" "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" ) func main() { diff --git a/cmd/zetaclientd/debug.go b/cmd/zetaclientd/debug.go index 9d7ece9a0c..a818b402b8 100644 --- a/cmd/zetaclientd/debug.go +++ b/cmd/zetaclientd/debug.go @@ -15,15 +15,14 @@ import ( "github.com/onrik/ethrpc" "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..ca646dbd46 100644 --- a/cmd/zetaclientd/encrypt_tss.go +++ b/cmd/zetaclientd/encrypt_tss.go @@ -7,8 +7,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..00e1803ba5 100644 --- a/cmd/zetaclientd/hsm.go +++ b/cmd/zetaclientd/hsm.go @@ -7,10 +7,9 @@ import ( "github.com/pkg/errors" "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 caf2db9538..ce45acfb9b 100644 --- a/cmd/zetaclientd/import_relayer_keys.go +++ b/cmd/zetaclientd/import_relayer_keys.go @@ -8,11 +8,10 @@ import ( "github.com/pkg/errors" "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/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/keys" ) var CmdImportRelayerKey = &cobra.Command{ diff --git a/cmd/zetaclientd/init.go b/cmd/zetaclientd/init.go index 2d3e67d698..86c6d28c54 100644 --- a/cmd/zetaclientd/init.go +++ b/cmd/zetaclientd/init.go @@ -3,9 +3,8 @@ package main 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..ec80717113 100644 --- a/cmd/zetaclientd/keygen_tss.go +++ b/cmd/zetaclientd/keygen_tss.go @@ -9,18 +9,17 @@ import ( "time" "github.com/rs/zerolog" + "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" tsscommon "gitlab.com/thorchain/tss/go-tss/common" "gitlab.com/thorchain/tss/go-tss/keygen" "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" ) // GenerateTSS generates a new TSS if keygen is set. diff --git a/cmd/zetaclientd/main.go b/cmd/zetaclientd/main.go index 128b92972e..1db1319807 100644 --- a/cmd/zetaclientd/main.go +++ b/cmd/zetaclientd/main.go @@ -8,10 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/cmd" ecdsakeygen "gitlab.com/thorchain/tss/tss-lib/ecdsa/keygen" - - "github.com/zeta-chain/zetacore/app" - "github.com/zeta-chain/zetacore/cmd" ) var ( diff --git a/cmd/zetaclientd/p2p_diagnostics.go b/cmd/zetaclientd/p2p_diagnostics.go index dc8a98621d..8634a0b942 100644 --- a/cmd/zetaclientd/p2p_diagnostics.go +++ b/cmd/zetaclientd/p2p_diagnostics.go @@ -19,10 +19,9 @@ import ( dutil "github.com/libp2p/go-libp2p/p2p/discovery/util" 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..ab92c66471 100644 --- a/cmd/zetaclientd/start.go +++ b/cmd/zetaclientd/start.go @@ -18,20 +18,19 @@ import ( "github.com/pkg/errors" "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..ba1c7ddd2c 100644 --- a/cmd/zetaclientd/start_utils.go +++ b/cmd/zetaclientd/start_utils.go @@ -9,10 +9,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" + "github.com/zeta-chain/node/zetaclient/config" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - - "github.com/zeta-chain/zetacore/zetaclient/config" ) func waitForZetaCore(config config.Config, logger zerolog.Logger) { diff --git a/cmd/zetaclientd/utils.go b/cmd/zetaclientd/utils.go index b25de0a2b5..5f5ff01d32 100644 --- a/cmd/zetaclientd/utils.go +++ b/cmd/zetaclientd/utils.go @@ -3,11 +3,10 @@ package main 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..979dd841dc 100644 --- a/cmd/zetaclientd/version.go +++ b/cmd/zetaclientd/version.go @@ -4,8 +4,7 @@ import ( "fmt" "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..4d842aa121 100644 --- a/cmd/zetacore_utils/main.go +++ b/cmd/zetacore_utils/main.go @@ -11,8 +11,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..9a5081d77c 100644 --- a/cmd/zetacored/add_observer_list.go +++ b/cmd/zetacored/add_observer_list.go @@ -21,12 +21,11 @@ import ( "github.com/spf13/cobra" 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..16dd9a4d14 100644 --- a/cmd/zetacored/collect_observer_info.go +++ b/cmd/zetacored/collect_observer_info.go @@ -6,8 +6,7 @@ import ( "path/filepath" "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..a693f6bceb 100644 --- a/cmd/zetacored/get_pubkey.go +++ b/cmd/zetacored/get_pubkey.go @@ -6,9 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..4837436970 100644 --- a/cmd/zetacored/main.go +++ b/cmd/zetacored/main.go @@ -7,9 +7,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..c3258c881a 100644 --- a/cmd/zetacored/parse_genesis.go +++ b/cmd/zetacored/parse_genesis.go @@ -28,12 +28,11 @@ import ( "github.com/spf13/cobra" 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..11b49faa21 100644 --- a/cmd/zetacored/root.go +++ b/cmd/zetacored/root.go @@ -32,12 +32,11 @@ import ( ethermintclient "github.com/zeta-chain/ethermint/client" "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..b0ae694be8 100644 --- a/cmd/zetae2e/balances.go +++ b/cmd/zetae2e/balances.go @@ -5,11 +5,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..cdc264b1fc 100644 --- a/cmd/zetae2e/bitcoin_address.go +++ b/cmd/zetae2e/bitcoin_address.go @@ -5,11 +5,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 ac4686fc23..ba358036a4 100644 --- a/cmd/zetae2e/config/clients.go +++ b/cmd/zetae2e/config/clients.go @@ -10,15 +10,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/ethclient" "github.com/gagliardetto/solana-go/rpc" + "github.com/zeta-chain/node/e2e/config" + 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" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - - "github.com/zeta-chain/zetacore/e2e/config" - 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" ) // E2EClients contains all the RPC clients and gRPC clients for E2E tests diff --git a/cmd/zetae2e/config/config.go b/cmd/zetae2e/config/config.go index ce1b03717b..9ea46a7f00 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..3b7fe40bb4 100644 --- a/cmd/zetae2e/config/contracts.go +++ b/cmd/zetae2e/config/contracts.go @@ -4,6 +4,12 @@ import ( "fmt" "github.com/gagliardetto/solana-go" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" 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" @@ -16,13 +22,6 @@ 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/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" ) // setContractsFromConfig get EVM contracts from config diff --git a/cmd/zetae2e/init.go b/cmd/zetae2e/init.go index 1f26814d24..107e8a60b1 100644 --- a/cmd/zetae2e/init.go +++ b/cmd/zetae2e/init.go @@ -4,9 +4,8 @@ import ( "fmt" "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..de3bac8818 100644 --- a/cmd/zetae2e/list_tests.go +++ b/cmd/zetae2e/list_tests.go @@ -5,9 +5,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..1524ab59b3 100644 --- a/cmd/zetae2e/local/admin.go +++ b/cmd/zetae2e/local/admin.go @@ -5,10 +5,9 @@ import ( "time" "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..7a5e687b11 100644 --- a/cmd/zetae2e/local/bitcoin.go +++ b/cmd/zetae2e/local/bitcoin.go @@ -5,10 +5,9 @@ import ( "time" "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..18c9dcb1b2 100644 --- a/cmd/zetae2e/local/config.go +++ b/cmd/zetae2e/local/config.go @@ -6,9 +6,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..88855bd97f 100644 --- a/cmd/zetae2e/local/erc20.go +++ b/cmd/zetae2e/local/erc20.go @@ -5,10 +5,9 @@ import ( "time" "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..1d9e3e4001 100644 --- a/cmd/zetae2e/local/ethereum.go +++ b/cmd/zetae2e/local/ethereum.go @@ -5,10 +5,9 @@ import ( "time" "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 dd00666e25..f0c0d85107 100644 --- a/cmd/zetae2e/local/local.go +++ b/cmd/zetae2e/local/local.go @@ -9,18 +9,17 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" + 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" "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" ) const ( diff --git a/cmd/zetae2e/local/migration.go b/cmd/zetae2e/local/migration.go index 27d9682990..a0a123f0e4 100644 --- a/cmd/zetae2e/local/migration.go +++ b/cmd/zetae2e/local/migration.go @@ -5,10 +5,9 @@ import ( "time" "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" ) // migrationRoutine runs migration related e2e tests diff --git a/cmd/zetae2e/local/misc.go b/cmd/zetae2e/local/misc.go index a27c93c932..d413d457fc 100644 --- a/cmd/zetae2e/local/misc.go +++ b/cmd/zetae2e/local/misc.go @@ -5,10 +5,9 @@ import ( "time" "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..06dcdb2a98 100644 --- a/cmd/zetae2e/local/monitor_priority_txs.go +++ b/cmd/zetae2e/local/monitor_priority_txs.go @@ -9,8 +9,7 @@ import ( "github.com/cometbft/cometbft/abci/types" 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..5ffa156bee 100644 --- a/cmd/zetae2e/local/performance.go +++ b/cmd/zetae2e/local/performance.go @@ -8,10 +8,9 @@ import ( "time" "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..db2a65ac1a 100644 --- a/cmd/zetae2e/local/precompiles.go +++ b/cmd/zetae2e/local/precompiles.go @@ -5,10 +5,9 @@ import ( "time" "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..ceb200fb27 100644 --- a/cmd/zetae2e/local/solana.go +++ b/cmd/zetae2e/local/solana.go @@ -5,10 +5,9 @@ import ( "time" "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 a7acf80daa..7d1d8fae90 100644 --- a/cmd/zetae2e/local/tss_migration.go +++ b/cmd/zetae2e/local/tss_migration.go @@ -5,11 +5,10 @@ import ( "time" "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" ) func TSSMigration(deployerRunner *runner.E2ERunner, logger *runner.Logger, verbose bool, conf config.Config) { diff --git a/cmd/zetae2e/local/v2.go b/cmd/zetae2e/local/v2.go index e87785de31..f53a2b0c7f 100644 --- a/cmd/zetae2e/local/v2.go +++ b/cmd/zetae2e/local/v2.go @@ -5,10 +5,9 @@ import ( "time" "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 v2 related e2e tests diff --git a/cmd/zetae2e/local/zeta.go b/cmd/zetae2e/local/zeta.go index a0f6d49a09..aa8c2462fb 100644 --- a/cmd/zetae2e/local/zeta.go +++ b/cmd/zetae2e/local/zeta.go @@ -5,10 +5,9 @@ import ( "time" "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..7e6b2baa6b 100644 --- a/cmd/zetae2e/local/zevm_mp.go +++ b/cmd/zetae2e/local/zevm_mp.go @@ -5,10 +5,9 @@ import ( "time" "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..aad18c67c8 100644 --- a/cmd/zetae2e/root.go +++ b/cmd/zetae2e/root.go @@ -2,8 +2,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 9c36d8e3d2..95b4353678 100644 --- a/cmd/zetae2e/run.go +++ b/cmd/zetae2e/run.go @@ -10,12 +10,11 @@ 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" + "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" ) const flagVerbose = "verbose" diff --git a/cmd/zetae2e/setup_bitcoin.go b/cmd/zetae2e/setup_bitcoin.go index 99a5365adc..bb93facb18 100644 --- a/cmd/zetae2e/setup_bitcoin.go +++ b/cmd/zetae2e/setup_bitcoin.go @@ -5,11 +5,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..610a54f1a2 100644 --- a/cmd/zetae2e/show_tss.go +++ b/cmd/zetae2e/show_tss.go @@ -5,11 +5,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..24c4ac8799 100644 --- a/cmd/zetae2e/stress.go +++ b/cmd/zetae2e/stress.go @@ -15,16 +15,15 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/fatih/color" "github.com/spf13/cobra" + "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" "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" ) const ( diff --git a/cmd/zetatool/filterdeposit/btc.go b/cmd/zetatool/filterdeposit/btc.go index a667a7d3eb..0a65e2e66c 100644 --- a/cmd/zetatool/filterdeposit/btc.go +++ b/cmd/zetatool/filterdeposit/btc.go @@ -12,9 +12,8 @@ import ( "strings" "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..585121c057 100644 --- a/cmd/zetatool/filterdeposit/evm.go +++ b/cmd/zetatool/filterdeposit/evm.go @@ -13,12 +13,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/nanmu42/etherscan-api" "github.com/spf13/cobra" + "github.com/zeta-chain/node/cmd/zetatool/config" + "github.com/zeta-chain/node/pkg/constant" + "github.com/zeta-chain/node/zetaclient/chains/evm" "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" ) const ( diff --git a/cmd/zetatool/filterdeposit/filterdeposit.go b/cmd/zetatool/filterdeposit/filterdeposit.go index ccab8e6273..4e363cddfa 100644 --- a/cmd/zetatool/filterdeposit/filterdeposit.go +++ b/cmd/zetatool/filterdeposit/filterdeposit.go @@ -9,9 +9,8 @@ import ( "strings" "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..aa7cdcabd5 100644 --- a/cmd/zetatool/main.go +++ b/cmd/zetatool/main.go @@ -5,9 +5,8 @@ import ( "os" "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..083e003ce1 100644 --- a/docs/main.go +++ b/docs/main.go @@ -15,8 +15,7 @@ import ( "time" "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..871b5b4c84 100644 --- a/e2e/e2etests/helpers.go +++ b/e2e/e2etests/helpers.go @@ -9,11 +9,10 @@ import ( "github.com/btcsuite/btcutil" 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..e87ffdef2c 100644 --- a/e2e/e2etests/test_admin_transactions.go +++ b/e2e/e2etests/test_admin_transactions.go @@ -2,14 +2,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..f3b74f0ab9 100644 --- a/e2e/e2etests/test_bitcoin_deposit.go +++ b/e2e/e2etests/test_bitcoin_deposit.go @@ -2,10 +2,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..05d7d725b9 100644 --- a/e2e/e2etests/test_bitcoin_deposit_refund.go +++ b/e2e/e2etests/test_bitcoin_deposit_refund.go @@ -4,11 +4,10 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "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..b2e0db0c51 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go +++ b/e2e/e2etests/test_bitcoin_withdraw_invalid_address.go @@ -4,9 +4,8 @@ import ( "math/big" "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..f4cd42945f 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_legacy.go +++ b/e2e/e2etests/test_bitcoin_withdraw_legacy.go @@ -3,8 +3,7 @@ package e2etests 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..9295fa5deb 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_multiple.go +++ b/e2e/e2etests/test_bitcoin_withdraw_multiple.go @@ -2,9 +2,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..ebad656ac7 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_p2sh.go +++ b/e2e/e2etests/test_bitcoin_withdraw_p2sh.go @@ -3,8 +3,7 @@ package e2etests 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..a0190aedcf 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go +++ b/e2e/e2etests/test_bitcoin_withdraw_p2wsh.go @@ -3,8 +3,7 @@ package e2etests 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..9c3a32bce1 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go +++ b/e2e/e2etests/test_bitcoin_withdraw_restricted_address.go @@ -4,10 +4,9 @@ import ( "math/big" "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..5e8755c407 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_segwit.go +++ b/e2e/e2etests/test_bitcoin_withdraw_segwit.go @@ -3,8 +3,7 @@ package e2etests 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..1f0c474732 100644 --- a/e2e/e2etests/test_bitcoin_withdraw_taproot.go +++ b/e2e/e2etests/test_bitcoin_withdraw_taproot.go @@ -2,9 +2,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..dcd724751b 100644 --- a/e2e/e2etests/test_context_upgrade.go +++ b/e2e/e2etests/test_context_upgrade.go @@ -6,9 +6,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..5e94df3e9f 100644 --- a/e2e/e2etests/test_crosschain_swap.go +++ b/e2e/e2etests/test_crosschain_swap.go @@ -8,10 +8,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..c90cc295f7 100644 --- a/e2e/e2etests/test_deploy_contract.go +++ b/e2e/e2etests/test_deploy_contract.go @@ -5,10 +5,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..e959bf04f7 100644 --- a/e2e/e2etests/test_donation.go +++ b/e2e/e2etests/test_donation.go @@ -2,10 +2,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..f81caba217 100644 --- a/e2e/e2etests/test_erc20_deposit.go +++ b/e2e/e2etests/test_erc20_deposit.go @@ -2,9 +2,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..039dd7048d 100644 --- a/e2e/e2etests/test_erc20_deposit_refund.go +++ b/e2e/e2etests/test_erc20_deposit_refund.go @@ -9,10 +9,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..f9089c12ba 100644 --- a/e2e/e2etests/test_erc20_deposit_restricted_address.go +++ b/e2e/e2etests/test_erc20_deposit_restricted_address.go @@ -3,9 +3,8 @@ package e2etests 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..0b6b8fdb40 100644 --- a/e2e/e2etests/test_erc20_multiple_deposits.go +++ b/e2e/e2etests/test_erc20_multiple_deposits.go @@ -6,10 +6,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..28c8402a94 100644 --- a/e2e/e2etests/test_erc20_multiple_withdraws.go +++ b/e2e/e2etests/test_erc20_multiple_withdraws.go @@ -5,10 +5,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..bf94d98616 100644 --- a/e2e/e2etests/test_erc20_withdraw.go +++ b/e2e/e2etests/test_erc20_withdraw.go @@ -4,9 +4,8 @@ import ( "math/big" "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..c7fb429881 100644 --- a/e2e/e2etests/test_eth_deposit.go +++ b/e2e/e2etests/test_eth_deposit.go @@ -2,9 +2,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..6ad28f39d6 100644 --- a/e2e/e2etests/test_eth_deposit_call.go +++ b/e2e/e2etests/test_eth_deposit_call.go @@ -3,11 +3,10 @@ package e2etests 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..af866d4785 100644 --- a/e2e/e2etests/test_eth_deposit_liquidity_cap.go +++ b/e2e/e2etests/test_eth_deposit_liquidity_cap.go @@ -6,11 +6,10 @@ import ( "cosmossdk.io/math" "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..6a4cba8be2 100644 --- a/e2e/e2etests/test_eth_deposit_refund.go +++ b/e2e/e2etests/test_eth_deposit_refund.go @@ -6,10 +6,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" 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..cdcda53240 100644 --- a/e2e/e2etests/test_eth_withdraw.go +++ b/e2e/e2etests/test_eth_withdraw.go @@ -6,10 +6,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" 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..da9a1be18f 100644 --- a/e2e/e2etests/test_eth_withdraw_restricted_address.go +++ b/e2e/e2etests/test_eth_withdraw_restricted_address.go @@ -5,11 +5,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..fcd4054a11 100644 --- a/e2e/e2etests/test_message_passing_evm_to_zevm.go +++ b/e2e/e2etests/test_message_passing_evm_to_zevm.go @@ -6,11 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..c1fa98d445 100644 --- a/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go +++ b/e2e/e2etests/test_message_passing_evm_to_zevm_revert.go @@ -6,11 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..12024fa5b9 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 @@ -3,11 +3,10 @@ package e2etests 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..663d0d62b0 100644 --- a/e2e/e2etests/test_message_passing_external_chains.go +++ b/e2e/e2etests/test_message_passing_external_chains.go @@ -5,11 +5,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" 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" ) // 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..c5765b5a36 100644 --- a/e2e/e2etests/test_message_passing_external_chains_revert.go +++ b/e2e/e2etests/test_message_passing_external_chains_revert.go @@ -4,11 +4,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" 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..fa2c788338 100644 --- a/e2e/e2etests/test_message_passing_external_chains_revert_fail.go +++ b/e2e/e2etests/test_message_passing_external_chains_revert_fail.go @@ -6,11 +6,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + cctxtypes "github.com/zeta-chain/node/x/crosschain/types" 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" ) // 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..9cec6467dd 100644 --- a/e2e/e2etests/test_message_passing_zevm_to_evm.go +++ b/e2e/e2etests/test_message_passing_zevm_to_evm.go @@ -6,11 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..4d766b57f7 100644 --- a/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go +++ b/e2e/e2etests/test_message_passing_zevm_to_evm_revert.go @@ -6,11 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..52bd4f6848 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 @@ -5,11 +5,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 62c9bac84f..4db0d14410 100644 --- a/e2e/e2etests/test_migrate_chain_support.go +++ b/e2e/e2etests/test_migrate_chain_support.go @@ -12,17 +12,16 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/fatih/color" "github.com/stretchr/testify/require" + "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" "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" ) // 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 1c38909b3d..3ac2d98098 100644 --- a/e2e/e2etests/test_migrate_erc20_custody_funds.go +++ b/e2e/e2etests/test_migrate_erc20_custody_funds.go @@ -4,12 +4,11 @@ import ( sdkmath "cosmossdk.io/math" "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..250f6bdb5b 100644 --- a/e2e/e2etests/test_migrate_tss.go +++ b/e2e/e2etests/test_migrate_tss.go @@ -10,13 +10,12 @@ import ( "github.com/btcsuite/btcutil" "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..486256650d 100644 --- a/e2e/e2etests/test_operation_add_liquidity_erc20.go +++ b/e2e/e2etests/test_operation_add_liquidity_erc20.go @@ -4,8 +4,7 @@ import ( "math/big" "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..82948086f6 100644 --- a/e2e/e2etests/test_operation_add_liquidity_eth.go +++ b/e2e/e2etests/test_operation_add_liquidity_eth.go @@ -4,8 +4,7 @@ import ( "math/big" "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..6b24330e93 100644 --- a/e2e/e2etests/test_pause_erc20_custody.go +++ b/e2e/e2etests/test_pause_erc20_custody.go @@ -3,11 +3,10 @@ package e2etests 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..f0e4c5369a 100644 --- a/e2e/e2etests/test_pause_zrc20.go +++ b/e2e/e2etests/test_pause_zrc20.go @@ -4,13 +4,12 @@ import ( "math/big" "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..7a2a113c0b 100644 --- a/e2e/e2etests/test_precompiles_prototype.go +++ b/e2e/e2etests/test_precompiles_prototype.go @@ -3,9 +3,8 @@ package e2etests 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..ead49b10b6 100644 --- a/e2e/e2etests/test_rate_limiter.go +++ b/e2e/e2etests/test_rate_limiter.go @@ -9,11 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..65150b8ae9 100644 --- a/e2e/e2etests/test_solana_deposit.go +++ b/e2e/e2etests/test_solana_deposit.go @@ -5,10 +5,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..b468aaa10d 100644 --- a/e2e/e2etests/test_solana_deposit_call.go +++ b/e2e/e2etests/test_solana_deposit_call.go @@ -2,11 +2,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..e919c3f712 100644 --- a/e2e/e2etests/test_solana_deposit_refund.go +++ b/e2e/e2etests/test_solana_deposit_refund.go @@ -2,11 +2,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..79a8d68369 100644 --- a/e2e/e2etests/test_solana_withdraw.go +++ b/e2e/e2etests/test_solana_withdraw.go @@ -6,8 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "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..6a84e18db7 100644 --- a/e2e/e2etests/test_stress_btc_deposit.go +++ b/e2e/e2etests/test_stress_btc_deposit.go @@ -6,11 +6,10 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..8037f2f29a 100644 --- a/e2e/e2etests/test_stress_btc_withdraw.go +++ b/e2e/e2etests/test_stress_btc_withdraw.go @@ -8,11 +8,10 @@ import ( "github.com/btcsuite/btcutil" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..0bb3800efa 100644 --- a/e2e/e2etests/test_stress_eth_deposit.go +++ b/e2e/e2etests/test_stress_eth_deposit.go @@ -6,11 +6,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..34e3594f97 100644 --- a/e2e/e2etests/test_stress_eth_withdraw.go +++ b/e2e/e2etests/test_stress_eth_withdraw.go @@ -8,11 +8,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..e081b77c11 100644 --- a/e2e/e2etests/test_update_bytecode_connector.go +++ b/e2e/e2etests/test_update_bytecode_connector.go @@ -5,12 +5,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..ebed0e5fae 100644 --- a/e2e/e2etests/test_update_bytecode_zrc20.go +++ b/e2e/e2etests/test_update_bytecode_zrc20.go @@ -5,13 +5,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..f323261b69 100644 --- a/e2e/e2etests/test_v2_erc20_deposit.go +++ b/e2e/e2etests/test_v2_erc20_deposit.go @@ -5,11 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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/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" ) 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..2a7c488ff4 100644 --- a/e2e/e2etests/test_v2_erc20_deposit_and_call.go +++ b/e2e/e2etests/test_v2_erc20_deposit_and_call.go @@ -5,11 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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/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" ) 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..d150851f6e 100644 --- a/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go +++ b/e2e/e2etests/test_v2_erc20_deposit_and_call_revert.go @@ -5,12 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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" "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" ) 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..0a13ea87a7 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 @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..5f6aebf7eb 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw.go +++ b/e2e/e2etests/test_v2_erc20_withdraw.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..a8f45e7ead 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw_and_call.go +++ b/e2e/e2etests/test_v2_erc20_withdraw_and_call.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..29cf3d5a2b 100644 --- a/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go +++ b/e2e/e2etests/test_v2_erc20_withdraw_and_call_revert.go @@ -5,12 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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" "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" ) 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..714a9dc026 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 @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..1180be6b42 100644 --- a/e2e/e2etests/test_v2_eth_deposit.go +++ b/e2e/e2etests/test_v2_eth_deposit.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..a164022bb2 100644 --- a/e2e/e2etests/test_v2_eth_deposit_and_call.go +++ b/e2e/e2etests/test_v2_eth_deposit_and_call.go @@ -5,11 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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/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" ) 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..cd2a61ee7e 100644 --- a/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go +++ b/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go @@ -4,12 +4,11 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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" "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" ) 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..1d95d99ea6 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 @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..07166ac5e0 100644 --- a/e2e/e2etests/test_v2_eth_withdraw.go +++ b/e2e/e2etests/test_v2_eth_withdraw.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..b78760dc41 100644 --- a/e2e/e2etests/test_v2_eth_withdraw_and_call.go +++ b/e2e/e2etests/test_v2_eth_withdraw_and_call.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..5983f0d03e 100644 --- a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go +++ b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go @@ -5,12 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" + "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" "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" ) 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..7ad24e8fc4 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 @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..55b6213acd 100644 --- a/e2e/e2etests/test_v2_evm_to_zevm_call.go +++ b/e2e/e2etests/test_v2_evm_to_zevm_call.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..c079d9bdac 100644 --- a/e2e/e2etests/test_v2_zevm_to_evm_call.go +++ b/e2e/e2etests/test_v2_zevm_to_evm_call.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "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/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" ) 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..e35af0280e 100644 --- a/e2e/e2etests/test_whitelist_erc20.go +++ b/e2e/e2etests/test_whitelist_erc20.go @@ -7,14 +7,13 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "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" "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" ) // TestWhitelistERC20 tests the whitelist ERC20 functionality diff --git a/e2e/e2etests/test_zeta_deposit.go b/e2e/e2etests/test_zeta_deposit.go index 00b672ee61..a5e97c9524 100644 --- a/e2e/e2etests/test_zeta_deposit.go +++ b/e2e/e2etests/test_zeta_deposit.go @@ -2,9 +2,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..b5496f2249 100644 --- a/e2e/e2etests/test_zeta_deposit_new_address.go +++ b/e2e/e2etests/test_zeta_deposit_new_address.go @@ -2,10 +2,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..e43a80cd9f 100644 --- a/e2e/e2etests/test_zeta_deposit_restricted_address.go +++ b/e2e/e2etests/test_zeta_deposit_restricted_address.go @@ -3,9 +3,8 @@ package e2etests 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..61887cf61a 100644 --- a/e2e/e2etests/test_zeta_withdraw.go +++ b/e2e/e2etests/test_zeta_withdraw.go @@ -2,10 +2,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..efb71c1743 100644 --- a/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go +++ b/e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go @@ -4,11 +4,10 @@ import ( "math/big" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/runner" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/chains" 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" ) 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..6e4e5904b8 100644 --- a/e2e/e2etests/test_zrc20_swap.go +++ b/e2e/e2etests/test_zrc20_swap.go @@ -7,9 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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 7c9a0c5746..295a7ae6b4 100644 --- a/e2e/runner/accounting.go +++ b/e2e/runner/accounting.go @@ -11,9 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "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..db7d8b7290 100644 --- a/e2e/runner/admin_evm.go +++ b/e2e/runner/admin_evm.go @@ -5,8 +5,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..83d497e847 100644 --- a/e2e/runner/bitcoin.go +++ b/e2e/runner/bitcoin.go @@ -14,14 +14,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "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/evm.go b/e2e/runner/evm.go index 3b5e7f8d90..a2e89fcbc5 100644 --- a/e2e/runner/evm.go +++ b/e2e/runner/evm.go @@ -10,8 +10,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "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..789b2b6987 100644 --- a/e2e/runner/liquidity.go +++ b/e2e/runner/liquidity.go @@ -7,8 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "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..c7de9792c6 100644 --- a/e2e/runner/logger.go +++ b/e2e/runner/logger.go @@ -7,10 +7,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/fatih/color" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "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" ) const ( diff --git a/e2e/runner/report.go b/e2e/runner/report.go index 31cd085fc6..f1fc26bbe7 100644 --- a/e2e/runner/report.go +++ b/e2e/runner/report.go @@ -8,10 +8,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 77d068c398..63b9cc2a30 100644 --- a/e2e/runner/runner.go +++ b/e2e/runner/runner.go @@ -17,6 +17,18 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/rpc" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" 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" @@ -29,19 +41,6 @@ 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/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" ) type E2ERunnerOption func(*E2ERunner) diff --git a/e2e/runner/setup_evm.go b/e2e/runner/setup_evm.go index ab8d3edd16..63ab2d4cc2 100644 --- a/e2e/runner/setup_evm.go +++ b/e2e/runner/setup_evm.go @@ -7,17 +7,16 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" 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" ) const ( diff --git a/e2e/runner/setup_solana.go b/e2e/runner/setup_solana.go index 10aa4b1a15..5d6b14d46d 100644 --- a/e2e/runner/setup_solana.go +++ b/e2e/runner/setup_solana.go @@ -6,9 +6,8 @@ import ( "github.com/gagliardetto/solana-go/rpc" "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..f2a800d1a1 100644 --- a/e2e/runner/setup_zeta.go +++ b/e2e/runner/setup_zeta.go @@ -8,21 +8,20 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/wzeta.sol" connectorzevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-core/contracts/uniswapv2factory.sol" 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" ) // 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 30e089406e..1bcd8a4048 100644 --- a/e2e/runner/solana.go +++ b/e2e/runner/solana.go @@ -9,10 +9,9 @@ import ( "github.com/gagliardetto/solana-go/rpc" "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..bdb4126483 100644 --- a/e2e/runner/testdapp.go +++ b/e2e/runner/testdapp.go @@ -6,8 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" 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..0c83b39f49 100644 --- a/e2e/runner/trackers.go +++ b/e2e/runner/trackers.go @@ -2,8 +2,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..053c595988 100644 --- a/e2e/runner/v2_evm.go +++ b/e2e/runner/v2_evm.go @@ -6,9 +6,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/utils" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol" - - "github.com/zeta-chain/zetacore/e2e/utils" ) // V2ETHDeposit calls Deposit of Gateway with gas token on EVM diff --git a/e2e/runner/v2_setup_evm.go b/e2e/runner/v2_setup_evm.go index 001da12e04..2c95e761e7 100644 --- a/e2e/runner/v2_setup_evm.go +++ b/e2e/runner/v2_setup_evm.go @@ -6,13 +6,12 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "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" 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" ) // 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 c82e8fa741..0a4f8f1c33 100644 --- a/e2e/runner/v2_setup_zeta.go +++ b/e2e/runner/v2_setup_zeta.go @@ -5,12 +5,11 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "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" "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" ) // SetZEVMContractsV2 set contracts for the ZEVM diff --git a/e2e/runner/zeta.go b/e2e/runner/zeta.go index fec82f459a..02d951cfc5 100644 --- a/e2e/runner/zeta.go +++ b/e2e/runner/zeta.go @@ -9,12 +9,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/e2e/utils" + "github.com/zeta-chain/node/pkg/retry" + "github.com/zeta-chain/node/x/crosschain/types" 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" ) func (r *E2ERunner) WaitForBlocks(n int64) { diff --git a/e2e/txserver/zeta_tx_server.go b/e2e/txserver/zeta_tx_server.go index 39a6d8325b..909531d359 100644 --- a/e2e/txserver/zeta_tx_server.go +++ b/e2e/txserver/zeta_tx_server.go @@ -36,17 +36,16 @@ import ( "github.com/zeta-chain/ethermint/crypto/hd" 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..708ea1ddb9 100644 --- a/e2e/utils/contracts.go +++ b/e2e/utils/contracts.go @@ -5,8 +5,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..22d8729f33 100644 --- a/e2e/utils/require.go +++ b/e2e/utils/require.go @@ -5,8 +5,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..26ede7265e 100644 --- a/e2e/utils/zetacore.go +++ b/e2e/utils/zetacore.go @@ -7,10 +7,9 @@ import ( rpchttp "github.com/cometbft/cometbft/rpc/client/http" "github.com/pkg/errors" "github.com/stretchr/testify/require" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" ) type CCTXClient = crosschaintypes.QueryClient diff --git a/go.mod b/go.mod index c151309321..bfdfa49e1c 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 6eb0a71e76..8c3f0faed8 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_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/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..0ceae5b3d1 100644 --- a/pkg/crypto/address.go +++ b/pkg/crypto/address.go @@ -2,8 +2,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/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..d74c699d3f 100644 --- a/pkg/crypto/pubkey.go +++ b/pkg/crypto/pubkey.go @@ -12,9 +12,8 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" 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..1e72d2217e 100644 --- a/pkg/crypto/tss.go +++ b/pkg/crypto/tss.go @@ -5,8 +5,7 @@ import ( "github.com/btcsuite/btcutil" 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/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/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..6dc72c1561 100644 --- a/pkg/proofs/headers.go +++ b/pkg/proofs/headers.go @@ -13,9 +13,8 @@ import ( "github.com/btcsuite/btcutil" 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..c6a0450732 100644 --- a/pkg/proofs/proof.go +++ b/pkg/proofs/proof.go @@ -8,9 +8,8 @@ import ( "github.com/btcsuite/btcutil" 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..ed92a9be0a 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" diff --git a/precompiles/precompiles.go b/precompiles/precompiles.go index e3901aa873..42f794f7f5 100644 --- a/precompiles/precompiles.go +++ b/precompiles/precompiles.go @@ -8,9 +8,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" 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..2da342709b 100644 --- a/precompiles/prototype/prototype.go +++ b/precompiles/prototype/prototype.go @@ -10,9 +10,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "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/rpc/apis.go b/rpc/apis.go index 3f295b7136..8a9ed53bf1 100644 --- a/rpc/apis.go +++ b/rpc/apis.go @@ -23,16 +23,15 @@ import ( "github.com/cosmos/cosmos-sdk/server" "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..d95db05c8a 100644 --- a/rpc/backend/account_info.go +++ b/rpc/backend/account_info.go @@ -29,8 +29,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "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..a991250431 100644 --- a/rpc/backend/backend.go +++ b/rpc/backend/backend.go @@ -34,9 +34,8 @@ import ( "github.com/ethereum/go-ethereum/signer/core/apitypes" 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..9297ed6007 100644 --- a/rpc/backend/blocks.go +++ b/rpc/backend/blocks.go @@ -34,10 +34,9 @@ import ( "github.com/ethereum/go-ethereum/trie" "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + rpctypes "github.com/zeta-chain/node/rpc/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" - - rpctypes "github.com/zeta-chain/zetacore/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..1cc1da1c18 100644 --- a/rpc/backend/call_tx.go +++ b/rpc/backend/call_tx.go @@ -32,10 +32,9 @@ import ( "github.com/pkg/errors" ethermint "github.com/zeta-chain/ethermint/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + rpctypes "github.com/zeta-chain/node/rpc/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - rpctypes "github.com/zeta-chain/zetacore/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..ae6d420ea3 100644 --- a/rpc/backend/chain_info.go +++ b/rpc/backend/chain_info.go @@ -32,8 +32,7 @@ import ( ethermint "github.com/zeta-chain/ethermint/types" 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..56dc82f4b6 100644 --- a/rpc/backend/node_info.go +++ b/rpc/backend/node_info.go @@ -38,8 +38,7 @@ import ( "github.com/zeta-chain/ethermint/server/config" 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..294d2f18ac 100644 --- a/rpc/backend/tracing.go +++ b/rpc/backend/tracing.go @@ -24,8 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "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..012aecced9 100644 --- a/rpc/backend/tx_info.go +++ b/rpc/backend/tx_info.go @@ -29,8 +29,7 @@ import ( "github.com/pkg/errors" 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..f4c1652b11 100644 --- a/rpc/backend/utils.go +++ b/rpc/backend/utils.go @@ -33,10 +33,9 @@ import ( "github.com/ethereum/go-ethereum/consensus/misc" ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + "github.com/zeta-chain/node/rpc/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/rpc/types" ) type txGasAndReward struct { diff --git a/rpc/namespaces/ethereum/debug/api.go b/rpc/namespaces/ethereum/debug/api.go index 9608fa7d67..5df31a403d 100644 --- a/rpc/namespaces/ethereum/debug/api.go +++ b/rpc/namespaces/ethereum/debug/api.go @@ -36,10 +36,9 @@ import ( "github.com/ethereum/go-ethereum/rlp" 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..bb5c4fa1d2 100644 --- a/rpc/namespaces/ethereum/debug/trace.go +++ b/rpc/namespaces/ethereum/debug/trace.go @@ -25,8 +25,7 @@ import ( "runtime/trace" 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..c947ae3039 100644 --- a/rpc/namespaces/ethereum/debug/utils.go +++ b/rpc/namespaces/ethereum/debug/utils.go @@ -21,8 +21,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..ac36f86e45 100644 --- a/rpc/namespaces/ethereum/eth/api.go +++ b/rpc/namespaces/ethereum/eth/api.go @@ -25,9 +25,8 @@ import ( "github.com/ethereum/go-ethereum/rpc" 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..e0e68954a3 100644 --- a/rpc/namespaces/ethereum/eth/filters/api.go +++ b/rpc/namespaces/ethereum/eth/filters/api.go @@ -31,8 +31,7 @@ import ( "github.com/ethereum/go-ethereum/eth/filters" "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..5d8e6b1181 100644 --- a/rpc/namespaces/ethereum/eth/filters/filter_system.go +++ b/rpc/namespaces/ethereum/eth/filters/filter_system.go @@ -34,8 +34,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "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..869e3fb807 100644 --- a/rpc/namespaces/ethereum/eth/filters/filters.go +++ b/rpc/namespaces/ethereum/eth/filters/filters.go @@ -28,9 +28,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "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..b998d8eaa8 100644 --- a/rpc/namespaces/ethereum/miner/api.go +++ b/rpc/namespaces/ethereum/miner/api.go @@ -20,8 +20,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" "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..274e201626 100644 --- a/rpc/namespaces/ethereum/personal/api.go +++ b/rpc/namespaces/ethereum/personal/api.go @@ -31,8 +31,7 @@ import ( "github.com/zeta-chain/ethermint/crypto/hd" 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..cdf2c0b523 100644 --- a/rpc/namespaces/ethereum/txpool/api.go +++ b/rpc/namespaces/ethereum/txpool/api.go @@ -18,8 +18,7 @@ package txpool 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..19cf5d1baf 100644 --- a/rpc/namespaces/ethereum/web3/api.go +++ b/rpc/namespaces/ethereum/web3/api.go @@ -21,8 +21,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..99cf0c4c27 100644 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -40,11 +40,10 @@ import ( "github.com/gorilla/websocket" "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/server/json_rpc.go b/server/json_rpc.go index 4b17ccf413..85d46213b5 100644 --- a/server/json_rpc.go +++ b/server/json_rpc.go @@ -27,9 +27,8 @@ import ( "github.com/gorilla/mux" "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..c6eda86b73 100644 --- a/server/start.go +++ b/server/start.go @@ -55,12 +55,11 @@ import ( "github.com/spf13/cobra" "github.com/zeta-chain/ethermint/indexer" ethermint "github.com/zeta-chain/ethermint/types" + zetaos "github.com/zeta-chain/node/pkg/os" + "github.com/zeta-chain/node/server/config" + srvflags "github.com/zeta-chain/node/server/flags" "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" ) // DBOpener is a function to open `application.db`, potentially with customized options. diff --git a/server/util.go b/server/util.go index b8a5d5ea63..ecc8aab04a 100644 --- a/server/util.go +++ b/server/util.go @@ -29,9 +29,8 @@ import ( "github.com/gorilla/mux" "github.com/improbable-eng/grpc-web/go/grpcweb" "github.com/spf13/cobra" + "github.com/zeta-chain/node/server/config" "golang.org/x/net/netutil" - - "github.com/zeta-chain/zetacore/server/config" ) // AddCommands adds server commands diff --git a/testutil/keeper/authority.go b/testutil/keeper/authority.go index 34b917f2d4..00ef97c35e 100644 --- a/testutil/keeper/authority.go +++ b/testutil/keeper/authority.go @@ -12,11 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "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..795ff3d2df 100644 --- a/testutil/keeper/codec.go +++ b/testutil/keeper/codec.go @@ -15,11 +15,10 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" 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..1a19026d0a 100644 --- a/testutil/keeper/config.go +++ b/testutil/keeper/config.go @@ -21,13 +21,12 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" 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..26f19be029 100644 --- a/testutil/keeper/crosschain.go +++ b/testutil/keeper/crosschain.go @@ -17,21 +17,20 @@ import ( "github.com/stretchr/testify/mock" "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..0e746f58fd 100644 --- a/testutil/keeper/emissions.go +++ b/testutil/keeper/emissions.go @@ -11,10 +11,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" 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..126ceef77d 100644 --- a/testutil/keeper/fungible.go +++ b/testutil/keeper/fungible.go @@ -17,18 +17,17 @@ import ( "github.com/stretchr/testify/require" "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..ccd3ec504b 100644 --- a/testutil/keeper/ibccrosschain.go +++ b/testutil/keeper/ibccrosschain.go @@ -10,10 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..9f242a962e 100644 --- a/testutil/keeper/keeper.go +++ b/testutil/keeper/keeper.go @@ -46,29 +46,28 @@ import ( evmtypes "github.com/zeta-chain/ethermint/x/evm/types" 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..0317822a15 100644 --- a/testutil/keeper/lightclient.go +++ b/testutil/keeper/lightclient.go @@ -11,10 +11,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" 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..f4c043bbe1 100644 --- a/testutil/keeper/observer.go +++ b/testutil/keeper/observer.go @@ -17,10 +17,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "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..959b4efe84 100644 --- a/testutil/network/genesis_state.go +++ b/testutil/network/genesis_state.go @@ -11,14 +11,13 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "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..3a6dedf89e 100644 --- a/testutil/network/network_setup.go +++ b/testutil/network/network_setup.go @@ -41,9 +41,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/spf13/cobra" + "github.com/zeta-chain/node/cmd/zetacored/config" "google.golang.org/grpc" - - "github.com/zeta-chain/zetacore/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..3a62b6c866 100644 --- a/testutil/sample/authority.go +++ b/testutil/sample/authority.go @@ -4,9 +4,8 @@ import ( "fmt" 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..67d8ae4122 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -14,11 +14,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/coin" + "github.com/zeta-chain/node/x/crosschain/types" "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" ) func RateLimiterFlags() types.RateLimiterFlags { diff --git a/testutil/sample/crypto.go b/testutil/sample/crypto.go index 906b8f6ee0..d1d600f43d 100644 --- a/testutil/sample/crypto.go +++ b/testutil/sample/crypto.go @@ -17,9 +17,8 @@ import ( ethcrypto "github.com/ethereum/go-ethereum/crypto" "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..57859f88c3 100644 --- a/testutil/sample/emissions.go +++ b/testutil/sample/emissions.go @@ -4,8 +4,7 @@ import ( "testing" "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..adf70cfd59 100644 --- a/testutil/sample/lightclient.go +++ b/testutil/sample/lightclient.go @@ -7,12 +7,11 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "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..082a3347c4 100644 --- a/testutil/sample/observer.go +++ b/testutil/sample/observer.go @@ -8,11 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" 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..34a54d61da 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -16,9 +16,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" 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..7abbcac8f7 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -18,10 +18,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" 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..05bb0a77f2 100644 --- a/x/authority/client/cli/query.go +++ b/x/authority/client/cli/query.go @@ -5,8 +5,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..780d91509c 100644 --- a/x/authority/client/cli/query_authorization_list.go +++ b/x/authority/client/cli/query_authorization_list.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..662aa5ad0b 100644 --- a/x/authority/client/cli/query_chain_info.go +++ b/x/authority/client/cli/query_chain_info.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..a978f750ef 100644 --- a/x/authority/client/cli/query_policies.go +++ b/x/authority/client/cli/query_policies.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..355942c673 100644 --- a/x/authority/client/cli/tx.go +++ b/x/authority/client/cli/tx.go @@ -5,8 +5,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..ff8038c575 100644 --- a/x/authority/client/cli/tx_add_authorization.go +++ b/x/authority/client/cli/tx_add_authorization.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..9cfb266c62 100644 --- a/x/authority/client/cli/tx_remove_authorization.go +++ b/x/authority/client/cli/tx_remove_authorization.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..6b06998c85 100644 --- a/x/authority/client/cli/tx_update_chain_info.go +++ b/x/authority/client/cli/tx_update_chain_info.go @@ -10,8 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..23a1e0d48c 100644 --- a/x/authority/client/cli/tx_update_policies.go +++ b/x/authority/client/cli/tx_update_policies.go @@ -10,8 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..ac885720c7 100644 --- a/x/authority/genesis.go +++ b/x/authority/genesis.go @@ -2,9 +2,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..5a1c850369 100644 --- a/x/authority/keeper/authorization_list.go +++ b/x/authority/keeper/authorization_list.go @@ -6,8 +6,7 @@ import ( "cosmossdk.io/errors" "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..1dea5dcf0e 100644 --- a/x/authority/keeper/chain_info.go +++ b/x/authority/keeper/chain_info.go @@ -3,9 +3,8 @@ package keeper 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..9f4c81ed6e 100644 --- a/x/authority/keeper/grpc_query_authorization_list.go +++ b/x/authority/keeper/grpc_query_authorization_list.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/authority/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..410572dfb1 100644 --- a/x/authority/keeper/grpc_query_chain_info.go +++ b/x/authority/keeper/grpc_query_chain_info.go @@ -4,11 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/authority/types" "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" ) // 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..0be5916197 100644 --- a/x/authority/keeper/grpc_query_policies.go +++ b/x/authority/keeper/grpc_query_policies.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/authority/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..e8faf2712b 100644 --- a/x/authority/keeper/keeper.go +++ b/x/authority/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..9176e47dfb 100644 --- a/x/authority/keeper/migrator.go +++ b/x/authority/keeper/migrator.go @@ -2,8 +2,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..2079ccfcba 100644 --- a/x/authority/keeper/msg_server_add_authorization.go +++ b/x/authority/keeper/msg_server_add_authorization.go @@ -5,8 +5,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..06adf87a6b 100644 --- a/x/authority/keeper/msg_server_remove_authorization.go +++ b/x/authority/keeper/msg_server_remove_authorization.go @@ -6,8 +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" ) // 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..1127928f9f 100644 --- a/x/authority/keeper/msg_server_update_chain_info.go +++ b/x/authority/keeper/msg_server_update_chain_info.go @@ -5,8 +5,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..545a51ca71 100644 --- a/x/authority/keeper/msg_server_update_policies.go +++ b/x/authority/keeper/msg_server_update_policies.go @@ -6,8 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" 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..7165a2d663 100644 --- a/x/authority/keeper/policies.go +++ b/x/authority/keeper/policies.go @@ -3,8 +3,7 @@ package keeper 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..00984bb30c 100644 --- a/x/authority/migrations/v2/migrate.go +++ b/x/authority/migrations/v2/migrate.go @@ -2,8 +2,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..e3e0ac172e 100644 --- a/x/authority/module.go +++ b/x/authority/module.go @@ -14,10 +14,9 @@ import ( "github.com/gorilla/mux" "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_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..ff1ef2dd9b 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" 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_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_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/crosschain/client/cli/cli_gas_price.go b/x/crosschain/client/cli/cli_gas_price.go index a08d16eed1..d1fe46cea6 100644 --- a/x/crosschain/client/cli/cli_gas_price.go +++ b/x/crosschain/client/cli/cli_gas_price.go @@ -9,8 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..4378d1e647 100644 --- a/x/crosschain/client/cli/cli_last_block_height.go +++ b/x/crosschain/client/cli/cli_last_block_height.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..30871ccd4e 100644 --- a/x/crosschain/client/cli/cli_refund_aborted.go +++ b/x/crosschain/client/cli/cli_refund_aborted.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..4fb508d6d5 100644 --- a/x/crosschain/client/cli/cli_tss.go +++ b/x/crosschain/client/cli/cli_tss.go @@ -9,8 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "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..1d2260eeb5 100644 --- a/x/crosschain/client/cli/cli_whitelist_erc20.go +++ b/x/crosschain/client/cli/cli_whitelist_erc20.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..b4095b96f9 100644 --- a/x/crosschain/client/cli/cli_zeta_height.go +++ b/x/crosschain/client/cli/cli_zeta_height.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..3d183b2bbb 100644 --- a/x/crosschain/client/cli/query.go +++ b/x/crosschain/client/cli/query.go @@ -5,8 +5,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..2a9130965a 100644 --- a/x/crosschain/client/cli/query_cctx.go +++ b/x/crosschain/client/cli/query_cctx.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..9a657b5a7e 100644 --- a/x/crosschain/client/cli/query_cctx_rate_limit.go +++ b/x/crosschain/client/cli/query_cctx_rate_limit.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..094fce13db 100644 --- a/x/crosschain/client/cli/query_inbound_hash_to_cctx.go +++ b/x/crosschain/client/cli/query_inbound_hash_to_cctx.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..52aa99bdb0 100644 --- a/x/crosschain/client/cli/query_inbound_tracker.go +++ b/x/crosschain/client/cli/query_inbound_tracker.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..1eb4d4c870 100644 --- a/x/crosschain/client/cli/query_outbound_tracker.go +++ b/x/crosschain/client/cli/query_outbound_tracker.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..b4f6987a55 100644 --- a/x/crosschain/client/cli/query_rate_limiter_flags.go +++ b/x/crosschain/client/cli/query_rate_limiter_flags.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..d938f60732 100644 --- a/x/crosschain/client/cli/query_zeta_accounting.go +++ b/x/crosschain/client/cli/query_zeta_accounting.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..84de5f9630 100644 --- a/x/crosschain/client/cli/tx.go +++ b/x/crosschain/client/cli/tx.go @@ -5,8 +5,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..64da8d9341 100644 --- a/x/crosschain/client/cli/tx_add_inbound_tracker.go +++ b/x/crosschain/client/cli/tx_add_inbound_tracker.go @@ -7,9 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..dd8698b2dc 100644 --- a/x/crosschain/client/cli/tx_add_outbound_tracker.go +++ b/x/crosschain/client/cli/tx_add_outbound_tracker.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..11eb67771e 100644 --- a/x/crosschain/client/cli/tx_remove_outbound_tracker.go +++ b/x/crosschain/client/cli/tx_remove_outbound_tracker.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..144c520ad2 100644 --- a/x/crosschain/client/cli/tx_vote_inbound.go +++ b/x/crosschain/client/cli/tx_vote_inbound.go @@ -9,9 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..49c214980a 100644 --- a/x/crosschain/client/cli/tx_vote_outbound.go +++ b/x/crosschain/client/cli/tx_vote_outbound.go @@ -10,10 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..76fef4faff 100644 --- a/x/crosschain/client/cli/tx_vote_stuck_cctx.go +++ b/x/crosschain/client/cli/tx_vote_stuck_cctx.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..661e41627c 100644 --- a/x/crosschain/genesis.go +++ b/x/crosschain/genesis.go @@ -2,9 +2,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..d84bf9f390 100644 --- a/x/crosschain/keeper/abci.go +++ b/x/crosschain/keeper/abci.go @@ -7,11 +7,10 @@ import ( cosmoserrors "cosmossdk.io/errors" "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..3c2bce2c53 100644 --- a/x/crosschain/keeper/cctx.go +++ b/x/crosschain/keeper/cctx.go @@ -5,10 +5,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..82cf02f4dc 100644 --- a/x/crosschain/keeper/cctx_gateway_observers.go +++ b/x/crosschain/keeper/cctx_gateway_observers.go @@ -4,9 +4,8 @@ import ( "fmt" 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..aae6ded176 100644 --- a/x/crosschain/keeper/cctx_gateway_zevm.go +++ b/x/crosschain/keeper/cctx_gateway_zevm.go @@ -2,8 +2,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..83d8a34aa2 100644 --- a/x/crosschain/keeper/cctx_gateways.go +++ b/x/crosschain/keeper/cctx_gateways.go @@ -2,9 +2,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..a206bd3296 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go @@ -2,11 +2,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..4d4f10c7bc 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go @@ -11,12 +11,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..df4ffdd064 100644 --- a/x/crosschain/keeper/cctx_utils.go +++ b/x/crosschain/keeper/cctx_utils.go @@ -8,11 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..fa232ac751 100644 --- a/x/crosschain/keeper/events.go +++ b/x/crosschain/keeper/events.go @@ -4,8 +4,7 @@ import ( "strconv" 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..b908fc064d 100644 --- a/x/crosschain/keeper/evm_deposit.go +++ b/x/crosschain/keeper/evm_deposit.go @@ -11,11 +11,10 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "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..1f2ca4d287 100644 --- a/x/crosschain/keeper/evm_hooks.go +++ b/x/crosschain/keeper/evm_hooks.go @@ -15,17 +15,16 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/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" 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" ) 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..ef4b32d4c1 100644 --- a/x/crosschain/keeper/finalized_inbounds.go +++ b/x/crosschain/keeper/finalized_inbounds.go @@ -3,8 +3,7 @@ package keeper 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..4590f3b953 100644 --- a/x/crosschain/keeper/foreign_coins.go +++ b/x/crosschain/keeper/foreign_coins.go @@ -2,8 +2,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..5154a2f512 100644 --- a/x/crosschain/keeper/gas_payment.go +++ b/x/crosschain/keeper/gas_payment.go @@ -9,12 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..e328488db2 100644 --- a/x/crosschain/keeper/gas_price.go +++ b/x/crosschain/keeper/gas_price.go @@ -6,9 +6,8 @@ import ( "cosmossdk.io/math" "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..fd226ce777 100644 --- a/x/crosschain/keeper/grpc_query_cctx.go +++ b/x/crosschain/keeper/grpc_query_cctx.go @@ -7,11 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/crosschain/types" + observertypes "github.com/zeta-chain/node/x/observer/types" "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" ) 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..c4db44f1a8 100644 --- a/x/crosschain/keeper/grpc_query_cctx_rate_limit.go +++ b/x/crosschain/keeper/grpc_query_cctx_rate_limit.go @@ -6,12 +6,11 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/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" "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" ) // 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..a77f0f9c1e 100644 --- a/x/crosschain/keeper/grpc_query_gas_price.go +++ b/x/crosschain/keeper/grpc_query_gas_price.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..e52a52789a 100644 --- a/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go +++ b/x/crosschain/keeper/grpc_query_inbound_hash_to_cctx.go @@ -6,10 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..450e59dfa8 100644 --- a/x/crosschain/keeper/grpc_query_inbound_tracker.go +++ b/x/crosschain/keeper/grpc_query_inbound_tracker.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..54a25d79dd 100644 --- a/x/crosschain/keeper/grpc_query_last_block_height.go +++ b/x/crosschain/keeper/grpc_query_last_block_height.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..e295dab935 100644 --- a/x/crosschain/keeper/grpc_query_last_zeta_height.go +++ b/x/crosschain/keeper/grpc_query_last_zeta_height.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..6ae82357ba 100644 --- a/x/crosschain/keeper/grpc_query_outbound_tracker.go +++ b/x/crosschain/keeper/grpc_query_outbound_tracker.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..389194dc04 100644 --- a/x/crosschain/keeper/grpc_query_rate_limiter_flags.go +++ b/x/crosschain/keeper/grpc_query_rate_limiter_flags.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/crosschain/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..438ba95194 100644 --- a/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go +++ b/x/crosschain/keeper/grpc_query_zeta_conversion_rate.go @@ -6,12 +6,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/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" "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" ) 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..8465bf9a56 100644 --- a/x/crosschain/keeper/inbound_hash_to_cctx.go +++ b/x/crosschain/keeper/inbound_hash_to_cctx.go @@ -3,8 +3,7 @@ package keeper 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..b7a7640490 100644 --- a/x/crosschain/keeper/inbound_tracker.go +++ b/x/crosschain/keeper/inbound_tracker.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..fa8785cb7d 100644 --- a/x/crosschain/keeper/initiate_outbound.go +++ b/x/crosschain/keeper/initiate_outbound.go @@ -3,9 +3,8 @@ package keeper 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..c69e0fb1b4 100644 --- a/x/crosschain/keeper/keeper.go +++ b/x/crosschain/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..f0de01100f 100644 --- a/x/crosschain/keeper/last_block_height.go +++ b/x/crosschain/keeper/last_block_height.go @@ -3,8 +3,7 @@ package keeper 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..9f42117489 100644 --- a/x/crosschain/keeper/migrator.go +++ b/x/crosschain/keeper/migrator.go @@ -2,11 +2,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..444ed48b7e 100644 --- a/x/crosschain/keeper/msg_server_abort_stuck_cctx.go +++ b/x/crosschain/keeper/msg_server_abort_stuck_cctx.go @@ -5,9 +5,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..94e7782210 100644 --- a/x/crosschain/keeper/msg_server_add_inbound_tracker.go +++ b/x/crosschain/keeper/msg_server_add_inbound_tracker.go @@ -6,10 +6,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..00f21a6a3b 100644 --- a/x/crosschain/keeper/msg_server_add_outbound_tracker.go +++ b/x/crosschain/keeper/msg_server_add_outbound_tracker.go @@ -7,11 +7,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..ef63c63761 100644 --- a/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go +++ b/x/crosschain/keeper/msg_server_migrate_erc20_custody_funds.go @@ -5,9 +5,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..9a54f251dc 100644 --- a/x/crosschain/keeper/msg_server_migrate_tss_funds.go +++ b/x/crosschain/keeper/msg_server_migrate_tss_funds.go @@ -10,10 +10,9 @@ import ( tmtypes "github.com/cometbft/cometbft/types" 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..3c315a7381 100644 --- a/x/crosschain/keeper/msg_server_refund_aborted_tx.go +++ b/x/crosschain/keeper/msg_server_refund_aborted_tx.go @@ -6,11 +6,10 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/crosschain/types" "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" ) // 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..2fa550246e 100644 --- a/x/crosschain/keeper/msg_server_remove_outbound_tracker.go +++ b/x/crosschain/keeper/msg_server_remove_outbound_tracker.go @@ -5,9 +5,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..c002fcbaf6 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 @@ -5,9 +5,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..dbc95d4abb 100644 --- a/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go +++ b/x/crosschain/keeper/msg_server_update_rate_limiter_flags.go @@ -5,9 +5,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..b3933c5dc4 100644 --- a/x/crosschain/keeper/msg_server_update_tss.go +++ b/x/crosschain/keeper/msg_server_update_tss.go @@ -5,10 +5,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..d157a3209a 100644 --- a/x/crosschain/keeper/msg_server_vote_gas_price.go +++ b/x/crosschain/keeper/msg_server_vote_gas_price.go @@ -9,10 +9,9 @@ import ( "cosmossdk.io/math" 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..75aa0dd470 100644 --- a/x/crosschain/keeper/msg_server_vote_inbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_inbound_tx.go @@ -5,8 +5,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..f105004156 100644 --- a/x/crosschain/keeper/msg_server_vote_outbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_outbound_tx.go @@ -9,9 +9,8 @@ import ( "cosmossdk.io/math" 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..622b756edd 100644 --- a/x/crosschain/keeper/msg_server_whitelist_erc20.go +++ b/x/crosschain/keeper/msg_server_whitelist_erc20.go @@ -8,11 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..e9f962bcea 100644 --- a/x/crosschain/keeper/outbound_tracker.go +++ b/x/crosschain/keeper/outbound_tracker.go @@ -5,8 +5,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..f47d6f5a3f 100644 --- a/x/crosschain/keeper/rate_limiter_flags.go +++ b/x/crosschain/keeper/rate_limiter_flags.go @@ -5,8 +5,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..36e3ccda4b 100644 --- a/x/crosschain/keeper/refund.go +++ b/x/crosschain/keeper/refund.go @@ -7,10 +7,9 @@ import ( errorsmod "cosmossdk.io/errors" 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..5769a7bce9 100644 --- a/x/crosschain/keeper/v2_zevm_inbound.go +++ b/x/crosschain/keeper/v2_zevm_inbound.go @@ -12,13 +12,12 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" + "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" "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" ) // 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..0fe88438e8 100644 --- a/x/crosschain/keeper/zeta_accounting.go +++ b/x/crosschain/keeper/zeta_accounting.go @@ -3,8 +3,7 @@ package keeper 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..31ed94b1f8 100644 --- a/x/crosschain/migrations/v2/migrate.go +++ b/x/crosschain/migrations/v2/migrate.go @@ -5,9 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..ba528dc2cc 100644 --- a/x/crosschain/migrations/v3/migrate.go +++ b/x/crosschain/migrations/v3/migrate.go @@ -8,9 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..e4156014cf 100644 --- a/x/crosschain/migrations/v4/migrate.go +++ b/x/crosschain/migrations/v4/migrate.go @@ -8,11 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..bfc0ada25c 100644 --- a/x/crosschain/migrations/v5/migrate.go +++ b/x/crosschain/migrations/v5/migrate.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..ef8764727c 100644 --- a/x/crosschain/module.go +++ b/x/crosschain/module.go @@ -14,10 +14,9 @@ import ( "github.com/gorilla/mux" "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..b6c038b337 100644 --- a/x/crosschain/module_simulation.go +++ b/x/crosschain/module_simulation.go @@ -4,8 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "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..b0a9efa20f 100644 --- a/x/crosschain/types/authz.go +++ b/x/crosschain/types/authz.go @@ -2,8 +2,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..4dbf81596b 100644 --- a/x/crosschain/types/cctx.go +++ b/x/crosschain/types/cctx.go @@ -9,8 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..566dab5eb9 100644 --- a/x/crosschain/types/cmd_cctxs.go +++ b/x/crosschain/types/cmd_cctxs.go @@ -7,12 +7,11 @@ import ( sdkmath "cosmossdk.io/math" 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..3005d49e7d 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" diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go index 9d053f9b05..83b1f8b66d 100644 --- a/x/crosschain/types/expected_keepers.go +++ b/x/crosschain/types/expected_keepers.go @@ -9,12 +9,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" 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/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_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..812f7f008a 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" 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..76f99a1525 100644 --- a/x/crosschain/types/message_add_inbound_tracker.go +++ b/x/crosschain/types/message_add_inbound_tracker.go @@ -4,8 +4,7 @@ import ( errorsmod "cosmossdk.io/errors" 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..9f2528bd9e 100644 --- a/x/crosschain/types/message_add_outbound_tracker.go +++ b/x/crosschain/types/message_add_outbound_tracker.go @@ -4,8 +4,7 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..20380f03c7 100644 --- a/x/crosschain/types/message_update_tss_address.go +++ b/x/crosschain/types/message_update_tss_address.go @@ -4,8 +4,7 @@ import ( errorsmod "cosmossdk.io/errors" 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..7a9268d91c 100644 --- a/x/crosschain/types/message_vote_gas_price.go +++ b/x/crosschain/types/message_vote_gas_price.go @@ -4,8 +4,7 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..08e4748595 100644 --- a/x/crosschain/types/message_vote_inbound.go +++ b/x/crosschain/types/message_vote_inbound.go @@ -6,11 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/crypto" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/coin" "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" ) // 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..e01f3db23b 100644 --- a/x/crosschain/types/message_vote_outbound.go +++ b/x/crosschain/types/message_vote_outbound.go @@ -6,10 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..955b81b120 100644 --- a/x/crosschain/types/message_whitelist_erc20.go +++ b/x/crosschain/types/message_whitelist_erc20.go @@ -5,8 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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/rate_limiter_flags.go b/x/crosschain/types/rate_limiter_flags.go index 0d4310ddc8..fbe73566af 100644 --- a/x/crosschain/types/rate_limiter_flags.go +++ b/x/crosschain/types/rate_limiter_flags.go @@ -7,8 +7,7 @@ import ( sdkmath "cosmossdk.io/math" 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..81bcf9bbcf 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" 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..aec2f8e2c5 100644 --- a/x/crosschain/types/revert_options.go +++ b/x/crosschain/types/revert_options.go @@ -3,10 +3,9 @@ package types import ( sdkmath "cosmossdk.io/math" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/pkg/crypto" "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" ) // 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..b321a01ca9 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" diff --git a/x/crosschain/types/tx_body_verification.go b/x/crosschain/types/tx_body_verification.go index 84d71054f1..e816776747 100644 --- a/x/crosschain/types/tx_body_verification.go +++ b/x/crosschain/types/tx_body_verification.go @@ -8,10 +8,9 @@ import ( "github.com/btcsuite/btcutil" 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..99ee7d3bff 100644 --- a/x/crosschain/types/validate.go +++ b/x/crosschain/types/validate.go @@ -7,8 +7,7 @@ import ( "cosmossdk.io/errors" 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..490c7ce81a 100644 --- a/x/emissions/abci.go +++ b/x/emissions/abci.go @@ -6,10 +6,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..19202a0d60 100644 --- a/x/emissions/client/cli/query.go +++ b/x/emissions/client/cli/query.go @@ -5,8 +5,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..9fde312618 100644 --- a/x/emissions/client/cli/query_get_emmisons_factors.go +++ b/x/emissions/client/cli/query_get_emmisons_factors.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..ec103c5c68 100644 --- a/x/emissions/client/cli/query_list_balances.go +++ b/x/emissions/client/cli/query_list_balances.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..aad86b0197 100644 --- a/x/emissions/client/cli/query_params.go +++ b/x/emissions/client/cli/query_params.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..3ebc7753db 100644 --- a/x/emissions/client/cli/query_show_available_emissions.go +++ b/x/emissions/client/cli/query_show_available_emissions.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..797a5c3637 100644 --- a/x/emissions/client/cli/tx.go +++ b/x/emissions/client/cli/tx.go @@ -5,8 +5,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..3092940671 100644 --- a/x/emissions/client/cli/tx_withdraw_emissions..go +++ b/x/emissions/client/cli/tx_withdraw_emissions..go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..74f360a434 100644 --- a/x/emissions/genesis.go +++ b/x/emissions/genesis.go @@ -4,9 +4,8 @@ import ( "fmt" 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..8c16f9dc39 100644 --- a/x/emissions/keeper/block_rewards_components.go +++ b/x/emissions/keeper/block_rewards_components.go @@ -2,10 +2,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..0a441adc4c 100644 --- a/x/emissions/keeper/grpc_query_get_emmisons_factors.go +++ b/x/emissions/keeper/grpc_query_get_emmisons_factors.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/emissions/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..59a2e5a7c7 100644 --- a/x/emissions/keeper/grpc_query_list_balances.go +++ b/x/emissions/keeper/grpc_query_list_balances.go @@ -3,10 +3,9 @@ package keeper import ( "context" + "github.com/zeta-chain/node/x/emissions/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..4db83d535c 100644 --- a/x/emissions/keeper/grpc_query_params.go +++ b/x/emissions/keeper/grpc_query_params.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/emissions/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..a55268f85d 100644 --- a/x/emissions/keeper/grpc_query_show_available_emissions.go +++ b/x/emissions/keeper/grpc_query_show_available_emissions.go @@ -4,11 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/cmd/zetacored/config" + "github.com/zeta-chain/node/x/emissions/types" "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" ) 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..1d674bd35d 100644 --- a/x/emissions/keeper/keeper.go +++ b/x/emissions/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..2e3ee36089 100644 --- a/x/emissions/keeper/migrator.go +++ b/x/emissions/keeper/migrator.go @@ -2,9 +2,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..2a5e2df3e9 100644 --- a/x/emissions/keeper/msg_server_update_params.go +++ b/x/emissions/keeper/msg_server_update_params.go @@ -6,8 +6,7 @@ import ( "cosmossdk.io/errors" 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..99add21bbd 100644 --- a/x/emissions/keeper/msg_server_withdraw_emissions.go +++ b/x/emissions/keeper/msg_server_withdraw_emissions.go @@ -6,9 +6,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..39bf047839 100644 --- a/x/emissions/keeper/params.go +++ b/x/emissions/keeper/params.go @@ -2,8 +2,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..3be9aa5e46 100644 --- a/x/emissions/keeper/withdrawable_emissions.go +++ b/x/emissions/keeper/withdrawable_emissions.go @@ -4,8 +4,7 @@ import ( sdkmath "cosmossdk.io/math" "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..a662d799f3 100644 --- a/x/emissions/migrations/v3/migrate.go +++ b/x/emissions/migrations/v3/migrate.go @@ -2,9 +2,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..9651104a79 100644 --- a/x/emissions/module.go +++ b/x/emissions/module.go @@ -14,11 +14,10 @@ import ( "github.com/gorilla/mux" "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/expected_keepers.go b/x/emissions/types/expected_keepers.go index 7639bec2fc..e1cffca432 100644 --- a/x/emissions/types/expected_keepers.go +++ b/x/emissions/types/expected_keepers.go @@ -3,8 +3,7 @@ package types 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_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/fungible/client/cli/query.go b/x/fungible/client/cli/query.go index eeb4104d52..6c99b760c2 100644 --- a/x/fungible/client/cli/query.go +++ b/x/fungible/client/cli/query.go @@ -5,8 +5,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..16b5748196 100644 --- a/x/fungible/client/cli/query_code_hash.go +++ b/x/fungible/client/cli/query_code_hash.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..fcb0537471 100644 --- a/x/fungible/client/cli/query_foreign_coins.go +++ b/x/fungible/client/cli/query_foreign_coins.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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_gas_stability_pool.go b/x/fungible/client/cli/query_gas_stability_pool.go index 6d037da809..411bc599d5 100644 --- a/x/fungible/client/cli/query_gas_stability_pool.go +++ b/x/fungible/client/cli/query_gas_stability_pool.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..6dd6a12ac6 100644 --- a/x/fungible/client/cli/query_system_contract.go +++ b/x/fungible/client/cli/query_system_contract.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..912fd47729 100644 --- a/x/fungible/client/cli/tx.go +++ b/x/fungible/client/cli/tx.go @@ -5,8 +5,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..8060252e00 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 @@ -7,9 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..a6d7591d11 100644 --- a/x/fungible/client/cli/tx_deploy_system_contracts.go +++ b/x/fungible/client/cli/tx_deploy_system_contracts.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..276a0e6806 100644 --- a/x/fungible/client/cli/tx_remove_foreign_coin.go +++ b/x/fungible/client/cli/tx_remove_foreign_coin.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..5e58013ae8 100644 --- a/x/fungible/client/cli/tx_update_contract_bytecode.go +++ b/x/fungible/client/cli/tx_update_contract_bytecode.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..d3fc5d90db 100644 --- a/x/fungible/client/cli/tx_update_gateway_contract.go +++ b/x/fungible/client/cli/tx_update_gateway_contract.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..7dbbd4df53 100644 --- a/x/fungible/client/cli/tx_update_system_contract.go +++ b/x/fungible/client/cli/tx_update_system_contract.go @@ -5,8 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..1a9c0e630a 100644 --- a/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go +++ b/x/fungible/client/cli/tx_update_zrc20_liquidity_cap.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..902884ba41 100644 --- a/x/fungible/client/cli/tx_update_zrc20_paused_status.go +++ b/x/fungible/client/cli/tx_update_zrc20_paused_status.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..4028f26dae 100644 --- a/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go +++ b/x/fungible/client/cli/tx_update_zrc20_withdraw_fee.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..49ba956b74 100644 --- a/x/fungible/genesis.go +++ b/x/fungible/genesis.go @@ -2,9 +2,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..21e9adc26e 100644 --- a/x/fungible/keeper/deposits.go +++ b/x/fungible/keeper/deposits.go @@ -6,11 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" eth "github.com/ethereum/go-ethereum/common" evmtypes "github.com/zeta-chain/ethermint/x/evm/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" "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" ) // 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..de0150440c 100644 --- a/x/fungible/keeper/evm.go +++ b/x/fungible/keeper/evm.go @@ -20,18 +20,17 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" evmtypes "github.com/zeta-chain/ethermint/x/evm/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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/wzeta.sol" zevmconnectorcontract "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-core/contracts/uniswapv2factory.sol" "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" ) // TODO USE string constant diff --git a/x/fungible/keeper/evm_hooks.go b/x/fungible/keeper/evm_hooks.go index 3c03c8974a..41295f7e66 100644 --- a/x/fungible/keeper/evm_hooks.go +++ b/x/fungible/keeper/evm_hooks.go @@ -7,8 +7,7 @@ import ( "github.com/ethereum/go-ethereum/core" 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..09a67546fb 100644 --- a/x/fungible/keeper/foreign_coins.go +++ b/x/fungible/keeper/foreign_coins.go @@ -6,9 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..b186b6f00c 100644 --- a/x/fungible/keeper/gas_coin_and_pool.go +++ b/x/fungible/keeper/gas_coin_and_pool.go @@ -6,14 +6,13 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "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" ) // 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..2a2af6dfd6 100644 --- a/x/fungible/keeper/gas_price.go +++ b/x/fungible/keeper/gas_price.go @@ -6,9 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/x/fungible/types" systemcontract "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" - - "github.com/zeta-chain/zetacore/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..825cd81cd0 100644 --- a/x/fungible/keeper/gas_stability_pool.go +++ b/x/fungible/keeper/gas_stability_pool.go @@ -4,8 +4,7 @@ import ( "math/big" 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..235ac63577 100644 --- a/x/fungible/keeper/grpc_query_code_hash.go +++ b/x/fungible/keeper/grpc_query_code_hash.go @@ -5,10 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/x/fungible/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..a5a1dcea7d 100644 --- a/x/fungible/keeper/grpc_query_foreign_coins.go +++ b/x/fungible/keeper/grpc_query_foreign_coins.go @@ -6,10 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/fungible/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..1a4a4c6ab0 100644 --- a/x/fungible/keeper/grpc_query_gas_stability_pool.go +++ b/x/fungible/keeper/grpc_query_gas_stability_pool.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/fungible/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..b40b7113f8 100644 --- a/x/fungible/keeper/grpc_query_system_contract.go +++ b/x/fungible/keeper/grpc_query_system_contract.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/fungible/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..d4d125ec3b 100644 --- a/x/fungible/keeper/keeper.go +++ b/x/fungible/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..fc9b4e3cbb 100644 --- a/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go +++ b/x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20.go @@ -7,10 +7,9 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..07443a1567 100644 --- a/x/fungible/keeper/msg_server_deploy_system_contract.go +++ b/x/fungible/keeper/msg_server_deploy_system_contract.go @@ -5,9 +5,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..3d17f03ff2 100644 --- a/x/fungible/keeper/msg_server_pause_zrc20.go +++ b/x/fungible/keeper/msg_server_pause_zrc20.go @@ -5,9 +5,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..c7725e9e33 100644 --- a/x/fungible/keeper/msg_server_remove_foreign_coin.go +++ b/x/fungible/keeper/msg_server_remove_foreign_coin.go @@ -6,9 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..4153c4b988 100644 --- a/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go +++ b/x/fungible/keeper/msg_server_udpate_zrc20_liquidity_cap.go @@ -5,9 +5,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..655bd474ab 100644 --- a/x/fungible/keeper/msg_server_unpause_zrc20.go +++ b/x/fungible/keeper/msg_server_unpause_zrc20.go @@ -5,9 +5,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..120658112b 100644 --- a/x/fungible/keeper/msg_server_update_contract_bytecode.go +++ b/x/fungible/keeper/msg_server_update_contract_bytecode.go @@ -7,9 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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 1fd3b95021..24a4fc49e3 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract.go @@ -5,9 +5,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" ) // 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 70b0a1144c..96a67bd63d 100644 --- a/x/fungible/keeper/msg_server_update_gateway_contract_test.go +++ b/x/fungible/keeper/msg_server_update_gateway_contract_test.go @@ -4,11 +4,11 @@ import ( "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..2d8b8aeb42 100644 --- a/x/fungible/keeper/msg_server_update_system_contract.go +++ b/x/fungible/keeper/msg_server_update_system_contract.go @@ -8,12 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/pkg/coin" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + "github.com/zeta-chain/node/x/fungible/types" "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" ) // 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..5d45083686 100644 --- a/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go +++ b/x/fungible/keeper/msg_server_update_zrc20_withdraw_fee.go @@ -7,9 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..bd8e9b157d 100644 --- a/x/fungible/keeper/system_contract.go +++ b/x/fungible/keeper/system_contract.go @@ -8,12 +8,11 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/zeta-chain/node/x/fungible/types" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/wzeta.sol" "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" ) // 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..04d7244833 100644 --- a/x/fungible/keeper/v2_deposits.go +++ b/x/fungible/keeper/v2_deposits.go @@ -8,9 +8,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + "github.com/zeta-chain/node/pkg/coin" "github.com/zeta-chain/protocol-contracts/v2/pkg/systemcontract.sol" - - "github.com/zeta-chain/zetacore/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 3015471f1c..6d68f009a5 100644 --- a/x/fungible/keeper/v2_evm.go +++ b/x/fungible/keeper/v2_evm.go @@ -6,12 +6,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" evmtypes "github.com/zeta-chain/ethermint/x/evm/types" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/fungible/types" "github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/revert.sol" "github.com/zeta-chain/protocol-contracts/v2/pkg/systemcontract.sol" - - "github.com/zeta-chain/zetacore/pkg/crypto" - "github.com/zeta-chain/zetacore/x/fungible/types" ) // CallDepositAndCallZRC20 calls the depositAndCall (ZRC20 version) function on the gateway contract diff --git a/x/fungible/keeper/zeta.go b/x/fungible/keeper/zeta.go index 7dfde65ca7..bde77dfd4d 100644 --- a/x/fungible/keeper/zeta.go +++ b/x/fungible/keeper/zeta.go @@ -4,9 +4,8 @@ import ( "math/big" 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..ea70d19188 100644 --- a/x/fungible/module.go +++ b/x/fungible/module.go @@ -14,10 +14,9 @@ import ( "github.com/gorilla/mux" "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..865224dd36 100644 --- a/x/fungible/module_simulation.go +++ b/x/fungible/module_simulation.go @@ -4,8 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "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..d946a1b959 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" 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..02638e08f0 100644 --- a/x/fungible/types/expected_keepers.go +++ b/x/fungible/types/expected_keepers.go @@ -11,8 +11,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "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..8c1edc9bb5 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" 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_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..e9ba4a955d 100644 --- a/x/fungible/types/message_deploy_fungible_coin_zrc20.go +++ b/x/fungible/types/message_deploy_fungible_coin_zrc20.go @@ -4,8 +4,7 @@ import ( cosmoserrors "cosmossdk.io/errors" 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/tx.pb.go b/x/fungible/types/tx.pb.go index f5c3778af3..4aebcf5df1 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" 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..1875a982b5 100644 --- a/x/ibccrosschain/client/cli/query.go +++ b/x/ibccrosschain/client/cli/query.go @@ -5,8 +5,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..ee4b634b84 100644 --- a/x/ibccrosschain/client/cli/tx.go +++ b/x/ibccrosschain/client/cli/tx.go @@ -5,8 +5,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..2f49d69de1 100644 --- a/x/ibccrosschain/genesis.go +++ b/x/ibccrosschain/genesis.go @@ -2,9 +2,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..0476890808 100644 --- a/x/ibccrosschain/ibc_module.go +++ b/x/ibccrosschain/ibc_module.go @@ -6,8 +6,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" 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..716dd558b7 100644 --- a/x/ibccrosschain/keeper/keeper.go +++ b/x/ibccrosschain/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..ef11dc3397 100644 --- a/x/ibccrosschain/module.go +++ b/x/ibccrosschain/module.go @@ -13,10 +13,9 @@ import ( "github.com/gorilla/mux" "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/lightclient/client/cli/query.go b/x/lightclient/client/cli/query.go index b0fe0e7f38..684663c0e2 100644 --- a/x/lightclient/client/cli/query.go +++ b/x/lightclient/client/cli/query.go @@ -5,8 +5,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..f3d5a79c5e 100644 --- a/x/lightclient/client/cli/query_block_header.go +++ b/x/lightclient/client/cli/query_block_header.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..e184a93dcd 100644 --- a/x/lightclient/client/cli/query_chain_state.go +++ b/x/lightclient/client/cli/query_chain_state.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..02a3ca9540 100644 --- a/x/lightclient/client/cli/query_verification_flags.go +++ b/x/lightclient/client/cli/query_verification_flags.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..66cbc421d7 100644 --- a/x/lightclient/client/cli/tx.go +++ b/x/lightclient/client/cli/tx.go @@ -5,8 +5,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..ed09bd5670 100644 --- a/x/lightclient/client/cli/tx_disable_verification_flags.go +++ b/x/lightclient/client/cli/tx_disable_verification_flags.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..813c7ab87f 100644 --- a/x/lightclient/client/cli/tx_enable_verification_flags.go +++ b/x/lightclient/client/cli/tx_enable_verification_flags.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..720804cd6d 100644 --- a/x/lightclient/genesis.go +++ b/x/lightclient/genesis.go @@ -2,9 +2,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..c07dd7a1fc 100644 --- a/x/lightclient/keeper/block_header.go +++ b/x/lightclient/keeper/block_header.go @@ -6,9 +6,8 @@ import ( cosmoserrors "cosmossdk.io/errors" "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..50807d58f3 100644 --- a/x/lightclient/keeper/block_header_verification.go +++ b/x/lightclient/keeper/block_header_verification.go @@ -4,8 +4,7 @@ import ( cosmoserrors "cosmossdk.io/errors" "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..12352634c8 100644 --- a/x/lightclient/keeper/chain_state.go +++ b/x/lightclient/keeper/chain_state.go @@ -6,8 +6,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..470db18cf0 100644 --- a/x/lightclient/keeper/grpc_query_block_header.go +++ b/x/lightclient/keeper/grpc_query_block_header.go @@ -4,12 +4,11 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" "golang.org/x/net/context" "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" ) // 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..e8f8ac36f9 100644 --- a/x/lightclient/keeper/grpc_query_chain_state.go +++ b/x/lightclient/keeper/grpc_query_chain_state.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/lightclient/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..ca2814791a 100644 --- a/x/lightclient/keeper/grpc_query_header_enabled_chains.go +++ b/x/lightclient/keeper/grpc_query_header_enabled_chains.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/lightclient/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..045c59c730 100644 --- a/x/lightclient/keeper/grpc_query_prove.go +++ b/x/lightclient/keeper/grpc_query_prove.go @@ -7,12 +7,11 @@ import ( "github.com/btcsuite/btcutil" sdk "github.com/cosmos/cosmos-sdk/types" ethtypes "github.com/ethereum/go-ethereum/core/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/proofs" + "github.com/zeta-chain/node/x/lightclient/types" "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" ) // 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..8b3d1f6768 100644 --- a/x/lightclient/keeper/keeper.go +++ b/x/lightclient/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..d9111154cd 100644 --- a/x/lightclient/keeper/msg_server_disable_block_header_verification.go +++ b/x/lightclient/keeper/msg_server_disable_block_header_verification.go @@ -5,9 +5,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..bde56ec4e5 100644 --- a/x/lightclient/keeper/msg_server_enable_block_header_verification.go +++ b/x/lightclient/keeper/msg_server_enable_block_header_verification.go @@ -5,9 +5,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..cfdfc63d37 100644 --- a/x/lightclient/keeper/proof.go +++ b/x/lightclient/keeper/proof.go @@ -3,10 +3,9 @@ package keeper 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..d5439e6437 100644 --- a/x/lightclient/module.go +++ b/x/lightclient/module.go @@ -14,10 +14,9 @@ import ( "github.com/gorilla/mux" "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_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/expected_keepers.go b/x/lightclient/types/expected_keepers.go index 71f83b2c49..66dda40244 100644 --- a/x/lightclient/types/expected_keepers.go +++ b/x/lightclient/types/expected_keepers.go @@ -2,8 +2,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..4118f50c50 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" 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..8cecf63642 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" 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..8c4639199f 100644 --- a/x/observer/abci.go +++ b/x/observer/abci.go @@ -4,9 +4,8 @@ import ( "math" 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..8b5aa6a5fc 100644 --- a/x/observer/client/cli/query.go +++ b/x/observer/client/cli/query.go @@ -5,8 +5,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..4140381cd3 100644 --- a/x/observer/client/cli/query_ballot.go +++ b/x/observer/client/cli/query_ballot.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..f18afde986 100644 --- a/x/observer/client/cli/query_blame.go +++ b/x/observer/client/cli/query_blame.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..1fe5094421 100644 --- a/x/observer/client/cli/query_chain_nonce.go +++ b/x/observer/client/cli/query_chain_nonce.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..7844473d05 100644 --- a/x/observer/client/cli/query_chain_params.go +++ b/x/observer/client/cli/query_chain_params.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..f62646dbd8 100644 --- a/x/observer/client/cli/query_get_tss_address.go +++ b/x/observer/client/cli/query_get_tss_address.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..4fd049e854 100644 --- a/x/observer/client/cli/query_keygen.go +++ b/x/observer/client/cli/query_keygen.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..12bd27fb10 100644 --- a/x/observer/client/cli/query_node_account.go +++ b/x/observer/client/cli/query_node_account.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..88447ef734 100644 --- a/x/observer/client/cli/query_observers.go +++ b/x/observer/client/cli/query_observers.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..e89fb51b21 100644 --- a/x/observer/client/cli/query_pending_nonces.go +++ b/x/observer/client/cli/query_pending_nonces.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..f2bfc275f0 100644 --- a/x/observer/client/cli/query_permission_flags.go +++ b/x/observer/client/cli/query_permission_flags.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..7fb37a2529 100644 --- a/x/observer/client/cli/query_show_observer_count.go +++ b/x/observer/client/cli/query_show_observer_count.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..cab72274e3 100644 --- a/x/observer/client/cli/query_supported_chains.go +++ b/x/observer/client/cli/query_supported_chains.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..067d6cca2f 100644 --- a/x/observer/client/cli/query_tss.go +++ b/x/observer/client/cli/query_tss.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..4158efcd0c 100644 --- a/x/observer/client/cli/query_tss_fund_migrator.go +++ b/x/observer/client/cli/query_tss_fund_migrator.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "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..9c01f254e0 100644 --- a/x/observer/client/cli/tx.go +++ b/x/observer/client/cli/tx.go @@ -5,8 +5,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..e3f72f8a54 100644 --- a/x/observer/client/cli/tx_add_observer.go +++ b/x/observer/client/cli/tx_add_observer.go @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..24ac9a91e9 100644 --- a/x/observer/client/cli/tx_disable_cctx_flags.go +++ b/x/observer/client/cli/tx_disable_cctx_flags.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..4d037e579f 100644 --- a/x/observer/client/cli/tx_enable_cctx_flags.go +++ b/x/observer/client/cli/tx_enable_cctx_flags.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..ed6823cd86 100644 --- a/x/observer/client/cli/tx_remove_chain_params.go +++ b/x/observer/client/cli/tx_remove_chain_params.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..b09a82f664 100644 --- a/x/observer/client/cli/tx_reset_chain_nonces.go +++ b/x/observer/client/cli/tx_reset_chain_nonces.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..499bb80b80 100644 --- a/x/observer/client/cli/tx_update_chain_params.go +++ b/x/observer/client/cli/tx_update_chain_params.go @@ -9,8 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..90904dd3cb 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 @@ -8,8 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..ca2bf4dc6c 100644 --- a/x/observer/client/cli/tx_update_keygen.go +++ b/x/observer/client/cli/tx_update_keygen.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "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..93e0261e32 100644 --- a/x/observer/client/cli/tx_update_observer.go +++ b/x/observer/client/cli/tx_update_observer.go @@ -9,8 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" 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..f54da67092 100644 --- a/x/observer/client/cli/tx_vote_blame.go +++ b/x/observer/client/cli/tx_vote_blame.go @@ -12,9 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" + "github.com/zeta-chain/node/x/observer/types" "gitlab.com/thorchain/tss/go-tss/blame" - - "github.com/zeta-chain/zetacore/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..03b854273e 100644 --- a/x/observer/client/cli/tx_vote_tss.go +++ b/x/observer/client/cli/tx_vote_tss.go @@ -8,9 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "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..bad5cdd402 100644 --- a/x/observer/genesis.go +++ b/x/observer/genesis.go @@ -2,10 +2,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..2cb550abf1 100644 --- a/x/observer/keeper/ballot.go +++ b/x/observer/keeper/ballot.go @@ -3,8 +3,7 @@ package keeper 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..a9143a58e6 100644 --- a/x/observer/keeper/blame.go +++ b/x/observer/keeper/blame.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..bd91d6893f 100644 --- a/x/observer/keeper/chain_nonces.go +++ b/x/observer/keeper/chain_nonces.go @@ -3,8 +3,7 @@ package keeper 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..66fef3f569 100644 --- a/x/observer/keeper/chain_params.go +++ b/x/observer/keeper/chain_params.go @@ -4,9 +4,8 @@ import ( "fmt" 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..a7fcb7de62 100644 --- a/x/observer/keeper/crosschain_flags.go +++ b/x/observer/keeper/crosschain_flags.go @@ -3,8 +3,7 @@ package keeper 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..364b5e3754 100644 --- a/x/observer/keeper/events.go +++ b/x/observer/keeper/events.go @@ -5,8 +5,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..d56613d576 100644 --- a/x/observer/keeper/grpc_query_ballot.go +++ b/x/observer/keeper/grpc_query_ballot.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..9f122b8e78 100644 --- a/x/observer/keeper/grpc_query_blame.go +++ b/x/observer/keeper/grpc_query_blame.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..ad36c7e5f0 100644 --- a/x/observer/keeper/grpc_query_chain_params.go +++ b/x/observer/keeper/grpc_query_chain_params.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..db68377ede 100644 --- a/x/observer/keeper/grpc_query_crosschain_flags.go +++ b/x/observer/keeper/grpc_query_crosschain_flags.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..b8b0cb8fb0 100644 --- a/x/observer/keeper/grpc_query_keygen.go +++ b/x/observer/keeper/grpc_query_keygen.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..482fc46b57 100644 --- a/x/observer/keeper/grpc_query_node_account.go +++ b/x/observer/keeper/grpc_query_node_account.go @@ -6,10 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..46cee4a1a7 100644 --- a/x/observer/keeper/grpc_query_nonces.go +++ b/x/observer/keeper/grpc_query_nonces.go @@ -7,10 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..515ecaeff2 100644 --- a/x/observer/keeper/grpc_query_observer.go +++ b/x/observer/keeper/grpc_query_observer.go @@ -4,10 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/zeta-chain/zetacore/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..75db45db46 100644 --- a/x/observer/keeper/grpc_query_supported_chain.go +++ b/x/observer/keeper/grpc_query_supported_chain.go @@ -4,8 +4,7 @@ import ( "context" 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..a3a97f57af 100644 --- a/x/observer/keeper/grpc_query_tss.go +++ b/x/observer/keeper/grpc_query_tss.go @@ -5,12 +5,11 @@ import ( "sort" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/crypto" + "github.com/zeta-chain/node/x/observer/types" "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" ) // 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..7181e4a0bb 100644 --- a/x/observer/keeper/grpc_query_tss_funds_migrator_info.go +++ b/x/observer/keeper/grpc_query_tss_funds_migrator_info.go @@ -4,11 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/observer/types" "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" ) // 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..f91fd859fb 100644 --- a/x/observer/keeper/hooks.go +++ b/x/observer/keeper/hooks.go @@ -2,8 +2,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..1008fb858c 100644 --- a/x/observer/keeper/keeper.go +++ b/x/observer/keeper/keeper.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" 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..5c50a04df4 100644 --- a/x/observer/keeper/keygen.go +++ b/x/observer/keeper/keygen.go @@ -3,8 +3,7 @@ package keeper 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..20f1670774 100644 --- a/x/observer/keeper/last_observer_count.go +++ b/x/observer/keeper/last_observer_count.go @@ -3,8 +3,7 @@ package keeper 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..4078564a5c 100644 --- a/x/observer/keeper/migrator.go +++ b/x/observer/keeper/migrator.go @@ -2,8 +2,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..0a8f34a75c 100644 --- a/x/observer/keeper/msg_server_add_observer.go +++ b/x/observer/keeper/msg_server_add_observer.go @@ -7,10 +7,9 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..a79bb00176 100644 --- a/x/observer/keeper/msg_server_disable_cctx_flags.go +++ b/x/observer/keeper/msg_server_disable_cctx_flags.go @@ -5,9 +5,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..e2c86d85a8 100644 --- a/x/observer/keeper/msg_server_enable_cctx_flags.go +++ b/x/observer/keeper/msg_server_enable_cctx_flags.go @@ -5,9 +5,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..3074b3b9cb 100644 --- a/x/observer/keeper/msg_server_remove_chain_params.go +++ b/x/observer/keeper/msg_server_remove_chain_params.go @@ -5,9 +5,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..175aef0773 100644 --- a/x/observer/keeper/msg_server_reset_chain_nonces.go +++ b/x/observer/keeper/msg_server_reset_chain_nonces.go @@ -5,9 +5,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..9593f42e94 100644 --- a/x/observer/keeper/msg_server_update_chain_params.go +++ b/x/observer/keeper/msg_server_update_chain_params.go @@ -5,9 +5,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..5da2d264be 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 @@ -5,9 +5,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..6cade6a1c9 100644 --- a/x/observer/keeper/msg_server_update_keygen.go +++ b/x/observer/keeper/msg_server_update_keygen.go @@ -5,9 +5,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..ac4eb55cbb 100644 --- a/x/observer/keeper/msg_server_update_observer.go +++ b/x/observer/keeper/msg_server_update_observer.go @@ -5,9 +5,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..91ac0b5068 100644 --- a/x/observer/keeper/msg_server_vote_blame.go +++ b/x/observer/keeper/msg_server_vote_blame.go @@ -5,9 +5,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..3567e694d0 100644 --- a/x/observer/keeper/msg_server_vote_block_header.go +++ b/x/observer/keeper/msg_server_vote_block_header.go @@ -5,9 +5,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..9971c82e6a 100644 --- a/x/observer/keeper/msg_server_vote_tss.go +++ b/x/observer/keeper/msg_server_vote_tss.go @@ -7,9 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..dee0b55c2c 100644 --- a/x/observer/keeper/node_account.go +++ b/x/observer/keeper/node_account.go @@ -3,8 +3,7 @@ package keeper 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..9ee685a72b 100644 --- a/x/observer/keeper/nonce_to_cctx.go +++ b/x/observer/keeper/nonce_to_cctx.go @@ -5,8 +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" ) // 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..89e5a5776b 100644 --- a/x/observer/keeper/observer_set.go +++ b/x/observer/keeper/observer_set.go @@ -4,8 +4,7 @@ import ( "cosmossdk.io/errors" "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..b633ddd254 100644 --- a/x/observer/keeper/pending_nonces.go +++ b/x/observer/keeper/pending_nonces.go @@ -6,8 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..c3a0f0fec1 100644 --- a/x/observer/keeper/tss.go +++ b/x/observer/keeper/tss.go @@ -7,8 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..5c332d7cbc 100644 --- a/x/observer/keeper/tss_funds_migrator.go +++ b/x/observer/keeper/tss_funds_migrator.go @@ -5,8 +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) 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..a6b3096f09 100644 --- a/x/observer/keeper/vote_inbound.go +++ b/x/observer/keeper/vote_inbound.go @@ -3,9 +3,8 @@ package keeper 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..a66d2ac612 100644 --- a/x/observer/keeper/vote_outbound.go +++ b/x/observer/keeper/vote_outbound.go @@ -3,9 +3,8 @@ package keeper 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..039c868457 100644 --- a/x/observer/keeper/voting.go +++ b/x/observer/keeper/voting.go @@ -5,9 +5,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..4c7e6a8eaa 100644 --- a/x/observer/migrations/v8/migrate.go +++ b/x/observer/migrations/v8/migrate.go @@ -4,8 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" 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..dfea2ba29c 100644 --- a/x/observer/module.go +++ b/x/observer/module.go @@ -14,10 +14,9 @@ import ( "github.com/gorilla/mux" "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..e624f1aedc 100644 --- a/x/observer/module_simulation.go +++ b/x/observer/module_simulation.go @@ -6,8 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "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/chain_params.go b/x/observer/types/chain_params.go index d1bc9f1b3b..14b46c1359 100644 --- a/x/observer/types/chain_params.go +++ b/x/observer/types/chain_params.go @@ -8,10 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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_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/expected_keepers.go b/x/observer/types/expected_keepers.go index 4a556d4fa4..2d97b8ede6 100644 --- a/x/observer/types/expected_keepers.go +++ b/x/observer/types/expected_keepers.go @@ -4,10 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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_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/message_add_observer.go b/x/observer/types/message_add_observer.go index 19a58eef0a..a947ff33ac 100644 --- a/x/observer/types/message_add_observer.go +++ b/x/observer/types/message_add_observer.go @@ -4,8 +4,7 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..4d4cc59333 100644 --- a/x/observer/types/message_vote_block_header.go +++ b/x/observer/types/message_vote_block_header.go @@ -5,8 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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..65edcb1e5b 100644 --- a/x/observer/types/message_vote_tss.go +++ b/x/observer/types/message_vote_tss.go @@ -6,8 +6,7 @@ import ( cosmoserrors "cosmossdk.io/errors" 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..aecefdb38a 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" diff --git a/x/observer/types/observer_set.go b/x/observer/types/observer_set.go index db9473f187..5d7c540d99 100644 --- a/x/observer/types/observer_set.go +++ b/x/observer/types/observer_set.go @@ -3,8 +3,7 @@ package types 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/parsers.go b/x/observer/types/parsers.go index 27cd73df74..1e1d6e9c5e 100644 --- a/x/observer/types/parsers.go +++ b/x/observer/types/parsers.go @@ -2,8 +2,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/query.pb.go b/x/observer/types/query.pb.go index 5145570cae..124d8f73c1 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" diff --git a/x/observer/types/tx.pb.go b/x/observer/types/tx.pb.go index a0328fa65d..73686a968f 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" 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..259fc29f22 100644 --- a/zetaclient/authz/authz_signer.go +++ b/zetaclient/authz/authz_signer.go @@ -4,9 +4,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..01a1e04e2f 100644 --- a/zetaclient/chains/base/logger.go +++ b/zetaclient/chains/base/logger.go @@ -7,8 +7,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..1f425eb6d0 100644 --- a/zetaclient/chains/base/observer.go +++ b/zetaclient/chains/base/observer.go @@ -11,16 +11,15 @@ import ( lru "github.com/hashicorp/golang-lru" "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..fb9eac9ba0 100644 --- a/zetaclient/chains/bitcoin/fee.go +++ b/zetaclient/chains/bitcoin/fee.go @@ -13,11 +13,10 @@ import ( "github.com/btcsuite/btcutil" "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 2035340e73..e40ff1b275 100644 --- a/zetaclient/chains/bitcoin/observer/inbound.go +++ b/zetaclient/chains/bitcoin/observer/inbound.go @@ -13,17 +13,16 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "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 d8b7378b58..4ddbcc4094 100644 --- a/zetaclient/chains/bitcoin/observer/observer.go +++ b/zetaclient/chains/bitcoin/observer/observer.go @@ -17,16 +17,15 @@ import ( "github.com/btcsuite/btcutil" "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..8fc61a9563 100644 --- a/zetaclient/chains/bitcoin/observer/outbound.go +++ b/zetaclient/chains/bitcoin/observer/outbound.go @@ -10,17 +10,16 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "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..c2e61273c3 100644 --- a/zetaclient/chains/bitcoin/observer/witness.go +++ b/zetaclient/chains/bitcoin/observer/witness.go @@ -8,9 +8,8 @@ import ( "github.com/btcsuite/btcd/chaincfg" "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..88fab4c12d 100644 --- a/zetaclient/chains/bitcoin/rpc/rpc.go +++ b/zetaclient/chains/bitcoin/rpc/rpc.go @@ -8,9 +8,8 @@ import ( "github.com/btcsuite/btcd/rpcclient" "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..9688f59af3 100644 --- a/zetaclient/chains/bitcoin/signer/signer.go +++ b/zetaclient/chains/bitcoin/signer/signer.go @@ -17,19 +17,18 @@ import ( "github.com/btcsuite/btcutil" 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..049f5989f9 100644 --- a/zetaclient/chains/bitcoin/tx_script.go +++ b/zetaclient/chains/bitcoin/tx_script.go @@ -13,10 +13,9 @@ import ( "github.com/btcsuite/btcutil" "github.com/cosmos/btcutil/base58" "github.com/pkg/errors" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/pkg/constant" "golang.org/x/crypto/ripemd160" - - "github.com/zeta-chain/zetacore/pkg/chains" - "github.com/zeta-chain/zetacore/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..60352514f1 100644 --- a/zetaclient/chains/evm/observer/inbound.go +++ b/zetaclient/chains/evm/observer/inbound.go @@ -17,22 +17,21 @@ import ( "github.com/onrik/ethrpc" "github.com/pkg/errors" "github.com/rs/zerolog" + "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" "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" ) // 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..621300ff26 100644 --- a/zetaclient/chains/evm/observer/observer.go +++ b/zetaclient/chains/evm/observer/observer.go @@ -13,21 +13,20 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/onrik/ethrpc" "github.com/pkg/errors" + "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" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zeta.non-eth.sol" zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.non-eth.sol" 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" ) 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..11afcd5163 100644 --- a/zetaclient/chains/evm/observer/observer_gas.go +++ b/zetaclient/chains/evm/observer/observer_gas.go @@ -6,8 +6,7 @@ import ( "math/big" "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..c940b2dd9f 100644 --- a/zetaclient/chains/evm/observer/outbound.go +++ b/zetaclient/chains/evm/observer/outbound.go @@ -13,22 +13,21 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" "github.com/rs/zerolog" + "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" "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" 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" ) // 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..f8ffab97c4 100644 --- a/zetaclient/chains/evm/observer/v2_inbound.go +++ b/zetaclient/chains/evm/observer/v2_inbound.go @@ -10,17 +10,16 @@ import ( sdkmath "cosmossdk.io/math" "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" + "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" "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" ) // 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..5a671be956 100644 --- a/zetaclient/chains/evm/observer/v2_outbound.go +++ b/zetaclient/chains/evm/observer/v2_outbound.go @@ -10,12 +10,11 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" + "github.com/zeta-chain/node/pkg/chains" + crosschaintypes "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/evm" "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" ) // 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..74f1bdcbcb 100644 --- a/zetaclient/chains/evm/rpc/rpc.go +++ b/zetaclient/chains/evm/rpc/rpc.go @@ -5,8 +5,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..7b35385f67 100644 --- a/zetaclient/chains/evm/signer/gas.go +++ b/zetaclient/chains/evm/signer/gas.go @@ -6,8 +6,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..3a04af6d02 100644 --- a/zetaclient/chains/evm/signer/outbound_data.go +++ b/zetaclient/chains/evm/signer/outbound_data.go @@ -10,10 +10,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "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..382a4777f3 100644 --- a/zetaclient/chains/evm/signer/outbound_tracker_reporter.go +++ b/zetaclient/chains/evm/signer/outbound_tracker_reporter.go @@ -6,12 +6,11 @@ import ( "time" "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..928198ce96 100644 --- a/zetaclient/chains/evm/signer/sign.go +++ b/zetaclient/chains/evm/signer/sign.go @@ -7,10 +7,9 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" + "github.com/zeta-chain/node/zetaclient/chains/evm" "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" ) // 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 c77d4e36e6..6e4d8314b7 100644 --- a/zetaclient/chains/evm/signer/signer.go +++ b/zetaclient/chains/evm/signer/signer.go @@ -19,19 +19,18 @@ import ( "github.com/pkg/errors" "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..e4fc518aae 100644 --- a/zetaclient/chains/evm/signer/signer_admin.go +++ b/zetaclient/chains/evm/signer/signer_admin.go @@ -8,9 +8,8 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" + "github.com/zeta-chain/node/pkg/constant" "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol" - - "github.com/zeta-chain/zetacore/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..c4778a0abd 100644 --- a/zetaclient/chains/evm/signer/v2_signer.go +++ b/zetaclient/chains/evm/signer/v2_signer.go @@ -5,9 +5,8 @@ import ( "fmt" 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..37db64fb26 100644 --- a/zetaclient/chains/interfaces/interfaces.go +++ b/zetaclient/chains/interfaces/interfaces.go @@ -18,15 +18,14 @@ import ( solrpc "github.com/gagliardetto/solana-go/rpc" "github.com/onrik/ethrpc" "github.com/rs/zerolog" + "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" "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" ) type Order string diff --git a/zetaclient/chains/solana/observer/inbound.go b/zetaclient/chains/solana/observer/inbound.go index ef459cbd7a..553328d945 100644 --- a/zetaclient/chains/solana/observer/inbound.go +++ b/zetaclient/chains/solana/observer/inbound.go @@ -12,16 +12,15 @@ import ( "github.com/near/borsh-go" "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 40f53ce0bc..216d4d8277 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..c03494670d 100644 --- a/zetaclient/chains/solana/observer/inbound_tracker.go +++ b/zetaclient/chains/solana/observer/inbound_tracker.go @@ -7,9 +7,8 @@ import ( "github.com/gagliardetto/solana-go" "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..0c5b36b91b 100644 --- a/zetaclient/chains/solana/observer/observer.go +++ b/zetaclient/chains/solana/observer/observer.go @@ -6,15 +6,14 @@ import ( "github.com/gagliardetto/solana-go" "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..3ffde2c3c4 100644 --- a/zetaclient/chains/solana/observer/observer_gas.go +++ b/zetaclient/chains/solana/observer/observer_gas.go @@ -6,9 +6,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..b4d967e21f 100644 --- a/zetaclient/chains/solana/observer/outbound.go +++ b/zetaclient/chains/solana/observer/outbound.go @@ -10,16 +10,15 @@ import ( "github.com/gagliardetto/solana-go/rpc" "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..2c2144060b 100644 --- a/zetaclient/chains/solana/rpc/rpc.go +++ b/zetaclient/chains/solana/rpc/rpc.go @@ -6,8 +6,7 @@ import ( "github.com/gagliardetto/solana-go" "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..3dd178104c 100644 --- a/zetaclient/chains/solana/signer/outbound_tracker_reporter.go +++ b/zetaclient/chains/solana/signer/outbound_tracker_reporter.go @@ -7,10 +7,9 @@ import ( "github.com/gagliardetto/solana-go" "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..1617af55c1 100644 --- a/zetaclient/chains/solana/signer/signer.go +++ b/zetaclient/chains/solana/signer/signer.go @@ -7,18 +7,17 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "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..3889eb0617 100644 --- a/zetaclient/chains/solana/signer/withdraw.go +++ b/zetaclient/chains/solana/signer/withdraw.go @@ -7,10 +7,9 @@ import ( "github.com/gagliardetto/solana-go" "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..0d0f456611 100644 --- a/zetaclient/compliance/compliance.go +++ b/zetaclient/compliance/compliance.go @@ -6,12 +6,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 b43043e30e..528fa9f9eb 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/context/app.go b/zetaclient/context/app.go index e3a219f00b..ed7cc64d8e 100644 --- a/zetaclient/context/app.go +++ b/zetaclient/context/app.go @@ -8,13 +8,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/samber/lo" + "github.com/zeta-chain/node/pkg/chains" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/config" "golang.org/x/exp/constraints" "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" ) // 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..b2bcfe5df2 100644 --- a/zetaclient/context/chain.go +++ b/zetaclient/context/chain.go @@ -5,11 +5,10 @@ import ( "sync" "github.com/pkg/errors" + "github.com/zeta-chain/node/pkg/chains" + observer "github.com/zeta-chain/node/x/observer/types" "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" ) // 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..97f85de40a 100644 --- a/zetaclient/db/db.go +++ b/zetaclient/db/db.go @@ -7,11 +7,10 @@ import ( "strings" "github.com/pkg/errors" + "github.com/zeta-chain/node/zetaclient/types" "gorm.io/driver/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" - - "github.com/zeta-chain/zetacore/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..875fcec4c9 100644 --- a/zetaclient/keys/keys.go +++ b/zetaclient/keys/keys.go @@ -15,11 +15,10 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" 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..53781e9682 100644 --- a/zetaclient/keys/relayer_key.go +++ b/zetaclient/keys/relayer_key.go @@ -6,10 +6,9 @@ import ( "path/filepath" "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..e6f6e23d19 100644 --- a/zetaclient/maintenance/tss_listener.go +++ b/zetaclient/maintenance/tss_listener.go @@ -7,11 +7,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..e193d4770f 100644 --- a/zetaclient/metrics/telemetry.go +++ b/zetaclient/metrics/telemetry.go @@ -12,10 +12,9 @@ import ( "github.com/gorilla/mux" "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..e68f360b8d 100644 --- a/zetaclient/orchestrator/bootstrap.go +++ b/zetaclient/orchestrator/bootstrap.go @@ -8,20 +8,19 @@ import ( ethrpc "github.com/ethereum/go-ethereum/rpc" 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 d8a8aeb6a0..db030498a2 100644 --- a/zetaclient/orchestrator/orchestrator.go +++ b/zetaclient/orchestrator/orchestrator.go @@ -13,20 +13,19 @@ import ( "github.com/pkg/errors" "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..40a9c1b555 100644 --- a/zetaclient/ratelimiter/rate_limiter.go +++ b/zetaclient/ratelimiter/rate_limiter.go @@ -4,8 +4,7 @@ package ratelimiter 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 3036035db4..dc7e890a93 100644 --- a/zetaclient/testutils/constant.go +++ b/zetaclient/testutils/constant.go @@ -2,8 +2,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..69bd3a9cdc 100644 --- a/zetaclient/testutils/mocks/btc_rpc.go +++ b/zetaclient/testutils/mocks/btc_rpc.go @@ -8,8 +8,7 @@ import ( "github.com/btcsuite/btcd/rpcclient" "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..f90288d735 100644 --- a/zetaclient/testutils/mocks/chain_params.go +++ b/zetaclient/testutils/mocks/chain_params.go @@ -5,12 +5,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/stretchr/testify/require" + "github.com/zeta-chain/node/pkg/constant" + observertypes "github.com/zeta-chain/node/x/observer/types" + "github.com/zeta-chain/node/zetaclient/testutils" "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" ) 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..941d6b77fd 100644 --- a/zetaclient/testutils/mocks/chain_signer.go +++ b/zetaclient/testutils/mocks/chain_signer.go @@ -4,11 +4,10 @@ import ( "context" 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..ae171f56b9 100644 --- a/zetaclient/testutils/mocks/evm_json_rpc.go +++ b/zetaclient/testutils/mocks/evm_json_rpc.go @@ -4,8 +4,7 @@ import ( "errors" "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..f0faaeebbf 100644 --- a/zetaclient/testutils/mocks/evm_rpc.go +++ b/zetaclient/testutils/mocks/evm_rpc.go @@ -7,9 +7,8 @@ import ( "github.com/ethereum/go-ethereum" ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" "golang.org/x/net/context" - - "github.com/zeta-chain/zetacore/zetaclient/chains/interfaces" ) const EVMRPCEnabled = "MockEVMRPCEnabled" diff --git a/zetaclient/testutils/mocks/tss_signer.go b/zetaclient/testutils/mocks/tss_signer.go index b4f989aaf4..99375bc4b3 100644 --- a/zetaclient/testutils/mocks/tss_signer.go +++ b/zetaclient/testutils/mocks/tss_signer.go @@ -10,10 +10,9 @@ import ( "github.com/btcsuite/btcutil" 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..efe3deb23c 100644 --- a/zetaclient/testutils/mocks/zetacore_client_opts.go +++ b/zetaclient/testutils/mocks/zetacore_client_opts.go @@ -4,10 +4,9 @@ import ( "errors" "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..83cd8044d2 100644 --- a/zetaclient/testutils/testdata.go +++ b/zetaclient/testutils/testdata.go @@ -12,11 +12,10 @@ import ( "github.com/gagliardetto/solana-go/rpc" "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..5404bdf3a3 100644 --- a/zetaclient/testutils/testrpc/rpc_btc.go +++ b/zetaclient/testutils/testrpc/rpc_btc.go @@ -6,8 +6,7 @@ import ( "testing" "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..ded25d2e97 100644 --- a/zetaclient/tss/concurrent_keysigns_tracker.go +++ b/zetaclient/tss/concurrent_keysigns_tracker.go @@ -6,8 +6,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..0b73f63f17 100644 --- a/zetaclient/tss/tss_signer.go +++ b/zetaclient/tss/tss_signer.go @@ -23,19 +23,18 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "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" thorcommon "gitlab.com/thorchain/tss/go-tss/common" "gitlab.com/thorchain/tss/go-tss/keysign" "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" ) 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..ffa2871f8e 100644 --- a/zetaclient/zetacore/broadcast.go +++ b/zetaclient/zetacore/broadcast.go @@ -15,11 +15,10 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" "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 aee2e51784..59cd2ef340 100644 --- a/zetaclient/zetacore/client.go +++ b/zetaclient/zetacore/client.go @@ -18,20 +18,19 @@ import ( "github.com/rs/zerolog" etherminttypes "github.com/zeta-chain/ethermint/types" feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types" + "github.com/zeta-chain/node/app" + "github.com/zeta-chain/node/pkg/authz" + "github.com/zeta-chain/node/pkg/chains" + authoritytypes "github.com/zeta-chain/node/x/authority/types" + 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" + "github.com/zeta-chain/node/zetaclient/config" + zctx "github.com/zeta-chain/node/zetaclient/context" + keyinterfaces "github.com/zeta-chain/node/zetaclient/keys/interfaces" "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" - authoritytypes "github.com/zeta-chain/zetacore/x/authority/types" - 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/zetacore/zetaclient/config" - zctx "github.com/zeta-chain/zetacore/zetaclient/context" - keyinterfaces "github.com/zeta-chain/zetacore/zetaclient/keys/interfaces" ) var _ interfaces.ZetacoreClient = &Client{} diff --git a/zetaclient/zetacore/client_monitor.go b/zetaclient/zetacore/client_monitor.go index 51d4f17168..9fd9f9a926 100644 --- a/zetaclient/zetacore/client_monitor.go +++ b/zetaclient/zetacore/client_monitor.go @@ -7,9 +7,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_query_authority.go b/zetaclient/zetacore/client_query_authority.go index 044a3d47ee..89f7a0de01 100644 --- a/zetaclient/zetacore/client_query_authority.go +++ b/zetaclient/zetacore/client_query_authority.go @@ -3,8 +3,8 @@ package zetacore 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/zetaclient/zetacore/client_query_cosmos.go b/zetaclient/zetacore/client_query_cosmos.go index 61d690d54a..94d5904667 100644 --- a/zetaclient/zetacore/client_query_cosmos.go +++ b/zetaclient/zetacore/client_query_cosmos.go @@ -10,8 +10,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" 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" ) // GetGenesisSupply returns the genesis supply. diff --git a/zetaclient/zetacore/client_query_crosschain.go b/zetaclient/zetacore/client_query_crosschain.go index 262b766a6b..f7d4747b7f 100644 --- a/zetaclient/zetacore/client_query_crosschain.go +++ b/zetaclient/zetacore/client_query_crosschain.go @@ -6,11 +6,10 @@ import ( "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/zeta-chain/node/pkg/chains" + "github.com/zeta-chain/node/x/crosschain/types" + "github.com/zeta-chain/node/zetaclient/chains/interfaces" "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" ) // 32MB diff --git a/zetaclient/zetacore/client_query_lightclient.go b/zetaclient/zetacore/client_query_lightclient.go index f5999a5d2a..275aa9b953 100644 --- a/zetaclient/zetacore/client_query_lightclient.go +++ b/zetaclient/zetacore/client_query_lightclient.go @@ -4,9 +4,8 @@ import ( "context" "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/zetaclient/zetacore/client_query_observer.go b/zetaclient/zetacore/client_query_observer.go index a8ed20c998..b03209c30b 100644 --- a/zetaclient/zetacore/client_query_observer.go +++ b/zetaclient/zetacore/client_query_observer.go @@ -5,10 +5,9 @@ import ( "fmt" "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/zetaclient/zetacore/client_query_tendermint.go b/zetaclient/zetacore/client_query_tendermint.go index adb38d0bab..e5d9441733 100644 --- a/zetaclient/zetacore/client_query_tendermint.go +++ b/zetaclient/zetacore/client_query_tendermint.go @@ -5,8 +5,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/zetaclient/zetacore/client_query_test.go b/zetaclient/zetacore/client_query_test.go index cf3ddb8d50..5e917e10f3 100644 --- a/zetaclient/zetacore/client_query_test.go +++ b/zetaclient/zetacore/client_query_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" abci "github.com/cometbft/cometbft/abci/types" tmtypes "github.com/cometbft/cometbft/proto/tendermint/types" @@ -21,20 +21,20 @@ 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" - "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/zetacore/zetaclient/keys" - "github.com/zeta-chain/zetacore/zetaclient/testutils/mocks" + "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" + "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..9e63460499 100644 --- a/zetaclient/zetacore/client_vote.go +++ b/zetaclient/zetacore/client_vote.go @@ -4,14 +4,13 @@ import ( "context" "github.com/pkg/errors" + "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" "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" ) // 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..342c1b3181 100644 --- a/zetaclient/zetacore/client_worker.go +++ b/zetaclient/zetacore/client_worker.go @@ -5,8 +5,7 @@ import ( "time" "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..49385f1785 100644 --- a/zetaclient/zetacore/tx.go +++ b/zetaclient/zetacore/tx.go @@ -8,13 +8,12 @@ import ( "cosmossdk.io/math" 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 (