From 06e1c4c80dfe5da52ebc5cfdb6bd0fa37154afc5 Mon Sep 17 00:00:00 2001 From: VictorTrustyDev Date: Sat, 30 Dec 2023 23:00:10 +0700 Subject: [PATCH] renamed chain --- Dockerfile | 6 +- Makefile | 42 +- RENAME_CHAIN.md | 8 +- app/ante/cosmos/authz_test.go | 8 +- app/ante/cosmos/eip712.go | 14 +- app/ante/cosmos/fees.go | 2 +- app/ante/cosmos/fees_test.go | 8 +- app/ante/cosmos/min_price.go | 2 +- app/ante/cosmos/min_price_test.go | 14 +- app/ante/cosmos/reject_msgs.go | 2 +- app/ante/cosmos/setup_test.go | 28 +- app/ante/cosmos/utils_test.go | 6 +- app/ante/cosmos/vesting.go | 4 +- app/ante/evm/ante_test.go | 6 +- app/ante/evm/eth.go | 10 +- app/ante/evm/eth_test.go | 16 +- app/ante/evm/fee_checker.go | 6 +- app/ante/evm/fee_checker_test.go | 8 +- app/ante/evm/fee_market.go | 2 +- app/ante/evm/fee_market_test.go | 22 +- app/ante/evm/fees.go | 2 +- app/ante/evm/fees_test.go | 14 +- app/ante/evm/interfaces.go | 6 +- app/ante/evm/setup_ctx.go | 2 +- app/ante/evm/setup_ctx_test.go | 8 +- app/ante/evm/setup_test.go | 20 +- app/ante/evm/signverify_test.go | 8 +- app/ante/evm/sigs_test.go | 6 +- app/ante/evm/sigverify.go | 2 +- app/ante/evm/utils_test.go | 8 +- app/ante/evm/vesting.go | 4 +- app/ante/evm/vesting_test.go | 10 +- app/ante/handler_options.go | 10 +- app/ante/handler_options_test.go | 10 +- app/ante/integration_test.go | 16 +- app/ante/setup_test.go | 14 +- app/ante/sigverify.go | 2 +- app/ante/sigverify_test.go | 8 +- app/ante/utils/claim_rewards_test.go | 8 +- app/ante/utils/setup_test.go | 22 +- app/ante/utils_test.go | 4 +- app/app.go | 182 ++++---- app/app_test.go | 10 +- app/ethtest_helper.go | 16 +- app/export.go | 6 +- app/forks.go | 4 +- app/gas.go | 2 +- app/test_helpers.go | 20 +- app/upgrades/v3_sample/constants.go | 2 +- client/config.go | 2 +- client/debug/debug.go | 6 +- client/docs/config.json | 2 +- client/docs/swagger-ui/swagger.yaml | 4 +- client/export.go | 6 +- client/import.go | 4 +- client/keys.go | 4 +- client/keys/add.go | 2 +- client/testnet.go | 14 +- cmd/config/config.go | 4 +- cmd/config/observability.go | 2 +- cmd/{evmd => nvmd}/cmd_test.go | 6 +- cmd/{evmd => nvmd}/convert_address.go | 2 +- cmd/{evmd => nvmd}/genaccounts.go | 10 +- cmd/{evmd => nvmd}/init.go | 8 +- cmd/{evmd => nvmd}/main.go | 6 +- cmd/{evmd => nvmd}/migrate.go | 4 +- cmd/{evmd => nvmd}/root.go | 32 +- cmd/{evmd => nvmd}/testnet.go | 16 +- contracts/erc20.go | 4 +- contracts/erc20DirectBalanceManipulation.go | 4 +- contracts/erc20burnable.go | 2 +- contracts/erc20maliciousdelayed.go | 4 +- contracts/package-lock.json | 4 +- contracts/package.json | 8 +- crypto/codec/amino.go | 2 +- crypto/codec/codec.go | 2 +- crypto/ethsecp256k1/ethsecp256k1.go | 2 +- crypto/hd/algorithm.go | 4 +- crypto/hd/algorithm_test.go | 14 +- crypto/hd/benchmark_test.go | 2 +- crypto/keyring/options.go | 8 +- docker-compose.yml | 32 +- encoding/codec/codec.go | 4 +- encoding/config.go | 2 +- encoding/config_test.go | 8 +- ethereum/eip712/eip712_fuzzer_test.go | 2 +- ethereum/eip712/eip712_test.go | 10 +- ethereum/eip712/encoding.go | 2 +- ethereum/eip712/encoding_legacy.go | 2 +- ethereum/eip712/preprocess.go | 2 +- ethereum/eip712/preprocess_test.go | 18 +- go.mod | 2 +- ibc/testing/app.go | 6 +- ibc/testing/chain.go | 8 +- ibc/testing/coordinator.go | 8 +- ibc/utils.go | 6 +- ibc/utils_test.go | 42 +- indexer/kv_indexer.go | 6 +- indexer/kv_indexer_test.go | 14 +- init.bat | 8 +- local_node.sh | 16 +- networks/local/Makefile | 2 +- networks/local/chain/Dockerfile | 6 +- .../crypto/v1/ethsecp256k1/keys.proto | 2 +- proto/ethermint/evm/v1/events.proto | 2 +- proto/ethermint/evm/v1/evm.proto | 2 +- proto/ethermint/evm/v1/genesis.proto | 2 +- proto/ethermint/evm/v1/query.proto | 2 +- proto/ethermint/evm/v1/tx.proto | 2 +- proto/ethermint/feemarket/v1/events.proto | 2 +- proto/ethermint/feemarket/v1/feemarket.proto | 2 +- proto/ethermint/feemarket/v1/genesis.proto | 2 +- proto/ethermint/feemarket/v1/query.proto | 2 +- proto/ethermint/feemarket/v1/tx.proto | 2 +- proto/ethermint/types/v1/account.proto | 2 +- proto/ethermint/types/v1/dynamic_fee.proto | 2 +- proto/ethermint/types/v1/indexer.proto | 2 +- proto/ethermint/types/v1/web3.proto | 2 +- proto/evmos/claims/v1/claims.proto | 2 +- proto/evmos/claims/v1/genesis.proto | 2 +- proto/evmos/claims/v1/query.proto | 2 +- proto/evmos/claims/v1/tx.proto | 2 +- proto/evmos/epochs/v1/genesis.proto | 2 +- proto/evmos/epochs/v1/query.proto | 2 +- proto/evmos/erc20/v1/erc20.proto | 2 +- proto/evmos/erc20/v1/events.proto | 2 +- proto/evmos/erc20/v1/genesis.proto | 2 +- proto/evmos/erc20/v1/query.proto | 2 +- proto/evmos/erc20/v1/tx.proto | 2 +- proto/evmos/incentives/v1/genesis.proto | 2 +- proto/evmos/incentives/v1/incentives.proto | 2 +- proto/evmos/incentives/v1/query.proto | 2 +- proto/evmos/incentives/v1/tx.proto | 2 +- proto/evmos/inflation/v1/genesis.proto | 2 +- proto/evmos/inflation/v1/inflation.proto | 2 +- proto/evmos/inflation/v1/query.proto | 2 +- proto/evmos/inflation/v1/tx.proto | 2 +- proto/evmos/recovery/v1/genesis.proto | 2 +- proto/evmos/recovery/v1/query.proto | 2 +- proto/evmos/recovery/v1/tx.proto | 2 +- proto/evmos/revenue/v1/events.proto | 2 +- proto/evmos/revenue/v1/genesis.proto | 2 +- proto/evmos/revenue/v1/query.proto | 2 +- proto/evmos/revenue/v1/revenue.proto | 2 +- proto/evmos/revenue/v1/tx.proto | 2 +- proto/evmos/vesting/v1/events.proto | 2 +- proto/evmos/vesting/v1/query.proto | 2 +- proto/evmos/vesting/v1/tx.proto | 2 +- proto/evmos/vesting/v1/vesting.proto | 2 +- rename-chain.sh | 36 -- rename_chain/main.go | 442 ------------------ rename_chain/marker/marker.go | 14 - rpc/apis.go | 20 +- rpc/backend/account_info.go | 6 +- rpc/backend/account_info_test.go | 8 +- rpc/backend/backend.go | 8 +- rpc/backend/backend_suite_test.go | 20 +- rpc/backend/blocks.go | 4 +- rpc/backend/blocks_test.go | 8 +- rpc/backend/call_tx.go | 6 +- rpc/backend/call_tx_test.go | 8 +- rpc/backend/chain_info.go | 8 +- rpc/backend/chain_info_test.go | 12 +- rpc/backend/client_test.go | 6 +- rpc/backend/evm_query_client_test.go | 10 +- rpc/backend/feemarket_query_client_test.go | 6 +- rpc/backend/filters_test.go | 6 +- rpc/backend/mocks/evm_query_client.go | 2 +- rpc/backend/mocks/feemarket_query_client.go | 2 +- rpc/backend/node_info.go | 10 +- rpc/backend/node_info_test.go | 8 +- rpc/backend/sign_tx.go | 2 +- rpc/backend/sign_tx_test.go | 8 +- rpc/backend/tracing.go | 4 +- rpc/backend/tracing_test.go | 8 +- rpc/backend/tx_info.go | 6 +- rpc/backend/tx_info_test.go | 10 +- rpc/backend/utils.go | 4 +- rpc/namespaces/ethereum/debug/api.go | 6 +- rpc/namespaces/ethereum/eth/api.go | 12 +- rpc/namespaces/ethereum/eth/filters/api.go | 4 +- .../ethereum/eth/filters/filter_system.go | 4 +- .../ethereum/eth/filters/filters.go | 4 +- rpc/namespaces/ethereum/miner/api.go | 2 +- rpc/namespaces/ethereum/net/api.go | 2 +- rpc/namespaces/ethereum/personal/api.go | 10 +- rpc/namespaces/ethereum/txpool/api.go | 2 +- rpc/namespaces/ethereum/web3/api.go | 2 +- rpc/types/block.go | 2 +- rpc/types/events.go | 4 +- rpc/types/events_test.go | 2 +- rpc/types/query_client.go | 4 +- rpc/types/utils.go | 6 +- rpc/websockets.go | 10 +- scripts/integration-test-all.sh | 10 +- scripts/protocgen.sh | 6 +- scripts/start-docker.sh | 8 +- server/flags/flags.go | 2 +- server/indexer_cmd.go | 2 +- server/indexer_service.go | 2 +- server/json_rpc.go | 6 +- server/start.go | 12 +- server/util.go | 2 +- tests/e2e/Dockerfile.repo | 10 +- tests/e2e/README.md | 24 +- tests/e2e/e2e_suite_test.go | 12 +- tests/e2e/e2e_test.go | 2 +- tests/e2e/init-node.sh | 16 +- tests/e2e/upgrade/Dockerfile.init | 4 +- tests/e2e/upgrade/constants.go | 4 +- tests/e2e/upgrade/govexec.go | 2 +- tests/e2e/upgrade/manager.go | 4 +- tests/e2e/upgrade/params_test.go | 6 +- tests/e2e/upgrade/queryexec.go | 2 +- tests/e2e/upgrade/utils.go | 16 +- tests/e2e/upgrade/utils_test.go | 12 +- tests/integration/ledger/ledger_suite_test.go | 18 +- tests/integration/ledger/ledger_test.go | 14 +- testutil/abci.go | 20 +- testutil/ante.go | 4 +- testutil/contract.go | 10 +- testutil/fund.go | 4 +- testutil/integration.go | 10 +- testutil/network/network.go | 20 +- testutil/network/network_test.go | 6 +- testutil/network/util.go | 8 +- testutil/staking-rewards.go | 8 +- testutil/statedb.go | 4 +- testutil/tx/cosmos.go | 10 +- testutil/tx/eip712.go | 14 +- testutil/tx/eth.go | 12 +- testutil/tx/signer.go | 2 +- types/account_test.go | 8 +- types/benchmark_test.go | 2 +- types/chain_id.go | 6 +- types/chain_id_test.go | 4 +- types/coin.go | 2 +- types/errors.go | 2 +- types/tests/test_utils.go | 2 +- types/validation_test.go | 4 +- utils/utils.go | 8 +- utils/utils_test.go | 16 +- wallets/ledger/ledger.go | 8 +- wallets/ledger/ledger_suite_test.go | 8 +- wallets/ledger/ledger_test.go | 14 +- wallets/ledger/mocks/wallet.go | 2 +- wallets/ledger/wallet_test.go | 6 +- wallets/usbwallet/hub.go | 2 +- wallets/usbwallet/wallet.go | 2 +- x/claims/client/cli/query.go | 2 +- x/claims/genesis.go | 4 +- x/claims/genesis_test.go | 22 +- x/claims/handler.go | 2 +- x/claims/ibc_middleware.go | 4 +- x/claims/keeper/abci.go | 4 +- x/claims/keeper/abci_test.go | 10 +- x/claims/keeper/claim.go | 4 +- x/claims/keeper/claim_test.go | 18 +- x/claims/keeper/claims_records.go | 2 +- x/claims/keeper/claims_records_test.go | 8 +- x/claims/keeper/grpc_query.go | 2 +- x/claims/keeper/grpc_query_test.go | 8 +- x/claims/keeper/hooks.go | 4 +- x/claims/keeper/hooks_test.go | 6 +- x/claims/keeper/ibc_callbacks.go | 4 +- .../keeper/ibc_callbacks_ibc_suite_test.go | 136 +++--- x/claims/keeper/ibc_callbacks_test.go | 34 +- x/claims/keeper/integration_test.go | 14 +- x/claims/keeper/invariants.go | 2 +- x/claims/keeper/invariants_test.go | 8 +- x/claims/keeper/keeper.go | 2 +- x/claims/keeper/migrations.go | 4 +- x/claims/keeper/msg_server.go | 2 +- x/claims/keeper/msg_server_test.go | 2 +- x/claims/keeper/params.go | 2 +- x/claims/keeper/params_test.go | 2 +- x/claims/keeper/setup_test.go | 8 +- x/claims/keeper/utils_test.go | 22 +- x/claims/migrations/v3/migrate.go | 4 +- x/claims/migrations/v3/migrate_test.go | 10 +- x/claims/migrations/v3/types/genesis.pb.go | 2 +- x/claims/migrations/v3/types/params.go | 4 +- x/claims/module.go | 6 +- x/claims/types/claims_record_test.go | 4 +- x/claims/types/genesis_test.go | 4 +- x/claims/types/params.go | 2 +- x/claims/types/params_test.go | 4 +- x/epochs/client/cli/query.go | 2 +- x/epochs/genesis.go | 4 +- x/epochs/genesis_test.go | 8 +- x/epochs/keeper/abci.go | 2 +- x/epochs/keeper/abci_test.go | 4 +- x/epochs/keeper/epoch_infos.go | 2 +- x/epochs/keeper/epoch_infos_test.go | 2 +- x/epochs/keeper/grpc_query.go | 2 +- x/epochs/keeper/grpc_query_test.go | 2 +- x/epochs/keeper/hooks.go | 2 +- x/epochs/keeper/keeper.go | 2 +- x/epochs/keeper/setup_test.go | 8 +- x/epochs/keeper/utils_test.go | 10 +- x/epochs/module.go | 8 +- .../cli/metadata/coin_metadata_test.json | 14 +- .../cli/metadata/coins_metadata_test.json | 14 +- .../cli/metadata/invalid_metadata_test.json | 12 +- x/erc20/client/cli/query.go | 2 +- x/erc20/client/cli/tx.go | 6 +- x/erc20/client/cli/utils.go | 2 +- x/erc20/client/cli/utils_test.go | 2 +- x/erc20/client/proposal_handler.go | 2 +- x/erc20/genesis.go | 4 +- x/erc20/genesis_test.go | 14 +- x/erc20/handler.go | 2 +- x/erc20/ibc_middleware.go | 4 +- x/erc20/keeper/erc20_utils_test.go | 6 +- x/erc20/keeper/evm.go | 8 +- x/erc20/keeper/evm_hooks.go | 6 +- x/erc20/keeper/evm_hooks_test.go | 6 +- x/erc20/keeper/evm_test.go | 10 +- x/erc20/keeper/grpc_query.go | 4 +- x/erc20/keeper/grpc_query_test.go | 4 +- x/erc20/keeper/ibc_callbacks.go | 4 +- .../keeper/ibc_callbacks_integration_test.go | 336 ++++++------- x/erc20/keeper/ibc_callbacks_test.go | 88 ++-- x/erc20/keeper/integration_test.go | 18 +- x/erc20/keeper/keeper.go | 2 +- x/erc20/keeper/migrations.go | 4 +- x/erc20/keeper/migrations_test.go | 10 +- x/erc20/keeper/mint.go | 2 +- x/erc20/keeper/mint_test.go | 4 +- x/erc20/keeper/mock_test.go | 6 +- x/erc20/keeper/msg_server.go | 4 +- x/erc20/keeper/msg_server_test.go | 8 +- x/erc20/keeper/params.go | 2 +- x/erc20/keeper/params_test.go | 2 +- x/erc20/keeper/proposals.go | 2 +- x/erc20/keeper/proposals_test.go | 10 +- x/erc20/keeper/setup_test.go | 22 +- x/erc20/keeper/token_pairs.go | 2 +- x/erc20/keeper/token_pairs_test.go | 6 +- x/erc20/keeper/utils_test.go | 92 ++-- x/erc20/migrations/v3/migration.go | 4 +- x/erc20/migrations/v3/migration_test.go | 10 +- x/erc20/migrations/v3/types/genesis.pb.go | 2 +- x/erc20/migrations/v3/types/params.go | 2 +- x/erc20/module.go | 6 +- x/erc20/proposal_handler.go | 4 +- x/erc20/types/evm_test.go | 2 +- x/erc20/types/genesis_test.go | 2 +- x/erc20/types/interfaces.go | 6 +- x/erc20/types/msg_test.go | 6 +- x/erc20/types/params_test.go | 2 +- x/erc20/types/proposal.go | 2 +- x/erc20/types/proposal_test.go | 4 +- x/erc20/types/token_pair.go | 2 +- x/erc20/types/token_pair_test.go | 4 +- x/erc20/types/utils_test.go | 38 +- x/evm/client/cli/query.go | 4 +- x/evm/client/cli/tx.go | 4 +- x/evm/genesis.go | 6 +- x/evm/genesis_test.go | 10 +- x/evm/handler.go | 2 +- x/evm/handler_test.go | 24 +- x/evm/keeper/abci_test.go | 2 +- x/evm/keeper/benchmark_test.go | 4 +- x/evm/keeper/config.go | 4 +- x/evm/keeper/fees.go | 2 +- x/evm/keeper/fees_test.go | 4 +- x/evm/keeper/gas.go | 2 +- x/evm/keeper/grpc_query.go | 6 +- x/evm/keeper/grpc_query_test.go | 8 +- x/evm/keeper/hooks.go | 2 +- x/evm/keeper/hooks_test.go | 6 +- x/evm/keeper/integration_test.go | 18 +- x/evm/keeper/keeper.go | 6 +- x/evm/keeper/keeper_test.go | 10 +- x/evm/keeper/migrations.go | 6 +- x/evm/keeper/migrations_test.go | 4 +- x/evm/keeper/msg_server.go | 2 +- x/evm/keeper/msg_server_test.go | 4 +- x/evm/keeper/params.go | 2 +- x/evm/keeper/params_benchmark_test.go | 2 +- x/evm/keeper/params_test.go | 2 +- x/evm/keeper/setup_test.go | 22 +- x/evm/keeper/state_transition.go | 6 +- .../keeper/state_transition_benchmark_test.go | 2 +- x/evm/keeper/state_transition_test.go | 10 +- x/evm/keeper/statedb.go | 6 +- x/evm/keeper/statedb_benchmark_test.go | 2 +- x/evm/keeper/statedb_test.go | 8 +- x/evm/keeper/utils_test.go | 8 +- x/evm/migrations/v4/migrate.go | 4 +- x/evm/migrations/v4/migrate_test.go | 10 +- x/evm/migrations/v5/migrate.go | 6 +- x/evm/migrations/v5/migrate_test.go | 10 +- x/evm/module.go | 8 +- x/evm/statedb/config.go | 2 +- x/evm/statedb/mock_test.go | 2 +- x/evm/statedb/statedb_test.go | 2 +- x/evm/types/access_list_test.go | 2 +- x/evm/types/access_list_tx.go | 2 +- x/evm/types/access_list_tx_test.go | 2 +- x/evm/types/dynamic_fee_tx.go | 2 +- x/evm/types/dynamic_fee_tx_test.go | 4 +- x/evm/types/genesis.go | 2 +- x/evm/types/genesis_test.go | 2 +- x/evm/types/interfaces.go | 2 +- x/evm/types/legacy_tx.go | 2 +- x/evm/types/legacy_tx_test.go | 2 +- x/evm/types/logs.go | 2 +- x/evm/types/logs_test.go | 4 +- x/evm/types/msg.go | 2 +- x/evm/types/msg_test.go | 12 +- x/evm/types/params.go | 2 +- x/evm/types/tx_args_test.go | 2 +- x/evm/types/tx_data_test.go | 2 +- x/evm/types/utils_test.go | 8 +- x/feemarket/client/cli/query.go | 2 +- x/feemarket/genesis.go | 4 +- x/feemarket/handler.go | 2 +- x/feemarket/keeper/abci.go | 2 +- x/feemarket/keeper/grpc_query.go | 2 +- x/feemarket/keeper/grpc_query_test.go | 2 +- x/feemarket/keeper/integration_test.go | 6 +- x/feemarket/keeper/keeper.go | 2 +- x/feemarket/keeper/migrations.go | 4 +- x/feemarket/keeper/migrations_test.go | 4 +- x/feemarket/keeper/msg_server.go | 2 +- x/feemarket/keeper/msg_server_test.go | 2 +- x/feemarket/keeper/params.go | 2 +- x/feemarket/keeper/params_test.go | 2 +- x/feemarket/keeper/setup_test.go | 6 +- x/feemarket/keeper/utils_test.go | 20 +- x/feemarket/migrations/v4/migrate.go | 2 +- x/feemarket/migrations/v4/migrate_test.go | 8 +- x/feemarket/migrations/v4/types/params.go | 2 +- x/feemarket/module.go | 8 +- x/ibc/transfer/ibc_module.go | 2 +- x/ibc/transfer/keeper/keeper.go | 2 +- x/ibc/transfer/keeper/keeper_test.go | 24 +- x/ibc/transfer/keeper/msg_server.go | 2 +- x/ibc/transfer/keeper/msg_server_test.go | 8 +- x/ibc/transfer/module.go | 2 +- x/ibc/transfer/types/interfaces.go | 2 +- x/incentives/client/cli/query.go | 2 +- x/incentives/client/cli/tx.go | 4 +- x/incentives/client/proposal_handler.go | 2 +- x/incentives/genesis.go | 4 +- x/incentives/handler.go | 2 +- x/incentives/keeper/allocation_meters.go | 2 +- x/incentives/keeper/distribution.go | 2 +- x/incentives/keeper/distribution_test.go | 2 +- x/incentives/keeper/epoch_hooks.go | 2 +- x/incentives/keeper/evm_hooks.go | 6 +- x/incentives/keeper/evm_hooks_test.go | 12 +- x/incentives/keeper/gas_meters.go | 2 +- x/incentives/keeper/gas_meters_test.go | 4 +- x/incentives/keeper/grpc_query.go | 4 +- x/incentives/keeper/grpc_query_test.go | 2 +- x/incentives/keeper/incentives.go | 2 +- x/incentives/keeper/incentives_test.go | 2 +- x/incentives/keeper/integration_test.go | 6 +- x/incentives/keeper/keeper.go | 2 +- x/incentives/keeper/migrations.go | 4 +- x/incentives/keeper/msg_server.go | 2 +- x/incentives/keeper/msg_server_test.go | 2 +- x/incentives/keeper/params.go | 2 +- x/incentives/keeper/params_test.go | 2 +- x/incentives/keeper/proposals.go | 2 +- x/incentives/keeper/proposals_test.go | 4 +- x/incentives/keeper/setup_test.go | 8 +- x/incentives/keeper/utils_test.go | 24 +- x/incentives/migrations/v2/migrate.go | 4 +- x/incentives/migrations/v2/migrate_test.go | 10 +- x/incentives/migrations/v2/types/params.go | 4 +- x/incentives/module.go | 6 +- x/incentives/proposal_handler.go | 4 +- x/incentives/types/fuzz_test.go | 4 +- x/incentives/types/gas_meter.go | 2 +- x/incentives/types/gas_meter_test.go | 4 +- x/incentives/types/genesis_test.go | 2 +- x/incentives/types/incentive.go | 2 +- x/incentives/types/incentive_test.go | 6 +- x/incentives/types/interfaces.go | 6 +- x/incentives/types/keys_test.go | 4 +- x/incentives/types/params.go | 2 +- x/incentives/types/params_test.go | 2 +- x/incentives/types/proposal.go | 2 +- x/incentives/types/proposal_test.go | 6 +- x/inflation/client/cli/query.go | 2 +- x/inflation/genesis.go | 4 +- x/inflation/handler.go | 2 +- x/inflation/keeper/epoch_info.go | 2 +- x/inflation/keeper/epoch_info_test.go | 4 +- x/inflation/keeper/grpc_query.go | 2 +- x/inflation/keeper/grpc_query_test.go | 6 +- x/inflation/keeper/hooks.go | 4 +- x/inflation/keeper/hooks_test.go | 4 +- x/inflation/keeper/inflation.go | 8 +- x/inflation/keeper/inflation_test.go | 8 +- x/inflation/keeper/integration_test.go | 6 +- x/inflation/keeper/keeper.go | 2 +- x/inflation/keeper/migrations.go | 6 +- x/inflation/keeper/migrations_test.go | 10 +- x/inflation/keeper/msg_server.go | 2 +- x/inflation/keeper/msg_server_test.go | 2 +- x/inflation/keeper/params.go | 2 +- x/inflation/keeper/params_test.go | 2 +- x/inflation/keeper/periods.go | 2 +- x/inflation/keeper/setup_test.go | 8 +- x/inflation/keeper/utils_test.go | 12 +- x/inflation/migrations/v2/migrate.go | 4 +- x/inflation/migrations/v2/migrate_test.go | 10 +- x/inflation/migrations/v2/types/params.go | 4 +- x/inflation/migrations/v3/migrate_test.go | 4 +- x/inflation/module.go | 6 +- x/inflation/types/genesis.go | 2 +- x/inflation/types/genesis_test.go | 2 +- x/inflation/types/inflation_calculation.go | 6 +- x/inflation/types/params.go | 2 +- x/inflation/types/params_test.go | 2 +- x/recovery/client/cli/query.go | 2 +- x/recovery/genesis.go | 4 +- x/recovery/genesis_test.go | 14 +- x/recovery/handler.go | 2 +- x/recovery/ibc_middleware.go | 4 +- x/recovery/keeper/grpc_query.go | 2 +- x/recovery/keeper/grpc_query_test.go | 2 +- x/recovery/keeper/ibc_callbacks.go | 8 +- .../keeper/ibc_callbacks_integration_test.go | 164 +++---- x/recovery/keeper/ibc_callbacks_test.go | 66 +-- x/recovery/keeper/keeper.go | 2 +- x/recovery/keeper/migrations.go | 4 +- x/recovery/keeper/mock_test.go | 2 +- x/recovery/keeper/msg_server.go | 2 +- x/recovery/keeper/msg_server_test.go | 2 +- x/recovery/keeper/params.go | 2 +- x/recovery/keeper/setup_test.go | 24 +- x/recovery/keeper/utils_test.go | 50 +- x/recovery/migrations/v2/migrate.go | 4 +- x/recovery/migrations/v2/migrate_test.go | 10 +- x/recovery/migrations/v2/types/params.go | 2 +- x/recovery/module.go | 6 +- x/recovery/types/interfaces.go | 2 +- x/revenue/v1/client/cli/query.go | 2 +- x/revenue/v1/client/cli/tx.go | 4 +- x/revenue/v1/genesis.go | 4 +- x/revenue/v1/genesis_test.go | 14 +- x/revenue/v1/handler.go | 2 +- x/revenue/v1/keeper/evm_hooks.go | 4 +- x/revenue/v1/keeper/grpc_query.go | 6 +- x/revenue/v1/keeper/grpc_query_test.go | 4 +- x/revenue/v1/keeper/integration_test.go | 10 +- x/revenue/v1/keeper/keeper.go | 2 +- x/revenue/v1/keeper/migrations.go | 4 +- x/revenue/v1/keeper/msg_server.go | 2 +- x/revenue/v1/keeper/msg_server_test.go | 6 +- x/revenue/v1/keeper/params.go | 2 +- x/revenue/v1/keeper/params_test.go | 2 +- x/revenue/v1/keeper/revenues.go | 2 +- x/revenue/v1/keeper/revenues_test.go | 4 +- x/revenue/v1/keeper/setup_test.go | 12 +- x/revenue/v1/keeper/utils_test.go | 12 +- x/revenue/v1/migrations/v2/migrate.go | 4 +- x/revenue/v1/migrations/v2/migrate_test.go | 10 +- .../v1/migrations/v2/types/genesis.pb.go | 2 +- x/revenue/v1/migrations/v2/types/params.go | 2 +- x/revenue/v1/module.go | 8 +- x/revenue/v1/types/genesis_test.go | 4 +- x/revenue/v1/types/interfaces.go | 4 +- x/revenue/v1/types/msg.go | 2 +- x/revenue/v1/types/msg_test.go | 4 +- x/revenue/v1/types/revenue.go | 2 +- x/revenue/v1/types/revenue_test.go | 10 +- x/vesting/client/cli/query.go | 2 +- x/vesting/client/cli/tx.go | 2 +- x/vesting/handler.go | 2 +- x/vesting/keeper/grpc_query.go | 2 +- x/vesting/keeper/grpc_query_test.go | 8 +- x/vesting/keeper/integration_test.go | 10 +- x/vesting/keeper/keeper.go | 2 +- x/vesting/keeper/msg_server.go | 4 +- x/vesting/keeper/msg_server_test.go | 8 +- x/vesting/keeper/setup_test.go | 8 +- x/vesting/keeper/utils_test.go | 30 +- x/vesting/module.go | 6 +- .../types/clawback_vesting_account_test.go | 4 +- x/vesting/types/msg_test.go | 4 +- 587 files changed, 2249 insertions(+), 2741 deletions(-) rename cmd/{evmd => nvmd}/cmd_test.go (86%) rename cmd/{evmd => nvmd}/convert_address.go (98%) rename cmd/{evmd => nvmd}/genaccounts.go (96%) rename cmd/{evmd => nvmd}/init.go (94%) rename cmd/{evmd => nvmd}/main.go (81%) rename cmd/{evmd => nvmd}/migrate.go (96%) rename cmd/{evmd => nvmd}/root.go (91%) rename cmd/{evmd => nvmd}/testnet.go (97%) delete mode 100755 rename-chain.sh delete mode 100644 rename_chain/main.go delete mode 100644 rename_chain/marker/marker.go diff --git a/Dockerfile b/Dockerfile index a8fc0e8e5a..871aff1be4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=linux/amd64 golang:1.20.2-bullseye AS build-env -WORKDIR /go/src/github.com/EscanBE/evermint +WORKDIR /go/src/github.com/VictorTrustyDev/nevermind RUN apt-get update -y RUN apt-get install git -y @@ -16,8 +16,8 @@ RUN apt-get install ca-certificates jq -y WORKDIR /root -COPY --from=build-env /go/src/github.com/EscanBE/evermint/build/evmd /usr/bin/evmd +COPY --from=build-env /go/src/github.com/VictorTrustyDev/nevermind/build/nvmd /usr/bin/nvmd EXPOSE 26656 26657 1317 9090 8545 8546 -CMD ["evmd"] +CMD ["nvmd"] diff --git a/Makefile b/Makefile index a57c10e938..e74b0b13ea 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::' COMMIT := $(shell git log -1 --format='%H') LEDGER_ENABLED ?= true BINDIR ?= $(GOPATH)/bin -APP_BINARY = evmd +APP_BINARY = nvmd BUILDDIR ?= $(CURDIR)/build -HTTPS_GIT := https://github.com/EscanBE/evermint.git +HTTPS_GIT := https://github.com/VictorTrustyDev/nevermind.git DOCKER := $(shell which docker) -NAMESPACE := evermint -PROJECT := evermint +NAMESPACE := nevermind +PROJECT := nevermind DOCKER_IMAGE := $(NAMESPACE)/$(PROJECT) COMMIT_HASH := $(shell git rev-parse --short=7 HEAD) DOCKER_TAG := $(COMMIT_HASH) @@ -60,7 +60,7 @@ build_tags := $(strip $(build_tags)) # process linker flags -ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=evermint \ +ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=nevermind \ -X github.com/cosmos/cosmos-sdk/version.AppName=$(APP_BINARY) \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ @@ -132,7 +132,7 @@ build-reproducible: go.sum $(DOCKER) rm latest-build || true $(DOCKER) run --volume=$(CURDIR):/sources:ro \ --env TARGET_PLATFORMS='linux/amd64' \ - --env APP=evmd \ + --env APP=nvmd \ --env VERSION=$(VERSION) \ --env COMMIT=$(COMMIT) \ --env CGO_ENABLED=1 \ @@ -147,12 +147,12 @@ build-docker: $(DOCKER) tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest # docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:${COMMIT_HASH} # update old container - $(DOCKER) rm evermint || true + $(DOCKER) rm nevermind || true # create a new container from the latest image - $(DOCKER) create --name evermint -t -i ${DOCKER_IMAGE}:latest evermint + $(DOCKER) create --name nevermind -t -i ${DOCKER_IMAGE}:latest nevermind # move the binaries to the ./build directory mkdir -p ./build/ - $(DOCKER) cp evermint:/usr/bin/evmd ./build/ + $(DOCKER) cp nevermind:/usr/bin/nvmd ./build/ push-docker: build-docker $(DOCKER) push ${DOCKER_IMAGE}:${DOCKER_TAG} @@ -278,7 +278,7 @@ update-swagger-docs: statik .PHONY: update-swagger-docs godocs: - @echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/EscanBE/evermint" + @echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/VictorTrustyDev/nevermind" godoc -http=:6060 ############################################################################### @@ -312,7 +312,7 @@ test-e2e: make build-docker; \ fi @mkdir -p ./build - @rm -rf build/.evermint + @rm -rf build/.nevermind @INITIAL_VERSION=$(INITIAL_VERSION) TARGET_VERSION=$(TARGET_VERSION) \ E2E_SKIP_CLEANUP=$(E2E_SKIP_CLEANUP) MOUNT_PATH=$(MOUNT_PATH) CHAIN_ID=$(CHAIN_ID) \ go test -v ./tests/e2e -run ^TestIntegrationTestSuite$ @@ -488,7 +488,7 @@ localnet-build: # Start a 4-node testnet locally localnet-start: localnet-stop localnet-build - @if ! [ -f build/node0/$(APP_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/evermint:Z evermint/node "./evmd testnet init-files --v 4 -o /evermint --keyring-backend=test --starting-ip-address 192.167.10.2"; fi + @if ! [ -f build/node0/$(APP_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/nevermind:Z nevermind/node "./nvmd testnet init-files --v 4 -o /nevermind --keyring-backend=test --starting-ip-address 192.167.10.2"; fi docker-compose up -d # Stop testnet @@ -504,15 +504,15 @@ localnet-clean: localnet-unsafe-reset: docker-compose down ifeq ($(OS),Windows_NT) - @docker run --rm -v $(CURDIR)\build\node0\evmd:/evermint\Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)\build\node1\evmd:/evermint\Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)\build\node2\evmd:/evermint\Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)\build\node3\evmd:/evermint\Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" + @docker run --rm -v $(CURDIR)\build\node0\nvmd:/nevermind\Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)\build\node1\nvmd:/nevermind\Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)\build\node2\nvmd:/nevermind\Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)\build\node3\nvmd:/nevermind\Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" else - @docker run --rm -v $(CURDIR)/build/node0/evmd:/evermint:Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)/build/node1/evmd:/evermint:Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)/build/node2/evmd:/evermint:Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" - @docker run --rm -v $(CURDIR)/build/node3/evmd:/evermint:Z evermint/node "./evmd tendermint unsafe-reset-all --home=/evermint" + @docker run --rm -v $(CURDIR)/build/node0/nvmd:/nevermind:Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)/build/node1/nvmd:/nevermind:Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)/build/node2/nvmd:/nevermind:Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" + @docker run --rm -v $(CURDIR)/build/node3/nvmd:/nevermind:Z nevermind/node "./nvmd tendermint unsafe-reset-all --home=/nevermind" endif # Clean testnet @@ -525,7 +525,7 @@ localnet-show-logstream: ### Releasing ### ############################################################################### -PACKAGE_NAME:=github.com/EscanBE/evermint +PACKAGE_NAME:=github.com/VictorTrustyDev/nevermind GOLANG_CROSS_VERSION = v1.20 GOPATH ?= '$(HOME)/go' release-dry-run: diff --git a/RENAME_CHAIN.md b/RENAME_CHAIN.md index 4e1ca36228..0d34d534c0 100644 --- a/RENAME_CHAIN.md +++ b/RENAME_CHAIN.md @@ -8,13 +8,13 @@ Step 2: Run `./rename-chain.sh` Done, you have your own chain now. Try running tests to make sure everything is working fine. -[View example after rename](https://github.com/EscanBE/evermint/pull/1) +[View example after rename](https://github.com/VictorTrustyDev/nevermind/pull/1) ___ Cleanup notes to be checked after running script: - Directory `./rename_chain` is deleted. - Script `./rename-chain.sh` is deleted. -- Make sure the following words, which belong to definition of evermint, are no longer exists: - - evmd (binary name) - - evermint (git repo + application name) +- Make sure the following words, which belong to definition of nevermind, are no longer exists: + - nvmd (binary name) + - nevermind (git repo + application name) - evm1 (bech32 prefix) - EscanBE (git owner name) diff --git a/app/ante/cosmos/authz_test.go b/app/ante/cosmos/authz_test.go index 8cdfb599b1..f9731093db 100644 --- a/app/ante/cosmos/authz_test.go +++ b/app/ante/cosmos/authz_test.go @@ -15,10 +15,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - cosmosante "github.com/EscanBE/evermint/v12/app/ante/cosmos" - testutil "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + cosmosante "github.com/VictorTrustyDev/nevermind/v12/app/ante/cosmos" + testutil "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func TestAuthzLimiterDecorator(t *testing.T) { diff --git a/app/ante/cosmos/eip712.go b/app/ante/cosmos/eip712.go index 1d08c3ef75..0ca7d61db9 100644 --- a/app/ante/cosmos/eip712.go +++ b/app/ante/cosmos/eip712.go @@ -5,9 +5,9 @@ import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -21,15 +21,15 @@ import ( "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/signer/core/apitypes" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) -var evermintCodec codec.ProtoCodecMarshaler +var nevermindCodec codec.ProtoCodecMarshaler func init() { registry := codectypes.NewInterfaceRegistry() types.RegisterInterfaces(registry) - evermintCodec = codec.NewProtoCodec(registry) + nevermindCodec = codec.NewProtoCodec(registry) } // Deprecated: LegacyEip712SigVerificationDecorator Verify all signatures for a tx and return an error if any are invalid. Note, @@ -224,7 +224,7 @@ func VerifySignature( FeePayer: feePayer, } - typedData, err := eip712.LegacyWrapTxToTypedData(evermintCodec, extOpt.TypedDataChainID, msgs[0], txBytes, feeDelegation) + typedData, err := eip712.LegacyWrapTxToTypedData(nevermindCodec, extOpt.TypedDataChainID, msgs[0], txBytes, feeDelegation) if err != nil { return errorsmod.Wrap(err, "failed to create EIP-712 typed data from tx") } diff --git a/app/ante/cosmos/fees.go b/app/ante/cosmos/fees.go index 690be7613d..dcd9037063 100644 --- a/app/ante/cosmos/fees.go +++ b/app/ante/cosmos/fees.go @@ -5,7 +5,7 @@ import ( "math" errorsmod "cosmossdk.io/errors" - anteutils "github.com/EscanBE/evermint/v12/app/ante/utils" + anteutils "github.com/VictorTrustyDev/nevermind/v12/app/ante/utils" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" diff --git a/app/ante/cosmos/fees_test.go b/app/ante/cosmos/fees_test.go index 3c143ec1bb..cc532bf101 100644 --- a/app/ante/cosmos/fees_test.go +++ b/app/ante/cosmos/fees_test.go @@ -2,13 +2,13 @@ package cosmos_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" "cosmossdk.io/math" - cosmosante "github.com/EscanBE/evermint/v12/app/ante/cosmos" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" + cosmosante "github.com/VictorTrustyDev/nevermind/v12/app/ante/cosmos" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" sdktestutil "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/feegrant" diff --git a/app/ante/cosmos/min_price.go b/app/ante/cosmos/min_price.go index a013b63b0a..f9943a52d8 100644 --- a/app/ante/cosmos/min_price.go +++ b/app/ante/cosmos/min_price.go @@ -4,7 +4,7 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/app/ante/cosmos/min_price_test.go b/app/ante/cosmos/min_price_test.go index 3e56fc87ed..9d417c555d 100644 --- a/app/ante/cosmos/min_price_test.go +++ b/app/ante/cosmos/min_price_test.go @@ -2,11 +2,11 @@ package cosmos_test import ( sdkmath "cosmossdk.io/math" - cosmosante "github.com/EscanBE/evermint/v12/app/ante/cosmos" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" + cosmosante "github.com/VictorTrustyDev/nevermind/v12/app/ante/cosmos" + "github.com/VictorTrustyDev/nevermind/v12/constants" + + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) @@ -23,8 +23,8 @@ var execTypes = []struct { func (suite *AnteTestSuite) TestMinGasPriceDecorator() { denom := constants.BaseDenom testMsg := banktypes.MsgSend{ - FromAddress: marker.ReplaceAbleAddress("evm1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ppeqynn"), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + FromAddress: "ever1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0pdz47ur", + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}}, } diff --git a/app/ante/cosmos/reject_msgs.go b/app/ante/cosmos/reject_msgs.go index 8e4ea9dcbe..44e85bc344 100644 --- a/app/ante/cosmos/reject_msgs.go +++ b/app/ante/cosmos/reject_msgs.go @@ -2,7 +2,7 @@ package cosmos import ( errorsmod "cosmossdk.io/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/app/ante/cosmos/setup_test.go b/app/ante/cosmos/setup_test.go index 06b65fed1b..3288ae8766 100644 --- a/app/ante/cosmos/setup_test.go +++ b/app/ante/cosmos/setup_test.go @@ -1,7 +1,7 @@ package cosmos_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "testing" "time" @@ -20,24 +20,24 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/app/ante" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/testutil" - "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app/ante" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) type AnteTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind clientCtx client.Context anteHandler sdk.AnteHandler ethSigner ethtypes.Signer @@ -61,7 +61,7 @@ func (suite *AnteTestSuite) SetupTest() { suite.Require().NoError(err) suite.priv = priv - suite.app = app.EthSetup(checkTx, func(app *app.Evermint, genesis simapp.GenesisState) simapp.GenesisState { + suite.app = app.EthSetup(checkTx, func(app *app.Nevermind, genesis simapp.GenesisState) simapp.GenesisState { if suite.enableFeemarket { // setup feemarketGenesis params feemarketGenesis := feemarkettypes.DefaultGenesisState() diff --git a/app/ante/cosmos/utils_test.go b/app/ante/cosmos/utils_test.go index c8030b9fbe..a561e507a0 100644 --- a/app/ante/cosmos/utils_test.go +++ b/app/ante/cosmos/utils_test.go @@ -4,9 +4,9 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" diff --git a/app/ante/cosmos/vesting.go b/app/ante/cosmos/vesting.go index 169d38132d..8ddd4c30d0 100644 --- a/app/ante/cosmos/vesting.go +++ b/app/ante/cosmos/vesting.go @@ -2,8 +2,8 @@ package cosmos import ( errorsmod "cosmossdk.io/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/app/ante/evm/ante_test.go b/app/ante/evm/ante_test.go index b9e55a741e..4d7cd39a9f 100644 --- a/app/ante/evm/ante_test.go +++ b/app/ante/evm/ante_test.go @@ -2,7 +2,7 @@ package evm_test import ( "errors" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "strings" "time" @@ -16,8 +16,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/core/types" ethparams "github.com/ethereum/go-ethereum/params" ) diff --git a/app/ante/evm/eth.go b/app/ante/evm/eth.go index 3d8db3ce87..bb1e09e764 100644 --- a/app/ante/evm/eth.go +++ b/app/ante/evm/eth.go @@ -10,11 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - anteutils "github.com/EscanBE/evermint/v12/app/ante/utils" - "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + anteutils "github.com/VictorTrustyDev/nevermind/v12/app/ante/utils" + "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/app/ante/evm/eth_test.go b/app/ante/evm/eth_test.go index 7ca6697eea..f5138ee549 100644 --- a/app/ante/evm/eth_test.go +++ b/app/ante/evm/eth_test.go @@ -1,19 +1,19 @@ package evm_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" sdk "github.com/cosmos/cosmos-sdk/types" - ethante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + ethante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/app/ante/evm/fee_checker.go b/app/ante/evm/fee_checker.go index 9f5e363d71..d3a1d1482a 100644 --- a/app/ante/evm/fee_checker.go +++ b/app/ante/evm/fee_checker.go @@ -6,9 +6,9 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - anteutils "github.com/EscanBE/evermint/v12/app/ante/utils" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + anteutils "github.com/VictorTrustyDev/nevermind/v12/app/ante/utils" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" diff --git a/app/ante/evm/fee_checker_test.go b/app/ante/evm/fee_checker_test.go index 99cb5dbc55..e786398837 100644 --- a/app/ante/evm/fee_checker_test.go +++ b/app/ante/evm/fee_checker_test.go @@ -1,15 +1,15 @@ package evm import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "testing" "github.com/stretchr/testify/require" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/app/ante/evm/fee_market.go b/app/ante/evm/fee_market.go index 01138bcc7d..66ebf85db4 100644 --- a/app/ante/evm/fee_market.go +++ b/app/ante/evm/fee_market.go @@ -4,7 +4,7 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/app/ante/evm/fee_market_test.go b/app/ante/evm/fee_market_test.go index 02ef9ee2a4..936b30b038 100644 --- a/app/ante/evm/fee_market_test.go +++ b/app/ante/evm/fee_market_test.go @@ -1,8 +1,8 @@ package evm_test import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "math/big" sdkmath "cosmossdk.io/math" @@ -10,11 +10,11 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *AnteTestSuite) TestGasWantedDecorator() { @@ -36,8 +36,8 @@ func (suite *AnteTestSuite) TestGasWantedDecorator() { func() sdk.Tx { denom := evmtypes.DefaultEVMDenom testMsg := banktypes.MsgSend{ - FromAddress: marker.ReplaceAbleAddress("evm1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ppeqynn"), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + FromAddress: "ever1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0pdz47ur", + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}}, } txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), constants.BaseDenom, &testMsg) @@ -95,8 +95,8 @@ func (suite *AnteTestSuite) TestGasWantedDecorator() { func() sdk.Tx { denom := evmtypes.DefaultEVMDenom testMsg := banktypes.MsgSend{ - FromAddress: marker.ReplaceAbleAddress("evm1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ppeqynn"), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + FromAddress: "ever1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0pdz47ur", + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}}, } txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(10), constants.BaseDenom, &testMsg) diff --git a/app/ante/evm/fees.go b/app/ante/evm/fees.go index 94f92df801..3b092b55bb 100644 --- a/app/ante/evm/fees.go +++ b/app/ante/evm/fees.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/app/ante/evm/fees_test.go b/app/ante/evm/fees_test.go index c1d14205c6..86190830fe 100644 --- a/app/ante/evm/fees_test.go +++ b/app/ante/evm/fees_test.go @@ -1,14 +1,14 @@ package evm_test import ( - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "math/big" sdkmath "cosmossdk.io/math" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ethtypes "github.com/ethereum/go-ethereum/core/types" @@ -56,8 +56,8 @@ func (suite *AnteTestSuite) TestEthMinGasPriceDecorator() { err := suite.app.FeeMarketKeeper.SetParams(suite.ctx, params) suite.Require().NoError(err) testMsg := banktypes.MsgSend{ - FromAddress: marker.ReplaceAbleAddress("evm1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ppeqynn"), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + FromAddress: "ever1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0pdz47ur", + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(10), Denom: denom}}, } txBuilder := suite.CreateTestCosmosTxBuilder(sdkmath.NewInt(0), denom, &testMsg) diff --git a/app/ante/evm/interfaces.go b/app/ante/evm/interfaces.go index d46f6da6b2..f000654ffa 100644 --- a/app/ante/evm/interfaces.go +++ b/app/ante/evm/interfaces.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/params" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // EVMKeeper defines the expected keeper interface used on the AnteHandler diff --git a/app/ante/evm/setup_ctx.go b/app/ante/evm/setup_ctx.go index 68be8bec82..d8d5499994 100644 --- a/app/ante/evm/setup_ctx.go +++ b/app/ante/evm/setup_ctx.go @@ -6,7 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/app/ante/evm/setup_ctx_test.go b/app/ante/evm/setup_ctx_test.go index 559eaedfe3..bfb51412a2 100644 --- a/app/ante/evm/setup_ctx_test.go +++ b/app/ante/evm/setup_ctx_test.go @@ -3,11 +3,11 @@ package evm_test import ( "math/big" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/testutil" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/app/ante/evm/setup_test.go b/app/ante/evm/setup_test.go index 912d64ce69..e89f12d683 100644 --- a/app/ante/evm/setup_test.go +++ b/app/ante/evm/setup_test.go @@ -1,7 +1,7 @@ package evm_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "testing" "time" @@ -10,12 +10,12 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - ante "github.com/EscanBE/evermint/v12/app/ante" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + ante "github.com/VictorTrustyDev/nevermind/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" @@ -28,7 +28,7 @@ type AnteTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind clientCtx client.Context anteHandler sdk.AnteHandler ethSigner types.Signer @@ -44,7 +44,7 @@ const TestGasLimit uint64 = 100000 func (suite *AnteTestSuite) SetupTest() { checkTx := false - suite.app = app.EthSetup(checkTx, func(app *app.Evermint, genesis simapp.GenesisState) simapp.GenesisState { + suite.app = app.EthSetup(checkTx, func(app *app.Nevermind, genesis simapp.GenesisState) simapp.GenesisState { if suite.enableFeemarket { // setup feemarketGenesis params feemarketGenesis := feemarkettypes.DefaultGenesisState() @@ -78,7 +78,7 @@ func (suite *AnteTestSuite) SetupTest() { suite.ctx = suite.ctx.WithBlockGasMeter(sdk.NewGasMeter(1000000000000000000)) suite.app.EvmKeeper.WithChainID(suite.ctx) - // set staking denomination to Evermint denom + // set staking denomination to Nevermind denom params := suite.app.StakingKeeper.GetParams(suite.ctx) params.BondDenom = constants.BaseDenom suite.app.StakingKeeper.SetParams(suite.ctx, params) diff --git a/app/ante/evm/signverify_test.go b/app/ante/evm/signverify_test.go index e6c2af1ad0..576554d309 100644 --- a/app/ante/evm/signverify_test.go +++ b/app/ante/evm/signverify_test.go @@ -3,10 +3,10 @@ package evm_test import ( "math/big" - ethante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + ethante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/app/ante/evm/sigs_test.go b/app/ante/evm/sigs_test.go index 401d412b8d..5a7e838d1e 100644 --- a/app/ante/evm/sigs_test.go +++ b/app/ante/evm/sigs_test.go @@ -3,9 +3,9 @@ package evm_test import ( "math/big" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *AnteTestSuite) TestSignatures() { diff --git a/app/ante/evm/sigverify.go b/app/ante/evm/sigverify.go index 2b3dfe6854..aad343bcd4 100644 --- a/app/ante/evm/sigverify.go +++ b/app/ante/evm/sigverify.go @@ -4,7 +4,7 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/app/ante/evm/utils_test.go b/app/ante/evm/utils_test.go index b2418ee4a9..ecfc1d68d6 100644 --- a/app/ante/evm/utils_test.go +++ b/app/ante/evm/utils_test.go @@ -8,7 +8,7 @@ import ( sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -34,8 +34,8 @@ import ( ibctypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" evtypes "github.com/cosmos/cosmos-sdk/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/feegrant" diff --git a/app/ante/evm/vesting.go b/app/ante/evm/vesting.go index 73ed569b2b..3b9c6d73e2 100644 --- a/app/ante/evm/vesting.go +++ b/app/ante/evm/vesting.go @@ -4,8 +4,8 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/app/ante/evm/vesting_test.go b/app/ante/evm/vesting_test.go index ac4e8a3a66..289ecb713d 100644 --- a/app/ante/evm/vesting_test.go +++ b/app/ante/evm/vesting_test.go @@ -8,11 +8,11 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - ethante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + ethante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // global variables used for testing the eth vesting ante handler diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 25eda478d1..f7835bd532 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -2,7 +2,7 @@ package ante import ( errorsmod "cosmossdk.io/errors" - anteutils "github.com/EscanBE/evermint/v12/app/ante/utils" + anteutils "github.com/VictorTrustyDev/nevermind/v12/app/ante/utils" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" @@ -13,11 +13,11 @@ import ( ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" - cosmosante "github.com/EscanBE/evermint/v12/app/ante/cosmos" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + cosmosante "github.com/VictorTrustyDev/nevermind/v12/app/ante/cosmos" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" ) diff --git a/app/ante/handler_options_test.go b/app/ante/handler_options_test.go index 035434c994..c4b89f20bc 100644 --- a/app/ante/handler_options_test.go +++ b/app/ante/handler_options_test.go @@ -1,12 +1,12 @@ package ante_test import ( - ethante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/types" + ethante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app/ante" ) func (suite *AnteTestSuite) TestValidateHandlerOptions() { diff --git a/app/ante/integration_test.go b/app/ante/integration_test.go index 8c8f3063d2..ccaf96ab65 100644 --- a/app/ante/integration_test.go +++ b/app/ante/integration_test.go @@ -1,19 +1,19 @@ package ante_test import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "time" sdkmath "cosmossdk.io/math" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -35,7 +35,7 @@ var _ = Describe("when sending a Cosmos transaction", func() { msg = &banktypes.MsgSend{ FromAddress: addr.String(), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(1e14), Denom: constants.BaseDenom}}, } @@ -70,7 +70,7 @@ var _ = Describe("when sending a Cosmos transaction", func() { msg = &banktypes.MsgSend{ FromAddress: addr.String(), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(1e14), Denom: constants.BaseDenom}}, } @@ -107,7 +107,7 @@ var _ = Describe("when sending a Cosmos transaction", func() { msg = &banktypes.MsgSend{ FromAddress: addr.String(), - ToAddress: marker.ReplaceAbleAddress("evm1dx67l23hz9l0k9hcher8xz04uj7wf3yuqpfj0p"), + ToAddress: "ever1dx67l23hz9l0k9hcher8xz04uj7wf3yuv6ugq3", Amount: sdk.Coins{sdk.Coin{Amount: sdkmath.NewInt(1), Denom: constants.BaseDenom}}, } diff --git a/app/ante/setup_test.go b/app/ante/setup_test.go index 03e0de3f0d..ae2ed955c2 100644 --- a/app/ante/setup_test.go +++ b/app/ante/setup_test.go @@ -1,18 +1,18 @@ package ante_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -26,7 +26,7 @@ type AnteTestSuite struct { ctx sdk.Context clientCtx client.Context - app *app.Evermint + app *app.Nevermind denom string } diff --git a/app/ante/sigverify.go b/app/ante/sigverify.go index 23cf2cbbec..7e5eacf224 100644 --- a/app/ante/sigverify.go +++ b/app/ante/sigverify.go @@ -12,7 +12,7 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) var _ authante.SignatureVerificationGasConsumer = SigVerificationGasConsumer diff --git a/app/ante/sigverify_test.go b/app/ante/sigverify_test.go index f99bab7356..0d94c4635e 100644 --- a/app/ante/sigverify_test.go +++ b/app/ante/sigverify_test.go @@ -16,10 +16,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/app/ante" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" ) func TestConsumeSignatureVerificationGas(t *testing.T) { diff --git a/app/ante/utils/claim_rewards_test.go b/app/ante/utils/claim_rewards_test.go index cb2efa9653..ffc6bd46fe 100644 --- a/app/ante/utils/claim_rewards_test.go +++ b/app/ante/utils/claim_rewards_test.go @@ -1,12 +1,12 @@ package utils_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" - anteutils "github.com/EscanBE/evermint/v12/app/ante/utils" - "github.com/EscanBE/evermint/v12/testutil" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" + anteutils "github.com/VictorTrustyDev/nevermind/v12/app/ante/utils" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/app/ante/utils/setup_test.go b/app/ante/utils/setup_test.go index 431149a34e..6f26a3e2fe 100644 --- a/app/ante/utils/setup_test.go +++ b/app/ante/utils/setup_test.go @@ -1,7 +1,7 @@ package utils_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "testing" "time" @@ -10,13 +10,13 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/app/ante" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/testutil" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" @@ -29,7 +29,7 @@ type AnteTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind clientCtx client.Context anteHandler sdk.AnteHandler ethSigner types.Signer @@ -41,7 +41,7 @@ type AnteTestSuite struct { func (suite *AnteTestSuite) SetupTest() { checkTx := false - suite.app = app.EthSetup(checkTx, func(app *app.Evermint, genesis simapp.GenesisState) simapp.GenesisState { + suite.app = app.EthSetup(checkTx, func(app *app.Nevermind, genesis simapp.GenesisState) simapp.GenesisState { if suite.enableFeemarket { // setup feemarketGenesis params feemarketGenesis := feemarkettypes.DefaultGenesisState() @@ -75,7 +75,7 @@ func (suite *AnteTestSuite) SetupTest() { suite.ctx = suite.ctx.WithBlockGasMeter(sdk.NewGasMeter(1000000000000000000)) suite.app.EvmKeeper.WithChainID(suite.ctx) - // set staking denomination to Evermint denom + // set staking denomination to Nevermind denom params := suite.app.StakingKeeper.GetParams(suite.ctx) params.BondDenom = constants.BaseDenom suite.app.StakingKeeper.SetParams(suite.ctx, params) diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index 36a0fe2df4..7cb0664b6f 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/EscanBE/evermint/v12/app/ante" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/app/app.go b/app/app.go index 3df42b1f5d..b72b562137 100644 --- a/app/app.go +++ b/app/app.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "io" "net/http" "os" @@ -108,53 +108,53 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ethante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - srvflags "github.com/EscanBE/evermint/v12/server/flags" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm" - evmkeeper "github.com/EscanBE/evermint/v12/x/evm/keeper" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/feemarket" - feemarketkeeper "github.com/EscanBE/evermint/v12/x/feemarket/keeper" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + ethante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + srvflags "github.com/VictorTrustyDev/nevermind/v12/server/flags" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm" + evmkeeper "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket" + feemarketkeeper "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/keeper" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" // unnamed import of statik for swagger UI support - _ "github.com/EscanBE/evermint/v12/client/docs/statik" - - "github.com/EscanBE/evermint/v12/app/ante" - "github.com/EscanBE/evermint/v12/app/upgrades/v3_sample" - "github.com/EscanBE/evermint/v12/x/claims" - claimskeeper "github.com/EscanBE/evermint/v12/x/claims/keeper" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/epochs" - epochskeeper "github.com/EscanBE/evermint/v12/x/epochs/keeper" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - "github.com/EscanBE/evermint/v12/x/erc20" - erc20client "github.com/EscanBE/evermint/v12/x/erc20/client" - erc20keeper "github.com/EscanBE/evermint/v12/x/erc20/keeper" - erc20types "github.com/EscanBE/evermint/v12/x/erc20/types" - "github.com/EscanBE/evermint/v12/x/incentives" - incentivesclient "github.com/EscanBE/evermint/v12/x/incentives/client" - incentiveskeeper "github.com/EscanBE/evermint/v12/x/incentives/keeper" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" - "github.com/EscanBE/evermint/v12/x/inflation" - inflationkeeper "github.com/EscanBE/evermint/v12/x/inflation/keeper" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" - "github.com/EscanBE/evermint/v12/x/recovery" - recoverykeeper "github.com/EscanBE/evermint/v12/x/recovery/keeper" - recoverytypes "github.com/EscanBE/evermint/v12/x/recovery/types" - revenue "github.com/EscanBE/evermint/v12/x/revenue/v1" - revenuekeeper "github.com/EscanBE/evermint/v12/x/revenue/v1/keeper" - revenuetypes "github.com/EscanBE/evermint/v12/x/revenue/v1/types" - "github.com/EscanBE/evermint/v12/x/vesting" - vestingkeeper "github.com/EscanBE/evermint/v12/x/vesting/keeper" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + _ "github.com/VictorTrustyDev/nevermind/v12/client/docs/statik" + + "github.com/VictorTrustyDev/nevermind/v12/app/ante" + "github.com/VictorTrustyDev/nevermind/v12/app/upgrades/v3_sample" + "github.com/VictorTrustyDev/nevermind/v12/x/claims" + claimskeeper "github.com/VictorTrustyDev/nevermind/v12/x/claims/keeper" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs" + epochskeeper "github.com/VictorTrustyDev/nevermind/v12/x/epochs/keeper" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20" + erc20client "github.com/VictorTrustyDev/nevermind/v12/x/erc20/client" + erc20keeper "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + erc20types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives" + incentivesclient "github.com/VictorTrustyDev/nevermind/v12/x/incentives/client" + incentiveskeeper "github.com/VictorTrustyDev/nevermind/v12/x/incentives/keeper" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation" + inflationkeeper "github.com/VictorTrustyDev/nevermind/v12/x/inflation/keeper" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery" + recoverykeeper "github.com/VictorTrustyDev/nevermind/v12/x/recovery/keeper" + recoverytypes "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" + revenue "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1" + revenuekeeper "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/keeper" + revenuetypes "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting" + vestingkeeper "github.com/VictorTrustyDev/nevermind/v12/x/vesting/keeper" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" // NOTE: override ICS20 keeper to support IBC transfers of ERC20 tokens - "github.com/EscanBE/evermint/v12/x/ibc/transfer" - transferkeeper "github.com/EscanBE/evermint/v12/x/ibc/transfer/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer" + transferkeeper "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer/keeper" // Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes _ "github.com/ethereum/go-ethereum/eth/tracers/js" @@ -195,7 +195,7 @@ var ( []govclient.ProposalHandler{ paramsclient.ProposalHandler, distrclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler, - // Evermint proposal types + // Nevermind proposal types erc20client.RegisterCoinProposalHandler, erc20client.RegisterERC20ProposalHandler, erc20client.ToggleTokenConversionProposalHandler, incentivesclient.RegisterIncentiveProposalHandler, incentivesclient.CancelIncentiveProposalHandler, }, @@ -245,14 +245,14 @@ var ( ) var ( - _ servertypes.Application = (*Evermint)(nil) - _ ibctesting.TestingApp = (*Evermint)(nil) + _ servertypes.Application = (*Nevermind)(nil) + _ ibctesting.TestingApp = (*Nevermind)(nil) ) -// Evermint implements an extended ABCI application. It is an application +// Nevermind implements an extended ABCI application. It is an application // that may process transactions through Ethereum's EVM running atop of // Tendermint consensus. -type Evermint struct { +type Nevermind struct { *baseapp.BaseApp // encoding @@ -293,7 +293,7 @@ type Evermint struct { EvmKeeper *evmkeeper.Keeper FeeMarketKeeper feemarketkeeper.Keeper - // Evermint keepers + // Nevermind keepers InflationKeeper inflationkeeper.Keeper ClaimsKeeper *claimskeeper.Keeper Erc20Keeper erc20keeper.Keeper @@ -312,8 +312,8 @@ type Evermint struct { tpsCounter *tpsCounter } -// NewEvermint returns a reference to a new initialized Ethermint application. -func NewEvermint( +// NewNevermind returns a reference to a new initialized Ethermint application. +func NewNevermind( logger log.Logger, db dbm.DB, traceStore io.Writer, @@ -324,7 +324,7 @@ func NewEvermint( encodingConfig simappparams.EncodingConfig, appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp), -) *Evermint { +) *Nevermind { appCodec := encodingConfig.Codec cdc := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry @@ -356,7 +356,7 @@ func NewEvermint( icahosttypes.StoreKey, // ethermint keys evmtypes.StoreKey, feemarkettypes.StoreKey, - // evermint module keys + // nevermind module keys inflationtypes.StoreKey, erc20types.StoreKey, incentivestypes.StoreKey, epochstypes.StoreKey, claimstypes.StoreKey, vestingtypes.StoreKey, revenuetypes.StoreKey, recoverytypes.StoreKey, @@ -372,7 +372,7 @@ func NewEvermint( os.Exit(1) } - chainApp := &Evermint{ + chainApp := &Nevermind{ BaseApp: baseApp, cdc: cdc, appCodec: appCodec, @@ -465,7 +465,7 @@ func NewEvermint( &stakingKeeper, govRouter, chainApp.MsgServiceRouter(), govConfig, ) - // Evermint Keeper + // Nevermind Keeper chainApp.InflationKeeper = inflationkeeper.NewKeeper( keys[inflationtypes.StoreKey], appCodec, authtypes.NewModuleAddress(govtypes.ModuleName), chainApp.AccountKeeper, chainApp.BankKeeper, chainApp.DistrKeeper, &stakingKeeper, @@ -650,7 +650,7 @@ func NewEvermint( // Ethermint app modules evm.NewAppModule(chainApp.EvmKeeper, chainApp.AccountKeeper, chainApp.GetSubspace(evmtypes.ModuleName)), feemarket.NewAppModule(chainApp.FeeMarketKeeper, chainApp.GetSubspace(feemarkettypes.ModuleName)), - // Evermint app modules + // Nevermind app modules inflation.NewAppModule(chainApp.InflationKeeper, chainApp.AccountKeeper, chainApp.StakingKeeper, chainApp.GetSubspace(inflationtypes.ModuleName)), erc20.NewAppModule(chainApp.Erc20Keeper, chainApp.AccountKeeper, @@ -730,7 +730,7 @@ func NewEvermint( feegrant.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, - // Evermint modules + // Nevermind modules vestingtypes.ModuleName, inflationtypes.ModuleName, erc20types.ModuleName, @@ -770,7 +770,7 @@ func NewEvermint( feegrant.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, - // Evermint modules + // Nevermind modules vestingtypes.ModuleName, inflationtypes.ModuleName, erc20types.ModuleName, @@ -827,9 +827,9 @@ func NewEvermint( } // Name returns the name of the App -func (app *Evermint) Name() string { return app.BaseApp.Name() } +func (app *Nevermind) Name() string { return app.BaseApp.Name() } -func (app *Evermint) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint64) { +func (app *Nevermind) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint64) { options := ante.HandlerOptions{ Cdc: app.appCodec, AccountKeeper: app.AccountKeeper, @@ -854,7 +854,7 @@ func (app *Evermint) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint6 app.SetAnteHandler(ante.NewAnteHandler(options)) } -func (app *Evermint) setPostHandler() { +func (app *Nevermind) setPostHandler() { postHandler, err := posthandler.NewPostHandler( posthandler.HandlerOptions{}, ) @@ -868,19 +868,19 @@ func (app *Evermint) setPostHandler() { // BeginBlocker runs the Tendermint ABCI BeginBlock logic. It executes state changes at the beginning // of the new block for every registered module. If there is a registered fork at the current height, // BeginBlocker will schedule the upgrade plan and perform the state migration (if any). -func (app *Evermint) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { +func (app *Nevermind) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { // Perform any scheduled forks before executing the modules logic app.ScheduleForkUpgrade(ctx) return app.mm.BeginBlock(ctx, req) } // EndBlocker updates every end block -func (app *Evermint) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { +func (app *Nevermind) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { return app.mm.EndBlock(ctx, req) } // The DeliverTx method is intentionally decomposed to calculate the transactions per second. -func (app *Evermint) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDeliverTx) { +func (app *Nevermind) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDeliverTx) { defer func() { // TODO: Record the count along with the code and or reason so as to display // in the transactions per second live dashboards. @@ -894,7 +894,7 @@ func (app *Evermint) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDeli } // InitChainer updates at chain initialization -func (app *Evermint) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { +func (app *Nevermind) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { var genesisState simapp.GenesisState if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) @@ -906,12 +906,12 @@ func (app *Evermint) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc } // LoadHeight loads state at a particular height -func (app *Evermint) LoadHeight(height int64) error { +func (app *Nevermind) LoadHeight(height int64) error { return app.LoadVersion(height) } // ModuleAccountAddrs returns all the app's module account addresses. -func (app *Evermint) ModuleAccountAddrs() map[string]bool { +func (app *Nevermind) ModuleAccountAddrs() map[string]bool { modAccAddrs := make(map[string]bool) accs := make([]string, 0, len(maccPerms)) @@ -929,7 +929,7 @@ func (app *Evermint) ModuleAccountAddrs() map[string]bool { // BlockedAddrs returns all the app's module account addresses that are not // allowed to receive external tokens. -func (app *Evermint) BlockedAddrs() map[string]bool { +func (app *Nevermind) BlockedAddrs() map[string]bool { blockedAddrs := make(map[string]bool) accs := make([]string, 0, len(maccPerms)) @@ -945,59 +945,59 @@ func (app *Evermint) BlockedAddrs() map[string]bool { return blockedAddrs } -// LegacyAmino returns Evermint's amino codec. +// LegacyAmino returns Nevermind's amino codec. // // NOTE: This is solely to be used for testing purposes as it may be desirable // for modules to register their own custom testing types. -func (app *Evermint) LegacyAmino() *codec.LegacyAmino { +func (app *Nevermind) LegacyAmino() *codec.LegacyAmino { return app.cdc } -// AppCodec returns Evermint's app codec. +// AppCodec returns Nevermind's app codec. // // NOTE: This is solely to be used for testing purposes as it may be desirable // for modules to register their own custom testing types. -func (app *Evermint) AppCodec() codec.Codec { +func (app *Nevermind) AppCodec() codec.Codec { return app.appCodec } -// InterfaceRegistry returns Evermint's InterfaceRegistry -func (app *Evermint) InterfaceRegistry() types.InterfaceRegistry { +// InterfaceRegistry returns Nevermind's InterfaceRegistry +func (app *Nevermind) InterfaceRegistry() types.InterfaceRegistry { return app.interfaceRegistry } // GetKey returns the KVStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *Evermint) GetKey(storeKey string) *storetypes.KVStoreKey { +func (app *Nevermind) GetKey(storeKey string) *storetypes.KVStoreKey { return app.keys[storeKey] } // GetTKey returns the TransientStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *Evermint) GetTKey(storeKey string) *storetypes.TransientStoreKey { +func (app *Nevermind) GetTKey(storeKey string) *storetypes.TransientStoreKey { return app.tkeys[storeKey] } // GetMemKey returns the MemStoreKey for the provided mem key. // // NOTE: This is solely used for testing purposes. -func (app *Evermint) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { +func (app *Nevermind) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { return app.memKeys[storeKey] } // GetSubspace returns a param subspace for a given module name. // // NOTE: This is solely to be used for testing purposes. -func (app *Evermint) GetSubspace(moduleName string) paramstypes.Subspace { +func (app *Nevermind) GetSubspace(moduleName string) paramstypes.Subspace { subspace, _ := app.ParamsKeeper.GetSubspace(moduleName) return subspace } // RegisterAPIRoutes registers all application module routes with the provided // API server. -func (app *Evermint) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) { +func (app *Nevermind) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) { clientCtx := apiSvr.ClientCtx // Register new tx routes from grpc-gateway. @@ -1016,12 +1016,12 @@ func (app *Evermint) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIC } } -func (app *Evermint) RegisterTxService(clientCtx client.Context) { +func (app *Nevermind) RegisterTxService(clientCtx client.Context) { authtx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry) } // RegisterTendermintService implements the Application.RegisterTendermintService method. -func (app *Evermint) RegisterTendermintService(clientCtx client.Context) { +func (app *Nevermind) RegisterTendermintService(clientCtx client.Context) { tmservice.RegisterTendermintService( clientCtx, app.BaseApp.GRPCQueryRouter(), @@ -1032,39 +1032,39 @@ func (app *Evermint) RegisterTendermintService(clientCtx client.Context) { // RegisterNodeService registers the node gRPC service on the provided // application gRPC query router. -func (app *Evermint) RegisterNodeService(clientCtx client.Context) { +func (app *Nevermind) RegisterNodeService(clientCtx client.Context) { node.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) } // IBC Go TestingApp functions // GetBaseApp implements the TestingApp interface. -func (app *Evermint) GetBaseApp() *baseapp.BaseApp { +func (app *Nevermind) GetBaseApp() *baseapp.BaseApp { return app.BaseApp } // GetStakingKeeper implements the TestingApp interface. -func (app *Evermint) GetStakingKeeper() ibctestingtypes.StakingKeeper { +func (app *Nevermind) GetStakingKeeper() ibctestingtypes.StakingKeeper { return app.StakingKeeper } // GetStakingKeeperSDK implements the TestingApp interface. -func (app *Evermint) GetStakingKeeperSDK() stakingkeeper.Keeper { +func (app *Nevermind) GetStakingKeeperSDK() stakingkeeper.Keeper { return app.StakingKeeper } // GetIBCKeeper implements the TestingApp interface. -func (app *Evermint) GetIBCKeeper() *ibckeeper.Keeper { +func (app *Nevermind) GetIBCKeeper() *ibckeeper.Keeper { return app.IBCKeeper } // GetScopedIBCKeeper implements the TestingApp interface. -func (app *Evermint) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper { +func (app *Nevermind) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper { return app.ScopedIBCKeeper } // GetTxConfig implements the TestingApp interface. -func (app *Evermint) GetTxConfig() client.TxConfig { +func (app *Nevermind) GetTxConfig() client.TxConfig { cfg := encoding.MakeConfig(ModuleBasics) return cfg.TxConfig } @@ -1110,7 +1110,7 @@ func initParamsKeeper( // ethermint subspaces paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) //nolint: staticcheck paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable()) - // evermint subspaces + // nevermind subspaces paramsKeeper.Subspace(inflationtypes.ModuleName) paramsKeeper.Subspace(erc20types.ModuleName) paramsKeeper.Subspace(claimstypes.ModuleName) @@ -1120,7 +1120,7 @@ func initParamsKeeper( return paramsKeeper } -func (app *Evermint) setupUpgradeHandlers() { +func (app *Nevermind) setupUpgradeHandlers() { // Sample v3.0.0 upgrade handler app.UpgradeKeeper.SetUpgradeHandler( v3_sample.UpgradeName, diff --git a/app/app_test.go b/app/app_test.go index d383623129..fa5202ae85 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -2,7 +2,7 @@ package app import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "testing" @@ -20,10 +20,10 @@ import ( tmtypes "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/encoding" ) -func TestEvermintExport(t *testing.T) { +func TestNevermindExport(t *testing.T) { // create public key privVal := mock.NewPV() pubKey, err := privVal.GetPubKey() @@ -42,7 +42,7 @@ func TestEvermintExport(t *testing.T) { } db := dbm.NewMemDB() - chainApp := NewEvermint(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) + chainApp := NewNevermind(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) genesisState := NewDefaultGenesisState() genesisState = GenesisStateWithValSet(chainApp, genesisState, valSet, []authtypes.GenesisAccount{acc}, balance) @@ -60,7 +60,7 @@ func TestEvermintExport(t *testing.T) { chainApp.Commit() // Making a new app object with the db, so that initchain hasn't been called - app2 := NewEvermint(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) + app2 := NewNevermind(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) _, err = app2.ExportAppStateAndValidators(false, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") } diff --git a/app/ethtest_helper.go b/app/ethtest_helper.go index 653703e80a..0bd127f7c7 100644 --- a/app/ethtest_helper.go +++ b/app/ethtest_helper.go @@ -2,7 +2,7 @@ package app import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" "github.com/cosmos/cosmos-sdk/codec" @@ -15,7 +15,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/encoding" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" @@ -25,7 +25,7 @@ import ( ) // EthDefaultConsensusParams defines the default Tendermint consensus params used in -// Evermint app testing. +// Nevermind app testing. var EthDefaultConsensusParams = &abci.ConsensusParams{ Block: &abci.BlockParams{ MaxBytes: 200000, @@ -43,14 +43,14 @@ var EthDefaultConsensusParams = &abci.ConsensusParams{ }, } -// EthSetup initializes a new Evermint app. A Nop logger is set in Evermint app. -func EthSetup(isCheckTx bool, patchGenesis func(*Evermint, simapp.GenesisState) simapp.GenesisState) *Evermint { +// EthSetup initializes a new Nevermind app. A Nop logger is set in Nevermind app. +func EthSetup(isCheckTx bool, patchGenesis func(*Nevermind, simapp.GenesisState) simapp.GenesisState) *Nevermind { return EthSetupWithDB(isCheckTx, patchGenesis, dbm.NewMemDB()) } -// EthSetupWithDB initializes a new Evermint app. A Nop logger is set in Evermint app. -func EthSetupWithDB(isCheckTx bool, patchGenesis func(*Evermint, simapp.GenesisState) simapp.GenesisState, db dbm.DB) *Evermint { - chainApp := NewEvermint(log.NewNopLogger(), +// EthSetupWithDB initializes a new Nevermind app. A Nop logger is set in Nevermind app. +func EthSetupWithDB(isCheckTx bool, patchGenesis func(*Nevermind, simapp.GenesisState) simapp.GenesisState, db dbm.DB) *Nevermind { + chainApp := NewNevermind(log.NewNopLogger(), db, nil, true, diff --git a/app/export.go b/app/export.go index fe3e7e8dcd..dc4294f51d 100644 --- a/app/export.go +++ b/app/export.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/encoding" ) // NewDefaultGenesisState generates the default state for the application. @@ -24,7 +24,7 @@ func NewDefaultGenesisState() simapp.GenesisState { // ExportAppStateAndValidators exports the state of the application for a genesis // file. -func (app *Evermint) ExportAppStateAndValidators( +func (app *Nevermind) ExportAppStateAndValidators( forZeroHeight bool, jailAllowedAddrs []string, ) (servertypes.ExportedApp, error) { // Creates context with current height and checks txs for ctx to be usable by start of next block @@ -64,7 +64,7 @@ func (app *Evermint) ExportAppStateAndValidators( // NOTE zero height genesis is a temporary feature which will be deprecated // // in favor of export at a block height -func (app *Evermint) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) error { +func (app *Nevermind) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) error { applyAllowedAddrs := false // check if there is a allowed address list diff --git a/app/forks.go b/app/forks.go index ed62c8b788..7ea2078c28 100644 --- a/app/forks.go +++ b/app/forks.go @@ -2,7 +2,7 @@ package app import ( "fmt" - "github.com/EscanBE/evermint/v12/app/upgrades/v3_sample" + "github.com/VictorTrustyDev/nevermind/v12/app/upgrades/v3_sample" sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) @@ -15,7 +15,7 @@ import ( // // 1. Release a non-breaking patch version so that the chain can set the scheduled upgrade plan at upgrade-height. // 2. Release the software defined in the upgrade-info -func (app *Evermint) ScheduleForkUpgrade(ctx sdk.Context) { +func (app *Nevermind) ScheduleForkUpgrade(ctx sdk.Context) { upgradePlan := upgradetypes.Plan{ Height: ctx.BlockHeight(), } diff --git a/app/gas.go b/app/gas.go index 8a2f3ab578..577e2ff865 100644 --- a/app/gas.go +++ b/app/gas.go @@ -5,7 +5,7 @@ import ( ) var ( - // MainnetMinGasPrices defines 20B (20 gas-wei) as the minimum gas price value on the fee market module. + // MainnetMinGasPrices defines 20B (20 gas-uever) as the minimum gas price value on the fee market module. // See https://commonwealth.im/evmos/discussion/5073-global-min-gas-price-value-for-cosmos-sdk-and-evm-transaction-choosing-a-value for reference MainnetMinGasPrices = sdk.NewDec(20_000_000_000) // MainnetMinGasMultiplier defines the min gas multiplier value on the fee market module. diff --git a/app/test_helpers.go b/app/test_helpers.go index 885c53dd09..cc91b46eef 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -2,7 +2,7 @@ package app import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -22,10 +22,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/encoding" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" - "github.com/EscanBE/evermint/v12/cmd/config" + "github.com/VictorTrustyDev/nevermind/v12/cmd/config" ) func init() { @@ -38,7 +38,7 @@ func init() { var DefaultTestingAppInit func() (ibctesting.TestingApp, map[string]json.RawMessage) = SetupTestingApp // DefaultConsensusParams defines the default Tendermint consensus params used in -// Evermint testing. +// Nevermind testing. var DefaultConsensusParams = &abci.ConsensusParams{ Block: &abci.BlockParams{ MaxBytes: 200000, @@ -63,11 +63,11 @@ func init() { config.SetBip44CoinType(cfg) } -// Setup initializes a new Evermint. A Nop logger is set in Evermint. +// Setup initializes a new Nevermind. A Nop logger is set in Nevermind. func Setup( isCheckTx bool, feemarketGenesis *feemarkettypes.GenesisState, -) *Evermint { +) *Nevermind { privVal := mock.NewPV() pubKey, _ := privVal.GetPubKey() @@ -85,7 +85,7 @@ func Setup( db := dbm.NewMemDB() - chainApp := NewEvermint(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) + chainApp := NewNevermind(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, encoding.MakeConfig(ModuleBasics), simapp.EmptyAppOptions{}) if !isCheckTx { // init chain must be called to stop deliverState from being nil genesisState := NewDefaultGenesisState() @@ -119,7 +119,7 @@ func Setup( return chainApp } -func GenesisStateWithValSet(app *Evermint, genesisState simapp.GenesisState, +func GenesisStateWithValSet(app *Nevermind, genesisState simapp.GenesisState, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance, ) simapp.GenesisState { @@ -186,6 +186,6 @@ func GenesisStateWithValSet(app *Evermint, genesisState simapp.GenesisState, func SetupTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) { db := dbm.NewMemDB() cfg := encoding.MakeConfig(ModuleBasics) - chainApp := NewEvermint(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, cfg, simapp.EmptyAppOptions{}) + chainApp := NewNevermind(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, cfg, simapp.EmptyAppOptions{}) return chainApp, NewDefaultGenesisState() } diff --git a/app/upgrades/v3_sample/constants.go b/app/upgrades/v3_sample/constants.go index 54a78977a7..80679f03f8 100644 --- a/app/upgrades/v3_sample/constants.go +++ b/app/upgrades/v3_sample/constants.go @@ -6,5 +6,5 @@ const ( // DevnetUpgradeHeight defines the devnet block height on which the upgrade will take place DevnetUpgradeHeight = 999_999_999 // UpgradeInfo defines the binaries that will be used for the upgrade - UpgradeInfo = `'{"binaries":{"darwin/amd64":"https://github.com/EscanBE/evermint/releases/download/v3.0.0/evermint_3.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/EscanBE/evermint/releases/download/v3.0.0/evermint_3.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/EscanBE/evermint/releases/download/v3.0.0/evermint_3.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/EscanBE/evermint/releases/download/v3.0.0/evermint_3.0.0_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/EscanBE/evermint/releases/download/v3.0.0/evermint_3.0.0_Windows_x86_64.zip"}}'` + UpgradeInfo = `'{"binaries":{"darwin/amd64":"https://github.com/VictorTrustyDev/nevermind/releases/download/v3.0.0/nevermind_3.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/VictorTrustyDev/nevermind/releases/download/v3.0.0/nevermind_3.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/VictorTrustyDev/nevermind/releases/download/v3.0.0/nevermind_3.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/VictorTrustyDev/nevermind/releases/download/v3.0.0/nevermind_3.0.0_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/VictorTrustyDev/nevermind/releases/download/v3.0.0/nevermind_3.0.0_Windows_x86_64.zip"}}'` ) diff --git a/client/config.go b/client/config.go index 811834c680..e9abf2c638 100644 --- a/client/config.go +++ b/client/config.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" ) // InitConfig adds the chain-id, encoding and output flags to the persistent flag set. diff --git a/client/debug/debug.go b/client/debug/debug.go index 868e2877f7..96a2798584 100644 --- a/client/debug/debug.go +++ b/client/debug/debug.go @@ -4,12 +4,12 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strconv" "strings" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - evertypes "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/client" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/client/docs/config.json b/client/docs/config.json index 43e728a825..138d35e819 100644 --- a/client/docs/config.json +++ b/client/docs/config.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "Evermint Chain - gRPC Gateway docs", + "title": "Nevermind Chain - gRPC Gateway docs", "description": "A REST interface for state queries and transactions", "version": "1.0.0" }, diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml index 7c48627a0e..59011d713e 100644 --- a/client/docs/swagger-ui/swagger.yaml +++ b/client/docs/swagger-ui/swagger.yaml @@ -1,6 +1,6 @@ swagger: '2.0' info: - title: Evermint Chain - gRPC Gateway docs + title: Nevermind Chain - gRPC Gateway docs description: A REST interface for state queries and transactions version: 1.0.0 paths: @@ -44761,7 +44761,7 @@ definitions: excludes the team vesting distribution, as this is minted once at genesis. - The initial InflationDistribution can be calculated from the Evermint Coin + The initial InflationDistribution can be calculated from the Nevermind Coin Model like this: diff --git a/client/export.go b/client/export.go index 8e0ef61e39..542bc0917f 100644 --- a/client/export.go +++ b/client/export.go @@ -12,8 +12,8 @@ import ( ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) @@ -64,7 +64,7 @@ func UnsafeExportEthKeyCommand() *cobra.Command { return fmt.Errorf("invalid key algorithm, got %s, expected %s", algo, ethsecp256k1.KeyType) } - // Converts key to Evermint secp256k1 implementation + // Converts key to Nevermind secp256k1 implementation ethPrivKey, ok := privKey.(*ethsecp256k1.PrivKey) if !ok { return fmt.Errorf("invalid private key type %T, expected %T", privKey, ðsecp256k1.PrivKey{}) diff --git a/client/import.go b/client/import.go index f85e240d51..8a4d24fe90 100644 --- a/client/import.go +++ b/client/import.go @@ -5,13 +5,13 @@ import ( "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/input" "github.com/cosmos/cosmos-sdk/crypto" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" ) // UnsafeImportKeyCommand imports private keys from a keyfile. diff --git a/client/keys.go b/client/keys.go index b690b4f2d5..1704c8554d 100644 --- a/client/keys.go +++ b/client/keys.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" - clientkeys "github.com/EscanBE/evermint/v12/client/keys" - "github.com/EscanBE/evermint/v12/crypto/hd" + clientkeys "github.com/VictorTrustyDev/nevermind/v12/client/keys" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/client/keys/add.go b/client/keys/add.go index 10707ca28a..e5f7015e37 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - cryptohd "github.com/EscanBE/evermint/v12/crypto/hd" + cryptohd "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" bip39 "github.com/cosmos/go-bip39" "github.com/spf13/cobra" diff --git a/client/testnet.go b/client/testnet.go index fba5858b7e..ccd8c3146a 100644 --- a/client/testnet.go +++ b/client/testnet.go @@ -6,7 +6,7 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "net" "os" "path/filepath" @@ -39,13 +39,13 @@ import ( mintypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/server/config" - srvflags "github.com/EscanBE/evermint/v12/server/flags" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + srvflags "github.com/VictorTrustyDev/nevermind/v12/server/flags" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/testutil/network" + "github.com/VictorTrustyDev/nevermind/v12/testutil/network" ) var ( diff --git a/cmd/config/config.go b/cmd/config/config.go index d1d2a9d296..a6b53e5b1f 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -1,8 +1,8 @@ package config import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/cmd/config/observability.go b/cmd/config/observability.go index 6c022aad52..5cae3d551a 100644 --- a/cmd/config/observability.go +++ b/cmd/config/observability.go @@ -25,7 +25,7 @@ func EnableObservability() error { // mux := http.NewServeMux() // mux.Handle("/metrics", pe) - // // TODO: Derive the Prometheus observability exporter from the Evermint config. + // // TODO: Derive the Prometheus observability exporter from the Nevermind config. // addr := ":8877" // go func() { // println("Serving the Prometheus observability exporter at", addr) diff --git a/cmd/evmd/cmd_test.go b/cmd/nvmd/cmd_test.go similarity index 86% rename from cmd/evmd/cmd_test.go rename to cmd/nvmd/cmd_test.go index 0fffaf9fff..7e68575cf4 100644 --- a/cmd/evmd/cmd_test.go +++ b/cmd/nvmd/cmd_test.go @@ -2,7 +2,7 @@ package main_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "github.com/cosmos/cosmos-sdk/client/flags" @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" "github.com/stretchr/testify/require" - "github.com/EscanBE/evermint/v12/app" - main "github.com/EscanBE/evermint/v12/cmd/evmd" + "github.com/VictorTrustyDev/nevermind/v12/app" + main "github.com/VictorTrustyDev/nevermind/v12/cmd/nvmd" ) func TestInitCmd(t *testing.T) { diff --git a/cmd/evmd/convert_address.go b/cmd/nvmd/convert_address.go similarity index 98% rename from cmd/evmd/convert_address.go rename to cmd/nvmd/convert_address.go index 559b792030..fb1aaff5d9 100644 --- a/cmd/evmd/convert_address.go +++ b/cmd/nvmd/convert_address.go @@ -3,7 +3,7 @@ package main import ( "encoding/hex" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/spf13/cobra" "os" diff --git a/cmd/evmd/genaccounts.go b/cmd/nvmd/genaccounts.go similarity index 96% rename from cmd/evmd/genaccounts.go rename to cmd/nvmd/genaccounts.go index 8bf1cfd6f6..a5d79e3c34 100644 --- a/cmd/evmd/genaccounts.go +++ b/cmd/nvmd/genaccounts.go @@ -20,13 +20,13 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - appkeyring "github.com/EscanBE/evermint/v12/crypto/keyring" + appkeyring "github.com/VictorTrustyDev/nevermind/v12/crypto/keyring" - vestingcli "github.com/EscanBE/evermint/v12/x/vesting/client/cli" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + vestingcli "github.com/VictorTrustyDev/nevermind/v12/x/vesting/client/cli" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) const ( diff --git a/cmd/evmd/init.go b/cmd/nvmd/init.go similarity index 94% rename from cmd/evmd/init.go rename to cmd/nvmd/init.go index 47eec64df4..7c9a46d7ed 100644 --- a/cmd/evmd/init.go +++ b/cmd/nvmd/init.go @@ -4,7 +4,7 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "path/filepath" "strings" @@ -85,9 +85,9 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { // Set default seeds // TODO add seeds here seeds := []string{ - //"40f4fac63da8b1ce8f850b0fa0f79b2699d2ce72@seed1.evermint.example.com:26656", - //"e3e11fca4ecf4035a751f3fea90e3a821e274487@seed2.evermint.example.com:26656", - //"fc86e7e75c5d2e4699535e1b1bec98ae55b16826@seed3.evermint.example.com:26656", + //"40f4fac63da8b1ce8f850b0fa0f79b2699d2ce72@seed1.nevermind.example.com:26656", + //"e3e11fca4ecf4035a751f3fea90e3a821e274487@seed2.nevermind.example.com:26656", + //"fc86e7e75c5d2e4699535e1b1bec98ae55b16826@seed3.nevermind.example.com:26656", } config.P2P.Seeds = strings.Join(seeds, ",") diff --git a/cmd/evmd/main.go b/cmd/nvmd/main.go similarity index 81% rename from cmd/evmd/main.go rename to cmd/nvmd/main.go index 1e96a2e43c..ff7b11ee6a 100644 --- a/cmd/evmd/main.go +++ b/cmd/nvmd/main.go @@ -1,15 +1,15 @@ package main import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/app" - cmdcfg "github.com/EscanBE/evermint/v12/cmd/config" + "github.com/VictorTrustyDev/nevermind/v12/app" + cmdcfg "github.com/VictorTrustyDev/nevermind/v12/cmd/config" ) func main() { diff --git a/cmd/evmd/migrate.go b/cmd/nvmd/migrate.go similarity index 96% rename from cmd/evmd/migrate.go rename to cmd/nvmd/migrate.go index 02bad2f346..8ccf515559 100644 --- a/cmd/evmd/migrate.go +++ b/cmd/nvmd/migrate.go @@ -3,7 +3,7 @@ package main import ( "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" "github.com/spf13/cobra" @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/EscanBE/evermint/v12/utils" + "github.com/VictorTrustyDev/nevermind/v12/utils" ) // FlagGenesisTime defines the genesis time in string format diff --git a/cmd/evmd/root.go b/cmd/nvmd/root.go similarity index 91% rename from cmd/evmd/root.go rename to cmd/nvmd/root.go index 28ceaf7f7f..a2ec5ee51d 100644 --- a/cmd/evmd/root.go +++ b/cmd/nvmd/root.go @@ -3,7 +3,7 @@ package main import ( "errors" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "io" "os" "path/filepath" @@ -36,20 +36,20 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - appclient "github.com/EscanBE/evermint/v12/client" - "github.com/EscanBE/evermint/v12/client/debug" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - appserver "github.com/EscanBE/evermint/v12/server" - servercfg "github.com/EscanBE/evermint/v12/server/config" - srvflags "github.com/EscanBE/evermint/v12/server/flags" + appclient "github.com/VictorTrustyDev/nevermind/v12/client" + "github.com/VictorTrustyDev/nevermind/v12/client/debug" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + appserver "github.com/VictorTrustyDev/nevermind/v12/server" + servercfg "github.com/VictorTrustyDev/nevermind/v12/server/config" + srvflags "github.com/VictorTrustyDev/nevermind/v12/server/flags" - chainapp "github.com/EscanBE/evermint/v12/app" - appkeyring "github.com/EscanBE/evermint/v12/crypto/keyring" + chainapp "github.com/VictorTrustyDev/nevermind/v12/app" + appkeyring "github.com/VictorTrustyDev/nevermind/v12/crypto/keyring" ) const ( - ViperEnvPrefix = "EVERMINT" + ViperEnvPrefix = "NEVERMIND" ) // NewRootCmd creates a new root command for our binary. It is called once in the @@ -73,7 +73,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { rootCmd := &cobra.Command{ Use: constants.ApplicationBinaryName, - Short: "Evermint Daemon", + Short: "Nevermind Daemon", PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { // set the default command outputs cmd.SetOut(cmd.OutOrStdout()) @@ -262,7 +262,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a cast.ToUint32(appOpts.Get(sdkserver.FlagStateSyncSnapshotKeepRecent)), ) - chainApp := chainapp.NewEvermint( + chainApp := chainapp.NewNevermind( logger, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(sdkserver.FlagInvCheckPeriod)), @@ -290,20 +290,20 @@ func (a appCreator) appExport( logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string, appOpts servertypes.AppOptions, ) (servertypes.ExportedApp, error) { - var app *chainapp.Evermint + var app *chainapp.Nevermind homePath, ok := appOpts.Get(flags.FlagHome).(string) if !ok || homePath == "" { return servertypes.ExportedApp{}, errors.New("application home not set") } if height != -1 { - app = chainapp.NewEvermint(logger, db, traceStore, false, map[int64]bool{}, "", uint(1), a.encCfg, appOpts) + app = chainapp.NewNevermind(logger, db, traceStore, false, map[int64]bool{}, "", uint(1), a.encCfg, appOpts) if err := app.LoadHeight(height); err != nil { return servertypes.ExportedApp{}, err } } else { - app = chainapp.NewEvermint(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), a.encCfg, appOpts) + app = chainapp.NewNevermind(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), a.encCfg, appOpts) } return app.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) diff --git a/cmd/evmd/testnet.go b/cmd/nvmd/testnet.go similarity index 97% rename from cmd/evmd/testnet.go rename to cmd/nvmd/testnet.go index d70bda658c..9880d8e1fe 100644 --- a/cmd/evmd/testnet.go +++ b/cmd/nvmd/testnet.go @@ -6,7 +6,7 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "net" "os" "path/filepath" @@ -38,15 +38,15 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/server/config" - srvflags "github.com/EscanBE/evermint/v12/server/flags" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + srvflags "github.com/VictorTrustyDev/nevermind/v12/server/flags" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - appkeyring "github.com/EscanBE/evermint/v12/crypto/keyring" - "github.com/EscanBE/evermint/v12/testutil/network" + appkeyring "github.com/VictorTrustyDev/nevermind/v12/crypto/keyring" + "github.com/VictorTrustyDev/nevermind/v12/testutil/network" ) var ( diff --git a/contracts/erc20.go b/contracts/erc20.go index eb03255768..29205ff684 100644 --- a/contracts/erc20.go +++ b/contracts/erc20.go @@ -4,10 +4,10 @@ import ( _ "embed" // embed compiled smart contract "encoding/json" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) var ( diff --git a/contracts/erc20DirectBalanceManipulation.go b/contracts/erc20DirectBalanceManipulation.go index 9f85ded4da..d25d48b67c 100644 --- a/contracts/erc20DirectBalanceManipulation.go +++ b/contracts/erc20DirectBalanceManipulation.go @@ -4,10 +4,10 @@ import ( _ "embed" // embed compiled smart contract "encoding/json" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // This is an evil token. Whenever an A -> B transfer is called, diff --git a/contracts/erc20burnable.go b/contracts/erc20burnable.go index 2f63227b5a..aaab558e09 100644 --- a/contracts/erc20burnable.go +++ b/contracts/erc20burnable.go @@ -4,7 +4,7 @@ import ( _ "embed" // embed compiled smart contract "encoding/json" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) var ( diff --git a/contracts/erc20maliciousdelayed.go b/contracts/erc20maliciousdelayed.go index 826fbd62a8..085458ccc4 100644 --- a/contracts/erc20maliciousdelayed.go +++ b/contracts/erc20maliciousdelayed.go @@ -4,10 +4,10 @@ import ( _ "embed" // embed compiled smart contract "encoding/json" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // This is an evil token. Whenever an A -> B transfer is called, diff --git a/contracts/package-lock.json b/contracts/package-lock.json index c4b3481ebc..3b2d5a3dde 100644 --- a/contracts/package-lock.json +++ b/contracts/package-lock.json @@ -1,11 +1,11 @@ { - "name": "evermint", + "name": "nevermind", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "evermint", + "name": "nevermind", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/contracts/package.json b/contracts/package.json index 19d6886458..6cf6c0b457 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,5 +1,5 @@ { - "name": "evermint", + "name": "nevermind", "version": "1.0.0", "description": "", "main": "index.js", @@ -15,12 +15,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/EscanBE/evermint.git" + "url": "git+https://github.com/VictorTrustyDev/nevermind.git" }, "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/EscanBE/evermint/issues" + "url": "https://github.com/VictorTrustyDev/nevermind/issues" }, - "homepage": "https://github.com/EscanBE/evermint#readme" + "homepage": "https://github.com/VictorTrustyDev/nevermind#readme" } diff --git a/crypto/codec/amino.go b/crypto/codec/amino.go index bd625729e8..613768ff2b 100644 --- a/crypto/codec/amino.go +++ b/crypto/codec/amino.go @@ -7,7 +7,7 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) // RegisterCrypto registers all crypto dependency types with the provided Amino diff --git a/crypto/codec/codec.go b/crypto/codec/codec.go index 17728c41a8..0fc4737d23 100644 --- a/crypto/codec/codec.go +++ b/crypto/codec/codec.go @@ -4,7 +4,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) // RegisterInterfaces register our chain's key concrete types. diff --git a/crypto/ethsecp256k1/ethsecp256k1.go b/crypto/ethsecp256k1/ethsecp256k1.go index c1541b447b..84a123d115 100644 --- a/crypto/ethsecp256k1/ethsecp256k1.go +++ b/crypto/ethsecp256k1/ethsecp256k1.go @@ -7,7 +7,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/crypto/hd/algorithm.go b/crypto/hd/algorithm.go index 3fe27fcaf1..9b495b9a67 100644 --- a/crypto/hd/algorithm.go +++ b/crypto/hd/algorithm.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) const ( @@ -25,7 +25,7 @@ var ( // - eth_secp256k1 (Ethereum) // - secp256k1 (Tendermint) SupportedAlgorithms = keyring.SigningAlgoList{EthSecp256k1, hd.Secp256k1} - // SupportedAlgorithmsLedger defines the list of signing algorithms used on Evermint for the Ledger device: + // SupportedAlgorithmsLedger defines the list of signing algorithms used on Nevermind for the Ledger device: // - eth_secp256k1 (Ethereum) // - secp256k1 (Tendermint) SupportedAlgorithmsLedger = keyring.SigningAlgoList{EthSecp256k1, hd.Secp256k1} diff --git a/crypto/hd/algorithm_test.go b/crypto/hd/algorithm_test.go index 390cdf1b55..b8790c9ac3 100644 --- a/crypto/hd/algorithm_test.go +++ b/crypto/hd/algorithm_test.go @@ -1,7 +1,7 @@ package hd import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "strings" "testing" @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" - cryptocodec "github.com/EscanBE/evermint/v12/crypto/codec" - enccodec "github.com/EscanBE/evermint/v12/encoding/codec" - evertypes "github.com/EscanBE/evermint/v12/types" + cryptocodec "github.com/VictorTrustyDev/nevermind/v12/crypto/codec" + enccodec "github.com/VictorTrustyDev/nevermind/v12/encoding/codec" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) var TestCodec amino.Codec @@ -119,15 +119,15 @@ func TestDerivation(t *testing.T) { require.Equal(t, badAccount.Address.String(), "0xF8D6FDf2B8b488ea37e54903750dcd13F67E71cb") // Inequality of wrong derivation path address require.NotEqual(t, account.Address.String(), badAccount.Address.String()) - // Equality of Evermint implementation + // Equality of Nevermind implementation require.Equal(t, common.BytesToAddress(privkey.PubKey().Address().Bytes()).String(), "0xA588C66983a81e800Db4dF74564F09f91c026351") require.Equal(t, common.BytesToAddress(badPrivKey.PubKey().Address().Bytes()).String(), "0xF8D6FDf2B8b488ea37e54903750dcd13F67E71cb") - // Equality of Eth and Evermint implementation + // Equality of Eth and Nevermind implementation require.Equal(t, common.BytesToAddress(privkey.PubKey().Address()).String(), account.Address.String()) require.Equal(t, common.BytesToAddress(badPrivKey.PubKey().Address()).String(), badAccount.Address.String()) - // Inequality of wrong derivation path of Eth and Evermint implementation + // Inequality of wrong derivation path of Eth and Nevermind implementation require.NotEqual(t, common.BytesToAddress(privkey.PubKey().Address()).String(), badAccount.Address.String()) require.NotEqual(t, common.BytesToAddress(badPrivKey.PubKey().Address()).String(), account.Address.Hex()) } diff --git a/crypto/hd/benchmark_test.go b/crypto/hd/benchmark_test.go index bb10629b7f..85cb0a2a0c 100644 --- a/crypto/hd/benchmark_test.go +++ b/crypto/hd/benchmark_test.go @@ -3,7 +3,7 @@ package hd import ( "testing" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/crypto/keyring/options.go b/crypto/keyring/options.go index 26503e1912..b88602a684 100644 --- a/crypto/keyring/options.go +++ b/crypto/keyring/options.go @@ -1,13 +1,13 @@ package keyring import ( - "github.com/EscanBE/evermint/v12/wallets/ledger" + "github.com/VictorTrustyDev/nevermind/v12/wallets/ledger" "github.com/cosmos/cosmos-sdk/crypto/keyring" cosmosLedger "github.com/cosmos/cosmos-sdk/crypto/ledger" "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" ) // AppName defines the Ledger app used for signing. Our chain uses the Ethereum app @@ -22,7 +22,7 @@ var ( // The Ledger derivation function is responsible for all signing and address generation. SupportedAlgorithmsLedger = keyring.SigningAlgoList{hd.EthSecp256k1} // LedgerDerivation defines our Ledger Go derivation (Ethereum app with EIP-712 signing) - LedgerDerivation = ledger.EvermintLedgerDerivation() + LedgerDerivation = ledger.NevermindLedgerDerivation() // CreatePubkey uses the ethsecp256k1 pubkey with Ethereum address generation and keccak hashing CreatePubkey = func(key []byte) types.PubKey { return ðsecp256k1.PubKey{Key: key} } // SkipDERConversion represents whether the signed Ledger output should skip conversion from DER to BER. diff --git a/docker-compose.yml b/docker-compose.yml index e84b769659..553c5c6637 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,53 +2,53 @@ version: '3' services: node0: - container_name: evermintnode0 - image: "evermint/node" + container_name: nevermindnode0 + image: "nevermind/node" ports: - "26656-26657:26656-26657" volumes: - - ./build/node0/evmd:/evermint:Z + - ./build/node0/nvmd:/nevermind:Z command: - - /evmd start --home /evermint + - /nvmd start --home /nevermind networks: localnet: ipv4_address: 192.167.10.2 node1: - container_name: evermintnode1 - image: "evermint/node" + container_name: nevermindnode1 + image: "nevermind/node" ports: - "26659-26660:26656-26657" volumes: - - ./build/node1/evmd:/evermint:Z + - ./build/node1/nvmd:/nevermind:Z command: - - /evmd start --home /evermint + - /nvmd start --home /nevermind networks: localnet: ipv4_address: 192.167.10.3 node2: - container_name: evermintnode2 - image: "evermint/node" + container_name: nevermindnode2 + image: "nevermind/node" ports: - "26661-26662:26656-26657" volumes: - - ./build/node2/evmd:/evermint:Z + - ./build/node2/nvmd:/nevermind:Z command: - - /evmd start --home /evermint + - /nvmd start --home /nevermind networks: localnet: ipv4_address: 192.167.10.4 node3: - container_name: evermintnode3 - image: "evermint/node" + container_name: nevermindnode3 + image: "nevermind/node" ports: - "26663-26664:26656-26657" volumes: - - ./build/node3/evmd:/evermint:Z + - ./build/node3/nvmd:/nevermind:Z command: - - /evmd start --home /evermint + - /nvmd start --home /nevermind networks: localnet: ipv4_address: 192.167.10.5 diff --git a/encoding/codec/codec.go b/encoding/codec/codec.go index c58b700c89..f3b85fe987 100644 --- a/encoding/codec/codec.go +++ b/encoding/codec/codec.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/std" sdk "github.com/cosmos/cosmos-sdk/types" - cryptocodec "github.com/EscanBE/evermint/v12/crypto/codec" - "github.com/EscanBE/evermint/v12/types" + cryptocodec "github.com/VictorTrustyDev/nevermind/v12/crypto/codec" + "github.com/VictorTrustyDev/nevermind/v12/types" ) // RegisterLegacyAminoCodec registers Interfaces from types, crypto, and SDK std. diff --git a/encoding/config.go b/encoding/config.go index 127e269fd1..3adb3e6c1e 100644 --- a/encoding/config.go +++ b/encoding/config.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth/tx" - enccodec "github.com/EscanBE/evermint/v12/encoding/codec" + enccodec "github.com/VictorTrustyDev/nevermind/v12/encoding/codec" ) // MakeConfig creates an EncodingConfig for testing diff --git a/encoding/config_test.go b/encoding/config_test.go index bec2b629b4..c2565ec63e 100644 --- a/encoding/config_test.go +++ b/encoding/config_test.go @@ -8,10 +8,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func TestTxEncoding(t *testing.T) { diff --git a/ethereum/eip712/eip712_fuzzer_test.go b/ethereum/eip712/eip712_fuzzer_test.go index 3291efa777..e4bb11f385 100644 --- a/ethereum/eip712/eip712_fuzzer_test.go +++ b/ethereum/eip712/eip712_fuzzer_test.go @@ -6,7 +6,7 @@ import ( rand "github.com/tendermint/tendermint/libs/rand" - "github.com/EscanBE/evermint/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) diff --git a/ethereum/eip712/eip712_test.go b/ethereum/eip712/eip712_test.go index 172084d021..548d96dada 100644 --- a/ethereum/eip712/eip712_test.go +++ b/ethereum/eip712/eip712_test.go @@ -3,12 +3,12 @@ package eip712_test import ( "bytes" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" "github.com/cosmos/cosmos-sdk/client" chainparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/ethereum/go-ethereum/crypto" @@ -16,12 +16,12 @@ import ( "github.com/tidwall/gjson" "github.com/tidwall/sjson" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" txtypes "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/cosmos-sdk/types/tx/signing" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" diff --git a/ethereum/eip712/encoding.go b/ethereum/eip712/encoding.go index 2b9887dee3..ba50c2f960 100644 --- a/ethereum/eip712/encoding.go +++ b/ethereum/eip712/encoding.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" txTypes "github.com/cosmos/cosmos-sdk/types/tx" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/signer/core/apitypes" "github.com/cosmos/cosmos-sdk/codec" diff --git a/ethereum/eip712/encoding_legacy.go b/ethereum/eip712/encoding_legacy.go index f3710b3df7..ac3aa5fb13 100644 --- a/ethereum/eip712/encoding_legacy.go +++ b/ethereum/eip712/encoding_legacy.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" txTypes "github.com/cosmos/cosmos-sdk/types/tx" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/signer/core/apitypes" ) diff --git a/ethereum/eip712/preprocess.go b/ethereum/eip712/preprocess.go index 981647dd5b..7f5a9fa11f 100644 --- a/ethereum/eip712/preprocess.go +++ b/ethereum/eip712/preprocess.go @@ -3,7 +3,7 @@ package eip712 import ( "fmt" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cosmoskr "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/ethereum/eip712/preprocess_test.go b/ethereum/eip712/preprocess_test.go index 155f667a9a..bab9b0a642 100644 --- a/ethereum/eip712/preprocess_test.go +++ b/ethereum/eip712/preprocess_test.go @@ -2,8 +2,8 @@ package eip712_test import ( "encoding/hex" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "strings" "testing" @@ -16,11 +16,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/ante" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/stretchr/testify/require" ) @@ -31,7 +31,7 @@ var ( encoding.MakeConfig(app.ModuleBasics).TxConfig, ) ) -var feePayerAddress = marker.ReplaceAbleAddress("evm17xpfvakm2amg962yls6f84z3kell8c5lcryk68") +var feePayerAddress = "ever17xpfvakm2amg962yls6f84z3kell8c5l5c3v4h" type TestCaseStruct struct { txBuilder client.TxBuilder @@ -203,7 +203,7 @@ func createPopulatedTestCase(t *testing.T) TestCaseStruct { msgSend := banktypes.MsgSend{ FromAddress: feePayerAddress, - ToAddress: marker.ReplaceAbleWithBadChecksum("evm12luku6uxehhak02py4rcz65zu0swh7wj08n0z0"), + ToAddress: "ever15usgtx54at9ma3fzjwzlm6x5l7sp29u8aaaaaa", Amount: sdk.NewCoins( sdk.NewCoin( constants.BaseDenom, diff --git a/go.mod b/go.mod index 29cc739353..97c50bafab 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/EscanBE/evermint/v12 +module github.com/VictorTrustyDev/nevermind/v12 go 1.20 diff --git a/ibc/testing/app.go b/ibc/testing/app.go index 940f75948f..384f23eb9e 100644 --- a/ibc/testing/app.go +++ b/ibc/testing/app.go @@ -2,7 +2,7 @@ package ibctesting import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -20,8 +20,8 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v6/testing" - chainapp "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/types" + chainapp "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/types" ) var DefaultTestingAppInit func() (ibcgotesting.TestingApp, map[string]json.RawMessage) = chainapp.SetupTestingApp diff --git a/ibc/testing/chain.go b/ibc/testing/chain.go index 99aefce956..e5193a8db3 100644 --- a/ibc/testing/chain.go +++ b/ibc/testing/chain.go @@ -2,7 +2,7 @@ package ibctesting import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "github.com/stretchr/testify/require" @@ -20,9 +20,9 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v6/testing" "github.com/cosmos/ibc-go/v6/testing/mock" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // ChainIDPrefix defines the default chain ID prefix for our test chains diff --git a/ibc/testing/coordinator.go b/ibc/testing/coordinator.go index 36ba2eae0f..dc6b0f0bc7 100644 --- a/ibc/testing/coordinator.go +++ b/ibc/testing/coordinator.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/EscanBE/evermint/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -18,7 +18,7 @@ const DefaultFeeAmt = int64(150_000_000_000_000_000) // 0.15 EVMOS var globalStartTime = time.Date(2020, 1, 2, 0, 0, 0, 0, time.UTC) -// NewCoordinator initializes Coordinator with N EVM TestChain's (Evermint apps) and M Cosmos chains (Simulation Apps) +// NewCoordinator initializes Coordinator with N EVM TestChain's (Nevermind apps) and M Cosmos chains (Simulation Apps) func NewCoordinator(t *testing.T, nEVMChains, mCosmosChains int) *ibctesting.Coordinator { chains := make(map[string]*ibctesting.TestChain) coord := &ibctesting.Coordinator{ @@ -124,8 +124,8 @@ func SendMsgs(chain *ibctesting.TestChain, feeAmt int64, msgs ...sdk.Msg) (*sdk. // ensure the chain has the latest time chain.Coordinator.UpdateTimeForChain(chain) - if evermintChain, ok := chain.App.(*app.Evermint); ok { - bondDenom = evermintChain.StakingKeeper.BondDenom(chain.GetContext()) + if nevermindChain, ok := chain.App.(*app.Nevermind); ok { + bondDenom = nevermindChain.StakingKeeper.BondDenom(chain.GetContext()) } else { bondDenom = chain.GetSimApp().StakingKeeper.BondDenom(chain.GetContext()) } diff --git a/ibc/utils.go b/ibc/utils.go index 8e3818aac0..1db4c04388 100644 --- a/ibc/utils.go +++ b/ibc/utils.go @@ -8,7 +8,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - "github.com/EscanBE/evermint/v12/utils" + "github.com/VictorTrustyDev/nevermind/v12/utils" ) // GetTransferSenderRecipient returns the sender and recipient sdk.AccAddresses @@ -30,14 +30,14 @@ func GetTransferSenderRecipient(packet channeltypes.Packet) ( // validate the sender bech32 address from the counterparty chain // and change the bech32 human readable prefix (HRP) of the sender to bech32-style address of this chain - sender, err = utils.GetEvermintAddressFromBech32(data.Sender) + sender, err = utils.GetNevermindAddressFromBech32(data.Sender) if err != nil { return nil, nil, "", "", errorsmod.Wrap(err, "invalid sender") } // validate the recipient bech32 address from the counterparty chain // and change the bech32 human readable prefix (HRP) of the recipient to bech32-style address of this chain - recipient, err = utils.GetEvermintAddressFromBech32(data.Receiver) + recipient, err = utils.GetNevermindAddressFromBech32(data.Receiver) if err != nil { return nil, nil, "", "", errorsmod.Wrap(err, "invalid recipient") } diff --git a/ibc/utils_test.go b/ibc/utils_test.go index b462bf2fcf..98c5cf1971 100644 --- a/ibc/utils_test.go +++ b/ibc/utils_test.go @@ -1,16 +1,16 @@ package ibc import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "testing" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - teststypes "github.com/EscanBE/evermint/v12/types/tests" + teststypes "github.com/VictorTrustyDev/nevermind/v12/types/tests" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v6/testing" @@ -59,7 +59,7 @@ func TestGetTransferSenderRecipient(t *testing.T) { Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "123456", }, ), @@ -82,48 +82,48 @@ func TestGetTransferSenderRecipient(t *testing.T) { true, }, { - "valid - cosmos sender, evermint recipient", + "valid - cosmos sender, nevermind recipient", channeltypes.Packet{ Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "123456", }, ), }, - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), - marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", + "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", false, }, { - "valid - evermint sender, cosmos recipient", + "valid - nevermind sender, cosmos recipient", channeltypes.Packet{ Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ - Sender: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Sender: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Receiver: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", Amount: "123456", }, ), }, - marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), + "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", false, }, { - "valid - osmosis sender, evermint recipient", + "valid - osmosis sender, nevermind recipient", channeltypes.Packet{ Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "osmo1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhnecd2", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "123456", }, ), }, - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), - marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", + "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", false, }, } @@ -167,7 +167,7 @@ func TestGetTransferAmount(t *testing.T) { Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "", }, ), @@ -181,7 +181,7 @@ func TestGetTransferAmount(t *testing.T) { Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "test", }, ), @@ -195,7 +195,7 @@ func TestGetTransferAmount(t *testing.T) { Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: "10000", }, ), @@ -209,7 +209,7 @@ func TestGetTransferAmount(t *testing.T) { Data: transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ Sender: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - Receiver: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Receiver: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Amount: types.IBCTriggerAmt, }, ), diff --git a/indexer/kv_indexer.go b/indexer/kv_indexer.go index fd02c36e97..fbf89a18de 100644 --- a/indexer/kv_indexer.go +++ b/indexer/kv_indexer.go @@ -4,7 +4,7 @@ import ( "fmt" errorsmod "cosmossdk.io/errors" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,8 +15,8 @@ import ( tmtypes "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) const ( diff --git a/indexer/kv_indexer_test.go b/indexer/kv_indexer_test.go index d68f01d252..c55fbaa332 100644 --- a/indexer/kv_indexer_test.go +++ b/indexer/kv_indexer_test.go @@ -1,16 +1,16 @@ package indexer_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "testing" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - evmenc "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/indexer" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + evmenc "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/indexer" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/ethereum/go-ethereum/common" diff --git a/init.bat b/init.bat index 9e2f5eba52..461b10f353 100644 --- a/init.bat +++ b/init.bat @@ -9,17 +9,17 @@ rem 3. add path C:\msys64\mingw64\bin rem C:\msys64\usr\bin set KEY="dev0" -set CHAINID="evermint_80808-1" +set CHAINID="nevermind_80808-1" set MONIKER="localtestnet" -set BINARY="evmd" +set BINARY="nvmd" set KEYRING="test" set KEYALGO="eth_secp256k1" set LOGLEVEL="info" -set MIN_DENOM="wei" +set MIN_DENOM="uever" # to trace evm #TRACE="--trace" set TRACE="" -set HOME=%USERPROFILE%\.evermint +set HOME=%USERPROFILE%\.nevermind echo %HOME% set ETHCONFIG=%HOME%\config\config.toml set GENESIS=%HOME%\config\genesis.json diff --git a/local_node.sh b/local_node.sh index 43a0587c49..380654bad4 100755 --- a/local_node.sh +++ b/local_node.sh @@ -3,10 +3,10 @@ KEYS[0]="dev0" KEYS[1]="dev1" KEYS[2]="dev2" -CHAINID="evermint_70707-1" # devnet +CHAINID="nevermind_70707-1" # devnet MONIKER="localtestnet" -BINARY="evmd" -MIN_DENOM="wei" +BINARY="nvmd" +MIN_DENOM="uever" # Remember to change to other types of keyring like 'file' in-case exposing to outside world, # otherwise your balance will be wiped quickly # The keyring test does not require private key to steal tokens from you @@ -14,7 +14,7 @@ KEYRING="test" KEYALGO="eth_secp256k1" LOGLEVEL="info" # Set dedicated home directory for the temp instance -HOMEDIR="$HOME/.tmp-evermint" +HOMEDIR="$HOME/.tmp-nevermind" # to trace evm #TRACE="--trace" TRACE="" @@ -89,8 +89,8 @@ if [[ $overwrite == "y" || $overwrite == "Y" ]]; then jq '.app_state["claims"]["params"]["duration_until_decay"]="100000s"' >"$TMP_GENESIS" "$GENESIS" && mv "$TMP_GENESIS" "$GENESIS" # Claim module account: - # 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || evm15cvq3ljql6utxseh0zau9m8ve2j8erz80qzkas - jq -r --arg amount_to_claim "$amount_to_claim" '.app_state["bank"]["balances"] += [{"address":"evm15cvq3ljql6utxseh0zau9m8ve2j8erz80qzkas","coins":[{"denom":"'$MIN_DENOM'", "amount":$amount_to_claim}]}]' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" + # 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || ever15cvq3ljql6utxseh0zau9m8ve2j8erz8rmhvjq + jq -r --arg amount_to_claim "$amount_to_claim" '.app_state["bank"]["balances"] += [{"address":"ever15cvq3ljql6utxseh0zau9m8ve2j8erz8rmhvjq","coins":[{"denom":"'$MIN_DENOM'", "amount":$amount_to_claim}]}]' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" if [[ $1 == "pending" ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then @@ -148,9 +148,9 @@ if [[ $overwrite == "y" || $overwrite == "Y" ]]; then ## In case you want to create multiple validators at genesis ## 1. Back to `"$BINARY" keys add` step, init more keys ## 2. Back to `"$BINARY" add-genesis-account` step, add balance for those - ## 3. Clone this ~/.evermint home directory into some others, let's say `~/.clonedHome` + ## 3. Clone this ~/.nevermind home directory into some others, let's say `~/.clonedHome` ## 4. Run `gentx` in each of those folders - ## 5. Copy the `gentx-*` folders under `~/.clonedHome/config/gentx/` folders into the original `~/.evermint/config/gentx` + ## 5. Copy the `gentx-*` folders under `~/.clonedHome/config/gentx/` folders into the original `~/.nevermind/config/gentx` # Collect genesis tx "$BINARY" collect-gentxs --home "$HOMEDIR" diff --git a/networks/local/Makefile b/networks/local/Makefile index 803364230b..57aef4edeb 100644 --- a/networks/local/Makefile +++ b/networks/local/Makefile @@ -1,4 +1,4 @@ all: - docker build --tag evermint/node ../.. -f chain/Dockerfile + docker build --tag nevermind/node ../.. -f chain/Dockerfile .PHONY: all diff --git a/networks/local/chain/Dockerfile b/networks/local/chain/Dockerfile index b909dd1336..2b6b9e1f58 100644 --- a/networks/local/chain/Dockerfile +++ b/networks/local/chain/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get upgrade -y && \ apt-get install -y $PACKAGES # Set working directory for the build -WORKDIR /go/src/github.com/EscanBE/evermint +WORKDIR /go/src/github.com/VictorTrustyDev/nevermind # Add source files COPY . . @@ -22,8 +22,8 @@ WORKDIR / RUN apt-get update # Copy over binaries from the build-env -COPY --from=build-env /go/src/github.com/EscanBE/evermint/build/evmd / -COPY --from=build-env /go/src/github.com/EscanBE/evermint/scripts/start-docker.sh / +COPY --from=build-env /go/src/github.com/VictorTrustyDev/nevermind/build/nvmd / +COPY --from=build-env /go/src/github.com/VictorTrustyDev/nevermind/scripts/start-docker.sh / EXPOSE 26656 26657 1317 9090 8545 8546 diff --git a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto index c94b31ae93..36e9d04260 100644 --- a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto +++ b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto @@ -3,7 +3,7 @@ package ethermint.crypto.v1.ethsecp256k1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1"; // PubKey defines a type alias for an ecdsa.PublicKey that implements // Tendermint's PubKey interface. It represents the 33-byte compressed public diff --git a/proto/ethermint/evm/v1/events.proto b/proto/ethermint/evm/v1/events.proto index 813fad186f..d0ce4b5da0 100644 --- a/proto/ethermint/evm/v1/events.proto +++ b/proto/ethermint/evm/v1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ethermint.evm.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/evm/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/evm/types"; // EventEthereumTx defines the event for an Ethereum transaction message EventEthereumTx { diff --git a/proto/ethermint/evm/v1/evm.proto b/proto/ethermint/evm/v1/evm.proto index 11340a42d8..8e7e37892e 100644 --- a/proto/ethermint/evm/v1/evm.proto +++ b/proto/ethermint/evm/v1/evm.proto @@ -3,7 +3,7 @@ package ethermint.evm.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/evm/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/evm/types"; // Params defines the EVM module parameters message Params { diff --git a/proto/ethermint/evm/v1/genesis.proto b/proto/ethermint/evm/v1/genesis.proto index cd1e20978e..b10955acc8 100644 --- a/proto/ethermint/evm/v1/genesis.proto +++ b/proto/ethermint/evm/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.evm.v1; import "ethermint/evm/v1/evm.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/evm/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/evm/types"; // GenesisState defines the evm module's genesis state. message GenesisState { diff --git a/proto/ethermint/evm/v1/query.proto b/proto/ethermint/evm/v1/query.proto index bc9dd20ef9..abdbcfd727 100644 --- a/proto/ethermint/evm/v1/query.proto +++ b/proto/ethermint/evm/v1/query.proto @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/evm/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/evm/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/ethermint/evm/v1/tx.proto b/proto/ethermint/evm/v1/tx.proto index a885732501..a51fc09354 100644 --- a/proto/ethermint/evm/v1/tx.proto +++ b/proto/ethermint/evm/v1/tx.proto @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/evm/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/evm/types"; // Msg defines the evm Msg service. service Msg { diff --git a/proto/ethermint/feemarket/v1/events.proto b/proto/ethermint/feemarket/v1/events.proto index 0e059034ce..9545961ad0 100644 --- a/proto/ethermint/feemarket/v1/events.proto +++ b/proto/ethermint/feemarket/v1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ethermint.feemarket.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/feemarket/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types"; // EventFeeMarket is the event type for the fee market module message EventFeeMarket { diff --git a/proto/ethermint/feemarket/v1/feemarket.proto b/proto/ethermint/feemarket/v1/feemarket.proto index 369668e166..1616ccb58c 100644 --- a/proto/ethermint/feemarket/v1/feemarket.proto +++ b/proto/ethermint/feemarket/v1/feemarket.proto @@ -3,7 +3,7 @@ package ethermint.feemarket.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/feemarket/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types"; // Params defines the EVM module parameters message Params { diff --git a/proto/ethermint/feemarket/v1/genesis.proto b/proto/ethermint/feemarket/v1/genesis.proto index 83f2d5f87f..6805d3cd3c 100644 --- a/proto/ethermint/feemarket/v1/genesis.proto +++ b/proto/ethermint/feemarket/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.feemarket.v1; import "ethermint/feemarket/v1/feemarket.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/feemarket/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types"; // GenesisState defines the feemarket module's genesis state. message GenesisState { diff --git a/proto/ethermint/feemarket/v1/query.proto b/proto/ethermint/feemarket/v1/query.proto index 7d4659d48b..eb1f76fec5 100644 --- a/proto/ethermint/feemarket/v1/query.proto +++ b/proto/ethermint/feemarket/v1/query.proto @@ -5,7 +5,7 @@ import "ethermint/feemarket/v1/feemarket.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/feemarket/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/ethermint/feemarket/v1/tx.proto b/proto/ethermint/feemarket/v1/tx.proto index 67ad14436c..90f7624c55 100644 --- a/proto/ethermint/feemarket/v1/tx.proto +++ b/proto/ethermint/feemarket/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "ethermint/feemarket/v1/feemarket.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/feemarket/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types"; // Msg defines the erc20 Msg service. service Msg { diff --git a/proto/ethermint/types/v1/account.proto b/proto/ethermint/types/v1/account.proto index 1c2a7436ed..af88974943 100644 --- a/proto/ethermint/types/v1/account.proto +++ b/proto/ethermint/types/v1/account.proto @@ -5,7 +5,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/types"; // EthAccount implements the authtypes.AccountI interface and embeds an // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper. diff --git a/proto/ethermint/types/v1/dynamic_fee.proto b/proto/ethermint/types/v1/dynamic_fee.proto index 5d2dfd1493..e5a5c281d3 100644 --- a/proto/ethermint/types/v1/dynamic_fee.proto +++ b/proto/ethermint/types/v1/dynamic_fee.proto @@ -3,7 +3,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/types"; // ExtensionOptionDynamicFeeTx is an extension option that specifies the maxPrioPrice for cosmos tx message ExtensionOptionDynamicFeeTx { diff --git a/proto/ethermint/types/v1/indexer.proto b/proto/ethermint/types/v1/indexer.proto index cac1f55de7..1a6bb02e6d 100644 --- a/proto/ethermint/types/v1/indexer.proto +++ b/proto/ethermint/types/v1/indexer.proto @@ -3,7 +3,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/types"; // TxResult is the value stored in eth tx indexer message TxResult { diff --git a/proto/ethermint/types/v1/web3.proto b/proto/ethermint/types/v1/web3.proto index 61420300de..07cc716a43 100644 --- a/proto/ethermint/types/v1/web3.proto +++ b/proto/ethermint/types/v1/web3.proto @@ -3,7 +3,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/types"; // ExtensionOptionsWeb3Tx is an extension option that specifies the typed chain id, // the fee payer as well as its signature data. diff --git a/proto/evmos/claims/v1/claims.proto b/proto/evmos/claims/v1/claims.proto index 305fe11bf3..3b7869c5b8 100644 --- a/proto/evmos/claims/v1/claims.proto +++ b/proto/evmos/claims/v1/claims.proto @@ -3,7 +3,7 @@ package evmos.claims.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/claims/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/claims/types"; // Action defines the list of available actions to claim the airdrop tokens. enum Action { diff --git a/proto/evmos/claims/v1/genesis.proto b/proto/evmos/claims/v1/genesis.proto index 1234fc2341..cc503f8bd4 100644 --- a/proto/evmos/claims/v1/genesis.proto +++ b/proto/evmos/claims/v1/genesis.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/claims/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/claims/types"; // GenesisState define the claims module's genesis state. message GenesisState { diff --git a/proto/evmos/claims/v1/query.proto b/proto/evmos/claims/v1/query.proto index 13e866b514..e1ba9b554a 100644 --- a/proto/evmos/claims/v1/query.proto +++ b/proto/evmos/claims/v1/query.proto @@ -8,7 +8,7 @@ import "evmos/claims/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/claims/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/claims/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/claims/v1/tx.proto b/proto/evmos/claims/v1/tx.proto index f7947e5420..2d966e877f 100644 --- a/proto/evmos/claims/v1/tx.proto +++ b/proto/evmos/claims/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "evmos/claims/v1/genesis.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/claims/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/claims/types"; // Msg defines the claims Msg service. service Msg { diff --git a/proto/evmos/epochs/v1/genesis.proto b/proto/evmos/epochs/v1/genesis.proto index 1fa3827f95..eb4e03be34 100644 --- a/proto/evmos/epochs/v1/genesis.proto +++ b/proto/evmos/epochs/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/epochs/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types"; // EpochInfo defines the message interface containing the relevant informations about // an epoch. diff --git a/proto/evmos/epochs/v1/query.proto b/proto/evmos/epochs/v1/query.proto index 2b110e70e2..bce9c753dc 100644 --- a/proto/evmos/epochs/v1/query.proto +++ b/proto/evmos/epochs/v1/query.proto @@ -6,7 +6,7 @@ import "evmos/epochs/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/epochs/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/erc20/v1/erc20.proto b/proto/evmos/erc20/v1/erc20.proto index c095b1b474..655f87ed3f 100644 --- a/proto/evmos/erc20/v1/erc20.proto +++ b/proto/evmos/erc20/v1/erc20.proto @@ -3,7 +3,7 @@ package evmos.erc20.v1; import "cosmos/bank/v1beta1/bank.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/erc20/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types"; // Owner enumerates the ownership of a ERC20 contract. enum Owner { diff --git a/proto/evmos/erc20/v1/events.proto b/proto/evmos/erc20/v1/events.proto index 5af6fca8fd..4734081ddb 100644 --- a/proto/evmos/erc20/v1/events.proto +++ b/proto/evmos/erc20/v1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package evmos.erc20.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/erc20/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types"; // EventRegisterPair is an event emitted when a coin is registered. message EventRegisterPair { diff --git a/proto/evmos/erc20/v1/genesis.proto b/proto/evmos/erc20/v1/genesis.proto index d989bd630e..516fa11c6a 100644 --- a/proto/evmos/erc20/v1/genesis.proto +++ b/proto/evmos/erc20/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.erc20.v1; import "evmos/erc20/v1/erc20.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/erc20/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/erc20/v1/query.proto b/proto/evmos/erc20/v1/query.proto index 66aaa35d47..efc59ccbf7 100644 --- a/proto/evmos/erc20/v1/query.proto +++ b/proto/evmos/erc20/v1/query.proto @@ -7,7 +7,7 @@ import "evmos/erc20/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/erc20/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/erc20/v1/tx.proto b/proto/evmos/erc20/v1/tx.proto index c434a33eba..a0be360cb9 100644 --- a/proto/evmos/erc20/v1/tx.proto +++ b/proto/evmos/erc20/v1/tx.proto @@ -8,7 +8,7 @@ import "evmos/erc20/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/erc20/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types"; // Msg defines the erc20 Msg service. service Msg { diff --git a/proto/evmos/incentives/v1/genesis.proto b/proto/evmos/incentives/v1/genesis.proto index 12a691d898..5059a65abb 100644 --- a/proto/evmos/incentives/v1/genesis.proto +++ b/proto/evmos/incentives/v1/genesis.proto @@ -4,7 +4,7 @@ import "evmos/incentives/v1/incentives.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/incentives/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/incentives/v1/incentives.proto b/proto/evmos/incentives/v1/incentives.proto index 5c324307cd..9ddda60393 100644 --- a/proto/evmos/incentives/v1/incentives.proto +++ b/proto/evmos/incentives/v1/incentives.proto @@ -4,7 +4,7 @@ package evmos.incentives.v1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/incentives/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types"; // Incentive defines an instance that organizes distribution conditions for a // given smart contract diff --git a/proto/evmos/incentives/v1/query.proto b/proto/evmos/incentives/v1/query.proto index ae90ef5dbf..1bea059ebe 100644 --- a/proto/evmos/incentives/v1/query.proto +++ b/proto/evmos/incentives/v1/query.proto @@ -8,7 +8,7 @@ import "evmos/incentives/v1/incentives.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/incentives/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/incentives/v1/tx.proto b/proto/evmos/incentives/v1/tx.proto index 04f826d908..8103e516d9 100644 --- a/proto/evmos/incentives/v1/tx.proto +++ b/proto/evmos/incentives/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "evmos/incentives/v1/genesis.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/incentives/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types"; // Msg defines the incentives Msg service. service Msg { diff --git a/proto/evmos/inflation/v1/genesis.proto b/proto/evmos/inflation/v1/genesis.proto index ba856497e5..e85918e248 100644 --- a/proto/evmos/inflation/v1/genesis.proto +++ b/proto/evmos/inflation/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "evmos/inflation/v1/inflation.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/inflation/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types"; // GenesisState defines the inflation module's genesis state. message GenesisState { diff --git a/proto/evmos/inflation/v1/inflation.proto b/proto/evmos/inflation/v1/inflation.proto index 7b09f8496f..87c910a9c7 100644 --- a/proto/evmos/inflation/v1/inflation.proto +++ b/proto/evmos/inflation/v1/inflation.proto @@ -3,7 +3,7 @@ package evmos.inflation.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/inflation/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types"; // InflationDistribution defines the distribution in which inflation is // allocated through minting on each epoch (staking, incentives, community). It diff --git a/proto/evmos/inflation/v1/query.proto b/proto/evmos/inflation/v1/query.proto index 1fdebf329b..ca5e1d28d7 100644 --- a/proto/evmos/inflation/v1/query.proto +++ b/proto/evmos/inflation/v1/query.proto @@ -6,7 +6,7 @@ import "evmos/inflation/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/inflation/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/evmos/inflation/v1/tx.proto b/proto/evmos/inflation/v1/tx.proto index f9b8be1649..1325fbd00b 100644 --- a/proto/evmos/inflation/v1/tx.proto +++ b/proto/evmos/inflation/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "evmos/inflation/v1/genesis.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/inflation/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types"; // Msg defines the evm Msg service. service Msg { diff --git a/proto/evmos/recovery/v1/genesis.proto b/proto/evmos/recovery/v1/genesis.proto index c5b939ee16..2a5c206f2c 100644 --- a/proto/evmos/recovery/v1/genesis.proto +++ b/proto/evmos/recovery/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.recovery.v1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/recovery/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types"; // GenesisState defines the recovery module's genesis state. message GenesisState { diff --git a/proto/evmos/recovery/v1/query.proto b/proto/evmos/recovery/v1/query.proto index 4bef670535..46f0bcb271 100644 --- a/proto/evmos/recovery/v1/query.proto +++ b/proto/evmos/recovery/v1/query.proto @@ -5,7 +5,7 @@ import "evmos/recovery/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/recovery/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/recovery/v1/tx.proto b/proto/evmos/recovery/v1/tx.proto index a4f1b50977..a4c0323a00 100644 --- a/proto/evmos/recovery/v1/tx.proto +++ b/proto/evmos/recovery/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "evmos/recovery/v1/genesis.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/recovery/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types"; // Msg defines the recovery Msg service. service Msg { diff --git a/proto/evmos/revenue/v1/events.proto b/proto/evmos/revenue/v1/events.proto index e7e1c3661d..3630c1d180 100644 --- a/proto/evmos/revenue/v1/events.proto +++ b/proto/evmos/revenue/v1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package evmos.revenue.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/revenue/v1/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types"; // EventRegisterRevenue is an event emitted when a contract is registered to receive a percentage of tx fees. message EventRegisterRevenue { diff --git a/proto/evmos/revenue/v1/genesis.proto b/proto/evmos/revenue/v1/genesis.proto index 609c6991df..6dcdebba1a 100644 --- a/proto/evmos/revenue/v1/genesis.proto +++ b/proto/evmos/revenue/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.revenue.v1; import "evmos/revenue/v1/revenue.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/revenue/v1/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/revenue/v1/query.proto b/proto/evmos/revenue/v1/query.proto index a2df3b3cec..591467e2a4 100644 --- a/proto/evmos/revenue/v1/query.proto +++ b/proto/evmos/revenue/v1/query.proto @@ -7,7 +7,7 @@ import "evmos/revenue/v1/revenue.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/revenue/v1/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/revenue/v1/revenue.proto b/proto/evmos/revenue/v1/revenue.proto index 314748a1d6..828b2986b0 100644 --- a/proto/evmos/revenue/v1/revenue.proto +++ b/proto/evmos/revenue/v1/revenue.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package evmos.revenue.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/revenue/v1/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types"; // Revenue defines an instance that organizes fee distribution conditions for // the owner of a given smart contract diff --git a/proto/evmos/revenue/v1/tx.proto b/proto/evmos/revenue/v1/tx.proto index cc72d64beb..43b6e41c41 100644 --- a/proto/evmos/revenue/v1/tx.proto +++ b/proto/evmos/revenue/v1/tx.proto @@ -7,7 +7,7 @@ import "evmos/revenue/v1/genesis.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/revenue/v1/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types"; // Msg defines the fees Msg service. service Msg { diff --git a/proto/evmos/vesting/v1/events.proto b/proto/evmos/vesting/v1/events.proto index 6aa60c99cf..42594dc5ab 100644 --- a/proto/evmos/vesting/v1/events.proto +++ b/proto/evmos/vesting/v1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package evmos.vesting.v1; -option go_package = "github.com/EscanBE/evermint/v12/x/vesting/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types"; // EventCreateClawbackVestingAccount defines the event type // for creating a clawback vesting account diff --git a/proto/evmos/vesting/v1/query.proto b/proto/evmos/vesting/v1/query.proto index cea70f5ef3..94e34c0712 100644 --- a/proto/evmos/vesting/v1/query.proto +++ b/proto/evmos/vesting/v1/query.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/vesting/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/vesting/v1/tx.proto b/proto/evmos/vesting/v1/tx.proto index d7bf11990f..c86e4a1355 100644 --- a/proto/evmos/vesting/v1/tx.proto +++ b/proto/evmos/vesting/v1/tx.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/vesting/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types"; // Msg defines the vesting Msg service. service Msg { diff --git a/proto/evmos/vesting/v1/vesting.proto b/proto/evmos/vesting/v1/vesting.proto index 95a201d6d9..eb8d8e001f 100644 --- a/proto/evmos/vesting/v1/vesting.proto +++ b/proto/evmos/vesting/v1/vesting.proto @@ -5,7 +5,7 @@ import "cosmos/vesting/v1beta1/vesting.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/EscanBE/evermint/v12/x/vesting/types"; +option go_package = "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types"; // ClawbackVestingAccount implements the VestingAccount interface. It provides // an account that can hold contributions subject to "lockup" (like a diff --git a/rename-chain.sh b/rename-chain.sh deleted file mode 100755 index f416160c09..0000000000 --- a/rename-chain.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Required tools checking -command -v sed > /dev/null 2>&1 || { echo 'require sed'; exit 1; } -command -v npm > /dev/null 2>&1 || { echo 'require npm'; exit 1; } -command -v go > /dev/null 2>&1 || { echo 'require go 1.20+'; exit 1; } - -# Working directory checking -if [ ! -d "./rename_chain" ] || [ ! -f "./go.mod" ]; then - echo "Please run this script from the root of the repository." - exit 1 -fi - -# Work on new branch to be able to compare changes -git branch -D branch-rename-chain -git checkout -b branch-rename-chain - -set -eu # Abort execution if any command fails - -# Run go tool to rename chain -go run --tags renamechain rename_chain/main.go - -# Update dependencies -cd ./contracts -npm i -cd .. -rm -f go.sum -go mod tidy - -# Cleanup -rm -rf ./rename_chain -rm -rf ./build -rm -f ./rename-chain.sh -rm -f ./RENAME_CHAIN.md - -echo "Done." \ No newline at end of file diff --git a/rename_chain/main.go b/rename_chain/main.go deleted file mode 100644 index ec341b3049..0000000000 --- a/rename_chain/main.go +++ /dev/null @@ -1,442 +0,0 @@ -//go:build renamechain -// +build renamechain - -package main - -import ( - "crypto/rand" - "encoding/hex" - "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/cosmos/cosmos-sdk/types/bech32" - "os" - "os/exec" - "path" - "path/filepath" - "regexp" - "runtime" - "strings" -) - -// TODO: remove this 'rename_chain' directory after renamed chain - -// NewRenameChainCmd creates a helper command that convert account bech32 address into hex address or vice versa -// -//goland:noinspection GoBoolExpressions -func main() { - if !isLinux() && !isDarwin() { - fmt.Println("ERR: Only support Linux & MacOS") - os.Exit(1) - } - - if !isPathFileOrDirExists("go.mod") { - fmt.Println("ERR: must run at root of project, go.mod could not be found") - os.Exit(1) - } - - if !isPathFileOrDirExists(fmt.Sprintf("cmd/%s", EvermintOg_ApplicationBinaryName)) { - fmt.Printf("ERR: must run at root of project, cmd/%s could not be found\n", EvermintOg_ApplicationBinaryName) - os.Exit(1) - } - - // validation - if !regexp.MustCompile("^https://github.com/[^/]+/[^/]+$").MatchString(constants.GitHubRepo) { - fmt.Println("ERR: invalid GitHub repo format of", constants.GitHubRepo) - fmt.Println("It should be in format: https://github.com//") - os.Exit(1) - } else if constants.GitHubRepo == EvermintOg_GitHubRepo { - fmt.Println("ERR: must change github repo at variable constants.GitHubRepo") - os.Exit(1) - } - - if constants.Bech32Prefix == EvermintOg_Bech32Prefix { - fmt.Println("ERR: must change bech32 prefix at variable constants.Bech32Prefix") - os.Exit(1) - } else if strings.ToLower(constants.Bech32Prefix) != constants.Bech32Prefix { - fmt.Println("ERR: bech32 prefix must be in lower case") - os.Exit(1) - } - - if constants.ApplicationName == EvermintOg_ApplicationName { - fmt.Println("ERR: must change application name at variable constants.ApplicationName") - os.Exit(1) - } else if strings.ToLower(constants.ApplicationName) != constants.ApplicationName { - fmt.Println("ERR: application name must be in lower case") - os.Exit(1) - } - - if constants.ApplicationBinaryName == EvermintOg_ApplicationBinaryName { - fmt.Println("ERR: must change application binary name at variable constants.ApplicationBinaryName") - os.Exit(1) - } else if strings.ToLower(constants.ApplicationBinaryName) != constants.ApplicationBinaryName { - fmt.Println("ERR: application binary name must be in lower case") - os.Exit(1) - } - - if constants.ApplicationHome == EvermintOg_ApplicationHome { - fmt.Println("ERR: must change application home at variable constants.ApplicationHome") - os.Exit(1) - } else if strings.ToLower(constants.ApplicationHome) != constants.ApplicationHome { - fmt.Println("ERR: application home must be in lower case") - os.Exit(1) - } else if !strings.HasPrefix(constants.ApplicationHome, ".") { - fmt.Println("ERR: application home MUST start with '.'") - os.Exit(1) - } - - if constants.MainnetChainID == EvermintOg_MainnetChainID { - fmt.Println("ERR: must change mainnet chain id at variable constants.MainnetChainID") - os.Exit(1) - } else if strings.ToLower(constants.MainnetChainID) != constants.MainnetChainID { - fmt.Println("ERR: mainnet chain id must be in lower case") - os.Exit(1) - } - - if constants.TestnetChainID == EvermintOg_TestnetChainID { - fmt.Println("ERR: must change testnet chain id at variable constants.TestnetChainID") - os.Exit(1) - } else if strings.ToLower(constants.TestnetChainID) != constants.TestnetChainID { - fmt.Println("ERR: testnet chain id must be in lower case") - os.Exit(1) - } - - if constants.DevnetChainID == EvermintOg_DevnetChainID { - fmt.Println("ERR: must change devnet chain id at variable constants.DevnetChainID") - os.Exit(1) - } else if strings.ToLower(constants.DevnetChainID) != constants.DevnetChainID { - fmt.Println("ERR: devnet chain id must be in lower case") - os.Exit(1) - } - - if strings.ToLower(constants.BaseDenom) != constants.BaseDenom { - fmt.Println("ERR: base denom must be in lower case") - os.Exit(1) - } - - if strings.ToLower(constants.DisplayDenom) != constants.DisplayDenom { - fmt.Println("ERR: display denom must be in lower case") - os.Exit(1) - } - - if strings.ToUpper(constants.SymbolDenom) != constants.SymbolDenom { - fmt.Println("ERR: symbol denom must be in upper case") - os.Exit(1) - } - - ogGitHubWithoutScheme := strings.TrimSuffix(strings.Split(EvermintOg_GitHubRepo, "://")[1], ".git") - ogGoModule := fmt.Sprintf("%s/v12", ogGitHubWithoutScheme) - splOgGitHub := strings.Split(ogGitHubWithoutScheme, "/") - ogGitOwnerAndRepo := fmt.Sprintf("%s/%s", splOgGitHub[len(splOgGitHub)-2], splOgGitHub[len(splOgGitHub)-1]) - ogGitHubWithoutRepo := strings.TrimSuffix(ogGitHubWithoutScheme, fmt.Sprintf("/%s", splOgGitHub[len(splOgGitHub)-1])) - - newGitHubWithoutScheme := strings.TrimSuffix(strings.Split(constants.GitHubRepo, "://")[1], ".git") - newGoModule := fmt.Sprintf("%s/v12", newGitHubWithoutScheme) - splNewGitHub := strings.Split(newGitHubWithoutScheme, "/") - newGitOwnerAndRepo := fmt.Sprintf("%s/%s", splNewGitHub[len(splNewGitHub)-2], splNewGitHub[len(splNewGitHub)-1]) - newGitHubWithoutRepo := strings.TrimSuffix(newGitHubWithoutScheme, fmt.Sprintf("/%s", splNewGitHub[len(splNewGitHub)-1])) - - bytesOfClaimsModuleAccount, err := hex.DecodeString("A61808Fe40fEb8B3433778BBC2ecECCAA47c8c47") - if err != nil { - panic(err) - } - newClaimModuleAccount, err := bech32.ConvertAndEncode(constants.Bech32Prefix, bytesOfClaimsModuleAccount) - if err != nil { - panic(err) - } - - anyFiles := getFileListRecursive() - goFiles := getFileListRecursive("go") - - for _, anyFile := range anyFiles { - sed(anyFile, EvermintOg_MainnetFullChainId, constants.MainnetFullChainId) - sed(anyFile, EvermintOg_TestnetFullChainId, constants.TestnetFullChainId) - sed(anyFile, EvermintOg_DevnetFullChainId, constants.DevnetFullChainId) - } - - for _, anyFile := range anyFiles { - sed(anyFile, ogGoModule, newGoModule) - sed(anyFile, ogGitHubWithoutScheme, newGitHubWithoutScheme) - sed(anyFile, ogGitHubWithoutRepo, newGitHubWithoutRepo) - sed(anyFile, ogGitOwnerAndRepo, newGitOwnerAndRepo) - sed(anyFile, EvermintOg_ApplicationHome, constants.ApplicationHome) - } - - for _, shellFile := range getFileListRecursive("sh", "bat") { - sed(shellFile, EvermintOg_BaseDenom, constants.BaseDenom) - sed(shellFile, EvermintOg_ApplicationBinaryName, constants.ApplicationBinaryName) - //goland:noinspection SpellCheckingInspection - sed(shellFile, "evm15cvq3ljql6utxseh0zau9m8ve2j8erz80qzkas", newClaimModuleAccount) - } - - for _, goFile := range goFiles { - sed(goFile, EvermintOg_BaseDenom, constants.BaseDenom) - } - - for _, jsonFile := range getFileListRecursive("json") { - sed(jsonFile, strings.ToUpper(EvermintOg_ApplicationName[:1])+EvermintOg_ApplicationName[1:], strings.ToUpper(constants.ApplicationName[:1])+strings.ToLower(constants.ApplicationName[1:])) - sed(jsonFile, fmt.Sprintf("\"%s\"", EvermintOg_BaseDenom), fmt.Sprintf("\"%s\"", constants.BaseDenom)) - sed(jsonFile, fmt.Sprintf("\"%s\"", EvermintOg_DisplayDenom), fmt.Sprintf("\"%s\"", constants.DisplayDenom)) - sed(jsonFile, fmt.Sprintf("\"%s\"", EvermintOg_SymbolDenom), fmt.Sprintf("\"%s\"", constants.SymbolDenom)) - } - - for _, anyFile := range anyFiles { - sed(anyFile, EvermintOg_ApplicationBinaryName, constants.ApplicationBinaryName) - sed(anyFile, strings.ToUpper(EvermintOg_ApplicationName[:1])+EvermintOg_ApplicationName[1:], strings.ToUpper(constants.ApplicationName[:1])+strings.ToLower(constants.ApplicationName[1:])) - sed(anyFile, EvermintOg_ApplicationName, constants.ApplicationName) - } - - sed(path.Join("cmd", EvermintOg_ApplicationBinaryName, "root.go"), strings.ToUpper(EvermintOg_ApplicationName), strings.ToUpper(constants.ApplicationName)) - - patternMarker := regexp.MustCompile(`marker\.(\w+)\("(\w+)"\)`) - for _, goFile := range goFiles { - if !strings.HasSuffix(goFile, "_test.go") { - continue - } - - if !isFileContains(goFile, "marker.ReplaceAble") { - continue - } - - bz, err := os.ReadFile(goFile) - if err != nil { - fmt.Println("ERR: failed to read file", goFile, ":", err) - os.Exit(1) - } - - matches := patternMarker.FindAllStringSubmatch(string(bz), -1) - if len(matches) < 1 { - continue - } - - for _, match := range matches { - if len(match) != 3 { - panic(fmt.Sprintf("unexpected matches on %s with values matched values: %s", goFile, strings.Join(match, ", "))) - } - - ogBech32Address := match[2] - - hrp := constants.Bech32Prefix - if strings.HasPrefix(ogBech32Address, EvermintOg_Bech32PrefixValAddr) { - hrp = constants.Bech32PrefixValAddr - } - - if match[1] == "ReplaceAbleAddress" { - _, bytes, err := bech32.DecodeAndConvert(ogBech32Address) - if err != nil { - fmt.Println("failed to decode bech32 address:", err) - continue - } - newBech32Address, err := bech32.ConvertAndEncode(hrp, bytes) - if err != nil { - fmt.Println("failed to encode bech32 address", ogBech32Address, ":", err) - os.Exit(1) - } - - sed(goFile, match[0], fmt.Sprintf("\"%s\"", newBech32Address)) - } else if match[1] == "ReplaceAbleWithBadChecksum" { - bytes := make([]byte, 20) - _, _ = rand.Read(bytes) - - newBech32Address, err := bech32.ConvertAndEncode(hrp, bytes) - if err != nil { - fmt.Println("failed to encode bech32 address", "0x"+hex.EncodeToString(bytes), ":", err) - os.Exit(1) - } - - // clear last 6 characters - if newBech32Address[len(newBech32Address)-6:] != "aaaaaa" { - newBech32Address = newBech32Address[:len(newBech32Address)-6] + "aaaaaa" - } else { - newBech32Address = newBech32Address[:len(newBech32Address)-6] + "bbbbbb" - } - - sed(goFile, match[0], fmt.Sprintf("\"%s\"", newBech32Address)) - } else { - panic(fmt.Sprintf("unexpected matches on %s with function signature: %s", goFile, match[1])) - } - } - - sed(goFile, "\"github.com/VictorTrustyDev/nevermind/v12/rename_chain/marker\"", "") - } - - launchAppWithDirectStd("mv", path.Join("cmd", EvermintOg_ApplicationBinaryName), path.Join("cmd", constants.ApplicationBinaryName)) -} - -func isLinux() bool { - //goland:noinspection GoBoolExpressions - return runtime.GOOS == "linux" -} - -func isDarwin() bool { - //goland:noinspection GoBoolExpressions - return runtime.GOOS == "darwin" -} - -func isPathFileOrDirExists(file string) bool { - _, err := os.Stat(file) - if err == nil { - return true - } - return !os.IsNotExist(err) -} - -func isFileContains(file, pattern string) bool { - bz, err := exec.Command("/bin/bash", "-c", fmt.Sprintf("cat '%s' | grep '%s' | wc -l | tr -d ' '", file, pattern)).Output() - if err != nil { - fmt.Println("ERR: failed to check if pattern exists in file:", err) - fmt.Println("Pattern:", pattern) - fmt.Println("File:", file) - os.Exit(1) - } - - count := strings.TrimSpace(string(bz)) - if count == "0" { - return false - } - return true -} - -func sed(file, pattern, replacement string) { - if pattern == replacement { - return - } - - if !isFileContains(file, pattern) { - return - } - - var sedCmd []string - - sedCmd = append(sedCmd, "sed", "-i") - - if isDarwin() { - sedCmd = append(sedCmd, "''") - } - splitor := "/" - if strings.Contains(pattern, "/") { - splitor = "#" - } - - if strings.Contains(pattern, splitor) { - fmt.Println("Pattern contains splitor", splitor, "which is not supported:", pattern) - os.Exit(1) - } - - if strings.Contains(replacement, splitor) { - fmt.Println("Replacement contains splitor", splitor, "which is not supported:", replacement) - os.Exit(1) - } - - sedCmd = append(sedCmd, fmt.Sprintf("'s%s%s%s%s%sg'", splitor, strings.ReplaceAll(pattern, ".", "\\."), splitor, strings.ReplaceAll(replacement, ".", "\\."), splitor), fmt.Sprintf("'%s'", file)) - - ec := launchAppWithDirectStd( - "/bin/bash", "-c", strings.Join(sedCmd, " "), - ) - - if ec != 0 { - fmt.Println("ERR: failed to sed", file) - fmt.Println(strings.Join(sedCmd, " ")) - os.Exit(1) - } -} - -func launchAppWithDirectStd(appName string, args ...string) int { - return launchAppWithSetup(appName, args, func(launchCmd *exec.Cmd) { - launchCmd.Stdin = os.Stdin - launchCmd.Stdout = os.Stdout - launchCmd.Stderr = os.Stderr - }) -} - -func launchAppWithSetup(appName string, args []string, setup func(launchCmd *exec.Cmd)) int { - launchCmd := exec.Command(appName, args...) - setup(launchCmd) - err := launchCmd.Run() - if err != nil { - fmt.Printf("problem when running process %s: %s\n", appName, err.Error()) - return 1 - } - return 0 -} - -func getFileListRecursive(whiteListExt ...string) []string { - mapOfExt := make(map[string]bool) - for _, ext := range whiteListExt { - mapOfExt[ext] = true - } - - var fileList []string - err := filepath.Walk(".", - func(p string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if info.IsDir() { - return nil - } - if strings.HasPrefix(p, ".git") { - return nil - } - if strings.HasPrefix(p, ".idea") { - return nil - } - if strings.HasPrefix(p, "build/") { - return nil - } - if strings.HasPrefix(p, "rename_chain/") { - return nil - } - if strings.Contains(p, "/node_modules/") { - return nil - } - if strings.HasSuffix(p, "rename-chain.sh") { - return nil - } - - if len(mapOfExt) > 0 { - ext := path.Ext(p) - if len(ext) > 1 && strings.HasPrefix(ext, ".") { - ext = ext[1:] - } - if !mapOfExt[ext] { - return nil - } - } - - fileList = append(fileList, p) - - return nil - }) - if err != nil { - fmt.Println("ERR: failed to walk through files:", err) - os.Exit(1) - } - return fileList -} - -const ( - EvermintOg_GitHubRepo = "https://github.com/EscanBE/evermint" - - EvermintOg_ApplicationName = "evermint" - EvermintOg_ApplicationBinaryName = "evmd" - EvermintOg_ApplicationHome = ".evermint" - - EvermintOg_BaseDenom = "wei" - EvermintOg_DisplayDenom = "ether" - EvermintOg_SymbolDenom = "ETH" - - EvermintOg_Bech32Prefix = "evm" - EvermintOg_Bech32PrefixValAddr = "evmvaloper" - - EvermintOg_MainnetChainID = "evermint_90909" - EvermintOg_TestnetChainID = "evermint_80808" - EvermintOg_DevnetChainID = "evermint_70707" - - EvermintOg_MainnetFullChainId = constants.MainnetChainID + "-1" - EvermintOg_TestnetFullChainId = constants.TestnetChainID + "-1" - EvermintOg_DevnetFullChainId = constants.DevnetChainID + "-1" - - EvermintOg_MainnetEIP155ChainId = 90909 - EvermintOg_TestnetEIP155ChainId = 80808 - EvermintOg_DevnetEIP155ChainId = 70707 -) diff --git a/rename_chain/marker/marker.go b/rename_chain/marker/marker.go deleted file mode 100644 index 2e7bfc8bff..0000000000 --- a/rename_chain/marker/marker.go +++ /dev/null @@ -1,14 +0,0 @@ -package marker - -// README: This file is used to mark the code that needs to be replaced by rename-chain tools. -// Function signatures must start with "ReplaceAble" prefix. - -// ReplaceAbleAddress is a marker function for rename-chain tools to convert bech32 address to new prefix -func ReplaceAbleAddress(addr string) string { - return addr -} - -// ReplaceAbleWithBadChecksum is a marker function for rename-chain tools to generate new bech32 address of new prefix, with invalid checksum -func ReplaceAbleWithBadChecksum(addr string) string { - return addr -} diff --git a/rpc/apis.go b/rpc/apis.go index 5c27e84959..65b6607713 100644 --- a/rpc/apis.go +++ b/rpc/apis.go @@ -8,16 +8,16 @@ import ( "github.com/ethereum/go-ethereum/rpc" - "github.com/EscanBE/evermint/v12/rpc/backend" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/debug" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/eth" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/eth/filters" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/miner" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/net" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/personal" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/txpool" - "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/web3" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/debug" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/eth" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/eth/filters" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/miner" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/net" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/personal" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/txpool" + "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/web3" + "github.com/VictorTrustyDev/nevermind/v12/types" rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" ) diff --git a/rpc/backend/account_info.go b/rpc/backend/account_info.go index 23d2588154..5010b0d36b 100644 --- a/rpc/backend/account_info.go +++ b/rpc/backend/account_info.go @@ -8,8 +8,8 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -114,7 +114,7 @@ func (b *Backend) GetProof(address common.Address, storageKeys []string, blockNr Balance: (*hexutil.Big)(balance.BigInt()), CodeHash: common.HexToHash(res.CodeHash), Nonce: hexutil.Uint64(res.Nonce), - StorageHash: common.Hash{}, // NOTE: Evermint doesn't have a storage hash. TODO: implement? + StorageHash: common.Hash{}, // NOTE: Nevermind doesn't have a storage hash. TODO: implement? StorageProof: storageProofs, }, nil } diff --git a/rpc/backend/account_info_test.go b/rpc/backend/account_info_test.go index edbe10ddac..b666492150 100644 --- a/rpc/backend/account_info_test.go +++ b/rpc/backend/account_info_test.go @@ -11,10 +11,10 @@ import ( tmrpcclient "github.com/tendermint/tendermint/rpc/client" "google.golang.org/grpc/metadata" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *BackendTestSuite) TestGetCode() { diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go index 925bf2fa8c..ecc8898460 100644 --- a/rpc/backend/backend.go +++ b/rpc/backend/backend.go @@ -5,10 +5,10 @@ import ( "math/big" "time" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/server/config" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/server" diff --git a/rpc/backend/backend_suite_test.go b/rpc/backend/backend_suite_test.go index 36f355e19b..5ba9f2ad5f 100644 --- a/rpc/backend/backend_suite_test.go +++ b/rpc/backend/backend_suite_test.go @@ -2,7 +2,7 @@ package backend import ( "bufio" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "os" "path/filepath" @@ -19,14 +19,14 @@ import ( "github.com/stretchr/testify/suite" tmrpctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/indexer" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/indexer" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) type BackendTestSuite struct { @@ -51,7 +51,7 @@ func (suite *BackendTestSuite) SetupTest() { baseDir := suite.T().TempDir() nodeDirName := "node" - clientDir := filepath.Join(baseDir, nodeDirName, "evermintcli") + clientDir := filepath.Join(baseDir, nodeDirName, "nevermindcli") keyRing, err := suite.generateTestKeyring(clientDir) if err != nil { panic(err) diff --git a/rpc/backend/blocks.go b/rpc/backend/blocks.go index 4a6d07c5cb..61b0200342 100644 --- a/rpc/backend/blocks.go +++ b/rpc/backend/blocks.go @@ -7,8 +7,8 @@ import ( "math/big" "strconv" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" "github.com/ethereum/go-ethereum/common" diff --git a/rpc/backend/blocks_test.go b/rpc/backend/blocks_test.go index 5cde13935c..38028ec1fd 100644 --- a/rpc/backend/blocks_test.go +++ b/rpc/backend/blocks_test.go @@ -16,10 +16,10 @@ import ( tmtypes "github.com/tendermint/tendermint/types" "google.golang.org/grpc/metadata" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - ethrpc "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + ethrpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *BackendTestSuite) TestBlockNumber() { diff --git a/rpc/backend/call_tx.go b/rpc/backend/call_tx.go index b8ba75ce05..ec6cb1d788 100644 --- a/rpc/backend/call_tx.go +++ b/rpc/backend/call_tx.go @@ -8,9 +8,9 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" diff --git a/rpc/backend/call_tx_test.go b/rpc/backend/call_tx_test.go index 92c167bbf9..ef13eac557 100644 --- a/rpc/backend/call_tx_test.go +++ b/rpc/backend/call_tx_test.go @@ -5,10 +5,10 @@ import ( "fmt" "math/big" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/rpc/backend/chain_info.go b/rpc/backend/chain_info.go index d022ccd32c..59f97c1c44 100644 --- a/rpc/backend/chain_info.go +++ b/rpc/backend/chain_info.go @@ -5,10 +5,10 @@ import ( "math/big" "strconv" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/rpc/backend/chain_info_test.go b/rpc/backend/chain_info_test.go index dfccb06ad8..9998700e01 100644 --- a/rpc/backend/chain_info_test.go +++ b/rpc/backend/chain_info_test.go @@ -2,7 +2,7 @@ package backend import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "github.com/ethereum/go-ethereum/common/hexutil" @@ -15,11 +15,11 @@ import ( "github.com/tendermint/tendermint/abci/types" tmrpctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpc "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) func (suite *BackendTestSuite) TestBaseFee() { diff --git a/rpc/backend/client_test.go b/rpc/backend/client_test.go index 2452eeed1b..3b691e53b0 100644 --- a/rpc/backend/client_test.go +++ b/rpc/backend/client_test.go @@ -8,9 +8,9 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpc "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ethereum/go-ethereum/common" mock "github.com/stretchr/testify/mock" diff --git a/rpc/backend/evm_query_client_test.go b/rpc/backend/evm_query_client_test.go index 13f0520074..72bf104170 100644 --- a/rpc/backend/evm_query_client_test.go +++ b/rpc/backend/evm_query_client_test.go @@ -4,16 +4,16 @@ import ( "context" "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strconv" "testing" "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpc "github.com/EscanBE/evermint/v12/rpc/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" diff --git a/rpc/backend/feemarket_query_client_test.go b/rpc/backend/feemarket_query_client_test.go index b16dc9397a..317ea1075f 100644 --- a/rpc/backend/feemarket_query_client_test.go +++ b/rpc/backend/feemarket_query_client_test.go @@ -1,9 +1,9 @@ package backend import ( - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpc "github.com/EscanBE/evermint/v12/rpc/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/rpc/backend/filters_test.go b/rpc/backend/filters_test.go index ad25a0e460..b52f1f9121 100644 --- a/rpc/backend/filters_test.go +++ b/rpc/backend/filters_test.go @@ -3,9 +3,9 @@ package backend import ( "encoding/json" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - ethrpc "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + ethrpc "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" tmtypes "github.com/tendermint/tendermint/types" diff --git a/rpc/backend/mocks/evm_query_client.go b/rpc/backend/mocks/evm_query_client.go index 64a7a99803..9ac6dd201f 100644 --- a/rpc/backend/mocks/evm_query_client.go +++ b/rpc/backend/mocks/evm_query_client.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/EscanBE/evermint/v12/x/evm/types" + types "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // EVMQueryClient is an autogenerated mock type for the EVMQueryClient type diff --git a/rpc/backend/mocks/feemarket_query_client.go b/rpc/backend/mocks/feemarket_query_client.go index 2b18bd1a39..9872f68cc2 100644 --- a/rpc/backend/mocks/feemarket_query_client.go +++ b/rpc/backend/mocks/feemarket_query_client.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/EscanBE/evermint/v12/x/feemarket/types" + types "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // FeeMarketQueryClient is an autogenerated mock type for the QueryClient type diff --git a/rpc/backend/node_info.go b/rpc/backend/node_info.go index c8b76ede94..1d6ee74267 100644 --- a/rpc/backend/node_info.go +++ b/rpc/backend/node_info.go @@ -7,11 +7,11 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto" diff --git a/rpc/backend/node_info_test.go b/rpc/backend/node_info_test.go index b586c49728..2d07251fbb 100644 --- a/rpc/backend/node_info_test.go +++ b/rpc/backend/node_info_test.go @@ -2,12 +2,12 @@ package backend import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ethereum/go-ethereum/common" diff --git a/rpc/backend/sign_tx.go b/rpc/backend/sign_tx.go index 493a661c69..761ce1c68e 100644 --- a/rpc/backend/sign_tx.go +++ b/rpc/backend/sign_tx.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/signer/core/apitypes" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // SendTransaction sends transaction based on received args using Node's key to sign it diff --git a/rpc/backend/sign_tx_test.go b/rpc/backend/sign_tx_test.go index e4a97764f4..a44fcde24c 100644 --- a/rpc/backend/sign_tx_test.go +++ b/rpc/backend/sign_tx_test.go @@ -14,10 +14,10 @@ import ( "github.com/ethereum/go-ethereum/signer/core/apitypes" "google.golang.org/grpc/metadata" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *BackendTestSuite) TestSendTransaction() { diff --git a/rpc/backend/tracing.go b/rpc/backend/tracing.go index 4e4e050d15..c68bf26f30 100644 --- a/rpc/backend/tracing.go +++ b/rpc/backend/tracing.go @@ -5,8 +5,8 @@ import ( "fmt" "math" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" diff --git a/rpc/backend/tracing_test.go b/rpc/backend/tracing_test.go index 8eec555860..1ac9c4ba56 100644 --- a/rpc/backend/tracing_test.go +++ b/rpc/backend/tracing_test.go @@ -3,10 +3,10 @@ package backend import ( "fmt" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/indexer" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/indexer" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/crypto" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/rpc/backend/tx_info.go b/rpc/backend/tx_info.go index 1ae7cb9bcd..849a0d74a7 100644 --- a/rpc/backend/tx_info.go +++ b/rpc/backend/tx_info.go @@ -7,9 +7,9 @@ import ( errorsmod "cosmossdk.io/errors" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/rpc/backend/tx_info_test.go b/rpc/backend/tx_info_test.go index e43c78ed65..3e19efbad4 100644 --- a/rpc/backend/tx_info_test.go +++ b/rpc/backend/tx_info_test.go @@ -4,11 +4,11 @@ import ( "fmt" "math/big" - "github.com/EscanBE/evermint/v12/indexer" - "github.com/EscanBE/evermint/v12/rpc/backend/mocks" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/indexer" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend/mocks" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/rpc/backend/utils.go b/rpc/backend/utils.go index 5ef72fb5cc..d7315b9193 100644 --- a/rpc/backend/utils.go +++ b/rpc/backend/utils.go @@ -22,8 +22,8 @@ import ( "github.com/tendermint/tendermint/libs/log" tmrpctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/EscanBE/evermint/v12/rpc/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/tendermint/tendermint/proto/tendermint/crypto" ) diff --git a/rpc/namespaces/ethereum/debug/api.go b/rpc/namespaces/ethereum/debug/api.go index 2fb64ea5b2..4e7c5a8e09 100644 --- a/rpc/namespaces/ethereum/debug/api.go +++ b/rpc/namespaces/ethereum/debug/api.go @@ -14,14 +14,14 @@ import ( "github.com/davecgh/go-spew/spew" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" stderrors "github.com/pkg/errors" "github.com/cosmos/cosmos-sdk/server" - "github.com/EscanBE/evermint/v12/rpc/backend" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/consensus/ethash" diff --git a/rpc/namespaces/ethereum/eth/api.go b/rpc/namespaces/ethereum/eth/api.go index c56061bb34..8fc5ff64a6 100644 --- a/rpc/namespaces/ethereum/eth/api.go +++ b/rpc/namespaces/ethereum/eth/api.go @@ -13,15 +13,15 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/rpc/backend" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) -// EthereumAPI allows applications to connect to an Evermint node that is -// part of the Evermint blockchain. Developers can interact with on-chain EVM data +// EthereumAPI allows applications to connect to an Nevermind node that is +// part of the Nevermind blockchain. Developers can interact with on-chain EVM data // and send different types of transactions to the network by utilizing the // endpoints provided by the API. The API follows a JSON-RPC standard. If not // otherwise specified, the interface is derived from the Alchemy Ethereum API: diff --git a/rpc/namespaces/ethereum/eth/filters/api.go b/rpc/namespaces/ethereum/eth/filters/api.go index d5ba9096e5..2cb540b8ce 100644 --- a/rpc/namespaces/ethereum/eth/filters/api.go +++ b/rpc/namespaces/ethereum/eth/filters/api.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/EscanBE/evermint/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/types" "github.com/cosmos/cosmos-sdk/client" "github.com/tendermint/tendermint/libs/log" @@ -20,7 +20,7 @@ import ( "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/rpc" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // FilterAPI gathers diff --git a/rpc/namespaces/ethereum/eth/filters/filter_system.go b/rpc/namespaces/ethereum/eth/filters/filter_system.go index a2884eb92f..a9ea1c82d4 100644 --- a/rpc/namespaces/ethereum/eth/filters/filter_system.go +++ b/rpc/namespaces/ethereum/eth/filters/filter_system.go @@ -22,8 +22,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/rpc/ethereum/pubsub" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/ethereum/pubsub" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) var ( diff --git a/rpc/namespaces/ethereum/eth/filters/filters.go b/rpc/namespaces/ethereum/eth/filters/filters.go index 711bd49ee6..0eaaeed80d 100644 --- a/rpc/namespaces/ethereum/eth/filters/filters.go +++ b/rpc/namespaces/ethereum/eth/filters/filters.go @@ -6,8 +6,8 @@ import ( "fmt" "math/big" - "github.com/EscanBE/evermint/v12/rpc/backend" - "github.com/EscanBE/evermint/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" + "github.com/VictorTrustyDev/nevermind/v12/rpc/types" "github.com/pkg/errors" "github.com/tendermint/tendermint/libs/log" diff --git a/rpc/namespaces/ethereum/miner/api.go b/rpc/namespaces/ethereum/miner/api.go index 44023297b6..d5f39f0afd 100644 --- a/rpc/namespaces/ethereum/miner/api.go +++ b/rpc/namespaces/ethereum/miner/api.go @@ -1,7 +1,7 @@ package miner import ( - "github.com/EscanBE/evermint/v12/rpc/backend" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" "github.com/cosmos/cosmos-sdk/server" "github.com/ethereum/go-ethereum/common" diff --git a/rpc/namespaces/ethereum/net/api.go b/rpc/namespaces/ethereum/net/api.go index a6735627e8..3f72044a5a 100644 --- a/rpc/namespaces/ethereum/net/api.go +++ b/rpc/namespaces/ethereum/net/api.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/client" rpcclient "github.com/tendermint/tendermint/rpc/client" ) diff --git a/rpc/namespaces/ethereum/personal/api.go b/rpc/namespaces/ethereum/personal/api.go index 795989b916..0b7a62e2b0 100644 --- a/rpc/namespaces/ethereum/personal/api.go +++ b/rpc/namespaces/ethereum/personal/api.go @@ -3,15 +3,15 @@ package personal import ( "context" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "path" "time" - "github.com/EscanBE/evermint/v12/rpc/backend" + "github.com/VictorTrustyDev/nevermind/v12/rpc/backend" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/tendermint/tendermint/libs/log" @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // 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 8c53ddadab..38943cfe95 100644 --- a/rpc/namespaces/ethereum/txpool/api.go +++ b/rpc/namespaces/ethereum/txpool/api.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/EscanBE/evermint/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/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 d1a01bf918..97a6123ee4 100644 --- a/rpc/namespaces/ethereum/web3/api.go +++ b/rpc/namespaces/ethereum/web3/api.go @@ -1,7 +1,7 @@ package web3 import ( - "github.com/EscanBE/evermint/v12/version" + "github.com/VictorTrustyDev/nevermind/v12/version" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" diff --git a/rpc/types/block.go b/rpc/types/block.go index 474e9ffd92..990a15f466 100644 --- a/rpc/types/block.go +++ b/rpc/types/block.go @@ -17,7 +17,7 @@ import ( grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" ) // BlockNumber represents decoding hex string to block values diff --git a/rpc/types/events.go b/rpc/types/events.go index e3b0e333c5..5ae34be7d4 100644 --- a/rpc/types/events.go +++ b/rpc/types/events.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" abci "github.com/tendermint/tendermint/abci/types" diff --git a/rpc/types/events_test.go b/rpc/types/events_test.go index ad190f6bfa..dfb410851b 100644 --- a/rpc/types/events_test.go +++ b/rpc/types/events_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" diff --git a/rpc/types/query_client.go b/rpc/types/query_client.go index ba779aca4e..f390c79f48 100644 --- a/rpc/types/query_client.go +++ b/rpc/types/query_client.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // QueryClient defines a gRPC Client used for: diff --git a/rpc/types/utils.go b/rpc/types/utils.go index 6ca5fbf56d..85bf6a1fb5 100644 --- a/rpc/types/utils.go +++ b/rpc/types/utils.go @@ -14,8 +14,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" @@ -243,7 +243,7 @@ func CheckTxFee(gasPrice *big.Int, gas uint64, cap float64) error { return nil } totalfee := new(big.Float).SetInt(new(big.Int).Mul(gasPrice, new(big.Int).SetUint64(gas))) - // 1 ETH = 10^18 wei + // 1 ETH = 10^18 uever oneToken := new(big.Float).SetInt(big.NewInt(params.Ether)) // quo = rounded(x/y) feeEth := new(big.Float).Quo(totalfee, oneToken) diff --git a/rpc/websockets.go b/rpc/websockets.go index 3b04e34282..0a4e1a177e 100644 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -27,11 +27,11 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" tmtypes "github.com/tendermint/tendermint/types" - "github.com/EscanBE/evermint/v12/rpc/ethereum/pubsub" - rpcfilters "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/eth/filters" - "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/server/config" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/rpc/ethereum/pubsub" + rpcfilters "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/eth/filters" + "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) type WebsocketsServer interface { diff --git a/scripts/integration-test-all.sh b/scripts/integration-test-all.sh index ff5de4e93f..d234ba1d71 100755 --- a/scripts/integration-test-all.sh +++ b/scripts/integration-test-all.sh @@ -17,10 +17,10 @@ RPC_PORT="854" IP_ADDR="0.0.0.0" KEY="dev0" -CHAINID="evermint_80808-1" +CHAINID="nevermind_80808-1" MONIKER="mymoniker" -BINARY="evmd" -MIN_DENOM="wei" +BINARY="nvmd" +MIN_DENOM="uever" ## default port prefixes for node NODE_P2P_PORT="2660" @@ -54,14 +54,14 @@ done set -euxo pipefail -DATA_DIR=$(mktemp -d -t evermint-datadir.XXXXX) +DATA_DIR=$(mktemp -d -t nevermind-datadir.XXXXX) if [[ ! "$DATA_DIR" ]]; then echo "Could not create $DATA_DIR" exit 1 fi -# Compile evermint +# Compile nevermind echo "compiling binary" make build diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 222b7b229c..65aee6ad1a 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -11,13 +11,13 @@ proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 for dir in $proto_dirs; do proto_files=$(find "${dir}" -maxdepth 1 -name '*.proto') for file in $proto_files; do - # Check if the go_package in the file is pointing to evermint - if grep -q "option go_package.*evermint" "$file"; then + # Check if the go_package in the file is pointing to nevermind + if grep -q "option go_package.*nevermind" "$file"; then buf generate --template proto/buf.gen.gogo.yaml "$file" fi done done # move proto files to the right places -cp -r github.com/EscanBE/evermint/v*/* ./ +cp -r github.com/VictorTrustyDev/nevermind/v*/* ./ rm -rf github.com diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh index dc6c62d56b..9ce91497b8 100755 --- a/scripts/start-docker.sh +++ b/scripts/start-docker.sh @@ -1,11 +1,11 @@ #!/bin/bash KEY="dev0" -CHAINID="evermint_80808-1" +CHAINID="nevermind_80808-1" MONIKER="mymoniker" -BINARY="./evmd" -MIN_DENOM="wei" -DATA_DIR=$(mktemp -d -t evermint-datadir.XXXXX) +BINARY="./nvmd" +MIN_DENOM="uever" +DATA_DIR=$(mktemp -d -t nevermind-datadir.XXXXX) echo "create and add new keys" "$BINARY" keys add $KEY --home $DATA_DIR --no-backup --chain-id $CHAINID --algo "eth_secp256k1" --keyring-backend test diff --git a/server/flags/flags.go b/server/flags/flags.go index 8a1c37770b..94cb9e3c9c 100644 --- a/server/flags/flags.go +++ b/server/flags/flags.go @@ -2,7 +2,7 @@ package flags import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/spf13/cobra" diff --git a/server/indexer_cmd.go b/server/indexer_cmd.go index 86a9ec3f1a..cd6072add2 100644 --- a/server/indexer_cmd.go +++ b/server/indexer_cmd.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/indexer" + "github.com/VictorTrustyDev/nevermind/v12/indexer" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" tmnode "github.com/tendermint/tendermint/node" diff --git a/server/indexer_service.go b/server/indexer_service.go index 81cee563de..d5ff3bbfd5 100644 --- a/server/indexer_service.go +++ b/server/indexer_service.go @@ -8,7 +8,7 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/client" "github.com/tendermint/tendermint/types" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) const ( diff --git a/server/json_rpc.go b/server/json_rpc.go index ef921111c1..a8490f8c9d 100644 --- a/server/json_rpc.go +++ b/server/json_rpc.go @@ -7,15 +7,15 @@ import ( "github.com/gorilla/mux" "github.com/rs/cors" - "github.com/EscanBE/evermint/v12/rpc" + "github.com/VictorTrustyDev/nevermind/v12/rpc" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/types" ethlog "github.com/ethereum/go-ethereum/log" ethrpc "github.com/ethereum/go-ethereum/rpc" - "github.com/EscanBE/evermint/v12/server/config" - evertypes "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) // StartJSONRPC starts the JSON-RPC server diff --git a/server/start.go b/server/start.go index 29d73b16e5..b560610a04 100644 --- a/server/start.go +++ b/server/start.go @@ -3,7 +3,7 @@ package server import ( "context" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "io" "net" "net/http" @@ -47,11 +47,11 @@ import ( "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/indexer" - ethdebug "github.com/EscanBE/evermint/v12/rpc/namespaces/ethereum/debug" - "github.com/EscanBE/evermint/v12/server/config" - srvflags "github.com/EscanBE/evermint/v12/server/flags" - evertypes "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/indexer" + ethdebug "github.com/VictorTrustyDev/nevermind/v12/rpc/namespaces/ethereum/debug" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + srvflags "github.com/VictorTrustyDev/nevermind/v12/server/flags" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) // DBOpener is a function to open `application.db`, potentially with customized options. diff --git a/server/util.go b/server/util.go index fb454a87a8..68fa8ecdf5 100644 --- a/server/util.go +++ b/server/util.go @@ -6,7 +6,7 @@ import ( "time" // TODO update import to local pkg when rpc pkg is migrated - "github.com/EscanBE/evermint/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/server/config" "github.com/gorilla/mux" "github.com/improbable-eng/grpc-web/go/grpcweb" "github.com/spf13/cobra" diff --git a/tests/e2e/Dockerfile.repo b/tests/e2e/Dockerfile.repo index b2f723fc8e..98f42533ac 100644 --- a/tests/e2e/Dockerfile.repo +++ b/tests/e2e/Dockerfile.repo @@ -2,11 +2,11 @@ FROM golang:1.20.0-bullseye AS build-env ARG BRANCH_NAME -WORKDIR /go/src/github.com/EscanBE/ +WORKDIR /go/src/github.com/VictorTrustyDev/ -RUN git clone "https://github.com/EscanBE/evermint.git" +RUN git clone "https://github.com/VictorTrustyDev/nevermind.git" -WORKDIR /go/src/github.com/EscanBE/evermint +WORKDIR /go/src/github.com/VictorTrustyDev/nevermind RUN apt-get update -y @@ -21,14 +21,14 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /go/src/github.com/EscanBE/evermint +WORKDIR /go/src/github.com/VictorTrustyDev/nevermind COPY ./init-node.sh . # perms to make init-node.sh executable RUN chmod +x init-node.sh -COPY --from=build-env /go/src/github.com/EscanBE/evermint/build/evmd /usr/bin/evmd +COPY --from=build-env /go/src/github.com/VictorTrustyDev/nevermind/build/nvmd /usr/bin/nvmd EXPOSE 26656 26657 1317 9090 8545 8546 diff --git a/tests/e2e/README.md b/tests/e2e/README.md index fe5b43e93b..a67d728f34 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -3,7 +3,7 @@ The End-to-End (E2E) testing suite provides an environment for running end-to-end tests on our chain. It is used for testing chain upgrades, -as it allows for initializing multiple Evermint chains with different versions. +as it allows for initializing multiple Nevermind chains with different versions. - [End-to-End Testing Suite](#end-to-end-testing-suite) - [Quick Start](#quick-start) @@ -44,13 +44,13 @@ INITIAL_VERSION TARGET_VERSION # mount point for the upgraded node container, to mount new node version to -# previous node state folder. By default this is './build/.evermint:/root/.evermint' +# previous node state folder. By default this is './build/.nevermind:/root/.nevermind' # More info at https://docs.docker.com/engine/reference/builder/#volume MOUNT_PATH # '--chain-id' our chain's cli parameter, used to start nodes with a specific # chain-id and submit proposals -# By default this is 'evermint_80808-1' +# By default this is 'nevermind_80808-1' CHAIN_ID ``` @@ -73,7 +73,7 @@ Testing a chain upgrade is a multi-step process: 4. The node will submit, deposit and vote for an upgrade proposal for upgrading to the `TARGET_VERSION`. 5. After block `50` is reached, -the test suite exports `/.evermint` folder from the docker container +the test suite exports `/.nevermind` folder from the docker container to the local `build/` folder and then purges the container. 6. Suite will mount the node with `TARGET_VERSION` to the local `build/` dir and start the node. @@ -86,7 +86,7 @@ and will execute the upgrade. The `e2e` package defines an integration testing suite used for full end-to-end testing functionality. -This package is decoupled from depending on the Evermint codebase. +This package is decoupled from depending on the Nevermind codebase. It initializes the chains for testing via Docker. As a result, the test suite may provide the desired version to Docker containers during the initialization. @@ -126,16 +126,16 @@ responsible for setting node container parameters before run. If `INITIAL_VERSION` is provided as an argument, node container(s) with the corresponding version(s) -will be pulled from [DockerHub](https://hub.docker.com/r/EscanBE/evermint/tags). +will be pulled from [DockerHub](https://hub.docker.com/r/VictorTrustyDev/nevermind/tags). If it is not specified, the test suite retrieves the second-to-last upgrade version -from the local codebase (in the `evermint/app/upgrades` folder) +from the local codebase (in the `nevermind/app/upgrades` folder) according to [Semantic Versioning](https://semver.org/). If `TARGET_VERSION` is specified, the corresponding container will also be pulled from DockerHub. When not specified, the test suite will retrieve the latest upgrade version -from `evermint/app/upgrades`. +from `nevermind/app/upgrades`. ### Testing Results @@ -145,7 +145,7 @@ In case of a successful upgrade, the script will print the following output (example): ```log -ok github.com/EscanBE/evermint/v12/tests/e2e 174.137s. +ok github.com/VictorTrustyDev/nevermind/v12/tests/e2e 174.137s. ``` If the target node version fails to start, @@ -165,7 +165,7 @@ Error: Received unexpected error: github.com/cosmos/cosmos-sdk/baseapp.SetMinGasPrices({0xc0013563e7?, ... github.com/cosmos/cosmos-sdk@v0.46.16/baseapp/options.go:29 +0xd9 main.appCreator.newApp({{{0x3399b40, 0xc000ec1db8}, {0x33ac0f8, 0xc00... - github.com/EscanBE/evermint/v12/cmd/evmd/root.go:243 +0x2ca + github.com/VictorTrustyDev/nevermind/v12/cmd/nvmd/root.go:243 +0x2ca [output stream]: @@ -184,8 +184,8 @@ Container names will be listed as follows: ```log CONTAINER ID IMAGE -9307f5485323 evermint:local <-- upgraded node -f41c97d6ca21 evermint:v12.0.0 <-- initial node +9307f5485323 nevermind:local <-- upgraded node +f41c97d6ca21 nevermind:v12.0.0 <-- initial node ``` To access containers logs directly, run: diff --git a/tests/e2e/e2e_suite_test.go b/tests/e2e/e2e_suite_test.go index 63cdbdc631..30e90e5b98 100644 --- a/tests/e2e/e2e_suite_test.go +++ b/tests/e2e/e2e_suite_test.go @@ -4,19 +4,19 @@ import ( "context" "errors" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "strings" "testing" "github.com/stretchr/testify/suite" - "github.com/EscanBE/evermint/v12/tests/e2e/upgrade" + "github.com/VictorTrustyDev/nevermind/v12/tests/e2e/upgrade" ) const ( // defaultManagerNetwork defines the network used by the upgrade manager - defaultManagerNetwork = "evermint-local" + defaultManagerNetwork = "nevermind-local" // blocksAfterUpgrade defines how many blocks must be produced after an upgrade is // considered successful @@ -94,13 +94,13 @@ func (s *IntegrationTestSuite) runInitialNode(version upgrade.VersionConfig) { s.T().Logf("successfully started node with version: [%s]", version.ImageTag) } -// runNodeWithCurrentChanges builds a docker image using the current branch of the Evermint repository. +// runNodeWithCurrentChanges builds a docker image using the current branch of the Nevermind repository. // Before running the node, runs a script to modify some configurations for the tests // (e.g.: gov proposal voting period, setup accounts, balances, etc..) // After a successful build, runs the container. func (s *IntegrationTestSuite) runNodeWithCurrentChanges() { const ( - name = "e2e-test/evermint" + name = "e2e-test/nevermind" version = "latest" ) // get the current branch name @@ -135,7 +135,7 @@ func (s *IntegrationTestSuite) proposeUpgrade(name, target string) { s.Require().NoError(err, "can't get block height from running node") s.upgradeManager.UpgradeHeight = uint(nodeHeight + upgradeHeightDelta) - // if Evermint is based on Evmos lower than v10.x.x no need to use the legacy proposal + // if Nevermind is based on Evmos lower than v10.x.x no need to use the legacy proposal currentVersion, err := s.upgradeManager.GetNodeVersion(ctx) s.Require().NoErrorf(err, "can't get current %s version", constants.ApplicationName) isLegacyProposal := upgrade.CheckLegacyProposal(currentVersion) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 88b62b4790..1e3c0ad97f 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -2,7 +2,7 @@ package e2e import ( "context" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strings" ) diff --git a/tests/e2e/init-node.sh b/tests/e2e/init-node.sh index c3589fe66e..b61adead54 100644 --- a/tests/e2e/init-node.sh +++ b/tests/e2e/init-node.sh @@ -1,11 +1,11 @@ #!/bin/bash KEY="mykey" -CHAINID="${CHAIN_ID:-evermint_80808-1}" +CHAINID="${CHAIN_ID:-nevermind_80808-1}" MONIKER="localtestnet" KEYRING="test" # remember to change to other types of keyring like 'file' in-case exposing to outside world, otherwise your balance will be wiped quickly. The keyring test does not require private key to steal tokens from you -BINARY="evmd" -MIN_DENOM="wei" +BINARY="nvmd" +MIN_DENOM="uever" KEYALGO="eth_secp256k1" #gitleaks:allow LOGLEVEL="info" # to trace evm @@ -14,7 +14,7 @@ TRACE="" PRUNING="default" #PRUNING="custom" -CHAINDIR="$HOME/.evermint" +CHAINDIR="$HOME/.nevermind" GENESIS="$CHAINDIR/config/genesis.json" TMP_GENESIS="$CHAINDIR/config/tmp_genesis.json" APP_TOML="$CHAINDIR/config/app.toml" @@ -64,8 +64,8 @@ jq '.app_state.claims.params.duration_of_decay="1000000s"' "$GENESIS" > "$TMP_GE jq '.app_state.claims.params.duration_until_decay="100000s"' "$GENESIS" > "$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" # Claim module account: -# 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || evm15cvq3ljql6utxseh0zau9m8ve2j8erz80qzkas -jq -r --arg amount_to_claim "$amount_to_claim" '.app_state.bank.balances += [{"address":"evm15cvq3ljql6utxseh0zau9m8ve2j8erz80qzkas","coins":[{"denom":"'$MIN_DENOM'", "amount":$amount_to_claim}]}]' "$GENESIS" > "$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" +# 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || ever15cvq3ljql6utxseh0zau9m8ve2j8erz8rmhvjq +jq -r --arg amount_to_claim "$amount_to_claim" '.app_state.bank.balances += [{"address":"ever15cvq3ljql6utxseh0zau9m8ve2j8erz8rmhvjq","coins":[{"denom":"'$MIN_DENOM'", "amount":$amount_to_claim}]}]' "$GENESIS" > "$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" # disable produce empty block sed -i 's/create_empty_blocks = true/create_empty_blocks = false/g' "$CONFIG_TOML" @@ -95,9 +95,9 @@ sed -i 's/127.0.0.1/0.0.0.0/g' "$APP_TOML" ## In case you want to create multiple validators at genesis ## 1. Back to `"$BINARY" keys add` step, init more keys ## 2. Back to `"$BINARY" add-genesis-account` step, add balance for those -## 3. Clone this ~/.evermint home directory into some others, let's say `~/.clonedHome` +## 3. Clone this ~/.nevermind home directory into some others, let's say `~/.clonedHome` ## 4. Run `gentx` in each of those folders -## 5. Copy the `gentx-*` folders under `~/.clonedHome/config/gentx/` folders into the original `~/.evermint/config/gentx` +## 5. Copy the `gentx-*` folders under `~/.clonedHome/config/gentx/` folders into the original `~/.nevermind/config/gentx` # Collect genesis tx "$BINARY" collect-gentxs diff --git a/tests/e2e/upgrade/Dockerfile.init b/tests/e2e/upgrade/Dockerfile.init index bbdb55ae37..e8c18abbfe 100644 --- a/tests/e2e/upgrade/Dockerfile.init +++ b/tests/e2e/upgrade/Dockerfile.init @@ -1,6 +1,6 @@ # argument to provide specific version of node ARG INITIAL_VERSION -FROM EscanBE/evermint:$INITIAL_VERSION +FROM VictorTrustyDev/nevermind:$INITIAL_VERSION # jq needs to perform changes of node parameters RUN apt-get update \ @@ -9,7 +9,7 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /go/src/github.com/EscanBE/evermint +WORKDIR /go/src/github.com/VictorTrustyDev/nevermind COPY ./init-node.sh . diff --git a/tests/e2e/upgrade/constants.go b/tests/e2e/upgrade/constants.go index 64a48f1b1a..e0eac6ceb3 100644 --- a/tests/e2e/upgrade/constants.go +++ b/tests/e2e/upgrade/constants.go @@ -1,7 +1,7 @@ package upgrade import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" ) // The constants used in the upgrade tests are defined here @@ -13,7 +13,7 @@ const ( LocalVersionTag = "latest" // dockerRepo is the docker hub repository that contains our chain app's images pulled during tests - dockerRepo = "EscanBE/evermint" + dockerRepo = "VictorTrustyDev/nevermind" // upgradesPath is the relative path from this folder to the app/upgrades folder upgradesPath = "../../../app/upgrades" diff --git a/tests/e2e/upgrade/govexec.go b/tests/e2e/upgrade/govexec.go index 1d68e7a7d7..cc0a93e4f7 100644 --- a/tests/e2e/upgrade/govexec.go +++ b/tests/e2e/upgrade/govexec.go @@ -4,7 +4,7 @@ import ( "bytes" "context" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "github.com/ory/dockertest/v3/docker" ) diff --git a/tests/e2e/upgrade/manager.go b/tests/e2e/upgrade/manager.go index d43d478730..0e621d8514 100644 --- a/tests/e2e/upgrade/manager.go +++ b/tests/e2e/upgrade/manager.go @@ -4,7 +4,7 @@ import ( "bytes" "context" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "io" "net/http" "os" @@ -71,7 +71,7 @@ func (m *Manager) BuildImage(name, version, dockerFile, contextDir string, args // rebuild the image every time in case there were changes // and the image is cached NoCache: true, - // name with tag, e.g. evermint:v12.0.0 + // name with tag, e.g. nevermind:v12.0.0 Name: fmt.Sprintf("%s:%s", name, version), OutputStream: io.Discard, ErrorStream: os.Stdout, diff --git a/tests/e2e/upgrade/params_test.go b/tests/e2e/upgrade/params_test.go index d8cf855433..4b41f8cd13 100644 --- a/tests/e2e/upgrade/params_test.go +++ b/tests/e2e/upgrade/params_test.go @@ -1,7 +1,7 @@ package upgrade import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "os" "testing" @@ -43,10 +43,10 @@ func TestLoadUpgradeParams(t *testing.T) { targetVersion: "v0.2.0", chainID: constants.DevnetChainID, skipCleanup: "true", - mountPath: "/tmp/evermint", + mountPath: "/tmp/nevermind", }, want: Params{ - MountPath: "/tmp/evermint", + MountPath: "/tmp/nevermind", Versions: []VersionConfig{ {"v0.1.0", "v0.1.0", dockerRepo}, {"v0.2.0", "v0.2.0", dockerRepo}, diff --git a/tests/e2e/upgrade/queryexec.go b/tests/e2e/upgrade/queryexec.go index a9dfe2d0ee..0fe0b0f4ea 100644 --- a/tests/e2e/upgrade/queryexec.go +++ b/tests/e2e/upgrade/queryexec.go @@ -2,7 +2,7 @@ package upgrade import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" ) // CreateModuleQueryExec creates a module query for out chain diff --git a/tests/e2e/upgrade/utils.go b/tests/e2e/upgrade/utils.go index 12538af377..387046339f 100644 --- a/tests/e2e/upgrade/utils.go +++ b/tests/e2e/upgrade/utils.go @@ -2,7 +2,7 @@ package upgrade import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "log" "os" "os/exec" @@ -13,17 +13,17 @@ import ( "github.com/hashicorp/go-version" ) -// EvermintVersion is a custom comparator for sorting semver version strings. -type EvermintVersion []string +// NevermindVersion is a custom comparator for sorting semver version strings. +type NevermindVersion []string // Len is the number of stored versions.. -func (v EvermintVersion) Len() int { return len(v) } +func (v NevermindVersion) Len() int { return len(v) } // Swap swaps the elements with indexes i and j. It is needed to sort the slice. -func (v EvermintVersion) Swap(i, j int) { v[i], v[j] = v[j], v[i] } +func (v NevermindVersion) Swap(i, j int) { v[i], v[j] = v[j], v[i] } // Less compares semver versions strings properly -func (v EvermintVersion) Less(i, j int) bool { +func (v NevermindVersion) Less(i, j int) bool { v1, err := version.NewVersion(v[i]) if err != nil { log.Fatalf("couldn't interpret version as SemVer string: %s: %s", v[i], err.Error()) @@ -43,7 +43,7 @@ func CheckLegacyProposal(version string) bool { } // check if the version is lower than v10.x.x - cmp := EvermintVersion([]string{version, "v10.0.0"}) + cmp := NevermindVersion([]string{version, "v10.0.0"}) isLegacyProposal := !cmp.Less(0, 1) return isLegacyProposal @@ -75,7 +75,7 @@ func RetrieveUpgradesList(upgradesPath string) ([]string, error) { versions[i] = v[1 : len(v)-1] } - sort.Sort(EvermintVersion(versions)) + sort.Sort(NevermindVersion(versions)) return versions, nil } diff --git a/tests/e2e/upgrade/utils_test.go b/tests/e2e/upgrade/utils_test.go index f893cdb61f..2fd872c2a1 100644 --- a/tests/e2e/upgrade/utils_test.go +++ b/tests/e2e/upgrade/utils_test.go @@ -46,10 +46,10 @@ func TestCheckLegacyProposal(t *testing.T) { } } -// TestVersionsLess tests the EvermintVersion type's Less method with +// TestVersionsLess tests the NevermindVersion type's Less method with // different version strings func TestVersionsLess(t *testing.T) { - var version EvermintVersion + var version NevermindVersion testCases := []struct { Name string @@ -76,18 +76,18 @@ func TestVersionsLess(t *testing.T) { } } -// TestVersionsSwap tests the EvermintVersion type's Swap method +// TestVersionsSwap tests the NevermindVersion type's Swap method func TestVersionsSwap(t *testing.T) { - var version EvermintVersion + var version NevermindVersion value := "v9.1.0" version = []string{value, "v10.0.0"} version.Swap(0, 1) require.Equal(t, value, version[1], "expected: %v, got: %v", value, version[1]) } -// TestVersionsLen tests the EvermintVersion type's Len method +// TestVersionsLen tests the NevermindVersion type's Len method func TestVersionsLen(t *testing.T) { - var version EvermintVersion = []string{"v9.1.0", "v10.0.0"} + var version NevermindVersion = []string{"v9.1.0", "v10.0.0"} require.Equal(t, 2, version.Len(), "expected: %v, got: %v", 2, version.Len()) } diff --git a/tests/integration/ledger/ledger_suite_test.go b/tests/integration/ledger/ledger_suite_test.go index b705b686ea..c33a4dbb69 100644 --- a/tests/integration/ledger/ledger_suite_test.go +++ b/tests/integration/ledger/ledger_suite_test.go @@ -4,7 +4,7 @@ import ( "bufio" "context" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "io" "testing" "time" @@ -19,17 +19,17 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/tests/integration/ledger/mocks" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/tests/integration/ledger/mocks" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/stretchr/testify/suite" "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/version" - clientkeys "github.com/EscanBE/evermint/v12/client/keys" - appkeyring "github.com/EscanBE/evermint/v12/crypto/keyring" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + clientkeys "github.com/VictorTrustyDev/nevermind/v12/client/keys" + appkeyring "github.com/VictorTrustyDev/nevermind/v12/crypto/keyring" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" cosmosledger "github.com/cosmos/cosmos-sdk/crypto/ledger" sdk "github.com/cosmos/cosmos-sdk/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" @@ -45,7 +45,7 @@ var s *LedgerTestSuite type LedgerTestSuite struct { suite.Suite - app *app.Evermint + app *app.Nevermind ctx sdk.Context ledger *mocks.SECP256K1 diff --git a/tests/integration/ledger/ledger_test.go b/tests/integration/ledger/ledger_test.go index da88fc87b7..5498cf6210 100644 --- a/tests/integration/ledger/ledger_test.go +++ b/tests/integration/ledger/ledger_test.go @@ -3,18 +3,18 @@ package ledger_test import ( "bytes" "context" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/hd" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/tests/integration/ledger/mocks" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/tests/integration/ledger/mocks" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/spf13/cobra" diff --git a/testutil/abci.go b/testutil/abci.go index d727036ca3..375fec2c43 100644 --- a/testutil/abci.go +++ b/testutil/abci.go @@ -11,9 +11,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" ) // Commit commits a block at a given time. Reminder: At the end of each @@ -22,7 +22,7 @@ import ( // 2. DeliverTx // 3. EndBlock // 4. Commit -func Commit(ctx sdk.Context, app *app.Evermint, t time.Duration, vs *tmtypes.ValidatorSet) (sdk.Context, error) { +func Commit(ctx sdk.Context, app *app.Nevermind, t time.Duration, vs *tmtypes.ValidatorSet) (sdk.Context, error) { header := ctx.BlockHeader() if vs != nil { @@ -54,7 +54,7 @@ func Commit(ctx sdk.Context, app *app.Evermint, t time.Duration, vs *tmtypes.Val // DeliverTx delivers a cosmos tx for a given set of msgs func DeliverTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, priv cryptotypes.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg, @@ -82,7 +82,7 @@ func DeliverTx( // If a private key is provided, it will attempt to sign all messages with the given private key, // otherwise, it will assume the messages have already been signed. func DeliverEthTx( - chainApp *app.Evermint, + chainApp *app.Nevermind, priv cryptotypes.PrivKey, msgs ...sdk.Msg, ) (abci.ResponseDeliverTx, error) { @@ -98,7 +98,7 @@ func DeliverEthTx( // CheckTx checks a cosmos tx for a given set of msgs func CheckTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, priv cryptotypes.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg, @@ -125,7 +125,7 @@ func CheckTx( // CheckEthTx checks a Ethereum tx for a given set of msgs func CheckEthTx( - chainApp *app.Evermint, + chainApp *app.Nevermind, priv cryptotypes.PrivKey, msgs ...sdk.Msg, ) (abci.ResponseCheckTx, error) { @@ -139,7 +139,7 @@ func CheckEthTx( } // BroadcastTxBytes encodes a transaction and calls DeliverTx on the app. -func BroadcastTxBytes(app *app.Evermint, txEncoder sdk.TxEncoder, tx sdk.Tx) (abci.ResponseDeliverTx, error) { +func BroadcastTxBytes(app *app.Nevermind, txEncoder sdk.TxEncoder, tx sdk.Tx) (abci.ResponseDeliverTx, error) { // bz are bytes to be broadcasted over the network bz, err := txEncoder(tx) if err != nil { @@ -156,7 +156,7 @@ func BroadcastTxBytes(app *app.Evermint, txEncoder sdk.TxEncoder, tx sdk.Tx) (ab } // checkTxBytes encodes a transaction and calls checkTx on the app. -func checkTxBytes(app *app.Evermint, txEncoder sdk.TxEncoder, tx sdk.Tx) (abci.ResponseCheckTx, error) { +func checkTxBytes(app *app.Nevermind, txEncoder sdk.TxEncoder, tx sdk.Tx) (abci.ResponseCheckTx, error) { bz, err := txEncoder(tx) if err != nil { return abci.ResponseCheckTx{}, err diff --git a/testutil/ante.go b/testutil/ante.go index b87e851f31..8c7b15e527 100644 --- a/testutil/ante.go +++ b/testutil/ante.go @@ -1,8 +1,8 @@ package testutil import ( - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/contract.go b/testutil/contract.go index 06566d20c4..b271190329 100644 --- a/testutil/contract.go +++ b/testutil/contract.go @@ -15,16 +15,16 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/testutil/tx" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // DeployContract deploys a contract with the provided private key, // compiled contract data and constructor arguments func DeployContract( ctx sdk.Context, - app *app.Evermint, + app *app.Nevermind, priv cryptotypes.PrivKey, queryClientEvm evm.QueryClient, contract evm.CompiledContract, @@ -72,7 +72,7 @@ func DeployContract( // with the provided factoryAddress func DeployContractWithFactory( ctx sdk.Context, - app *app.Evermint, + app *app.Nevermind, priv cryptotypes.PrivKey, factoryAddress common.Address, ) (common.Address, abci.ResponseDeliverTx, error) { diff --git a/testutil/fund.go b/testutil/fund.go index cd9bfe4522..bf8c42088a 100644 --- a/testutil/fund.go +++ b/testutil/fund.go @@ -1,8 +1,8 @@ package testutil import ( - "github.com/EscanBE/evermint/v12/constants" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/constants" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) diff --git a/testutil/integration.go b/testutil/integration.go index 0ef8599f1d..7130a8277d 100644 --- a/testutil/integration.go +++ b/testutil/integration.go @@ -9,8 +9,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) // SubmitProposal delivers a submit proposal tx for a given gov content. @@ -18,7 +18,7 @@ import ( // event. func SubmitProposal( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, pk *ethsecp256k1.PrivKey, content govv1beta1.Content, eventNum int, @@ -47,7 +47,7 @@ func SubmitProposal( // Delegate delivers a delegate tx func Delegate( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, priv *ethsecp256k1.PrivKey, delegateAmount sdk.Coin, validator stakingtypes.Validator, @@ -66,7 +66,7 @@ func Delegate( // Vote delivers a vote tx with the VoteOption "yes" func Vote( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, priv *ethsecp256k1.PrivKey, proposalID uint64, voteOption govv1beta1.VoteOption, diff --git a/testutil/network/network.go b/testutil/network/network.go index 191f9b3c57..400b8b92a7 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "net/http" "net/url" "os" @@ -29,8 +29,8 @@ import ( dbm "github.com/tendermint/tm-db" "google.golang.org/grpc" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/hd" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/hd" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" @@ -52,10 +52,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/server/config" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // package-wide network lock to only allow one test network at a time @@ -124,10 +124,10 @@ func DefaultConfig() Config { } } -// NewAppConstructor returns a new Evermint AppConstructor +// NewAppConstructor returns a new Nevermind AppConstructor func NewAppConstructor(encodingCfg params.EncodingConfig) AppConstructor { return func(val Validator) servertypes.Application { - return app.NewEvermint( + return app.NewNevermind( val.Ctx.Logger, dbm.NewMemDB(), nil, true, make(map[int64]bool), val.Ctx.Config.RootDir, 0, encodingCfg, simapp.EmptyAppOptions{}, @@ -334,7 +334,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) { nodeDirName := fmt.Sprintf("node%d", i) nodeDir := filepath.Join(network.BaseDir, nodeDirName, constants.ApplicationHome) - clientDir := filepath.Join(network.BaseDir, nodeDirName, "evermintcli") + clientDir := filepath.Join(network.BaseDir, nodeDirName, "nevermindcli") gentxsDir := filepath.Join(network.BaseDir, "gentxs") err := os.MkdirAll(filepath.Join(nodeDir, "config"), 0o750) diff --git a/testutil/network/network_test.go b/testutil/network/network_test.go index 287939d155..c83be6db8f 100644 --- a/testutil/network/network_test.go +++ b/testutil/network/network_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil/network" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil/network" "github.com/ethereum/go-ethereum/ethclient" - testnetwork "github.com/EscanBE/evermint/v12/testutil/network" + testnetwork "github.com/VictorTrustyDev/nevermind/v12/testutil/network" ) type IntegrationTestSuite struct { diff --git a/testutil/network/util.go b/testutil/network/util.go index c248d8c812..cc35158373 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -3,7 +3,7 @@ package network import ( "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "path/filepath" "time" @@ -17,7 +17,7 @@ import ( "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/server/api" servergrpc "github.com/cosmos/cosmos-sdk/server/grpc" srvtypes "github.com/cosmos/cosmos-sdk/server/types" @@ -30,8 +30,8 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/server" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/server" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func startInProcess(cfg Config, val *Validator) error { diff --git a/testutil/staking-rewards.go b/testutil/staking-rewards.go index 9bc48f5470..0dadbdd641 100644 --- a/testutil/staking-rewards.go +++ b/testutil/staking-rewards.go @@ -2,12 +2,12 @@ package testutil import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - testutiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/app" + testutiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" @@ -32,7 +32,7 @@ import ( // - Allocate rewards to the validator. // // The function returns the updated context along with a potential error. -func PrepareAccountsForDelegationRewards(t *testing.T, ctx sdk.Context, app *app.Evermint, addr sdk.AccAddress, balance sdkmath.Int, rewards ...sdkmath.Int) (sdk.Context, error) { +func PrepareAccountsForDelegationRewards(t *testing.T, ctx sdk.Context, app *app.Nevermind, addr sdk.AccAddress, balance sdkmath.Int, rewards ...sdkmath.Int) (sdk.Context, error) { // Calculate the necessary amount of tokens to fund the account in order for the desired residual balance to // be left after creating validators and delegating to them. totalRewards := sdk.ZeroInt() diff --git a/testutil/statedb.go b/testutil/statedb.go index ea35af8eec..0b72c40da8 100644 --- a/testutil/statedb.go +++ b/testutil/statedb.go @@ -1,8 +1,8 @@ package testutil import ( - "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/testutil/tx/cosmos.go b/testutil/tx/cosmos.go index f82716da68..0eeb20a643 100644 --- a/testutil/tx/cosmos.go +++ b/testutil/tx/cosmos.go @@ -1,7 +1,7 @@ package tx import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" sdkmath "cosmossdk.io/math" @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/EscanBE/evermint/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app" ) var ( @@ -28,7 +28,7 @@ type CosmosTxArgs struct { TxCfg client.TxConfig // Priv is the private key that will be used to sign the tx Priv cryptotypes.PrivKey - // ChainID is the chain's id on cosmos format, e.g. 'evermint_80808-1' + // ChainID is the chain's id on cosmos format, e.g. 'nevermind_80808-1' ChainID string // Gas to be used on the tx Gas uint64 @@ -46,7 +46,7 @@ type CosmosTxArgs struct { // It returns the signed transaction and an error func PrepareCosmosTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, args CosmosTxArgs, ) (authsigning.Tx, error) { txBuilder := args.TxCfg.NewTxBuilder() @@ -79,7 +79,7 @@ func PrepareCosmosTx( // the provided private key func signCosmosTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, args CosmosTxArgs, txBuilder client.TxBuilder, ) (authsigning.Tx, error) { diff --git a/testutil/tx/eip712.go b/testutil/tx/eip712.go index dc21797839..1ca3a14301 100644 --- a/testutil/tx/eip712.go +++ b/testutil/tx/eip712.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/EscanBE/evermint/v12/app" - cryptocodec "github.com/EscanBE/evermint/v12/crypto/codec" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + cryptocodec "github.com/VictorTrustyDev/nevermind/v12/crypto/codec" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" ) @@ -50,7 +50,7 @@ type legacyWeb3ExtensionArgs struct { // It returns the signed transaction and an error func CreateEIP712CosmosTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, args EIP712TxArgs, ) (sdk.Tx, error) { builder, err := PrepareEIP712CosmosTx( @@ -66,7 +66,7 @@ func CreateEIP712CosmosTx( // It returns the tx builder with the signed transaction and an error func PrepareEIP712CosmosTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, args EIP712TxArgs, ) (client.TxBuilder, error) { txArgs := args.CosmosTxArgs @@ -129,7 +129,7 @@ func PrepareEIP712CosmosTx( // the provided private key and the typed data func signCosmosEIP712Tx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, args EIP712TxArgs, builder authtx.ExtensionOptionsTxBuilder, chainID uint64, diff --git a/testutil/tx/eth.go b/testutil/tx/eth.go index f9bbb2e74c..aeae23be72 100644 --- a/testutil/tx/eth.go +++ b/testutil/tx/eth.go @@ -2,7 +2,7 @@ package tx import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" errorsmod "cosmossdk.io/errors" @@ -17,16 +17,16 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/server/config" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // PrepareEthTx creates an ethereum tx and signs it with the provided messages and private key. // It returns the signed transaction and an error func PrepareEthTx( txCfg client.TxConfig, - chainApp *app.Evermint, + chainApp *app.Nevermind, priv cryptotypes.PrivKey, msgs ...sdk.Msg, ) (authsigning.Tx, error) { @@ -89,7 +89,7 @@ func PrepareEthTx( // Should this not be the case, just pass in zero. func CreateEthTx( ctx sdk.Context, - chainApp *app.Evermint, + chainApp *app.Nevermind, privKey cryptotypes.PrivKey, from sdk.AccAddress, dest sdk.AccAddress, diff --git a/testutil/tx/signer.go b/testutil/tx/signer.go index 4c4c240d8a..c5aa31d48a 100644 --- a/testutil/tx/signer.go +++ b/testutil/tx/signer.go @@ -10,7 +10,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) // NewAddrKey generates an Ethereum address and its corresponding private key. diff --git a/types/account_test.go b/types/account_test.go index 0d5ecc56dd..9b2110fe92 100644 --- a/types/account_test.go +++ b/types/account_test.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - cryptocodec "github.com/EscanBE/evermint/v12/crypto/codec" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - encodingcodec "github.com/EscanBE/evermint/v12/encoding/codec" - "github.com/EscanBE/evermint/v12/types" + cryptocodec "github.com/VictorTrustyDev/nevermind/v12/crypto/codec" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + encodingcodec "github.com/VictorTrustyDev/nevermind/v12/encoding/codec" + "github.com/VictorTrustyDev/nevermind/v12/types" ) func init() { diff --git a/types/benchmark_test.go b/types/benchmark_test.go index d45f608449..fdcd4a2c8b 100644 --- a/types/benchmark_test.go +++ b/types/benchmark_test.go @@ -2,7 +2,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" ) diff --git a/types/chain_id.go b/types/chain_id.go index 2e479525d0..f33b9c7ff2 100644 --- a/types/chain_id.go +++ b/types/chain_id.go @@ -15,7 +15,7 @@ var ( regexEIP155 = `[1-9][0-9]*` regexEpochSeparator = `-{1}` regexEpoch = `[1-9][0-9]*` - evermintChainID = regexp.MustCompile(fmt.Sprintf(`^(%s)%s(%s)%s(%s)$`, + nevermindChainID = regexp.MustCompile(fmt.Sprintf(`^(%s)%s(%s)%s(%s)$`, regexChainID, regexEIP155Separator, regexEIP155, @@ -29,7 +29,7 @@ func IsValidChainID(chainID string) bool { return false } - return evermintChainID.MatchString(chainID) + return nevermindChainID.MatchString(chainID) } // ParseChainID parses a string chain identifier's epoch to an Ethereum-compatible @@ -40,7 +40,7 @@ func ParseChainID(chainID string) (*big.Int, error) { return nil, errorsmod.Wrapf(ErrInvalidChainID, "chain-id '%s' cannot exceed 48 chars", chainID) } - matches := evermintChainID.FindStringSubmatch(chainID) + matches := nevermindChainID.FindStringSubmatch(chainID) if matches == nil || len(matches) != 4 || matches[1] == "" { return nil, errorsmod.Wrapf(ErrInvalidChainID, "%s: %v", chainID, matches) } diff --git a/types/chain_id_test.go b/types/chain_id_test.go index 5f545ee810..05b39f35a0 100644 --- a/types/chain_id_test.go +++ b/types/chain_id_test.go @@ -2,7 +2,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "strings" "testing" @@ -42,7 +42,7 @@ func TestParseChainID(t *testing.T) { "invalid chain-id, uppercases", "EVRMINT_1-1", true, nil, }, { - "invalid chain-id, mixed cases", "Evermint_1-1", true, nil, + "invalid chain-id, mixed cases", "Nevermind_1-1", true, nil, }, { "invalid chain-id, special chars", "$&*#!_1-1", true, nil, diff --git a/types/coin.go b/types/coin.go index 3f81882cc5..fb62e6bdc1 100644 --- a/types/coin.go +++ b/types/coin.go @@ -1,7 +1,7 @@ package types import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" sdkmath "cosmossdk.io/math" diff --git a/types/errors.go b/types/errors.go index c3b218f855..61a1c92fff 100644 --- a/types/errors.go +++ b/types/errors.go @@ -2,7 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" ) // RootCodespace is the codespace for all errors defined in this package diff --git a/types/tests/test_utils.go b/types/tests/test_utils.go index 794696050b..c33dff8dd6 100644 --- a/types/tests/test_utils.go +++ b/types/tests/test_utils.go @@ -1,7 +1,7 @@ package tests import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" ) diff --git a/types/validation_test.go b/types/validation_test.go index 214493d4be..ffa6e334a2 100644 --- a/types/validation_test.go +++ b/types/validation_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/utils/utils.go b/utils/utils.go index d6873f4681..ca18c3d414 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1,10 +1,10 @@ package utils import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strings" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" @@ -57,11 +57,11 @@ func IsSupportedKey(pubkey cryptotypes.PubKey) bool { } } -// GetEvermintAddressFromBech32 returns the sdk.Account address of given address, +// GetNevermindAddressFromBech32 returns the sdk.Account address of given address, // while also changing bech32 human read-able prefix (HRP) to the value set on // the global sdk.Config. // The function fails if the provided bech32 address is invalid. -func GetEvermintAddressFromBech32(address string) (sdk.AccAddress, error) { +func GetNevermindAddressFromBech32(address string) (sdk.AccAddress, error) { bech32Prefix := strings.SplitN(address, "1", 2)[0] if bech32Prefix == address { return nil, errorsmod.Wrapf(errortypes.ErrInvalidAddress, "invalid bech32 address: %s", address) diff --git a/utils/utils_test.go b/utils/utils_test.go index e6c0b5a61d..a8adcc6c13 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -2,8 +2,8 @@ package utils import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "testing" "github.com/stretchr/testify/require" @@ -14,7 +14,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) func init() { @@ -102,26 +102,26 @@ func TestGetNativeAddressFromBech32(t *testing.T) { }, { "native address", - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", false, }, { "cosmos address", "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", false, }, { "osmosis address", "osmo1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhnecd2", - marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), + "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", false, }, } for _, tc := range testCases { - addr, err := GetEvermintAddressFromBech32(tc.address) + addr, err := GetNevermindAddressFromBech32(tc.address) if tc.expError { require.Error(t, err, tc.name) } else { diff --git a/wallets/ledger/ledger.go b/wallets/ledger/ledger.go index 8b06e6b81f..d170f2861e 100644 --- a/wallets/ledger/ledger.go +++ b/wallets/ledger/ledger.go @@ -11,15 +11,15 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/wallets/accounts" - "github.com/EscanBE/evermint/v12/wallets/usbwallet" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" + "github.com/VictorTrustyDev/nevermind/v12/wallets/usbwallet" ) // Secp256k1DerivationFn defines the derivation function used on the Cosmos SDK Keyring. type Secp256k1DerivationFn func() (sdkledger.SECP256K1, error) -func EvermintLedgerDerivation() Secp256k1DerivationFn { +func NevermindLedgerDerivation() Secp256k1DerivationFn { SECP256K1 := new(EvmosSECP256K1) return func() (sdkledger.SECP256K1, error) { diff --git a/wallets/ledger/ledger_suite_test.go b/wallets/ledger/ledger_suite_test.go index 70b2b15c7c..09d7500fdd 100644 --- a/wallets/ledger/ledger_suite_test.go +++ b/wallets/ledger/ledger_suite_test.go @@ -3,7 +3,7 @@ package ledger_test import ( "encoding/hex" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "regexp" "testing" @@ -19,9 +19,9 @@ import ( auxTx "github.com/cosmos/cosmos-sdk/x/auth/tx" bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/EscanBE/evermint/v12/wallets/ledger" - "github.com/EscanBE/evermint/v12/wallets/ledger/mocks" - "github.com/EscanBE/evermint/v12/wallets/usbwallet" + "github.com/VictorTrustyDev/nevermind/v12/wallets/ledger" + "github.com/VictorTrustyDev/nevermind/v12/wallets/ledger/mocks" + "github.com/VictorTrustyDev/nevermind/v12/wallets/usbwallet" ) type LedgerTestSuite struct { diff --git a/wallets/ledger/ledger_test.go b/wallets/ledger/ledger_test.go index 20c41db4f1..9d1885db5e 100644 --- a/wallets/ledger/ledger_test.go +++ b/wallets/ledger/ledger_test.go @@ -1,12 +1,12 @@ package ledger_test import ( - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/wallets/accounts" - "github.com/EscanBE/evermint/v12/wallets/ledger" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" + "github.com/VictorTrustyDev/nevermind/v12/wallets/ledger" sdk "github.com/cosmos/cosmos-sdk/types" gethaccounts "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" @@ -39,7 +39,7 @@ func (suite *LedgerTestSuite) TestEvmosLedgerDerivation() { for _, tc := range testCases { suite.Run(tc.name, func() { suite.SetupTest() // reset - derivationFunc := ledger.EvermintLedgerDerivation() + derivationFunc := ledger.NevermindLedgerDerivation() _, err := derivationFunc() if tc.expPass { suite.Require().NoError(err) diff --git a/wallets/ledger/mocks/wallet.go b/wallets/ledger/mocks/wallet.go index f5d6b15cf3..8b5e836c8d 100644 --- a/wallets/ledger/mocks/wallet.go +++ b/wallets/ledger/mocks/wallet.go @@ -1,7 +1,7 @@ package mocks import ( - accounts "github.com/EscanBE/evermint/v12/wallets/accounts" + accounts "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes" big "math/big" diff --git a/wallets/ledger/wallet_test.go b/wallets/ledger/wallet_test.go index 4352820170..c33bd65b8c 100644 --- a/wallets/ledger/wallet_test.go +++ b/wallets/ledger/wallet_test.go @@ -4,9 +4,9 @@ import ( "crypto/ecdsa" "errors" - "github.com/EscanBE/evermint/v12/ethereum/eip712" - "github.com/EscanBE/evermint/v12/wallets/accounts" - "github.com/EscanBE/evermint/v12/wallets/ledger/mocks" + "github.com/VictorTrustyDev/nevermind/v12/ethereum/eip712" + "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" + "github.com/VictorTrustyDev/nevermind/v12/wallets/ledger/mocks" gethaccounts "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" ) diff --git a/wallets/usbwallet/hub.go b/wallets/usbwallet/hub.go index 9f4d52dc68..a30c0b8d79 100644 --- a/wallets/usbwallet/hub.go +++ b/wallets/usbwallet/hub.go @@ -10,7 +10,7 @@ import ( // #nosec "runtime" - "github.com/EscanBE/evermint/v12/wallets/accounts" + "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" gethaccounts "github.com/ethereum/go-ethereum/accounts" usb "github.com/zondax/hid" ) diff --git a/wallets/usbwallet/wallet.go b/wallets/usbwallet/wallet.go index 893ae9417a..a73d21865a 100644 --- a/wallets/usbwallet/wallet.go +++ b/wallets/usbwallet/wallet.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/EscanBE/evermint/v12/wallets/accounts" + "github.com/VictorTrustyDev/nevermind/v12/wallets/accounts" gethaccounts "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/x/claims/client/cli/query.go b/x/claims/client/cli/query.go index be1b28a1a8..68dddab5b2 100644 --- a/x/claims/client/cli/query.go +++ b/x/claims/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/claims/genesis.go b/x/claims/genesis.go index 5a5b0b288c..8c98899ee0 100644 --- a/x/claims/genesis.go +++ b/x/claims/genesis.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/keeper" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // InitGenesis initializes the claim module's state from a provided genesis diff --git a/x/claims/genesis_test.go b/x/claims/genesis_test.go index 1e7cfc35a2..ec9a53d0e2 100644 --- a/x/claims/genesis_test.go +++ b/x/claims/genesis_test.go @@ -2,8 +2,8 @@ package claims_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "testing" "time" @@ -14,12 +14,12 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims" - "github.com/EscanBE/evermint/v12/x/claims/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) type GenesisTestSuite struct { @@ -27,7 +27,7 @@ type GenesisTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind genesis types.GenesisState } @@ -79,8 +79,8 @@ func TestGenesisTestSuite(t *testing.T) { } var ( - acc1 = sdk.MustAccAddressFromBech32(marker.ReplaceAbleAddress("evm1qxx0fdsmruzuar2fay88lfw6sce6emamyuyrg4vf")) - acc2 = sdk.MustAccAddressFromBech32(marker.ReplaceAbleAddress("evm1nsrs4t7dngkdltehkm3p6n8dp22sz3mcp720n4")) + acc1 = sdk.MustAccAddressFromBech32("ever1qxx0fdsmruzuar2fay88lfw6sce6emamyuzwgmxe") + acc2 = sdk.MustAccAddressFromBech32("ever1nsrs4t7dngkdltehkm3p6n8dp22sz3mcd9l4u9") ) func (suite *GenesisTestSuite) TestClaimInitGenesis() { diff --git a/x/claims/handler.go b/x/claims/handler.go index ce2b2e9402..f19c59a6b9 100644 --- a/x/claims/handler.go +++ b/x/claims/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // NewHandler returns claim module messages diff --git a/x/claims/ibc_middleware.go b/x/claims/ibc_middleware.go index 4b6ef8665d..a3021f598c 100644 --- a/x/claims/ibc_middleware.go +++ b/x/claims/ibc_middleware.go @@ -7,8 +7,8 @@ import ( porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/x/claims/keeper" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/keeper" clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" ) diff --git a/x/claims/keeper/abci.go b/x/claims/keeper/abci.go index bd51bfeb26..ef6f983e6a 100644 --- a/x/claims/keeper/abci.go +++ b/x/claims/keeper/abci.go @@ -4,11 +4,11 @@ import ( "strconv" errorsmod "cosmossdk.io/errors" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // EndBlocker checks if the airdrop claiming period has ended in order to diff --git a/x/claims/keeper/abci_test.go b/x/claims/keeper/abci_test.go index e586955360..46e5929ef8 100644 --- a/x/claims/keeper/abci_test.go +++ b/x/claims/keeper/abci_test.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - testutil "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/claims/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + testutil "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" diff --git a/x/claims/keeper/claim.go b/x/claims/keeper/claim.go index 7521b53e44..0aa011d31b 100644 --- a/x/claims/keeper/claim.go +++ b/x/claims/keeper/claim.go @@ -3,11 +3,11 @@ package keeper import ( errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // ClaimCoinsForAction removes the claimable amount entry from a claims record diff --git a/x/claims/keeper/claim_test.go b/x/claims/keeper/claim_test.go index 8324bbef9b..0ec0e60da9 100644 --- a/x/claims/keeper/claim_test.go +++ b/x/claims/keeper/claim_test.go @@ -2,15 +2,15 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "time" "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" @@ -19,7 +19,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) func (suite *KeeperTestSuite) TestGetClaimableAmountForAction() { @@ -1054,7 +1054,7 @@ func (suite *KeeperTestSuite) TestClawbackEmptyAccountsAirdrop() { }{ { name: "address active", - address: marker.ReplaceAbleAddress("evm1qql8ag4cluz6r4dz28p3w00dnc9w8ueuhjd72z"), + address: "ever1qql8ag4cluz6r4dz28p3w00dnc9w8ueumfcy9j", sequence: 1, expectClawback: false, claimsRecord: types.ClaimsRecord{ @@ -1064,7 +1064,7 @@ func (suite *KeeperTestSuite) TestClawbackEmptyAccountsAirdrop() { }, { name: "address inactive", - address: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + address: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", sequence: 0, expectClawback: true, claimsRecord: types.ClaimsRecord{ diff --git a/x/claims/keeper/claims_records.go b/x/claims/keeper/claims_records.go index f1f1f1453e..250c49f473 100644 --- a/x/claims/keeper/claims_records.go +++ b/x/claims/keeper/claims_records.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // GetClaimsRecord returns the claims record for a specific address diff --git a/x/claims/keeper/claims_records_test.go b/x/claims/keeper/claims_records_test.go index 397cf61448..c1cb55e8f5 100644 --- a/x/claims/keeper/claims_records_test.go +++ b/x/claims/keeper/claims_records_test.go @@ -1,16 +1,16 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/rename_chain/marker" + sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) func (suite *KeeperTestSuite) TestsClaimsRecords() { - addr1, err := sdk.AccAddressFromBech32(marker.ReplaceAbleAddress("evm1hf0468jjpe6m6vx38s97z2qqe8ldu0nj8llzpx")) + addr1, err := sdk.AccAddressFromBech32("ever1hf0468jjpe6m6vx38s97z2qqe8ldu0njty2cwk") suite.Require().NoError(err) - addr2, err := sdk.AccAddressFromBech32(marker.ReplaceAbleAddress("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsz")) + addr2, err := sdk.AccAddressFromBech32("ever1sv9m0g7ycejwr3s369km58h5qe7xj77h2c9plj") suite.Require().NoError(err) cr1 := types.NewClaimsRecord(sdk.NewInt(1000)) diff --git a/x/claims/keeper/grpc_query.go b/x/claims/keeper/grpc_query.go index 5c2242ece9..9fc85d424d 100644 --- a/x/claims/keeper/grpc_query.go +++ b/x/claims/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/claims/keeper/grpc_query_test.go b/x/claims/keeper/grpc_query_test.go index 9894889800..cb2e41ed88 100644 --- a/x/claims/keeper/grpc_query_test.go +++ b/x/claims/keeper/grpc_query_test.go @@ -1,15 +1,15 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) func (suite *KeeperTestSuite) TestTotalUnclaimed() { diff --git a/x/claims/keeper/hooks.go b/x/claims/keeper/hooks.go index fadd2f9e95..fcf23a9f9c 100644 --- a/x/claims/keeper/hooks.go +++ b/x/claims/keeper/hooks.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" ) diff --git a/x/claims/keeper/hooks_test.go b/x/claims/keeper/hooks_test.go index c3bf1e5832..9399369c83 100644 --- a/x/claims/keeper/hooks_test.go +++ b/x/claims/keeper/hooks_test.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/claims/keeper/ibc_callbacks.go b/x/claims/keeper/ibc_callbacks.go index 9e51acdadb..28274a524c 100644 --- a/x/claims/keeper/ibc_callbacks.go +++ b/x/claims/keeper/ibc_callbacks.go @@ -8,8 +8,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // OnAcknowledgementPacket performs an IBC send callback. Once a user submits an diff --git a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go index 0af778680c..36ce13d240 100644 --- a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go +++ b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go @@ -2,8 +2,8 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "testing" "github.com/stretchr/testify/suite" @@ -14,12 +14,12 @@ import ( channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" ibcgotesting "github.com/cosmos/ibc-go/v6/testing" - "github.com/EscanBE/evermint/v12/app" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) type IBCTestingSuite struct { @@ -27,16 +27,16 @@ type IBCTestingSuite struct { coordinator *ibcgotesting.Coordinator // testing chains used for convenience and readability - chainA *ibcgotesting.TestChain // Evermint chain A - chainB *ibcgotesting.TestChain // Evermint chain B + chainA *ibcgotesting.TestChain // Nevermind chain A + chainB *ibcgotesting.TestChain // Nevermind chain B chainCosmos *ibcgotesting.TestChain // Cosmos chain - pathEVM *ibctesting.Path // chainA (Evermint) <--> chainB (Evermint) - pathCosmos *ibctesting.Path // chainA (Evermint) <--> chainCosmos + pathEVM *ibctesting.Path // chainA (Nevermind) <--> chainB (Nevermind) + pathCosmos *ibctesting.Path // chainA (Nevermind) <--> chainCosmos } func (suite *IBCTestingSuite) SetupTest() { - suite.coordinator = ibctesting.NewCoordinator(suite.T(), 2, 1) // initializes 2 Evermint test chains and 1 Cosmos Chain + suite.coordinator = ibctesting.NewCoordinator(suite.T(), 2, 1) // initializes 2 Nevermind test chains and 1 Cosmos Chain suite.chainA = suite.coordinator.GetChain(ibcgotesting.GetChainID(1)) suite.chainB = suite.coordinator.GetChain(ibcgotesting.GetChainID(2)) suite.chainCosmos = suite.coordinator.GetChain(ibcgotesting.GetChainID(3)) @@ -45,8 +45,8 @@ func (suite *IBCTestingSuite) SetupTest() { suite.coordinator.CommitNBlocks(suite.chainB, 2) suite.coordinator.CommitNBlocks(suite.chainCosmos, 2) - evermintChainA := suite.chainA.App.(*app.Evermint) - evermintChainB := suite.chainB.App.(*app.Evermint) + nevermindChainA := suite.chainA.App.(*app.Nevermind) + nevermindChainB := suite.chainB.App.(*app.Nevermind) // Mint coins to pay tx fees amt, ok := sdk.NewIntFromString("1000000000000000000000") @@ -54,43 +54,43 @@ func (suite *IBCTestingSuite) SetupTest() { nativeCoin := sdk.NewCoin(constants.BaseDenom, amt) coins := sdk.NewCoins(nativeCoin) - err := evermintChainA.BankKeeper.MintCoins(suite.chainA.GetContext(), inflationtypes.ModuleName, coins) + err := nevermindChainA.BankKeeper.MintCoins(suite.chainA.GetContext(), inflationtypes.ModuleName, coins) suite.Require().NoError(err) - err = evermintChainA.BankKeeper.SendCoinsFromModuleToAccount(suite.chainA.GetContext(), inflationtypes.ModuleName, suite.chainA.SenderAccount.GetAddress(), coins) + err = nevermindChainA.BankKeeper.SendCoinsFromModuleToAccount(suite.chainA.GetContext(), inflationtypes.ModuleName, suite.chainA.SenderAccount.GetAddress(), coins) suite.Require().NoError(err) - err = evermintChainB.BankKeeper.MintCoins(suite.chainB.GetContext(), inflationtypes.ModuleName, coins) + err = nevermindChainB.BankKeeper.MintCoins(suite.chainB.GetContext(), inflationtypes.ModuleName, coins) suite.Require().NoError(err) - err = evermintChainB.BankKeeper.SendCoinsFromModuleToAccount(suite.chainB.GetContext(), inflationtypes.ModuleName, suite.chainB.SenderAccount.GetAddress(), coins) + err = nevermindChainB.BankKeeper.SendCoinsFromModuleToAccount(suite.chainB.GetContext(), inflationtypes.ModuleName, suite.chainB.SenderAccount.GetAddress(), coins) suite.Require().NoError(err) - evmParams := evermintChainA.EvmKeeper.GetParams(suite.chainA.GetContext()) + evmParams := nevermindChainA.EvmKeeper.GetParams(suite.chainA.GetContext()) evmParams.EvmDenom = constants.BaseDenom - err = evermintChainA.EvmKeeper.SetParams(suite.chainA.GetContext(), evmParams) + err = nevermindChainA.EvmKeeper.SetParams(suite.chainA.GetContext(), evmParams) suite.Require().NoError(err) - err = evermintChainB.EvmKeeper.SetParams(suite.chainB.GetContext(), evmParams) + err = nevermindChainB.EvmKeeper.SetParams(suite.chainB.GetContext(), evmParams) suite.Require().NoError(err) claimsRecord := types.NewClaimsRecord(sdk.NewInt(10000)) addr := sdk.AccAddress(utiltx.GenerateAddress().Bytes()) coins = sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, sdk.NewInt(10000))) - err = testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err = testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), addr, claimsRecord) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), addr, claimsRecord) - err = testutil.FundModuleAccount(suite.chainA.GetContext(), suite.chainA.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err = testutil.FundModuleAccount(suite.chainA.GetContext(), suite.chainA.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) - suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), addr, claimsRecord) + suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), addr, claimsRecord) params := types.DefaultParams() params.AirdropStartTime = suite.chainA.GetContext().BlockTime() params.EnableClaims = true - err = suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) + err = suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) suite.Require().NoError(err) - err = suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) + err = suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) suite.Require().NoError(err) suite.pathEVM = ibctesting.NewTransferPath(suite.chainA, suite.chainB) // clientID, connectionID, channelID empty @@ -111,8 +111,8 @@ func TestIBCTestingSuite(t *testing.T) { } func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { - sender := marker.ReplaceAbleAddress("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsz") //nolint:goconst - receiver := marker.ReplaceAbleAddress("evm1hf0468jjpe6m6vx38s97z2qqe8ldu0nj8llzpx") //nolint:goconst + sender := "ever1sv9m0g7ycejwr3s369km58h5qe7xj77h2c9plj" //nolint:goconst + receiver := "ever1hf0468jjpe6m6vx38s97z2qqe8ldu0njty2cwk" //nolint:goconst senderAddr, err := sdk.AccAddressFromBech32(sender) suite.Require().NoError(err) @@ -129,8 +129,8 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { func(_ int64) { params := types.DefaultParams() params.EnableClaims = false - suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck + suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck }, 4, 0, @@ -150,9 +150,9 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) - suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), senderAddr, types.NewClaimsRecord(amt)) + suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), senderAddr, types.NewClaimsRecord(amt)) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainA.GetContext(), suite.chainA.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainA.GetContext(), suite.chainA.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, 4, @@ -164,7 +164,7 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { func(claimableAmount int64) { amt := sdk.NewInt(claimableAmount) - suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, true}}) + suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainA.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, true}}) }, 4, 0, @@ -194,9 +194,9 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { err = path.RelayPacket(packet) suite.Require().NoError(err) - coin := suite.chainA.App.(*app.Evermint).BankKeeper.GetBalance(suite.chainA.GetContext(), senderAddr, constants.BaseDenom) + coin := suite.chainA.App.(*app.Nevermind).BankKeeper.GetBalance(suite.chainA.GetContext(), senderAddr, constants.BaseDenom) suite.Require().Equal(sdk.NewCoin(constants.BaseDenom, sdk.NewInt(tc.expectedBalance)).String(), coin.String()) - _, found := suite.chainA.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainA.GetContext(), senderAddr) + _, found := suite.chainA.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainA.GetContext(), senderAddr) if tc.expPass { suite.Require().True(found) } else { @@ -207,8 +207,8 @@ func (suite *IBCTestingSuite) TestOnAcknowledgementPacketIBC() { } func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { - sender := marker.ReplaceAbleAddress("evm1hf0468jjpe6m6vx38s97z2qqe8ldu0nj8llzpx") - receiver := marker.ReplaceAbleAddress("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsz") + sender := "ever1hf0468jjpe6m6vx38s97z2qqe8ldu0njty2cwk" + receiver := "ever1sv9m0g7ycejwr3s369km58h5qe7xj77h2c9plj" triggerAmt := types.IBCTriggerAmt senderAddr, err := sdk.AccAddressFromBech32(sender) @@ -229,8 +229,8 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { func(_ int64) { params := types.DefaultParams() params.EnableClaims = false - suite.chainA.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck + suite.chainA.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainA.GetContext(), params) //nolint:errcheck + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.chainB.GetContext(), params) //nolint:errcheck }, func() {}, 4, @@ -243,14 +243,14 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, sdk.NewInt(claimableAmount/4))) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, true}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, true}}) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() { // Check sender claim was not deleted - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().True(found) }, 4, @@ -263,16 +263,16 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, true}}) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, true}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, false}}) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() { // Check sender claim was not deleted - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().True(found) }, 4, @@ -285,16 +285,16 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt.Add(amt.QuoRaw(2)))) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, false}}) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() { // Check sender claim was deleted after merge - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().False(found) }, 4, @@ -308,16 +308,16 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt.QuoRaw(2))) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: sdk.ZeroInt(), ActionsCompleted: []bool{false, false, false, false}}) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: sdk.ZeroInt(), ActionsCompleted: []bool{false, false, false, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, true, true, false}}) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() { // Check sender claim was deleted after merge - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().False(found) }, 4, @@ -327,11 +327,11 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { { "case 2: no-op - only sender claims record found with no claimable amount", func(_ int64) { - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: sdk.ZeroInt(), ActionsCompleted: []bool{false, false, false, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.ClaimsRecord{InitialClaimableAmount: sdk.ZeroInt(), ActionsCompleted: []bool{false, false, false, false}}) }, func() { // Check sender claim was not deleted - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().True(found) }, 0, @@ -343,15 +343,15 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { func(claimableAmount int64) { amt := sdk.NewInt(claimableAmount) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.NewClaimsRecord(amt)) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), senderAddr, types.NewClaimsRecord(amt)) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() { // Check sender claim was deleted - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), senderAddr) suite.Require().False(found) }, 4, @@ -362,11 +362,11 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { "case 3: pass/claim - only recipient claims record found", func(claimableAmount int64) { amt := sdk.NewInt(claimableAmount) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() {}, @@ -378,7 +378,7 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { "case 3: no-op - only recipient claims record found, but recipient already claimed ibc transfer", func(claimableAmount int64) { amt := sdk.NewInt(claimableAmount) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, true}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{true, true, true, true}}) }, func() {}, 4, @@ -389,11 +389,11 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { "case 3: no-op - only sender claims record found with no claimable amount", func(claimableAmount int64) { amt := sdk.NewInt(claimableAmount) - suite.chainB.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) + suite.chainB.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(suite.chainB.GetContext(), receiverAddr, types.ClaimsRecord{InitialClaimableAmount: amt, ActionsCompleted: []bool{false, false, false, false}}) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Evermint).BankKeeper, types.ModuleName, coins) + err := testutil.FundModuleAccount(suite.chainB.GetContext(), suite.chainB.App.(*app.Nevermind).BankKeeper, types.ModuleName, coins) suite.Require().NoError(err) }, func() {}, @@ -433,9 +433,9 @@ func (suite *IBCTestingSuite) TestOnRecvPacketIBC() { err = path.EndpointB.RecvPacket(packet) suite.Require().NoError(err) - coin := suite.chainB.App.(*app.Evermint).BankKeeper.GetBalance(suite.chainB.GetContext(), receiverAddr, constants.BaseDenom) + coin := suite.chainB.App.(*app.Nevermind).BankKeeper.GetBalance(suite.chainB.GetContext(), receiverAddr, constants.BaseDenom) suite.Require().Equal(coin.String(), sdk.NewCoin(constants.BaseDenom, sdk.NewInt(tc.expectedBalance)).String()) - _, found := suite.chainB.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), receiverAddr) + _, found := suite.chainB.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(suite.chainB.GetContext(), receiverAddr) if tc.expectedRecipientFound { suite.Require().True(found) } else { diff --git a/x/claims/keeper/ibc_callbacks_test.go b/x/claims/keeper/ibc_callbacks_test.go index 370b155f20..67bd905e09 100644 --- a/x/claims/keeper/ibc_callbacks_test.go +++ b/x/claims/keeper/ibc_callbacks_test.go @@ -3,8 +3,8 @@ package keeper_test import ( errorsmod "cosmossdk.io/errors" "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" @@ -16,7 +16,7 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v6/testing" ibcmock "github.com/cosmos/ibc-go/v6/testing/mock" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) var timeoutHeight = clienttypes.NewHeight(1000, 1000) @@ -69,12 +69,12 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { { "error - no escrowed funds", func() { - addr, err := sdk.AccAddressFromBech32(marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7")) + addr, err := sdk.AccAddressFromBech32("ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw") suite.Require().NoError(err) mockpacket.Data = transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ - Sender: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Sender: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Receiver: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", }, ) @@ -90,12 +90,12 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { func() { suite.SetupTestWithEscrow() - addr, err := sdk.AccAddressFromBech32(marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7")) + addr, err := sdk.AccAddressFromBech32("ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw") suite.Require().NoError(err) mockpacket.Data = transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ - Sender: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Sender: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Receiver: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", }, ) @@ -112,12 +112,12 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { func() { suite.SetupTestWithEscrow() - addr, err := sdk.AccAddressFromBech32(marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7")) + addr, err := sdk.AccAddressFromBech32("ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw") suite.Require().NoError(err) mockpacket.Data = transfertypes.ModuleCdc.MustMarshalJSON( &transfertypes.FungibleTokenPacketData{ - Sender: marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7"), + Sender: "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw", Receiver: "cosmos1qql8ag4cluz6r4dz28p3w00dnc9w8ueulg2gmc", }, ) @@ -150,10 +150,10 @@ func (suite *KeeperTestSuite) TestAckknowledgementPacket() { func (suite *KeeperTestSuite) TestOnRecvPacket() { pk := secp256k1.GenPrivKey() secpAddr := sdk.AccAddress(pk.PubKey().Address()) - secpAddrEvermint := secpAddr.String() + secpAddrNevermind := secpAddr.String() secpAddrCosmos := sdk.MustBech32ifyAddressBytes(sdk.Bech32MainPrefix, secpAddr) - senderStr := marker.ReplaceAbleAddress("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsz") - receiverStr := marker.ReplaceAbleAddress("evm1hf0468jjpe6m6vx38s97z2qqe8ldu0nj8llzpx") + senderStr := "ever1sv9m0g7ycejwr3s369km58h5qe7xj77h2c9plj" + receiverStr := "ever1hf0468jjpe6m6vx38s97z2qqe8ldu0njty2cwk" sender, err := sdk.AccAddressFromBech32(senderStr) suite.Require().NoError(err) receiver, err := sdk.AccAddressFromBech32(receiverStr) @@ -271,7 +271,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { "fail - sender and receiver address are the same (with claim record)", func() { - transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet := channeltypes.NewPacket(bz, 1, transfertypes.PortID, "channel-0", transfertypes.PortID, "channel-0", timeoutHeight, 0) @@ -284,7 +284,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { "pass - sender and receiver address is the same (no claim record) - attempt recovery", func() { - transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet := channeltypes.NewPacket(bz, 1, transfertypes.PortID, "channel-0", transfertypes.PortID, "channel-0", timeoutHeight, 0) @@ -456,7 +456,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { err = suite.app.ClaimsKeeper.SetParams(suite.ctx, params) suite.Require().NoError(err) - transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet := channeltypes.NewPacket(bz, 1, transfertypes.PortID, "channel-0", transfertypes.PortID, types.DefaultEVMChannels[0], timeoutHeight, 0) @@ -487,7 +487,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { err := suite.app.ClaimsKeeper.SetParams(suite.ctx, params) suite.Require().NoError(err) - transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet := channeltypes.NewPacket(bz, 1, transfertypes.PortID, "channel-0", transfertypes.PortID, types.DefaultEVMChannels[0], timeoutHeight, 0) @@ -548,7 +548,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { "case 4: no-op - same sender with EVM channel, no claims record", func() { - transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(constants.BaseDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet := channeltypes.NewPacket(bz, 1, transfertypes.PortID, "channel-0", transfertypes.PortID, types.DefaultEVMChannels[0], timeoutHeight, 0) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index c0815fc6f6..cd9e53fb87 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "time" @@ -13,11 +13,11 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) var _ = Describe("Claiming", Ordered, func() { @@ -93,7 +93,7 @@ var _ = Describe("Claiming", Ordered, func() { s.app.AccountKeeper.SetAccount(s.ctx, acc) claimsRecords = append(claimsRecords, claimsRecord) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, constants.BaseDenom) // claimsDenom == evmDenom == 'wei' + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, constants.BaseDenom) // claimsDenom == evmDenom == 'uever' Expect(balance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount))) } diff --git a/x/claims/keeper/invariants.go b/x/claims/keeper/invariants.go index b2847345bf..17db022e93 100644 --- a/x/claims/keeper/invariants.go +++ b/x/claims/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // RegisterInvariants registers the claims module invariants diff --git a/x/claims/keeper/invariants_test.go b/x/claims/keeper/invariants_test.go index c61cdff6f2..388b9fb1cf 100644 --- a/x/claims/keeper/invariants_test.go +++ b/x/claims/keeper/invariants_test.go @@ -1,10 +1,10 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/claims/keeper/keeper.go b/x/claims/keeper/keeper.go index c9da543a6e..aebf5023a0 100644 --- a/x/claims/keeper/keeper.go +++ b/x/claims/keeper/keeper.go @@ -11,7 +11,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // Keeper struct diff --git a/x/claims/keeper/migrations.go b/x/claims/keeper/migrations.go index 5da5815c30..d61303ca5b 100644 --- a/x/claims/keeper/migrations.go +++ b/x/claims/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v3 "github.com/EscanBE/evermint/v12/x/claims/migrations/v3" - "github.com/EscanBE/evermint/v12/x/claims/types" + v3 "github.com/VictorTrustyDev/nevermind/v12/x/claims/migrations/v3" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/claims/keeper/msg_server.go b/x/claims/keeper/msg_server.go index 20e926641d..c3100b0a9d 100644 --- a/x/claims/keeper/msg_server.go +++ b/x/claims/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // UpdateParams implements the gRPC MsgServer interface. When an UpdateParams diff --git a/x/claims/keeper/msg_server_test.go b/x/claims/keeper/msg_server_test.go index 0529becbeb..bb76bdd0d6 100644 --- a/x/claims/keeper/msg_server_test.go +++ b/x/claims/keeper/msg_server_test.go @@ -9,7 +9,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) func (suite *KeeperTestSuite) TestUpdateParams() { diff --git a/x/claims/keeper/params.go b/x/claims/keeper/params.go index 2e6d69dfe8..e2eef66774 100644 --- a/x/claims/keeper/params.go +++ b/x/claims/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // GetParams returns the total set of claim parameters. diff --git a/x/claims/keeper/params_test.go b/x/claims/keeper/params_test.go index 5891b2fbe9..1104b8d26f 100644 --- a/x/claims/keeper/params_test.go +++ b/x/claims/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/claims/keeper/setup_test.go b/x/claims/keeper/setup_test.go index a89b398bb4..6e2d0bdb41 100644 --- a/x/claims/keeper/setup_test.go +++ b/x/claims/keeper/setup_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/claims/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -24,7 +24,7 @@ type KeeperTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClient types.QueryClient queryClientEvm evm.QueryClient address common.Address diff --git a/x/claims/keeper/utils_test.go b/x/claims/keeper/utils_test.go index 50d16a47c6..1e9a340740 100644 --- a/x/claims/keeper/utils_test.go +++ b/x/claims/keeper/utils_test.go @@ -1,21 +1,21 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "time" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/claims/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/claims/migrations/v3/migrate.go b/x/claims/migrations/v3/migrate.go index 3439cf86c8..4bd13d9ab1 100644 --- a/x/claims/migrations/v3/migrate.go +++ b/x/claims/migrations/v3/migrate.go @@ -3,8 +3,8 @@ package v3 import ( "github.com/cosmos/cosmos-sdk/codec" - v3types "github.com/EscanBE/evermint/v12/x/claims/migrations/v3/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + v3types "github.com/VictorTrustyDev/nevermind/v12/x/claims/migrations/v3/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/claims/migrations/v3/migrate_test.go b/x/claims/migrations/v3/migrate_test.go index 9abecd326e..1c493ab460 100644 --- a/x/claims/migrations/v3/migrate_test.go +++ b/x/claims/migrations/v3/migrate_test.go @@ -6,11 +6,11 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v3 "github.com/EscanBE/evermint/v12/x/claims/migrations/v3" - v3types "github.com/EscanBE/evermint/v12/x/claims/migrations/v3/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v3 "github.com/VictorTrustyDev/nevermind/v12/x/claims/migrations/v3" + v3types "github.com/VictorTrustyDev/nevermind/v12/x/claims/migrations/v3/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/claims/migrations/v3/types/genesis.pb.go b/x/claims/migrations/v3/types/genesis.pb.go index 52d3be3ebe..094ec248e8 100644 --- a/x/claims/migrations/v3/types/genesis.pb.go +++ b/x/claims/migrations/v3/types/genesis.pb.go @@ -11,7 +11,7 @@ import ( time "time" _ "github.com/cosmos/gogoproto/gogoproto" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/durationpb" diff --git a/x/claims/migrations/v3/types/params.go b/x/claims/migrations/v3/types/params.go index dd8b834550..2a76f674dc 100644 --- a/x/claims/migrations/v3/types/params.go +++ b/x/claims/migrations/v3/types/params.go @@ -2,10 +2,10 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/claims/module.go b/x/claims/module.go index 41f72f20ab..a8578cdb57 100644 --- a/x/claims/module.go +++ b/x/claims/module.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/EscanBE/evermint/v12/x/claims/client/cli" - "github.com/EscanBE/evermint/v12/x/claims/keeper" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) var ( diff --git a/x/claims/types/claims_record_test.go b/x/claims/types/claims_record_test.go index 3eee553e22..db210734e3 100644 --- a/x/claims/types/claims_record_test.go +++ b/x/claims/types/claims_record_test.go @@ -4,8 +4,8 @@ import ( "testing" "cosmossdk.io/math" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" ) diff --git a/x/claims/types/genesis_test.go b/x/claims/types/genesis_test.go index 7d5aaeccef..5abacc7bec 100644 --- a/x/claims/types/genesis_test.go +++ b/x/claims/types/genesis_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/claims/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" "github.com/stretchr/testify/suite" ) diff --git a/x/claims/types/params.go b/x/claims/types/params.go index a3ec64845f..88e0a5dd54 100644 --- a/x/claims/types/params.go +++ b/x/claims/types/params.go @@ -2,7 +2,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" errorsmod "cosmossdk.io/errors" diff --git a/x/claims/types/params_test.go b/x/claims/types/params_test.go index 912800a8b6..4f430390ca 100644 --- a/x/claims/types/params_test.go +++ b/x/claims/types/params_test.go @@ -2,13 +2,13 @@ package types_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index b63d24359c..9f29c367bd 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/epochs/genesis.go b/x/epochs/genesis.go index 450fe44a1f..a8a21b8d67 100644 --- a/x/epochs/genesis.go +++ b/x/epochs/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/epochs/keeper" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // InitGenesis initializes the epochs module's state from a provided genesis diff --git a/x/epochs/genesis_test.go b/x/epochs/genesis_test.go index f35e362b74..60e3a4dfdb 100644 --- a/x/epochs/genesis_test.go +++ b/x/epochs/genesis_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - chainapp "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/epochs" - "github.com/EscanBE/evermint/v12/x/epochs/types" + chainapp "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index 7738b5430a..930a8d7fca 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // BeginBlocker of epochs module diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 0e06f00dde..d100efe700 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/EscanBE/evermint/v12/x/epochs" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochInfoChangesBeginBlockerAndInitGenesis() { diff --git a/x/epochs/keeper/epoch_infos.go b/x/epochs/keeper/epoch_infos.go index 67ab4440e9..3c157fa943 100644 --- a/x/epochs/keeper/epoch_infos.go +++ b/x/epochs/keeper/epoch_infos.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // GetEpochInfo returns epoch info by identifier diff --git a/x/epochs/keeper/epoch_infos_test.go b/x/epochs/keeper/epoch_infos_test.go index 779a8c4b40..538333224e 100644 --- a/x/epochs/keeper/epoch_infos_test.go +++ b/x/epochs/keeper/epoch_infos_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochLifeCycle() { diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index 2abb10662f..321f595037 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index c28285d0cc..733d71fcab 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" ) diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go index 5ce4341af6..60e93cb182 100644 --- a/x/epochs/keeper/hooks.go +++ b/x/epochs/keeper/hooks.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 4d3239340c..6c5bab89fc 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // Keeper of this module maintains collections of epochs and hooks. diff --git a/x/epochs/keeper/setup_test.go b/x/epochs/keeper/setup_test.go index c5a5c9fba7..6b243ab75c 100644 --- a/x/epochs/keeper/setup_test.go +++ b/x/epochs/keeper/setup_test.go @@ -9,17 +9,17 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient consAddress sdk.ConsAddress diff --git a/x/epochs/keeper/utils_test.go b/x/epochs/keeper/utils_test.go index 6b505317d8..cebfec860e 100644 --- a/x/epochs/keeper/utils_test.go +++ b/x/epochs/keeper/utils_test.go @@ -1,13 +1,13 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/testutil" - "github.com/EscanBE/evermint/v12/x/epochs/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/x/epochs/module.go b/x/epochs/module.go index 893fd1b8a6..bd53d18b1f 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/EscanBE/evermint/v12/x/epochs/client/cli" - "github.com/EscanBE/evermint/v12/x/epochs/keeper" - "github.com/EscanBE/evermint/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) var ( @@ -190,7 +190,7 @@ func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) { } -// WeightedOperations returns the all the gov module operations with their respective weights. +// WeightedOperations returns the all the gov module operations with their respective ueverghts. func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { return []simtypes.WeightedOperation{} } diff --git a/x/erc20/client/cli/metadata/coin_metadata_test.json b/x/erc20/client/cli/metadata/coin_metadata_test.json index 9b774eff4d..34c5ae2f11 100644 --- a/x/erc20/client/cli/metadata/coin_metadata_test.json +++ b/x/erc20/client/cli/metadata/coin_metadata_test.json @@ -1,21 +1,21 @@ { "metadata": [ { - "description": "The native staking and governance token of the Evermint chain", + "description": "The native staking and governance token of the Nevermind chain", "denom_units": [ { - "denom": "wei", + "denom": "uever", "exponent": 0 }, { - "denom": "ether", + "denom": "ever", "exponent": 18 } ], - "base": "wei", - "display": "ether", - "name": "wei", - "symbol": "ETH" + "base": "uever", + "display": "ever", + "name": "uever", + "symbol": "EVER" } ] } \ No newline at end of file diff --git a/x/erc20/client/cli/metadata/coins_metadata_test.json b/x/erc20/client/cli/metadata/coins_metadata_test.json index ff93712827..c6a9f0e96f 100644 --- a/x/erc20/client/cli/metadata/coins_metadata_test.json +++ b/x/erc20/client/cli/metadata/coins_metadata_test.json @@ -1,21 +1,21 @@ { "metadata": [ { - "description": "The native staking and governance token of the Evermint chain", + "description": "The native staking and governance token of the Nevermind chain", "denom_units": [ { - "denom": "wei", + "denom": "uever", "exponent": 0 }, { - "denom": "ether", + "denom": "ever", "exponent": 18 } ], - "base": "wei", - "display": "wei", - "name": "wei", - "symbol": "ETH" + "base": "uever", + "display": "uever", + "name": "uever", + "symbol": "EVER" }, { "description": "The native staking and governance token of the Osmosis chain", diff --git a/x/erc20/client/cli/metadata/invalid_metadata_test.json b/x/erc20/client/cli/metadata/invalid_metadata_test.json index 4135e0a78c..b4bbea2570 100644 --- a/x/erc20/client/cli/metadata/invalid_metadata_test.json +++ b/x/erc20/client/cli/metadata/invalid_metadata_test.json @@ -4,18 +4,18 @@ "description": 1, "denom_units": [ { - "denom": "wei", + "denom": "uever", "exponent": 0 }, { - "denom": "ether", + "denom": "ever", "exponent": 18 } ], - "base": "wei", - "display": "wei", - "name": "wei", - "symbol": "ETH" + "base": "uever", + "display": "uever", + "name": "uever", + "symbol": "EVER" } ] } \ No newline at end of file diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index 98389b3aaf..02321c37a7 100644 --- a/x/erc20/client/cli/query.go +++ b/x/erc20/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // GetQueryCmd returns the parent command for all erc20 CLI query commands diff --git a/x/erc20/client/cli/tx.go b/x/erc20/client/cli/tx.go index 98f15feb78..c1a0cc27ff 100644 --- a/x/erc20/client/cli/tx.go +++ b/x/erc20/client/cli/tx.go @@ -2,7 +2,7 @@ package cli import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" @@ -15,9 +15,9 @@ import ( "github.com/ethereum/go-ethereum/common" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // NewTxCmd returns a root CLI command handler for erc20 transaction commands diff --git a/x/erc20/client/cli/utils.go b/x/erc20/client/cli/utils.go index df286db134..f839abb542 100644 --- a/x/erc20/client/cli/utils.go +++ b/x/erc20/client/cli/utils.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/cosmos/cosmos-sdk/codec" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) diff --git a/x/erc20/client/cli/utils_test.go b/x/erc20/client/cli/utils_test.go index 359cf6ffc6..777b6dd57d 100644 --- a/x/erc20/client/cli/utils_test.go +++ b/x/erc20/client/cli/utils_test.go @@ -3,7 +3,7 @@ package cli import ( "testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/stretchr/testify/require" ) diff --git a/x/erc20/client/proposal_handler.go b/x/erc20/client/proposal_handler.go index 7187a95c6a..8a7b91a98b 100644 --- a/x/erc20/client/proposal_handler.go +++ b/x/erc20/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/EscanBE/evermint/v12/x/erc20/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/client/cli" ) var ( diff --git a/x/erc20/genesis.go b/x/erc20/genesis.go index 9daf4c325e..0645ea58af 100644 --- a/x/erc20/genesis.go +++ b/x/erc20/genesis.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // InitGenesis import module genesis diff --git a/x/erc20/genesis_test.go b/x/erc20/genesis_test.go index 797cc10733..93ab14f615 100644 --- a/x/erc20/genesis_test.go +++ b/x/erc20/genesis_test.go @@ -1,7 +1,7 @@ package erc20_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -14,18 +14,18 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/erc20" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) type GenesisTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind genesis types.GenesisState } diff --git a/x/erc20/handler.go b/x/erc20/handler.go index bd401abe3a..d7d45bdef3 100644 --- a/x/erc20/handler.go +++ b/x/erc20/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // NewHandler defines the erc20 module handler instance diff --git a/x/erc20/ibc_middleware.go b/x/erc20/ibc_middleware.go index 3a3fb8d9b9..71644a601c 100644 --- a/x/erc20/ibc_middleware.go +++ b/x/erc20/ibc_middleware.go @@ -9,8 +9,8 @@ import ( porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/erc20/keeper/erc20_utils_test.go b/x/erc20/keeper/erc20_utils_test.go index 1bbf606903..73e7e38d5f 100644 --- a/x/erc20/keeper/erc20_utils_test.go +++ b/x/erc20/keeper/erc20_utils_test.go @@ -4,9 +4,9 @@ import ( "fmt" "math/big" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/x/erc20/keeper/evm.go b/x/erc20/keeper/evm.go index 9fbc6a4f20..a071507997 100644 --- a/x/erc20/keeper/evm.go +++ b/x/erc20/keeper/evm.go @@ -5,8 +5,8 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/server/config" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -16,8 +16,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // DeployERC20Contract creates and deploys an ERC20 contract on the EVM with the diff --git a/x/erc20/keeper/evm_hooks.go b/x/erc20/keeper/evm_hooks.go index d6044216d9..0cb9137821 100644 --- a/x/erc20/keeper/evm_hooks.go +++ b/x/erc20/keeper/evm_hooks.go @@ -4,14 +4,14 @@ import ( "bytes" "math/big" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index d89012efcf..04bc5a6101 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/contracts" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // ensureHooksSet tries to set the hooks on EVMKeeper, this will fail if the erc20 hook is already set diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index 2c1b0a1838..1d1390ec9a 100644 --- a/x/erc20/keeper/evm_test.go +++ b/x/erc20/keeper/evm_test.go @@ -6,14 +6,14 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/mock" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) func (suite *KeeperTestSuite) TestQueryERC20() { diff --git a/x/erc20/keeper/grpc_query.go b/x/erc20/keeper/grpc_query.go index 57cb4c884b..7e44589a9a 100644 --- a/x/erc20/keeper/grpc_query.go +++ b/x/erc20/keeper/grpc_query.go @@ -6,12 +6,12 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 07420d6027..8d8e855709 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) func (suite *KeeperTestSuite) TestTokenPairs() { diff --git a/x/erc20/keeper/ibc_callbacks.go b/x/erc20/keeper/ibc_callbacks.go index ca3c24ae4e..81570f0144 100644 --- a/x/erc20/keeper/ibc_callbacks.go +++ b/x/erc20/keeper/ibc_callbacks.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/ibc-go/v6/modules/core/exported" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // OnRecvPacket performs the ICS20 middleware receive callback for automatically diff --git a/x/erc20/keeper/ibc_callbacks_integration_test.go b/x/erc20/keeper/ibc_callbacks_integration_test.go index b58dd622d6..7db8533085 100644 --- a/x/erc20/keeper/ibc_callbacks_integration_test.go +++ b/x/erc20/keeper/ibc_callbacks_integration_test.go @@ -2,19 +2,19 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "strconv" "time" "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/contracts" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/testutil" - teststypes "github.com/EscanBE/evermint/v12/types/tests" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + teststypes "github.com/VictorTrustyDev/nevermind/v12/types/tests" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" @@ -49,7 +49,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { } nativeCoinMeta := banktypes.Metadata{ - Description: "Base Denom for Evermint Chain", + Description: "Base Denom for Nevermind Chain", Base: constants.BaseDenom, DenomUnits: []*banktypes.DenomUnit{ { @@ -72,30 +72,30 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = false - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - receiver = s.EvermintChain.SenderAccount.GetAddress().String() + receiver = s.NevermindChain.SenderAccount.GetAddress().String() receiverAcc = sdk.MustAccAddressFromBech32(receiver) }) It("should transfer and not convert to erc20", func() { // register the pair to check that it was not converted to ERC-20 - pair, err := s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), osmoMeta) + pair, err := s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), osmoMeta) s.Require().NoError(err) // check balance before transfer is 0 - ibcOsmoBalanceBefore := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmoBalanceBefore := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcOsmoBalanceBefore.Amount.Int64()) - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") // check balance after transfer - ibcOsmoBalanceAfter := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmoBalanceAfter := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(amount, ibcOsmoBalanceAfter.Amount.Int64()) // check ERC20 balance - should be zero (no conversion) - balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(int64(0), balanceERC20TokenAfter.Int64()) }) }) @@ -103,111 +103,111 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - receiver = s.EvermintChain.SenderAccount.GetAddress().String() + receiver = s.NevermindChain.SenderAccount.GetAddress().String() senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) // Register uosmo pair - pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), osmoMeta) + pair, err = s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), osmoMeta) s.Require().NoError(err) }) It("should transfer and convert uosmo to tokens", func() { // Check receiver's balance for IBC and ERC-20 before transfer. Should be zero - balanceTokenBefore := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenBefore := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(int64(0), balanceTokenBefore.Int64()) - ibcOsmoBalanceBefore := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmoBalanceBefore := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcOsmoBalanceBefore.Amount.Int64()) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Send coins - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") // Check ERC20 balances - balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(amount, balanceTokenAfter.Int64()) // Check IBC uosmo coin balance - should be zero - ibcOsmoBalanceAfter := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmoBalanceAfter := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcOsmoBalanceAfter.Amount.Int64()) }) It("should transfer and not convert unregistered coin (uatom)", func() { sender = s.IBCCosmosChain.SenderAccount.GetAddress().String() // check balance before transfer is 0 - ibcAtomBalanceBefore := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UatomIbcdenom) + ibcAtomBalanceBefore := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UatomIbcdenom) s.Require().Equal(int64(0), ibcAtomBalanceBefore.Amount.Int64()) - s.EvermintChain.Coordinator.CommitBlock() - s.SendAndReceiveMessage(s.pathCosmosEvermint, s.IBCCosmosChain, "uatom", amount, sender, receiver, 1, "") + s.NevermindChain.Coordinator.CommitBlock() + s.SendAndReceiveMessage(s.pathCosmosNevermind, s.IBCCosmosChain, "uatom", amount, sender, receiver, 1, "") // check balance after transfer - ibcAtomBalanceAfter := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UatomIbcdenom) + ibcAtomBalanceAfter := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UatomIbcdenom) s.Require().Equal(amount, ibcAtomBalanceAfter.Amount.Int64()) }) It("should transfer and not convert "+constants.BaseDenom, func() { // Register native coin in ERC-20 keeper to validate it is not converting the coins when receiving native coin thru IBC - pair, err := s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), nativeCoinMeta) + pair, err := s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), nativeCoinMeta) s.Require().NoError(err) - nativeCoinInitialBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, constants.BaseDenom) + nativeCoinInitialBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, constants.BaseDenom) - // 1. Send native coin from Evermint to Osmosis - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.EvermintChain, constants.BaseDenom, amount, receiver, sender, 1, "") + // 1. Send native coin from Nevermind to Osmosis + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.NevermindChain, constants.BaseDenom, amount, receiver, sender, 1, "") - nativeCoinAfterBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, constants.BaseDenom) + nativeCoinAfterBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, constants.BaseDenom) s.Require().Equal(nativeCoinInitialBalance.Amount.Sub(math.NewInt(amount)).Sub(sendAndReceiveMsgFee), nativeCoinAfterBalance.Amount) // check ibc native coin balance on Osmosis nativeCoinIBCBalanceBefore := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, teststypes.NativeCoinIbcdenom) s.Require().Equal(amount, nativeCoinIBCBalanceBefore.Amount.Int64()) - // 2. Send native coin as IBC coins from Osmosis to Evermint + // 2. Send native coin as IBC coins from Osmosis to Nevermind ibcCoinMeta := fmt.Sprintf("%s/%s", teststypes.NativeCoinDenomtrace.Path, teststypes.NativeCoinDenomtrace.BaseDenom) - s.SendBackCoins(s.pathOsmosisEvermint, s.IBCOsmosisChain, teststypes.NativeCoinIbcdenom, amount, sender, receiver, 1, ibcCoinMeta) + s.SendBackCoins(s.pathOsmosisNevermind, s.IBCOsmosisChain, teststypes.NativeCoinIbcdenom, amount, sender, receiver, 1, ibcCoinMeta) // check ibc native coin balance on Osmosis - should be zero nativeCoinIBCSenderFinalBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, teststypes.NativeCoinIbcdenom) s.Require().Equal(int64(0), nativeCoinIBCSenderFinalBalance.Amount.Int64()) // check native coin balance after transfer - should be equal to initial balance - nativeCoinFinalBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, constants.BaseDenom) + nativeCoinFinalBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, constants.BaseDenom) totalFees := sendBackCoinsFee.Add(sendAndReceiveMsgFee) s.Require().Equal(nativeCoinInitialBalance.Amount.Sub(totalFees), nativeCoinFinalBalance.Amount) // check IBC Coin balance - should be zero - ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) + ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) s.Require().Equal(int64(0), ibcCoinsBalance.Amount.Int64()) // Check ERC20 balances - should be zero - balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(int64(0), balanceTokenAfter.Int64()) }) It("should transfer and convert original erc20", func() { uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, "uosmo") - // 1. Send 'uosmo' from Osmosis to Evermint - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") + // 1. Send 'uosmo' from Osmosis to Nevermind + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") // validate 'uosmo' was transferred successfully and converted to ERC20 - balanceERC20Token := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceERC20Token := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(amount, balanceERC20Token.Int64()) - // 2. Transfer back the erc20 from Evermint to Osmosis + // 2. Transfer back the erc20 from Nevermind to Osmosis ibcCoinMeta := fmt.Sprintf("%s/%s", teststypes.UosmoDenomtrace.Path, teststypes.UosmoDenomtrace.BaseDenom) - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, types.ModuleName+"/"+pair.GetERC20Contract().String(), amount, receiver, sender, 1, ibcCoinMeta) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, types.ModuleName+"/"+pair.GetERC20Contract().String(), amount, receiver, sender, 1, ibcCoinMeta) // after transfer, ERC-20 token balance should be zero - balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(int64(0), balanceTokenAfter.Int64()) // check IBC Coin balance - should be zero - ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcCoinsBalance.Amount.Int64()) // Final balance on Osmosis should be equal to initial balance @@ -219,28 +219,28 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() // receiver address is on Osmosis Chain also, - // but funds are transferred to this address in Evermint chain + // but funds are transferred to this address in Nevermind chain receiver = sender senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) // Register uosmo pair - pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), osmoMeta) + pair, err = s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), osmoMeta) s.Require().NoError(err) }) It("should recover and not convert uosmo to tokens", func() { uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, "uosmo") - // Send 'uosmo' to Osmosis address in Evermint Chain (locked funds) + // Send 'uosmo' to Osmosis address in Nevermind Chain (locked funds) // sender_addr == receiver_addr - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") - timeout := uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") + timeout := uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) s.IBCOsmosisChain.Coordinator.CommitNBlocks(s.IBCOsmosisChain, 10) @@ -248,11 +248,11 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { // in the Osmosis Chain // ERC-20 balance should be zero - balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(int64(0), balanceTokenAfter.Int64()) // IBC coin balance should be zero - ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcCoinsBalance.Amount.Int64()) // validate that Osmosis address final balance == initial balance @@ -263,66 +263,66 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { Describe("Performing claims with registered coin", func() { BeforeEach(func() { - s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), types.DefaultParams()) //nolint:errcheck + s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), types.DefaultParams()) //nolint:errcheck sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() // receiver address is on Osmosis Chain also, - // but funds are transferred to this address in Evermint chain - receiver = s.EvermintChain.SenderAccount.GetAddress().String() + // but funds are transferred to this address in Nevermind chain + receiver = s.NevermindChain.SenderAccount.GetAddress().String() senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) // Register uosmo pair var err error - pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), osmoMeta) + pair, err = s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), osmoMeta) s.Require().NoError(err) - // Authorize channel-0 for claims (Evermint-Osmosis) - params := s.app.ClaimsKeeper.GetParams(s.EvermintChain.GetContext()) + // Authorize channel-0 for claims (Nevermind-Osmosis) + params := s.app.ClaimsKeeper.GetParams(s.NevermindChain.GetContext()) params.AuthorizedChannels = []string{ "channel-0", } - s.app.ClaimsKeeper.SetParams(s.EvermintChain.GetContext(), params) //nolint:errcheck + s.app.ClaimsKeeper.SetParams(s.NevermindChain.GetContext(), params) //nolint:errcheck }) It("it should perform the claim and convert the received tokens", func() { // Register claims record initialClaimAmount := sdk.NewInt(100) claimableAmount := sdk.NewInt(25) - s.app.ClaimsKeeper.SetClaimsRecord(s.EvermintChain.GetContext(), senderAcc, claimstypes.ClaimsRecord{ + s.app.ClaimsKeeper.SetClaimsRecord(s.NevermindChain.GetContext(), senderAcc, claimstypes.ClaimsRecord{ InitialClaimableAmount: initialClaimAmount, ActionsCompleted: []bool{true, true, true, false}, }) // escrow coins in module coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, claimableAmount)) - err := testutil.FundModuleAccount(s.EvermintChain.GetContext(), s.app.BankKeeper, claimstypes.ModuleName, coins) + err := testutil.FundModuleAccount(s.NevermindChain.GetContext(), s.app.BankKeeper, claimstypes.ModuleName, coins) s.Require().NoError(err) - receiverInitialNativeCoinBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, constants.BaseDenom) + receiverInitialNativeCoinBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, constants.BaseDenom) uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, "uosmo") - // Send 'uosmo' from Osmosis address with claims to Evermint address + // Send 'uosmo' from Osmosis address with claims to Nevermind address // send the corresponding amount to trigger the claim amount, _ := strconv.ParseInt(claimstypes.IBCTriggerAmt, 10, 64) - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, sender, receiver, 1, "") // should trigger claims logic and send native coin from claims to receiver // ERC-20 balance should be the transferred amount - balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) + balanceTokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(receiverAcc.Bytes())) s.Require().Equal(amount, balanceTokenAfter.Int64()) // IBC coin balance should be zero - ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcCoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), ibcCoinsBalance.Amount.Int64()) // validate that Osmosis address balance is correct uosmoFinalBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, "uosmo") s.Require().Equal(uosmoInitialBalance.Amount.Int64()-amount, uosmoFinalBalance.Amount.Int64()) - // validate that Receiver address on Evermint got the claims tokens - receiverFinalNativeCoinBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, constants.BaseDenom) + // validate that Receiver address on Nevermind got the claims tokens + receiverFinalNativeCoinBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, constants.BaseDenom) s.Require().Equal(receiverInitialNativeCoinBalance.Amount.Add(claimableAmount).Sub(sendBackCoinsFee), receiverFinalNativeCoinBalance.Amount) }) @@ -331,18 +331,18 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BeforeEach(func() { //nolint:dupl erc20params := types.DefaultParams() erc20params.EnableErc20 = true - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - sender = s.EvermintChain.SenderAccount.GetAddress().String() + sender = s.NevermindChain.SenderAccount.GetAddress().String() receiverAcc = sdk.MustAccAddressFromBech32(receiver) senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) - pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvermintChain.GetContext(), addr) + pair, err = s.app.Erc20Keeper.RegisterERC20(s.NevermindChain.GetContext(), addr) s.Require().NoError(err) erc20Denomtrace = transfertypes.DenomTrace{ @@ -350,14 +350,14 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { BaseDenom: pair.Denom, } - s.EvermintChain.SenderAccount.SetSequence(s.EvermintChain.SenderAccount.GetSequence() + 1) //nolint:errcheck + s.NevermindChain.SenderAccount.SetSequence(s.NevermindChain.SenderAccount.GetSequence() + 1) //nolint:errcheck }) It("should convert erc20 ibc voucher to original erc20", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // Convert half of the available tokens @@ -371,38 +371,38 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { err = msgConvertERC20.ValidateBasic() s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertERC20) + _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertERC20) s.Require().NoError(err) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(int64(0), balanceToken.Int64()) // IBC coin balance should be amount - erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(amount, erc20CoinsBalance.Amount.Int64()) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Attempt to send erc20 into ibc, should send without conversion - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) s.IBCOsmosisChain.Coordinator.CommitBlock() // Check balance on the Osmosis chain erc20IBCBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, erc20Denomtrace.IBCDenom()) s.Require().Equal(amount, erc20IBCBalance.Amount.Int64()) - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) }) It("should convert full available balance of erc20 coin to original erc20 token", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // Convert half of the available tokens @@ -416,70 +416,70 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { err = msgConvertERC20.ValidateBasic() s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertERC20) + _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertERC20) s.Require().NoError(err) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(int64(0), balanceToken.Int64()) // erc20 coin balance should be amount - erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(amount, erc20CoinsBalance.Amount.Int64()) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Attempt to send erc20 into ibc, should send without conversion - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount/2, sender, receiver, 1, pair.Denom) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount/2, sender, receiver, 1, pair.Denom) s.IBCOsmosisChain.Coordinator.CommitBlock() // Check balance on the Osmosis chain erc20IBCBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, erc20Denomtrace.IBCDenom()) s.Require().Equal(amount/2, erc20IBCBalance.Amount.Int64()) - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount/2, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount/2, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // IBC coin balance should be zero - erc20CoinsBalance = s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance = s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(int64(0), erc20CoinsBalance.Amount.Int64()) }) It("send native ERC-20 to osmosis, when sending back IBC coins should convert full balance back to erc20 token", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Attempt to send 1/2 of erc20 balance via ibc, should convert erc20 tokens to ibc coins and send the converted balance via IBC - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, types.ModuleName+"/"+pair.GetERC20Contract().String(), amount/2, sender, receiver, 1, "") + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, types.ModuleName+"/"+pair.GetERC20Contract().String(), amount/2, sender, receiver, 1, "") s.IBCOsmosisChain.Coordinator.CommitBlock() // IBC coin balance should be zero - erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(int64(0), erc20CoinsBalance.Amount.Int64()) // Check updated token Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount/2, balanceToken.Int64()) // Check balance on the Osmosis chain erc20IBCBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, erc20Denomtrace.IBCDenom()) s.Require().Equal(amount/2, erc20IBCBalance.Amount.Int64()) - // send back the IBC coins from Osmosis to Evermint - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount/2, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) + // send back the IBC coins from Osmosis to Nevermind + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, erc20Denomtrace.IBCDenom(), amount/2, receiver, sender, 1, erc20Denomtrace.GetFullDenomPath()) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // IBC coin balance should be zero - erc20CoinsBalance = s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance = s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(int64(0), erc20CoinsBalance.Amount.Int64()) }) }) @@ -520,42 +520,42 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { BeforeEach(func() { erc20params := types.DefaultParams() erc20params.EnableErc20 = true - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - sender = s.EvermintChain.SenderAccount.GetAddress().String() + sender = s.NevermindChain.SenderAccount.GetAddress().String() receiverAcc = sdk.MustAccAddressFromBech32(receiver) senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) - pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvermintChain.GetContext(), addr) + pair, err = s.app.Erc20Keeper.RegisterERC20(s.NevermindChain.GetContext(), addr) s.Require().NoError(err) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() erc20params.EnableErc20 = false - err = s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err = s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) }) It("should fail transfer and not convert to IBC", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) - path := s.pathOsmosisEvermint + path := s.pathOsmosisNevermind originEndpoint := path.EndpointB destEndpoint := path.EndpointA - originChain := s.EvermintChain + originChain := s.NevermindChain coin := pair.Denom transfer := transfertypes.NewFungibleTokenPacketData(pair.Denom, strconv.Itoa(int(amount*2)), sender, receiver, "") transferMsg := transfertypes.NewMsgTransfer(originEndpoint.ChannelConfig.PortID, originEndpoint.ChannelID, sdk.NewCoin(coin, sdk.NewInt(amount*2)), sender, receiver, timeoutHeight, 0, "") originChain.Coordinator.UpdateTimeForChain(originChain) - denom := originChain.App.(*app.Evermint).StakingKeeper.BondDenom(originChain.GetContext()) + denom := originChain.App.(*app.Nevermind).StakingKeeper.BondDenom(originChain.GetContext()) fee := sdk.Coins{sdk.NewInt64Coin(denom, ibctesting.DefaultFeeAmt)} _, _, err = ibctesting.SignAndDeliver( @@ -584,7 +584,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { s.Require().Error(err) // Check Balance didnt change - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) }) }) @@ -592,18 +592,18 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { BeforeEach(func() { //nolint:dupl erc20params := types.DefaultParams() erc20params.EnableErc20 = true - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - sender = s.EvermintChain.SenderAccount.GetAddress().String() + sender = s.NevermindChain.SenderAccount.GetAddress().String() receiverAcc = sdk.MustAccAddressFromBech32(receiver) senderAcc = sdk.MustAccAddressFromBech32(sender) // Register ERC20 pair addr, err := s.DeployContractToChain("testcoin", "tt", 18) s.Require().NoError(err) - pair, err = s.app.Erc20Keeper.RegisterERC20(s.EvermintChain.GetContext(), addr) + pair, err = s.app.Erc20Keeper.RegisterERC20(s.NevermindChain.GetContext(), addr) s.Require().NoError(err) erc20Denomtrace = transfertypes.DenomTrace{ @@ -611,14 +611,14 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { BaseDenom: pair.Denom, } - s.EvermintChain.SenderAccount.SetSequence(s.EvermintChain.SenderAccount.GetSequence() + 1) //nolint:errcheck + s.NevermindChain.SenderAccount.SetSequence(s.NevermindChain.SenderAccount.GetSequence() + 1) //nolint:errcheck }) It("should transfer available balance", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount*2)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount*2)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount*2, balanceToken.Int64()) // Convert half of the available tokens @@ -632,45 +632,45 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { err = msgConvertERC20.ValidateBasic() s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertERC20) + _, err = s.app.Erc20Keeper.ConvertERC20(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertERC20) s.Require().NoError(err) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // IBC coin balance should be amount - erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, pair.Denom) + erc20CoinsBalance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, pair.Denom) s.Require().Equal(amount, erc20CoinsBalance.Amount.Int64()) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Attempt to send erc20 into ibc, should send without conversion - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) s.IBCOsmosisChain.Coordinator.CommitBlock() // Check balance on the Osmosis chain erc20IBCBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, erc20Denomtrace.IBCDenom()) s.Require().Equal(amount, erc20IBCBalance.Amount.Int64()) // Check Balance - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) }) It("should convert and transfer if no ibc balance", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // Attempt to send erc20 into ibc, should automatically convert - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount, sender, receiver, 1, pair.Denom) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Check balance of erc20 depleted - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(int64(0), balanceToken.Int64()) // Check balance received on the Osmosis chain @@ -679,23 +679,23 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { }) It("should fail if balance is not enough", func() { // Mint tokens and send to receiver - _, err := s.app.Erc20Keeper.CallEVM(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) + _, err := s.app.Erc20Keeper.CallEVM(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, common.BytesToAddress(senderAcc.Bytes()), pair.GetERC20Contract(), true, "mint", common.BytesToAddress(senderAcc.Bytes()), big.NewInt(amount)) s.Require().NoError(err) // Check Balance - balanceToken := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) // Attempt to send that will fail because balance is not enough - path := s.pathOsmosisEvermint + path := s.pathOsmosisNevermind originEndpoint := path.EndpointB - originChain := s.EvermintChain + originChain := s.NevermindChain coin := pair.Denom transferMsg := transfertypes.NewMsgTransfer(originEndpoint.ChannelConfig.PortID, originEndpoint.ChannelID, sdk.NewCoin(coin, sdk.NewInt(amount*2)), sender, receiver, timeoutHeight, 0, "") originChain.Coordinator.UpdateTimeForChain(originChain) - denom := originChain.App.(*app.Evermint).StakingKeeper.BondDenom(originChain.GetContext()) + denom := originChain.App.(*app.Nevermind).StakingKeeper.BondDenom(originChain.GetContext()) fee := sdk.Coins{sdk.NewInt64Coin(denom, ibctesting.DefaultFeeAmt)} _, _, err = ibctesting.SignAndDeliver( @@ -719,37 +719,37 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { // Check Balance didnt change ibcOsmosBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, erc20Denomtrace.IBCDenom()) s.Require().Equal(int64(0), ibcOsmosBalance.Amount.Int64()) - balanceToken = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceToken = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceToken.Int64()) }) }) Describe("registered coin", func() { BeforeEach(func() { receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - sender = s.EvermintChain.SenderAccount.GetAddress().String() + sender = s.NevermindChain.SenderAccount.GetAddress().String() receiverAcc = sdk.MustAccAddressFromBech32(receiver) senderAcc = sdk.MustAccAddressFromBech32(sender) erc20params := types.DefaultParams() erc20params.EnableErc20 = false - err := s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err := s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) - // Send from osmosis to Evermint - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", amount, receiver, sender, 1, "") - s.EvermintChain.Coordinator.CommitBlock(s.EvermintChain) + // Send from osmosis to Nevermind + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", amount, receiver, sender, 1, "") + s.NevermindChain.Coordinator.CommitBlock(s.NevermindChain) erc20params.EnableErc20 = true - err = s.app.Erc20Keeper.SetParams(s.EvermintChain.GetContext(), erc20params) + err = s.app.Erc20Keeper.SetParams(s.NevermindChain.GetContext(), erc20params) s.Require().NoError(err) // Register uosmo pair - pair, err = s.app.Erc20Keeper.RegisterCoin(s.EvermintChain.GetContext(), osmoMeta) + pair, err = s.app.Erc20Keeper.RegisterCoin(s.NevermindChain.GetContext(), osmoMeta) s.Require().NoError(err) }) It("should convert erc20 to ibc vouched and transfer", func() { uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") - balance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(amount, balance.Amount.Int64()) // Convert ibc vouchers to erc20 tokens @@ -762,13 +762,13 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { err := msgConvertCoin.ValidateBasic() s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertCoin) + _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertCoin) s.Require().NoError(err) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Attempt to send erc20 tokens to osmosis and convert automatically - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount, sender, receiver, 1, teststypes.UosmoDenomtrace.GetFullDenomPath()) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount, sender, receiver, 1, teststypes.UosmoDenomtrace.GetFullDenomPath()) s.IBCOsmosisChain.Coordinator.CommitBlock() // Check balance on the Osmosis chain uosmoBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") @@ -777,11 +777,11 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { It("should transfer available balance", func() { uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") - balance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(amount, balance.Amount.Int64()) // Attempt to send erc20 tokens to osmosis and convert automatically - s.SendBackCoins(s.pathOsmosisEvermint, s.EvermintChain, pair.Denom, amount, sender, receiver, 1, teststypes.UosmoDenomtrace.GetFullDenomPath()) + s.SendBackCoins(s.pathOsmosisNevermind, s.NevermindChain, pair.Denom, amount, sender, receiver, 1, teststypes.UosmoDenomtrace.GetFullDenomPath()) s.IBCOsmosisChain.Coordinator.CommitBlock() // Check balance on the Osmosis chain uosmoBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") @@ -789,7 +789,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { }) It("should timeout and reconvert coins", func() { - balance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(amount, balance.Amount.Int64()) // Convert ibc vouchers to erc20 tokens @@ -802,25 +802,25 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertCoin) + _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertCoin) s.Require().NoError(err) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Send message that will timeout - path := s.pathOsmosisEvermint + path := s.pathOsmosisNevermind originEndpoint := path.EndpointB destEndpoint := path.EndpointA - originChain := s.EvermintChain + originChain := s.NevermindChain coin := pair.Denom - currentTime := s.EvermintChain.Coordinator.CurrentTime + currentTime := s.NevermindChain.Coordinator.CurrentTime timeout := uint64(currentTime.Unix() * 1000000000) transferMsg := transfertypes.NewMsgTransfer(originEndpoint.ChannelConfig.PortID, originEndpoint.ChannelID, sdk.NewCoin(coin, sdk.NewInt(amount)), sender, receiver, timeoutHeight, timeout, "") originChain.Coordinator.UpdateTimeForChain(originChain) - denom := originChain.App.(*app.Evermint).StakingKeeper.BondDenom(originChain.GetContext()) + denom := originChain.App.(*app.Nevermind).StakingKeeper.BondDenom(originChain.GetContext()) fee := sdk.Coins{sdk.NewInt64Coin(denom, ibctesting.DefaultFeeAmt)} _, _, err = ibctesting.SignAndDeliver( @@ -837,7 +837,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { s.Require().NoError(err) // check ERC20 balance was converted to ibc and sent - balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(int64(0), balanceERC20TokenAfter.Int64()) // NextBlock calls app.Commit() @@ -864,10 +864,10 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { originChain.NextBlock() // Check that balance was reconverted - balance = s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance = s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), balance.Amount.Int64()) - balanceERC20TokenAfter = s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceERC20TokenAfter = s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceERC20TokenAfter.Int64()) }) It("should error and reconvert coins", func() { @@ -875,7 +875,7 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { receiver = receiverAcc.String() s.IBCOsmosisChain.GetSimApp().BankKeeper.BlockedAddr(receiverAcc) - balance := s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance := s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(amount, balance.Amount.Int64()) // Convert ibc vouchers to erc20 tokens @@ -888,16 +888,16 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { s.Require().NoError(err) // Use MsgConvertERC20 to convert the ERC20 to a Cosmos IBC Coin - _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.EvermintChain.GetContext()), msgConvertCoin) + _, err = s.app.Erc20Keeper.ConvertCoin(sdk.WrapSDKContext(s.NevermindChain.GetContext()), msgConvertCoin) s.Require().NoError(err) - s.EvermintChain.Coordinator.CommitBlock() + s.NevermindChain.Coordinator.CommitBlock() // Send message that will timeout - path := s.pathOsmosisEvermint + path := s.pathOsmosisNevermind originEndpoint := path.EndpointB destEndpoint := path.EndpointA - originChain := s.EvermintChain + originChain := s.NevermindChain coin := pair.Denom timeout := uint64(0) transferMsg := transfertypes.NewMsgTransfer(originEndpoint.ChannelConfig.PortID, originEndpoint.ChannelID, @@ -914,10 +914,10 @@ var _ = Describe("Convert outgoing ERC20 to IBC", Ordered, func() { err = path.RelayPacket(packet) s.Require().NoError(err) - balance = s.app.BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) + balance = s.app.BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UosmoIbcdenom) s.Require().Equal(int64(0), balance.Amount.Int64()) - balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.EvermintChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) + balanceERC20TokenAfter := s.app.Erc20Keeper.BalanceOf(s.NevermindChain.GetContext(), contracts.ERC20MinterBurnerDecimalsContract.ABI, pair.GetERC20Contract(), common.BytesToAddress(senderAcc.Bytes())) s.Require().Equal(amount, balanceERC20TokenAfter.Int64()) }) }) diff --git a/x/erc20/keeper/ibc_callbacks_test.go b/x/erc20/keeper/ibc_callbacks_test.go index 305bbbd9de..ef5653b263 100644 --- a/x/erc20/keeper/ibc_callbacks_test.go +++ b/x/erc20/keeper/ibc_callbacks_test.go @@ -3,18 +3,18 @@ package keeper_test import ( "errors" "fmt" - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "math/big" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -25,11 +25,11 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v6/testing" ibcmock "github.com/cosmos/ibc-go/v6/testing/mock" - "github.com/EscanBE/evermint/v12/contracts" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var erc20Denom = "erc20/0xdac17f958d2ee523a2206206994597c13d831ec7" @@ -38,20 +38,20 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { // secp256k1 account secpPk := secp256k1.GenPrivKey() secpAddr := sdk.AccAddress(secpPk.PubKey().Address()) - secpAddrEvermint := secpAddr.String() + secpAddrNevermind := secpAddr.String() secpAddrCosmos := sdk.MustBech32ifyAddressBytes(sdk.Bech32MainPrefix, secpAddr) // ethsecp256k1 account ethPk, err := ethsecp256k1.GenerateKey() suite.Require().Nil(err) ethsecpAddr := sdk.AccAddress(ethPk.PubKey().Address()) - ethsecpAddrEvermint := sdk.AccAddress(ethPk.PubKey().Address()).String() + ethsecpAddrNevermind := sdk.AccAddress(ethPk.PubKey().Address()).String() ethsecpAddrCosmos := sdk.MustBech32ifyAddressBytes(sdk.Bech32MainPrefix, ethsecpAddr) - // Setup Cosmos <=> Evermint IBC relayer + // Setup Cosmos <=> Nevermind IBC relayer sourceChannel := "channel-292" - evermintChannel := claimstypes.DefaultAuthorizedChannels[1] - path := fmt.Sprintf("%s/%s", transfertypes.PortID, evermintChannel) + nevermindChannel := claimstypes.DefaultAuthorizedChannels[1] + path := fmt.Sprintf("%s/%s", transfertypes.PortID, nevermindChannel) timeoutHeight := clienttypes.NewHeight(0, 100) disabledTimeoutTimestamp := uint64(0) @@ -91,9 +91,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "no-op - erc20 module param disabled", malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrEvermint, ethsecpAddrCosmos, "") + transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrNevermind, ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, disableERC20: true, @@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { malleate: func() { transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", "invalid", ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: false, @@ -120,7 +120,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { malleate: func() { transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", "badba1sv9m0g7ycejwr3s369km58h5qe7xj77hvcxrms", ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: false, @@ -131,9 +131,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "error - invalid recipient (bad address)", malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrEvermint, "badbadhf0468jjpe6m6vx38s97z2qqe8ldu0njdyf625", "") + transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrNevermind, "badbadhf0468jjpe6m6vx38s97z2qqe8ldu0njdyf625", "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: false, @@ -144,7 +144,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "no-op - sender == receiver, not from Evm channel", malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrEvermint, ethsecpAddrCosmos, "") + transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", ethsecpAddrNevermind, ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, "channel-100", timeoutHeight, 0) }, @@ -160,7 +160,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { secpAddr = suite.app.AccountKeeper.GetModuleAccount(suite.ctx, "erc20").GetAddress() transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", secpAddrCosmos, secpAddr.String(), "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, ackSuccess: true, receiver: secpAddr, @@ -174,9 +174,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { // base denom should be prefixed sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + s.app.StakingKeeper.BondDenom(suite.ctx) - transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "100", secpAddrCosmos, ethsecpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "100", secpAddrCosmos, ethsecpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, ackSuccess: true, receiver: ethsecpAddr, @@ -187,9 +187,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "no-op - pair is not registered", malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData(erc20Denom, "100", secpAddrCosmos, ethsecpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(erc20Denom, "100", secpAddrCosmos, ethsecpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, ackSuccess: true, receiver: ethsecpAddr, @@ -204,9 +204,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + registeredDenom otherSecpNativeAddr := sdk.AccAddress(pk1.PubKey().Address()).String() - transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "500", otherSecpNativeAddr, ethsecpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "500", otherSecpNativeAddr, ethsecpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, ackSuccess: true, receiver: ethsecpAddr, @@ -222,9 +222,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "no-op - sender == receiver and is not from evm chain", // getting failed to escrow coins - need to escrow coins malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(registeredDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: true, @@ -235,9 +235,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { name: "error - invalid denomination", // should fall as unregistered and not transfer any coins, but ack is Success malleate: func() { - transfer := transfertypes.NewFungibleTokenPacketData("b/d//s/ss/", "100", ethsecpAddrEvermint, ethsecpAddrCosmos, "") + transfer := transfertypes.NewFungibleTokenPacketData("b/d//s/ss/", "100", ethsecpAddrNevermind, ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 1, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: true, @@ -249,14 +249,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { name: "ibc conversion - sender == receiver and from evm chain", malleate: func() { claimsParams := suite.app.ClaimsKeeper.GetParams(suite.ctx) - claimsParams.EVMChannels = []string{evermintChannel} + claimsParams.EVMChannels = []string{nevermindChannel} suite.app.ClaimsKeeper.SetParams(suite.ctx, claimsParams) //nolint:errcheck sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + registeredDenom - transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "100", secpAddrCosmos, secpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "100", secpAddrCosmos, secpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: secpAddr, ackSuccess: true, @@ -275,9 +275,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + registeredDenom otherSecpNativeAddr := sdk.AccAddress(pk1.PubKey().Address()).String() - transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "500", otherSecpNativeAddr, ethsecpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "500", otherSecpNativeAddr, ethsecpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: ethsecpAddr, ackSuccess: true, @@ -300,9 +300,9 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { sourcePrefix := transfertypes.GetDenomPrefix(transfertypes.PortID, sourceChannel) prefixedDenom := sourcePrefix + registeredDenom - transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "1000", secpAddrCosmos, ethsecpAddrEvermint, "") + transfer := transfertypes.NewFungibleTokenPacketData(prefixedDenom, "1000", secpAddrCosmos, ethsecpAddrNevermind, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, receiver: ethsecpAddr, ackSuccess: true, @@ -336,10 +336,10 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { Counterparty: channeltypes.NewCounterparty(transfertypes.PortID, sourceChannel), ConnectionHops: []string{sourceChannel}, } - suite.app.IBCKeeper.ChannelKeeper.SetChannel(suite.ctx, transfertypes.PortID, evermintChannel, channel) + suite.app.IBCKeeper.ChannelKeeper.SetChannel(suite.ctx, transfertypes.PortID, nevermindChannel, channel) // Set Next Sequence Send - suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, transfertypes.PortID, evermintChannel, 1) + suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, transfertypes.PortID, nevermindChannel, 1) suite.app.Erc20Keeper = keeper.NewKeeper( suite.app.GetKey(types.StoreKey), @@ -396,7 +396,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { } func (suite *KeeperTestSuite) TestConvertCoinToERC20FromPacket() { - senderAddr := marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7") + senderAddr := "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw" testCases := []struct { name string @@ -615,7 +615,7 @@ func (suite *KeeperTestSuite) TestOnAcknowledgementPacket() { } func (suite *KeeperTestSuite) TestOnTimeoutPacket() { - senderAddr := marker.ReplaceAbleAddress("evm1x2w87cvt5mqjncav4lxy8yfreynn273xe08fl7") + senderAddr := "ever1x2w87cvt5mqjncav4lxy8yfreynn273x45jnsw" testCases := []struct { name string diff --git a/x/erc20/keeper/integration_test.go b/x/erc20/keeper/integration_test.go index 4806af756f..9f557004cd 100644 --- a/x/erc20/keeper/integration_test.go +++ b/x/erc20/keeper/integration_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "time" @@ -16,10 +16,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) var _ = Describe("Performing EVM transactions", Ordered, func() { @@ -364,17 +364,17 @@ var _ = Describe("ERC20:", Ordered, func() { }) }) -func submitRegisterCoinProposal(ctx sdk.Context, chainApp *app.Evermint, pk *ethsecp256k1.PrivKey, metadata []banktypes.Metadata) (id uint64, err error) { +func submitRegisterCoinProposal(ctx sdk.Context, chainApp *app.Nevermind, pk *ethsecp256k1.PrivKey, metadata []banktypes.Metadata) (id uint64, err error) { content := types.NewRegisterCoinProposal("test Coin", "foo", metadata...) return testutil.SubmitProposal(ctx, chainApp, pk, content, 8) } -func submitRegisterERC20Proposal(ctx sdk.Context, chainApp *app.Evermint, pk *ethsecp256k1.PrivKey, addrs []string) (id uint64, err error) { +func submitRegisterERC20Proposal(ctx sdk.Context, chainApp *app.Nevermind, pk *ethsecp256k1.PrivKey, addrs []string) (id uint64, err error) { content := types.NewRegisterERC20Proposal("test token", "foo", addrs...) return testutil.SubmitProposal(ctx, chainApp, pk, content, 8) } -func convertCoin(ctx sdk.Context, chainApp *app.Evermint, pk *ethsecp256k1.PrivKey, coin sdk.Coin) { +func convertCoin(ctx sdk.Context, chainApp *app.Nevermind, pk *ethsecp256k1.PrivKey, coin sdk.Coin) { addrBz := pk.PubKey().Address().Bytes() convertCoinMsg := types.NewMsgConvertCoin(coin, common.BytesToAddress(addrBz), sdk.AccAddress(addrBz)) @@ -384,7 +384,7 @@ func convertCoin(ctx sdk.Context, chainApp *app.Evermint, pk *ethsecp256k1.PrivK Expect(res.IsOK()).To(BeTrue(), "failed to convert coin: %s", res.Log) } -func convertERC20(ctx sdk.Context, chainApp *app.Evermint, pk *ethsecp256k1.PrivKey, amt math.Int, contract common.Address) { +func convertERC20(ctx sdk.Context, chainApp *app.Nevermind, pk *ethsecp256k1.PrivKey, amt math.Int, contract common.Address) { addrBz := pk.PubKey().Address().Bytes() convertERC20Msg := types.NewMsgConvertERC20(amt, sdk.AccAddress(addrBz), contract, common.BytesToAddress(addrBz)) diff --git a/x/erc20/keeper/keeper.go b/x/erc20/keeper/keeper.go index 44906428b6..1f989ceb8b 100644 --- a/x/erc20/keeper/keeper.go +++ b/x/erc20/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // Keeper of this module maintains collections of erc20. diff --git a/x/erc20/keeper/migrations.go b/x/erc20/keeper/migrations.go index bfca84009d..fafd7e5fdb 100644 --- a/x/erc20/keeper/migrations.go +++ b/x/erc20/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v3 "github.com/EscanBE/evermint/v12/x/erc20/migrations/v3" - "github.com/EscanBE/evermint/v12/x/erc20/types" + v3 "github.com/VictorTrustyDev/nevermind/v12/x/erc20/migrations/v3" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/erc20/keeper/migrations_test.go b/x/erc20/keeper/migrations_test.go index be7fc74248..b7d2492a55 100644 --- a/x/erc20/keeper/migrations_test.go +++ b/x/erc20/keeper/migrations_test.go @@ -1,11 +1,11 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - erc20keeper "github.com/EscanBE/evermint/v12/x/erc20/keeper" - v3types "github.com/EscanBE/evermint/v12/x/erc20/migrations/v3/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + erc20keeper "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + v3types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/migrations/v3/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/erc20/keeper/mint.go b/x/erc20/keeper/mint.go index 512361423b..d59c392b66 100644 --- a/x/erc20/keeper/mint.go +++ b/x/erc20/keeper/mint.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // MintingEnabled checks that: diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index c2b80f52e8..b77a3f50d4 100644 --- a/x/erc20/keeper/mint_test.go +++ b/x/erc20/keeper/mint_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) func (suite *KeeperTestSuite) TestMintingEnabled() { diff --git a/x/erc20/keeper/mock_test.go b/x/erc20/keeper/mock_test.go index e3a70fd493..80fbfb4810 100644 --- a/x/erc20/keeper/mock_test.go +++ b/x/erc20/keeper/mock_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "context" - "github.com/EscanBE/evermint/v12/x/erc20/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/erc20/keeper/msg_server.go b/x/erc20/keeper/msg_server.go index 0674d13656..d1446f5928 100644 --- a/x/erc20/keeper/msg_server.go +++ b/x/erc20/keeper/msg_server.go @@ -12,8 +12,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index 6aa767c369..ce28597441 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { diff --git a/x/erc20/keeper/params.go b/x/erc20/keeper/params.go index 3ffbd702da..a1bd621d31 100644 --- a/x/erc20/keeper/params.go +++ b/x/erc20/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/erc20/keeper/params_test.go b/x/erc20/keeper/params_test.go index cd068a410d..9edca7c393 100644 --- a/x/erc20/keeper/params_test.go +++ b/x/erc20/keeper/params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "reflect" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/erc20/keeper/proposals.go b/x/erc20/keeper/proposals.go index f28e7ac8e2..419b48c70b 100644 --- a/x/erc20/keeper/proposals.go +++ b/x/erc20/keeper/proposals.go @@ -7,7 +7,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // RegisterCoin deploys an erc20 contract and creates the token pair for the diff --git a/x/erc20/keeper/proposals_test.go b/x/erc20/keeper/proposals_test.go index a5ea13722f..ac50723e5b 100644 --- a/x/erc20/keeper/proposals_test.go +++ b/x/erc20/keeper/proposals_test.go @@ -12,12 +12,12 @@ import ( "github.com/ethereum/go-ethereum/common" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) const ( diff --git a/x/erc20/keeper/setup_test.go b/x/erc20/keeper/setup_test.go index 268eda55f9..73a0892390 100644 --- a/x/erc20/keeper/setup_test.go +++ b/x/erc20/keeper/setup_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/app" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -25,7 +25,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient address common.Address @@ -40,12 +40,12 @@ type KeeperTestSuite struct { coordinator *ibcgotesting.Coordinator // testing chains used for convenience and readability - EvermintChain *ibcgotesting.TestChain + NevermindChain *ibcgotesting.TestChain IBCOsmosisChain *ibcgotesting.TestChain IBCCosmosChain *ibcgotesting.TestChain - pathOsmosisEvermint *ibctesting.Path - pathCosmosEvermint *ibctesting.Path + pathOsmosisNevermind *ibctesting.Path + pathCosmosNevermind *ibctesting.Path pathOsmosisCosmos *ibctesting.Path suiteIBCTesting bool @@ -53,11 +53,11 @@ type KeeperTestSuite struct { var ( s *KeeperTestSuite - // sendAndReceiveMsgFee corresponds to the fees paid on Evermint chain when calling the SendAndReceive function + // sendAndReceiveMsgFee corresponds to the fees paid on Nevermind chain when calling the SendAndReceive function // This function makes 3 cosmos txs under the hood sendAndReceiveMsgFee = sdk.NewInt(ibctesting.DefaultFeeAmt * 3) - // sendBackCoinsFee corresponds to the fees paid on Evermint chain when calling the SendBackCoins function - // or calling the SendAndReceive from another chain to Evermint + // sendBackCoinsFee corresponds to the fees paid on Nevermind chain when calling the SendBackCoins function + // or calling the SendAndReceive from another chain to Nevermind // This function makes 2 cosmos txs under the hood sendBackCoinsFee = sdk.NewInt(ibctesting.DefaultFeeAmt * 2) ) diff --git a/x/erc20/keeper/token_pairs.go b/x/erc20/keeper/token_pairs.go index e4c000db11..a613a1628f 100644 --- a/x/erc20/keeper/token_pairs.go +++ b/x/erc20/keeper/token_pairs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // GetTokenPairs - get all registered token tokenPairs diff --git a/x/erc20/keeper/token_pairs_test.go b/x/erc20/keeper/token_pairs_test.go index f4583e5b8e..790052d2ae 100644 --- a/x/erc20/keeper/token_pairs_test.go +++ b/x/erc20/keeper/token_pairs_test.go @@ -5,9 +5,9 @@ import ( "github.com/ethereum/go-ethereum/common" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *KeeperTestSuite) TestGetTokenPairs() { diff --git a/x/erc20/keeper/utils_test.go b/x/erc20/keeper/utils_test.go index 26e873d568..8586b51cf8 100644 --- a/x/erc20/keeper/utils_test.go +++ b/x/erc20/keeper/utils_test.go @@ -2,26 +2,26 @@ package keeper_test import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" "strconv" "time" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - teststypes "github.com/EscanBE/evermint/v12/types/tests" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + teststypes "github.com/VictorTrustyDev/nevermind/v12/types/tests" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -137,51 +137,51 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { func (suite *KeeperTestSuite) SetupIBCTest() { // initializes 3 test chains suite.coordinator = ibctesting.NewCoordinator(suite.T(), 1, 2) - suite.EvermintChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(1)) + suite.NevermindChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(1)) suite.IBCOsmosisChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(2)) suite.IBCCosmosChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(3)) - suite.coordinator.CommitNBlocks(suite.EvermintChain, 2) + suite.coordinator.CommitNBlocks(suite.NevermindChain, 2) suite.coordinator.CommitNBlocks(suite.IBCOsmosisChain, 2) suite.coordinator.CommitNBlocks(suite.IBCCosmosChain, 2) - s.app = suite.EvermintChain.App.(*app.Evermint) - evmParams := s.app.EvmKeeper.GetParams(s.EvermintChain.GetContext()) + s.app = suite.NevermindChain.App.(*app.Nevermind) + evmParams := s.app.EvmKeeper.GetParams(s.NevermindChain.GetContext()) evmParams.EvmDenom = constants.BaseDenom - err := s.app.EvmKeeper.SetParams(s.EvermintChain.GetContext(), evmParams) + err := s.app.EvmKeeper.SetParams(s.NevermindChain.GetContext(), evmParams) suite.Require().NoError(err) - // s.app.FeeMarketKeeper.SetBaseFee(s.EvermintChain.GetContext(), big.NewInt(1)) + // s.app.FeeMarketKeeper.SetBaseFee(s.NevermindChain.GetContext(), big.NewInt(1)) // Increase max gas ibcgotestinghelpers.DefaultGenTxGas = uint64(1_000_000_000) // Set block proposer once, so its carried over on the ibc-go-testing suite - validators := s.app.StakingKeeper.GetValidators(suite.EvermintChain.GetContext(), 2) + validators := s.app.StakingKeeper.GetValidators(suite.NevermindChain.GetContext(), 2) cons, err := validators[0].GetConsAddr() suite.Require().NoError(err) - suite.EvermintChain.CurrentHeader.ProposerAddress = cons.Bytes() + suite.NevermindChain.CurrentHeader.ProposerAddress = cons.Bytes() - err = s.app.StakingKeeper.SetValidatorByConsAddr(suite.EvermintChain.GetContext(), validators[0]) + err = s.app.StakingKeeper.SetValidatorByConsAddr(suite.NevermindChain.GetContext(), validators[0]) suite.Require().NoError(err) - _, err = s.app.EvmKeeper.GetCoinbaseAddress(suite.EvermintChain.GetContext(), sdk.ConsAddress(suite.EvermintChain.CurrentHeader.ProposerAddress)) + _, err = s.app.EvmKeeper.GetCoinbaseAddress(suite.NevermindChain.GetContext(), sdk.ConsAddress(suite.NevermindChain.CurrentHeader.ProposerAddress)) suite.Require().NoError(err) // Mint coins locked on the account generated with secp. amt, ok := sdk.NewIntFromString("1000000000000000000000") suite.Require().True(ok) nativeCoin := sdk.NewCoin(constants.BaseDenom, amt) coins := sdk.NewCoins(nativeCoin) - err = s.app.BankKeeper.MintCoins(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, coins) + err = s.app.BankKeeper.MintCoins(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, coins) suite.Require().NoError(err) - err = s.app.BankKeeper.SendCoinsFromModuleToAccount(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, suite.EvermintChain.SenderAccount.GetAddress(), coins) + err = s.app.BankKeeper.SendCoinsFromModuleToAccount(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, suite.NevermindChain.SenderAccount.GetAddress(), coins) suite.Require().NoError(err) // we need some coins in the bankkeeper to be able to register the coins later coins = sdk.NewCoins(sdk.NewCoin(teststypes.UosmoIbcdenom, sdk.NewInt(100))) - err = s.app.BankKeeper.MintCoins(s.EvermintChain.GetContext(), types.ModuleName, coins) + err = s.app.BankKeeper.MintCoins(s.NevermindChain.GetContext(), types.ModuleName, coins) s.Require().NoError(err) coins = sdk.NewCoins(sdk.NewCoin(teststypes.UatomIbcdenom, sdk.NewInt(100))) - err = s.app.BankKeeper.MintCoins(s.EvermintChain.GetContext(), types.ModuleName, coins) + err = s.app.BankKeeper.MintCoins(s.NevermindChain.GetContext(), types.ModuleName, coins) s.Require().NoError(err) // Mint coins on the osmosis side which we'll use to unlock our native coin @@ -214,31 +214,31 @@ func (suite *KeeperTestSuite) SetupIBCTest() { suite.Require().NoError(err) claimparams := claimstypes.DefaultParams() - claimparams.AirdropStartTime = suite.EvermintChain.GetContext().BlockTime() + claimparams.AirdropStartTime = suite.NevermindChain.GetContext().BlockTime() claimparams.EnableClaims = true - err = s.app.ClaimsKeeper.SetParams(suite.EvermintChain.GetContext(), claimparams) + err = s.app.ClaimsKeeper.SetParams(suite.NevermindChain.GetContext(), claimparams) suite.Require().NoError(err) params := types.DefaultParams() params.EnableErc20 = true - err = s.app.Erc20Keeper.SetParams(suite.EvermintChain.GetContext(), params) + err = s.app.Erc20Keeper.SetParams(suite.NevermindChain.GetContext(), params) suite.Require().NoError(err) - suite.pathOsmosisEvermint = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.EvermintChain) // clientID, connectionID, channelID empty - suite.pathCosmosEvermint = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.EvermintChain) + suite.pathOsmosisNevermind = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.NevermindChain) // clientID, connectionID, channelID empty + suite.pathCosmosNevermind = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.NevermindChain) suite.pathOsmosisCosmos = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.IBCOsmosisChain) - ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisEvermint) // clientID, connectionID, channelID filled - ibctesting.SetupPath(suite.coordinator, suite.pathCosmosEvermint) + ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisNevermind) // clientID, connectionID, channelID filled + ibctesting.SetupPath(suite.coordinator, suite.pathCosmosNevermind) ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisCosmos) - suite.Require().Equal("07-tendermint-0", suite.pathOsmosisEvermint.EndpointA.ClientID) - suite.Require().Equal("connection-0", suite.pathOsmosisEvermint.EndpointA.ConnectionID) - suite.Require().Equal("channel-0", suite.pathOsmosisEvermint.EndpointA.ChannelID) + suite.Require().Equal("07-tendermint-0", suite.pathOsmosisNevermind.EndpointA.ClientID) + suite.Require().Equal("connection-0", suite.pathOsmosisNevermind.EndpointA.ConnectionID) + suite.Require().Equal("channel-0", suite.pathOsmosisNevermind.EndpointA.ChannelID) nativeCoin = sdk.NewCoin(constants.BaseDenom, sdk.NewInt(1000000000000000000)) coins = sdk.NewCoins(nativeCoin) - err = s.app.BankKeeper.MintCoins(suite.EvermintChain.GetContext(), types.ModuleName, coins) + err = s.app.BankKeeper.MintCoins(suite.NevermindChain.GetContext(), types.ModuleName, coins) suite.Require().NoError(err) - err = s.app.BankKeeper.SendCoinsFromModuleToModule(suite.EvermintChain.GetContext(), types.ModuleName, authtypes.FeeCollectorName, coins) + err = s.app.BankKeeper.SendCoinsFromModuleToModule(suite.NevermindChain.GetContext(), types.ModuleName, authtypes.FeeCollectorName, coins) suite.Require().NoError(err) } @@ -358,12 +358,12 @@ func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation() (common. } // DeployContractToChain deploys the ERC20MinterBurnerDecimalsContract -// to the Evermint chain (used on IBC tests) +// to the Nevermind chain (used on IBC tests) func (suite *KeeperTestSuite) DeployContractToChain(name, symbol string, decimals uint8) (common.Address, error) { return testutil.DeployContract( - s.EvermintChain.GetContext(), - s.EvermintChain.App.(*app.Evermint), - suite.EvermintChain.SenderPrivKey, + s.NevermindChain.GetContext(), + s.NevermindChain.App.(*app.Nevermind), + suite.NevermindChain.SenderPrivKey, suite.queryClientEvm, contracts.ERC20MinterBurnerDecimalsContract, name, symbol, decimals, @@ -402,7 +402,7 @@ func (suite *KeeperTestSuite) SendAndReceiveMessage(path *ibctesting.Path, origi suite.sendAndReceiveMessage(path, path.EndpointA, path.EndpointB, origin, coin, amount, sender, receiver, seq, ibcCoinMetadata) } -// Send back coins (from path endpoint B to A). In case of IBC coins need to provide ibcCoinMetadata (//, e.g.: "transfer/channel-0/wei") as input parameter. +// Send back coins (from path endpoint B to A). In case of IBC coins need to provide ibcCoinMetadata (//, e.g.: "transfer/channel-0/uever") as input parameter. // We need this to instantiate properly a FungibleTokenPacketData https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-001-coin-source-tracing.md func (suite *KeeperTestSuite) SendBackCoins(path *ibctesting.Path, origin *ibcgotesting.TestChain, coin string, amount int64, sender, receiver string, seq uint64, ibcCoinMetadata string) { // Send coin from B to A diff --git a/x/erc20/migrations/v3/migration.go b/x/erc20/migrations/v3/migration.go index 2d15c40a42..2a7f9a4791 100644 --- a/x/erc20/migrations/v3/migration.go +++ b/x/erc20/migrations/v3/migration.go @@ -1,8 +1,8 @@ package v3 import ( - v3types "github.com/EscanBE/evermint/v12/x/erc20/migrations/v3/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + v3types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/migrations/v3/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/erc20/migrations/v3/migration_test.go b/x/erc20/migrations/v3/migration_test.go index 399342af2d..544f5c5ca5 100644 --- a/x/erc20/migrations/v3/migration_test.go +++ b/x/erc20/migrations/v3/migration_test.go @@ -3,17 +3,17 @@ package v3_test import ( "testing" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v3types "github.com/EscanBE/evermint/v12/x/erc20/migrations/v3/types" + v3types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/migrations/v3/types" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/stretchr/testify/require" - "github.com/EscanBE/evermint/v12/x/erc20/migrations/v3" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/migrations/v3" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/erc20/migrations/v3/types/genesis.pb.go b/x/erc20/migrations/v3/types/genesis.pb.go index b52711b102..924d8be0d9 100644 --- a/x/erc20/migrations/v3/types/genesis.pb.go +++ b/x/erc20/migrations/v3/types/genesis.pb.go @@ -10,7 +10,7 @@ import ( math_bits "math/bits" _ "github.com/cosmos/gogoproto/gogoproto" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" proto "github.com/gogo/protobuf/proto" ) diff --git a/x/erc20/migrations/v3/types/params.go b/x/erc20/migrations/v3/types/params.go index 19073284b7..677d05ba7a 100644 --- a/x/erc20/migrations/v3/types/params.go +++ b/x/erc20/migrations/v3/types/params.go @@ -3,7 +3,7 @@ package v3types import ( "fmt" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/erc20/module.go b/x/erc20/module.go index df52bba35f..217b218483 100644 --- a/x/erc20/module.go +++ b/x/erc20/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/x/erc20/client/cli" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // type check to ensure the interface is properly implemented diff --git a/x/erc20/proposal_handler.go b/x/erc20/proposal_handler.go index 0c36ffdb01..16f98e8bf7 100644 --- a/x/erc20/proposal_handler.go +++ b/x/erc20/proposal_handler.go @@ -7,8 +7,8 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/erc20/keeper" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // NewErc20ProposalHandler creates a governance handler to manage new proposal types. diff --git a/x/erc20/types/evm_test.go b/x/erc20/types/evm_test.go index a1b01da10c..052569a5e6 100644 --- a/x/erc20/types/evm_test.go +++ b/x/erc20/types/evm_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/stretchr/testify/require" ) diff --git a/x/erc20/types/genesis_test.go b/x/erc20/types/genesis_test.go index 7ca22d4f6b..9a53e52ec1 100644 --- a/x/erc20/types/genesis_test.go +++ b/x/erc20/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/stretchr/testify/suite" ) diff --git a/x/erc20/types/interfaces.go b/x/erc20/types/interfaces.go index 189df58925..275f1a1aa4 100644 --- a/x/erc20/types/interfaces.go +++ b/x/erc20/types/interfaces.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/vm" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/erc20/types/msg_test.go b/x/erc20/types/msg_test.go index 1758684b04..ca38d0306e 100644 --- a/x/erc20/types/msg_test.go +++ b/x/erc20/types/msg_test.go @@ -1,7 +1,7 @@ package types_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "github.com/stretchr/testify/suite" @@ -11,8 +11,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/erc20/types/params_test.go b/x/erc20/types/params_test.go index 0a1d3cfd5e..e87a00eb9f 100644 --- a/x/erc20/types/params_test.go +++ b/x/erc20/types/params_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/stretchr/testify/suite" ) diff --git a/x/erc20/types/proposal.go b/x/erc20/types/proposal.go index 549858fb83..0730ae8845 100644 --- a/x/erc20/types/proposal.go +++ b/x/erc20/types/proposal.go @@ -5,7 +5,7 @@ import ( "strings" errorsmod "cosmossdk.io/errors" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" v1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" diff --git a/x/erc20/types/proposal_test.go b/x/erc20/types/proposal_test.go index af05724eac..9a752569b1 100644 --- a/x/erc20/types/proposal_test.go +++ b/x/erc20/types/proposal_test.go @@ -9,8 +9,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" length "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) type ProposalTestSuite struct { diff --git a/x/erc20/types/token_pair.go b/x/erc20/types/token_pair.go index 784e4cf727..0393ba5822 100644 --- a/x/erc20/types/token_pair.go +++ b/x/erc20/types/token_pair.go @@ -1,7 +1,7 @@ package types import ( - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/tendermint/tendermint/crypto/tmhash" diff --git a/x/erc20/types/token_pair_test.go b/x/erc20/types/token_pair_test.go index fa35b591d8..458711226d 100644 --- a/x/erc20/types/token_pair_test.go +++ b/x/erc20/types/token_pair_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/erc20/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" "github.com/tendermint/tendermint/crypto/tmhash" diff --git a/x/erc20/types/utils_test.go b/x/erc20/types/utils_test.go index bf4bfe18d0..f8e8ba3ab5 100644 --- a/x/erc20/types/utils_test.go +++ b/x/erc20/types/utils_test.go @@ -1,11 +1,11 @@ package types_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strings" "testing" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" @@ -57,12 +57,12 @@ func TestEqualMetadata(t *testing.T) { Display: constants.DisplayDenom, Name: "Ether", Symbol: constants.SymbolDenom, - Description: "EVM, staking and governance denom of Evermint", + Description: "EVM, staking and governance denom of Nevermind", DenomUnits: []*banktypes.DenomUnit{ { Denom: constants.BaseDenom, Exponent: 0, - Aliases: []string{"micro wei"}, + Aliases: []string{"micro uever"}, }, { Denom: constants.DisplayDenom, @@ -101,12 +101,12 @@ func TestEqualMetadata(t *testing.T) { Display: constants.DisplayDenom, Name: "Ether", Symbol: constants.SymbolDenom, - Description: "EVM, staking and governance denom of Evermint", + Description: "EVM, staking and governance denom of Nevermind", DenomUnits: []*banktypes.DenomUnit{ { Denom: constants.BaseDenom, Exponent: 0, - Aliases: []string{"micro wei"}, + Aliases: []string{"micro uever"}, }, }, }, @@ -119,17 +119,17 @@ func TestEqualMetadata(t *testing.T) { Display: constants.DisplayDenom, Name: "Ether", Symbol: constants.SymbolDenom, - Description: "EVM, staking and governance denom of Evermint", + Description: "EVM, staking and governance denom of Nevermind", DenomUnits: []*banktypes.DenomUnit{ { Denom: constants.BaseDenom, Exponent: 0, - Aliases: []string{"micro wei"}, + Aliases: []string{"micro uever"}, }, { Denom: "g" + constants.BaseDenom[1:], Exponent: 12, - Aliases: []string{"gas wei"}, + Aliases: []string{"gas uever"}, }, { Denom: constants.DisplayDenom, @@ -142,17 +142,17 @@ func TestEqualMetadata(t *testing.T) { Display: constants.DisplayDenom, Name: "Ether", Symbol: constants.SymbolDenom, - Description: "EVM, staking and governance denom of Evermint", + Description: "EVM, staking and governance denom of Nevermind", DenomUnits: []*banktypes.DenomUnit{ { Denom: constants.BaseDenom, Exponent: 0, - Aliases: []string{"micro wei"}, + Aliases: []string{"micro uever"}, }, { Denom: "m" + constants.BaseDenom[1:], Exponent: 12, - Aliases: []string{"milli wei"}, + Aliases: []string{"milli uever"}, }, { Denom: constants.DisplayDenom, @@ -190,25 +190,25 @@ func TestEqualAliases(t *testing.T) { { "different lengths", []string{}, - []string{"micro wei"}, + []string{"micro uever"}, false, }, { "different values", - []string{"microwei"}, - []string{"micro wei"}, + []string{"microuever"}, + []string{"micro uever"}, false, }, { "same values, unsorted", - []string{"micro wei", constants.BaseDenom}, - []string{constants.BaseDenom, "micro wei"}, + []string{"micro uever", constants.BaseDenom}, + []string{constants.BaseDenom, "micro uever"}, false, }, { "same values, sorted", - []string{constants.BaseDenom, "micro wei"}, - []string{constants.BaseDenom, "micro wei"}, + []string{constants.BaseDenom, "micro uever"}, + []string{constants.BaseDenom, "micro uever"}, true, }, } diff --git a/x/evm/client/cli/query.go b/x/evm/client/cli/query.go index 828c935de8..0fee80dce3 100644 --- a/x/evm/client/cli/query.go +++ b/x/evm/client/cli/query.go @@ -1,13 +1,13 @@ package cli import ( - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // GetQueryCmd returns the parent command for all x/bank CLi query commands. diff --git a/x/evm/client/cli/tx.go b/x/evm/client/cli/tx.go index 90162e9a06..7952b39e93 100644 --- a/x/evm/client/cli/tx.go +++ b/x/evm/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - rpctypes "github.com/EscanBE/evermint/v12/rpc/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + rpctypes "github.com/VictorTrustyDev/nevermind/v12/rpc/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/evm/genesis.go b/x/evm/genesis.go index 7eae9780dd..e1432c8bc5 100644 --- a/x/evm/genesis.go +++ b/x/evm/genesis.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" abci "github.com/tendermint/tendermint/abci/types" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/evm/genesis_test.go b/x/evm/genesis_test.go index 866e5354f2..a108ec6f2e 100644 --- a/x/evm/genesis_test.go +++ b/x/evm/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/evm/handler.go b/x/evm/handler.go index dd5e8446d5..1d4a86feb1 100644 --- a/x/evm/handler.go +++ b/x/evm/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // NewHandler returns a handler for Ethermint type messages. diff --git a/x/evm/handler_test.go b/x/evm/handler_test.go index cb46519cb0..aca21d1e92 100644 --- a/x/evm/handler_test.go +++ b/x/evm/handler_test.go @@ -2,12 +2,12 @@ package evm_test import ( "errors" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "testing" "time" - "github.com/EscanBE/evermint/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" sdkmath "cosmossdk.io/math" "github.com/gogo/protobuf/proto" @@ -19,7 +19,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" @@ -33,13 +33,13 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" @@ -53,7 +53,7 @@ type EvmTestSuite struct { ctx sdk.Context handler sdk.Handler - app *app.Evermint + app *app.Nevermind chainID *big.Int signer keyring.Signer @@ -79,7 +79,7 @@ func (suite *EvmTestSuite) DoSetupTest(t require.TestingT) { require.NoError(t, err) consAddress := sdk.ConsAddress(priv.PubKey().Address()) - suite.app = app.EthSetup(checkTx, func(app *app.Evermint, genesis simapp.GenesisState) simapp.GenesisState { + suite.app = app.EthSetup(checkTx, func(app *app.Nevermind, genesis simapp.GenesisState) simapp.GenesisState { if suite.dynamicTxFee { feemarketGenesis := feemarkettypes.DefaultGenesisState() feemarketGenesis.Params.EnableHeight = 1 diff --git a/x/evm/keeper/abci_test.go b/x/evm/keeper/abci_test.go index d9474d98e1..435d424847 100644 --- a/x/evm/keeper/abci_test.go +++ b/x/evm/keeper/abci_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/evm/keeper/benchmark_test.go b/x/evm/keeper/benchmark_test.go index 6a1840547e..f4d23c68fb 100644 --- a/x/evm/keeper/benchmark_test.go +++ b/x/evm/keeper/benchmark_test.go @@ -11,8 +11,8 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/ethereum/go-ethereum/common" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/x/evm/keeper/config.go b/x/evm/keeper/config.go index fc658a5b03..5ef33d767a 100644 --- a/x/evm/keeper/config.go +++ b/x/evm/keeper/config.go @@ -4,8 +4,8 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" diff --git a/x/evm/keeper/fees.go b/x/evm/keeper/fees.go index 185dff9154..be8a9f258e 100644 --- a/x/evm/keeper/fees.go +++ b/x/evm/keeper/fees.go @@ -13,7 +13,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // CheckSenderBalance validates that the tx cost value is positive and that the diff --git a/x/evm/keeper/fees_test.go b/x/evm/keeper/fees_test.go index 56166bf20c..6160ec4eb5 100644 --- a/x/evm/keeper/fees_test.go +++ b/x/evm/keeper/fees_test.go @@ -4,8 +4,8 @@ import ( "math/big" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/evm/keeper/gas.go b/x/evm/keeper/gas.go index 5bd362951d..b2922fdbab 100644 --- a/x/evm/keeper/gas.go +++ b/x/evm/keeper/gas.go @@ -12,7 +12,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // GetEthIntrinsicGas returns the intrinsic gas cost for the transaction diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go index c8961726f6..33662f8e61 100644 --- a/x/evm/keeper/grpc_query.go +++ b/x/evm/keeper/grpc_query.go @@ -24,9 +24,9 @@ import ( "github.com/ethereum/go-ethereum/core/vm" ethparams "github.com/ethereum/go-ethereum/params" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go index 075331a8fa..119851933e 100644 --- a/x/evm/keeper/grpc_query_test.go +++ b/x/evm/keeper/grpc_query_test.go @@ -15,10 +15,10 @@ import ( ethlogger "github.com/ethereum/go-ethereum/eth/tracers/logger" ethparams "github.com/ethereum/go-ethereum/params" - "github.com/EscanBE/evermint/v12/server/config" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // Not valid Ethereum address diff --git a/x/evm/keeper/hooks.go b/x/evm/keeper/hooks.go index 5cb405c8f2..86a379f543 100644 --- a/x/evm/keeper/hooks.go +++ b/x/evm/keeper/hooks.go @@ -2,7 +2,7 @@ package keeper import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/evm/keeper/hooks_test.go b/x/evm/keeper/hooks_test.go index 8e17f1225f..4dc0f7e3ae 100644 --- a/x/evm/keeper/hooks_test.go +++ b/x/evm/keeper/hooks_test.go @@ -9,9 +9,9 @@ import ( "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // LogRecordHook records all the logs diff --git a/x/evm/keeper/integration_test.go b/x/evm/keeper/integration_test.go index fedbe5f7af..29c5432838 100644 --- a/x/evm/keeper/integration_test.go +++ b/x/evm/keeper/integration_test.go @@ -2,25 +2,25 @@ package keeper_test import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "cosmossdk.io/math" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - chainapp "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + chainapp "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/simapp" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" abci "github.com/tendermint/tendermint/abci/types" @@ -174,7 +174,7 @@ func setupChain(localMinGasPricesStr string) { // Initialize the app, so we can use SetMinGasPrices to set the // validator-specific min-gas-prices setting db := dbm.NewMemDB() - chainApp := chainapp.NewEvermint( + chainApp := chainapp.NewNevermind( log.NewNopLogger(), db, nil, diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go index 47ece3cbba..f2c6d3bebd 100644 --- a/x/evm/keeper/keeper.go +++ b/x/evm/keeper/keeper.go @@ -15,9 +15,9 @@ import ( "github.com/tendermint/tendermint/libs/log" "math/big" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // Keeper grants access to the EVM module state and implements the go-ethereum StateDB interface. diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index 0cdc883d23..7fc5b34a91 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -2,15 +2,15 @@ package keeper_test import ( _ "embed" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/evm/keeper/migrations.go b/x/evm/keeper/migrations.go index 4f5e7993c7..d092b9a5aa 100644 --- a/x/evm/keeper/migrations.go +++ b/x/evm/keeper/migrations.go @@ -1,9 +1,9 @@ package keeper import ( - v4 "github.com/EscanBE/evermint/v12/x/evm/migrations/v4" - v5 "github.com/EscanBE/evermint/v12/x/evm/migrations/v5" - "github.com/EscanBE/evermint/v12/x/evm/types" + v4 "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v4" + v5 "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v5" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/evm/keeper/migrations_test.go b/x/evm/keeper/migrations_test.go index 5473328d6f..edbc5f07aa 100644 --- a/x/evm/keeper/migrations_test.go +++ b/x/evm/keeper/migrations_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - evmkeeper "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/types" + evmkeeper "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/evm/keeper/msg_server.go b/x/evm/keeper/msg_server.go index 00150be01a..7730b87edc 100644 --- a/x/evm/keeper/msg_server.go +++ b/x/evm/keeper/msg_server.go @@ -16,7 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/evm/keeper/msg_server_test.go b/x/evm/keeper/msg_server_test.go index 7c7b5423a9..d9a717ade8 100644 --- a/x/evm/keeper/msg_server_test.go +++ b/x/evm/keeper/msg_server_test.go @@ -6,8 +6,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" ) diff --git a/x/evm/keeper/params.go b/x/evm/keeper/params.go index cf892de2bf..a6a9d690e8 100644 --- a/x/evm/keeper/params.go +++ b/x/evm/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/evm/keeper/params_benchmark_test.go b/x/evm/keeper/params_benchmark_test.go index 4d9b8208ad..de2a0b74d9 100644 --- a/x/evm/keeper/params_benchmark_test.go +++ b/x/evm/keeper/params_benchmark_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func BenchmarkSetParams(b *testing.B) { diff --git a/x/evm/keeper/params_test.go b/x/evm/keeper/params_test.go index 9e0740f8b1..fc01cd95d2 100644 --- a/x/evm/keeper/params_test.go +++ b/x/evm/keeper/params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "reflect" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/evm/keeper/setup_test.go b/x/evm/keeper/setup_test.go index 53026cfe7e..b117660865 100644 --- a/x/evm/keeper/setup_test.go +++ b/x/evm/keeper/setup_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "testing" "time" @@ -10,14 +10,14 @@ import ( . "github.com/onsi/gomega" sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -42,7 +42,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClient evmtypes.QueryClient address common.Address consAddress sdk.ConsAddress @@ -105,7 +105,7 @@ func (suite *KeeperTestSuite) SetupAppWithT(checkTx bool, t require.TestingT) { require.NoError(t, err) suite.consAddress = sdk.ConsAddress(priv.PubKey().Address()) - suite.app = app.EthSetup(checkTx, func(app *app.Evermint, genesis simapp.GenesisState) simapp.GenesisState { + suite.app = app.EthSetup(checkTx, func(app *app.Nevermind, genesis simapp.GenesisState) simapp.GenesisState { feemarketGenesis := feemarkettypes.DefaultGenesisState() if suite.enableFeemarket { feemarketGenesis.Params.EnableHeight = 1 diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index 31515c83a0..118eaddfdf 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -8,9 +8,9 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" diff --git a/x/evm/keeper/state_transition_benchmark_test.go b/x/evm/keeper/state_transition_benchmark_test.go index 001b1abed5..26c9080a2c 100644 --- a/x/evm/keeper/state_transition_benchmark_test.go +++ b/x/evm/keeper/state_transition_benchmark_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/evm/keeper/state_transition_test.go b/x/evm/keeper/state_transition_test.go index 2e6725d1d0..65e979e1d4 100644 --- a/x/evm/keeper/state_transition_test.go +++ b/x/evm/keeper/state_transition_test.go @@ -2,14 +2,14 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/evm/keeper/statedb.go b/x/evm/keeper/statedb.go index 533d973094..66637466d1 100644 --- a/x/evm/keeper/statedb.go +++ b/x/evm/keeper/statedb.go @@ -7,9 +7,9 @@ import ( sdkmath "cosmossdk.io/math" errorsmod "cosmossdk.io/errors" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/evm/keeper/statedb_benchmark_test.go b/x/evm/keeper/statedb_benchmark_test.go index 7e6416fe93..80a3bddcf3 100644 --- a/x/evm/keeper/statedb_benchmark_test.go +++ b/x/evm/keeper/statedb_benchmark_test.go @@ -10,7 +10,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" ) func BenchmarkCreateAccountNew(b *testing.B) { diff --git a/x/evm/keeper/statedb_test.go b/x/evm/keeper/statedb_test.go index 0a7a36a663..5ea1668cc9 100644 --- a/x/evm/keeper/statedb_test.go +++ b/x/evm/keeper/statedb_test.go @@ -12,10 +12,10 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" diff --git a/x/evm/keeper/utils_test.go b/x/evm/keeper/utils_test.go index 1a379afefc..ab265bb8a1 100644 --- a/x/evm/keeper/utils_test.go +++ b/x/evm/keeper/utils_test.go @@ -5,10 +5,10 @@ import ( "math/big" "time" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/evm/migrations/v4/migrate.go b/x/evm/migrations/v4/migrate.go index 43e7246799..358fbc3133 100644 --- a/x/evm/migrations/v4/migrate.go +++ b/x/evm/migrations/v4/migrate.go @@ -5,8 +5,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - v4types "github.com/EscanBE/evermint/v12/x/evm/migrations/v4/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + v4types "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v4/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // MigrateStore migrates the x/evm module state from the consensus version 3 to diff --git a/x/evm/migrations/v4/migrate_test.go b/x/evm/migrations/v4/migrate_test.go index 503e9bcadf..ae0475939c 100644 --- a/x/evm/migrations/v4/migrate_test.go +++ b/x/evm/migrations/v4/migrate_test.go @@ -5,12 +5,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v4 "github.com/EscanBE/evermint/v12/x/evm/migrations/v4" - v4types "github.com/EscanBE/evermint/v12/x/evm/migrations/v4/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v4 "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v4" + v4types "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v4/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/evm/migrations/v5/migrate.go b/x/evm/migrations/v5/migrate.go index 7d6c3a4146..bd0efced14 100644 --- a/x/evm/migrations/v5/migrate.go +++ b/x/evm/migrations/v5/migrate.go @@ -1,13 +1,13 @@ package v5 import ( - "github.com/EscanBE/evermint/v12/utils" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/utils" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - v5types "github.com/EscanBE/evermint/v12/x/evm/migrations/v5/types" + v5types "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v5/types" ) // MigrateStore migrates the x/evm module state from the consensus version 4 to diff --git a/x/evm/migrations/v5/migrate_test.go b/x/evm/migrations/v5/migrate_test.go index e2ff742e4b..7ad3443999 100644 --- a/x/evm/migrations/v5/migrate_test.go +++ b/x/evm/migrations/v5/migrate_test.go @@ -7,11 +7,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v5 "github.com/EscanBE/evermint/v12/x/evm/migrations/v5" - v5types "github.com/EscanBE/evermint/v12/x/evm/migrations/v5/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v5 "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v5" + v5types "github.com/VictorTrustyDev/nevermind/v12/x/evm/migrations/v5/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func TestMigrate(t *testing.T) { diff --git a/x/evm/module.go b/x/evm/module.go index 76f94048bb..a22339b218 100644 --- a/x/evm/module.go +++ b/x/evm/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/EscanBE/evermint/v12/x/evm/client/cli" - "github.com/EscanBE/evermint/v12/x/evm/keeper" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) var ( @@ -196,7 +196,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP func (AppModule) GenerateGenesisState(_ *module.SimulationState) { } -// WeightedOperations returns the all the evm module operations with their respective weights. +// WeightedOperations returns the all the evm module operations with their respective ueverghts. func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { return nil } diff --git a/x/evm/statedb/config.go b/x/evm/statedb/config.go index a1d82b6b83..2719b5fa72 100644 --- a/x/evm/statedb/config.go +++ b/x/evm/statedb/config.go @@ -3,7 +3,7 @@ package statedb import ( "math/big" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" ) diff --git a/x/evm/statedb/mock_test.go b/x/evm/statedb/mock_test.go index cdcae6ff6c..24d09ae4c3 100644 --- a/x/evm/statedb/mock_test.go +++ b/x/evm/statedb/mock_test.go @@ -5,7 +5,7 @@ import ( "errors" "math/big" - "github.com/EscanBE/evermint/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/x/evm/statedb/statedb_test.go b/x/evm/statedb/statedb_test.go index 7027971d72..9e08d30f51 100644 --- a/x/evm/statedb/statedb_test.go +++ b/x/evm/statedb/statedb_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/EscanBE/evermint/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/evm/types/access_list_test.go b/x/evm/types/access_list_test.go index 16a94c32f2..08ad82173c 100644 --- a/x/evm/types/access_list_test.go +++ b/x/evm/types/access_list_test.go @@ -1,7 +1,7 @@ package types_test import ( - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/x/evm/types/access_list_tx.go b/x/evm/types/access_list_tx.go index 160a445529..f96547c152 100644 --- a/x/evm/types/access_list_tx.go +++ b/x/evm/types/access_list_tx.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" ) func newAccessListTx(tx *ethtypes.Transaction) (*AccessListTx, error) { diff --git a/x/evm/types/access_list_tx_test.go b/x/evm/types/access_list_tx_test.go index 004a12ab00..f632bb1c1a 100644 --- a/x/evm/types/access_list_tx_test.go +++ b/x/evm/types/access_list_tx_test.go @@ -3,7 +3,7 @@ package types_test import ( "math/big" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/x/evm/types/dynamic_fee_tx.go b/x/evm/types/dynamic_fee_tx.go index 71eb16b21a..7ba419eac6 100644 --- a/x/evm/types/dynamic_fee_tx.go +++ b/x/evm/types/dynamic_fee_tx.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" ) func NewDynamicFeeTx(tx *ethtypes.Transaction) (*DynamicFeeTx, error) { diff --git a/x/evm/types/dynamic_fee_tx_test.go b/x/evm/types/dynamic_fee_tx_test.go index 0a52e4c686..66a5672d5a 100644 --- a/x/evm/types/dynamic_fee_tx_test.go +++ b/x/evm/types/dynamic_fee_tx_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/stretchr/testify/suite" ) diff --git a/x/evm/types/genesis.go b/x/evm/types/genesis.go index 182a19fb23..c31f75daef 100644 --- a/x/evm/types/genesis.go +++ b/x/evm/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" ) // Validate performs a basic validation of a GenesisAccount fields. diff --git a/x/evm/types/genesis_test.go b/x/evm/types/genesis_test.go index 9662187071..46d5d1f700 100644 --- a/x/evm/types/genesis_test.go +++ b/x/evm/types/genesis_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" ) type GenesisTestSuite struct { diff --git a/x/evm/types/interfaces.go b/x/evm/types/interfaces.go index 5aa33237dd..67d7d8841a 100644 --- a/x/evm/types/interfaces.go +++ b/x/evm/types/interfaces.go @@ -9,7 +9,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/x/evm/types/legacy_tx.go b/x/evm/types/legacy_tx.go index 32a1bc6ae2..653ce07160 100644 --- a/x/evm/types/legacy_tx.go +++ b/x/evm/types/legacy_tx.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/x/evm/types/legacy_tx_test.go b/x/evm/types/legacy_tx_test.go index 23653e08fb..9b15c0d567 100644 --- a/x/evm/types/legacy_tx_test.go +++ b/x/evm/types/legacy_tx_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *TxDataTestSuite) TestNewLegacyTx() { diff --git a/x/evm/types/logs.go b/x/evm/types/logs.go index fcf361e3d2..6e12a782c9 100644 --- a/x/evm/types/logs.go +++ b/x/evm/types/logs.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) // NewTransactionLogs creates a new NewTransactionLogs instance. diff --git a/x/evm/types/logs_test.go b/x/evm/types/logs_test.go index 62b5d15a3a..54fd5212ff 100644 --- a/x/evm/types/logs_test.go +++ b/x/evm/types/logs_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/evm/types/msg.go b/x/evm/types/msg.go index 2ebbd8e71b..4e7869ffea 100644 --- a/x/evm/types/msg.go +++ b/x/evm/types/msg.go @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/signing" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/EscanBE/evermint/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" diff --git a/x/evm/types/msg_test.go b/x/evm/types/msg_test.go index 4b667dfd0e..0a62f3dc9a 100644 --- a/x/evm/types/msg_test.go +++ b/x/evm/types/msg_test.go @@ -2,7 +2,7 @@ package types_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" "reflect" @@ -12,8 +12,8 @@ import ( sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/suite" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" @@ -21,9 +21,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) const invalidAddress = "0x0000" diff --git a/x/evm/types/params.go b/x/evm/types/params.go index bee533c006..d2392ca947 100644 --- a/x/evm/types/params.go +++ b/x/evm/types/params.go @@ -2,7 +2,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "github.com/ethereum/go-ethereum/core/vm" diff --git a/x/evm/types/tx_args_test.go b/x/evm/types/tx_args_test.go index 5842a5f18d..7c6b3bca64 100644 --- a/x/evm/types/tx_args_test.go +++ b/x/evm/types/tx_args_test.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) func (suite *TxDataTestSuite) TestTxArgsString() { diff --git a/x/evm/types/tx_data_test.go b/x/evm/types/tx_data_test.go index e8492fec2a..4d12f9e06c 100644 --- a/x/evm/types/tx_data_test.go +++ b/x/evm/types/tx_data_test.go @@ -1,7 +1,7 @@ package types import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "testing" diff --git a/x/evm/types/utils_test.go b/x/evm/types/utils_test.go index afb9f226a3..d267165604 100644 --- a/x/evm/types/utils_test.go +++ b/x/evm/types/utils_test.go @@ -14,10 +14,10 @@ import ( proto "github.com/gogo/protobuf/proto" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" "github.com/stretchr/testify/require" ) diff --git a/x/feemarket/client/cli/query.go b/x/feemarket/client/cli/query.go index f0cf9dcaff..466caf3aaf 100644 --- a/x/feemarket/client/cli/query.go +++ b/x/feemarket/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // GetQueryCmd returns the parent command for all x/feemarket CLI query commands. diff --git a/x/feemarket/genesis.go b/x/feemarket/genesis.go index 82e3045389..bee068342b 100644 --- a/x/feemarket/genesis.go +++ b/x/feemarket/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/x/feemarket/keeper" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/feemarket/handler.go b/x/feemarket/handler.go index 50fd0152a4..b017ed68a6 100644 --- a/x/feemarket/handler.go +++ b/x/feemarket/handler.go @@ -2,7 +2,7 @@ package feemarket import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/feemarket/keeper/abci.go b/x/feemarket/keeper/abci.go index 5e1d29a5dd..6649c1a1bb 100644 --- a/x/feemarket/keeper/abci.go +++ b/x/feemarket/keeper/abci.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" abci "github.com/tendermint/tendermint/abci/types" sdkmath "cosmossdk.io/math" diff --git a/x/feemarket/keeper/grpc_query.go b/x/feemarket/keeper/grpc_query.go index e358855dfe..e5328a088c 100644 --- a/x/feemarket/keeper/grpc_query.go +++ b/x/feemarket/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/feemarket/keeper/grpc_query_test.go b/x/feemarket/keeper/grpc_query_test.go index c0a37df346..99804e17c8 100644 --- a/x/feemarket/keeper/grpc_query_test.go +++ b/x/feemarket/keeper/grpc_query_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ethparams "github.com/ethereum/go-ethereum/params" ) diff --git a/x/feemarket/keeper/integration_test.go b/x/feemarket/keeper/integration_test.go index 7d91e441b7..06d2d9e533 100644 --- a/x/feemarket/keeper/integration_test.go +++ b/x/feemarket/keeper/integration_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" sdk "github.com/cosmos/cosmos-sdk/types" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/feemarket/keeper/keeper.go b/x/feemarket/keeper/keeper.go index 8048b0f573..8f74d62b15 100644 --- a/x/feemarket/keeper/keeper.go +++ b/x/feemarket/keeper/keeper.go @@ -9,7 +9,7 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) // KeyPrefixBaseFeeV1 TODO: Temporary will be removed with params refactor PR diff --git a/x/feemarket/keeper/migrations.go b/x/feemarket/keeper/migrations.go index 1d9eabfc97..544fd7ff04 100644 --- a/x/feemarket/keeper/migrations.go +++ b/x/feemarket/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v4 "github.com/EscanBE/evermint/v12/x/feemarket/migrations/v4" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + v4 "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/migrations/v4" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feemarket/keeper/migrations_test.go b/x/feemarket/keeper/migrations_test.go index 6e23e26cb5..25c4dc1af6 100644 --- a/x/feemarket/keeper/migrations_test.go +++ b/x/feemarket/keeper/migrations_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - feemarketkeeper "github.com/EscanBE/evermint/v12/x/feemarket/keeper" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + feemarketkeeper "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feemarket/keeper/msg_server.go b/x/feemarket/keeper/msg_server.go index 3bfda082a9..7b2e0bab23 100644 --- a/x/feemarket/keeper/msg_server.go +++ b/x/feemarket/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/feemarket/keeper/msg_server_test.go b/x/feemarket/keeper/msg_server_test.go index 163ebc4467..dfcfebb992 100644 --- a/x/feemarket/keeper/msg_server_test.go +++ b/x/feemarket/keeper/msg_server_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/feemarket/keeper/params.go b/x/feemarket/keeper/params.go index 1b896524de..1d9faa4bbe 100644 --- a/x/feemarket/keeper/params.go +++ b/x/feemarket/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( "math/big" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feemarket/keeper/params_test.go b/x/feemarket/keeper/params_test.go index 7f5e5aadb6..77efb48d76 100644 --- a/x/feemarket/keeper/params_test.go +++ b/x/feemarket/keeper/params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "reflect" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) func (suite *KeeperTestSuite) TestSetGetParams() { diff --git a/x/feemarket/keeper/setup_test.go b/x/feemarket/keeper/setup_test.go index 70b6055858..79e610707a 100644 --- a/x/feemarket/keeper/setup_test.go +++ b/x/feemarket/keeper/setup_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" @@ -21,7 +21,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClient types.QueryClient address common.Address consAddress sdk.ConsAddress diff --git a/x/feemarket/keeper/utils_test.go b/x/feemarket/keeper/utils_test.go index d68dae7f0c..24d95ab5aa 100644 --- a/x/feemarket/keeper/utils_test.go +++ b/x/feemarket/keeper/utils_test.go @@ -2,7 +2,7 @@ package keeper_test import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "time" @@ -20,14 +20,14 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - chainapp "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + chainapp "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/stretchr/testify/require" @@ -146,7 +146,7 @@ func setupChain(localMinGasPricesStr string) { // Initialize the app, so we can use SetMinGasPrices to set the // validator-specific min-gas-prices setting db := dbm.NewMemDB() - chainApp := chainapp.NewEvermint( + chainApp := chainapp.NewNevermind( log.NewNopLogger(), db, nil, diff --git a/x/feemarket/migrations/v4/migrate.go b/x/feemarket/migrations/v4/migrate.go index 8175ead0fd..2e14fca097 100644 --- a/x/feemarket/migrations/v4/migrate.go +++ b/x/feemarket/migrations/v4/migrate.go @@ -1,7 +1,7 @@ package v4 import ( - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/feemarket/migrations/v4/migrate_test.go b/x/feemarket/migrations/v4/migrate_test.go index edd848f0e4..be0162c83c 100644 --- a/x/feemarket/migrations/v4/migrate_test.go +++ b/x/feemarket/migrations/v4/migrate_test.go @@ -3,10 +3,10 @@ package v4_test import ( "testing" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v4 "github.com/EscanBE/evermint/v12/x/feemarket/migrations/v4" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v4 "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/migrations/v4" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/feemarket/migrations/v4/types/params.go b/x/feemarket/migrations/v4/types/params.go index 41eb326fe3..5aa828828b 100644 --- a/x/feemarket/migrations/v4/types/params.go +++ b/x/feemarket/migrations/v4/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/feemarket/module.go b/x/feemarket/module.go index a8e072187f..fc3f15a548 100644 --- a/x/feemarket/module.go +++ b/x/feemarket/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/EscanBE/evermint/v12/x/feemarket/client/cli" - "github.com/EscanBE/evermint/v12/x/feemarket/keeper" - "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" ) var ( @@ -189,7 +189,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP func (AppModule) GenerateGenesisState(_ *module.SimulationState) { } -// WeightedOperations returns the all the fee market module operations with their respective weights. +// WeightedOperations returns the all the fee market module operations with their respective ueverghts. func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { return nil } diff --git a/x/ibc/transfer/ibc_module.go b/x/ibc/transfer/ibc_module.go index 90f3bbd668..d2e250f7e4 100644 --- a/x/ibc/transfer/ibc_module.go +++ b/x/ibc/transfer/ibc_module.go @@ -1,7 +1,7 @@ package transfer import ( - "github.com/EscanBE/evermint/v12/x/ibc/transfer/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer/keeper" ibctransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" ) diff --git a/x/ibc/transfer/keeper/keeper.go b/x/ibc/transfer/keeper/keeper.go index 51092d79b9..c55ff71e3e 100644 --- a/x/ibc/transfer/keeper/keeper.go +++ b/x/ibc/transfer/keeper/keeper.go @@ -10,7 +10,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" - "github.com/EscanBE/evermint/v12/x/ibc/transfer/types" + "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer/types" ) // Keeper defines the modified IBC transfer keeper that embeds the original one. diff --git a/x/ibc/transfer/keeper/keeper_test.go b/x/ibc/transfer/keeper/keeper_test.go index 653093dfea..f5298e9f7c 100644 --- a/x/ibc/transfer/keeper/keeper_test.go +++ b/x/ibc/transfer/keeper/keeper_test.go @@ -2,7 +2,7 @@ package keeper_test import ( "encoding/json" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" "testing" @@ -24,19 +24,19 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" @@ -50,7 +50,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient address common.Address diff --git a/x/ibc/transfer/keeper/msg_server.go b/x/ibc/transfer/keeper/msg_server.go index 962fd27dfa..157233e277 100644 --- a/x/ibc/transfer/keeper/msg_server.go +++ b/x/ibc/transfer/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - erc20types "github.com/EscanBE/evermint/v12/x/erc20/types" + erc20types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" ) diff --git a/x/ibc/transfer/keeper/msg_server_test.go b/x/ibc/transfer/keeper/msg_server_test.go index e7f92061fa..d125ff1b01 100644 --- a/x/ibc/transfer/keeper/msg_server_test.go +++ b/x/ibc/transfer/keeper/msg_server_test.go @@ -2,14 +2,14 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/testutil" - erc20types "github.com/EscanBE/evermint/v12/x/erc20/types" - "github.com/EscanBE/evermint/v12/x/ibc/transfer/keeper" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + erc20types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" + "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer/keeper" "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v6/modules/core/24-host" diff --git a/x/ibc/transfer/module.go b/x/ibc/transfer/module.go index 37ce8051ba..4d1e9ad7cd 100644 --- a/x/ibc/transfer/module.go +++ b/x/ibc/transfer/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/EscanBE/evermint/v12/x/ibc/transfer/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/ibc/transfer/keeper" ibctransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper" "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" diff --git a/x/ibc/transfer/types/interfaces.go b/x/ibc/transfer/types/interfaces.go index be0ecf8aee..e2a39eeadb 100644 --- a/x/ibc/transfer/types/interfaces.go +++ b/x/ibc/transfer/types/interfaces.go @@ -10,7 +10,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - erc20types "github.com/EscanBE/evermint/v12/x/erc20/types" + erc20types "github.com/VictorTrustyDev/nevermind/v12/x/erc20/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 36d4d57b23..835fd0a030 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // GetQueryCmd returns the parent command for all incentives CLI query commands. diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 48de0afa67..34900dce6e 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -2,7 +2,7 @@ package cli import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strconv" "github.com/ethereum/go-ethereum/common" @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // NewRegisterIncentiveProposalCmd implements the command to submit a register diff --git a/x/incentives/client/proposal_handler.go b/x/incentives/client/proposal_handler.go index 122e398948..44031cf6d4 100644 --- a/x/incentives/client/proposal_handler.go +++ b/x/incentives/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/EscanBE/evermint/v12/x/incentives/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/client/cli" ) var ( diff --git a/x/incentives/genesis.go b/x/incentives/genesis.go index 22d25d3b75..6d4da60e0c 100644 --- a/x/incentives/genesis.go +++ b/x/incentives/genesis.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/EscanBE/evermint/v12/x/incentives/keeper" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // InitGenesis import module genesis diff --git a/x/incentives/handler.go b/x/incentives/handler.go index 3ab20ac16a..20fbfc63c8 100644 --- a/x/incentives/handler.go +++ b/x/incentives/handler.go @@ -2,7 +2,7 @@ package incentives import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/incentives/keeper/allocation_meters.go b/x/incentives/keeper/allocation_meters.go index 1c836a4239..e836f7b87d 100644 --- a/x/incentives/keeper/allocation_meters.go +++ b/x/incentives/keeper/allocation_meters.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // GetAllAllocationMeters - get all registered AllocationMeters diff --git a/x/incentives/keeper/distribution.go b/x/incentives/keeper/distribution.go index ba20c7422a..530f1824aa 100644 --- a/x/incentives/keeper/distribution.go +++ b/x/incentives/keeper/distribution.go @@ -12,7 +12,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // DistributeRewards transfers the allocated rewards to the participants of a given diff --git a/x/incentives/keeper/distribution_test.go b/x/incentives/keeper/distribution_test.go index 2c3bcb2d5b..d7850847f1 100644 --- a/x/incentives/keeper/distribution_test.go +++ b/x/incentives/keeper/distribution_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func (suite *KeeperTestSuite) TestDistributeIncentives() { diff --git a/x/incentives/keeper/epoch_hooks.go b/x/incentives/keeper/epoch_hooks.go index de7ebec382..c71cce506e 100644 --- a/x/incentives/keeper/epoch_hooks.go +++ b/x/incentives/keeper/epoch_hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // BeforeEpochStart performs a no-op diff --git a/x/incentives/keeper/evm_hooks.go b/x/incentives/keeper/evm_hooks.go index 0f9b4ae570..da4658793f 100644 --- a/x/incentives/keeper/evm_hooks.go +++ b/x/incentives/keeper/evm_hooks.go @@ -8,10 +8,10 @@ import ( "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/incentives/keeper/evm_hooks_test.go b/x/incentives/keeper/evm_hooks_test.go index df69593a92..1b66207a86 100644 --- a/x/incentives/keeper/evm_hooks_test.go +++ b/x/incentives/keeper/evm_hooks_test.go @@ -10,12 +10,12 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) func (suite *KeeperTestSuite) TestEvmHooksStoreTxGasUsed() { diff --git a/x/incentives/keeper/gas_meters.go b/x/incentives/keeper/gas_meters.go index b1cf543a1c..fc4f6765cd 100644 --- a/x/incentives/keeper/gas_meters.go +++ b/x/incentives/keeper/gas_meters.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // GetIncentivesGasMeters - get all registered GasMeters per Incentive diff --git a/x/incentives/keeper/gas_meters_test.go b/x/incentives/keeper/gas_meters_test.go index b03350b604..08afaad4d0 100644 --- a/x/incentives/keeper/gas_meters_test.go +++ b/x/incentives/keeper/gas_meters_test.go @@ -3,10 +3,10 @@ package keeper_test import ( "fmt" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetIncentivesGasMeters() { diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index 02504167eb..c4b367d0c5 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -8,14 +8,14 @@ import ( "google.golang.org/grpc/status" errorsmod "cosmossdk.io/errors" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index 75a0ef63a7..878ed86101 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func (suite *KeeperTestSuite) TestIncentives() { diff --git a/x/incentives/keeper/incentives.go b/x/incentives/keeper/incentives.go index 0000f5d243..a98e4734fb 100644 --- a/x/incentives/keeper/incentives.go +++ b/x/incentives/keeper/incentives.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // GetAllIncentives - get all registered Incentives diff --git a/x/incentives/keeper/incentives_test.go b/x/incentives/keeper/incentives_test.go index 0cfa02f099..fb96606d6a 100644 --- a/x/incentives/keeper/incentives_test.go +++ b/x/incentives/keeper/incentives_test.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetAllIncentives() { diff --git a/x/incentives/keeper/integration_test.go b/x/incentives/keeper/integration_test.go index 3e30508b65..fcd049c8d7 100644 --- a/x/incentives/keeper/integration_test.go +++ b/x/incentives/keeper/integration_test.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" - evertypes "github.com/EscanBE/evermint/v12/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) var _ = Describe("Performing EVM transactions", Ordered, func() { diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index 0503cc1569..b7801a2068 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // Keeper of this module maintains collections of incentives. diff --git a/x/incentives/keeper/migrations.go b/x/incentives/keeper/migrations.go index e84e19a3b5..be80b4e432 100644 --- a/x/incentives/keeper/migrations.go +++ b/x/incentives/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v2 "github.com/EscanBE/evermint/v12/x/incentives/migrations/v2" - "github.com/EscanBE/evermint/v12/x/incentives/types" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/incentives/migrations/v2" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index 13481e57fc..6b836a933a 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/incentives/keeper/msg_server_test.go b/x/incentives/keeper/msg_server_test.go index 9b44cd2c1f..f03195c4d2 100644 --- a/x/incentives/keeper/msg_server_test.go +++ b/x/incentives/keeper/msg_server_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index cfc3cd454d..eb34c8c6d2 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // GetParams returns the total set of incentives parameters. diff --git a/x/incentives/keeper/params_test.go b/x/incentives/keeper/params_test.go index 18e690be5f..b59be13211 100644 --- a/x/incentives/keeper/params_test.go +++ b/x/incentives/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/EscanBE/evermint/v12/x/incentives/types" +import "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.IncentivesKeeper.GetParams(suite.ctx) diff --git a/x/incentives/keeper/proposals.go b/x/incentives/keeper/proposals.go index cb44d05d3d..6f7b88979b 100644 --- a/x/incentives/keeper/proposals.go +++ b/x/incentives/keeper/proposals.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // RegisterIncentive creates an incentive for a contract diff --git a/x/incentives/keeper/proposals_test.go b/x/incentives/keeper/proposals_test.go index e3b7e3840d..deb63d3edd 100644 --- a/x/incentives/keeper/proposals_test.go +++ b/x/incentives/keeper/proposals_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func (suite KeeperTestSuite) TestRegisterIncentive() { //nolint:govet // we can copy locks here because it is a test diff --git a/x/incentives/keeper/setup_test.go b/x/incentives/keeper/setup_test.go index dd9a2e3074..3b288a3db7 100644 --- a/x/incentives/keeper/setup_test.go +++ b/x/incentives/keeper/setup_test.go @@ -13,18 +13,18 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient address common.Address diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index 5bb7980c86..a20ebe83b6 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -3,22 +3,22 @@ package keeper_test import ( "encoding/json" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math" "math/big" "time" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/server/config" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/server/config" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/migrations/v2/migrate.go b/x/incentives/migrations/v2/migrate.go index da4227541f..68beb4b5cb 100644 --- a/x/incentives/migrations/v2/migrate.go +++ b/x/incentives/migrations/v2/migrate.go @@ -1,8 +1,8 @@ package v2 import ( - v2types "github.com/EscanBE/evermint/v12/x/incentives/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/incentives/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/migrations/v2/migrate_test.go b/x/incentives/migrations/v2/migrate_test.go index a3ad49cff7..f8ea75bbd9 100644 --- a/x/incentives/migrations/v2/migrate_test.go +++ b/x/incentives/migrations/v2/migrate_test.go @@ -6,11 +6,11 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v2 "github.com/EscanBE/evermint/v12/x/incentives/migrations/v2" - v2types "github.com/EscanBE/evermint/v12/x/incentives/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/incentives/migrations/v2" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/incentives/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/incentives/migrations/v2/types/params.go b/x/incentives/migrations/v2/types/params.go index d3fc9d69c9..347ddb6fe0 100644 --- a/x/incentives/migrations/v2/types/params.go +++ b/x/incentives/migrations/v2/types/params.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) var _ types.LegacyParams = &V2Params{} diff --git a/x/incentives/module.go b/x/incentives/module.go index 97ae632359..886393f921 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/x/incentives/client/cli" - "github.com/EscanBE/evermint/v12/x/incentives/keeper" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // type check to ensure the interface is properly implemented diff --git a/x/incentives/proposal_handler.go b/x/incentives/proposal_handler.go index 696fc90c11..e732986745 100644 --- a/x/incentives/proposal_handler.go +++ b/x/incentives/proposal_handler.go @@ -10,8 +10,8 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/incentives/keeper" - "github.com/EscanBE/evermint/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) // NewIncentivesProposalHandler creates a governance handler to manage new diff --git a/x/incentives/types/fuzz_test.go b/x/incentives/types/fuzz_test.go index 8452bce6e5..9316ab198a 100644 --- a/x/incentives/types/fuzz_test.go +++ b/x/incentives/types/fuzz_test.go @@ -5,8 +5,8 @@ package types_test import ( "testing" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) func FuzzSplitGasMeterKey(f *testing.F) { diff --git a/x/incentives/types/gas_meter.go b/x/incentives/types/gas_meter.go index 657b015bdd..cba9f85605 100644 --- a/x/incentives/types/gas_meter.go +++ b/x/incentives/types/gas_meter.go @@ -1,7 +1,7 @@ package types import ( - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/incentives/types/gas_meter_test.go b/x/incentives/types/gas_meter_test.go index dc847289ed..6d3197d22b 100644 --- a/x/incentives/types/gas_meter_test.go +++ b/x/incentives/types/gas_meter_test.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) type GasMeterTestSuite struct { diff --git a/x/incentives/types/genesis_test.go b/x/incentives/types/genesis_test.go index 3e4b43840e..2f554179de 100644 --- a/x/incentives/types/genesis_test.go +++ b/x/incentives/types/genesis_test.go @@ -1,7 +1,7 @@ package types import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" diff --git a/x/incentives/types/incentive.go b/x/incentives/types/incentive.go index e2c32bc39e..339246aa2d 100644 --- a/x/incentives/types/incentive.go +++ b/x/incentives/types/incentive.go @@ -3,7 +3,7 @@ package types import ( "fmt" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/incentives/types/incentive_test.go b/x/incentives/types/incentive_test.go index 1471fb95f7..4263ee2c45 100644 --- a/x/incentives/types/incentive_test.go +++ b/x/incentives/types/incentive_test.go @@ -2,7 +2,7 @@ package types_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) type IncentiveTestSuite struct { diff --git a/x/incentives/types/interfaces.go b/x/incentives/types/interfaces.go index 65e44284c9..a3e629a9ea 100644 --- a/x/incentives/types/interfaces.go +++ b/x/incentives/types/interfaces.go @@ -13,10 +13,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/incentives/types/keys_test.go b/x/incentives/types/keys_test.go index ad52613b6d..3aafc736f9 100644 --- a/x/incentives/types/keys_test.go +++ b/x/incentives/types/keys_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index 3c629f8102..00957336c2 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/params_test.go b/x/incentives/types/params_test.go index d29693eabd..b614518764 100644 --- a/x/incentives/types/params_test.go +++ b/x/incentives/types/params_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/proposal.go b/x/incentives/types/proposal.go index 01db16baee..72f0df8bd7 100644 --- a/x/incentives/types/proposal.go +++ b/x/incentives/types/proposal.go @@ -4,7 +4,7 @@ import ( "errors" fmt "fmt" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ) diff --git a/x/incentives/types/proposal_test.go b/x/incentives/types/proposal_test.go index acf9676d80..1bd91d418f 100644 --- a/x/incentives/types/proposal_test.go +++ b/x/incentives/types/proposal_test.go @@ -1,15 +1,15 @@ package types_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/incentives/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) type ProposalTestSuite struct { diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go index 0c1c191283..07b766d4e5 100644 --- a/x/inflation/client/cli/query.go +++ b/x/inflation/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" ) diff --git a/x/inflation/genesis.go b/x/inflation/genesis.go index 622adf67c7..92d994d2be 100644 --- a/x/inflation/genesis.go +++ b/x/inflation/genesis.go @@ -2,8 +2,8 @@ package inflation import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/inflation/keeper" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/handler.go b/x/inflation/handler.go index 5df336d830..68f2b70c3d 100644 --- a/x/inflation/handler.go +++ b/x/inflation/handler.go @@ -2,7 +2,7 @@ package inflation import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/inflation/keeper/epoch_info.go b/x/inflation/keeper/epoch_info.go index e66b49ea33..8d1fd534cc 100644 --- a/x/inflation/keeper/epoch_info.go +++ b/x/inflation/keeper/epoch_info.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/epoch_info_test.go b/x/inflation/keeper/epoch_info_test.go index d645eea53d..5578c668f8 100644 --- a/x/inflation/keeper/epoch_info_test.go +++ b/x/inflation/keeper/epoch_info_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "fmt" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) func (suite *KeeperTestSuite) TestSetGetEpochIdentifier() { diff --git a/x/inflation/keeper/grpc_query.go b/x/inflation/keeper/grpc_query.go index 009c0983b4..d61a762b77 100644 --- a/x/inflation/keeper/grpc_query.go +++ b/x/inflation/keeper/grpc_query.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/grpc_query_test.go b/x/inflation/keeper/grpc_query_test.go index afcfeda35f..0646f89824 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "cosmossdk.io/math" "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" sdk "github.com/cosmos/cosmos-sdk/types" - evertypes "github.com/EscanBE/evermint/v12/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) func (suite *KeeperTestSuite) TestPeriod() { //nolint:dupl diff --git a/x/inflation/keeper/hooks.go b/x/inflation/keeper/hooks.go index ad94004431..fd8916bd38 100644 --- a/x/inflation/keeper/hooks.go +++ b/x/inflation/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/inflation/keeper/hooks_test.go b/x/inflation/keeper/hooks_test.go index 2cb5ff6978..86373a2878 100644 --- a/x/inflation/keeper/hooks_test.go +++ b/x/inflation/keeper/hooks_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() { diff --git a/x/inflation/keeper/inflation.go b/x/inflation/keeper/inflation.go index 7acd64232e..1b469928d9 100644 --- a/x/inflation/keeper/inflation.go +++ b/x/inflation/keeper/inflation.go @@ -3,11 +3,11 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" - "github.com/EscanBE/evermint/v12/utils" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/utils" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) // 200M token at year 4 allocated to the team diff --git a/x/inflation/keeper/inflation_test.go b/x/inflation/keeper/inflation_test.go index db69945ed6..ff584b1142 100644 --- a/x/inflation/keeper/inflation_test.go +++ b/x/inflation/keeper/inflation_test.go @@ -3,10 +3,10 @@ package keeper_test import ( sdkmath "cosmossdk.io/math" "fmt" - "github.com/EscanBE/evermint/v12/constants" - evertypes "github.com/EscanBE/evermint/v12/types" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/constants" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/inflation/keeper/integration_test.go b/x/inflation/keeper/integration_test.go index b0b9f2cd55..9ed5a7bcfb 100644 --- a/x/inflation/keeper/integration_test.go +++ b/x/inflation/keeper/integration_test.go @@ -3,14 +3,14 @@ package keeper_test import ( "time" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" ) var ( diff --git a/x/inflation/keeper/keeper.go b/x/inflation/keeper/keeper.go index e740e691ab..042b71d986 100644 --- a/x/inflation/keeper/keeper.go +++ b/x/inflation/keeper/keeper.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) // Keeper of the inflation store diff --git a/x/inflation/keeper/migrations.go b/x/inflation/keeper/migrations.go index 7a1b15c732..c24cc56783 100644 --- a/x/inflation/keeper/migrations.go +++ b/x/inflation/keeper/migrations.go @@ -1,9 +1,9 @@ package keeper import ( - v2 "github.com/EscanBE/evermint/v12/x/inflation/migrations/v2" - v3 "github.com/EscanBE/evermint/v12/x/inflation/migrations/v3" - "github.com/EscanBE/evermint/v12/x/inflation/types" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v2" + v3 "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v3" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/migrations_test.go b/x/inflation/keeper/migrations_test.go index 6d51fda8f0..cc6a91ce3d 100644 --- a/x/inflation/keeper/migrations_test.go +++ b/x/inflation/keeper/migrations_test.go @@ -1,11 +1,11 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - inflationkeeper "github.com/EscanBE/evermint/v12/x/inflation/keeper" - v2types "github.com/EscanBE/evermint/v12/x/inflation/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + inflationkeeper "github.com/VictorTrustyDev/nevermind/v12/x/inflation/keeper" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/inflation/keeper/msg_server.go b/x/inflation/keeper/msg_server.go index 54e57f0f69..0e8fbdfc74 100644 --- a/x/inflation/keeper/msg_server.go +++ b/x/inflation/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/inflation/keeper/msg_server_test.go b/x/inflation/keeper/msg_server_test.go index 2df55c372a..a7e923b224 100644 --- a/x/inflation/keeper/msg_server_test.go +++ b/x/inflation/keeper/msg_server_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/inflation/keeper/params.go b/x/inflation/keeper/params.go index f6092627fb..80a282b919 100644 --- a/x/inflation/keeper/params.go +++ b/x/inflation/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/params_test.go b/x/inflation/keeper/params_test.go index d7cef0ba4c..a4cdbbd703 100644 --- a/x/inflation/keeper/params_test.go +++ b/x/inflation/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/inflation/keeper/periods.go b/x/inflation/keeper/periods.go index 9f184f9207..f78fb3d2ba 100644 --- a/x/inflation/keeper/periods.go +++ b/x/inflation/keeper/periods.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/setup_test.go b/x/inflation/keeper/setup_test.go index b23ea6bb7c..611983a9e6 100644 --- a/x/inflation/keeper/setup_test.go +++ b/x/inflation/keeper/setup_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) var denomMint = types.DefaultInflationDenom @@ -21,7 +21,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient consAddress sdk.ConsAddress diff --git a/x/inflation/keeper/utils_test.go b/x/inflation/keeper/utils_test.go index c5ac5fc5b7..c4e21968bf 100644 --- a/x/inflation/keeper/utils_test.go +++ b/x/inflation/keeper/utils_test.go @@ -1,14 +1,14 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/testutil" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/x/inflation/migrations/v2/migrate.go b/x/inflation/migrations/v2/migrate.go index 9ae62e466c..8988422097 100644 --- a/x/inflation/migrations/v2/migrate.go +++ b/x/inflation/migrations/v2/migrate.go @@ -1,8 +1,8 @@ package v2 import ( - v2types "github.com/EscanBE/evermint/v12/x/inflation/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/inflation/migrations/v2/migrate_test.go b/x/inflation/migrations/v2/migrate_test.go index be38272178..c2ab0f4ea2 100644 --- a/x/inflation/migrations/v2/migrate_test.go +++ b/x/inflation/migrations/v2/migrate_test.go @@ -6,12 +6,12 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/EscanBE/evermint/v12/x/inflation/migrations/v2" - "github.com/EscanBE/evermint/v12/x/inflation/types" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v2" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v2types "github.com/EscanBE/evermint/v12/x/inflation/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v2/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/inflation/migrations/v2/types/params.go b/x/inflation/migrations/v2/types/params.go index 85767cffb0..a38d5f4236 100644 --- a/x/inflation/migrations/v2/types/params.go +++ b/x/inflation/migrations/v2/types/params.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/inflation/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/inflation/migrations/v3/migrate_test.go b/x/inflation/migrations/v3/migrate_test.go index 0f8d1fe5dd..55efc60a80 100644 --- a/x/inflation/migrations/v3/migrate_test.go +++ b/x/inflation/migrations/v3/migrate_test.go @@ -3,8 +3,8 @@ package v3_test import ( "testing" - v3 "github.com/EscanBE/evermint/v12/x/inflation/migrations/v3" - "github.com/EscanBE/evermint/v12/x/inflation/types" + v3 "github.com/VictorTrustyDev/nevermind/v12/x/inflation/migrations/v3" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/inflation/module.go b/x/inflation/module.go index 2b816f0cb1..67630c6c83 100644 --- a/x/inflation/module.go +++ b/x/inflation/module.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/x/inflation/client/cli" - "github.com/EscanBE/evermint/v12/x/inflation/keeper" - "github.com/EscanBE/evermint/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" ) // type check to ensure the interface is properly implemented diff --git a/x/inflation/types/genesis.go b/x/inflation/types/genesis.go index a7ebba10c7..e71b79eacc 100644 --- a/x/inflation/types/genesis.go +++ b/x/inflation/types/genesis.go @@ -3,7 +3,7 @@ package types import ( fmt "fmt" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" ) // NewGenesisState creates a new GenesisState object diff --git a/x/inflation/types/genesis_test.go b/x/inflation/types/genesis_test.go index 1daeae017e..69dd550860 100644 --- a/x/inflation/types/genesis_test.go +++ b/x/inflation/types/genesis_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" "github.com/stretchr/testify/suite" ) diff --git a/x/inflation/types/inflation_calculation.go b/x/inflation/types/inflation_calculation.go index 572c40dcd7..9b4937445c 100644 --- a/x/inflation/types/inflation_calculation.go +++ b/x/inflation/types/inflation_calculation.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" ) // CalculateEpochMintProvision returns mint provision per epoch @@ -39,9 +39,9 @@ func CalculateEpochMintProvision( // epochProvision = periodProvision / epochsPerPeriod epochProvision := periodProvision.Quo(sdk.NewDec(epochsPerPeriod)) - // Multiply epochMintProvision with power reduction (10^18 for wei) as the + // Multiply epochMintProvision with power reduction (10^18 for uever) as the // calculation is based on `ether` and the issued tokens need to be given in - // `wei` + // `uever` epochProvision = epochProvision.Mul(sdk.NewDecFromInt(evertypes.PowerReduction)) return epochProvision } diff --git a/x/inflation/types/params.go b/x/inflation/types/params.go index 7f20aae132..4a76299cee 100644 --- a/x/inflation/types/params.go +++ b/x/inflation/types/params.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/types/params_test.go b/x/inflation/types/params_test.go index 9db9e033fd..82473d29e3 100644 --- a/x/inflation/types/params_test.go +++ b/x/inflation/types/params_test.go @@ -1,7 +1,7 @@ package types import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/recovery/client/cli/query.go b/x/recovery/client/cli/query.go index 0759c9c659..ed6c1152cf 100644 --- a/x/recovery/client/cli/query.go +++ b/x/recovery/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // GetQueryCmd returns the parent command for all recovery CLI query commands. diff --git a/x/recovery/genesis.go b/x/recovery/genesis.go index 76ccc5e51a..741ff5180f 100644 --- a/x/recovery/genesis.go +++ b/x/recovery/genesis.go @@ -4,8 +4,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/recovery/keeper" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // InitGenesis import module genesis diff --git a/x/recovery/genesis_test.go b/x/recovery/genesis_test.go index 21d4126de1..6f7b138306 100644 --- a/x/recovery/genesis_test.go +++ b/x/recovery/genesis_test.go @@ -2,7 +2,7 @@ package recovery_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -13,12 +13,12 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/recovery" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) type GenesisTestSuite struct { @@ -26,7 +26,7 @@ type GenesisTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind genesis types.GenesisState } diff --git a/x/recovery/handler.go b/x/recovery/handler.go index 88b86a8727..c52f438a87 100644 --- a/x/recovery/handler.go +++ b/x/recovery/handler.go @@ -2,7 +2,7 @@ package recovery import ( errorsmod "cosmossdk.io/errors" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/recovery/ibc_middleware.go b/x/recovery/ibc_middleware.go index f503f14774..bc006a025d 100644 --- a/x/recovery/ibc_middleware.go +++ b/x/recovery/ibc_middleware.go @@ -9,8 +9,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/x/recovery/keeper" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/recovery/keeper/grpc_query.go b/x/recovery/keeper/grpc_query.go index aa608de464..900c60d7a7 100644 --- a/x/recovery/keeper/grpc_query.go +++ b/x/recovery/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/recovery/keeper/grpc_query_test.go b/x/recovery/keeper/grpc_query_test.go index 942846f120..7231ec1318 100644 --- a/x/recovery/keeper/grpc_query_test.go +++ b/x/recovery/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/recovery/keeper/ibc_callbacks.go b/x/recovery/keeper/ibc_callbacks.go index 7ef0f1a812..b2ab0cc15a 100644 --- a/x/recovery/keeper/ibc_callbacks.go +++ b/x/recovery/keeper/ibc_callbacks.go @@ -16,9 +16,9 @@ import ( host "github.com/cosmos/ibc-go/v6/modules/core/24-host" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/EscanBE/evermint/v12/ibc" - "github.com/EscanBE/evermint/v12/utils" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/ibc" + "github.com/VictorTrustyDev/nevermind/v12/utils" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // OnRecvPacket performs an IBC receive callback. It returns the tokens that @@ -222,7 +222,7 @@ func (k Keeper) OnRecvPacket( } // GetIBCDenomDestinationIdentifiers returns the destination port and channel of -// the IBC denomination, i.e port and channel on Evermint for the voucher. It +// the IBC denomination, i.e port and channel on Nevermind for the voucher. It // returns an error if: // - the denomination is invalid // - the denom trace is not found on the store diff --git a/x/recovery/keeper/ibc_callbacks_integration_test.go b/x/recovery/keeper/ibc_callbacks_integration_test.go index 47164b904e..b2d1e1dc34 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_test.go @@ -1,15 +1,15 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "time" - "github.com/EscanBE/evermint/v12/app" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/testutil" - teststypes "github.com/EscanBE/evermint/v12/types/tests" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + teststypes "github.com/VictorTrustyDev/nevermind/v12/types/tests" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" @@ -38,44 +38,44 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := claimstypes.DefaultParams() params.AuthorizedChannels = []string{} - err := s.EvermintChain.App.(*app.Evermint).ClaimsKeeper.SetParams(s.EvermintChain.GetContext(), params) + err := s.NevermindChain.App.(*app.Nevermind).ClaimsKeeper.SetParams(s.NevermindChain.GetContext(), params) s.Require().NoError(err) sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - receiver = s.EvermintChain.SenderAccount.GetAddress().String() + receiver = s.NevermindChain.SenderAccount.GetAddress().String() senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) }) It("should transfer and not recover tokens", func() { - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo).To(Equal(sdk.NewCoin(teststypes.UosmoIbcdenom, coinOsmo.Amount))) }) }) Describe("from an authorized, non-EVM chain (e.g. Osmosis)", func() { - Describe("to a different account on Evermint (sender != recipient)", func() { + Describe("to a different account on Nevermind (sender != recipient)", func() { BeforeEach(func() { sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() - receiver = s.EvermintChain.SenderAccount.GetAddress().String() + receiver = s.NevermindChain.SenderAccount.GetAddress().String() senderAcc = sdk.MustAccAddressFromBech32(sender) receiverAcc = sdk.MustAccAddressFromBech32(receiver) }) It("should transfer and not recover tokens", func() { - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo).To(Equal(sdk.NewCoin(teststypes.UosmoIbcdenom, coinOsmo.Amount))) }) }) - Describe("to the sender's own eth_secp256k1 account on Evermint (sender == recipient)", func() { + Describe("to the sender's own eth_secp256k1 account on Nevermind (sender == recipient)", func() { BeforeEach(func() { sender = s.IBCOsmosisChain.SenderAccount.GetAddress().String() receiver = s.IBCOsmosisChain.SenderAccount.GetAddress().String() @@ -87,14 +87,14 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - s.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(s.EvermintChain.GetContext(), params) //nolint:errcheck + s.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(s.NevermindChain.GetContext(), params) //nolint:errcheck }) It("should not transfer or recover tokens", func() { - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo).To(Equal(sdk.NewCoin(teststypes.UosmoIbcdenom, coinOsmo.Amount))) }) }) @@ -105,19 +105,19 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { amt := sdk.NewInt(int64(100)) coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, amt)) claim = claimstypes.NewClaimsRecord(amt) - s.EvermintChain.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(s.EvermintChain.GetContext(), senderAcc, claim) + s.NevermindChain.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(s.NevermindChain.GetContext(), senderAcc, claim) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(s.EvermintChain.GetContext(), s.EvermintChain.App.(*app.Evermint).BankKeeper, claimstypes.ModuleName, coins) + err := testutil.FundModuleAccount(s.NevermindChain.GetContext(), s.NevermindChain.App.(*app.Nevermind).BankKeeper, claimstypes.ModuleName, coins) s.Require().NoError(err) }) It("should not transfer or recover tokens", func() { // Prevent further funds from getting stuck - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) }) }) @@ -129,39 +129,39 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { coins := sdk.NewCoins(sdk.NewCoin(constants.BaseDenom, sdk.NewInt(int64(75)))) claim = claimstypes.NewClaimsRecord(amt) claim.MarkClaimed(claimstypes.ActionIBCTransfer) - s.EvermintChain.App.(*app.Evermint).ClaimsKeeper.SetClaimsRecord(s.EvermintChain.GetContext(), senderAcc, claim) + s.NevermindChain.App.(*app.Nevermind).ClaimsKeeper.SetClaimsRecord(s.NevermindChain.GetContext(), senderAcc, claim) // update the escrowed account balance to maintain the invariant - err := testutil.FundModuleAccount(s.EvermintChain.GetContext(), s.EvermintChain.App.(*app.Evermint).BankKeeper, claimstypes.ModuleName, coins) + err := testutil.FundModuleAccount(s.NevermindChain.GetContext(), s.NevermindChain.App.(*app.Nevermind).BankKeeper, claimstypes.ModuleName, coins) s.Require().NoError(err) // native coin & ibc tokens that originated from the sender's chain - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) - timeout = uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) + timeout = uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) }) It("should transfer tokens to the recipient and perform recovery", func() { s.T().Skip("TODO: fix this test") // Escrow before relaying packets - balanceEscrow := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), transfertypes.GetEscrowAddress("transfer", "channel-0"), constants.BaseDenom) + balanceEscrow := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), transfertypes.GetEscrowAddress("transfer", "channel-0"), constants.BaseDenom) Expect(balanceEscrow).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) // Relay both packets that were sent in the ibc_callback - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) s.Require().NoError(err) // Check that the native coin were recovered - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin.IsZero()).To(BeTrue()) ibcNativeCoin := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) Expect(ibcNativeCoin).To(Equal(sdk.NewCoin(teststypes.NativeCoinIbcdenom, nativeCoin.Amount))) // Check that the uosmo were recovered - ibcOsmo = s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo = s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) nativeOsmo := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") Expect(nativeOsmo).To(Equal(coinOsmo)) @@ -169,12 +169,12 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { It("should not claim/migrate/merge claims records", func() { // Relay both packets that were sent in the ibc_callback - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) s.Require().NoError(err) - claimAfter, _ := s.EvermintChain.App.(*app.Evermint).ClaimsKeeper.GetClaimsRecord(s.EvermintChain.GetContext(), senderAcc) + claimAfter, _ := s.NevermindChain.App.(*app.Nevermind).ClaimsKeeper.GetClaimsRecord(s.NevermindChain.GetContext(), senderAcc) Expect(claim).To(Equal(claimAfter)) }) }) @@ -184,29 +184,29 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { When("recipient has no ibc vouchers that originated from other chains", func() { It("should transfer and recover tokens", func() { // native coin & ibc tokens that originated from the sender's chain - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) - timeout = uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, coinOsmo.Denom, coinOsmo.Amount.Int64(), sender, receiver, 1) + timeout = uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) // Escrow before relaying packets - balanceEscrow := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), transfertypes.GetEscrowAddress("transfer", "channel-0"), constants.BaseDenom) + balanceEscrow := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), transfertypes.GetEscrowAddress("transfer", "channel-0"), constants.BaseDenom) Expect(balanceEscrow).To(Equal(nativeCoin)) - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) // Relay both packets that were sent in the ibc_callback - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) s.Require().NoError(err) // Check that the native coin were recovered - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin.IsZero()).To(BeTrue()) ibcNativeCoin := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) Expect(ibcNativeCoin).To(Equal(sdk.NewCoin(teststypes.NativeCoinIbcdenom, nativeCoin.Amount))) // Check that the uosmo were recovered - ibcOsmo = s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo = s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) nativeOsmo := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") Expect(nativeOsmo).To(Equal(coinOsmo)) @@ -218,60 +218,60 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - s.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(s.EvermintChain.GetContext(), params) //nolint:errcheck + s.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(s.NevermindChain.GetContext(), params) //nolint:errcheck - // Send uatom from Cosmos to Evermint - s.SendAndReceiveMessage(s.pathCosmosEvermint, s.IBCCosmosChain, coinAtom.Denom, coinAtom.Amount.Int64(), s.IBCCosmosChain.SenderAccount.GetAddress().String(), receiver, 1) + // Send uatom from Cosmos to Nevermind + s.SendAndReceiveMessage(s.pathCosmosNevermind, s.IBCCosmosChain, coinAtom.Denom, coinAtom.Amount.Int64(), s.IBCCosmosChain.SenderAccount.GetAddress().String(), receiver, 1) params.EnableRecovery = true - s.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(s.EvermintChain.GetContext(), params) //nolint:errcheck + s.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(s.NevermindChain.GetContext(), params) //nolint:errcheck }) It("should not recover tokens that originated from other chains", func() { - // Send uosmo from Osmosis to Evermint - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) + // Send uosmo from Osmosis to Nevermind + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 1) // Relay both packets that were sent in the ibc_callback - timeout := uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + timeout := uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) s.Require().NoError(err) // native coin was recovered from user address - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin.IsZero()).To(BeTrue()) ibcNativeCoin := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) Expect(ibcNativeCoin).To(Equal(sdk.NewCoin(teststypes.NativeCoinIbcdenom, nativeCoin.Amount))) // Check that the uosmo were retrieved - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) nativeOsmo := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") Expect(nativeOsmo).To(Equal(coinOsmo)) // Check that the atoms were not retrieved - ibcAtom := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UatomIbcdenom) + ibcAtom := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UatomIbcdenom) Expect(ibcAtom).To(Equal(sdk.NewCoin(teststypes.UatomIbcdenom, coinAtom.Amount))) - // Repeat transaction from Osmosis to Evermint - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 2) + // Repeat transaction from Osmosis to Nevermind + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 2) - timeout = uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 3, timeout)) + timeout = uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 3, timeout)) s.Require().NoError(err) // No further tokens recovered - nativeCoin = s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin = s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin.IsZero()).To(BeTrue()) ibcNativeCoin = s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) Expect(ibcNativeCoin).To(Equal(sdk.NewCoin(teststypes.NativeCoinIbcdenom, nativeCoin.Amount))) - ibcOsmo = s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo = s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) nativeOsmo = s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") Expect(nativeOsmo).To(Equal(coinOsmo)) - ibcAtom = s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, teststypes.UatomIbcdenom) + ibcAtom = s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, teststypes.UatomIbcdenom) Expect(ibcAtom).To(Equal(sdk.NewCoin(teststypes.UatomIbcdenom, coinAtom.Amount))) }) }) @@ -281,53 +281,53 @@ var _ = Describe("Recovery: Performing an IBC Transfer", Ordered, func() { BeforeEach(func() { params := types.DefaultParams() params.EnableRecovery = false - err := s.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(s.EvermintChain.GetContext(), params) + err := s.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(s.NevermindChain.GetContext(), params) s.Require().NoError(err) s.SendAndReceiveMessage(s.pathOsmosisCosmos, s.IBCCosmosChain, coinAtom.Denom, coinAtom.Amount.Int64(), s.IBCCosmosChain.SenderAccount.GetAddress().String(), receiver, 1) // Send IBC transaction of 10 ibc/uatom - transferMsg := transfertypes.NewMsgTransfer(s.pathOsmosisEvermint.EndpointA.ChannelConfig.PortID, s.pathOsmosisEvermint.EndpointA.ChannelID, sdk.NewCoin(teststypes.UatomIbcdenom, sdk.NewInt(10)), sender, receiver, timeoutHeight, 0, "") + transferMsg := transfertypes.NewMsgTransfer(s.pathOsmosisNevermind.EndpointA.ChannelConfig.PortID, s.pathOsmosisNevermind.EndpointA.ChannelID, sdk.NewCoin(teststypes.UatomIbcdenom, sdk.NewInt(10)), sender, receiver, timeoutHeight, 0, "") _, err = ibctesting.SendMsgs(s.IBCOsmosisChain, ibctesting.DefaultFeeAmt, transferMsg) s.Require().NoError(err) // message committed transfer := transfertypes.NewFungibleTokenPacketData("transfer/channel-1/uatom", "10", sender, receiver, "") - packet := channeltypes.NewPacket(transfer.GetBytes(), 1, s.pathOsmosisEvermint.EndpointA.ChannelConfig.PortID, s.pathOsmosisEvermint.EndpointA.ChannelID, s.pathOsmosisEvermint.EndpointB.ChannelConfig.PortID, s.pathOsmosisEvermint.EndpointB.ChannelID, timeoutHeight, 0) - // Receive message on the evermint side, and send ack - err = s.pathOsmosisEvermint.RelayPacket(packet) + packet := channeltypes.NewPacket(transfer.GetBytes(), 1, s.pathOsmosisNevermind.EndpointA.ChannelConfig.PortID, s.pathOsmosisNevermind.EndpointA.ChannelID, s.pathOsmosisNevermind.EndpointB.ChannelConfig.PortID, s.pathOsmosisNevermind.EndpointB.ChannelID, timeoutHeight, 0) + // Receive message on the nevermind side, and send ack + err = s.pathOsmosisNevermind.RelayPacket(packet) s.Require().NoError(err) // Check that the ibc/uatom are available - osmoIBCAtom := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UatomOsmoIbcdenom) + osmoIBCAtom := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UatomOsmoIbcdenom) s.Require().Equal(osmoIBCAtom.Amount, coinAtom.Amount) params.EnableRecovery = true - s.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(s.EvermintChain.GetContext(), params) //nolint:errcheck + s.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(s.NevermindChain.GetContext(), params) //nolint:errcheck }) It("should not recover tokens that originated from other chains", func() { - s.SendAndReceiveMessage(s.pathOsmosisEvermint, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 2) + s.SendAndReceiveMessage(s.pathOsmosisNevermind, s.IBCOsmosisChain, "uosmo", 10, sender, receiver, 2) // Relay packets that were sent in the ibc_callback - timeout := uint64(s.EvermintChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) - err := s.pathOsmosisEvermint.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) + timeout := uint64(s.NevermindChain.GetContext().BlockTime().Add(time.Hour * 4).Add(time.Second * -20).UnixNano()) + err := s.pathOsmosisNevermind.RelayPacket(CreatePacket("10000", constants.BaseDenom, sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 1, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/transfer/channel-1/uatom", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/transfer/channel-1/uatom", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 2, timeout)) s.Require().NoError(err) - err = s.pathOsmosisEvermint.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 3, timeout)) + err = s.pathOsmosisNevermind.RelayPacket(CreatePacket("10", "transfer/channel-0/uosmo", sender, receiver, "transfer", "channel-0", "transfer", "channel-0", 3, timeout)) s.Require().NoError(err) // native coin was recovered from user address - nativeCoin := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), senderAcc, constants.BaseDenom) + nativeCoin := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), senderAcc, constants.BaseDenom) Expect(nativeCoin.IsZero()).To(BeTrue()) ibcNativeCoin := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, teststypes.NativeCoinIbcdenom) Expect(ibcNativeCoin).To(Equal(sdk.NewCoin(teststypes.NativeCoinIbcdenom, nativeCoin.Amount))) // Check that the uosmo were recovered - ibcOsmo := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) + ibcOsmo := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UosmoIbcdenom) Expect(ibcOsmo.IsZero()).To(BeTrue()) nativeOsmo := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), receiverAcc, "uosmo") Expect(nativeOsmo).To(Equal(coinOsmo)) // Check that the ibc/uatom were retrieved - osmoIBCAtom := s.EvermintChain.App.(*app.Evermint).BankKeeper.GetBalance(s.EvermintChain.GetContext(), receiverAcc, teststypes.UatomOsmoIbcdenom) + osmoIBCAtom := s.NevermindChain.App.(*app.Nevermind).BankKeeper.GetBalance(s.NevermindChain.GetContext(), receiverAcc, teststypes.UatomOsmoIbcdenom) Expect(osmoIBCAtom.IsZero()).To(BeTrue()) ibcAtom := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, teststypes.UatomIbcdenom) Expect(ibcAtom).To(Equal(sdk.NewCoin(teststypes.UatomIbcdenom, sdk.NewInt(10)))) diff --git a/x/recovery/keeper/ibc_callbacks_test.go b/x/recovery/keeper/ibc_callbacks_test.go index 2937b56000..04ec6ca3f4 100644 --- a/x/recovery/keeper/ibc_callbacks_test.go +++ b/x/recovery/keeper/ibc_callbacks_test.go @@ -2,12 +2,12 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -19,11 +19,11 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v6/testing" ibcmock "github.com/cosmos/ibc-go/v6/testing/mock" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - incentivestypes "github.com/EscanBE/evermint/v12/x/incentives/types" - "github.com/EscanBE/evermint/v12/x/recovery/keeper" - "github.com/EscanBE/evermint/v12/x/recovery/types" - vestingtypes "github.com/EscanBE/evermint/v12/x/vesting/types" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + incentivestypes "github.com/VictorTrustyDev/nevermind/v12/x/incentives/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" + vestingtypes "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) func (suite *KeeperTestSuite) TestOnRecvPacket() { @@ -40,11 +40,11 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { ethsecpNativeAddr := sdk.AccAddress(ethPk.PubKey().Address()).String() ethsecpAddrCosmos := sdk.MustBech32ifyAddressBytes(sdk.Bech32MainPrefix, ethsecpAddr) - // Setup Cosmos <=> Evermint IBC relayer + // Setup Cosmos <=> Nevermind IBC relayer denom := "uatom" sourceChannel := "channel-292" - evermintChannel := claimstypes.DefaultAuthorizedChannels[1] - path := fmt.Sprintf("%s/%s", transfertypes.PortID, evermintChannel) + nevermindChannel := claimstypes.DefaultAuthorizedChannels[1] + path := fmt.Sprintf("%s/%s", transfertypes.PortID, nevermindChannel) timeoutHeight := clienttypes.NewHeight(0, 100) disabledTimeoutTimestamp := uint64(0) @@ -114,7 +114,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", "invalid", ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, false, false, @@ -125,7 +125,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", "badba1sv9m0g7ycejwr3s369km58h5qe7xj77hvcxrms", ethsecpAddrCosmos, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, false, false, @@ -136,7 +136,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", ethsecpNativeAddr, "badbadhf0468jjpe6m6vx38s97z2qqe8ldu0njdyf625", "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, false, false, @@ -149,7 +149,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, blockedAddr.String(), "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, false, false, @@ -163,7 +163,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, otherSecpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, false, @@ -180,7 +180,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", ethsecpAddrCosmos, ethsecpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, false, @@ -194,7 +194,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { addr := incentivesAcc.GetAddress().String() transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", addr, addr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, false, @@ -208,7 +208,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", ethsecpAddrCosmos, ethsecpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, false, @@ -219,7 +219,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) invalidDenom := "ibc/1" coins := sdk.NewCoins(sdk.NewCoin(invalidDenom, sdk.NewInt(1000))) @@ -240,7 +240,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { func() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, true, @@ -253,7 +253,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) }, true, true, @@ -262,15 +262,15 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { { "recovery - send uosmo from osmosis to our chain", func() { - // Setup Osmosis <=> Evermint IBC relayer + // Setup Osmosis <=> Nevermind IBC relayer denom = "uosmo" sourceChannel = "channel-204" - evermintChannel = claimstypes.DefaultAuthorizedChannels[0] - path = fmt.Sprintf("%s/%s", transfertypes.PortID, evermintChannel) + nevermindChannel = claimstypes.DefaultAuthorizedChannels[0] + path = fmt.Sprintf("%s/%s", transfertypes.PortID, nevermindChannel) transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpNativeAddr, "") bz := transfertypes.ModuleCdc.MustMarshalJSON(&transfer) - packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet = channeltypes.NewPacket(bz, 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) // TODO TEST }, true, @@ -304,10 +304,10 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { Counterparty: channeltypes.NewCounterparty(transfertypes.PortID, sourceChannel), ConnectionHops: []string{sourceChannel}, } - suite.app.IBCKeeper.ChannelKeeper.SetChannel(suite.ctx, transfertypes.PortID, evermintChannel, channel) + suite.app.IBCKeeper.ChannelKeeper.SetChannel(suite.ctx, transfertypes.PortID, nevermindChannel, channel) // Set Next Sequence Send - suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, transfertypes.PortID, evermintChannel, 1) + suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, transfertypes.PortID, nevermindChannel, 1) // Mock the Transferkeeper to always return nil on SendTransfer(), as this // method requires a successful handshake with the counterparty chain. @@ -514,11 +514,11 @@ func (suite *KeeperTestSuite) TestOnRecvPacketFailTransfer() { secpNativeAddr := secpAddr.String() secpAddrCosmos := sdk.MustBech32ifyAddressBytes(sdk.Bech32MainPrefix, secpAddr) - // Setup Cosmos <=> Evermint IBC relayer + // Setup Cosmos <=> Nevermind IBC relayer denom := "uatom" sourceChannel := "channel-292" - evermintChannel := claimstypes.DefaultAuthorizedChannels[1] - path := fmt.Sprintf("%s/%s", transfertypes.PortID, evermintChannel) + nevermindChannel := claimstypes.DefaultAuthorizedChannels[1] + path := fmt.Sprintf("%s/%s", transfertypes.PortID, nevermindChannel) var mockTransferKeeper *MockTransferKeeper expAck := ibcmock.MockAcknowledgement @@ -572,7 +572,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacketFailTransfer() { suite.Require().NoError(err) transfer := transfertypes.NewFungibleTokenPacketData(denom, "100", secpAddrCosmos, secpNativeAddr, "") - packet := channeltypes.NewPacket(transfer.GetBytes(), 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, evermintChannel, timeoutHeight, 0) + packet := channeltypes.NewPacket(transfer.GetBytes(), 100, transfertypes.PortID, sourceChannel, transfertypes.PortID, nevermindChannel, timeoutHeight, 0) mockTransferKeeper = &MockTransferKeeper{ Keeper: suite.app.BankKeeper, diff --git a/x/recovery/keeper/keeper.go b/x/recovery/keeper/keeper.go index fbaad045d8..dabc99b159 100644 --- a/x/recovery/keeper/keeper.go +++ b/x/recovery/keeper/keeper.go @@ -14,7 +14,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" "github.com/cosmos/ibc-go/v6/modules/core/exported" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) var _ porttypes.ICS4Wrapper = Keeper{} diff --git a/x/recovery/keeper/migrations.go b/x/recovery/keeper/migrations.go index 94624934cc..d377448fc2 100644 --- a/x/recovery/keeper/migrations.go +++ b/x/recovery/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v2 "github.com/EscanBE/evermint/v12/x/recovery/migrations/v2" - "github.com/EscanBE/evermint/v12/x/recovery/types" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/recovery/migrations/v2" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/recovery/keeper/mock_test.go b/x/recovery/keeper/mock_test.go index 963ecb6602..a53ce9b567 100644 --- a/x/recovery/keeper/mock_test.go +++ b/x/recovery/keeper/mock_test.go @@ -12,7 +12,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) var _ types.TransferKeeper = &MockTransferKeeper{} diff --git a/x/recovery/keeper/msg_server.go b/x/recovery/keeper/msg_server.go index bdd3c0daea..af55423dfd 100644 --- a/x/recovery/keeper/msg_server.go +++ b/x/recovery/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // UpdateParams implements the gRPC MsgServer interface. When an UpdateParams diff --git a/x/recovery/keeper/msg_server_test.go b/x/recovery/keeper/msg_server_test.go index 1616be83f0..afe13d77af 100644 --- a/x/recovery/keeper/msg_server_test.go +++ b/x/recovery/keeper/msg_server_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/recovery/keeper/params.go b/x/recovery/keeper/params.go index 73a7f32e32..d3dd64fe19 100644 --- a/x/recovery/keeper/params.go +++ b/x/recovery/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // GetParams returns the total set of recovery parameters. diff --git a/x/recovery/keeper/setup_test.go b/x/recovery/keeper/setup_test.go index 02d0d5e3de..60868ac435 100644 --- a/x/recovery/keeper/setup_test.go +++ b/x/recovery/keeper/setup_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -10,18 +10,18 @@ import ( "github.com/stretchr/testify/suite" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" ibcgotesting "github.com/cosmos/ibc-go/v6/testing" - "github.com/EscanBE/evermint/v12/app" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) var ( @@ -35,7 +35,7 @@ type KeeperTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClient types.QueryClient } @@ -72,12 +72,12 @@ type IBCTestingSuite struct { coordinator *ibcgotesting.Coordinator // testing chains used for convenience and readability - EvermintChain *ibcgotesting.TestChain + NevermindChain *ibcgotesting.TestChain IBCOsmosisChain *ibcgotesting.TestChain IBCCosmosChain *ibcgotesting.TestChain - pathOsmosisEvermint *ibctesting.Path - pathCosmosEvermint *ibctesting.Path + pathOsmosisNevermind *ibctesting.Path + pathCosmosNevermind *ibctesting.Path pathOsmosisCosmos *ibctesting.Path } diff --git a/x/recovery/keeper/utils_test.go b/x/recovery/keeper/utils_test.go index 310dc124b9..a13e4b00e0 100644 --- a/x/recovery/keeper/utils_test.go +++ b/x/recovery/keeper/utils_test.go @@ -1,14 +1,14 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strconv" - "github.com/EscanBE/evermint/v12/app" - ibctesting "github.com/EscanBE/evermint/v12/ibc/testing" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" - inflationtypes "github.com/EscanBE/evermint/v12/x/inflation/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + ibctesting "github.com/VictorTrustyDev/nevermind/v12/ibc/testing" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" + inflationtypes "github.com/VictorTrustyDev/nevermind/v12/x/inflation/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" @@ -39,30 +39,30 @@ func CreatePacket(amount, denom, sender, receiver, srcPort, srcChannel, dstPort, func (suite *IBCTestingSuite) SetupTest() { // initializes 3 test chains suite.coordinator = ibctesting.NewCoordinator(suite.T(), 1, 2) - suite.EvermintChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(1)) + suite.NevermindChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(1)) suite.IBCOsmosisChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(2)) suite.IBCCosmosChain = suite.coordinator.GetChain(ibcgotesting.GetChainID(3)) - suite.coordinator.CommitNBlocks(suite.EvermintChain, 2) + suite.coordinator.CommitNBlocks(suite.NevermindChain, 2) suite.coordinator.CommitNBlocks(suite.IBCOsmosisChain, 2) suite.coordinator.CommitNBlocks(suite.IBCCosmosChain, 2) - // Mint coins locked on the evermint account generated with secp. + // Mint coins locked on the nevermind account generated with secp. amt, ok := sdk.NewIntFromString("1000000000000000000000") suite.Require().True(ok) nativeCoin := sdk.NewCoin(constants.BaseDenom, amt) coins := sdk.NewCoins(nativeCoin) - err := suite.EvermintChain.App.(*app.Evermint).BankKeeper.MintCoins(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, coins) + err := suite.NevermindChain.App.(*app.Nevermind).BankKeeper.MintCoins(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, coins) suite.Require().NoError(err) // Fund sender address to pay fees - err = suite.EvermintChain.App.(*app.Evermint).BankKeeper.SendCoinsFromModuleToAccount(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, suite.EvermintChain.SenderAccount.GetAddress(), coins) + err = suite.NevermindChain.App.(*app.Nevermind).BankKeeper.SendCoinsFromModuleToAccount(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, suite.NevermindChain.SenderAccount.GetAddress(), coins) suite.Require().NoError(err) nativeCoin = sdk.NewCoin(constants.BaseDenom, sdk.NewInt(10000)) coins = sdk.NewCoins(nativeCoin) - err = suite.EvermintChain.App.(*app.Evermint).BankKeeper.MintCoins(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, coins) + err = suite.NevermindChain.App.(*app.Nevermind).BankKeeper.MintCoins(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, coins) suite.Require().NoError(err) - err = suite.EvermintChain.App.(*app.Evermint).BankKeeper.SendCoinsFromModuleToAccount(suite.EvermintChain.GetContext(), inflationtypes.ModuleName, suite.IBCOsmosisChain.SenderAccount.GetAddress(), coins) + err = suite.NevermindChain.App.(*app.Nevermind).BankKeeper.SendCoinsFromModuleToAccount(suite.NevermindChain.GetContext(), inflationtypes.ModuleName, suite.IBCOsmosisChain.SenderAccount.GetAddress(), coins) suite.Require().NoError(err) // Mint coins on the osmosis side which we'll use to unlock our native coin @@ -95,30 +95,30 @@ func (suite *IBCTestingSuite) SetupTest() { suite.Require().NoError(err) claimparams := claimstypes.DefaultParams() - claimparams.AirdropStartTime = suite.EvermintChain.GetContext().BlockTime() + claimparams.AirdropStartTime = suite.NevermindChain.GetContext().BlockTime() claimparams.EnableClaims = true - err = suite.EvermintChain.App.(*app.Evermint).ClaimsKeeper.SetParams(suite.EvermintChain.GetContext(), claimparams) + err = suite.NevermindChain.App.(*app.Nevermind).ClaimsKeeper.SetParams(suite.NevermindChain.GetContext(), claimparams) suite.Require().NoError(err) params := types.DefaultParams() params.EnableRecovery = true - err = suite.EvermintChain.App.(*app.Evermint).RecoveryKeeper.SetParams(suite.EvermintChain.GetContext(), params) + err = suite.NevermindChain.App.(*app.Nevermind).RecoveryKeeper.SetParams(suite.NevermindChain.GetContext(), params) suite.Require().NoError(err) - evmParams := suite.EvermintChain.App.(*app.Evermint).EvmKeeper.GetParams(s.EvermintChain.GetContext()) + evmParams := suite.NevermindChain.App.(*app.Nevermind).EvmKeeper.GetParams(s.NevermindChain.GetContext()) evmParams.EvmDenom = constants.BaseDenom - err = suite.EvermintChain.App.(*app.Evermint).EvmKeeper.SetParams(s.EvermintChain.GetContext(), evmParams) + err = suite.NevermindChain.App.(*app.Nevermind).EvmKeeper.SetParams(s.NevermindChain.GetContext(), evmParams) suite.Require().NoError(err) - suite.pathOsmosisEvermint = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.EvermintChain) // clientID, connectionID, channelID empty - suite.pathCosmosEvermint = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.EvermintChain) + suite.pathOsmosisNevermind = ibctesting.NewTransferPath(suite.IBCOsmosisChain, suite.NevermindChain) // clientID, connectionID, channelID empty + suite.pathCosmosNevermind = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.NevermindChain) suite.pathOsmosisCosmos = ibctesting.NewTransferPath(suite.IBCCosmosChain, suite.IBCOsmosisChain) - ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisEvermint) // clientID, connectionID, channelID filled - ibctesting.SetupPath(suite.coordinator, suite.pathCosmosEvermint) + ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisNevermind) // clientID, connectionID, channelID filled + ibctesting.SetupPath(suite.coordinator, suite.pathCosmosNevermind) ibctesting.SetupPath(suite.coordinator, suite.pathOsmosisCosmos) - suite.Require().Equal("07-tendermint-0", suite.pathOsmosisEvermint.EndpointA.ClientID) - suite.Require().Equal("connection-0", suite.pathOsmosisEvermint.EndpointA.ConnectionID) - suite.Require().Equal("channel-0", suite.pathOsmosisEvermint.EndpointA.ChannelID) + suite.Require().Equal("07-tendermint-0", suite.pathOsmosisNevermind.EndpointA.ClientID) + suite.Require().Equal("connection-0", suite.pathOsmosisNevermind.EndpointA.ConnectionID) + suite.Require().Equal("channel-0", suite.pathOsmosisNevermind.EndpointA.ChannelID) } var timeoutHeight = clienttypes.NewHeight(1000, 1000) diff --git a/x/recovery/migrations/v2/migrate.go b/x/recovery/migrations/v2/migrate.go index 17c4ae01cb..d9b486b612 100644 --- a/x/recovery/migrations/v2/migrate.go +++ b/x/recovery/migrations/v2/migrate.go @@ -5,8 +5,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - v2types "github.com/EscanBE/evermint/v12/x/recovery/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/recovery/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // MigrateStore migrates the x/recovery module state from the consensus version 1 to diff --git a/x/recovery/migrations/v2/migrate_test.go b/x/recovery/migrations/v2/migrate_test.go index 3d00d19ba5..7e210ec82b 100644 --- a/x/recovery/migrations/v2/migrate_test.go +++ b/x/recovery/migrations/v2/migrate_test.go @@ -6,11 +6,11 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/encoding" - v2 "github.com/EscanBE/evermint/v12/x/recovery/migrations/v2" - v2types "github.com/EscanBE/evermint/v12/x/recovery/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/recovery/migrations/v2" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/recovery/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/recovery/migrations/v2/types/params.go b/x/recovery/migrations/v2/types/params.go index 9698aad5ed..f6f71c31b9 100644 --- a/x/recovery/migrations/v2/types/params.go +++ b/x/recovery/migrations/v2/types/params.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/recovery/module.go b/x/recovery/module.go index 104f805348..ad8cf89d60 100644 --- a/x/recovery/module.go +++ b/x/recovery/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/EscanBE/evermint/v12/x/recovery/client/cli" - "github.com/EscanBE/evermint/v12/x/recovery/keeper" - "github.com/EscanBE/evermint/v12/x/recovery/types" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/recovery/types" ) // type check to ensure the interface is properly implemented diff --git a/x/recovery/types/interfaces.go b/x/recovery/types/interfaces.go index 5653696a9d..d2488db49d 100644 --- a/x/recovery/types/interfaces.go +++ b/x/recovery/types/interfaces.go @@ -12,7 +12,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - claimstypes "github.com/EscanBE/evermint/v12/x/claims/types" + claimstypes "github.com/VictorTrustyDev/nevermind/v12/x/claims/types" ) // BankKeeper defines the banking keeper that must be fulfilled when diff --git a/x/revenue/v1/client/cli/query.go b/x/revenue/v1/client/cli/query.go index d33175b3ef..eb5f75090b 100644 --- a/x/revenue/v1/client/cli/query.go +++ b/x/revenue/v1/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/revenue/v1/client/cli/tx.go b/x/revenue/v1/client/cli/tx.go index de0c61d86d..37a2aa851d 100644 --- a/x/revenue/v1/client/cli/tx.go +++ b/x/revenue/v1/client/cli/tx.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // NewTxCmd returns a root CLI command handler for certain modules/revenue diff --git a/x/revenue/v1/genesis.go b/x/revenue/v1/genesis.go index 3d80dfcc41..4b8456640e 100644 --- a/x/revenue/v1/genesis.go +++ b/x/revenue/v1/genesis.go @@ -4,8 +4,8 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/keeper" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // InitGenesis import module genesis diff --git a/x/revenue/v1/genesis_test.go b/x/revenue/v1/genesis_test.go index 6e21a322bf..23dd8d61f9 100644 --- a/x/revenue/v1/genesis_test.go +++ b/x/revenue/v1/genesis_test.go @@ -2,7 +2,7 @@ package revenue_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "testing" "time" @@ -13,12 +13,12 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" - "github.com/EscanBE/evermint/v12/app" - revenue "github.com/EscanBE/evermint/v12/x/revenue/v1" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + revenue "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) type GenesisTestSuite struct { @@ -26,7 +26,7 @@ type GenesisTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind genesis types.GenesisState } diff --git a/x/revenue/v1/handler.go b/x/revenue/v1/handler.go index cdd1333ad7..263f5807a4 100644 --- a/x/revenue/v1/handler.go +++ b/x/revenue/v1/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // NewHandler defines the fees module handler instance diff --git a/x/revenue/v1/keeper/evm_hooks.go b/x/revenue/v1/keeper/evm_hooks.go index b407c543d1..9966a2bc7f 100644 --- a/x/revenue/v1/keeper/evm_hooks.go +++ b/x/revenue/v1/keeper/evm_hooks.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/revenue/v1/keeper/grpc_query.go b/x/revenue/v1/keeper/grpc_query.go index 386a5c26eb..f279deb8ab 100644 --- a/x/revenue/v1/keeper/grpc_query.go +++ b/x/revenue/v1/keeper/grpc_query.go @@ -2,19 +2,19 @@ package keeper import ( "context" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "strings" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/revenue/v1/keeper/grpc_query_test.go b/x/revenue/v1/keeper/grpc_query_test.go index 45d5e02dd4..e45757d8e8 100644 --- a/x/revenue/v1/keeper/grpc_query_test.go +++ b/x/revenue/v1/keeper/grpc_query_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) func (suite *KeeperTestSuite) TestRevenues() { diff --git a/x/revenue/v1/keeper/integration_test.go b/x/revenue/v1/keeper/integration_test.go index f6fbd7ddb7..c8047c86b4 100644 --- a/x/revenue/v1/keeper/integration_test.go +++ b/x/revenue/v1/keeper/integration_test.go @@ -9,11 +9,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" sdk "github.com/cosmos/cosmos-sdk/types" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/revenue/v1/keeper/keeper.go b/x/revenue/v1/keeper/keeper.go index 5b7b3849d1..168e88a654 100644 --- a/x/revenue/v1/keeper/keeper.go +++ b/x/revenue/v1/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // Keeper of this module maintains collections of revenues for contracts diff --git a/x/revenue/v1/keeper/migrations.go b/x/revenue/v1/keeper/migrations.go index 47e6a106b2..459aa4caf7 100644 --- a/x/revenue/v1/keeper/migrations.go +++ b/x/revenue/v1/keeper/migrations.go @@ -1,8 +1,8 @@ package keeper import ( - v2 "github.com/EscanBE/evermint/v12/x/revenue/v1/migrations/v2" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/migrations/v2" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/revenue/v1/keeper/msg_server.go b/x/revenue/v1/keeper/msg_server.go index 5990a07100..811be860ae 100644 --- a/x/revenue/v1/keeper/msg_server.go +++ b/x/revenue/v1/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/revenue/v1/keeper/msg_server_test.go b/x/revenue/v1/keeper/msg_server_test.go index 7ad42c8f91..4d2ad484b9 100644 --- a/x/revenue/v1/keeper/msg_server_test.go +++ b/x/revenue/v1/keeper/msg_server_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) func (suite *KeeperTestSuite) TestRegisterRevenue() { diff --git a/x/revenue/v1/keeper/params.go b/x/revenue/v1/keeper/params.go index 92ce0de517..f5c074756b 100644 --- a/x/revenue/v1/keeper/params.go +++ b/x/revenue/v1/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // GetParams returns the total set of revenue parameters. diff --git a/x/revenue/v1/keeper/params_test.go b/x/revenue/v1/keeper/params_test.go index 9bff3c3b85..755f1049f6 100644 --- a/x/revenue/v1/keeper/params_test.go +++ b/x/revenue/v1/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/EscanBE/evermint/v12/x/revenue/v1/types" +import "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.RevenueKeeper.GetParams(suite.ctx) diff --git a/x/revenue/v1/keeper/revenues.go b/x/revenue/v1/keeper/revenues.go index c5b5eadbbd..03a6843d49 100644 --- a/x/revenue/v1/keeper/revenues.go +++ b/x/revenue/v1/keeper/revenues.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // GetRevenues returns all registered Revenues. diff --git a/x/revenue/v1/keeper/revenues_test.go b/x/revenue/v1/keeper/revenues_test.go index b158f47284..a532ea57aa 100644 --- a/x/revenue/v1/keeper/revenues_test.go +++ b/x/revenue/v1/keeper/revenues_test.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) func (suite *KeeperTestSuite) TestGetFees() { diff --git a/x/revenue/v1/keeper/setup_test.go b/x/revenue/v1/keeper/setup_test.go index a196bcfdae..26b2892076 100644 --- a/x/revenue/v1/keeper/setup_test.go +++ b/x/revenue/v1/keeper/setup_test.go @@ -12,11 +12,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evm "github.com/EscanBE/evermint/v12/x/evm/types" - feemarkettypes "github.com/EscanBE/evermint/v12/x/feemarket/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + feemarkettypes "github.com/VictorTrustyDev/nevermind/v12/x/feemarket/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" "github.com/stretchr/testify/suite" ) @@ -26,7 +26,7 @@ type KeeperTestSuite struct { ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClient types.QueryClient queryClientEvm evm.QueryClient address common.Address diff --git a/x/revenue/v1/keeper/utils_test.go b/x/revenue/v1/keeper/utils_test.go index f98f0734ca..555e750c5e 100644 --- a/x/revenue/v1/keeper/utils_test.go +++ b/x/revenue/v1/keeper/utils_test.go @@ -1,17 +1,17 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "time" . "github.com/onsi/gomega" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" diff --git a/x/revenue/v1/migrations/v2/migrate.go b/x/revenue/v1/migrations/v2/migrate.go index 841db1b677..0e59a124c6 100644 --- a/x/revenue/v1/migrations/v2/migrate.go +++ b/x/revenue/v1/migrations/v2/migrate.go @@ -1,8 +1,8 @@ package v2 import ( - v2types "github.com/EscanBE/evermint/v12/x/revenue/v1/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/revenue/v1/migrations/v2/migrate_test.go b/x/revenue/v1/migrations/v2/migrate_test.go index 4414079f96..f40ddb59b8 100644 --- a/x/revenue/v1/migrations/v2/migrate_test.go +++ b/x/revenue/v1/migrations/v2/migrate_test.go @@ -6,12 +6,12 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/EscanBE/evermint/v12/encoding" - v2 "github.com/EscanBE/evermint/v12/x/revenue/v1/migrations/v2" - v2types "github.com/EscanBE/evermint/v12/x/revenue/v1/migrations/v2/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + v2 "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/migrations/v2" + v2types "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/migrations/v2/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" - "github.com/EscanBE/evermint/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/app" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/revenue/v1/migrations/v2/types/genesis.pb.go b/x/revenue/v1/migrations/v2/types/genesis.pb.go index 9277a75336..a22036f63b 100644 --- a/x/revenue/v1/migrations/v2/types/genesis.pb.go +++ b/x/revenue/v1/migrations/v2/types/genesis.pb.go @@ -11,7 +11,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" proto "github.com/gogo/protobuf/proto" ) diff --git a/x/revenue/v1/migrations/v2/types/params.go b/x/revenue/v1/migrations/v2/types/params.go index 13cef7ca93..a852622aae 100644 --- a/x/revenue/v1/migrations/v2/types/params.go +++ b/x/revenue/v1/migrations/v2/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/revenue/v1/module.go b/x/revenue/v1/module.go index f2b58ec4b3..ed515c74ca 100644 --- a/x/revenue/v1/module.go +++ b/x/revenue/v1/module.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/EscanBE/evermint/v12/x/revenue/v1/client/cli" - "github.com/EscanBE/evermint/v12/x/revenue/v1/keeper" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) // type check to ensure the interface is properly implemented @@ -209,7 +209,7 @@ func (am AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) { } -// WeightedOperations returns fees module weighted operations +// WeightedOperations returns fees module ueverghted operations func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { return []simtypes.WeightedOperation{} } diff --git a/x/revenue/v1/types/genesis_test.go b/x/revenue/v1/types/genesis_test.go index 150b407933..4aec8a7bd2 100644 --- a/x/revenue/v1/types/genesis_test.go +++ b/x/revenue/v1/types/genesis_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" ) diff --git a/x/revenue/v1/types/interfaces.go b/x/revenue/v1/types/interfaces.go index db9113c69c..b6fcef5fd3 100644 --- a/x/revenue/v1/types/interfaces.go +++ b/x/revenue/v1/types/interfaces.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/EscanBE/evermint/v12/x/evm/statedb" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/evm/statedb" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/revenue/v1/types/msg.go b/x/revenue/v1/types/msg.go index 8cd6036ca4..56a2f80172 100644 --- a/x/revenue/v1/types/msg.go +++ b/x/revenue/v1/types/msg.go @@ -2,7 +2,7 @@ package types import ( errorsmod "cosmossdk.io/errors" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" diff --git a/x/revenue/v1/types/msg_test.go b/x/revenue/v1/types/msg_test.go index 80d25542f7..5b320bfbbe 100644 --- a/x/revenue/v1/types/msg_test.go +++ b/x/revenue/v1/types/msg_test.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" ) type MsgsTestSuite struct { diff --git a/x/revenue/v1/types/revenue.go b/x/revenue/v1/types/revenue.go index d37c01aa74..90a4a5af34 100644 --- a/x/revenue/v1/types/revenue.go +++ b/x/revenue/v1/types/revenue.go @@ -1,7 +1,7 @@ package types import ( - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/revenue/v1/types/revenue_test.go b/x/revenue/v1/types/revenue_test.go index f91a876e84..e57f9114b8 100644 --- a/x/revenue/v1/types/revenue_test.go +++ b/x/revenue/v1/types/revenue_test.go @@ -1,15 +1,15 @@ package types_test import ( - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "testing" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/revenue/v1/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/revenue/v1/types" "github.com/stretchr/testify/suite" ) @@ -125,7 +125,7 @@ func (suite *RevenueTestSuite) TestFee() { "Create revenue- invalid deployer address", types.Revenue{ utiltx.GenerateAddress().String(), - marker.ReplaceAbleWithBadChecksum("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsX"), + "ever1hcg0q3e2tag0wysfa90cstz9st9f3686aaaaaa", suite.address2.String(), }, false, @@ -135,7 +135,7 @@ func (suite *RevenueTestSuite) TestFee() { types.Revenue{ utiltx.GenerateAddress().String(), suite.address1.String(), - marker.ReplaceAbleWithBadChecksum("evm1sv9m0g7ycejwr3s369km58h5qe7xj77hxrsmsX"), + "ever1hcg0q3e2tag0wysfa90cstz9st9f3686aaaaaa", }, false, }, diff --git a/x/vesting/client/cli/query.go b/x/vesting/client/cli/query.go index 6a340bf2a2..951e96470d 100644 --- a/x/vesting/client/cli/query.go +++ b/x/vesting/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // GetQueryCmd returns the parent command for all vesting CLI query commands. diff --git a/x/vesting/client/cli/tx.go b/x/vesting/client/cli/tx.go index 01bff13262..3de491af31 100644 --- a/x/vesting/client/cli/tx.go +++ b/x/vesting/client/cli/tx.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // Transaction command flags diff --git a/x/vesting/handler.go b/x/vesting/handler.go index afd68a2751..1d0a66989f 100644 --- a/x/vesting/handler.go +++ b/x/vesting/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // NewHandler defines the vesting module handler instance diff --git a/x/vesting/keeper/grpc_query.go b/x/vesting/keeper/grpc_query.go index a10de3f65c..5519ccc51d 100644 --- a/x/vesting/keeper/grpc_query.go +++ b/x/vesting/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/vesting/keeper/grpc_query_test.go b/x/vesting/keeper/grpc_query_test.go index b302dc23b2..697d8d4b2e 100644 --- a/x/vesting/keeper/grpc_query_test.go +++ b/x/vesting/keeper/grpc_query_test.go @@ -2,14 +2,14 @@ package keeper_test import ( "fmt" - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) func (suite *KeeperTestSuite) TestBalances() { diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index e83c6dd7ac..f150eef7ce 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" + "github.com/VictorTrustyDev/nevermind/v12/constants" "math/big" "strings" "time" @@ -14,10 +14,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // TestClawbackAccount is a struct to store all relevant information that is corresponding diff --git a/x/vesting/keeper/keeper.go b/x/vesting/keeper/keeper.go index 00f351c64b..fdf08a0128 100644 --- a/x/vesting/keeper/keeper.go +++ b/x/vesting/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) // Keeper of this module maintains collections of vesting. diff --git a/x/vesting/keeper/msg_server.go b/x/vesting/keeper/msg_server.go index 42ff8594bf..17d2390008 100644 --- a/x/vesting/keeper/msg_server.go +++ b/x/vesting/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" "github.com/armon/go-metrics" @@ -17,7 +17,7 @@ import ( vestingexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/vesting/keeper/msg_server_test.go b/x/vesting/keeper/msg_server_test.go index c78f884417..34af489418 100644 --- a/x/vesting/keeper/msg_server_test.go +++ b/x/vesting/keeper/msg_server_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - evertypes "github.com/EscanBE/evermint/v12/types" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" vestingexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,9 +12,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var ( diff --git a/x/vesting/keeper/setup_test.go b/x/vesting/keeper/setup_test.go index da6ffa8fea..9589d46a5c 100644 --- a/x/vesting/keeper/setup_test.go +++ b/x/vesting/keeper/setup_test.go @@ -14,11 +14,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - evm "github.com/EscanBE/evermint/v12/x/evm/types" + evm "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/EscanBE/evermint/v12/app" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var ( @@ -38,7 +38,7 @@ type KeeperTestSuite struct { suite.Suite ctx sdk.Context - app *app.Evermint + app *app.Nevermind queryClientEvm evm.QueryClient queryClient types.QueryClient address common.Address diff --git a/x/vesting/keeper/utils_test.go b/x/vesting/keeper/utils_test.go index 4fda027991..80047a1ba6 100644 --- a/x/vesting/keeper/utils_test.go +++ b/x/vesting/keeper/utils_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - "github.com/EscanBE/evermint/v12/constants" - "github.com/EscanBE/evermint/v12/rename_chain/marker" + "github.com/VictorTrustyDev/nevermind/v12/constants" + "math" "strings" "time" @@ -21,18 +21,18 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/EscanBE/evermint/v12/app" - cosmosante "github.com/EscanBE/evermint/v12/app/ante/cosmos" - evmante "github.com/EscanBE/evermint/v12/app/ante/evm" - "github.com/EscanBE/evermint/v12/contracts" - "github.com/EscanBE/evermint/v12/crypto/ethsecp256k1" - "github.com/EscanBE/evermint/v12/encoding" - "github.com/EscanBE/evermint/v12/testutil" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - evertypes "github.com/EscanBE/evermint/v12/types" - epochstypes "github.com/EscanBE/evermint/v12/x/epochs/types" - evmtypes "github.com/EscanBE/evermint/v12/x/evm/types" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/app" + cosmosante "github.com/VictorTrustyDev/nevermind/v12/app/ante/cosmos" + evmante "github.com/VictorTrustyDev/nevermind/v12/app/ante/evm" + "github.com/VictorTrustyDev/nevermind/v12/contracts" + "github.com/VictorTrustyDev/nevermind/v12/crypto/ethsecp256k1" + "github.com/VictorTrustyDev/nevermind/v12/encoding" + "github.com/VictorTrustyDev/nevermind/v12/testutil" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + evertypes "github.com/VictorTrustyDev/nevermind/v12/types" + epochstypes "github.com/VictorTrustyDev/nevermind/v12/x/epochs/types" + evmtypes "github.com/VictorTrustyDev/nevermind/v12/x/evm/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" "github.com/stretchr/testify/require" ) @@ -220,7 +220,7 @@ func delegate(clawbackAccount *types.ClawbackVestingAccount, amount sdkmath.Int) addr, err := sdk.AccAddressFromBech32(clawbackAccount.Address) s.Require().NoError(err) - val, err := sdk.ValAddressFromBech32(marker.ReplaceAbleAddress("evmvaloper1z3t55m0l9h0eupuz3dp5t5cypyv674jjjtazjl")) + val, err := sdk.ValAddressFromBech32("evervaloper1z3t55m0l9h0eupuz3dp5t5cypyv674jjayy5mp") s.Require().NoError(err) delegateMsg := stakingtypes.NewMsgDelegate(addr, val, sdk.NewCoin(constants.BaseDenom, amount)) diff --git a/x/vesting/module.go b/x/vesting/module.go index f2ef534745..4369bbbf3a 100644 --- a/x/vesting/module.go +++ b/x/vesting/module.go @@ -18,9 +18,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/EscanBE/evermint/v12/x/vesting/client/cli" - "github.com/EscanBE/evermint/v12/x/vesting/keeper" - "github.com/EscanBE/evermint/v12/x/vesting/types" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/client/cli" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/keeper" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var ( diff --git a/x/vesting/types/clawback_vesting_account_test.go b/x/vesting/types/clawback_vesting_account_test.go index 4ac79fd66a..6851a37e38 100644 --- a/x/vesting/types/clawback_vesting_account_test.go +++ b/x/vesting/types/clawback_vesting_account_test.go @@ -11,8 +11,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/vesting/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) var ( diff --git a/x/vesting/types/msg_test.go b/x/vesting/types/msg_test.go index 26bf52eb0b..c4661cd3a3 100644 --- a/x/vesting/types/msg_test.go +++ b/x/vesting/types/msg_test.go @@ -8,8 +8,8 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/stretchr/testify/suite" - utiltx "github.com/EscanBE/evermint/v12/testutil/tx" - "github.com/EscanBE/evermint/v12/x/vesting/types" + utiltx "github.com/VictorTrustyDev/nevermind/v12/testutil/tx" + "github.com/VictorTrustyDev/nevermind/v12/x/vesting/types" ) type MsgsTestSuite struct {