Rename To ICM #652

geoff-vball · 2024-11-20T14:11:49Z

Why this should be merged

Closes #620

It's probably easier to view this PR commit by commit.

There are a few quirks of the renaming. Now that Warp and Teleporter are both ICM, it's hard to document Teleporter. In most spots, I opted for specifying TeleporterMessenger the contract, to disambiguate it from ICM at large.

There are some places where our upstream dependencies haven't renamed subnet fields to l1, are some of them going to stay that way? Is warp going to get renamed in the dependencies?

richardpringle

Honestly... the more time I stare at all these changes, the less likely I am to catch something that's off. I think we should just merge this TBH. If there are mistakes or missed changes (which wouldn't show up in this PR anyway), we can change them as needed.

contracts/ictt/README.md

richardpringle · 2024-11-20T20:37:56Z

contracts/validator-manager/ValidatorManager.sol

@@ -118,7 +118,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
        onlyInitializing
    {
        ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
-        $._subnetID = settings.subnetID;
+        $._l1ID = settings.l1ID;


😂 this hurts my eyes

I don't disagree...

contracts/validator-manager/ValidatorManager.sol

richardpringle · 2024-11-20T20:52:07Z

🤔 all these files still have the word warp in them... is that okay?

tests/network/network.go
tests/utils/warp-genesis-template.json
tests/utils/governance.go
tests/utils/chain.go
tests/utils/validator_manager.go
tests/utils/teleporter.go
tests/flows/teleporter/validator_churn.go
tests/flows/teleporter/registry/teleporter_registry.go
tests/flows/teleporter/relayer_modifies_message.go
tests/flows/validator-manager/erc20_token_staking.go
tests/flows/validator-manager/native_token_staking.go
tests/suites/governance/governance_suite_test.go
tests/suites/ictt/ictt_suite_test.go
tests/suites/teleporter/teleporter_suite_test.go
tests/suites/validator-manager/validator_manager_suite_test.go
utils/gas-utils/gas_utils.go
contracts/teleporter/registry/UPGRADING.md
contracts/teleporter/registry/README.md
contracts/teleporter/TeleporterMessenger.sol
contracts/teleporter/ITeleporterMessenger.sol
contracts/teleporter/registry/TeleporterRegistry.sol
contracts/teleporter/tests/RedeemRelayerRewardsTests.t.sol
contracts/teleporter/tests/SendSpecifiedReceiptsTests.t.sol
contracts/teleporter/tests/MarkReceiptTests.t.sol
contracts/teleporter/tests/InitializeBlockchainIDTests.t.sol
contracts/teleporter/tests/GetOutstandingReceiptsToSendTests.t.sol
contracts/teleporter/tests/GetNextMessageIdTests.t.sol
contracts/teleporter/registry/tests/UpdateMinTeleporterVersionTests.t.sol
contracts/teleporter/tests/RetryMessageExecutionTests.t.sol
contracts/teleporter/tests/FallbackReceiveTests.t.sol
contracts/teleporter/tests/HandleInitialMessageExecutionTests.t.sol
contracts/teleporter/tests/TeleporterMessengerTest.t.sol
contracts/teleporter/registry/tests/NonReentrantTests.t.sol
contracts/teleporter/tests/SendCrossChainMessageTests.t.sol
contracts/ictt/TokenHome/TokenHome.sol
contracts/teleporter/tests/ReceiveCrossChainMessageTests.t.sol
contracts/teleporter/registry/tests/TeleporterRegistryTests.t.sol
abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
abi-bindings/go/governance/ValidatorSetSig/ValidatorSetSig.go
abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
contracts/governance/README.md
contracts/ictt/tests/TokenRemoteTests.t.sol
contracts/ictt/tests/TokenHomeTests.t.sol
contracts/ictt/TokenRemote/TokenRemote.sol
abi-bindings/go/teleporter/TeleporterMessenger/TeleporterMessenger.go
abi-bindings/go/teleporter/registry/TeleporterRegistry/packing.go
contracts/ictt/tests/TokenTransferrerTests.t.sol
abi-bindings/go/teleporter/registry/TeleporterRegistry/TeleporterRegistry.go
contracts/governance/tests/ValidatorSetSigTests.t.sol
contracts/governance/ValidatorSetSig.sol
abi-bindings/go/teleporter/registry/TeleporterRegistry/packing_test.go
contracts/validator-manager/README.md
contracts/validator-manager/PoSValidatorManager.sol
contracts/validator-manager/UptimeMessageSpec.md
contracts/validator-manager/ValidatorManager.sol
cmd/teleporter-cli/transaction.go
contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
contracts/validator-manager/tests/ValidatorManagerTests.t.sol

richardpringle · 2024-11-20T20:57:23Z

I don't know if this is actually helpful, but all these files have the word "subnet" in them

scripts/install_avalanchego_release.sh
scripts/install_subnetevm_release.sh
scripts/e2e_test.sh
scripts/deploy_teleporter.sh
scripts/abi_bindings.sh
scripts/versions.sh
remappings.txt
go.sum
utils/gas-utils/gas_utils.go
tests/interfaces/subnet_test_info.go
tests/utils/proxy.go
tests/utils/erc20.go
tests/utils/token_scaling.go
utils/teleporter-utils/teleporter_utils.go
tests/utils/governance.go
tests/flows/ictt/erc20_home_erc20_remote.go
tests/flows/governance/validator_set_sig.go
tests/flows/ictt/native_home_erc20_remote.go
tests/flows/ictt/erc20_home_native_remote_multihop.go
tests/flows/ictt/registration_and_collateral_check.go
tests/utils/chain.go
tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go
tests/flows/ictt/transparent_proxy_upgradeability.go
tests/flows/ictt/native_home_erc20_remote_multihop.go
tests/flows/ictt/erc20_home_native_remote.go
tests/utils/validator_manager.go
tests/utils/teleporter.go
tests/flows/ictt/erc20_home_erc20_remote_multihop.go
tests/utils/ictt.go
tests/network/network.go
tests/flows/teleporter/teleporter_message_ids.go
tests/flows/validator-manager/poa_to_pos.go
tests/flows/validator-manager/native_token_staking.go
tests/flows/validator-manager/erc20_token_staking.go
tests/flows/teleporter/insufficient_gas.go
utils/deployment-utils/deployment_utils.go
tests/flows/teleporter/deliver_to_nonexistent_contract.go
tests/flows/teleporter/deliver_to_wrong_chain.go
tests/flows/teleporter/relayer_modifies_message.go
tests/flows/teleporter/registry/pause_teleporter.go
tests/flows/teleporter/registry/check_upgrade_access.go
tests/flows/teleporter/unallowed_relayer.go
tests/flows/teleporter/basic_send_receive.go
tests/flows/teleporter/retry_successful_execution.go
tests/flows/teleporter/relay_message_twice.go
tests/flows/teleporter/validator_churn.go
tests/flows/teleporter/resubmit_altered_message.go
tests/flows/teleporter/add_fee_amount.go
tests/flows/teleporter/registry/teleporter_registry.go
tests/flows/teleporter/send_specific_receipts.go
go.mod
LICENSE
cmd/teleporter-cli/transaction.go
cmd/teleporter-cli/root.go
contracts/governance/README.md
contracts/teleporter/registry/TeleporterRegistry.sol
contracts/teleporter/registry/tests/NonReentrantTests.t.sol
contracts/governance/ValidatorSetSig.sol
contracts/ictt/README.md
contracts/ictt/tests/NativeTokenRemoteTests.t.sol
contracts/ictt/TokenRemote/TokenRemote.sol
contracts/ictt/TokenRemote/NativeTokenRemoteUpgradeable.sol
contracts/ictt/TokenHome/TokenHome.sol
contracts/teleporter/TeleporterMessenger.sol
contracts/teleporter/README.md
abi-bindings/go/ProxyAdmin/ProxyAdmin.go
abi-bindings/go/INativeMinter/INativeMinter.go
abi-bindings/go/ictt/WrappedNativeToken/WrappedNativeToken.go
abi-bindings/go/governance/ValidatorSetSig/packing.go
abi-bindings/go/ictt/TokenRemote/ERC20TokenRemoteUpgradeable/ERC20TokenRemoteUpgradeable.go
abi-bindings/go/ictt/mocks/ExampleERC20Decimals/ExampleERC20Decimals.go
abi-bindings/go/ictt/TokenHome/TokenHome/TokenHome.go
abi-bindings/go/ictt/mocks/MockERC20SendAndCallReceiver/MockERC20SendAndCallReceiver.go
abi-bindings/go/governance/ValidatorSetSig/ValidatorSetSig.go
abi-bindings/go/ictt/TokenHome/ERC20TokenHomeUpgradeable/ERC20TokenHomeUpgradeable.go
abi-bindings/go/ictt/mocks/MockNativeSendAndCallReceiver/MockNativeSendAndCallReceiver.go
abi-bindings/go/ictt/TokenRemote/TokenRemote/TokenRemote.go
abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote/ERC20TokenRemote.go
abi-bindings/go/ictt/TokenRemote/NativeTokenRemote/NativeTokenRemote.go
abi-bindings/go/ictt/TokenRemote/NativeTokenRemoteUpgradeable/NativeTokenRemoteUpgradeable.go
abi-bindings/go/teleporter/TeleporterMessenger/TeleporterMessenger.go
abi-bindings/go/ictt/TokenHome/NativeTokenHomeUpgradeable/NativeTokenHomeUpgradeable.go
abi-bindings/go/teleporter/TeleporterMessenger/packing.go
abi-bindings/go/teleporter/TeleporterMessenger/event.go
abi-bindings/go/ictt/TokenHome/ERC20TokenHome/ERC20TokenHome.go
abi-bindings/go/ictt/TokenHome/NativeTokenHome/NativeTokenHome.go
abi-bindings/go/TransparentUpgradeableProxy/TransparentUpgradeableProxy.go
abi-bindings/go/teleporter/registry/TeleporterRegistry/packing.go
abi-bindings/go/teleporter/registry/TeleporterRegistry/TeleporterRegistry.go
abi-bindings/go/teleporter/tests/TestMessenger/TestMessenger.go
contracts/teleporter/tests/ReceiveCrossChainMessageTests.t.sol
contracts/validator-manager/NativeTokenStakingManager.sol
contracts/validator-manager/README.md
abi-bindings/go/validator-manager/ExampleRewardCalculator/ExampleRewardCalculator.go
contracts/validator-manager/ValidatorMessages.sol
abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
contracts/validator-manager/PoSValidatorManager.sol
abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
contracts/validator-manager/interfaces/IPoSValidatorManager.sol
contracts/validator-manager/UptimeMessageSpec.md
contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
contracts/validator-manager/interfaces/IValidatorManager.sol
contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol
contracts/validator-manager/tests/ValidatorMessagesTests.t.sol
contracts/validator-manager/ValidatorManager.sol
contracts/validator-manager/tests/ValidatorManagerTests.t.sol
abi-bindings/go/mocks/ExampleERC20/ExampleERC20.go

(though I know that some of them are because of the subnet-evm dependency)

iansuvak · 2024-11-22T21:04:13Z

Are we renaming the module in go.mod?

go.mod

geoff-vball added 9 commits November 20, 2024 06:00

Subnet to L1

b77ea5f

Warp to ICM

4b3432d

Teleporter to ICM or TeleporterMessenger

ba76f3f

Small changes

df21bc2

Merge branch 'main' into rename-icm

f1120a2

Fix unit test

0ff2572

Fix infinite recursion

8e95379

Fix some tests

b7b1463

Fix some tests

297ba32

richardpringle approved these changes Nov 20, 2024

View reviewed changes

geoff-vball marked this pull request as ready for review November 21, 2024 21:29

geoff-vball requested a review from a team as a code owner November 21, 2024 21:29

geoff-vball requested review from iansuvak, bernard-avalabs, michaelkaplan13 and cam-schultz November 21, 2024 21:29

geoff-vball and others added 3 commits November 21, 2024 16:29

Merge branch 'main' into rename-icm

4c0937f

Review fixes

48c8314

Merge branch 'main' into rename-icm

13e34cf

Nuttymoon mentioned this pull request Nov 27, 2024

ICM: Open-source AvalancheICTTRouter contracts suzaku-network/suzaku-contracts-library#39

Open

6 tasks

geoff-vball added 3 commits November 27, 2024 16:19

Merge branch 'main' into rename-icm

09e2316

Fix tests

df2dfdc

Fix tests

3ef0507

github-advanced-security bot found potential problems Nov 27, 2024

View reviewed changes

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

go.mod Fixed Show fixed Hide fixed

geoff-vball force-pushed the rename-icm branch from 847dad2 to 3ef0507 Compare November 27, 2024 22:06

geoff-vball added 2 commits November 27, 2024 17:11

Bindings

557facd

Bindings

7a812ad

geoff-vball added 2 commits November 28, 2024 12:59

Fix tests

9ed8d9d

Cleanup

3661a57

iansuvak approved these changes Nov 29, 2024

View reviewed changes

geoff-vball merged commit 179871c into main Nov 29, 2024
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename To ICM #652

Rename To ICM #652

geoff-vball commented Nov 20, 2024 •

edited

Loading

richardpringle left a comment

richardpringle Nov 20, 2024

geoff-vball Nov 22, 2024

richardpringle commented Nov 20, 2024

richardpringle commented Nov 20, 2024

iansuvak commented Nov 22, 2024

Rename To ICM #652

Rename To ICM #652

Conversation

geoff-vball commented Nov 20, 2024 • edited Loading

Why this should be merged

richardpringle left a comment

Choose a reason for hiding this comment

richardpringle Nov 20, 2024

Choose a reason for hiding this comment

geoff-vball Nov 22, 2024

Choose a reason for hiding this comment

richardpringle commented Nov 20, 2024

richardpringle commented Nov 20, 2024

iansuvak commented Nov 22, 2024

geoff-vball commented Nov 20, 2024 •

edited

Loading