From af3ce2dcffd51b97daa1e8f95a5e6a21bb504b2a Mon Sep 17 00:00:00 2001 From: Gustavo Gama Date: Sat, 2 May 2026 00:21:02 -0300 Subject: [PATCH] [wip] chore: upgrade cldf to v0.99.0 (and fix breaking changes) --- chains/evm/deployment/fastcurse_test.go | 26 +-- .../utils/operations/contract/write.go | 2 +- .../deployment/v1_0_0/adapters/deployer.go | 8 +- .../v1_0_0/adapters/pool_adapter.go | 28 +-- .../adapters/transfer_ownership_test.go | 2 +- .../burn_mint_erc20/burn_mint_erc20.go | 12 +- .../v1_0_0/operations/erc20/erc20.go | 2 +- .../deployment/v1_0_0/operations/link/link.go | 4 +- .../evm/deployment/v1_0_0/operations/mcms.go | 6 +- .../v1_0_0/operations/rmn_proxy/rmn_proxy.go | 4 +- .../v1_0_0/operations/tip20/salt.go | 4 +- .../tip20/tip20_factory_contract.go | 6 +- .../v1_0_0/operations/tip20/tip20_ops.go | 18 +- .../type_and_version/type_and_version.go | 2 +- .../evm/deployment/v1_0_0/sequences/mcms.go | 22 +-- .../evm/deployment/v1_0_0/sequences/token.go | 24 +-- .../v1_0_0/transfer_ownership_test.go | 2 +- .../evm/deployment/v1_2_0/adapters/router.go | 34 ++-- .../price_registry/price_registry.go | 6 +- .../v1_2_0/operations/router/router.go | 16 +- .../v1_2_0/sequences/price_registry.go | 12 +- .../deployment/v1_5_0/adapters/fastcurse.go | 9 +- .../burn_mint_erc20_with_drip.go | 8 +- .../burn_mint_token_pool_and_proxy.go | 8 +- .../v1_5_0/operations/offramp/offramp.go | 4 +- .../v1_5_0/operations/onramp/onramp.go | 10 +- .../ping_pong_dapp/ping_pong_dapp.go | 12 +- .../deployment/v1_5_0/operations/rmn/rmn.go | 10 +- .../token_admin_registry.go | 16 +- .../operations/token_pool/token_pool.go | 2 +- .../deployment/v1_5_0/sequences/offramp.go | 10 +- .../evm/deployment/v1_5_0/sequences/onramp.go | 27 +-- .../v1_5_0/sequences/register_token.go | 26 +-- .../v1_5_0/sequences/register_token_test.go | 6 +- .../deployment/v1_5_0/sequences/rmn_remote.go | 8 +- .../v1_5_0/sequences/token_admin_registry.go | 8 +- .../evm/deployment/v1_5_1/adapters/tokens.go | 13 +- .../operations/token_pool/token_pool.go | 10 +- .../v1_5_1/sequences/deploy_token_pool.go | 10 +- .../configure_token_pool_for_remote_chains.go | 12 +- .../v1_6_0/adapters/fee_aggregator.go | 19 +- .../v1_6_0/adapters/lanemigrator.go | 72 +++---- .../v1_6_0/adapters/rampupdatewithfq.go | 18 +- .../v1_6_0/operations/ccip_home/ccip_home.go | 12 +- .../operations/fee_quoter/fee_quoter.go | 20 +- .../operations/nonce_manager/nonce_manager.go | 4 +- .../v1_6_0/operations/offramp/offramp.go | 12 +- .../v1_6_0/operations/onramp/onramp.go | 14 +- .../operations/rmn_remote/rmn_remote.go | 12 +- .../token_governor/token_governor.go | 14 +- .../deployment/v1_6_0/sequences/adapter.go | 4 +- .../sequences/deploy_chain_contracts.go | 44 ++--- .../sequences/deploy_token_pool_contracts.go | 18 +- .../deployment/v1_6_0/sequences/fee_quoter.go | 54 +++--- chains/evm/deployment/v1_6_0/sequences/ocr.go | 52 ++--- .../deployment/v1_6_0/sequences/offramp.go | 20 +- .../evm/deployment/v1_6_0/sequences/onramp.go | 22 ++- .../deployment/v1_6_0/sequences/rmn_remote.go | 8 +- .../evm/deployment/v1_6_0/sequences/router.go | 4 +- .../v1_6_0/sequences/token_governor.go | 46 ++--- .../v1_6_0/sequences/update_lanes.go | 33 ++-- .../evm/deployment/v1_6_1/adapters/tokens.go | 13 +- .../lock_release_token_pool.go | 8 +- .../siloed_lock_release_token_pool.go | 22 +-- .../operations/token_pool/token_pool.go | 42 ++-- .../configure_token_for_transfers.go | 11 +- .../v1_6_1/sequences/configure_token_pool.go | 32 ++-- .../configure_token_pool_for_remote_chain.go | 38 ++-- .../sequences/deploy_burn_mint_token_pool.go | 4 +- .../sequences/deploy_non_canonical_usdc.go | 2 +- .../v1_6_1/sequences/deploy_token_and_pool.go | 22 +-- .../sequences/non_canonical_usdc_test.go | 6 +- .../configure_token_pool_for_remote_chains.go | 12 +- .../cctp_message_transmitter_proxy.go | 2 +- .../hybrid_lock_release_usdc_token_pool.go | 8 +- .../operations/fee_quoter/fee_quoter.go | 22 +-- .../usdc_token_pool/usdc_token_pool.go | 14 +- .../usdc_token_pool_cctp_v2.go | 22 +-- .../v2_0_0/adapters/cctp_chain_test.go | 30 +-- .../v2_0_0/adapters/chain_family_test.go | 2 +- .../deploy_chain_contracts_adapter.go | 4 +- .../v2_0_0/adapters/fee_aggregator.go | 27 +-- chains/evm/deployment/v2_0_0/adapters/fees.go | 14 +- .../v2_0_0/adapters/lanemigrator.go | 97 +++++----- .../v2_0_0/adapters/lanemigrator_test.go | 20 +- .../v2_0_0/adapters/lombard_chain.go | 13 +- .../evm/deployment/v2_0_0/adapters/tokens.go | 35 ++-- .../deployment/v2_0_0/adapters/tokens_test.go | 45 +++-- .../configure_create2_factory.go | 4 +- .../configure_create2_factory_test.go | 4 +- .../create2_factory/deploy_create2_factory.go | 2 +- .../changesets/deploy_chain_contracts_test.go | 4 +- .../deploy_committee_verifier_test.go | 2 +- .../v2_0_0/create2_factory/create2_factory.go | 6 +- .../create2_factory/create2_factory_test.go | 12 +- .../advanced_pool_hooks.go | 28 +-- .../cctp_message_transmitter_proxy.go | 4 +- .../cctp_through_ccv_token_pool.go | 2 +- .../operations/cctp_verifier/cctp_verifier.go | 30 +-- .../committee_verifier/committee_verifier.go | 24 +-- .../v2_0_0/operations/erc20/erc20.go | 4 +- .../erc20/erc20_custom_operations.go | 2 +- .../erc20_lock_box/erc20_lock_box.go | 6 +- .../erc20_lock_box_custom_operations.go | 4 +- .../v2_0_0/operations/executor/executor.go | 14 +- .../operations/fee_quoter/fee_quoter.go | 18 +- .../lock_release_token_pool.go | 2 +- .../lombard_token_pool/lombard_token_pool.go | 4 +- .../lombard_verifier/lombard_verifier.go | 38 ++-- .../mock_receiver_v2/mock_receiver_v2.go | 4 +- .../v2_0_0/operations/offramp/offramp.go | 8 +- .../v2_0_0/operations/onramp/onramp.go | 12 +- .../v2_0_0/operations/proxy/proxy.go | 10 +- .../siloed_lock_release_token_pool.go | 4 +- .../siloed_usdc_token_pool.go | 8 +- .../operations/token_pool/token_pool.go | 42 ++-- .../usdc_token_pool_proxy.go | 8 +- .../cctp/configure_cctp_chain_for_lanes.go | 39 ++-- .../sequences/cctp/deploy_cctp_chain.go | 63 +++--- .../cctp/deploy_siloed_usdc_lock_release.go | 19 +- .../deploy_siloed_usdc_lock_release_test.go | 2 +- .../migrate_hybrid_lock_release_liquidity.go | 48 ++--- .../sequences/configure_chain_for_lanes.go | 109 ++++++----- .../configure_chain_for_lanes_test.go | 125 +++++++----- .../configure_committee_verifier_for_lanes.go | 60 +++--- ...igure_committee_verifier_for_lanes_test.go | 21 +- .../v2_0_0/sequences/configure_lane_leg.go | 49 ++--- .../sequences/configure_lane_leg_test.go | 60 +++--- .../deploy_advanced_pool_hooks_extractor.go | 2 +- .../sequences/deploy_chain_contracts.go | 124 ++++++------ .../sequences/deploy_chain_contracts_test.go | 20 +- .../sequences/deploy_committee_verifier.go | 10 +- .../deploy_committee_verifier_test.go | 10 +- .../sequences/deploy_contract_via_create2.go | 8 +- .../deploy_contract_via_create2_test.go | 2 +- .../deploy_verifier_resolver_via_create2.go | 12 +- .../v2_0_0/sequences/executor_custom.go | 2 +- .../deployment/v2_0_0/sequences/fee_quoter.go | 22 +-- .../v2_0_0/sequences/lane_config_helpers.go | 10 +- .../configure_lombard_chain_for_lanes.go | 56 +++--- .../sequences/lombard/deploy_lombard_chain.go | 28 +-- ...sequence_fee_quoter_input_creation_test.go | 10 +- .../tokens/configure_token_for_transfers.go | 27 +-- .../configure_token_for_transfers_test.go | 13 +- .../sequences/tokens/configure_token_pool.go | 18 +- .../configure_token_pool_for_remote_chain.go | 179 +++++++++--------- ...figure_token_pool_for_remote_chain_test.go | 14 +- .../configure_token_pool_for_remote_chains.go | 14 +- .../tokens/configure_token_pool_test.go | 7 +- .../tokens/deploy_burn_mint_token_pool.go | 17 +- .../deploy_burn_mint_token_pool_test.go | 36 ++-- .../tokens/deploy_lock_release_token_pool.go | 19 +- .../deploy_lock_release_token_pool_test.go | 41 ++-- .../migrate_lock_release_pool_liquidity.go | 116 ++++++------ ...igrate_lock_release_pool_liquidity_test.go | 129 +++++++------ ...allowed_finality_config_for_token_pools.go | 4 +- ...ken_transfer_fee_config_for_token_pools.go | 4 +- .../versioned_verifier_resolver.go | 10 +- chains/evm/go.mod | 6 +- chains/evm/go.sum | 12 +- chains/solana/deployment/go.mod | 2 +- chains/solana/deployment/go.sum | 12 +- chains/solana/go.mod | 5 +- deployment/go.mod | 6 +- deployment/go.sum | 12 +- devenv/common/seq_home_chain.go | 28 +-- devenv/go.mod | 2 +- devenv/go.sum | 4 +- integration-tests/go.mod | 6 +- integration-tests/go.sum | 12 +- 170 files changed, 1823 insertions(+), 1671 deletions(-) diff --git a/chains/evm/deployment/fastcurse_test.go b/chains/evm/deployment/fastcurse_test.go index f003527aad..9ea1719363 100644 --- a/chains/evm/deployment/fastcurse_test.go +++ b/chains/evm/deployment/fastcurse_test.go @@ -50,7 +50,7 @@ func TestFastCurse(t *testing.T) { chain := env.BlockChains.EVMChains()[chain1] deployRMNOp, err := cldf_ops.ExecuteOperation(bundle, rmnops1_5.Deploy, chain, contract.DeployInput[rmnops1_5.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmnops1_5.ContractType, *semver.MustParse("1.5.0")), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmnops1_5.ConstructorArgs{ RMNConfig: rmn_contract.RMNConfig{ BlessWeightThreshold: 2, @@ -80,7 +80,7 @@ func TestFastCurse(t *testing.T) { chain = env.BlockChains.EVMChains()[chain2] deployRMNRemoteOp, err := cldf_ops.ExecuteOperation(bundle, rmnremoteops1_6.Deploy, chain, contract.DeployInput[rmnremoteops1_6.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmnremoteops1_6.ContractType, *semver.MustParse("1.6.0")), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmnremoteops1_6.ConstructorArgs{ LocalChainSelector: chain.Selector, LegacyRMN: utils.RandomAddress(), @@ -102,7 +102,7 @@ func TestFastCurse(t *testing.T) { rmnProxy := utils.RandomAddress() deployRouterOp, err := cldf_ops.ExecuteOperation(bundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{ - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")), Args: routerops1_2.ConstructorArgs{ WrappedNative: wNative, @@ -116,7 +116,7 @@ func TestFastCurse(t *testing.T) { ChainSelector: sel, Address: deployRouterOp.Output.Address, })) - routerAddr := deployRouterOp.Output.Address + // routerAddr := deployRouterOp.Output.Address // add some dummy onramps to the router so that chain is supported, // on chain1, add chain2 as supported dest chain and vice versa onRamp := utils.RandomAddress() @@ -128,8 +128,8 @@ func TestFastCurse(t *testing.T) { destChainSelector = chain1 } _, err = cldf_ops.ExecuteOperation(bundle, routerops1_2.ApplyRampUpdates, evmChain, contract.FunctionInput[routerops1_2.ApplyRampsUpdatesArgs]{ - Address: common.HexToAddress(routerAddr), - ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddr), + // ChainSelector: evmChain.Selector, Args: routerops1_2.ApplyRampsUpdatesArgs{ OnRampUpdates: []routerops1_2.OnRamp{ { @@ -315,7 +315,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { chain := env.BlockChains.EVMChains()[chain1] deployRMNOp, err := cldf_ops.ExecuteOperation(bundle, rmnops1_5.Deploy, chain, contract.DeployInput[rmnops1_5.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmnops1_5.ContractType, *semver.MustParse("1.5.0")), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmnops1_5.ConstructorArgs{ RMNConfig: rmn_contract.RMNConfig{ BlessWeightThreshold: 2, @@ -347,7 +347,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { chain = env.BlockChains.EVMChains()[chainSel] deployRMNRemoteOp, err := cldf_ops.ExecuteOperation(bundle, rmnremoteops1_6.Deploy, chain, contract.DeployInput[rmnremoteops1_6.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmnremoteops1_6.ContractType, *semver.MustParse("1.6.0")), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmnremoteops1_6.ConstructorArgs{ LocalChainSelector: chain.Selector, LegacyRMN: utils.RandomAddress(), @@ -374,7 +374,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { rmnAddr = rmnRemoteAddresses[sel] } deployRMNProxyOp, err := cldf_ops.ExecuteOperation(bundle, rmnproxyops.Deploy, evmChain, contract.DeployInput[rmnproxyops.ConstructorArgs]{ - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(rmnproxyops.ContractType, *semver.MustParse("1.0.0")), Args: rmnproxyops.ConstructorArgs{ RMN: rmnAddr, @@ -389,7 +389,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { Address: rmnProxy, })) deployRouterOp, err := cldf_ops.ExecuteOperation(bundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{ - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")), Args: routerops1_2.ConstructorArgs{ WrappedNative: wNative, @@ -403,7 +403,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { ChainSelector: sel, Address: deployRouterOp.Output.Address, })) - routerAddr := deployRouterOp.Output.Address + // routerAddr := deployRouterOp.Output.Address // add some dummy onramps to the router so that chain is supported, // on chain1, add chain2 as supported dest chain and vice versa var onRampUpdates []routerops1_2.OnRamp @@ -423,8 +423,8 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) { } } _, err = cldf_ops.ExecuteOperation(bundle, routerops1_2.ApplyRampUpdates, evmChain, contract.FunctionInput[routerops1_2.ApplyRampsUpdatesArgs]{ - Address: common.HexToAddress(routerAddr), - ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddr), + // ChainSelector: evmChain.Selector, Args: routerops1_2.ApplyRampsUpdatesArgs{ OnRampUpdates: onRampUpdates, OffRampAdds: offRampAdds, diff --git a/chains/evm/deployment/utils/operations/contract/write.go b/chains/evm/deployment/utils/operations/contract/write.go index 7c58f03ef8..d367b64f9b 100644 --- a/chains/evm/deployment/utils/operations/contract/write.go +++ b/chains/evm/deployment/utils/operations/contract/write.go @@ -26,7 +26,7 @@ type WriteParams[ARGS any, C any] = upstream.WriteParams[ARGS, C] // NewWrite creates a new write operation. // // Deprecated: Import github.com/smartcontractkit/chainlink-deployments-framework/chain/evm/operations/contract directly. -func NewWrite[ARGS any, C any](params WriteParams[ARGS, C]) *operations.Operation[FunctionInput[ARGS], WriteOutput, cldf_evm.Chain] { +func NewWrite[ARGS any, C interface{ Address() common.Address}](params WriteParams[ARGS, C]) *operations.Operation[FunctionInput[ARGS], WriteOutput, cldf_evm.Chain] { return upstream.NewWrite(params) } diff --git a/chains/evm/deployment/v1_0_0/adapters/deployer.go b/chains/evm/deployment/v1_0_0/adapters/deployer.go index b71d742963..857308fa2e 100644 --- a/chains/evm/deployment/v1_0_0/adapters/deployer.go +++ b/chains/evm/deployment/v1_0_0/adapters/deployer.go @@ -151,7 +151,7 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf cancellerAddr := report.Output.Addresses[0] // deploy timelock timelockAddr, err := contract.MaybeDeployContract(b, ops.OpDeployTimelock, evmChain, contract.DeployInput[ops.OpDeployTimelockInput]{ - ChainSelector: in.ChainSelector, + // ChainSelector: in.ChainSelector, Qualifier: in.Qualifier, TypeAndVersion: cldf.NewTypeAndVersion(utils.RBACTimelock, *ops.MCMSVersion), Args: ops.OpDeployTimelockInput{ @@ -170,7 +170,7 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf b.Logger.Infof("Deployed Timelock at address %s on chain %s", timelockAddr, evmChain.Name) // deploy call proxy with timelock callProxyAddr, err := contract.MaybeDeployContract(b, ops.OpDeployCallProxy, evmChain, contract.DeployInput[ops.OpDeployCallProxyInput]{ - ChainSelector: in.ChainSelector, + // ChainSelector: in.ChainSelector, Qualifier: in.Qualifier, TypeAndVersion: cldf.NewTypeAndVersion(utils.CallProxy, *ops.MCMSVersion), Args: ops.OpDeployCallProxyInput{ @@ -185,8 +185,8 @@ func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConf // now that call proxy is deployed, we can add it as executor to the timelock _, err = cldf_ops.ExecuteOperation(b, ops.OpGrantRoleTimelock, evmChain, contract.FunctionInput[ops.OpGrantRoleTimelockInput]{ - ChainSelector: in.ChainSelector, - Address: common.HexToAddress(timelockAddr.Address), + // ChainSelector: in.ChainSelector, + // Address: common.HexToAddress(timelockAddr.Address), Args: ops.OpGrantRoleTimelockInput{ RoleID: ops.EXECUTOR_ROLE.ID, Account: common.HexToAddress(callProxyAddr.Address), diff --git a/chains/evm/deployment/v1_0_0/adapters/pool_adapter.go b/chains/evm/deployment/v1_0_0/adapters/pool_adapter.go index da6e8f28de..fcdb85ab2e 100644 --- a/chains/evm/deployment/v1_0_0/adapters/pool_adapter.go +++ b/chains/evm/deployment/v1_0_0/adapters/pool_adapter.go @@ -351,8 +351,8 @@ func (a *EVMPoolAdapter) DeployTokenPoolForToken() *cldf_ops.Sequence[tokensapi. report, execErr := cldf_ops.ExecuteOperation(b, bnmERC20ops.GrantMintAndBurnRoles, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: toknAddr, + // ChainSelector: input.ChainSelector, + // Address: toknAddr, Args: poolAddr, }, ) @@ -365,8 +365,8 @@ func (a *EVMPoolAdapter) DeployTokenPoolForToken() *cldf_ops.Sequence[tokensapi. report, execErr := cldf_ops.ExecuteOperation(b, tip20ops.GrantIssuerRole, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: toknAddr, + // ChainSelector: input.ChainSelector, + // Address: toknAddr, Args: poolAddr, }, ) @@ -450,16 +450,16 @@ func tidyTokenRoles( // BnM ERC-20 case bnmDripERC20ops.ContractType.String(), bnmERC20ops.ContractType.String(), bnmDripOps150.ContractType.String(): defaultAdminRole, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.GetDefaultAdminRole, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: tokenAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenAddr, Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get default admin role for token %q on chain %d: %w", tokenAddr.Hex(), input.ChainSelector, err) } grantReport, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.GrantAdminRole, chain, evm_contract.FunctionInput[bnmERC20ops.RoleAssignment]{ - ChainSelector: input.ChainSelector, - Address: tokenAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenAddr, Args: bnmERC20ops.RoleAssignment{ Role: defaultAdminRole.Output, To: timelockAddr, @@ -469,8 +469,8 @@ func tidyTokenRoles( return nil, fmt.Errorf("failed to grant default admin role to timelock %q for token %q on chain %d: %w", timelockAddr.Hex(), tokenAddr.Hex(), input.ChainSelector, err) } revokeReport, err := cldf_ops.ExecuteOperation(b, bnmERC20ops.RevokeAdminRole, chain, evm_contract.FunctionInput[bnmERC20ops.RoleAssignment]{ - ChainSelector: input.ChainSelector, - Address: tokenAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenAddr, Args: bnmERC20ops.RoleAssignment{ Role: defaultAdminRole.Output, To: chain.DeployerKey.From, @@ -484,16 +484,16 @@ func tidyTokenRoles( // TIP-20 case tip20ops.ContractType.String(): grantReport, err := cldf_ops.ExecuteOperation(b, tip20ops.GrantAdminRole, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: tokenAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenAddr, Args: timelockAddr, }) if err != nil { return nil, fmt.Errorf("failed to grant TIP-20 default admin role to timelock %q for token %q on chain %d: %w", timelockAddr.Hex(), tokenAddr.Hex(), input.ChainSelector, err) } revokeReport, err := cldf_ops.ExecuteOperation(b, tip20ops.RevokeAdminRole, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: tokenAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenAddr, Args: chain.DeployerKey.From, }) if err != nil { diff --git a/chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go b/chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go index bd976bdd22..cbc8140c25 100644 --- a/chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go +++ b/chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go @@ -114,7 +114,7 @@ func TestTransferOwnership(t *testing.T) { wNative := utils.RandomAddress() rmnProxy := utils.RandomAddress() deployRouterOp, err := cldf_ops.ExecuteOperation(env.OperationsBundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{ - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")), Args: routerops1_2.ConstructorArgs{ WrappedNative: wNative, diff --git a/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20/burn_mint_erc20.go b/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20/burn_mint_erc20.go index 9ad8f765e6..55c3d14fc6 100644 --- a/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20/burn_mint_erc20.go +++ b/chains/evm/deployment/v1_0_0/operations/burn_mint_erc20/burn_mint_erc20.go @@ -47,7 +47,7 @@ var SetCCIPAdmin = contract.NewWrite(contract.WriteParams[string, *burn_mint_erc Description: "Set CCIP Admin on BurnMintERC20 token contract", ContractType: ContractType, ContractABI: burn_mint_erc20.BurnMintERC20ABI, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input string) (bool, error) { // SetCCIPAdmin can only be called by the current CCIP admin currentAdmin, err := token.GetCCIPAdmin(opts) @@ -68,7 +68,7 @@ var GrantAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *bur Description: "Grant admin role on BurnMintERC20 token contract", ContractType: ContractType, ContractABI: burn_mint_erc20.BurnMintERC20ABI, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { // Check if caller has the admin role for the role being granted roleAdmin, err := token.GetRoleAdmin(opts, input.Role) @@ -89,7 +89,7 @@ var RevokeAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *bu Description: "Revoke admin role on BurnMintERC20 token contract", ContractType: ContractType, ContractABI: burn_mint_erc20.BurnMintERC20ABI, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { // Check if caller has the admin role for the role being revoked roleAdmin, err := token.GetRoleAdmin(opts, input.Role) @@ -109,7 +109,7 @@ var GetDefaultAdminRole = contract.NewRead(contract.ReadParams[struct{}, [32]byt Version: utils.Version_1_0_0, Description: "Gets the default admin role on BurnMintERC20 token contract", ContractType: ContractType, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, CallContract: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, input struct{}) ([32]byte, error) { return token.DEFAULTADMINROLE(opts) }, @@ -121,7 +121,7 @@ var RenounceAdminRole = contract.NewWrite(contract.WriteParams[RoleAssignment, * Description: "Renounce admin role on BurnMintERC20 token contract", ContractType: ContractType, ContractABI: burn_mint_erc20.BurnMintERC20ABI, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { // For renounce, the caller must be the one renouncing their own role // The caller can only renounce for themselves @@ -139,7 +139,7 @@ var GrantMintAndBurnRoles = contract.NewWrite(contract.WriteParams[common.Addres Description: "Grant mint and burn role on BurnMintERC20 token contract", ContractType: ContractType, ContractABI: burn_mint_erc20.BurnMintERC20ABI, - NewContract: burn_mint_erc20.NewBurnMintERC20, + // NewContract: burn_mint_erc20.NewBurnMintERC20, IsAllowedCaller: func(token *burn_mint_erc20.BurnMintERC20, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { // Check if caller has the admin role for the role being revoked roleAdmin, err := token.DEFAULTADMINROLE(opts) diff --git a/chains/evm/deployment/v1_0_0/operations/erc20/erc20.go b/chains/evm/deployment/v1_0_0/operations/erc20/erc20.go index a13b7e0089..8646747ec1 100644 --- a/chains/evm/deployment/v1_0_0/operations/erc20/erc20.go +++ b/chains/evm/deployment/v1_0_0/operations/erc20/erc20.go @@ -45,7 +45,7 @@ var Transfer = contract.NewWrite(contract.WriteParams[TransferArgs, *erc20.ERC20 Description: "Transfer ERC20 tokens to a specified address", ContractType: ContractType, ContractABI: erc20.ERC20ABI, - NewContract: erc20.NewERC20, + // Contract: erc20.NewERC20, IsAllowedCaller: contract.AllCallersAllowed[*erc20.ERC20, TransferArgs], Validate: func(args TransferArgs) error { if args.Amount == nil || args.Amount.Cmp(big.NewInt(0)) <= 0 { diff --git a/chains/evm/deployment/v1_0_0/operations/link/link.go b/chains/evm/deployment/v1_0_0/operations/link/link.go index bc87a692a1..26db116034 100644 --- a/chains/evm/deployment/v1_0_0/operations/link/link.go +++ b/chains/evm/deployment/v1_0_0/operations/link/link.go @@ -42,7 +42,7 @@ var GrantMintRole = contract.NewWrite(contract.WriteParams[GrantMintRoleArgs, *l Description: "Grants minting permission to an address", ContractType: ContractType, ContractABI: link_token.LinkTokenABI, - NewContract: link_token.NewLinkToken, + // NewContract: link_token.NewLinkToken, IsAllowedCaller: contract.OnlyOwner[*link_token.LinkToken, GrantMintRoleArgs], Validate: func(GrantMintRoleArgs) error { return nil }, CallContract: func(linkToken *link_token.LinkToken, opts *bind.TransactOpts, args GrantMintRoleArgs) (*types.Transaction, error) { @@ -62,7 +62,7 @@ var Mint = contract.NewWrite(contract.WriteParams[MintArgs, *link_token.LinkToke Description: "Mints LINK tokens to the specified address", ContractType: ContractType, ContractABI: link_token.LinkTokenABI, - NewContract: link_token.NewLinkToken, + // NewContract: link_token.NewLinkToken, IsAllowedCaller: contract.AllCallersAllowed[*link_token.LinkToken, MintArgs], // Minter check is done on-chain Validate: func(MintArgs) error { return nil }, CallContract: func(linkToken *link_token.LinkToken, opts *bind.TransactOpts, args MintArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_0_0/operations/mcms.go b/chains/evm/deployment/v1_0_0/operations/mcms.go index 5bb0e6eeb5..0313da2f34 100644 --- a/chains/evm/deployment/v1_0_0/operations/mcms.go +++ b/chains/evm/deployment/v1_0_0/operations/mcms.go @@ -169,7 +169,7 @@ var OpEVMSetConfigMCM = contract.NewWrite(contract.WriteParams[OpSetConfigMCMInp Description: "Sets Config on the deployed MCM contract", ContractABI: bindings.ManyChainMultiSigABI, ContractType: "ManyChainMultiSig", - NewContract: bindings.NewManyChainMultiSig, + // NewContract: bindings.NewManyChainMultiSig, IsAllowedCaller: contract.OnlyOwner[*bindings.ManyChainMultiSig, OpSetConfigMCMInput], Validate: func(input OpSetConfigMCMInput) error { return nil }, CallContract: func(mcm *bindings.ManyChainMultiSig, opts *bind.TransactOpts, input OpSetConfigMCMInput) (*types.Transaction, error) { @@ -190,7 +190,7 @@ var OpGrantRoleTimelock = contract.NewWrite(contract.WriteParams[OpGrantRoleTime Description: "Grants role on the deployed Timelock contract", ContractABI: bindings.RBACTimelockABI, ContractType: "RBACTimelock", - NewContract: bindings.NewRBACTimelock, + // NewContract: bindings.NewRBACTimelock, IsAllowedCaller: func(contract *bindings.RBACTimelock, opts *bind.CallOpts, caller common.Address, input OpGrantRoleTimelockInput) (bool, error) { roleAdmin, err := contract.GetRoleAdmin(opts, input.RoleID) if err != nil { @@ -219,7 +219,7 @@ var OpRenounceRoleTimelock = contract.NewWrite(contract.WriteParams[OpRenounceRo Description: "Renounces role of the caller key on the deployed Timelock contract", ContractABI: bindings.RBACTimelockABI, ContractType: "RBACTimelock", - NewContract: bindings.NewRBACTimelock, + // NewContract: bindings.NewRBACTimelock, IsAllowedCaller: func(contract *bindings.RBACTimelock, opts *bind.CallOpts, caller common.Address, input OpRenounceRoleTimelockInput) (bool, error) { roleAdmin, err := contract.GetRoleAdmin(opts, input.RoleID) if err != nil { diff --git a/chains/evm/deployment/v1_0_0/operations/rmn_proxy/rmn_proxy.go b/chains/evm/deployment/v1_0_0/operations/rmn_proxy/rmn_proxy.go index 6f18562bb4..4f0c5c2a64 100644 --- a/chains/evm/deployment/v1_0_0/operations/rmn_proxy/rmn_proxy.go +++ b/chains/evm/deployment/v1_0_0/operations/rmn_proxy/rmn_proxy.go @@ -42,7 +42,7 @@ var SetRMN = contract.NewWrite(contract.WriteParams[SetRMNArgs, *rmn_proxy_contr Description: "Sets the RMN address on the RMNProxy", ContractType: ContractType, ContractABI: rmn_proxy_contract.RMNProxyABI, - NewContract: rmn_proxy_contract.NewRMNProxy, + // NewContract: rmn_proxy_contract.NewRMNProxy, IsAllowedCaller: contract.OnlyOwner[*rmn_proxy_contract.RMNProxy, SetRMNArgs], Validate: func(SetRMNArgs) error { return nil }, CallContract: func(rmnProxy *rmn_proxy_contract.RMNProxy, opts *bind.TransactOpts, args SetRMNArgs) (*types.Transaction, error) { @@ -55,7 +55,7 @@ var GetRMN = contract.NewRead(contract.ReadParams[struct{}, common.Address, *rmn Version: semver.MustParse("1.0.0"), Description: "Gets the RMN address set on the RMNProxy", ContractType: ContractType, - NewContract: rmn_proxy_contract.NewRMNProxy, + // NewContract: rmn_proxy_contract.NewRMNProxy, CallContract: func(rmnProxy *rmn_proxy_contract.RMNProxy, opts *bind.CallOpts, args struct{}) (common.Address, error) { return rmnProxy.GetARM(opts) }, diff --git a/chains/evm/deployment/v1_0_0/operations/tip20/salt.go b/chains/evm/deployment/v1_0_0/operations/tip20/salt.go index c539a165a0..3e9c546077 100644 --- a/chains/evm/deployment/v1_0_0/operations/tip20/salt.go +++ b/chains/evm/deployment/v1_0_0/operations/tip20/salt.go @@ -22,8 +22,8 @@ func generateValidSalt(b operations.Bundle, chain evm.Chain, factoryAddr common. // NOTE: GetTokenAddress will revert if the salt is already used, so we can // use it to check if the salt is valid without actually deploying a token. _, err := operations.ExecuteOperation(b, GetTokenAddress, chain, contract.FunctionInput[GetTokenAddressArgs]{ - ChainSelector: chain.Selector, - Address: factoryAddr, + // ChainSelector: chain.Selector, + // Address: factoryAddr, Args: GetTokenAddressArgs{ Sender: deployer, Salt: salt, diff --git a/chains/evm/deployment/v1_0_0/operations/tip20/tip20_factory_contract.go b/chains/evm/deployment/v1_0_0/operations/tip20/tip20_factory_contract.go index 0d5f51ae7f..496979b14e 100644 --- a/chains/evm/deployment/v1_0_0/operations/tip20/tip20_factory_contract.go +++ b/chains/evm/deployment/v1_0_0/operations/tip20/tip20_factory_contract.go @@ -83,7 +83,7 @@ var CreateToken = contract.NewWrite(contract.WriteParams[CreateTokenArgs, *TIP20 Description: "Creates a TIP-20 token via the Tempo TIP-20 factory precompile", ContractType: FactoryContractType, ContractABI: TIP20FactoryABI, - NewContract: NewTIP20Factory, + // NewContract: NewTIP20Factory, IsAllowedCaller: contract.AllCallersAllowed[*TIP20Factory, CreateTokenArgs], Validate: func(args CreateTokenArgs) error { if args.Name == "" { @@ -107,7 +107,7 @@ var GetTokenAddress = contract.NewRead(contract.ReadParams[GetTokenAddressArgs, Version: Version, Description: "Predicts the TIP-20 token address for a sender and salt", ContractType: FactoryContractType, - NewContract: NewTIP20Factory, + // NewContract: NewTIP20Factory, CallContract: func(f *TIP20Factory, opts *bind.CallOpts, args GetTokenAddressArgs) (common.Address, error) { return f.GetTokenAddress(opts, args.Sender, args.Salt) }, @@ -118,7 +118,7 @@ var IsTIP20 = contract.NewRead(contract.ReadParams[common.Address, bool, *TIP20F Version: Version, Description: "Returns whether an address is a valid TIP-20 token", ContractType: FactoryContractType, - NewContract: NewTIP20Factory, + // NewContract: NewTIP20Factory, CallContract: func(f *TIP20Factory, opts *bind.CallOpts, token common.Address) (bool, error) { return f.IsTIP20(opts, token) }, diff --git a/chains/evm/deployment/v1_0_0/operations/tip20/tip20_ops.go b/chains/evm/deployment/v1_0_0/operations/tip20/tip20_ops.go index edd7ba011c..ac5c6ea772 100644 --- a/chains/evm/deployment/v1_0_0/operations/tip20/tip20_ops.go +++ b/chains/evm/deployment/v1_0_0/operations/tip20/tip20_ops.go @@ -98,8 +98,8 @@ var Deploy = operations.NewSequence( b.Logger.Infof("Validating quote token address: %s", input.QuoteToken.Hex()) isQuoteTokenValid, err := operations.ExecuteOperation(b, IsTIP20, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: factoryAddr, + // ChainSelector: chain.Selector, + // Address: factoryAddr, Args: input.QuoteToken, }) if err != nil { @@ -111,8 +111,8 @@ var Deploy = operations.NewSequence( b.Logger.Infof("Deploying TIP20 token: %+v", input) createTokenReport, err := operations.ExecuteOperation(b, CreateToken, chain, contract.FunctionInput[CreateTokenArgs]{ - ChainSelector: chain.Selector, - Address: factoryAddr, + // ChainSelector: chain.Selector, + // Address: factoryAddr, Args: CreateTokenArgs{ QuoteToken: input.QuoteToken, Currency: input.Currency, @@ -128,8 +128,8 @@ var Deploy = operations.NewSequence( b.Logger.Info("Retrieving address of deployed token via factory's getTokenAddress function") tokenAddrReport, err := operations.ExecuteOperation(b, GetTokenAddress, chain, contract.FunctionInput[GetTokenAddressArgs]{ - ChainSelector: chain.Selector, - Address: factoryAddr, + // ChainSelector: chain.Selector, + // Address: factoryAddr, Args: GetTokenAddressArgs{ Sender: deployerKey, Salt: input.Salt, @@ -168,7 +168,7 @@ var GrantIssuerRole = contract.NewWrite(contract.WriteParams[common.Address, *TI Description: "Grants ISSUER_ROLE on a TIP-20 token so the account can mint and burn (e.g. a burn-mint pool on Tempo)", ContractType: ContractType, ContractABI: TIP20TokenABI, - NewContract: NewTIP20Token, + // NewContract: NewTIP20Token, IsAllowedCaller: func(token *TIP20Token, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return token.HasRole(opts, caller, DefaultAdminRole) }, @@ -193,7 +193,7 @@ var GrantAdminRole = contract.NewWrite(contract.WriteParams[common.Address, *TIP Description: "Grants DEFAULT_ADMIN_ROLE on a TIP-20 token (same role id as TIP20RolesAuth bytes32(0))", ContractType: ContractType, ContractABI: TIP20TokenABI, - NewContract: NewTIP20Token, + // NewContract: NewTIP20Token, IsAllowedCaller: func(token *TIP20Token, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return token.HasRole(opts, caller, DefaultAdminRole) }, @@ -214,7 +214,7 @@ var RevokeAdminRole = contract.NewWrite(contract.WriteParams[common.Address, *TI Description: "Revokes DEFAULT_ADMIN_ROLE on a TIP-20 token (same role id as TIP20RolesAuth bytes32(0))", ContractType: ContractType, ContractABI: TIP20TokenABI, - NewContract: NewTIP20Token, + // NewContract: NewTIP20Token, IsAllowedCaller: func(token *TIP20Token, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return token.HasRole(opts, caller, DefaultAdminRole) }, diff --git a/chains/evm/deployment/v1_0_0/operations/type_and_version/type_and_version.go b/chains/evm/deployment/v1_0_0/operations/type_and_version/type_and_version.go index 94e9a9cb0c..27af421bda 100644 --- a/chains/evm/deployment/v1_0_0/operations/type_and_version/type_and_version.go +++ b/chains/evm/deployment/v1_0_0/operations/type_and_version/type_and_version.go @@ -65,7 +65,7 @@ var GetTypeAndVersion = contract.NewRead(contract.ReadParams[struct{}, TypeAndVe Version: Version, Description: "Gets the type and version of the contract", ContractType: ContractType, - NewContract: NewTypeAndVersionContract, + // NewContract: NewTypeAndVersionContract, CallContract: func(c *TypeAndVersionContract, opts *bind.CallOpts, args struct{}) (TypeAndVersion, error) { typeAndVersion, err := c.TypeAndVersion(opts) if err != nil { diff --git a/chains/evm/deployment/v1_0_0/sequences/mcms.go b/chains/evm/deployment/v1_0_0/sequences/mcms.go index 3d59dbb69a..ac7b0ec8d9 100644 --- a/chains/evm/deployment/v1_0_0/sequences/mcms.go +++ b/chains/evm/deployment/v1_0_0/sequences/mcms.go @@ -58,7 +58,7 @@ var SeqDeployMCMWithConfig = cldf_ops.NewSequence( switch in.ContractType { case utils.ProposerManyChainMultisig: mcmAddr, err = contract.MaybeDeployContract(b, ops.OpDeployProposerMCM, chain, contract.DeployInput[struct{}]{ - ChainSelector: in.ChainSelector, + // ChainSelector: in.ChainSelector, Qualifier: in.Qualifier, TypeAndVersion: cldf.NewTypeAndVersion(utils.ProposerManyChainMultisig, *semver.MustParse("1.0.0")), }, in.ExistingAddresses) @@ -67,7 +67,7 @@ var SeqDeployMCMWithConfig = cldf_ops.NewSequence( } case utils.BypasserManyChainMultisig: mcmAddr, err = contract.MaybeDeployContract(b, ops.OpDeployBypasserMCM, chain, contract.DeployInput[struct{}]{ - ChainSelector: in.ChainSelector, + // ChainSelector: in.ChainSelector, Qualifier: in.Qualifier, TypeAndVersion: cldf.NewTypeAndVersion(utils.BypasserManyChainMultisig, *semver.MustParse("1.0.0")), }, in.ExistingAddresses) @@ -76,7 +76,7 @@ var SeqDeployMCMWithConfig = cldf_ops.NewSequence( } case utils.CancellerManyChainMultisig: mcmAddr, err = contract.MaybeDeployContract(b, ops.OpDeployCancellerMCM, chain, contract.DeployInput[struct{}]{ - ChainSelector: in.ChainSelector, + // ChainSelector: in.ChainSelector, Qualifier: in.Qualifier, TypeAndVersion: cldf.NewTypeAndVersion(utils.CancellerManyChainMultisig, *semver.MustParse("1.0.0")), }, in.ExistingAddresses) @@ -94,8 +94,8 @@ var SeqDeployMCMWithConfig = cldf_ops.NewSequence( } _, err = cldf_ops.ExecuteOperation(b, ops.OpEVMSetConfigMCM, chain, contract.FunctionInput[ops.OpSetConfigMCMInput]{ - ChainSelector: in.ChainSelector, - Address: common.HexToAddress(mcmAddr.Address), + // ChainSelector: in.ChainSelector, + // Address: common.HexToAddress(mcmAddr.Address), Args: ops.OpSetConfigMCMInput{ SignerAddresses: signerAddresses, SignerGroups: signerGroups, @@ -128,8 +128,8 @@ var SeqSetMCMSConfigs = cldf_ops.NewSequence( } report, err := cldf_ops.ExecuteOperation(b, ops.OpEVMSetConfigMCM, chain, contract.FunctionInput[ops.OpSetConfigMCMInput]{ - ChainSelector: in.ChainSelector, - Address: common.HexToAddress(mcmContract.Address), + // ChainSelector: in.ChainSelector, + // Address: common.HexToAddress(mcmContract.Address), Args: ops.OpSetConfigMCMInput{ SignerAddresses: signerAddresses, SignerGroups: signerGroups, @@ -184,8 +184,8 @@ var SeqGrantAdminRoleOfTimelockToTimelock = cldf_ops.NewSequence( // Grant admin role to new admin Timelock if !newAdminTimelockHasRole { _, err = cldf_ops.ExecuteOperation(b, ops.OpGrantRoleTimelock, chain, contract.FunctionInput[ops.OpGrantRoleTimelockInput]{ - ChainSelector: in.ChainSelector, - Address: in.TimelockAddress, + // ChainSelector: in.ChainSelector, + // Address: in.TimelockAddress, Args: ops.OpGrantRoleTimelockInput{ RoleID: ops.ADMIN_ROLE.ID, Account: in.NewAdminTimelockAddress, @@ -201,8 +201,8 @@ var SeqGrantAdminRoleOfTimelockToTimelock = cldf_ops.NewSequence( // Renounce admin role from Deployer EOA _, err = cldf_ops.ExecuteOperation(b, ops.OpRenounceRoleTimelock, chain, contract.FunctionInput[ops.OpRenounceRoleTimelockInput]{ - ChainSelector: in.ChainSelector, - Address: in.TimelockAddress, + // ChainSelector: in.ChainSelector, + // Address: in.TimelockAddress, Args: ops.OpRenounceRoleTimelockInput{ RoleID: ops.ADMIN_ROLE.ID, }, diff --git a/chains/evm/deployment/v1_0_0/sequences/token.go b/chains/evm/deployment/v1_0_0/sequences/token.go index b60521d267..00eb43e665 100644 --- a/chains/evm/deployment/v1_0_0/sequences/token.go +++ b/chains/evm/deployment/v1_0_0/sequences/token.go @@ -99,7 +99,7 @@ var DeployToken = cldf_ops.NewSequence( case erc20.ContractType: tokenRef, err = contract.MaybeDeployContract(b, erc20.Deploy, chain, contract.DeployInput[erc20.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(erc20.ContractType, *common_utils.Version_1_0_0), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: erc20.ConstructorArgs{ Name: input.Name, Symbol: input.Symbol, @@ -113,7 +113,7 @@ var DeployToken = cldf_ops.NewSequence( case burn_mint_erc20.ContractType: tokenRef, err = contract.MaybeDeployContract(b, burn_mint_erc20.Deploy, chain, contract.DeployInput[burn_mint_erc20.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20.ContractType, *common_utils.Version_1_0_0), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: burn_mint_erc20.ConstructorArgs{ Name: input.Name, Symbol: input.Symbol, @@ -130,7 +130,7 @@ var DeployToken = cldf_ops.NewSequence( case burn_mint_erc20_with_drip.ContractType: tokenRef, err = contract.MaybeDeployContract(b, burn_mint_erc20_with_drip.Deploy, chain, contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *common_utils.Version_1_0_0), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: burn_mint_erc20_with_drip.ConstructorArgs{ Name: input.Name, Symbol: input.Symbol, @@ -147,7 +147,7 @@ var DeployToken = cldf_ops.NewSequence( case drip_v150.ContractType: tokenRef, err = contract.MaybeDeployContract(b, drip_v150.Deploy, chain, contract.DeployInput[drip_v150.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(drip_v150.ContractType, *drip_v150.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: drip_v150.ConstructorArgs{ Name: input.Name, Symbol: input.Symbol, @@ -197,8 +197,8 @@ var DeployToken = cldf_ops.NewSequence( b.Logger.Warnf("Multiple senders provided but only the first one (%s) will receive the pre-minted tokens", tokReceiver.Hex()) } transferReport, err := cldf_ops.ExecuteOperation(b, erc20.Transfer, chain, contract.FunctionInput[erc20.TransferArgs]{ - ChainSelector: chain.Selector, - Address: tokenAddr, + // ChainSelector: chain.Selector, + // Address: tokenAddr, Args: erc20.TransferArgs{ Receiver: tokReceiver, Amount: preMint, @@ -212,8 +212,8 @@ var DeployToken = cldf_ops.NewSequence( if input.CCIPAdmin != "" && tokenSupportsCCIPAdmin(input.Type) { setCCIPAdminReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20.SetCCIPAdmin, chain, contract.FunctionInput[string]{ - ChainSelector: chain.Selector, - Address: tokenAddr, + // ChainSelector: chain.Selector, + // Address: tokenAddr, Args: ccipAdmin.Hex(), }) if err != nil { @@ -235,8 +235,8 @@ var DeployToken = cldf_ops.NewSequence( } grantReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20.GrantAdminRole, chain, contract.FunctionInput[burn_mint_erc20.RoleAssignment]{ - ChainSelector: chain.Selector, - Address: tokenAddr, + // ChainSelector: chain.Selector, + // Address: tokenAddr, Args: burn_mint_erc20.RoleAssignment{ Role: role, To: externalAdmin, @@ -249,8 +249,8 @@ var DeployToken = cldf_ops.NewSequence( case tip20.ContractType: grantReport, err := cldf_ops.ExecuteOperation(b, tip20.GrantAdminRole, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tokenAddr, + // ChainSelector: chain.Selector, + // Address: tokenAddr, Args: externalAdmin, }) if err != nil { diff --git a/chains/evm/deployment/v1_0_0/transfer_ownership_test.go b/chains/evm/deployment/v1_0_0/transfer_ownership_test.go index 9632ebf9a8..091eecf815 100644 --- a/chains/evm/deployment/v1_0_0/transfer_ownership_test.go +++ b/chains/evm/deployment/v1_0_0/transfer_ownership_test.go @@ -113,7 +113,7 @@ func TestTransferOwnership(t *testing.T) { wNative := utils.RandomAddress() rmnProxy := utils.RandomAddress() deployRouterOp, err := cldf_ops.ExecuteOperation(env.OperationsBundle, routerops1_2.Deploy, evmChain, contract.DeployInput[routerops1_2.ConstructorArgs]{ - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(routerops1_2.ContractType, *semver.MustParse("1.2.0")), Args: routerops1_2.ConstructorArgs{ WrappedNative: wNative, diff --git a/chains/evm/deployment/v1_2_0/adapters/router.go b/chains/evm/deployment/v1_2_0/adapters/router.go index e7f997afbd..04a3b23e1f 100644 --- a/chains/evm/deployment/v1_2_0/adapters/router.go +++ b/chains/evm/deployment/v1_2_0/adapters/router.go @@ -13,7 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract" routerops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router" "github.com/smartcontractkit/chainlink-ccip/deployment/deploy" - datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore" + // datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore" "github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences" ) @@ -41,21 +41,21 @@ func (u *RouterUpdater) UpdateRouter() *cldf_ops.Sequence[deploy.RouterUpdaterCo return sequences.OnChainOutput{}, fmt.Errorf("error adding address ref to temp datastore: %w", err) } } - tempDS := ds.Seal() + // tempDS := ds.Seal() // get router from existing addresses - routerAddr, err := datastore_utils.FindAndFormatRef( - tempDS, - datastore.AddressRef{ - ChainSelector: input.ChainSelector, - Type: datastore.ContractType(routerops.ContractType), - Version: routerops.Version, - }, - input.ChainSelector, - evm_datastore_utils.ToEVMAddress, - ) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("error finding router address ref: %w", err) - } + // routerAddr, err := datastore_utils.FindAndFormatRef( + // tempDS, + // datastore.AddressRef{ + // ChainSelector: input.ChainSelector, + // Type: datastore.ContractType(routerops.ContractType), + // Version: routerops.Version, + // }, + // input.ChainSelector, + // evm_datastore_utils.ToEVMAddress, + // ) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("error finding router address ref: %w", err) + // } onRampAddr, err := evm_datastore_utils.ToEVMAddress(input.OnRamp) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("error formatting onRamp address: %w", err) @@ -81,13 +81,13 @@ func (u *RouterUpdater) UpdateRouter() *cldf_ops.Sequence[deploy.RouterUpdaterCo } out, err := cldf_ops.ExecuteOperation( b, routerops.ApplyRampUpdates, c, contract.FunctionInput[routerops.ApplyRampsUpdatesArgs]{ - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, Args: routerops.ApplyRampsUpdatesArgs{ OnRampUpdates: onRampAdds, OffRampRemoves: []routerops.OffRamp{}, OffRampAdds: offRampAdds, }, - Address: routerAddr, + // Address: routerAddr, }, ) if err != nil { diff --git a/chains/evm/deployment/v1_2_0/operations/price_registry/price_registry.go b/chains/evm/deployment/v1_2_0/operations/price_registry/price_registry.go index 370ded5bb7..e2313edeaf 100644 --- a/chains/evm/deployment/v1_2_0/operations/price_registry/price_registry.go +++ b/chains/evm/deployment/v1_2_0/operations/price_registry/price_registry.go @@ -21,7 +21,7 @@ var PriceRegistryGetFeeToken = contract.NewRead(contract.ReadParams[any, []commo Version: Version, Description: "gets fee token from price registry 1.2", ContractType: ContractType, - NewContract: price_registry.NewPriceRegistry, + // NewContract: price_registry.NewPriceRegistry, CallContract: func(pr *price_registry.PriceRegistry, opts *bind.CallOpts, args any) ([]common.Address, error) { return pr.GetFeeTokens(opts) }, @@ -32,7 +32,7 @@ var PriceRegistryGetTokenPrices = contract.NewRead(contract.ReadParams[[]common. Version: Version, Description: "Calls getTokenPrices on the contract", ContractType: ContractType, - NewContract: price_registry.NewPriceRegistry, + // NewContract: price_registry.NewPriceRegistry, CallContract: func(pr *price_registry.PriceRegistry, opts *bind.CallOpts, args []common.Address) ([]price_registry.InternalTimestampedPackedUint224, error) { return pr.GetTokenPrices(opts, args) }, @@ -43,7 +43,7 @@ var PriceRegistryGetDestinationChainGasPrice = contract.NewRead(contract.ReadPar Version: Version, Description: "Calls getDestinationChainGasPrice on the contract", ContractType: ContractType, - NewContract: price_registry.NewPriceRegistry, + // NewContract: price_registry.NewPriceRegistry, CallContract: func(pr *price_registry.PriceRegistry, opts *bind.CallOpts, args uint64) (price_registry.InternalTimestampedPackedUint224, error) { return pr.GetDestinationChainGasPrice(opts, args) }, diff --git a/chains/evm/deployment/v1_2_0/operations/router/router.go b/chains/evm/deployment/v1_2_0/operations/router/router.go index e419c76fc4..ea3e9ad61e 100644 --- a/chains/evm/deployment/v1_2_0/operations/router/router.go +++ b/chains/evm/deployment/v1_2_0/operations/router/router.go @@ -74,7 +74,7 @@ var ApplyRampUpdates = contract.NewWrite(contract.WriteParams[ApplyRampsUpdatesA Description: "Applies ramp updates to the Router", ContractType: ContractType, ContractABI: router.RouterABI, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, IsAllowedCaller: contract.OnlyOwner[*router.Router, ApplyRampsUpdatesArgs], Validate: func(ApplyRampsUpdatesArgs) error { return nil }, CallContract: func(router *router.Router, opts *bind.TransactOpts, args ApplyRampsUpdatesArgs) (*types.Transaction, error) { @@ -88,7 +88,7 @@ var CCIPSend = contract.NewWrite(contract.WriteParams[CCIPSendArgs, *router.Rout Description: "Sends a CCIP message via the Router", ContractType: ContractType, ContractABI: router.RouterABI, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, IsAllowedCaller: contract.AllCallersAllowed[*router.Router, CCIPSendArgs], Validate: func(CCIPSendArgs) error { return nil }, CallContract: func(router *router.Router, opts *bind.TransactOpts, args CCIPSendArgs) (*types.Transaction, error) { @@ -103,7 +103,7 @@ var GetOffRamps = contract.NewRead(contract.ReadParams[any, []OffRamp, *router.R Version: Version, Description: "Gets all off ramps on the router", ContractType: ContractType, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, CallContract: func(router *router.Router, opts *bind.CallOpts, args any) ([]OffRamp, error) { return router.GetOffRamps(opts) }, @@ -114,7 +114,7 @@ var GetOnRamp = contract.NewRead(contract.ReadParams[uint64, common.Address, *ro Version: Version, Description: "Gets the on ramp for a given destination chain selector", ContractType: ContractType, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, CallContract: func(router *router.Router, opts *bind.CallOpts, destChainSelector uint64) (common.Address, error) { return router.GetOnRamp(opts, destChainSelector) }, @@ -125,7 +125,7 @@ var GetFee = contract.NewRead(contract.ReadParams[CCIPSendArgs, *big.Int, *route Version: Version, Description: "Gets the fee for a message", ContractType: ContractType, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, CallContract: func(router *router.Router, opts *bind.CallOpts, args CCIPSendArgs) (*big.Int, error) { return router.GetFee(opts, args.DestChainSelector, args.EVM2AnyMessage) }, @@ -136,7 +136,7 @@ var IsChainSupported = contract.NewRead(contract.ReadParams[uint64, bool, *route Version: Version, Description: "If the router supports a given destination chain selector", ContractType: ContractType, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, CallContract: func(router *router.Router, opts *bind.CallOpts, args uint64) (bool, error) { return router.IsChainSupported(opts, args) }, @@ -147,7 +147,7 @@ var GetWrappedNative = contract.NewRead(contract.ReadParams[struct{}, common.Add Version: Version, Description: "Gets the wrapped native address", ContractType: ContractType, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, CallContract: func(router *router.Router, opts *bind.CallOpts, args struct{}) (common.Address, error) { return router.GetWrappedNative(opts) }, @@ -159,7 +159,7 @@ var SetWrappedNative = contract.NewWrite(contract.WriteParams[common.Address, *r Description: "Sets the wrapped native address", ContractType: ContractType, ContractABI: router.RouterABI, - NewContract: router.NewRouter, + // NewContract: router.NewRouter, IsAllowedCaller: contract.OnlyOwner[*router.Router, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func(router *router.Router, opts *bind.TransactOpts, args common.Address) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_2_0/sequences/price_registry.go b/chains/evm/deployment/v1_2_0/sequences/price_registry.go index 74118b572f..fde00ef17a 100644 --- a/chains/evm/deployment/v1_2_0/sequences/price_registry.go +++ b/chains/evm/deployment/v1_2_0/sequences/price_registry.go @@ -47,8 +47,8 @@ var PriceRegistryImportConfigSequence = operations.NewSequence( gasPrices := make(map[uint64]*big.Int) for _, remoteChainSelector := range input.RemoteChains { gasPricesOutput, err := operations.ExecuteOperation(b, priceregistryops.PriceRegistryGetDestinationChainGasPrice, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: input.PriceRegistry, + // ChainSelector: chain.Selector, + // Address: input.PriceRegistry, Args: remoteChainSelector, }) if err != nil { @@ -59,8 +59,8 @@ var PriceRegistryImportConfigSequence = operations.NewSequence( } // get fee tokens feetokensRep, err := operations.ExecuteOperation(b, priceregistryops.PriceRegistryGetFeeToken, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: input.PriceRegistry, + // ChainSelector: chain.Selector, + // Address: input.PriceRegistry, Args: nil, }) if err != nil { @@ -80,8 +80,8 @@ var PriceRegistryImportConfigSequence = operations.NewSequence( } tokenPrices := make(map[common.Address]*big.Int) tokenPriceOutput, err := operations.ExecuteOperation(b, priceregistryops.PriceRegistryGetTokenPrices, chain, contract.FunctionInput[[]common.Address]{ - ChainSelector: chain.Selector, - Address: input.PriceRegistry, + // ChainSelector: chain.Selector, + // Address: input.PriceRegistry, Args: allTokens, }) if err != nil { diff --git a/chains/evm/deployment/v1_5_0/adapters/fastcurse.go b/chains/evm/deployment/v1_5_0/adapters/fastcurse.go index deea2cc39a..5767c98e16 100644 --- a/chains/evm/deployment/v1_5_0/adapters/fastcurse.go +++ b/chains/evm/deployment/v1_5_0/adapters/fastcurse.go @@ -139,8 +139,9 @@ func (ca *CurseAdapter) Curse() *cldf_ops.Sequence[api.CurseInput, sequences.OnC // form the curse ID // get config version cfgDetailsOp, err := cldf_ops.ExecuteOperation(b, ops.GetConfigDetails, chain, contract.FunctionInput[any]{ - Address: rmnAddr, - ChainSelector: chain.Selector, + // Address: rmnAddr, + // ChainSelector: chain.Selector, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get config details for RMN at %s on chain %d: %w", rmnAddr.String(), chain.Selector, err) @@ -189,8 +190,8 @@ func (ca *CurseAdapter) Uncurse() *cldf_ops.Sequence[api.CurseInput, sequences.O requests := make([]rmn_contract.RMNOwnerUnvoteToCurseRequest, 0) for _, subject := range in.Subjects { curseProgressRep, err := cldf_ops.ExecuteOperation(b, ops.GetCurseProgress, chain, contract.FunctionInput[api.Subject]{ - Address: rmnAddr, - ChainSelector: chain.Selector, + // Address: rmnAddr, + // ChainSelector: chain.Selector, Args: subject, }) if err != nil { diff --git a/chains/evm/deployment/v1_5_0/operations/burn_mint_erc20_with_drip/burn_mint_erc20_with_drip.go b/chains/evm/deployment/v1_5_0/operations/burn_mint_erc20_with_drip/burn_mint_erc20_with_drip.go index a3906ca1be..eb8697b168 100644 --- a/chains/evm/deployment/v1_5_0/operations/burn_mint_erc20_with_drip/burn_mint_erc20_with_drip.go +++ b/chains/evm/deployment/v1_5_0/operations/burn_mint_erc20_with_drip/burn_mint_erc20_with_drip.go @@ -51,7 +51,7 @@ var GrantMintAndBurnRoles = contract.NewWrite(contract.WriteParams[common.Addres Description: "Grants mint and burn roles on the token to an account", ContractType: ContractType, ContractABI: burn_mint_erc20_with_drip.BurnMintERC20WithDripABI, - NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, + // NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, IsAllowedCaller: func(contract *burn_mint_erc20_with_drip.BurnMintERC20WithDrip, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return contract.HasRole(opts, DefaultAdminRole, caller) }, @@ -67,7 +67,7 @@ var RevokeBurnRole = contract.NewWrite(contract.WriteParams[common.Address, *bur Description: "Revokes the burn role on the token from an account", ContractType: ContractType, ContractABI: burn_mint_erc20_with_drip.BurnMintERC20WithDripABI, - NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, + // NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, IsAllowedCaller: func(contract *burn_mint_erc20_with_drip.BurnMintERC20WithDrip, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return contract.HasRole(opts, DefaultAdminRole, caller) }, @@ -83,7 +83,7 @@ var RevokeMintRole = contract.NewWrite(contract.WriteParams[common.Address, *bur Description: "Revokes the mint role on the token from an account", ContractType: ContractType, ContractABI: burn_mint_erc20_with_drip.BurnMintERC20WithDripABI, - NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, + // NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, IsAllowedCaller: func(contract *burn_mint_erc20_with_drip.BurnMintERC20WithDrip, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { return contract.HasRole(opts, DefaultAdminRole, caller) }, @@ -99,7 +99,7 @@ var Mint = contract.NewWrite(contract.WriteParams[MintArgs, *burn_mint_erc20_wit Description: "Mint tokens to an account", ContractType: ContractType, ContractABI: burn_mint_erc20_with_drip.BurnMintERC20WithDripABI, - NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, + // NewContract: burn_mint_erc20_with_drip.NewBurnMintERC20WithDrip, IsAllowedCaller: func(contract *burn_mint_erc20_with_drip.BurnMintERC20WithDrip, opts *bind.CallOpts, caller common.Address, input MintArgs) (bool, error) { return contract.HasRole(opts, [32]byte(MintRole), caller) }, diff --git a/chains/evm/deployment/v1_5_0/operations/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go b/chains/evm/deployment/v1_5_0/operations/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go index 32352c539a..80578afe06 100644 --- a/chains/evm/deployment/v1_5_0/operations/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go +++ b/chains/evm/deployment/v1_5_0/operations/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go @@ -135,7 +135,7 @@ var GetRemotePool = contract.NewRead(contract.ReadParams[uint64, []byte, *BurnMi Version: Version, Description: "Calls getRemotePool on the contract", ContractType: ContractType, - NewContract: NewBurnMintTokenPoolAndProxyContract, + // NewContract: NewBurnMintTokenPoolAndProxyContract, CallContract: func(c *BurnMintTokenPoolAndProxyContract, opts *bind.CallOpts, args uint64) ([]byte, error) { return c.GetRemotePool(opts, args) }, @@ -146,7 +146,7 @@ var GetCurrentInboundRateLimiterState = contract.NewRead(contract.ReadParams[uin Version: Version, Description: "Calls getCurrentInboundRateLimiterState on the contract", ContractType: ContractType, - NewContract: NewBurnMintTokenPoolAndProxyContract, + // NewContract: NewBurnMintTokenPoolAndProxyContract, CallContract: func(c *BurnMintTokenPoolAndProxyContract, opts *bind.CallOpts, args uint64) (TokenBucket, error) { return c.GetCurrentInboundRateLimiterState(opts, args) }, @@ -157,7 +157,7 @@ var GetCurrentOutboundRateLimiterState = contract.NewRead(contract.ReadParams[ui Version: Version, Description: "Calls getCurrentOutboundRateLimiterState on the contract", ContractType: ContractType, - NewContract: NewBurnMintTokenPoolAndProxyContract, + // NewContract: NewBurnMintTokenPoolAndProxyContract, CallContract: func(c *BurnMintTokenPoolAndProxyContract, opts *bind.CallOpts, args uint64) (TokenBucket, error) { return c.GetCurrentOutboundRateLimiterState(opts, args) }, @@ -168,7 +168,7 @@ var GetPreviousPool = contract.NewRead(contract.ReadParams[struct{}, common.Addr Version: Version, Description: "Calls getPreviousPool on the contract", ContractType: ContractType, - NewContract: NewBurnMintTokenPoolAndProxyContract, + // NewContract: NewBurnMintTokenPoolAndProxyContract, CallContract: func(c *BurnMintTokenPoolAndProxyContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetPreviousPool(opts) }, diff --git a/chains/evm/deployment/v1_5_0/operations/offramp/offramp.go b/chains/evm/deployment/v1_5_0/operations/offramp/offramp.go index f0f35f124a..27f2896a39 100644 --- a/chains/evm/deployment/v1_5_0/operations/offramp/offramp.go +++ b/chains/evm/deployment/v1_5_0/operations/offramp/offramp.go @@ -18,7 +18,7 @@ var ( Version: Version, Description: "Reads the static config from the OffRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_offramp.NewEVM2EVMOffRamp, + // NewContract: evm_2_evm_offramp.NewEVM2EVMOffRamp, CallContract: func(offRamp *evm_2_evm_offramp.EVM2EVMOffRamp, opts *bind.CallOpts, args any) (evm_2_evm_offramp.EVM2EVMOffRampStaticConfig, error) { return offRamp.GetStaticConfig(opts) }, @@ -29,7 +29,7 @@ var ( Version: Version, Description: "Reads the dynamic config from the OffRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_offramp.NewEVM2EVMOffRamp, + // NewContract: evm_2_evm_offramp.NewEVM2EVMOffRamp, CallContract: func(offRamp *evm_2_evm_offramp.EVM2EVMOffRamp, opts *bind.CallOpts, args any) (evm_2_evm_offramp.EVM2EVMOffRampDynamicConfig, error) { return offRamp.GetDynamicConfig(opts) }, diff --git a/chains/evm/deployment/v1_5_0/operations/onramp/onramp.go b/chains/evm/deployment/v1_5_0/operations/onramp/onramp.go index 9aaf76a23e..93766f8682 100644 --- a/chains/evm/deployment/v1_5_0/operations/onramp/onramp.go +++ b/chains/evm/deployment/v1_5_0/operations/onramp/onramp.go @@ -51,7 +51,7 @@ var OnRampSetTokenTransferFeeConfig = contract.NewWrite(contract.WriteParams[Set Description: "Sets token transfer fee configs on the OnRamp 1.5.0 contract", ContractType: ContractType, ContractABI: evm_2_evm_onramp.EVM2EVMOnRampABI, - NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, + // NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, IsAllowedCaller: contract.OnlyOwner[*evm_2_evm_onramp.EVM2EVMOnRamp, SetTokenTransferFeeConfigInput], Validate: func(args SetTokenTransferFeeConfigInput) error { return nil }, CallContract: func(onRamp *evm_2_evm_onramp.EVM2EVMOnRamp, opts *bind.TransactOpts, args SetTokenTransferFeeConfigInput) (*types.Transaction, error) { @@ -64,7 +64,7 @@ var OnRampGetTokenTransferFeeConfig = contract.NewRead(contract.ReadParams[commo Version: Version, Description: "Reads the token transfer fee config from the OnRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, + // NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, CallContract: func(onRamp *evm_2_evm_onramp.EVM2EVMOnRamp, opts *bind.CallOpts, args common.Address) (evm_2_evm_onramp.EVM2EVMOnRampTokenTransferFeeConfig, error) { return onRamp.GetTokenTransferFeeConfig(opts, args) }, @@ -75,7 +75,7 @@ var OnRampStaticConfig = contract.NewRead(contract.ReadParams[any, evm_2_evm_onr Version: Version, Description: "Reads the static config from the OnRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, + // NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, CallContract: func(onRamp *evm_2_evm_onramp.EVM2EVMOnRamp, opts *bind.CallOpts, args any) (evm_2_evm_onramp.EVM2EVMOnRampStaticConfig, error) { return onRamp.GetStaticConfig(opts) }, @@ -86,7 +86,7 @@ var OnRampDynamicConfig = contract.NewRead(contract.ReadParams[any, evm_2_evm_on Version: Version, Description: "Reads the dynamic config from the OnRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, + // NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, CallContract: func(onRamp *evm_2_evm_onramp.EVM2EVMOnRamp, opts *bind.CallOpts, args any) (evm_2_evm_onramp.EVM2EVMOnRampDynamicConfig, error) { return onRamp.GetDynamicConfig(opts) }, @@ -97,7 +97,7 @@ var OnRampFeeTokenConfig = contract.NewRead(contract.ReadParams[common.Address, Version: Version, Description: "Reads the fee token config for a given token from the OnRamp 1.5.0 contract", ContractType: ContractType, - NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, + // NewContract: evm_2_evm_onramp.NewEVM2EVMOnRamp, CallContract: func(onRamp *evm_2_evm_onramp.EVM2EVMOnRamp, opts *bind.CallOpts, args common.Address) (evm_2_evm_onramp.EVM2EVMOnRampFeeTokenConfig, error) { return onRamp.GetFeeTokenConfig(opts, args) }, diff --git a/chains/evm/deployment/v1_5_0/operations/ping_pong_dapp/ping_pong_dapp.go b/chains/evm/deployment/v1_5_0/operations/ping_pong_dapp/ping_pong_dapp.go index dc44a5dbdb..12957c8644 100644 --- a/chains/evm/deployment/v1_5_0/operations/ping_pong_dapp/ping_pong_dapp.go +++ b/chains/evm/deployment/v1_5_0/operations/ping_pong_dapp/ping_pong_dapp.go @@ -46,7 +46,7 @@ var SetCounterpart = contract.NewWrite(contract.WriteParams[SetCounterpartArgs, Description: "Sets the counterpart chain selector and address for the PingPongDemo contract", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetCounterpartArgs], Validate: func(SetCounterpartArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetCounterpartArgs) (*types.Transaction, error) { @@ -65,7 +65,7 @@ var SetCounterpartChainSelector = contract.NewWrite(contract.WriteParams[SetCoun Description: "Sets the counterpart chain selector for the PingPongDemo contract", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetCounterpartChainSelectorArgs], Validate: func(SetCounterpartChainSelectorArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetCounterpartChainSelectorArgs) (*types.Transaction, error) { @@ -84,7 +84,7 @@ var SetCounterpartAddress = contract.NewWrite(contract.WriteParams[SetCounterpar Description: "Sets the counterpart address for the PingPongDemo contract", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetCounterpartAddressArgs], Validate: func(SetCounterpartAddressArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetCounterpartAddressArgs) (*types.Transaction, error) { @@ -103,7 +103,7 @@ var SetPaused = contract.NewWrite(contract.WriteParams[SetPausedArgs, *ping_pong Description: "Pauses or unpauses the PingPongDemo contract", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetPausedArgs], Validate: func(SetPausedArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetPausedArgs) (*types.Transaction, error) { @@ -122,7 +122,7 @@ var SetOutOfOrderExecution = contract.NewWrite(contract.WriteParams[SetOutOfOrde Description: "Enables or disables out of order execution for the PingPongDemo contract", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, SetOutOfOrderExecutionArgs], Validate: func(SetOutOfOrderExecutionArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, args SetOutOfOrderExecutionArgs) (*types.Transaction, error) { @@ -139,7 +139,7 @@ var StartPingPong = contract.NewWrite(contract.WriteParams[StartPingPongArgs, *p Description: "Starts the ping pong messaging loop", ContractType: ContractType, ContractABI: ping_pong_demo.PingPongDemoABI, - NewContract: ping_pong_demo.NewPingPongDemo, + // NewContract: ping_pong_demo.NewPingPongDemo, IsAllowedCaller: contract.OnlyOwner[*ping_pong_demo.PingPongDemo, StartPingPongArgs], Validate: func(StartPingPongArgs) error { return nil }, CallContract: func(pingPong *ping_pong_demo.PingPongDemo, opts *bind.TransactOpts, _ StartPingPongArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_5_0/operations/rmn/rmn.go b/chains/evm/deployment/v1_5_0/operations/rmn/rmn.go index ae710a1389..a03eda5efd 100644 --- a/chains/evm/deployment/v1_5_0/operations/rmn/rmn.go +++ b/chains/evm/deployment/v1_5_0/operations/rmn/rmn.go @@ -46,7 +46,7 @@ var Curse = contract.NewWrite(contract.WriteParams[CurseArgs, *rmn_contract.RMNC Description: "Applies a curse to an RMN contract", ContractType: ContractType, ContractABI: rmn_contract.RMNContractABI, - NewContract: rmn_contract.NewRMNContract, + // NewContract: rmn_contract.NewRMNContract, IsAllowedCaller: contract.OnlyOwner[*rmn_contract.RMNContract, CurseArgs], Validate: func(CurseArgs) error { return nil }, CallContract: func(rmn *rmn_contract.RMNContract, opts *bind.TransactOpts, args CurseArgs) (*types.Transaction, error) { @@ -60,7 +60,7 @@ var Uncurse = contract.NewWrite(contract.WriteParams[UncurseArgs, *rmn_contract. Description: "Uncurses an existing curse on an RMN contract", ContractType: ContractType, ContractABI: rmn_contract.RMNContractABI, - NewContract: rmn_contract.NewRMNContract, + // NewContract: rmn_contract.NewRMNContract, IsAllowedCaller: contract.OnlyOwner[*rmn_contract.RMNContract, UncurseArgs], Validate: func(UncurseArgs) error { return nil }, CallContract: func(rmn *rmn_contract.RMNContract, opts *bind.TransactOpts, args UncurseArgs) (*types.Transaction, error) { @@ -73,7 +73,7 @@ var IsCursed = contract.NewRead(contract.ReadParams[fastcurse.Subject, bool, *rm Version: semver.MustParse("1.5.0"), Description: "Checks if a subject is cursed on an RMN contract", ContractType: ContractType, - NewContract: rmn_contract.NewRMNContract, + // NewContract: rmn_contract.NewRMNContract, CallContract: func(rmn *rmn_contract.RMNContract, opts *bind.CallOpts, args fastcurse.Subject) (bool, error) { return rmn.IsCursed(opts, args) }, @@ -84,7 +84,7 @@ var GetCurseProgress = contract.NewRead(contract.ReadParams[fastcurse.Subject, r Version: semver.MustParse("1.5.0"), Description: "Gets the curse progress for a given subject on an RMN contract", ContractType: ContractType, - NewContract: rmn_contract.NewRMNContract, + // NewContract: rmn_contract.NewRMNContract, CallContract: func(rmn *rmn_contract.RMNContract, opts *bind.CallOpts, args fastcurse.Subject) (rmn_contract.GetCurseProgress, error) { return rmn.GetCurseProgress(opts, args) }, @@ -95,7 +95,7 @@ var GetConfigDetails = contract.NewRead(contract.ReadParams[any, rmn_contract.Ge Version: semver.MustParse("1.5.0"), Description: "Gets the configuration details of the RMN contract", ContractType: ContractType, - NewContract: rmn_contract.NewRMNContract, + // NewContract: rmn_contract.NewRMNContract, CallContract: func(rmn *rmn_contract.RMNContract, opts *bind.CallOpts, _ any) (rmn_contract.GetConfigDetails, error) { return rmn.GetConfigDetails(opts) }, diff --git a/chains/evm/deployment/v1_5_0/operations/token_admin_registry/token_admin_registry.go b/chains/evm/deployment/v1_5_0/operations/token_admin_registry/token_admin_registry.go index 00f6bf1f36..9fd537354e 100644 --- a/chains/evm/deployment/v1_5_0/operations/token_admin_registry/token_admin_registry.go +++ b/chains/evm/deployment/v1_5_0/operations/token_admin_registry/token_admin_registry.go @@ -59,7 +59,7 @@ var ProposeAdministrator = contract.NewWrite(contract.WriteParams[ProposeAdminis Description: "Proposes an administrator for a token on the TokenAdminRegistry contract", ContractType: ContractType, ContractABI: token_admin_registry.TokenAdminRegistryABI, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, IsAllowedCaller: func(contract *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, caller common.Address, input ProposeAdministratorArgs) (bool, error) { owner, err := contract.Owner(opts) if err != nil { @@ -83,7 +83,7 @@ var TransferAdminRole = contract.NewWrite(contract.WriteParams[TransferAdminRole Description: "Transfers the admin role for a token on the TokenAdminRegistry contract", ContractType: ContractType, ContractABI: token_admin_registry.TokenAdminRegistryABI, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, IsAllowedCaller: func(contract *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, caller common.Address, input TransferAdminRoleArgs) (bool, error) { tokenConfig, err := contract.GetTokenConfig(opts, input.TokenAddress) if err != nil { @@ -103,7 +103,7 @@ var AcceptAdminRole = contract.NewWrite(contract.WriteParams[AcceptAdminRoleArgs Description: "Accepts the admin role for a token on the TokenAdminRegistry contract", ContractType: ContractType, ContractABI: token_admin_registry.TokenAdminRegistryABI, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, IsAllowedCaller: func(contract *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, caller common.Address, args AcceptAdminRoleArgs) (bool, error) { tokenConfig, err := contract.GetTokenConfig(opts, args.TokenAddress) if err != nil { @@ -123,7 +123,7 @@ var SetPool = contract.NewWrite(contract.WriteParams[SetPoolArgs, *token_admin_r Description: "Sets the token pool for a token on the TokenAdminRegistry contract", ContractType: ContractType, ContractABI: token_admin_registry.TokenAdminRegistryABI, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, IsAllowedCaller: func(contract *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, caller common.Address, input SetPoolArgs) (bool, error) { tokenConfig, err := contract.GetTokenConfig(opts, input.TokenAddress) if err != nil { @@ -143,7 +143,7 @@ var AddRegistryModule = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Adds a registry module to the TokenAdminRegistry contract", ContractType: ContractType, ContractABI: token_admin_registry.TokenAdminRegistryABI, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, IsAllowedCaller: contract.OnlyOwner[*token_admin_registry.TokenAdminRegistry, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func(tokenAdminRegistry *token_admin_registry.TokenAdminRegistry, opts *bind.TransactOpts, args common.Address) (*types.Transaction, error) { @@ -156,7 +156,7 @@ var IsRegistryModule = contract.NewRead(contract.ReadParams[common.Address, bool Version: Version, Description: "Checks if an address is a registry module in the TokenAdminRegistry contract", ContractType: ContractType, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, CallContract: func(tokenAdminRegistry *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, args common.Address) (bool, error) { return tokenAdminRegistry.IsRegistryModule(opts, args) }, @@ -167,7 +167,7 @@ var Owner = contract.NewRead(contract.ReadParams[any, common.Address, *token_adm Version: Version, Description: "Gets the owner of the TokenAdminRegistry contract", ContractType: ContractType, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, CallContract: func(tokenAdminRegistry *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, args any) (common.Address, error) { return tokenAdminRegistry.Owner(opts) }, @@ -178,7 +178,7 @@ var GetTokenConfig = contract.NewRead(contract.ReadParams[common.Address, TokenC Version: Version, Description: "Gets the token configuration for a given token address from the TokenAdminRegistry contract", ContractType: ContractType, - NewContract: token_admin_registry.NewTokenAdminRegistry, + // NewContract: token_admin_registry.NewTokenAdminRegistry, CallContract: func(tokenAdminRegistry *token_admin_registry.TokenAdminRegistry, opts *bind.CallOpts, args common.Address) (TokenConfig, error) { return tokenAdminRegistry.GetTokenConfig(opts, args) }, diff --git a/chains/evm/deployment/v1_5_0/operations/token_pool/token_pool.go b/chains/evm/deployment/v1_5_0/operations/token_pool/token_pool.go index 41226c6685..c447f0cd1f 100644 --- a/chains/evm/deployment/v1_5_0/operations/token_pool/token_pool.go +++ b/chains/evm/deployment/v1_5_0/operations/token_pool/token_pool.go @@ -17,7 +17,7 @@ var GetToken = contract.NewRead(contract.ReadParams[any, common.Address, *token_ Version: Version, Description: "Gets the local token address for a TokenPool", ContractType: ContractType, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, CallContract: func(tokenPool *token_pool.TokenPool, opts *bind.CallOpts, args any) (common.Address, error) { return tokenPool.GetToken(opts) }, diff --git a/chains/evm/deployment/v1_5_0/sequences/offramp.go b/chains/evm/deployment/v1_5_0/sequences/offramp.go index 60cf05b436..f145ddbb12 100644 --- a/chains/evm/deployment/v1_5_0/sequences/offramp.go +++ b/chains/evm/deployment/v1_5_0/sequences/offramp.go @@ -38,16 +38,18 @@ var OffRampImportConfigSequence = operations.NewSequence( contractMeta := make([]datastore.ContractMetadata, 0) for remoteChain, offRampAddress := range input.OffRampsPerRemoteChain { sCfg, err := operations.ExecuteOperation(b, offrampops.OffRampStaticConfig, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: offRampAddress, + // ChainSelector: chain.Selector, + // Address: offRampAddress, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get static config from OffRamp %s on chain %s "+ "for remote chain %d: %w", offRampAddress.Hex(), chain.String(), remoteChain, err) } dCfg, err := operations.ExecuteOperation(b, offrampops.OffRampDynamicConfig, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: offRampAddress, + // ChainSelector: chain.Selector, + // Address: offRampAddress, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get dynamic config from OffRamp %s "+ diff --git a/chains/evm/deployment/v1_5_0/sequences/onramp.go b/chains/evm/deployment/v1_5_0/sequences/onramp.go index ff41969c89..41e18a9adc 100644 --- a/chains/evm/deployment/v1_5_0/sequences/onramp.go +++ b/chains/evm/deployment/v1_5_0/sequences/onramp.go @@ -54,8 +54,8 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, onramp.OnRampSetTokenTransferFeeConfig, chain, contract.FunctionInput[onramp.SetTokenTransferFeeConfigInput]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, Args: input.UpdatesByChain, }) if err != nil { @@ -85,8 +85,9 @@ var ( outerGrp, _ := errgroup.WithContext(b.GetContext()) outerGrp.SetLimit(10) // limit concurrency across remote chains feetokenOut, err := operations.ExecuteOperation(b, priceregistryops.PriceRegistryGetFeeToken, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: input.PriceRegistry, + // ChainSelector: chain.Selector, + // Address: input.PriceRegistry, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute PriceRegistryGetFeeTokenOp "+ @@ -98,16 +99,18 @@ var ( onRampAddress := onRampAddress outerGrp.Go(func() error { sCfgOut, err := operations.ExecuteOperation(b, onramp.OnRampStaticConfig, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: onRampAddress, + // ChainSelector: chain.Selector, + // Address: onRampAddress, + Args: nil, }) if err != nil { return fmt.Errorf("failed to execute OnRampStaticConfigOp "+ "on %s for remote chain %d: %w", chain.String(), remoteChainSelector, err) } dCfgOut, err := operations.ExecuteOperation(b, onramp.OnRampDynamicConfig, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: onRampAddress, + // ChainSelector: chain.Selector, + // Address: onRampAddress, + Args: nil, }) if err != nil { return fmt.Errorf("failed to execute OnRampDynamicConfigOp "+ @@ -117,8 +120,8 @@ var ( feeTokenConfig := make(map[common.Address]evm_2_evm_onramp.EVM2EVMOnRampFeeTokenConfig) for _, token := range feeTokens { feeTokenConfigOut, err := operations.ExecuteOperation(b, onramp.OnRampFeeTokenConfig, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: onRampAddress, + // ChainSelector: chain.Selector, + // Address: onRampAddress, Args: token, }) if err != nil { @@ -139,8 +142,8 @@ var ( tokenGrp.Go(func() error { ttfcOut, err := operations.ExecuteOperation( b, onramp.OnRampGetTokenTransferFeeConfig, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: onRampAddress, + // ChainSelector: chain.Selector, + // Address: onRampAddress, Args: token, }) if err != nil { diff --git a/chains/evm/deployment/v1_5_0/sequences/register_token.go b/chains/evm/deployment/v1_5_0/sequences/register_token.go index 6d0131c57b..3a7271bf18 100644 --- a/chains/evm/deployment/v1_5_0/sequences/register_token.go +++ b/chains/evm/deployment/v1_5_0/sequences/register_token.go @@ -49,8 +49,9 @@ var RegisterToken = cldf_ops.NewSequence( tokenAddress := input.TokenAddress if tokenAddress == (common.Address{}) { getTokenReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetToken, chain, evm_contract.FunctionInput[any]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token address: %w", err) @@ -60,8 +61,8 @@ var RegisterToken = cldf_ops.NewSequence( // Get the current token config from the token admin registry. tokenConfigReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.GetTokenConfig, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: input.TokenAdminRegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenAdminRegistryAddress, Args: tokenAddress, }) if err != nil { @@ -73,8 +74,9 @@ var RegisterToken = cldf_ops.NewSequence( // Get the owner of the token admin registry. ownerReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.Owner, chain, evm_contract.FunctionInput[any]{ - ChainSelector: input.ChainSelector, - Address: input.TokenAdminRegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenAdminRegistryAddress, + Args: nil, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get owner of token admin registry: %w", err) @@ -89,8 +91,8 @@ var RegisterToken = cldf_ops.NewSequence( desiredAdmin = registryOwner } proposeAdminReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.ProposeAdministrator, chain, evm_contract.FunctionInput[token_admin_registry.ProposeAdministratorArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenAdminRegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenAdminRegistryAddress, Args: token_admin_registry.ProposeAdministratorArgs{ TokenAddress: tokenAddress, Administrator: desiredAdmin, @@ -106,8 +108,8 @@ var RegisterToken = cldf_ops.NewSequence( // Accept the admin role if the registry owner is the pending admin. if pendingAdmin == registryOwner { acceptAdminReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.AcceptAdminRole, chain, evm_contract.FunctionInput[token_admin_registry.AcceptAdminRoleArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenAdminRegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenAdminRegistryAddress, Args: token_admin_registry.AcceptAdminRoleArgs{ TokenAddress: tokenAddress, }, @@ -122,8 +124,8 @@ var RegisterToken = cldf_ops.NewSequence( // Set the token pool on the token admin registry if the registry owner is the admin and the pool is not set. if admin == registryOwner && tokenPoolSet != input.TokenPoolAddress { setPoolReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.SetPool, chain, evm_contract.FunctionInput[token_admin_registry.SetPoolArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenAdminRegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenAdminRegistryAddress, Args: token_admin_registry.SetPoolArgs{ TokenAddress: tokenAddress, TokenPoolAddress: input.TokenPoolAddress, diff --git a/chains/evm/deployment/v1_5_0/sequences/register_token_test.go b/chains/evm/deployment/v1_5_0/sequences/register_token_test.go index 23743777f1..7e27ca1f1c 100644 --- a/chains/evm/deployment/v1_5_0/sequences/register_token_test.go +++ b/chains/evm/deployment/v1_5_0/sequences/register_token_test.go @@ -65,7 +65,7 @@ func TestRegisterToken(t *testing.T) { token_admin_registry.Deploy, e.BlockChains.EVMChains()[chainSel], evmcontract.DeployInput[token_admin_registry.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(token_admin_registry.ContractType, *token_admin_registry.Version), }, ) @@ -127,8 +127,8 @@ func TestRegisterToken(t *testing.T) { token_admin_registry.GetTokenConfig, e.BlockChains.EVMChains()[chainSel], evmcontract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: tokenAdminRegistryAddress, + // ChainSelector: chainSel, + // Address: tokenAdminRegistryAddress, Args: tokenAddress, }, ) diff --git a/chains/evm/deployment/v1_5_0/sequences/rmn_remote.go b/chains/evm/deployment/v1_5_0/sequences/rmn_remote.go index c21cc8d82f..4ee9495ed8 100644 --- a/chains/evm/deployment/v1_5_0/sequences/rmn_remote.go +++ b/chains/evm/deployment/v1_5_0/sequences/rmn_remote.go @@ -33,8 +33,8 @@ var SeqCurse = cldf_ops.NewSequence( "Cursing subjects with RMN", func(b cldf_ops.Bundle, chain cldf_evm.Chain, in SeqCurseInput) (output sequences.OnChainOutput, err error) { opOutput, err := cldf_ops.ExecuteOperation(b, ops.Curse, chain, contract.FunctionInput[ops.CurseArgs]{ - Address: in.Addr, - ChainSelector: chain.Selector, + // Address: in.Addr, + // ChainSelector: chain.Selector, Args: ops.CurseArgs{ Subject: in.Subjects, CurseID: in.CurseID, @@ -58,8 +58,8 @@ var SeqUncurse = cldf_ops.NewSequence( "Uncursing subjects with RMN", func(b cldf_ops.Bundle, chain cldf_evm.Chain, in SeqUncurseInput) (output sequences.OnChainOutput, err error) { opOutput, err := cldf_ops.ExecuteOperation(b, ops.Uncurse, chain, contract.FunctionInput[ops.UncurseArgs]{ - Address: in.Addr, - ChainSelector: chain.Selector, + // Address: in.Addr, + // ChainSelector: chain.Selector, Args: ops.UncurseArgs{ Requests: in.Requests, }, diff --git a/chains/evm/deployment/v1_5_0/sequences/token_admin_registry.go b/chains/evm/deployment/v1_5_0/sequences/token_admin_registry.go index 810946fd33..dff284aa93 100644 --- a/chains/evm/deployment/v1_5_0/sequences/token_admin_registry.go +++ b/chains/evm/deployment/v1_5_0/sequences/token_admin_registry.go @@ -53,8 +53,8 @@ var ManualRegistrationSequence = operations.NewSequence( tarops.ProposeAdministrator, chain, contract.FunctionInput[tarops.ProposeAdministratorArgs]{ - Address: input.Address, - ChainSelector: input.ChainSelector, + // Address: input.Address, + // ChainSelector: input.ChainSelector, Args: tarops.ProposeAdministratorArgs{ Administrator: input.AdminAddress, TokenAddress: input.TokenAddress, @@ -70,8 +70,8 @@ var ManualRegistrationSequence = operations.NewSequence( tarops.TransferAdminRole, chain, contract.FunctionInput[tarops.TransferAdminRoleArgs]{ - Address: input.Address, - ChainSelector: input.ChainSelector, + // Address: input.Address, + // ChainSelector: input.ChainSelector, Args: tarops.TransferAdminRoleArgs{ Administrator: input.AdminAddress, TokenAddress: input.TokenAddress, diff --git a/chains/evm/deployment/v1_5_1/adapters/tokens.go b/chains/evm/deployment/v1_5_1/adapters/tokens.go index 9e1c6d0f6b..2de544a12d 100644 --- a/chains/evm/deployment/v1_5_1/adapters/tokens.go +++ b/chains/evm/deployment/v1_5_1/adapters/tokens.go @@ -122,8 +122,9 @@ func (p *poolOpsV151) GetToken(b cldf_ops.Bundle, chain evm.Chain, poolAddr comm res, err := cldf_ops.ExecuteOperation(b, tpOps.GetToken, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, + Args: struct{}{}, }, ) if err != nil { @@ -160,8 +161,8 @@ func (p *poolOpsV151) SetRateLimiterConfig(b cldf_ops.Bundle, chain evm.Chain, p report, err := cldf_ops.ExecuteOperation(b, tpOps.SetChainRateLimiterConfig, chain, evm_contract.FunctionInput[tpOps.SetChainRateLimiterConfigArgs]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, Args: tpOps.SetChainRateLimiterConfigArgs{ OutboundRateLimitConfig: token_pool.RateLimiterConfig{ IsEnabled: outbound.IsEnabled, @@ -186,8 +187,8 @@ func (p *poolOpsV151) SetRateLimitAdmin(b cldf_ops.Bundle, chain evm.Chain, pool report, err := cldf_ops.ExecuteOperation(b, tpOps.SetRateLimitAdmin, chain, evm_contract.FunctionInput[tpOps.SetRateLimitAdminArgs]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, Args: tpOps.SetRateLimitAdminArgs{ NewAdmin: newAdmin, }, diff --git a/chains/evm/deployment/v1_5_1/operations/token_pool/token_pool.go b/chains/evm/deployment/v1_5_1/operations/token_pool/token_pool.go index c9a8c1b6e0..f2d1db0b33 100644 --- a/chains/evm/deployment/v1_5_1/operations/token_pool/token_pool.go +++ b/chains/evm/deployment/v1_5_1/operations/token_pool/token_pool.go @@ -44,7 +44,7 @@ var GetToken = contract.NewRead(contract.ReadParams[struct{}, common.Address, *t Version: Version, Description: "Gets the token address managed by the TokenPool 1.5.1 contract", ContractType: ContractType, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, CallContract: func(tp *token_pool.TokenPool, opts *bind.CallOpts, args struct{}) (common.Address, error) { return tp.GetToken(opts) }, @@ -56,7 +56,7 @@ var ApplyChainUpdates = contract.NewWrite(contract.WriteParams[ApplyChainUpdates Description: "Applies chain updates to the TokenPool 1.5.1 contract", ContractType: ContractType, ContractABI: token_pool.TokenPoolABI, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, IsAllowedCaller: contract.OnlyOwner[*token_pool.TokenPool, ApplyChainUpdatesArgs], Validate: func(args ApplyChainUpdatesArgs) error { return nil }, CallContract: func(tp *token_pool.TokenPool, opts *bind.TransactOpts, args ApplyChainUpdatesArgs) (*types.Transaction, error) { @@ -70,7 +70,7 @@ var SetChainRateLimiterConfig = contract.NewWrite(contract.WriteParams[SetChainR Description: "Sets the rate limiter configuration for a remote chain on the TokenPool 1.5.1 contract", ContractType: ContractType, ContractABI: token_pool.TokenPoolABI, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, IsAllowedCaller: func(tp *token_pool.TokenPool, opts *bind.CallOpts, caller common.Address, input SetChainRateLimiterConfigArgs) (bool, error) { admin, err := tp.GetRateLimitAdmin(opts) if err != nil { @@ -97,7 +97,7 @@ var AddRemotePool = contract.NewWrite(contract.WriteParams[AddRemotePoolArgs, *t Description: "Adds a remote pool for a given chain selector on the TokenPool 1.5.1 contract", ContractType: ContractType, ContractABI: token_pool.TokenPoolABI, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, IsAllowedCaller: contract.OnlyOwner[*token_pool.TokenPool, AddRemotePoolArgs], Validate: func(args AddRemotePoolArgs) error { return nil }, CallContract: func(tp *token_pool.TokenPool, opts *bind.TransactOpts, args AddRemotePoolArgs) (*types.Transaction, error) { @@ -111,7 +111,7 @@ var SetRateLimitAdmin = contract.NewWrite(contract.WriteParams[SetRateLimitAdmin Description: "Sets the rate limit admin for the TokenPool 1.5.1 contract", ContractType: ContractType, ContractABI: token_pool.TokenPoolABI, - NewContract: token_pool.NewTokenPool, + // NewContract: token_pool.NewTokenPool, IsAllowedCaller: contract.OnlyOwner[*token_pool.TokenPool, SetRateLimitAdminArgs], Validate: func(args SetRateLimitAdminArgs) error { return nil }, CallContract: func(tp *token_pool.TokenPool, opts *bind.TransactOpts, args SetRateLimitAdminArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_5_1/sequences/deploy_token_pool.go b/chains/evm/deployment/v1_5_1/sequences/deploy_token_pool.go index 2402e6a8a5..e50166317f 100644 --- a/chains/evm/deployment/v1_5_1/sequences/deploy_token_pool.go +++ b/chains/evm/deployment/v1_5_1/sequences/deploy_token_pool.go @@ -104,7 +104,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_5_1_burn_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_5_1_burn_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_5_1_burn_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -121,7 +121,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_5_1_burn_from_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_from_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_5_1_burn_from_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_5_1_burn_from_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -138,7 +138,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_5_1_burn_to_address_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_to_address_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_to_address_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_5_1_burn_to_address_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_5_1_burn_to_address_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -156,7 +156,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_5_1_burn_with_from_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_with_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_with_from_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_5_1_burn_with_from_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_5_1_burn_with_from_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -173,7 +173,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_5_1_lock_release_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_5_1_lock_release_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_lock_release_token_pool.ConstructorArgs]{ TypeAndVersion: v1_5_1_lock_release_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_5_1_lock_release_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, diff --git a/chains/evm/deployment/v1_5_1/sequences/token_pool/configure_token_pool_for_remote_chains.go b/chains/evm/deployment/v1_5_1/sequences/token_pool/configure_token_pool_for_remote_chains.go index 54140df3af..1e4e9faa6a 100644 --- a/chains/evm/deployment/v1_5_1/sequences/token_pool/configure_token_pool_for_remote_chains.go +++ b/chains/evm/deployment/v1_5_1/sequences/token_pool/configure_token_pool_for_remote_chains.go @@ -176,8 +176,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // If either rate limiter config is different, then update it if !isOutboundEqual || !isInboundEqual { report, err := cldf_ops.ExecuteOperation(b, tpops.SetChainRateLimiterConfig, chain, contract.FunctionInput[tpops.SetChainRateLimiterConfigArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.SetChainRateLimiterConfigArgs{ OutboundRateLimitConfig: token_pool.RateLimiterConfig{IsEnabled: inputORL.IsEnabled, Capacity: inputORL.Capacity, Rate: inputORL.Rate}, InboundRateLimitConfig: token_pool.RateLimiterConfig{IsEnabled: inputIRL.IsEnabled, Capacity: inputIRL.Capacity, Rate: inputIRL.Rate}, @@ -193,8 +193,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // If the remote token pool is not registered, then add it if !hasRemoteTP { report, err := cldf_ops.ExecuteOperation(b, tpops.AddRemotePool, chain, contract.FunctionInput[tpops.AddRemotePoolArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.AddRemotePoolArgs{ RemoteChainSelector: remoteCS, RemotePoolAddress: remoteTP, @@ -224,8 +224,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( if len(reportWrites) == 0 { paddedRemoteTokenPoolAddress := common.LeftPadBytes(input.RemoteChainConfig.RemotePool, 32) applyChainUpdatesInput := contract.FunctionInput[tpops.ApplyChainUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.ApplyChainUpdatesArgs{ RemoteChainSelectorsToRemove: remotesToDel, ChainsToAdd: []token_pool.TokenPoolChainUpdate{ diff --git a/chains/evm/deployment/v1_6_0/adapters/fee_aggregator.go b/chains/evm/deployment/v1_6_0/adapters/fee_aggregator.go index 689f803d5f..b808312736 100644 --- a/chains/evm/deployment/v1_6_0/adapters/fee_aggregator.go +++ b/chains/evm/deployment/v1_6_0/adapters/fee_aggregator.go @@ -106,17 +106,18 @@ func (a *FeeAggregatorAdapter) SetFeeAggregator(e cldf.Environment) *operations. } newFeeAggregator := common.HexToAddress(input.FeeAggregator) - onRampRef, err := a.resolveOnRampRef(e, input) - if err != nil { - return result, err - } - onRampAddr := common.HexToAddress(onRampRef.Address) + // onRampRef, err := a.resolveOnRampRef(e, input) + // if err != nil { + // return result, err + // } + // onRampAddr := common.HexToAddress(onRampRef.Address) readReport, err := operations.ExecuteOperation( b, onrampops.GetDynamicConfig, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, - Address: onRampAddr, + // ChainSelector: evmChain.Selector, + // Address: onRampAddr, + Args: struct{}{}, }, ) if err != nil { @@ -129,8 +130,8 @@ func (a *FeeAggregatorAdapter) SetFeeAggregator(e cldf.Environment) *operations. writeReport, err := operations.ExecuteOperation( b, onrampops.SetDynamicConfig, evmChain, contract.FunctionInput[onrampops.DynamicConfig]{ - ChainSelector: evmChain.Selector, - Address: onRampAddr, + // ChainSelector: evmChain.Selector, + // Address: onRampAddr, Args: currentCfg, }, ) diff --git a/chains/evm/deployment/v1_6_0/adapters/lanemigrator.go b/chains/evm/deployment/v1_6_0/adapters/lanemigrator.go index a7987a7429..32083ade48 100644 --- a/chains/evm/deployment/v1_6_0/adapters/lanemigrator.go +++ b/chains/evm/deployment/v1_6_0/adapters/lanemigrator.go @@ -19,7 +19,7 @@ import ( offrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/offramp" onrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/onramp" - datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore" + // datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore" "github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences" ) @@ -52,34 +52,34 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU return sequences.OnChainOutput{}, fmt.Errorf("error adding address ref to temp datastore: %w", err) } } - tempDS := ds.Seal() + // tempDS := ds.Seal() // fetch onRamp and offRamp from the existing addresses - onRampAddr, err := datastore_utils.FindAndFormatRef( - tempDS, - datastore.AddressRef{ - ChainSelector: input.ChainSelector, - Type: datastore.ContractType(onrampops.ContractType), - Version: onrampops.Version, - }, - input.ChainSelector, - evm_datastore_utils.ToEVMAddress, - ) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("error finding onRamp address ref: %w", err) - } - offRampAddr, err := datastore_utils.FindAndFormatRef( - tempDS, - datastore.AddressRef{ - ChainSelector: input.ChainSelector, - Type: datastore.ContractType(offrampops.ContractType), - Version: offrampops.Version, - }, - input.ChainSelector, - evm_datastore_utils.ToEVMAddress, - ) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("error finding offRamp address ref: %w", err) - } + // onRampAddr, err := datastore_utils.FindAndFormatRef( + // tempDS, + // datastore.AddressRef{ + // ChainSelector: input.ChainSelector, + // Type: datastore.ContractType(onrampops.ContractType), + // Version: onrampops.Version, + // }, + // input.ChainSelector, + // evm_datastore_utils.ToEVMAddress, + // ) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("error finding onRamp address ref: %w", err) + // } + // offRampAddr, err := datastore_utils.FindAndFormatRef( + // tempDS, + // datastore.AddressRef{ + // ChainSelector: input.ChainSelector, + // Type: datastore.ContractType(offrampops.ContractType), + // Version: offrampops.Version, + // }, + // input.ChainSelector, + // evm_datastore_utils.ToEVMAddress, + // ) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("error finding offRamp address ref: %w", err) + // } routerRef := input.RouterAddr routerAddr, err := evm_datastore_utils.ToEVMAddress(routerRef) @@ -91,8 +91,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU for _, remoteChainSelector := range input.RemoteChainSelectors { // get existing destChainConfig for the onRamp existingDestChainCfgOut, err := cldf_ops.ExecuteOperation(b, onrampops.GetDestChainConfig, c, contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, Args: remoteChainSelector, }) if err != nil { @@ -108,8 +108,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU // get the sourceChainConfig for the offRamp srcChainCfgOut, err := cldf_ops.ExecuteOperation(b, offrampops.GetSourceChainConfig, c, contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: offRampAddr, + // ChainSelector: input.ChainSelector, + // Address: offRampAddr, Args: remoteChainSelector, }) if err != nil { @@ -138,8 +138,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU } // set the destChainConfig with the updated router writeOutputOnRamp, err := cldf_ops.ExecuteOperation(b, onrampops.ApplyDestChainConfigUpdates, c, contract.FunctionInput[[]onrampops.DestChainConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, Args: onRampArgs, }) if err != nil { @@ -150,8 +150,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU writeOutputOffRamp, err := cldf_ops.ExecuteOperation( b, offrampops.ApplySourceChainConfigUpdates, c, contract.FunctionInput[[]offrampops.SourceChainConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: offRampAddr, + // ChainSelector: input.ChainSelector, + // Address: offRampAddr, Args: offRampArgs, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/adapters/rampupdatewithfq.go b/chains/evm/deployment/v1_6_0/adapters/rampupdatewithfq.go index c3392c5f1d..a22d182974 100644 --- a/chains/evm/deployment/v1_6_0/adapters/rampupdatewithfq.go +++ b/chains/evm/deployment/v1_6_0/adapters/rampupdatewithfq.go @@ -70,8 +70,9 @@ func (ru RampUpdateWithFQ) SequenceUpdateRampsWithFeeQuoter() *cldf_ops.Sequence return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not found in environment", input.ChainSelector) } onDCfgReport, err := cldf_ops.ExecuteOperation(b, onrampops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.OnRampAddressRef.Address), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.OnRampAddressRef.Address), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, err @@ -81,8 +82,8 @@ func (ru RampUpdateWithFQ) SequenceUpdateRampsWithFeeQuoter() *cldf_ops.Sequence // Update OnRamp's FeeQuoter address existingDynamicConfig.FeeQuoter = common.HexToAddress(input.FeeQuoterAddress.Address) onRampReport, err := cldf_ops.ExecuteOperation(b, onrampops.SetDynamicConfig, chain, contract.FunctionInput[onrampops.DynamicConfig]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.OnRampAddressRef.Address), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.OnRampAddressRef.Address), Args: existingDynamicConfig, }) if err != nil { @@ -92,8 +93,9 @@ func (ru RampUpdateWithFQ) SequenceUpdateRampsWithFeeQuoter() *cldf_ops.Sequence } // Similarly, update OffRamp's FeeQuoter address offDCfgReport, err := cldf_ops.ExecuteOperation(b, offrampops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.OffRampAddressRef.Address), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.OffRampAddressRef.Address), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, err @@ -102,8 +104,8 @@ func (ru RampUpdateWithFQ) SequenceUpdateRampsWithFeeQuoter() *cldf_ops.Sequence if existingOffDynamicConfig.FeeQuoter != common.HexToAddress(input.FeeQuoterAddress.Address) { existingOffDynamicConfig.FeeQuoter = common.HexToAddress(input.FeeQuoterAddress.Address) offRampReport, err := cldf_ops.ExecuteOperation(b, offrampops.SetDynamicConfig, chain, contract.FunctionInput[offrampops.DynamicConfig]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.OffRampAddressRef.Address), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.OffRampAddressRef.Address), Args: existingOffDynamicConfig, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/operations/ccip_home/ccip_home.go b/chains/evm/deployment/v1_6_0/operations/ccip_home/ccip_home.go index f405e59dd4..c3048d327d 100644 --- a/chains/evm/deployment/v1_6_0/operations/ccip_home/ccip_home.go +++ b/chains/evm/deployment/v1_6_0/operations/ccip_home/ccip_home.go @@ -35,7 +35,7 @@ var AddDON = contract.NewWrite(contract.WriteParams[AddDONOpInput, *capabilities Description: "Adds a new DON to the CapabilitiesRegistry", ContractType: utils.CapabilitiesRegistry, ContractABI: capabilities_registry.CapabilitiesRegistryABI, - NewContract: capabilities_registry.NewCapabilitiesRegistry, + // NewContract: capabilities_registry.NewCapabilitiesRegistry, IsAllowedCaller: contract.OnlyOwner[*capabilities_registry.CapabilitiesRegistry, AddDONOpInput], Validate: func(AddDONOpInput) error { return nil }, CallContract: func(capReg *capabilities_registry.CapabilitiesRegistry, opts *bind.TransactOpts, input AddDONOpInput) (*types.Transaction, error) { @@ -57,7 +57,7 @@ var UpdateDON = contract.NewWrite(contract.WriteParams[UpdateDONOpInput, *capabi Description: "Updates an existing DON in the CapabilitiesRegistry", ContractType: utils.CapabilitiesRegistry, ContractABI: capabilities_registry.CapabilitiesRegistryABI, - NewContract: capabilities_registry.NewCapabilitiesRegistry, + // NewContract: capabilities_registry.NewCapabilitiesRegistry, IsAllowedCaller: contract.OnlyOwner[*capabilities_registry.CapabilitiesRegistry, UpdateDONOpInput], Validate: func(UpdateDONOpInput) error { return nil }, CallContract: func(capReg *capabilities_registry.CapabilitiesRegistry, opts *bind.TransactOpts, input UpdateDONOpInput) (*types.Transaction, error) { @@ -75,7 +75,7 @@ var AddNodes = contract.NewWrite(contract.WriteParams[AddNodesOpInput, *capabili Description: "Adds nodes to an existing node operator in the CapabilitiesRegistry", ContractType: utils.CapabilitiesRegistry, ContractABI: capabilities_registry.CapabilitiesRegistryABI, - NewContract: capabilities_registry.NewCapabilitiesRegistry, + // NewContract: capabilities_registry.NewCapabilitiesRegistry, IsAllowedCaller: contract.OnlyOwner[*capabilities_registry.CapabilitiesRegistry, AddNodesOpInput], Validate: func(AddNodesOpInput) error { return nil }, CallContract: func(capReg *capabilities_registry.CapabilitiesRegistry, opts *bind.TransactOpts, input AddNodesOpInput) (*types.Transaction, error) { @@ -93,7 +93,7 @@ var AddNodeOperators = contract.NewWrite(contract.WriteParams[AddNodesOperatorsO Description: "Adds new node operators to the CapabilitiesRegistry", ContractType: utils.CapabilitiesRegistry, ContractABI: capabilities_registry.CapabilitiesRegistryABI, - NewContract: capabilities_registry.NewCapabilitiesRegistry, + // NewContract: capabilities_registry.NewCapabilitiesRegistry, IsAllowedCaller: contract.OnlyOwner[*capabilities_registry.CapabilitiesRegistry, AddNodesOperatorsOpInput], Validate: func(AddNodesOperatorsOpInput) error { return nil }, CallContract: func(capReg *capabilities_registry.CapabilitiesRegistry, opts *bind.TransactOpts, input AddNodesOperatorsOpInput) (*types.Transaction, error) { @@ -111,7 +111,7 @@ var AddCapabilities = contract.NewWrite(contract.WriteParams[AddCapabilitiesOpIn Description: "Adds a new capability to the CapabilitiesRegistry", ContractType: utils.CapabilitiesRegistry, ContractABI: capabilities_registry.CapabilitiesRegistryABI, - NewContract: capabilities_registry.NewCapabilitiesRegistry, + // NewContract: capabilities_registry.NewCapabilitiesRegistry, IsAllowedCaller: contract.OnlyOwner[*capabilities_registry.CapabilitiesRegistry, AddCapabilitiesOpInput], Validate: func(AddCapabilitiesOpInput) error { return nil }, CallContract: func(capReg *capabilities_registry.CapabilitiesRegistry, opts *bind.TransactOpts, input AddCapabilitiesOpInput) (*types.Transaction, error) { @@ -130,7 +130,7 @@ var ApplyChainConfigUpdates = contract.NewWrite(contract.WriteParams[ApplyChainC Description: "Applies chain config updates to the CCIPHome contract", ContractType: utils.CCIPHome, ContractABI: ccip_home.CCIPHomeABI, - NewContract: ccip_home.NewCCIPHome, + // NewContract: ccip_home.NewCCIPHome, IsAllowedCaller: contract.OnlyOwner[*ccip_home.CCIPHome, ApplyChainConfigUpdatesOpInput], Validate: func(ApplyChainConfigUpdatesOpInput) error { return nil }, CallContract: func(ccipHome *ccip_home.CCIPHome, opts *bind.TransactOpts, input ApplyChainConfigUpdatesOpInput) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go b/chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go index 5e574afbae..4beea6e53c 100644 --- a/chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go +++ b/chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go @@ -277,7 +277,7 @@ var ApplyDestChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]DestC Description: "Calls applyDestChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, []DestChainConfigArgs], Validate: func([]DestChainConfigArgs) error { return nil }, CallContract: func( @@ -295,7 +295,7 @@ var UpdatePrices = contract.NewWrite(contract.WriteParams[PriceUpdates, *FeeQuot Description: "Calls updatePrices on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, PriceUpdates], Validate: func(PriceUpdates) error { return nil }, CallContract: func( @@ -313,7 +313,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -331,7 +331,7 @@ var ApplyTokenTransferFeeConfigUpdates = contract.NewWrite(contract.WriteParams[ Description: "Calls applyTokenTransferFeeConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, ApplyTokenTransferFeeConfigUpdatesArgs], Validate: func(ApplyTokenTransferFeeConfigUpdatesArgs) error { return nil }, CallContract: func( @@ -348,7 +348,7 @@ var GetDestChainConfig = contract.NewRead(contract.ReadParams[uint64, DestChainC Version: Version, Description: "Calls getDestChainConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (DestChainConfig, error) { return c.GetDestChainConfig(opts, args) }, @@ -359,7 +359,7 @@ var GetTokenTransferFeeConfig = contract.NewRead(contract.ReadParams[GetTokenTra Version: Version, Description: "Calls getTokenTransferFeeConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args GetTokenTransferFeeConfigArgs) (TokenTransferFeeConfig, error) { return c.GetTokenTransferFeeConfig(opts, args.DestChainSelector, args.Token) }, @@ -370,7 +370,7 @@ var GetTokenPrice = contract.NewRead(contract.ReadParams[common.Address, Timesta Version: Version, Description: "Calls getTokenPrice on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args common.Address) (TimestampedPackedUint224, error) { return c.GetTokenPrice(opts, args) }, @@ -381,7 +381,7 @@ var GetDestinationChainGasPrice = contract.NewRead(contract.ReadParams[uint64, T Version: Version, Description: "Calls getDestinationChainGasPrice on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (TimestampedPackedUint224, error) { return c.GetDestinationChainGasPrice(opts, args) }, @@ -392,7 +392,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -403,7 +403,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, diff --git a/chains/evm/deployment/v1_6_0/operations/nonce_manager/nonce_manager.go b/chains/evm/deployment/v1_6_0/operations/nonce_manager/nonce_manager.go index 9672220e67..0b75c81841 100644 --- a/chains/evm/deployment/v1_6_0/operations/nonce_manager/nonce_manager.go +++ b/chains/evm/deployment/v1_6_0/operations/nonce_manager/nonce_manager.go @@ -40,7 +40,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Applies updates to the list of authorized callers on the NonceManager", ContractType: ContractType, ContractABI: nonce_manager.NonceManagerABI, - NewContract: nonce_manager.NewNonceManager, + // NewContract: nonce_manager.NewNonceManager, IsAllowedCaller: contract.OnlyOwner[*nonce_manager.NonceManager, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func(nonceManager *nonce_manager.NonceManager, opts *bind.TransactOpts, args AuthorizedCallerArgs) (*types.Transaction, error) { @@ -54,7 +54,7 @@ var ApplyPreviousRampUpdates = contract.NewWrite(contract.WriteParams[[]Previous Description: "Applies updates to the list of previous ramps on the NonceManager", ContractType: ContractType, ContractABI: nonce_manager.NonceManagerABI, - NewContract: nonce_manager.NewNonceManager, + // NewContract: nonce_manager.NewNonceManager, IsAllowedCaller: contract.OnlyOwner[*nonce_manager.NonceManager, []PreviousRampsArgs], Validate: func([]PreviousRampsArgs) error { return nil }, CallContract: func(nonceManager *nonce_manager.NonceManager, opts *bind.TransactOpts, args []PreviousRampsArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v1_6_0/operations/offramp/offramp.go b/chains/evm/deployment/v1_6_0/operations/offramp/offramp.go index 0e7366d245..d75deaff25 100644 --- a/chains/evm/deployment/v1_6_0/operations/offramp/offramp.go +++ b/chains/evm/deployment/v1_6_0/operations/offramp/offramp.go @@ -168,7 +168,7 @@ var ApplySourceChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]Sou Description: "Calls applySourceChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: OffRampABI, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, IsAllowedCaller: contract.OnlyOwner[*OffRampContract, []SourceChainConfigArgs], Validate: func([]SourceChainConfigArgs) error { return nil }, CallContract: func( @@ -186,7 +186,7 @@ var SetOCR3Configs = contract.NewWrite(contract.WriteParams[[]OCRConfigArgs, *Of Description: "Calls setOCR3Configs on the contract", ContractType: ContractType, ContractABI: OffRampABI, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, IsAllowedCaller: contract.OnlyOwner[*OffRampContract, []OCRConfigArgs], Validate: func([]OCRConfigArgs) error { return nil }, CallContract: func( @@ -203,7 +203,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -214,7 +214,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -225,7 +225,7 @@ var GetSourceChainConfig = contract.NewRead(contract.ReadParams[uint64, SourceCh Version: Version, Description: "Calls getSourceChainConfig on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args uint64) (SourceChainConfig, error) { return c.GetSourceChainConfig(opts, args) }, @@ -237,7 +237,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *Of Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: OffRampABI, - NewContract: NewOffRampContract, + // NewContract: NewOffRampContract, IsAllowedCaller: contract.OnlyOwner[*OffRampContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v1_6_0/operations/onramp/onramp.go b/chains/evm/deployment/v1_6_0/operations/onramp/onramp.go index 18e5f79d0f..0ac9b3a500 100644 --- a/chains/evm/deployment/v1_6_0/operations/onramp/onramp.go +++ b/chains/evm/deployment/v1_6_0/operations/onramp/onramp.go @@ -187,7 +187,7 @@ var ApplyDestChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]DestC Description: "Calls applyDestChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, []DestChainConfigArgs], Validate: func([]DestChainConfigArgs) error { return nil }, CallContract: func( @@ -205,7 +205,7 @@ var ApplyAllowlistUpdates = contract.NewWrite(contract.WriteParams[[]AllowlistCo Description: "Calls applyAllowlistUpdates on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, []AllowlistConfigArgs], Validate: func([]AllowlistConfigArgs) error { return nil }, CallContract: func( @@ -222,7 +222,7 @@ var GetAllowedSendersList = contract.NewRead(contract.ReadParams[uint64, GetAllo Version: Version, Description: "Calls getAllowedSendersList on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args uint64) (GetAllowedSendersListResult, error) { return c.GetAllowedSendersList(opts, args) }, @@ -233,7 +233,7 @@ var GetDestChainConfig = contract.NewRead(contract.ReadParams[uint64, GetDestCha Version: Version, Description: "Calls getDestChainConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args uint64) (GetDestChainConfigResult, error) { return c.GetDestChainConfig(opts, args) }, @@ -244,7 +244,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -255,7 +255,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -267,7 +267,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *On Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + // NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v1_6_0/operations/rmn_remote/rmn_remote.go b/chains/evm/deployment/v1_6_0/operations/rmn_remote/rmn_remote.go index 91af58d87b..36774d49d9 100644 --- a/chains/evm/deployment/v1_6_0/operations/rmn_remote/rmn_remote.go +++ b/chains/evm/deployment/v1_6_0/operations/rmn_remote/rmn_remote.go @@ -122,7 +122,7 @@ var Curse = contract.NewWrite(contract.WriteParams[[16]byte, *RMNRemoteContract] Description: "Calls curse on the contract", ContractType: ContractType, ContractABI: RMNRemoteABI, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, IsAllowedCaller: contract.OnlyOwner[*RMNRemoteContract, [16]byte], Validate: func([16]byte) error { return nil }, CallContract: func( @@ -140,7 +140,7 @@ var Curse0 = contract.NewWrite(contract.WriteParams[[][16]byte, *RMNRemoteContra Description: "Calls curse0 on the contract", ContractType: ContractType, ContractABI: RMNRemoteABI, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, IsAllowedCaller: contract.OnlyOwner[*RMNRemoteContract, [][16]byte], Validate: func([][16]byte) error { return nil }, CallContract: func( @@ -158,7 +158,7 @@ var Uncurse = contract.NewWrite(contract.WriteParams[[16]byte, *RMNRemoteContrac Description: "Calls uncurse on the contract", ContractType: ContractType, ContractABI: RMNRemoteABI, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, IsAllowedCaller: contract.OnlyOwner[*RMNRemoteContract, [16]byte], Validate: func([16]byte) error { return nil }, CallContract: func( @@ -176,7 +176,7 @@ var Uncurse0 = contract.NewWrite(contract.WriteParams[[][16]byte, *RMNRemoteCont Description: "Calls uncurse0 on the contract", ContractType: ContractType, ContractABI: RMNRemoteABI, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, IsAllowedCaller: contract.OnlyOwner[*RMNRemoteContract, [][16]byte], Validate: func([][16]byte) error { return nil }, CallContract: func( @@ -193,7 +193,7 @@ var IsCursed = contract.NewRead(contract.ReadParams[[16]byte, bool, *RMNRemoteCo Version: Version, Description: "Calls isCursed on the contract", ContractType: ContractType, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, CallContract: func(c *RMNRemoteContract, opts *bind.CallOpts, args [16]byte) (bool, error) { return c.IsCursed(opts, args) }, @@ -204,7 +204,7 @@ var IsCursed0 = contract.NewRead(contract.ReadParams[struct{}, bool, *RMNRemoteC Version: Version, Description: "Calls isCursed0 on the contract", ContractType: ContractType, - NewContract: NewRMNRemoteContract, + // NewContract: NewRMNRemoteContract, CallContract: func(c *RMNRemoteContract, opts *bind.CallOpts, args struct{}) (bool, error) { return c.IsCursed0(opts) }, diff --git a/chains/evm/deployment/v1_6_0/operations/token_governor/token_governor.go b/chains/evm/deployment/v1_6_0/operations/token_governor/token_governor.go index 677f080dbd..568ba213d7 100644 --- a/chains/evm/deployment/v1_6_0/operations/token_governor/token_governor.go +++ b/chains/evm/deployment/v1_6_0/operations/token_governor/token_governor.go @@ -50,7 +50,7 @@ var GrantRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *token_go Description: "Grant access to given roles on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { defaultAdmin, err := tg.DefaultAdmin(opts) if err != nil { @@ -75,7 +75,7 @@ var RenounceRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *token Description: "Renounce access to given roles on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { defaultAdmin, err := tg.DefaultAdmin(opts) if err != nil { @@ -100,7 +100,7 @@ var RevokeRole = contract.NewWrite(contract.WriteParams[RoleAssignment, *token_g Description: "Revoke access to given roles on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input RoleAssignment) (bool, error) { defaultAdmin, err := tg.DefaultAdmin(opts) if err != nil { @@ -125,7 +125,7 @@ var TransferOwnership = contract.NewWrite(contract.WriteParams[common.Address, * Description: "TransferOwnership to given account on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { owner, err := tg.Owner(opts) if err != nil { @@ -147,7 +147,7 @@ var AcceptOwnership = contract.NewWrite(contract.WriteParams[common.Address, *to Description: "AcceptOwnership on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { owner, err := tg.Owner(opts) if err != nil { @@ -169,7 +169,7 @@ var BeginDefaultAdminTransfer = contract.NewWrite(contract.WriteParams[common.Ad Description: "BeginDefaultAdminTransfer on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { owner, err := tg.Owner(opts) if err != nil { @@ -191,7 +191,7 @@ var AcceptDefaultAdminTransfer = contract.NewWrite(contract.WriteParams[common.A Description: "AcceptDefaultAdminTransfer on TokenGovernor contract", ContractType: ContractType, ContractABI: token_governor.TokenGovernorABI, - NewContract: token_governor.NewTokenGovernor, + // NewContract: token_governor.NewTokenGovernor, IsAllowedCaller: func(tg *token_governor.TokenGovernor, opts *bind.CallOpts, caller common.Address, input common.Address) (bool, error) { owner, err := tg.Owner(opts) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/adapter.go b/chains/evm/deployment/v1_6_0/sequences/adapter.go index 9eaea02e04..74771f4dab 100644 --- a/chains/evm/deployment/v1_6_0/sequences/adapter.go +++ b/chains/evm/deployment/v1_6_0/sequences/adapter.go @@ -158,8 +158,8 @@ var ConfigurePingPongSequence = operations.NewSequence( paddedDestAddr := common.LeftPadBytes(input.DestPingPongAddr, 32) _, err := operations.ExecuteOperation(b, pingpongdapp.SetCounterpart, chain, contract.FunctionInput[pingpongdapp.SetCounterpartArgs]{ - ChainSelector: input.SourceSelector, - Address: common.BytesToAddress(input.SourcePingPongAddr), + // ChainSelector: input.SourceSelector, + // Address: common.BytesToAddress(input.SourcePingPongAddr), Args: pingpongdapp.SetCounterpartArgs{ CounterpartChainSelector: input.DestSelector, CounterpartAddress: paddedDestAddr, diff --git a/chains/evm/deployment/v1_6_0/sequences/deploy_chain_contracts.go b/chains/evm/deployment/v1_6_0/sequences/deploy_chain_contracts.go index a4f8471555..8d5ed3f47b 100644 --- a/chains/evm/deployment/v1_6_0/sequences/deploy_chain_contracts.go +++ b/chains/evm/deployment/v1_6_0/sequences/deploy_chain_contracts.go @@ -77,7 +77,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy WETH wethRef, err := contract.MaybeDeployContract(b, weth.Deploy, chain, contract.DeployInput[weth.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(weth.ContractType, *weth.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, }, input.ExistingAddresses) if err != nil { return sequences.OnChainOutput{}, err @@ -87,7 +87,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy LINK linkRef, err := contract.MaybeDeployContract(b, link.Deploy, chain, contract.DeployInput[link.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(link.ContractType, *link.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, }, input.ExistingAddresses) if err != nil { return sequences.OnChainOutput{}, err @@ -97,7 +97,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy RMNRemote rmnRemoteRef, err := contract.MaybeDeployContract(b, rmn_remote.Deploy, chain, contract.DeployInput[rmn_remote.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_remote.ContractType, *rmn_remote.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmn_remote.ConstructorArgs{ LocalChainSelector: chain.Selector, LegacyRMN: common.HexToAddress(input.LegacyRMN), @@ -111,7 +111,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy RMNProxy rmnProxyRef, err := contract.MaybeDeployContract(b, rmn_proxy.Deploy, chain, contract.DeployInput[rmn_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_proxy.ContractType, *rmn_proxy.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmn_proxy.ConstructorArgs{ RMN: common.HexToAddress(rmnRemoteRef.Address), }, @@ -126,8 +126,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // In this case, we would not have set the RMNRemote in the constructor. // We would need to update the RMN on the existing RMNProxy. setRMNReport, err := cldf_ops.ExecuteOperation(b, rmn_proxy.SetRMN, chain, contract.FunctionInput[rmn_proxy.SetRMNArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(rmnProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(rmnProxyRef.Address), Args: rmn_proxy.SetRMNArgs{ RMN: common.HexToAddress(rmnRemoteRef.Address), }, @@ -140,7 +140,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy Router routerRef, err := contract.MaybeDeployContract(b, router.Deploy, chain, contract.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.ContractType, *router.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: router.ConstructorArgs{ WrappedNative: common.HexToAddress(wethRef.Address), RMNProxy: common.HexToAddress(rmnProxyRef.Address), @@ -154,7 +154,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy Test Router testRouterRef, err := contract.MaybeDeployContract(b, router.DeployTestRouter, chain, contract.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.TestRouterContractType, *router.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: router.ConstructorArgs{ WrappedNative: common.HexToAddress(wethRef.Address), RMNProxy: common.HexToAddress(rmnProxyRef.Address), @@ -168,7 +168,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy TokenAdminRegistry tokenAdminRegistryRef, err := contract.MaybeDeployContract(b, token_admin_registry.Deploy, chain, contract.DeployInput[token_admin_registry.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(token_admin_registry.ContractType, *token_admin_registry.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, }, input.ExistingAddresses) if err != nil { return sequences.OnChainOutput{}, err @@ -178,7 +178,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy NonceManager nonceManagerRef, err := contract.MaybeDeployContract(b, nonce_manager.Deploy, chain, contract.DeployInput[nonce_manager.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(nonce_manager.ContractType, *nonce_manager.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, }, input.ExistingAddresses) if err != nil { return sequences.OnChainOutput{}, err @@ -188,7 +188,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy FeeQuoter feeQuoterRef, err := contract.MaybeDeployContract(b, fq163ops.Deploy, chain, contract.DeployInput[fq163ops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(fq163ops.ContractType, *fq163ops.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: fq163ops.ConstructorArgs{ StaticConfig: fq163ops.StaticConfig{ MaxFeeJuelsPerMsg: input.MaxFeeJuelsPerMsg, @@ -226,7 +226,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy OffRamp offRampRef, err := contract.MaybeDeployContract(b, offrampops.Deploy, chain, contract.DeployInput[offrampops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(offrampops.ContractType, *offrampops.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: offrampops.ConstructorArgs{ StaticConfig: offrampops.StaticConfig{ ChainSelector: chain.Selector, @@ -250,7 +250,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy OnRamp onRampRef, err := contract.MaybeDeployContract(b, onrampops.Deploy, chain, contract.DeployInput[onrampops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(onrampops.ContractType, *onrampops.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: onrampops.ConstructorArgs{ StaticConfig: onrampops.StaticConfig{ ChainSelector: chain.Selector, @@ -273,7 +273,7 @@ var DeployChainContracts = cldf_ops.NewSequence( if input.DeployPingPongDapp { pingPongDappRef, err := contract.MaybeDeployContract(b, pingpongdappops.Deploy, chain, contract.DeployInput[pingpongdappops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(pingpongdappops.ContractType, *pingpongdappops.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: pingpongdappops.ConstructorArgs{ Router: common.HexToAddress(routerRef.Address), FeeToken: common.HexToAddress(linkRef.Address), @@ -287,8 +287,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fund Ping Pong Dapp with LINK tokens for cross-chain message fees // First, grant mint role to the deployer _, err = cldf_ops.ExecuteOperation(b, link.GrantMintRole, chain, contract.FunctionInput[link.GrantMintRoleArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(linkRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(linkRef.Address), Args: link.GrantMintRoleArgs{ Minter: chain.DeployerKey.From, }, @@ -301,8 +301,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Retry with backoff for external networks where grant confirmation may take time pingPongFundingAmount := new(big.Int).Mul(big.NewInt(20), new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)) mintInput := contract.FunctionInput[link.MintArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(linkRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(linkRef.Address), Args: link.MintArgs{ To: common.HexToAddress(pingPongDappRef.Address), Amount: pingPongFundingAmount, @@ -333,8 +333,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Add Authorized Caller to NonceManager _, err = cldf_ops.ExecuteOperation(b, nonce_manager.ApplyAuthorizedCallerUpdates, chain, contract.FunctionInput[nonce_manager.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(nonceManagerRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(nonceManagerRef.Address), Args: nonce_manager.AuthorizedCallerArgs{ AddedCallers: []common.Address{ common.HexToAddress(offRampRef.Address), @@ -348,8 +348,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Add Authorized Caller to FQ _, err = cldf_ops.ExecuteOperation(b, fqops.ApplyAuthorizedCallerUpdates, chain, contract.FunctionInput[fqops.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(feeQuoterRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(feeQuoterRef.Address), Args: fqops.AuthorizedCallerArgs{ AddedCallers: []common.Address{ common.HexToAddress(offRampRef.Address), diff --git a/chains/evm/deployment/v1_6_0/sequences/deploy_token_pool_contracts.go b/chains/evm/deployment/v1_6_0/sequences/deploy_token_pool_contracts.go index fa80292c95..2a1c36b49d 100644 --- a/chains/evm/deployment/v1_6_0/sequences/deploy_token_pool_contracts.go +++ b/chains/evm/deployment/v1_6_0/sequences/deploy_token_pool_contracts.go @@ -142,7 +142,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_burn_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_burn_mint_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_burn_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_burn_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_burn_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -159,7 +159,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_burn_from_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_burn_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_burn_from_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_burn_from_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_burn_from_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -176,7 +176,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_burn_mint_with_lock_release_flag_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_burn_mint_with_lock_release_flag_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_burn_mint_with_lock_release_flag_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_burn_mint_with_lock_release_flag_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_burn_mint_with_lock_release_flag_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -193,7 +193,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_burn_to_address_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_burn_to_address_mint_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_burn_to_address_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_burn_to_address_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_burn_to_address_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -211,7 +211,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_burn_with_from_mint_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_burn_with_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_burn_with_from_mint_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_burn_with_from_mint_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_burn_with_from_mint_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -228,7 +228,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_lock_release_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_lock_release_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_lock_release_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_lock_release_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_lock_release_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -245,7 +245,7 @@ var DeployTokenPool = cldf_ops.NewSequence( case v1_6_1_siloed_lock_release_token_pool.TypeAndVersion.String(): poolRef, err = contract.MaybeDeployContract(b, v1_6_1_siloed_lock_release_token_pool.Deploy, chain, contract.DeployInput[v1_6_1_siloed_lock_release_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_1_siloed_lock_release_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_1_siloed_lock_release_token_pool.ConstructorArgs{ Token: common.HexToAddress(tokenAddr), LocalTokenDecimals: tokenDecimal, @@ -267,7 +267,7 @@ var DeployTokenPool = cldf_ops.NewSequence( } poolRef, err = contract.MaybeDeployContract(b, v1_6_0_burn_mint_with_external_minter_token_pool.Deploy, chain, contract.DeployInput[v1_6_0_burn_mint_with_external_minter_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_0_burn_mint_with_external_minter_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_0_burn_mint_with_external_minter_token_pool.ConstructorArgs{ Minter: common.HexToAddress(tokenGovernor), Token: common.HexToAddress(tokenAddr), @@ -289,7 +289,7 @@ var DeployTokenPool = cldf_ops.NewSequence( } poolRef, err = contract.MaybeDeployContract(b, v1_6_0_hybrid_with_external_minter_token_pool.Deploy, chain, contract.DeployInput[v1_6_0_hybrid_with_external_minter_token_pool.ConstructorArgs]{ TypeAndVersion: v1_6_0_hybrid_with_external_minter_token_pool.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: v1_6_0_hybrid_with_external_minter_token_pool.ConstructorArgs{ Minter: common.HexToAddress(tokenGovernor), Token: common.HexToAddress(tokenAddr), diff --git a/chains/evm/deployment/v1_6_0/sequences/fee_quoter.go b/chains/evm/deployment/v1_6_0/sequences/fee_quoter.go index a806235bed..bd703027f7 100644 --- a/chains/evm/deployment/v1_6_0/sequences/fee_quoter.go +++ b/chains/evm/deployment/v1_6_0/sequences/fee_quoter.go @@ -70,9 +70,9 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, fqops.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]fqops.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: input.UpdatesByChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: input.UpdatesByChain, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute FeeQuoterApplyDestChainConfigUpdatesOp on %s: %w", chain, err) @@ -98,9 +98,9 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, fqops.UpdatePrices, chain, contract.FunctionInput[fqops.PriceUpdates]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: input.UpdatesByChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: input.UpdatesByChain, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute FeeQuoterUpdatePricesOp on %s: %w", chain, err) @@ -126,9 +126,9 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, fqops.ApplyTokenTransferFeeConfigUpdates, chain, contract.FunctionInput[fqops.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: input.UpdatesByChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: input.UpdatesByChain, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute FeeQuoterApplyTokenTransferFeeConfigUpdatesOp on %s: %w", chain, err) @@ -165,9 +165,9 @@ var ( gasPriceMu := sync.Mutex{} // fetch fee tokens feeTokensRep, err := operations.ExecuteOperation(b, fqops.GetFeeTokens, evmChain, contract.FunctionInput[struct{}]{ - Address: fqAddress, - ChainSelector: chainSelector, - Args: struct{}{}, + // Address: fqAddress, + // ChainSelector: chainSelector, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get fee tokens from feequoter %s on chain %s: %w", @@ -177,9 +177,9 @@ var ( remoteChain := remoteChain destGrp.Go(func() error { opsOutput, err := operations.ExecuteOperation(b, fqops.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - Address: fqAddress, - ChainSelector: chainSelector, - Args: remoteChain, + // Address: fqAddress, + // ChainSelector: chainSelector, + Args: remoteChain, }) if err != nil { return fmt.Errorf("failed to get dest chain config for "+ @@ -193,9 +193,9 @@ var ( destChainConfigs[remoteChain] = opsOutput.Output destChainMu.Unlock() gasPriceOutput, err := operations.ExecuteOperation(b, fqops.GetDestinationChainGasPrice, evmChain, contract.FunctionInput[uint64]{ - Address: fqAddress, - ChainSelector: chainSelector, - Args: remoteChain, + // Address: fqAddress, + // ChainSelector: chainSelector, + Args: remoteChain, }) if err != nil { return fmt.Errorf("failed to get destination chain gas price for "+ @@ -249,8 +249,8 @@ var ( innerTokenGrp.Go(func() error { opsOutput, err := operations.ExecuteOperation(b, fqops.GetTokenTransferFeeConfig, evmChain, contract.FunctionInput[fqops.GetTokenTransferFeeConfigArgs]{ - Address: fqAddress, - ChainSelector: chainSelector, + // Address: fqAddress, + // ChainSelector: chainSelector, Args: fqops.GetTokenTransferFeeConfigArgs{ Token: token, DestChainSelector: remoteChain, @@ -292,16 +292,18 @@ var ( } } staticCfgOutput, err := operations.ExecuteOperation(b, fqops.GetStaticConfig, evmChain, contract.FunctionInput[struct{}]{ - Address: fqAddress, - ChainSelector: chainSelector, + // Address: fqAddress, + // ChainSelector: chainSelector, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get static config from feequoter %s on chain %d: %w", fqAddress.Hex(), chainSelector, err) } priceUpdaters, err := operations.ExecuteOperation(b, fqops.GetAllAuthorizedCallers, evmChain, contract.FunctionInput[struct{}]{ - Address: fqAddress, - ChainSelector: chainSelector, + // Address: fqAddress, + // ChainSelector: chainSelector, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get all authorized callers from feequoter %s on chain %d: %w", @@ -318,8 +320,8 @@ var ( tokenSlice := maps.Keys(allTokens) // add fee tokens tokenPrices, err := operations.ExecuteOperation(b, fqops.GetTokenPrices, evmChain, contract.FunctionInput[[]common.Address]{ - Address: fqAddress, - ChainSelector: chainSelector, + // Address: fqAddress, + // ChainSelector: chainSelector, Args: tokenSlice, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/ocr.go b/chains/evm/deployment/v1_6_0/sequences/ocr.go index 2bb3893823..f01542fff5 100644 --- a/chains/evm/deployment/v1_6_0/sequences/ocr.go +++ b/chains/evm/deployment/v1_6_0/sequences/ocr.go @@ -29,35 +29,35 @@ var SetOCR3Config = cldf_ops.NewSequence( if !ok { return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } - e := &EVMAdapter{} - offRampAddr, err := e.GetOffRampAddress(input.Datastore, input.ChainSelector) - if err != nil { - return sequences.OnChainOutput{}, err - } - update := make([]offrampops.OCRConfigArgs, 0) - for _, cfg := range input.Configs { - var signerAddresses []common.Address - var transmitterAddresses []common.Address - for _, s := range cfg.Signers { - signerAddresses = append(signerAddresses, common.BytesToAddress(s)) + // e := &EVMAdapter{} + // offRampAddr, err := e.GetOffRampAddress(input.Datastore, input.ChainSelector) + if err != nil { + return sequences.OnChainOutput{}, err } - for _, t := range cfg.Transmitters { - transmitterAddresses = append(transmitterAddresses, common.BytesToAddress(t)) + update := make([]offrampops.OCRConfigArgs, 0) + for _, cfg := range input.Configs { + var signerAddresses []common.Address + var transmitterAddresses []common.Address + for _, s := range cfg.Signers { + signerAddresses = append(signerAddresses, common.BytesToAddress(s)) + } + for _, t := range cfg.Transmitters { + transmitterAddresses = append(transmitterAddresses, common.BytesToAddress(t)) + } + update = append(update, offrampops.OCRConfigArgs{ + ConfigDigest: cfg.ConfigDigest, + OcrPluginType: uint8(cfg.PluginType), + F: cfg.F, + IsSignatureVerificationEnabled: cfg.IsSignatureVerificationEnabled, + Signers: signerAddresses, + Transmitters: transmitterAddresses, + }) } - update = append(update, offrampops.OCRConfigArgs{ - ConfigDigest: cfg.ConfigDigest, - OcrPluginType: uint8(cfg.PluginType), - F: cfg.F, - IsSignatureVerificationEnabled: cfg.IsSignatureVerificationEnabled, - Signers: signerAddresses, - Transmitters: transmitterAddresses, + report, err := operations.ExecuteOperation(b, offrampops.SetOCR3Configs, chain, contract.FunctionInput[[]offrampops.OCRConfigArgs]{ + // ChainSelector: chain.Selector, + // Address: common.BytesToAddress(offRampAddr), + Args: update, }) - } - report, err := operations.ExecuteOperation(b, offrampops.SetOCR3Configs, chain, contract.FunctionInput[[]offrampops.OCRConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.BytesToAddress(offRampAddr), - Args: update, - }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute OffRampSetOcr3 on %s: %w", chain, err) } diff --git a/chains/evm/deployment/v1_6_0/sequences/offramp.go b/chains/evm/deployment/v1_6_0/sequences/offramp.go index e84486e358..3ca2e92247 100644 --- a/chains/evm/deployment/v1_6_0/sequences/offramp.go +++ b/chains/evm/deployment/v1_6_0/sequences/offramp.go @@ -47,9 +47,9 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, offrampops.ApplySourceChainConfigUpdates, chain, contract.FunctionInput[[]offrampops.SourceChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: input.UpdatesByChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: input.UpdatesByChain, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute OffRampApplySourceChainConfigUpdatesOp on %s: %w", chain, err) @@ -77,16 +77,18 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, offrampops.GetStaticConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute GetStaticConfig on %s: %w", chain, err) } output.StaticConfig = report.Output out, err := operations.ExecuteOperation(b, offrampops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute GetDynamicConfig on %s: %w", chain, err) @@ -94,8 +96,8 @@ var ( output.DynamicConfig = out.Output for _, remoteChain := range input.RemoteChains { report, err := operations.ExecuteOperation(b, offrampops.GetSourceChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, Args: remoteChain, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/onramp.go b/chains/evm/deployment/v1_6_0/sequences/onramp.go index faf75f257c..0021186e0f 100644 --- a/chains/evm/deployment/v1_6_0/sequences/onramp.go +++ b/chains/evm/deployment/v1_6_0/sequences/onramp.go @@ -46,9 +46,9 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, onrampops.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]onrampops.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: input.UpdatesByChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: input.UpdatesByChain, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to execute OnRampApplyDestChainConfigUpdatesOp on %s: %w", chain, err) @@ -75,9 +75,9 @@ var ( onRampDestConfigs := make(map[uint64]onrampops.GetDestChainConfigResult) for _, remoteChain := range input.RemoteChains { report, err := operations.ExecuteOperation(b, onrampops.GetDestChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: input.Address, - Args: remoteChain, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: remoteChain, }) onRampDestConfigs[remoteChain] = report.Output if err != nil { @@ -85,16 +85,18 @@ var ( } } report, err := operations.ExecuteOperation(b, onrampops.GetStaticConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get static config from OnRamp at %s on %s: %w", input.Address.String(), chain, err) } staticConfig := report.Output out, err := operations.ExecuteOperation(b, onrampops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get dynamic config from OnRamp at %s on %s: %w", input.Address.String(), chain, err) diff --git a/chains/evm/deployment/v1_6_0/sequences/rmn_remote.go b/chains/evm/deployment/v1_6_0/sequences/rmn_remote.go index 9d1cfab61d..158af446c7 100644 --- a/chains/evm/deployment/v1_6_0/sequences/rmn_remote.go +++ b/chains/evm/deployment/v1_6_0/sequences/rmn_remote.go @@ -28,8 +28,8 @@ var SeqCurse = cldf_ops.NewSequence( func(b cldf_ops.Bundle, chain cldf_evm.Chain, in SeqCurseInput) (output sequences.OnChainOutput, err error) { // Use Curse0 which takes an array of subjects opOutput, err := cldf_ops.ExecuteOperation(b, ops.Curse0, chain, contract.FunctionInput[[][16]byte]{ - Address: in.Addr, - ChainSelector: chain.Selector, + // Address: in.Addr, + // ChainSelector: chain.Selector, Args: in.Subjects, }) if err != nil { @@ -52,8 +52,8 @@ var SeqUncurse = cldf_ops.NewSequence( func(b cldf_ops.Bundle, chain cldf_evm.Chain, in SeqCurseInput) (output sequences.OnChainOutput, err error) { // Use Uncurse0 which takes an array of subjects opOutput, err := cldf_ops.ExecuteOperation(b, ops.Uncurse0, chain, contract.FunctionInput[[][16]byte]{ - Address: in.Addr, - ChainSelector: chain.Selector, + // Address: in.Addr, + // ChainSelector: chain.Selector, Args: in.Subjects, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/router.go b/chains/evm/deployment/v1_6_0/sequences/router.go index 82b8061879..0515373013 100644 --- a/chains/evm/deployment/v1_6_0/sequences/router.go +++ b/chains/evm/deployment/v1_6_0/sequences/router.go @@ -33,8 +33,8 @@ var ( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not defined", input.ChainSelector) } report, err := operations.ExecuteOperation(b, routerops.ApplyRampUpdates, chain, contract.FunctionInput[routerops.ApplyRampsUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: input.Address, + // ChainSelector: chain.Selector, + // Address: input.Address, Args: input.UpdatesByChain, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/token_governor.go b/chains/evm/deployment/v1_6_0/sequences/token_governor.go index ce789474b5..fdfb60483e 100644 --- a/chains/evm/deployment/v1_6_0/sequences/token_governor.go +++ b/chains/evm/deployment/v1_6_0/sequences/token_governor.go @@ -185,7 +185,7 @@ var DeployTokenGovernor = cldf_ops.NewSequence( } tokenGovernorRef, err = contract.MaybeDeployContract(b, token_governor.Deploy, chain, contract.DeployInput[token_governor.ConstructorArgs]{ TypeAndVersion: token_governor.TypeAndVersion, - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: token_governor.ConstructorArgs{ Token: common.HexToAddress(input.Token), InitialDelay: input.InitialDelay, @@ -247,8 +247,8 @@ var GrantRole = cldf_ops.NewSequence( } // execute GrantRole operation report, err := cldf_ops.ExecuteOperation(b, token_governor.GrantRole, chain, contract.FunctionInput[token_governor.RoleAssignment]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: token_governor.RoleAssignment{ Role: role, To: tokenGovernorRole.Account, @@ -307,8 +307,8 @@ var RevokeRole = cldf_ops.NewSequence( } // execute RevokeRole operation report, err := cldf_ops.ExecuteOperation(b, token_governor.RevokeRole, chain, contract.FunctionInput[token_governor.RoleAssignment]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: token_governor.RoleAssignment{ Role: role, To: tokenGovernorRole.Account, @@ -367,8 +367,8 @@ var RenounceRole = cldf_ops.NewSequence( } // execute RenounceRole operation report, err := cldf_ops.ExecuteOperation(b, token_governor.RenounceRole, chain, contract.FunctionInput[token_governor.RoleAssignment]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: token_governor.RoleAssignment{ Role: role, To: tokenGovernorRole.Account, @@ -440,8 +440,8 @@ var TransferOwnership = cldf_ops.NewSequence( // execute TransferOwnership operation report, err := cldf_ops.ExecuteOperation(b, token_governor.TransferOwnership, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: newOwner, }) if err != nil { @@ -475,15 +475,15 @@ var AcceptOwnership = cldf_ops.NewSequence( for tokenSymbol, newOwner := range tokenMap { // get token governor address from datastore - tgAddr, err := GetTokenGovernor(input.ExistingDataStore, chainSelector, tokenSymbol) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("failed to get token governor address for token %s on chain %d: %w", tokenSymbol, chainSelector, err) - } + // tgAddr, err := GetTokenGovernor(input.ExistingDataStore, chainSelector, tokenSymbol) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("failed to get token governor address for token %s on chain %d: %w", tokenSymbol, chainSelector, err) + // } // execute AcceptOwnership operation report, err := cldf_ops.ExecuteOperation(b, token_governor.AcceptOwnership, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: newOwner, }) if err != nil { @@ -539,8 +539,8 @@ var BeginDefaultAdminTransfer = cldf_ops.NewSequence( // execute BeginDefaultAdminTransfer operation report, err := cldf_ops.ExecuteOperation(b, token_governor.BeginDefaultAdminTransfer, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: newAdmin, }) if err != nil { @@ -574,15 +574,15 @@ var AcceptDefaultAdminTransfer = cldf_ops.NewSequence( for tokenSymbol, admin := range tokenMap { // get token governor address from datastore - tgAddr, err := GetTokenGovernor(input.ExistingDataStore, chainSelector, tokenSymbol) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("failed to get token governor address for token %s on chain %d: %w", tokenSymbol, chainSelector, err) - } + // tgAddr, err := GetTokenGovernor(input.ExistingDataStore, chainSelector, tokenSymbol) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("failed to get token governor address for token %s on chain %d: %w", tokenSymbol, chainSelector, err) + // } // execute AcceptDefaultAdminTransfer operation report, err := cldf_ops.ExecuteOperation(b, token_governor.AcceptDefaultAdminTransfer, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tgAddr, + // ChainSelector: chain.Selector, + // Address: tgAddr, Args: admin, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_0/sequences/update_lanes.go b/chains/evm/deployment/v1_6_0/sequences/update_lanes.go index 661e2f6166..03f16e47fc 100644 --- a/chains/evm/deployment/v1_6_0/sequences/update_lanes.go +++ b/chains/evm/deployment/v1_6_0/sequences/update_lanes.go @@ -167,8 +167,9 @@ var ConfigureLaneLegAsDest = operations.NewSequence( return result, fmt.Errorf("chain with selector %d not defined", input.Dest.Selector) } rep, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: input.Dest.Selector, - Address: common.BytesToAddress(input.Dest.Router), + // ChainSelector: input.Dest.Selector, + // Address: common.BytesToAddress(input.Dest.Router), + Args: nil, }) if err != nil { return result, fmt.Errorf("read offRamps from router: %w", err) @@ -210,9 +211,9 @@ func feeQuoterPricesAlreadySeeded( destChainSelector uint64, ) (bool, error) { rep, err := operations.ExecuteOperation(b, fqops.GetDestinationChainGasPrice, chain, contract.FunctionInput[uint64]{ - ChainSelector: sourceChainSelector, - Address: feeQuoter, - Args: destChainSelector, + // ChainSelector: sourceChainSelector, + // Address: feeQuoter, + Args: destChainSelector, }) if err != nil { return false, fmt.Errorf("read destination gas price from fee quoter: %w", err) @@ -229,8 +230,8 @@ func feeQuoterV2PricesAlreadySeeded( destChainSelector uint64, ) (bool, error) { rep, err := operations.ExecuteOperation(b, fqops2.GetDestinationChainGasPrice, chain, contract.FunctionInput[uint64]{ - ChainSelector: sourceChainSelector, - Address: feeQuoter, + // ChainSelector: sourceChainSelector, + // Address: feeQuoter, Args: destChainSelector, }) if err != nil { @@ -254,10 +255,10 @@ func applyOnRampAllowlist(b operations.Bundle, chain cldf_evm.Chain, input lanes return errors.New("OnRamp allowlist: cannot specify AllowList addresses when AllowListEnabled is false") } - onRampAddr := common.BytesToAddress(input.Source.OnRamp) + // onRampAddr := common.BytesToAddress(input.Source.OnRamp) currentRep, err := operations.ExecuteOperation(b, onrampops.GetAllowedSendersList, chain, contract.FunctionInput[uint64]{ - ChainSelector: input.Source.Selector, - Address: onRampAddr, + // ChainSelector: input.Source.Selector, + // Address: onRampAddr, Args: input.Dest.Selector, }) if err != nil { @@ -280,8 +281,8 @@ func applyOnRampAllowlist(b operations.Bundle, chain cldf_evm.Chain, input lanes } writeRep, err := operations.ExecuteOperation(b, onrampops.ApplyAllowlistUpdates, chain, contract.FunctionInput[[]onrampops.AllowlistConfigArgs]{ - ChainSelector: input.Source.Selector, - Address: onRampAddr, + // ChainSelector: input.Source.Selector, + // Address: onRampAddr, Args: []onrampops.AllowlistConfigArgs{{ DestChainSelector: input.Dest.Selector, AllowlistEnabled: input.Source.AllowListEnabled, @@ -460,8 +461,8 @@ func configureFeeQuoterV2(b operations.Bundle, input lanes.UpdateLanesInput, fqA destChainCfgReport, err := operations.ExecuteOperation( b, fqops2.ApplyDestChainConfigUpdates, evmChain, contract.FunctionInput[[]fqops2.DestChainConfigArgs]{ - ChainSelector: evmChain.Selector, - Address: fqAddr, + // ChainSelector: evmChain.Selector, + // Address: fqAddr, Args: []fqops2.DestChainConfigArgs{ { DestChainSelector: input.Dest.Selector, @@ -489,8 +490,8 @@ func configureFeeQuoterV2(b operations.Bundle, input lanes.UpdateLanesInput, fqA b.Logger.Info("Skipping FeeQuoter v2 price updates: prices already seeded for dest chain") } else { priceReport, err := operations.ExecuteOperation(b, fqops2.UpdatePrices, evmChain, contract.FunctionInput[fqops2.PriceUpdates]{ - ChainSelector: evmChain.Selector, - Address: fqAddr, + // ChainSelector: evmChain.Selector, + // Address: fqAddr, Args: fqops2.PriceUpdates{ TokenPriceUpdates: TranslateTokenPricesV2(input.Source.TokenPrices), GasPriceUpdates: []fqops2.GasPriceUpdate{ diff --git a/chains/evm/deployment/v1_6_1/adapters/tokens.go b/chains/evm/deployment/v1_6_1/adapters/tokens.go index d41f4d8215..6e2a2851d8 100644 --- a/chains/evm/deployment/v1_6_1/adapters/tokens.go +++ b/chains/evm/deployment/v1_6_1/adapters/tokens.go @@ -74,8 +74,9 @@ func (p *poolOpsV161) GetToken(b cldf_ops.Bundle, chain evm.Chain, poolAddr comm res, err := cldf_ops.ExecuteOperation(b, tpOpsV1_6_1.GetToken, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, + Args: struct{}{}, }, ) if err != nil { @@ -112,8 +113,8 @@ func (p *poolOpsV161) SetRateLimiterConfig(b cldf_ops.Bundle, chain evm.Chain, p report, err := cldf_ops.ExecuteOperation(b, tpOpsV1_6_1.SetChainRateLimiterConfig, chain, evm_contract.FunctionInput[tpOpsV1_6_1.SetChainRateLimiterConfigArgs]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, Args: tpOpsV1_6_1.SetChainRateLimiterConfigArgs{ OutboundConfig: tpOpsV1_6_1.Config{ IsEnabled: outbound.IsEnabled, @@ -138,8 +139,8 @@ func (p *poolOpsV161) SetRateLimitAdmin(b cldf_ops.Bundle, chain evm.Chain, pool report, err := cldf_ops.ExecuteOperation(b, tpOpsV1_6_1.SetRateLimitAdmin, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: poolAddr, + // ChainSelector: chain.Selector, + // Address: poolAddr, Args: newAdmin, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_1/operations/lock_release_token_pool/lock_release_token_pool.go b/chains/evm/deployment/v1_6_1/operations/lock_release_token_pool/lock_release_token_pool.go index 7cff7e9987..2fb2152e99 100644 --- a/chains/evm/deployment/v1_6_1/operations/lock_release_token_pool/lock_release_token_pool.go +++ b/chains/evm/deployment/v1_6_1/operations/lock_release_token_pool/lock_release_token_pool.go @@ -118,7 +118,7 @@ var GetRebalancer = contract.NewRead(contract.ReadParams[struct{}, common.Addres Version: Version, Description: "Calls getRebalancer on the contract", ContractType: ContractType, - NewContract: NewLockReleaseTokenPoolContract, + // NewContract: NewLockReleaseTokenPoolContract, CallContract: func(c *LockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetRebalancer(opts) }, @@ -130,7 +130,7 @@ var SetRebalancer = contract.NewWrite(contract.WriteParams[common.Address, *Lock Description: "Calls setRebalancer on the contract", ContractType: ContractType, ContractABI: LockReleaseTokenPoolABI, - NewContract: NewLockReleaseTokenPoolContract, + // NewContract: NewLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*LockReleaseTokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -148,7 +148,7 @@ var WithdrawLiquidity = contract.NewWrite(contract.WriteParams[*big.Int, *LockRe Description: "Calls withdrawLiquidity on the contract", ContractType: ContractType, ContractABI: LockReleaseTokenPoolABI, - NewContract: NewLockReleaseTokenPoolContract, + // NewContract: NewLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*LockReleaseTokenPoolContract, *big.Int], Validate: func(*big.Int) error { return nil }, CallContract: func( @@ -165,7 +165,7 @@ var GetToken = contract.NewRead(contract.ReadParams[struct{}, common.Address, *L Version: Version, Description: "Calls getToken on the contract", ContractType: ContractType, - NewContract: NewLockReleaseTokenPoolContract, + // NewContract: NewLockReleaseTokenPoolContract, CallContract: func(c *LockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetToken(opts) }, diff --git a/chains/evm/deployment/v1_6_1/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go b/chains/evm/deployment/v1_6_1/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go index 62af448966..c659577ffb 100644 --- a/chains/evm/deployment/v1_6_1/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go +++ b/chains/evm/deployment/v1_6_1/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go @@ -186,7 +186,7 @@ var GetRebalancer = contract.NewRead(contract.ReadParams[struct{}, common.Addres Version: Version, Description: "Calls getRebalancer on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetRebalancer(opts) }, @@ -197,7 +197,7 @@ var GetChainRebalancer = contract.NewRead(contract.ReadParams[uint64, common.Add Version: Version, Description: "Calls getChainRebalancer on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args uint64) (common.Address, error) { return c.GetChainRebalancer(opts, args) }, @@ -208,7 +208,7 @@ var GetSupportedChains = contract.NewRead(contract.ReadParams[struct{}, []uint64 Version: Version, Description: "Calls getSupportedChains on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) ([]uint64, error) { return c.GetSupportedChains(opts) }, @@ -219,7 +219,7 @@ var IsSiloed = contract.NewRead(contract.ReadParams[uint64, bool, *SiloedLockRel Version: Version, Description: "Calls isSiloed on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args uint64) (bool, error) { return c.IsSiloed(opts, args) }, @@ -230,7 +230,7 @@ var GetAvailableTokens = contract.NewRead(contract.ReadParams[uint64, *big.Int, Version: Version, Description: "Calls getAvailableTokens on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args uint64) (*big.Int, error) { return c.GetAvailableTokens(opts, args) }, @@ -241,7 +241,7 @@ var GetUnsiloedLiquidity = contract.NewRead(contract.ReadParams[struct{}, *big.I Version: Version, Description: "Calls getUnsiloedLiquidity on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (*big.Int, error) { return c.GetUnsiloedLiquidity(opts) }, @@ -253,7 +253,7 @@ var SetRebalancer = contract.NewWrite(contract.WriteParams[common.Address, *Silo Description: "Calls setRebalancer on the contract", ContractType: ContractType, ContractABI: SiloedLockReleaseTokenPoolABI, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedLockReleaseTokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -271,7 +271,7 @@ var SetSiloRebalancer = contract.NewWrite(contract.WriteParams[SetSiloRebalancer Description: "Calls setSiloRebalancer on the contract", ContractType: ContractType, ContractABI: SiloedLockReleaseTokenPoolABI, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedLockReleaseTokenPoolContract, SetSiloRebalancerArgs], Validate: func(SetSiloRebalancerArgs) error { return nil }, CallContract: func( @@ -289,7 +289,7 @@ var WithdrawLiquidity = contract.NewWrite(contract.WriteParams[*big.Int, *Siloed Description: "Calls withdrawLiquidity on the contract", ContractType: ContractType, ContractABI: SiloedLockReleaseTokenPoolABI, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedLockReleaseTokenPoolContract, *big.Int], Validate: func(*big.Int) error { return nil }, CallContract: func( @@ -307,7 +307,7 @@ var WithdrawSiloedLiquidity = contract.NewWrite(contract.WriteParams[WithdrawSil Description: "Calls withdrawSiloedLiquidity on the contract", ContractType: ContractType, ContractABI: SiloedLockReleaseTokenPoolABI, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedLockReleaseTokenPoolContract, WithdrawSiloedLiquidityArgs], Validate: func(WithdrawSiloedLiquidityArgs) error { return nil }, CallContract: func( @@ -324,7 +324,7 @@ var GetToken = contract.NewRead(contract.ReadParams[struct{}, common.Address, *S Version: Version, Description: "Calls getToken on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + // NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetToken(opts) }, diff --git a/chains/evm/deployment/v1_6_1/operations/token_pool/token_pool.go b/chains/evm/deployment/v1_6_1/operations/token_pool/token_pool.go index 4abf0c45a9..831995f5b1 100644 --- a/chains/evm/deployment/v1_6_1/operations/token_pool/token_pool.go +++ b/chains/evm/deployment/v1_6_1/operations/token_pool/token_pool.go @@ -276,7 +276,7 @@ var ApplyChainUpdates = contract.NewWrite(contract.WriteParams[ApplyChainUpdates Description: "Calls applyChainUpdates on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, ApplyChainUpdatesArgs], Validate: func(ApplyChainUpdatesArgs) error { return nil }, CallContract: func( @@ -294,7 +294,7 @@ var SetRateLimitAdmin = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Calls setRateLimitAdmin on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -311,7 +311,7 @@ var GetRateLimitAdmin = contract.NewRead(contract.ReadParams[struct{}, common.Ad Version: Version, Description: "Calls getRateLimitAdmin on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetRateLimitAdmin(opts) }, @@ -323,7 +323,7 @@ var TransferOwnership = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Calls transferOwnership on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -341,7 +341,7 @@ var SetChainRateLimiterConfigs = contract.NewWrite(contract.WriteParams[SetChain Description: "Calls setChainRateLimiterConfigs on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, SetChainRateLimiterConfigsArgs], Validate: func(SetChainRateLimiterConfigsArgs) error { return nil }, CallContract: func( @@ -359,7 +359,7 @@ var SetChainRateLimiterConfig = contract.NewWrite(contract.WriteParams[SetChainR Description: "Calls setChainRateLimiterConfig on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, SetChainRateLimiterConfigArgs], Validate: func(SetChainRateLimiterConfigArgs) error { return nil }, CallContract: func( @@ -376,7 +376,7 @@ var GetToken = contract.NewRead(contract.ReadParams[struct{}, common.Address, *T Version: Version, Description: "Calls getToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetToken(opts) }, @@ -387,7 +387,7 @@ var GetTokenDecimals = contract.NewRead(contract.ReadParams[struct{}, uint8, *To Version: Version, Description: "Calls getTokenDecimals on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (uint8, error) { return c.GetTokenDecimals(opts) }, @@ -398,7 +398,7 @@ var IsSupportedToken = contract.NewRead(contract.ReadParams[common.Address, bool Version: Version, Description: "Calls isSupportedToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args common.Address) (bool, error) { return c.IsSupportedToken(opts, args) }, @@ -409,7 +409,7 @@ var GetAllowListEnabled = contract.NewRead(contract.ReadParams[struct{}, bool, * Version: Version, Description: "Calls getAllowListEnabled on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (bool, error) { return c.GetAllowListEnabled(opts) }, @@ -420,7 +420,7 @@ var GetAllowList = contract.NewRead(contract.ReadParams[struct{}, []common.Addre Version: Version, Description: "Calls getAllowList on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllowList(opts) }, @@ -432,7 +432,7 @@ var ApplyAllowListUpdates = contract.NewWrite(contract.WriteParams[ApplyAllowLis Description: "Calls applyAllowListUpdates on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, ApplyAllowListUpdatesArgs], Validate: func(ApplyAllowListUpdatesArgs) error { return nil }, CallContract: func( @@ -449,7 +449,7 @@ var GetRouter = contract.NewRead(contract.ReadParams[struct{}, common.Address, * Version: Version, Description: "Calls getRouter on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetRouter(opts) }, @@ -461,7 +461,7 @@ var SetRouter = contract.NewWrite(contract.WriteParams[common.Address, *TokenPoo Description: "Calls setRouter on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -478,7 +478,7 @@ var GetSupportedChains = contract.NewRead(contract.ReadParams[struct{}, []uint64 Version: Version, Description: "Calls getSupportedChains on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) ([]uint64, error) { return c.GetSupportedChains(opts) }, @@ -489,7 +489,7 @@ var GetRemoteToken = contract.NewRead(contract.ReadParams[uint64, []byte, *Token Version: Version, Description: "Calls getRemoteToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) ([]byte, error) { return c.GetRemoteToken(opts, args) }, @@ -500,7 +500,7 @@ var GetRemotePools = contract.NewRead(contract.ReadParams[uint64, [][]byte, *Tok Version: Version, Description: "Calls getRemotePools on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) ([][]byte, error) { return c.GetRemotePools(opts, args) }, @@ -512,7 +512,7 @@ var AddRemotePool = contract.NewWrite(contract.WriteParams[AddRemotePoolArgs, *T Description: "Calls addRemotePool on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, AddRemotePoolArgs], Validate: func(AddRemotePoolArgs) error { return nil }, CallContract: func( @@ -530,7 +530,7 @@ var RemoveRemotePool = contract.NewWrite(contract.WriteParams[RemoveRemotePoolAr Description: "Calls removeRemotePool on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, RemoveRemotePoolArgs], Validate: func(RemoveRemotePoolArgs) error { return nil }, CallContract: func( @@ -547,7 +547,7 @@ var GetCurrentInboundRateLimiterState = contract.NewRead(contract.ReadParams[uin Version: Version, Description: "Calls getCurrentInboundRateLimiterState on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) (TokenBucket, error) { return c.GetCurrentInboundRateLimiterState(opts, args) }, @@ -558,7 +558,7 @@ var GetCurrentOutboundRateLimiterState = contract.NewRead(contract.ReadParams[ui Version: Version, Description: "Calls getCurrentOutboundRateLimiterState on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + // NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) (TokenBucket, error) { return c.GetCurrentOutboundRateLimiterState(opts, args) }, diff --git a/chains/evm/deployment/v1_6_1/sequences/configure_token_for_transfers.go b/chains/evm/deployment/v1_6_1/sequences/configure_token_for_transfers.go index 2803edf69e..e3229feac2 100644 --- a/chains/evm/deployment/v1_6_1/sequences/configure_token_for_transfers.go +++ b/chains/evm/deployment/v1_6_1/sequences/configure_token_for_transfers.go @@ -31,8 +31,9 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( tokenAddress = common.HexToAddress(input.TokenAddress) } else { tokenAddrReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetToken, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.TokenPoolAddress), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.TokenPoolAddress), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token address from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) @@ -47,9 +48,9 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( // Validate the pool supports the token isSupported, err := cldf_ops.ExecuteOperation(b, token_pool.IsSupportedToken, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddress, - Args: tokenAddress, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddress, + Args: tokenAddress, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to check if token %s is supported by token pool %s on %s: %w", tokenAddress, tokenPoolAddress, chain, err) diff --git a/chains/evm/deployment/v1_6_1/sequences/configure_token_pool.go b/chains/evm/deployment/v1_6_1/sequences/configure_token_pool.go index afa45c27f8..51d444174d 100644 --- a/chains/evm/deployment/v1_6_1/sequences/configure_token_pool.go +++ b/chains/evm/deployment/v1_6_1/sequences/configure_token_pool.go @@ -41,8 +41,9 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // First, check if the allow-list is enabled if len(input.AllowList) != 0 { allowListEnabledReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetAllowListEnabled, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get allow-list status from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) @@ -50,8 +51,9 @@ var ConfigureTokenPool = cldf_ops.NewSequence( if allowListEnabledReport.Output { // Allow-list is enabled, so we first check the current allow-list currentAllowListReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetAllowList, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get current allow-list from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) @@ -61,8 +63,8 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // Apply any updates to the allow-list if they exist if len(adds) != 0 || len(removes) != 0 { applyAllowListUpdatesReport, err := cldf_ops.ExecuteOperation(b, token_pool.ApplyAllowListUpdates, chain, evm_contract.FunctionInput[token_pool.ApplyAllowListUpdatesArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.ApplyAllowListUpdatesArgs{ Adds: adds, Removes: removes, @@ -79,16 +81,17 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // Set router if necessary if input.RouterAddress != (common.Address{}) { currentRouterReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRouter, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get current router from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) } if currentRouterReport.Output != input.RouterAddress { setRouterReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetRouter, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: input.RouterAddress, }) if err != nil { @@ -101,16 +104,17 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // Set rate limit admin if necessary if input.RateLimitAdmin != (common.Address{}) { currentRateLimitAdminReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRateLimitAdmin, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get current rate limit admin from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) } if currentRateLimitAdminReport.Output != input.RateLimitAdmin { setRateLimitAdminReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetRateLimitAdmin, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: input.RateLimitAdmin, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_1/sequences/configure_token_pool_for_remote_chain.go b/chains/evm/deployment/v1_6_1/sequences/configure_token_pool_for_remote_chain.go index 5755920352..ada53769b5 100644 --- a/chains/evm/deployment/v1_6_1/sequences/configure_token_pool_for_remote_chain.go +++ b/chains/evm/deployment/v1_6_1/sequences/configure_token_pool_for_remote_chain.go @@ -50,16 +50,18 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // Get remote chains that are currently supported by the token pools supportedChainsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetSupportedChains, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get supported chains: %w", err) } localDecimalsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetTokenDecimals, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token decimals: %w", err) @@ -82,8 +84,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( if slices.Contains(supportedChainsReport.Output, input.RemoteChainSelector) { // Check existing remote token getRemoteTokenReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRemoteToken, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: input.RemoteChainSelector, }) if err != nil { @@ -107,8 +109,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // Check existing remote pools getRemotePoolsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRemotePools, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: input.RemoteChainSelector, }) if err != nil { @@ -119,8 +121,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( }) { // Add the requested remote pool addRemotePoolsReport, err := cldf_ops.ExecuteOperation(b, token_pool.AddRemotePool, chain, evm_contract.FunctionInput[token_pool.AddRemotePoolArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.AddRemotePoolArgs{ RemoteChainSelector: input.RemoteChainSelector, RemotePoolAddress: common.LeftPadBytes(input.RemoteChainConfig.RemotePool, 32), @@ -144,8 +146,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // If the chain is not supported, apply the config for the remote chain applyChainUpdatesReport, err := cldf_ops.ExecuteOperation(b, token_pool.ApplyChainUpdates, chain, evm_contract.FunctionInput[token_pool.ApplyChainUpdatesArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.ApplyChainUpdatesArgs{ RemoteChainSelectorsToRemove: removes, ChainsToAdd: []token_pool.ChainUpdate{ @@ -194,8 +196,8 @@ func maybeUpdateRateLimiters( outboundConfig tokens.RateLimiterConfig, ) (output evm_contract.WriteOutput, err error) { inboundRateLimiterStateReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetCurrentInboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: tokenPoolAddress, + // ChainSelector: chainSelector, + // Address: tokenPoolAddress, Args: remoteChainSelector, }) if err != nil { @@ -204,8 +206,8 @@ func maybeUpdateRateLimiters( currentInboundRateLimiterState := inboundRateLimiterStateReport.Output outboundRateLimiterStateReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetCurrentOutboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: tokenPoolAddress, + // ChainSelector: chainSelector, + // Address: tokenPoolAddress, Args: remoteChainSelector, }) if err != nil { @@ -217,8 +219,8 @@ func maybeUpdateRateLimiters( if !rateLimiterConfigsEqual(currentInboundRateLimiterState, inboundConfig) || !rateLimiterConfigsEqual(currentOutboundRateLimiterState, outboundConfig) { setInboundRateLimiterReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetChainRateLimiterConfig, chain, evm_contract.FunctionInput[token_pool.SetChainRateLimiterConfigArgs]{ - ChainSelector: chainSelector, - Address: tokenPoolAddress, + // ChainSelector: chainSelector, + // Address: tokenPoolAddress, Args: token_pool.SetChainRateLimiterConfigArgs{ RemoteChainSelector: remoteChainSelector, InboundConfig: token_pool.Config{ diff --git a/chains/evm/deployment/v1_6_1/sequences/deploy_burn_mint_token_pool.go b/chains/evm/deployment/v1_6_1/sequences/deploy_burn_mint_token_pool.go index 87d780ddc1..f3a865d7b8 100644 --- a/chains/evm/deployment/v1_6_1/sequences/deploy_burn_mint_token_pool.go +++ b/chains/evm/deployment/v1_6_1/sequences/deploy_burn_mint_token_pool.go @@ -28,8 +28,8 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( *input.TokenPoolVersion, ) tpDeployReport, err := cldf_ops.ExecuteOperation(b, burn_mint_token_pool.Deploy, chain, evm_contract.DeployInput[burn_mint_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSel, - TypeAndVersion: typeAndVersion, + // ChainSelector: input.ChainSel, + // TypeAndVersion: typeAndVersion, Args: burn_mint_token_pool.ConstructorArgs{ Token: input.ConstructorArgs.Token, LocalTokenDecimals: input.ConstructorArgs.Decimals, diff --git a/chains/evm/deployment/v1_6_1/sequences/deploy_non_canonical_usdc.go b/chains/evm/deployment/v1_6_1/sequences/deploy_non_canonical_usdc.go index 174156d64e..10aac99dbc 100644 --- a/chains/evm/deployment/v1_6_1/sequences/deploy_non_canonical_usdc.go +++ b/chains/evm/deployment/v1_6_1/sequences/deploy_non_canonical_usdc.go @@ -66,7 +66,7 @@ var DeployNonCanonicalUSDC = cldf_ops.NewSequence( } else { burnMintWithLockReleaseFlagTokenPoolReport, err := cldf_ops.ExecuteOperation(b, burn_mint_with_lock_release_flag_token_pool.Deploy, chain, contract_utils.DeployInput[burn_mint_with_lock_release_flag_token_pool.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_with_lock_release_flag_token_pool.ContractType, *burn_mint_with_lock_release_flag_token_pool.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: burn_mint_with_lock_release_flag_token_pool.ConstructorArgs{ Token: usdcTokenAddress, LocalTokenDecimals: input.TokenDecimals, diff --git a/chains/evm/deployment/v1_6_1/sequences/deploy_token_and_pool.go b/chains/evm/deployment/v1_6_1/sequences/deploy_token_and_pool.go index 167cc33011..e14ddf9262 100644 --- a/chains/evm/deployment/v1_6_1/sequences/deploy_token_and_pool.go +++ b/chains/evm/deployment/v1_6_1/sequences/deploy_token_and_pool.go @@ -40,7 +40,7 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Deploy burn mint token. deployTokenReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.Deploy, chain, evm_contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, + // ChainSelector: input.DeployTokenPoolInput.ChainSel, TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *burn_mint_erc20_with_drip.Version), Args: burn_mint_erc20_with_drip.ConstructorArgs{ Name: input.DeployTokenPoolInput.TokenSymbol, @@ -79,8 +79,8 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Grant mint and burn roles to the token pool. grantRolesReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.GrantMintAndBurnRoles, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, - Address: common.HexToAddress(deployTokenReport.Output.Address), + // ChainSelector: input.DeployTokenPoolInput.ChainSel, + // Address: common.HexToAddress(deployTokenReport.Output.Address), Args: tokenPoolAddress, }) if err != nil { @@ -90,8 +90,8 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Grant roles to the deployer key so we can mint initial supply. grantMintReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.GrantMintAndBurnRoles, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, - Address: common.HexToAddress(deployTokenReport.Output.Address), + // ChainSelector: input.DeployTokenPoolInput.ChainSel, + // Address: common.HexToAddress(deployTokenReport.Output.Address), Args: chain.DeployerKey.From, }) if err != nil { @@ -102,8 +102,8 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Mint initial supply to each account. for account, amount := range input.Accounts { mintReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.Mint, chain, evm_contract.FunctionInput[burn_mint_erc20_with_drip.MintArgs]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, - Address: common.HexToAddress(deployTokenReport.Output.Address), + // ChainSelector: input.DeployTokenPoolInput.ChainSel, + // Address: common.HexToAddress(deployTokenReport.Output.Address), Args: burn_mint_erc20_with_drip.MintArgs{ Account: account, Amount: amount, @@ -117,8 +117,8 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Revoke mint role from the deployer key for safety. revokeMintReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.RevokeMintRole, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, - Address: common.HexToAddress(deployTokenReport.Output.Address), + // ChainSelector: input.DeployTokenPoolInput.ChainSel, + // Address: common.HexToAddress(deployTokenReport.Output.Address), Args: chain.DeployerKey.From, }) if err != nil { @@ -128,8 +128,8 @@ var DeployTokenAndPool = cldf_ops.NewSequence( // Revoke burn role from the deployer key for safety. revokeBurnReport, err := cldf_ops.ExecuteOperation(b, burn_mint_erc20_with_drip.RevokeBurnRole, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.DeployTokenPoolInput.ChainSel, - Address: common.HexToAddress(deployTokenReport.Output.Address), + // ChainSelector: input.DeployTokenPoolInput.ChainSel, + // Address: common.HexToAddress(deployTokenReport.Output.Address), Args: chain.DeployerKey.From, }) if err != nil { diff --git a/chains/evm/deployment/v1_6_1/sequences/non_canonical_usdc_test.go b/chains/evm/deployment/v1_6_1/sequences/non_canonical_usdc_test.go index 3636c11761..bc88c86b88 100644 --- a/chains/evm/deployment/v1_6_1/sequences/non_canonical_usdc_test.go +++ b/chains/evm/deployment/v1_6_1/sequences/non_canonical_usdc_test.go @@ -49,7 +49,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c // Deploy RMN Proxy (use deployer as RMN for test) rmnProxyRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, rmn_proxy.Deploy, chain, contract_utils.DeployInput[rmn_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_proxy.ContractType, *rmn_proxy.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: rmn_proxy.ConstructorArgs{RMN: chain.DeployerKey.From}, }, nil) require.NoError(t, err, "Failed to deploy RMN proxy") @@ -58,7 +58,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c // Deploy Router (WrappedNative = zero for test) routerRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, router.Deploy, chain, contract_utils.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.ContractType, *router.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: router.ConstructorArgs{ WrappedNative: common.Address{}, RMNProxy: rmnAddr, @@ -70,7 +70,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c // Deploy TokenAdminRegistry tarRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, tar_ops.Deploy, chain, contract_utils.DeployInput[tar_ops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(tar_ops.ContractType, *tar_ops.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: tar_ops.ConstructorArgs{}, }, nil) require.NoError(t, err, "Failed to deploy TokenAdminRegistry") diff --git a/chains/evm/deployment/v1_6_1/sequences/token_pool/configure_token_pool_for_remote_chains.go b/chains/evm/deployment/v1_6_1/sequences/token_pool/configure_token_pool_for_remote_chains.go index aec6c6ae72..c585f775a4 100644 --- a/chains/evm/deployment/v1_6_1/sequences/token_pool/configure_token_pool_for_remote_chains.go +++ b/chains/evm/deployment/v1_6_1/sequences/token_pool/configure_token_pool_for_remote_chains.go @@ -180,8 +180,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // If either rate limiter config is different, then update it if !isOutboundEqual || !isInboundEqual { report, err := cldf_ops.ExecuteOperation(b, tpops.SetChainRateLimiterConfig, chain, contract.FunctionInput[tpops.SetChainRateLimiterConfigArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.SetChainRateLimiterConfigArgs{ OutboundConfig: tpops.Config{IsEnabled: inputORL.IsEnabled, Capacity: inputORL.Capacity, Rate: inputORL.Rate}, InboundConfig: tpops.Config{IsEnabled: inputIRL.IsEnabled, Capacity: inputIRL.Capacity, Rate: inputIRL.Rate}, @@ -197,8 +197,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // If the remote token pool is not registered, then add it if !hasRemoteTP { report, err := cldf_ops.ExecuteOperation(b, tpops.AddRemotePool, chain, contract.FunctionInput[tpops.AddRemotePoolArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.AddRemotePoolArgs{ RemoteChainSelector: remoteCS, RemotePoolAddress: remoteTP, @@ -228,8 +228,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( if len(reportWrites) == 0 { paddedRemoteTokenPoolAddress := common.LeftPadBytes(input.RemoteChainConfig.RemotePool, 32) applyChainUpdatesInput := contract.FunctionInput[tpops.ApplyChainUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: input.TokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: input.TokenPoolAddress, Args: tpops.ApplyChainUpdatesArgs{ RemoteChainSelectorsToRemove: remotesToDel, ChainsToAdd: []tpops.ChainUpdate{ diff --git a/chains/evm/deployment/v1_6_2/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go b/chains/evm/deployment/v1_6_2/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go index 7ce52e06d2..106515c14d 100644 --- a/chains/evm/deployment/v1_6_2/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go +++ b/chains/evm/deployment/v1_6_2/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go @@ -94,7 +94,7 @@ var ConfigureAllowedCallers = contract.NewWrite(contract.WriteParams[[]AllowedCa Description: "Calls configureAllowedCallers on the contract", ContractType: ContractType, ContractABI: CCTPMessageTransmitterProxyABI, - NewContract: NewCCTPMessageTransmitterProxyContract, + // NewContract: NewCCTPMessageTransmitterProxyContract, IsAllowedCaller: contract.OnlyOwner[*CCTPMessageTransmitterProxyContract, []AllowedCallerConfigArgs], Validate: func([]AllowedCallerConfigArgs) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v1_6_2/operations/hybrid_lock_release_usdc_token_pool/hybrid_lock_release_usdc_token_pool.go b/chains/evm/deployment/v1_6_2/operations/hybrid_lock_release_usdc_token_pool/hybrid_lock_release_usdc_token_pool.go index b4f5bc6208..e649088057 100644 --- a/chains/evm/deployment/v1_6_2/operations/hybrid_lock_release_usdc_token_pool/hybrid_lock_release_usdc_token_pool.go +++ b/chains/evm/deployment/v1_6_2/operations/hybrid_lock_release_usdc_token_pool/hybrid_lock_release_usdc_token_pool.go @@ -28,7 +28,7 @@ var GetLockedTokensForChain = contract.NewRead(contract.ReadParams[uint64, *big. Version: Version, Description: "Gets locked token balance for a remote chain selector", ContractType: ContractType, - NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, + // NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, CallContract: func(pool *hybrid_lock_release_usdc_token_pool.HybridLockReleaseUSDCTokenPool, opts *bind.CallOpts, remoteChainSelector uint64) (*big.Int, error) { return pool.GetLockedTokensForChain(opts, remoteChainSelector) }, @@ -39,7 +39,7 @@ var GetLiquidityProvider = contract.NewRead(contract.ReadParams[uint64, common.A Version: Version, Description: "Gets the liquidity provider for a remote chain selector", ContractType: ContractType, - NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, + // NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, CallContract: func(pool *hybrid_lock_release_usdc_token_pool.HybridLockReleaseUSDCTokenPool, opts *bind.CallOpts, remoteChainSelector uint64) (common.Address, error) { return pool.GetLiquidityProvider(opts, remoteChainSelector) }, @@ -50,7 +50,7 @@ var ShouldUseLockRelease = contract.NewRead(contract.ReadParams[uint64, bool, *h Version: Version, Description: "Returns whether a remote chain selector should use lock-release", ContractType: ContractType, - NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, + // NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, CallContract: func(pool *hybrid_lock_release_usdc_token_pool.HybridLockReleaseUSDCTokenPool, opts *bind.CallOpts, remoteChainSelector uint64) (bool, error) { return pool.ShouldUseLockRelease(opts, remoteChainSelector) }, @@ -62,7 +62,7 @@ var WithdrawLiquidity = contract.NewWrite(contract.WriteParams[WithdrawLiquidity Description: "Withdraws liquidity for a remote chain selector", ContractType: ContractType, ContractABI: hybrid_lock_release_usdc_token_pool.HybridLockReleaseUSDCTokenPoolABI, - NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, + // NewContract: hybrid_lock_release_usdc_token_pool.NewHybridLockReleaseUSDCTokenPool, IsAllowedCaller: contract.OnlyOwner[*hybrid_lock_release_usdc_token_pool.HybridLockReleaseUSDCTokenPool, WithdrawLiquidityArgs], Validate: func(args WithdrawLiquidityArgs) error { if args.Amount == nil || args.Amount.Sign() <= 0 { diff --git a/chains/evm/deployment/v1_6_3/operations/fee_quoter/fee_quoter.go b/chains/evm/deployment/v1_6_3/operations/fee_quoter/fee_quoter.go index ce93ce5cd4..fc152aeac8 100644 --- a/chains/evm/deployment/v1_6_3/operations/fee_quoter/fee_quoter.go +++ b/chains/evm/deployment/v1_6_3/operations/fee_quoter/fee_quoter.go @@ -287,7 +287,7 @@ var ApplyDestChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]DestC Description: "Calls applyDestChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, []DestChainConfigArgs], Validate: func([]DestChainConfigArgs) error { return nil }, CallContract: func( @@ -305,7 +305,7 @@ var UpdatePrices = contract.NewWrite(contract.WriteParams[PriceUpdates, *FeeQuot Description: "Calls updatePrices on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, PriceUpdates], Validate: func(PriceUpdates) error { return nil }, CallContract: func( @@ -323,7 +323,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -341,7 +341,7 @@ var ApplyTokenTransferFeeConfigUpdates = contract.NewWrite(contract.WriteParams[ Description: "Calls applyTokenTransferFeeConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, ApplyTokenTransferFeeConfigUpdatesArgs], Validate: func(ApplyTokenTransferFeeConfigUpdatesArgs) error { return nil }, CallContract: func( @@ -358,7 +358,7 @@ var GetDestChainConfig = contract.NewRead(contract.ReadParams[uint64, DestChainC Version: Version, Description: "Calls getDestChainConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (DestChainConfig, error) { return c.GetDestChainConfig(opts, args) }, @@ -369,7 +369,7 @@ var GetTokenTransferFeeConfig = contract.NewRead(contract.ReadParams[GetTokenTra Version: Version, Description: "Calls getTokenTransferFeeConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args GetTokenTransferFeeConfigArgs) (TokenTransferFeeConfig, error) { return c.GetTokenTransferFeeConfig(opts, args.DestChainSelector, args.Token) }, @@ -380,7 +380,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -391,7 +391,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, @@ -402,7 +402,7 @@ var GetTokenPrices = contract.NewRead(contract.ReadParams[[]common.Address, []Ti Version: Version, Description: "Calls getTokenPrices on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args []common.Address) ([]TimestampedPackedUint224, error) { return c.GetTokenPrices(opts, args) }, @@ -413,7 +413,7 @@ var GetDestinationChainGasPrice = contract.NewRead(contract.ReadParams[uint64, T Version: Version, Description: "Calls getDestinationChainGasPrice on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (TimestampedPackedUint224, error) { return c.GetDestinationChainGasPrice(opts, args) }, @@ -424,7 +424,7 @@ var GetFeeTokens = contract.NewRead(contract.ReadParams[struct{}, []common.Addre Version: Version, Description: "Calls getFeeTokens on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + // NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetFeeTokens(opts) }, diff --git a/chains/evm/deployment/v1_6_5/operations/usdc_token_pool/usdc_token_pool.go b/chains/evm/deployment/v1_6_5/operations/usdc_token_pool/usdc_token_pool.go index d3be2241ba..9860d590a3 100644 --- a/chains/evm/deployment/v1_6_5/operations/usdc_token_pool/usdc_token_pool.go +++ b/chains/evm/deployment/v1_6_5/operations/usdc_token_pool/usdc_token_pool.go @@ -176,7 +176,7 @@ var SetDomains = contract.NewWrite(contract.WriteParams[[]DomainUpdate, *USDCTok Description: "Calls setDomains on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, []DomainUpdate], Validate: func([]DomainUpdate) error { return nil }, CallContract: func( @@ -193,7 +193,7 @@ var GetDomain = contract.NewRead(contract.ReadParams[uint64, Domain, *USDCTokenP Version: Version, Description: "Calls getDomain on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, CallContract: func(c *USDCTokenPoolContract, opts *bind.CallOpts, args uint64) (Domain, error) { return c.GetDomain(opts, args) }, @@ -205,7 +205,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -223,7 +223,7 @@ var ApplyChainUpdates = contract.NewWrite(contract.WriteParams[ApplyChainUpdates Description: "Calls applyChainUpdates on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, ApplyChainUpdatesArgs], Validate: func(ApplyChainUpdatesArgs) error { return nil }, CallContract: func( @@ -241,7 +241,7 @@ var AddRemotePool = contract.NewWrite(contract.WriteParams[AddRemotePoolArgs, *U Description: "Calls addRemotePool on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, AddRemotePoolArgs], Validate: func(AddRemotePoolArgs) error { return nil }, CallContract: func( @@ -259,7 +259,7 @@ var RemoveRemotePool = contract.NewWrite(contract.WriteParams[RemoveRemotePoolAr Description: "Calls removeRemotePool on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, RemoveRemotePoolArgs], Validate: func(RemoveRemotePoolArgs) error { return nil }, CallContract: func( @@ -277,7 +277,7 @@ var TransferOwnership = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Calls transferOwnership on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolABI, - NewContract: NewUSDCTokenPoolContract, + // NewContract: NewUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v1_6_5/operations/usdc_token_pool_cctp_v2/usdc_token_pool_cctp_v2.go b/chains/evm/deployment/v1_6_5/operations/usdc_token_pool_cctp_v2/usdc_token_pool_cctp_v2.go index dc1fb1cede..da368b8ef3 100644 --- a/chains/evm/deployment/v1_6_5/operations/usdc_token_pool_cctp_v2/usdc_token_pool_cctp_v2.go +++ b/chains/evm/deployment/v1_6_5/operations/usdc_token_pool_cctp_v2/usdc_token_pool_cctp_v2.go @@ -215,7 +215,7 @@ var SetDomains = contract.NewWrite(contract.WriteParams[[]DomainUpdate, *USDCTok Description: "Calls setDomains on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, []DomainUpdate], Validate: func([]DomainUpdate) error { return nil }, CallContract: func( @@ -232,7 +232,7 @@ var GetDomain = contract.NewRead(contract.ReadParams[uint64, Domain, *USDCTokenP Version: Version, Description: "Calls getDomain on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, CallContract: func(c *USDCTokenPoolCCTPV2Contract, opts *bind.CallOpts, args uint64) (Domain, error) { return c.GetDomain(opts, args) }, @@ -244,7 +244,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -262,7 +262,7 @@ var ApplyChainUpdates = contract.NewWrite(contract.WriteParams[ApplyChainUpdates Description: "Calls applyChainUpdates on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, ApplyChainUpdatesArgs], Validate: func(ApplyChainUpdatesArgs) error { return nil }, CallContract: func( @@ -280,7 +280,7 @@ var AddRemotePool = contract.NewWrite(contract.WriteParams[AddRemotePoolArgs, *U Description: "Calls addRemotePool on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, AddRemotePoolArgs], Validate: func(AddRemotePoolArgs) error { return nil }, CallContract: func( @@ -298,7 +298,7 @@ var RemoveRemotePool = contract.NewWrite(contract.WriteParams[RemoveRemotePoolAr Description: "Calls removeRemotePool on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, RemoveRemotePoolArgs], Validate: func(RemoveRemotePoolArgs) error { return nil }, CallContract: func( @@ -316,7 +316,7 @@ var TransferOwnership = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Calls transferOwnership on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolCCTPV2ABI, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolCCTPV2Contract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -333,7 +333,7 @@ var GetSupportedChains = contract.NewRead(contract.ReadParams[struct{}, []uint64 Version: Version, Description: "Calls getSupportedChains on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, CallContract: func(c *USDCTokenPoolCCTPV2Contract, opts *bind.CallOpts, args struct{}) ([]uint64, error) { return c.GetSupportedChains(opts) }, @@ -344,7 +344,7 @@ var GetRemoteToken = contract.NewRead(contract.ReadParams[uint64, []byte, *USDCT Version: Version, Description: "Calls getRemoteToken on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, CallContract: func(c *USDCTokenPoolCCTPV2Contract, opts *bind.CallOpts, args uint64) ([]byte, error) { return c.GetRemoteToken(opts, args) }, @@ -355,7 +355,7 @@ var GetRemotePools = contract.NewRead(contract.ReadParams[uint64, [][]byte, *USD Version: Version, Description: "Calls getRemotePools on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, CallContract: func(c *USDCTokenPoolCCTPV2Contract, opts *bind.CallOpts, args uint64) ([][]byte, error) { return c.GetRemotePools(opts, args) }, @@ -366,7 +366,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolCCTPV2Contract, + // NewContract: NewUSDCTokenPoolCCTPV2Contract, CallContract: func(c *USDCTokenPoolCCTPV2Contract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, diff --git a/chains/evm/deployment/v2_0_0/adapters/cctp_chain_test.go b/chains/evm/deployment/v2_0_0/adapters/cctp_chain_test.go index af1c323377..3e36210030 100644 --- a/chains/evm/deployment/v2_0_0/adapters/cctp_chain_test.go +++ b/chains/evm/deployment/v2_0_0/adapters/cctp_chain_test.go @@ -86,7 +86,7 @@ func setupCCTPTestEnvironment(t *testing.T, e *deployment.Environment, chainSele // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{chain.DeployerKey.From}, }, @@ -204,7 +204,7 @@ func setupCCTPTestEnvironment(t *testing.T, e *deployment.Environment, chainSele cctp_message_transmitter_proxy_v1_6_2.ContractType, *cctp_message_transmitter_proxy_v1_6_2.Version, ), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: cctp_message_transmitter_proxy_v1_6_2.ConstructorArgs{ TokenMessenger: tokenMessengerV1Addr, }, @@ -243,7 +243,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c rmnProxyRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, rmn_proxy.Deploy, chain, contract_utils.DeployInput[rmn_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_proxy.ContractType, *rmn_proxy.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: rmn_proxy.ConstructorArgs{RMN: chain.DeployerKey.From}, }, nil) require.NoError(t, err, "Failed to deploy RMN proxy") @@ -251,7 +251,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c routerRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, router.Deploy, chain, contract_utils.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.ContractType, *router.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: router.ConstructorArgs{ WrappedNative: common.Address{}, RMNProxy: rmnAddr, @@ -262,7 +262,7 @@ func setupNonCanonicalTestEnvironment(t *testing.T, e *deployment.Environment, c tarRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, token_admin_registry.Deploy, chain, contract_utils.DeployInput[token_admin_registry.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(token_admin_registry.ContractType, *token_admin_registry.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: token_admin_registry.ConstructorArgs{}, }, nil) require.NoError(t, err, "Failed to deploy TokenAdminRegistry") @@ -381,7 +381,7 @@ func TestCCTPChainAdapter_HomeToNonHomeChain(t *testing.T) { // Get CREATE2Factory addresses for both chains homeCreate2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, homeChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: homeChainSelector, + // ChainSelector: homeChainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{homeChain.DeployerKey.From}, }, @@ -390,7 +390,7 @@ func TestCCTPChainAdapter_HomeToNonHomeChain(t *testing.T) { nonHomeCreate2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, nonHomeChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: nonHomeChainSelector, + // ChainSelector: nonHomeChainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{nonHomeChain.DeployerKey.From}, }, @@ -538,8 +538,8 @@ func TestCCTPChainAdapter_HomeToNonHomeChain(t *testing.T) { token_admin_registry.GetTokenConfig, homeChain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: homeChainSelector, - Address: homeSetup.TokenAdminRegistry, + // ChainSelector: homeChainSelector, + // Address: homeSetup.TokenAdminRegistry, Args: homeSetup.USDCToken, }, ) @@ -714,8 +714,8 @@ func TestCCTPChainAdapter_HomeToNonHomeChain(t *testing.T) { token_admin_registry.GetTokenConfig, nonHomeChain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: nonHomeChainSelector, - Address: nonHomeSetup.TokenAdminRegistry, + // ChainSelector: nonHomeChainSelector, + // Address: nonHomeSetup.TokenAdminRegistry, Args: nonHomeSetup.USDCToken, }, ) @@ -978,8 +978,8 @@ func TestCCTPChainAdapter_CanonicalToNonCanonicalChain(t *testing.T) { token_admin_registry.GetTokenConfig, canonicalChain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: canonicalChainSelector, - Address: canonicalSetup.TokenAdminRegistry, + // ChainSelector: canonicalChainSelector, + // Address: canonicalSetup.TokenAdminRegistry, Args: canonicalSetup.USDCToken, }, ) @@ -1000,8 +1000,8 @@ func TestCCTPChainAdapter_CanonicalToNonCanonicalChain(t *testing.T) { token_admin_registry.GetTokenConfig, nonCanonicalChain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: nonCanonicalChainSelector, - Address: nonCanonicalSetup.TokenAdminRegistry, + // ChainSelector: nonCanonicalChainSelector, + // Address: nonCanonicalSetup.TokenAdminRegistry, Args: nonCanonicalSetup.USDCToken, }, ) diff --git a/chains/evm/deployment/v2_0_0/adapters/chain_family_test.go b/chains/evm/deployment/v2_0_0/adapters/chain_family_test.go index 879fbe6e5f..bf22b067ae 100644 --- a/chains/evm/deployment/v2_0_0/adapters/chain_family_test.go +++ b/chains/evm/deployment/v2_0_0/adapters/chain_family_test.go @@ -97,7 +97,7 @@ func TestChainFamilyAdapter(t *testing.T) { for _, chainSel := range []uint64{chainA, chainB} { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/adapters/deploy_chain_contracts_adapter.go b/chains/evm/deployment/v2_0_0/adapters/deploy_chain_contracts_adapter.go index 5f135747d7..1afbebbd78 100644 --- a/chains/evm/deployment/v2_0_0/adapters/deploy_chain_contracts_adapter.go +++ b/chains/evm/deployment/v2_0_0/adapters/deploy_chain_contracts_adapter.go @@ -181,8 +181,8 @@ func importConfigFromv1_6_0(b cldf_ops.Bundle, chain evm.Chain, input ccvadapter } // directly fetch offRamp static config offRampCfg16Rep, err := cldf_ops.ExecuteOperation(b, offrampops_v160.GetStaticConfig, chain, upstream.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(offRampAddr.Address), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(offRampAddr.Address), Args: struct{}{}, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/adapters/fee_aggregator.go b/chains/evm/deployment/v2_0_0/adapters/fee_aggregator.go index 9fbd0600f1..b98bf44e74 100644 --- a/chains/evm/deployment/v2_0_0/adapters/fee_aggregator.go +++ b/chains/evm/deployment/v2_0_0/adapters/fee_aggregator.go @@ -12,11 +12,11 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" "github.com/smartcontractkit/chainlink-deployments-framework/operations" + "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract" executorops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/executor" onrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/onramp" proxyops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/proxy" usdcproxyops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/usdc_token_pool_proxy" - "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract" "github.com/smartcontractkit/chainlink-ccip/deployment/fees" datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore" "github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences" @@ -185,9 +185,9 @@ func setFeeAggregatorDirect( report, err := operations.ExecuteOperation( b, op, chain, contract.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: addr, - Args: newFeeAggregator, + // ChainSelector: chain.Selector, + // Address: addr, + Args: newFeeAggregator, }, ) if err != nil { @@ -205,8 +205,8 @@ func setFeeAggregatorViaOnRampDynamicConfig( readReport, err := operations.ExecuteOperation( b, onrampops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: addr, + // ChainSelector: chain.Selector, + // Address: addr, }, ) if err != nil { @@ -219,9 +219,9 @@ func setFeeAggregatorViaOnRampDynamicConfig( writeReport, err := operations.ExecuteOperation( b, onrampops.SetDynamicConfig, chain, contract.FunctionInput[onrampops.DynamicConfig]{ - ChainSelector: chain.Selector, - Address: addr, - Args: cfg, + // ChainSelector: chain.Selector, + // Address: addr, + Args: cfg, }, ) if err != nil { @@ -239,8 +239,9 @@ func setFeeAggregatorViaExecutorDynamicConfig( readReport, err := operations.ExecuteOperation( b, executorops.GetDynamicConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: addr, + // ChainSelector: chain.Selector, + // Address: addr, + Args: struct{}{}, }, ) if err != nil { @@ -253,8 +254,8 @@ func setFeeAggregatorViaExecutorDynamicConfig( writeReport, err := operations.ExecuteOperation( b, executorops.SetDynamicConfig, chain, contract.FunctionInput[executorops.DynamicConfig]{ - ChainSelector: chain.Selector, - Address: addr, + // ChainSelector: chain.Selector, + // Address: addr, Args: cfg, }, ) diff --git a/chains/evm/deployment/v2_0_0/adapters/fees.go b/chains/evm/deployment/v2_0_0/adapters/fees.go index df0d56e557..92a667d300 100644 --- a/chains/evm/deployment/v2_0_0/adapters/fees.go +++ b/chains/evm/deployment/v2_0_0/adapters/fees.go @@ -228,11 +228,11 @@ func (a *FeesAdapter) ApplyDestChainConfigUpdates(e cldf.Environment) *operation return result, fmt.Errorf("chain with selector %d not defined", input.Selector) } - fqRef, err := a.GetFeeContractRef(e, input.Selector, 0) - if err != nil { - return result, fmt.Errorf("failed to get FeeQuoter address for chain %d: %w", input.Selector, err) - } - fqAddr := common.HexToAddress(fqRef.Address) + // fqRef, err := a.GetFeeContractRef(e, input.Selector, 0) + // if err != nil { + // return result, fmt.Errorf("failed to get FeeQuoter address for chain %d: %w", input.Selector, err) + // } + // fqAddr := common.HexToAddress(fqRef.Address) args := make([]fqops.DestChainConfigArgs, 0, len(input.Settings)) for dst, cfg := range input.Settings { @@ -245,8 +245,8 @@ func (a *FeesAdapter) ApplyDestChainConfigUpdates(e cldf.Environment) *operation report, err := operations.ExecuteOperation( b, fqops.ApplyDestChainConfigUpdates, evmChain, contract.FunctionInput[[]fqops.DestChainConfigArgs]{ - ChainSelector: evmChain.Selector, - Address: fqAddr, + // ChainSelector: evmChain.Selector, + // Address: fqAddr, Args: args, }, ) diff --git a/chains/evm/deployment/v2_0_0/adapters/lanemigrator.go b/chains/evm/deployment/v2_0_0/adapters/lanemigrator.go index 297d9ff6dc..7c5ad23f2e 100644 --- a/chains/evm/deployment/v2_0_0/adapters/lanemigrator.go +++ b/chains/evm/deployment/v2_0_0/adapters/lanemigrator.go @@ -148,20 +148,20 @@ func verifyAllContractsPresent(e deployment.Environment, chainSelector uint64, s // This ensures that the existing lanes are using the expected versions of contracts before we attempt to update them to use the prod Router. func verifyExistingLaneVersion(e deployment.Environment, evmChain evm.Chain, chainSelector uint64, remoteChains []uint64) error { // fetch router address from datastore - routerRef, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{ - ChainSelector: chainSelector, - Type: datastore.ContractType(routerops.ContractType), - Version: routerops.Version, - }, chainSelector, evm_datastore_utils.ToEVMAddress) - if err != nil { - return fmt.Errorf("error fetching router address ref for chain %d: %w", chainSelector, err) - } + // routerRef, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{ + // ChainSelector: chainSelector, + // Type: datastore.ContractType(routerops.ContractType), + // Version: routerops.Version, + // }, chainSelector, evm_datastore_utils.ToEVMAddress) + // if err != nil { + // return fmt.Errorf("error fetching router address ref for chain %d: %w", chainSelector, err) + // } // get onRamp for remote chains for _, remoteChainSelector := range remoteChains { onRampOnRouterOut, err := cldf_ops.ExecuteOperation(e.OperationsBundle, routerops.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: routerRef, + // ChainSelector: chainSelector, + // Address: routerRef, Args: remoteChainSelector, }) if err != nil { @@ -187,8 +187,9 @@ func verifyExistingLaneVersion(e deployment.Environment, evmChain evm.Chain, cha // get the fee quoter from onRamp feeQuoterOut, err := cldf_ops.ExecuteOperation(e.OperationsBundle, onrampops_v160.GetDynamicConfig, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: onRampOnRouterOut.Output, + // ChainSelector: chainSelector, + // Address: onRampOnRouterOut.Output, + Args: struct{}{}, }) if err != nil { return fmt.Errorf("error fetching fee quoter from onRamp for chain %d and remote chain %d: %w", chainSelector, remoteChainSelector, err) @@ -283,32 +284,32 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU } tempDS := ds.Seal() // fetch onRamp and offRamp from the existing addresses - onRampAddr, err := datastore_utils.FindAndFormatRef( - tempDS, - datastore.AddressRef{ - ChainSelector: input.ChainSelector, - Type: datastore.ContractType(onrampops.ContractType), - Version: onrampops.Version, - }, - input.ChainSelector, - evm_datastore_utils.ToEVMAddress, - ) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("error finding onRamp address ref: %w", err) - } - offRampAddr, err := datastore_utils.FindAndFormatRef( - tempDS, - datastore.AddressRef{ - ChainSelector: input.ChainSelector, - Type: datastore.ContractType(offrampops.ContractType), - Version: offrampops.Version, - }, - input.ChainSelector, - evm_datastore_utils.ToEVMAddress, - ) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("error finding offRamp address ref: %w", err) - } + // onRampAddr, err := datastore_utils.FindAndFormatRef( + // tempDS, + // datastore.AddressRef{ + // ChainSelector: input.ChainSelector, + // Type: datastore.ContractType(onrampops.ContractType), + // Version: onrampops.Version, + // }, + // input.ChainSelector, + // evm_datastore_utils.ToEVMAddress, + // ) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("error finding onRamp address ref: %w", err) + // } + // offRampAddr, err := datastore_utils.FindAndFormatRef( + // tempDS, + // datastore.AddressRef{ + // ChainSelector: input.ChainSelector, + // Type: datastore.ContractType(offrampops.ContractType), + // Version: offrampops.Version, + // }, + // input.ChainSelector, + // evm_datastore_utils.ToEVMAddress, + // ) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("error finding offRamp address ref: %w", err) + // } feequoterAddr, err := datastore_utils.FindAndFormatRef( tempDS, datastore.AddressRef{ @@ -337,8 +338,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU for _, remoteChainSelector := range input.RemoteChainSelectors { // get existing destChainConfig for the onRamp existingDestChainCfgOut, err := cldf_ops.ExecuteOperation(b, onrampops.GetDestChainConfig, c, contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, Args: remoteChainSelector, }) if err != nil { @@ -354,8 +355,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU // get the sourceChainConfig for the offRamp srcChainCfgOut, err := cldf_ops.ExecuteOperation(b, offrampops.GetSourceChainConfig, c, contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: offRampAddr, + // ChainSelector: input.ChainSelector, + // Address: offRampAddr, Args: remoteChainSelector, }) if err != nil { @@ -413,8 +414,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU } // set the destChainConfig with the updated router writeOutputOnRamp, err := cldf_ops.ExecuteOperation(b, onrampops.ApplyDestChainConfigUpdates, c, contract.FunctionInput[[]onrampops.DestChainConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, Args: onRampArgs, }) if err != nil { @@ -425,8 +426,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU writeOutputOffRamp, err := cldf_ops.ExecuteOperation( b, offrampops.ApplySourceChainConfigUpdates, c, contract.FunctionInput[[]offrampops.SourceChainConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: offRampAddr, + // ChainSelector: input.ChainSelector, + // Address: offRampAddr, Args: offRampArgs, }) if err != nil { @@ -435,8 +436,8 @@ func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampU writes = append(writes, writeOutputOffRamp.Output) // update fq 2.0 to have defaultTxLimit set to 8M fqDestChainUpdateRep, err := cldf_ops.ExecuteOperation(b, fqops.ApplyDestChainConfigUpdates, c, contract.FunctionInput[[]fqops.DestChainConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: feequoterAddr, + // ChainSelector: input.ChainSelector, + // Address: feequoterAddr, Args: fqArgs, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/adapters/lanemigrator_test.go b/chains/evm/deployment/v2_0_0/adapters/lanemigrator_test.go index 99fe42614d..13f8dc672e 100644 --- a/chains/evm/deployment/v2_0_0/adapters/lanemigrator_test.go +++ b/chains/evm/deployment/v2_0_0/adapters/lanemigrator_test.go @@ -53,7 +53,7 @@ func TestLaneMigrator(t *testing.T) { for _, chainSel := range []uint64{chainA, chainB} { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -136,16 +136,16 @@ func TestLaneMigrator(t *testing.T) { SourceChainSelector: chainB, OffRamp: offRampAddr, }) - feeQuoterAddr, err := datastore_utils.FindAndFormatRef( - e.DataStore, - datastore.AddressRef{ - Type: datastore.ContractType(fee_quoter.ContractType), - Version: fee_quoter.Version, - }, chainA, evm_datastore_utils.ToEVMAddress) - require.NoError(t, err) + // feeQuoterAddr, err := datastore_utils.FindAndFormatRef( + // e.DataStore, + // datastore.AddressRef{ + // Type: datastore.ContractType(fee_quoter.ContractType), + // Version: fee_quoter.Version, + // }, chainA, evm_datastore_utils.ToEVMAddress) + // require.NoError(t, err) opOut, err := cldf_ops.ExecuteOperation(e.OperationsBundle, fee_quoter.GetDestChainConfig, evmChain1, contract_utils.FunctionInput[uint64]{ - ChainSelector: chainA, - Address: feeQuoterAddr, + // ChainSelector: chainA, + // Address: feeQuoterAddr, Args: chainB, }) require.NoError(t, err) diff --git a/chains/evm/deployment/v2_0_0/adapters/lombard_chain.go b/chains/evm/deployment/v2_0_0/adapters/lombard_chain.go index 439140bcc9..69d1b26a42 100644 --- a/chains/evm/deployment/v2_0_0/adapters/lombard_chain.go +++ b/chains/evm/deployment/v2_0_0/adapters/lombard_chain.go @@ -59,14 +59,15 @@ func (c *LombardChainAdapter) TokenPool(ds datastore.DataStore, selector uint64, } func (c *LombardChainAdapter) RemoteTokenAddress(bundle operations.Bundle, ds datastore.DataStore, chains chain.BlockChains, selector uint64, tokenQualifier string) ([]byte, error) { - tokenPool, err := c.TokenPool(ds, selector, tokenQualifier) - if err != nil { - return nil, fmt.Errorf("failed to get token pool: %w", err) - } + // tokenPool, err := c.TokenPool(ds, selector, tokenQualifier) + // if err != nil { + // return nil, fmt.Errorf("failed to get token pool: %w", err) + // } getTokenReport, err := operations.ExecuteOperation(bundle, token_pool.GetToken, chains.EVMChains()[selector], evm_contract.FunctionInput[struct{}]{ - ChainSelector: selector, - Address: common.HexToAddress(tokenPool.Address), + // ChainSelector: selector, + // Address: common.HexToAddress(tokenPool.Address), + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to execute get token operation: %w", err) diff --git a/chains/evm/deployment/v2_0_0/adapters/tokens.go b/chains/evm/deployment/v2_0_0/adapters/tokens.go index a683663e88..aef4dc8a1f 100644 --- a/chains/evm/deployment/v2_0_0/adapters/tokens.go +++ b/chains/evm/deployment/v2_0_0/adapters/tokens.go @@ -218,8 +218,8 @@ func (t *TokenAdapter) DeployTokenPoolForToken() *cldf_ops.Sequence[tokens.Deplo grantReport, grantErr := cldf_ops.ExecuteOperation(b, bnmOps.GrantMintAndBurnRoles, evmChain, contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(tokenAddr), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(tokenAddr), Args: poolAddr, }, ) @@ -248,8 +248,9 @@ func (t *TokenAdapter) DeriveTokenDecimals(e deployment.Environment, chainSelect return 0, fmt.Errorf("chain with selector %d not found", chainSelector) } getTokenDecimalsReport, err := cldf_ops.ExecuteOperation(e.OperationsBundle, token_pool.GetTokenDecimals, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(poolRef.Address), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(poolRef.Address), + Args: struct{}{}, }) if err == nil { return getTokenDecimalsReport.Output, nil @@ -259,8 +260,9 @@ func (t *TokenAdapter) DeriveTokenDecimals(e deployment.Environment, chainSelect tokenAddr := common.BytesToAddress(tokenBytes) if tokenAddr.Cmp(common.Address{}) == 0 { getTokenReport, getTokErr := cldf_ops.ExecuteOperation(e.OperationsBundle, token_pool.GetToken, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(poolRef.Address), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(poolRef.Address), + Args: struct{}{}, }) if getTokErr != nil { return 0, fmt.Errorf("failed to get token decimals from token pool with address %s on %s: %w", poolRef.Address, evmChain, poolErr) @@ -302,8 +304,8 @@ func (t *TokenAdapter) SetTokenPoolRateLimits() *cldf_ops.Sequence[tokens.TPRLRe } currentFinalityConfig, err := cldf_ops.ExecuteOperation(b, token_pool.GetAllowedFinalityConfig, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddr, Args: struct{}{}, }) if err != nil { @@ -315,8 +317,8 @@ func (t *TokenAdapter) SetTokenPoolRateLimits() *cldf_ops.Sequence[tokens.TPRLRe requestedFinalityConfig := input.AllowedFinalityConfig.Raw() if requestedFinalityConfig != currentFinalityConfig.Output { _, err = cldf_ops.ExecuteOperation(b, token_pool.SetAllowedFinalityConfig, evmChain, contract.FunctionInput[[4]byte]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddr, Args: requestedFinalityConfig, }) if err != nil { @@ -344,8 +346,8 @@ func (t *TokenAdapter) SetTokenPoolRateLimits() *cldf_ops.Sequence[tokens.TPRLRe } report, err := cldf_ops.ExecuteOperation(b, token_pool.SetRateLimitConfig, evmChain, contract.FunctionInput[[]token_pool.RateLimitConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddr, Args: args, }) if err != nil { @@ -397,8 +399,8 @@ func (t *TokenAdapter) GetOnchainTokenTransferFeeConfig(e deployment.Environment token_pool.GetTokenTransferFeeConfig, chain, contract.FunctionInput[token_pool.GetTokenTransferFeeConfigArgs]{ - ChainSelector: src, - Address: addr, + // ChainSelector: src, + // Address: addr, Args: args, }, ) @@ -427,8 +429,9 @@ func (p *poolOpsV200) GetToken(b cldf_ops.Bundle, ch evm.Chain, poolAddr common. res, err := cldf_ops.ExecuteOperation(b, token_pool.GetToken, ch, contract.FunctionInput[struct{}]{ - ChainSelector: ch.Selector, - Address: poolAddr, + // ChainSelector: ch.Selector, + // Address: poolAddr, + Args: struct{}{}, }, ) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/adapters/tokens_test.go b/chains/evm/deployment/v2_0_0/adapters/tokens_test.go index 69288642c7..f873a9a054 100644 --- a/chains/evm/deployment/v2_0_0/adapters/tokens_test.go +++ b/chains/evm/deployment/v2_0_0/adapters/tokens_test.go @@ -38,8 +38,8 @@ import ( "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/create2_factory" "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/committee_verifier" "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/testsetup" - bnm_erc20_bindings "github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc20" drip_v150_bindings "github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/1_5_0/burn_mint_erc20_with_drip" + bnm_erc20_bindings "github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc20" drip_v150_ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_0/operations/burn_mint_erc20_with_drip" ) @@ -104,7 +104,7 @@ func TestTokenAdapter(t *testing.T) { for _, chainSel := range []uint64{chainA, chainB} { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -299,12 +299,12 @@ func TestTokenAdapter(t *testing.T) { Qualifier: "TEST", }, chainSel, evm_datastore_utils.ToEVMAddress) require.NoError(t, err, "Failed to find deployed token ref in datastore") - registryAddr, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{ - ChainSelector: chainSel, - Type: datastore.ContractType(token_admin_registry.ContractType), - Version: semver.MustParse("1.5.0"), - }, chainSel, evm_datastore_utils.ToEVMAddress) - require.NoError(t, err, "Failed to find deployed registry ref in datastore") + // registryAddr, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{ + // ChainSelector: chainSel, + // Type: datastore.ContractType(token_admin_registry.ContractType), + // Version: semver.MustParse("1.5.0"), + // }, chainSel, evm_datastore_utils.ToEVMAddress) + // require.NoError(t, err, "Failed to find deployed registry ref in datastore") verifierAddr, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{ ChainSelector: chainSel, Type: datastore.ContractType(committee_verifier.ContractType), @@ -313,17 +313,18 @@ func TestTokenAdapter(t *testing.T) { require.NoError(t, err, "Failed to find deployed verifier ref in datastore") tokenConfigReport, err := operations.ExecuteOperation(e.OperationsBundle, token_admin_registry.GetTokenConfig, evmChain, contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: registryAddr, - Args: tokenAddr, + // ChainSelector: chainSel, + // Address: registryAddr, + Args: tokenAddr, }) require.NoError(t, err, "Failed to get token config from token admin registry") require.Equal(t, tokenPoolAddr, tokenConfigReport.Output.TokenPool, "Token pool address in registry should match deployed token pool address") require.Equal(t, evmChain.DeployerKey.From, tokenConfigReport.Output.Administrator, "Deployer should be the admin of the token in the registry") chainSupportReport, err := operations.ExecuteOperation(e.OperationsBundle, token_pool.GetSupportedChains, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: tokenPoolAddr, + // ChainSelector: chainSel, + // Address: tokenPoolAddr, + Args: struct{}{}, }) require.NoError(t, err, "Failed to get supported chains from token pool") require.Len(t, chainSupportReport.Output, 1, "There should be 1 supported remote chain in the token pool") @@ -338,8 +339,8 @@ func TestTokenAdapter(t *testing.T) { // GetCurrentRateLimiterState is only available in version 2.0.0+ if version.GreaterThan(semver.MustParse("1.6.9")) || version.Equal(semver.MustParse("2.0.0")) { rateLimiterStateReport, err := operations.ExecuteOperation(e.OperationsBundle, token_pool.GetCurrentRateLimiterState, evmChain, contract.FunctionInput[token_pool.GetCurrentRateLimiterStateArgs]{ - ChainSelector: chainSel, - Address: tokenPoolAddr, + // ChainSelector: chainSel, + // Address: tokenPoolAddr, Args: token_pool.GetCurrentRateLimiterStateArgs{ RemoteChainSelector: remoteChainSel, }, @@ -389,7 +390,7 @@ func TestTokenExpansion(t *testing.T) { for _, chainSel := range []uint64{chainA, chainB} { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -500,16 +501,18 @@ func TestTokenExpansion(t *testing.T) { // Verify token pool points to the correct token getTokenReport, err := operations.ExecuteOperation(e.OperationsBundle, token_pool.GetToken, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: poolAddr, + // ChainSelector: chainSel, + // Address: poolAddr, + Args: struct{}{}, }) require.NoError(t, err) require.Equal(t, tokenAddr, getTokenReport.Output, "Token pool should point to the deployed token") // Verify token pool decimals getDecimalsReport, err := operations.ExecuteOperation(e.OperationsBundle, token_pool.GetTokenDecimals, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: poolAddr, + // ChainSelector: chainSel, + // Address: poolAddr, + Args: struct{}{}, }) require.NoError(t, err) require.Equal(t, uint8(18), getDecimalsReport.Output, "Token pool decimals should match token decimals") @@ -550,7 +553,7 @@ func TestTokenExpansionPoolOnlyForExistingV150BurnMintToken(t *testing.T) { for _, chainSel := range []uint64{chainA, chainB} { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory.go b/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory.go index f6bde3dd38..9c0d5b8d6b 100644 --- a/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory.go +++ b/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory.go @@ -59,8 +59,8 @@ var configureCREATE2Factory = cldf_ops.NewSequence( func(b operations.Bundle, chain evm.Chain, input ConfigureCREATE2FactoryInput[common.Address]) (output sequences.OnChainOutput, err error) { writes := make([]contract.WriteOutput, 0) configureReport, err := cldf_ops.ExecuteOperation(b, create2_factory.ApplyAllowListUpdates, chain, contract.FunctionInput[create2_factory.ApplyAllowListUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: input.CREATE2Factory, + // ChainSelector: chain.Selector, + // Address: input.CREATE2Factory, Args: create2_factory.ApplyAllowListUpdatesArgs{ Adds: input.AllowListAdds, Removes: input.AllowListRemoves, diff --git a/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory_test.go b/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory_test.go index f56af98f3d..035083c9ba 100644 --- a/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory_test.go +++ b/chains/evm/deployment/v2_0_0/changesets/create2_factory/configure_create2_factory_test.go @@ -34,7 +34,7 @@ func TestConfigureCREATE2Factory_Apply(t *testing.T) { create2_factory_ops.Deploy, chain, contract.DeployInput[create2_factory_ops.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(create2_factory_ops.ContractType, *create2_factory_ops.Version), Args: create2_factory_ops.ConstructorArgs{ AllowList: initialAllowList, @@ -175,7 +175,7 @@ func TestConfigureCREATE2Factory_EmptyUpdates(t *testing.T) { create2_factory_ops.Deploy, chain, contract.DeployInput[create2_factory_ops.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(create2_factory_ops.ContractType, *create2_factory_ops.Version), Args: create2_factory_ops.ConstructorArgs{ AllowList: []common.Address{chain.DeployerKey.From}, diff --git a/chains/evm/deployment/v2_0_0/changesets/create2_factory/deploy_create2_factory.go b/chains/evm/deployment/v2_0_0/changesets/create2_factory/deploy_create2_factory.go index bcde2ff31a..901d0e896d 100644 --- a/chains/evm/deployment/v2_0_0/changesets/create2_factory/deploy_create2_factory.go +++ b/chains/evm/deployment/v2_0_0/changesets/create2_factory/deploy_create2_factory.go @@ -36,7 +36,7 @@ func applyDeployCREATE2Factory(e cldf_deployment.Environment, cfg DeployCREATE2F } deployReport, err := cldf_ops.ExecuteOperation(e.OperationsBundle, create2_factory.Deploy, evmChain, contract.DeployInput[create2_factory.ConstructorArgs]{ - ChainSelector: cfg.ChainSel, + // ChainSelector: cfg.ChainSel, TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), Args: create2_factory.ConstructorArgs{ AllowList: cfg.AllowList, diff --git a/chains/evm/deployment/v2_0_0/changesets/deploy_chain_contracts_test.go b/chains/evm/deployment/v2_0_0/changesets/deploy_chain_contracts_test.go index 11f173f6c8..9887896b3e 100644 --- a/chains/evm/deployment/v2_0_0/changesets/deploy_chain_contracts_test.go +++ b/chains/evm/deployment/v2_0_0/changesets/deploy_chain_contracts_test.go @@ -119,7 +119,7 @@ func TestDeployChainContracts_Apply(t *testing.T) { mcmsRegistry := cs_core.GetRegistry() create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[5009297550715157269], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: 5009297550715157269, + // ChainSelector: 5009297550715157269, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[5009297550715157269].DeployerKey.From}, }, @@ -161,7 +161,7 @@ func TestDeployChainContracts_DeployTestRouter(t *testing.T) { mcmsRegistry := cs_core.GetRegistry() create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[5009297550715157269], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: 5009297550715157269, + // ChainSelector: 5009297550715157269, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[5009297550715157269].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/changesets/deploy_committee_verifier_test.go b/chains/evm/deployment/v2_0_0/changesets/deploy_committee_verifier_test.go index e69804411a..4e43a0cc90 100644 --- a/chains/evm/deployment/v2_0_0/changesets/deploy_committee_verifier_test.go +++ b/chains/evm/deployment/v2_0_0/changesets/deploy_committee_verifier_test.go @@ -98,7 +98,7 @@ func TestDeployCommitteeVerifier_Apply_MultipleQualifiersOnSameChain(t *testing. } create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[5009297550715157269], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: 5009297550715157269, + // ChainSelector: 5009297550715157269, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[5009297550715157269].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/create2_factory/create2_factory.go b/chains/evm/deployment/v2_0_0/create2_factory/create2_factory.go index 5da74fa199..d4820503c2 100644 --- a/chains/evm/deployment/v2_0_0/create2_factory/create2_factory.go +++ b/chains/evm/deployment/v2_0_0/create2_factory/create2_factory.go @@ -60,7 +60,7 @@ var CreateAndTransferOwnership = contract.NewWrite(contract.WriteParams[CreateAn Description: "Deploys a contract with the given creation code + salt and transfers ownership to the given address", ContractType: ContractType, ContractABI: create2_factory.CREATE2FactoryABI, - NewContract: create2_factory.NewCREATE2Factory, + // NewContract: create2_factory.NewCREATE2Factory, IsAllowedCaller: func(contract *create2_factory.CREATE2Factory, opts *bind.CallOpts, caller common.Address, input CreateAndTransferOwnershipArgs) (bool, error) { allowList, err := contract.GetAllowList(opts) if err != nil { @@ -83,7 +83,7 @@ var ComputeAddress = contract.NewRead(contract.ReadParams[ComputeAddressArgs, co Version: Version, Description: "Computes the address of a contract that will be deployed with the given creation code and salt", ContractType: ContractType, - NewContract: create2_factory.NewCREATE2Factory, + // NewContract: create2_factory.NewCREATE2Factory, CallContract: func(contract *create2_factory.CREATE2Factory, opts *bind.CallOpts, input ComputeAddressArgs) (common.Address, error) { creationCode, err := makeCreationCode(input.ABI, input.Bin, input.ConstructorArgs...) if err != nil { @@ -99,7 +99,7 @@ var ApplyAllowListUpdates = contract.NewWrite(contract.WriteParams[ApplyAllowLis Description: "Applies the allow list updates to the CREATE2Factory contract", ContractType: ContractType, ContractABI: create2_factory.CREATE2FactoryABI, - NewContract: create2_factory.NewCREATE2Factory, + // NewContract: create2_factory.NewCREATE2Factory, IsAllowedCaller: contract.OnlyOwner[*create2_factory.CREATE2Factory, ApplyAllowListUpdatesArgs], Validate: func(ApplyAllowListUpdatesArgs) error { return nil }, CallContract: func(contract *create2_factory.CREATE2Factory, opts *bind.TransactOpts, input ApplyAllowListUpdatesArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v2_0_0/create2_factory/create2_factory_test.go b/chains/evm/deployment/v2_0_0/create2_factory/create2_factory_test.go index d9f81af737..13235efbd6 100644 --- a/chains/evm/deployment/v2_0_0/create2_factory/create2_factory_test.go +++ b/chains/evm/deployment/v2_0_0/create2_factory/create2_factory_test.go @@ -80,7 +80,7 @@ func TestCREATE2Factory(t *testing.T) { evmChains[chain1Sel], contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: chain1Sel, + // ChainSelector: chain1Sel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChains[chain1Sel].DeployerKey.From}, }, @@ -109,7 +109,7 @@ func TestCREATE2Factory(t *testing.T) { evmChains[chain2Sel], contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: chain2Sel, + // ChainSelector: chain2Sel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{prevChain2DeployerKey.From}, }, @@ -144,8 +144,8 @@ func TestCREATE2Factory(t *testing.T) { create2_factory.CreateAndTransferOwnership, evmChains[chain1Sel], contract.FunctionInput[create2_factory.CreateAndTransferOwnershipArgs]{ - ChainSelector: chain1Sel, - Address: common.HexToAddress(factory1Report.Output.Address), + // ChainSelector: chain1Sel, + // Address: common.HexToAddress(factory1Report.Output.Address), Args: create2_factory.CreateAndTransferOwnershipArgs{ ComputeAddressArgs: create2_factory.ComputeAddressArgs{ ABI: create2_factory_latest.CREATE2FactoryMetaData.ABI, @@ -159,8 +159,8 @@ func TestCREATE2Factory(t *testing.T) { require.NoError(t, err, "Failed to create and transfer ownership of contract on chain1") _, err = cldf_ops.ExecuteOperation(e.OperationsBundle, create2_factory.CreateAndTransferOwnership, evmChains[chain2Sel], contract.FunctionInput[create2_factory.CreateAndTransferOwnershipArgs]{ - ChainSelector: chain2Sel, - Address: common.HexToAddress(factory2Report.Output.Address), + // ChainSelector: chain2Sel, + // Address: common.HexToAddress(factory2Report.Output.Address), Args: create2_factory.CreateAndTransferOwnershipArgs{ ComputeAddressArgs: create2_factory.ComputeAddressArgs{ ABI: create2_factory_latest.CREATE2FactoryMetaData.ABI, diff --git a/chains/evm/deployment/v2_0_0/operations/advanced_pool_hooks/advanced_pool_hooks.go b/chains/evm/deployment/v2_0_0/operations/advanced_pool_hooks/advanced_pool_hooks.go index 548a8d21ae..9d4e4f61e2 100644 --- a/chains/evm/deployment/v2_0_0/operations/advanced_pool_hooks/advanced_pool_hooks.go +++ b/chains/evm/deployment/v2_0_0/operations/advanced_pool_hooks/advanced_pool_hooks.go @@ -228,7 +228,7 @@ var ApplyCCVConfigUpdates = contract.NewWrite(contract.WriteParams[[]CCVConfigAr Description: "Calls applyCCVConfigUpdates on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, []CCVConfigArg], Validate: func([]CCVConfigArg) error { return nil }, CallContract: func( @@ -246,7 +246,7 @@ var ApplyAllowListUpdates = contract.NewWrite(contract.WriteParams[ApplyAllowLis Description: "Calls applyAllowListUpdates on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, ApplyAllowListUpdatesArgs], Validate: func(ApplyAllowListUpdatesArgs) error { return nil }, CallContract: func( @@ -264,7 +264,7 @@ var SetThresholdAmount = contract.NewWrite(contract.WriteParams[*big.Int, *Advan Description: "Calls setThresholdAmount on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, *big.Int], Validate: func(*big.Int) error { return nil }, CallContract: func( @@ -282,7 +282,7 @@ var SetPolicyEngine = contract.NewWrite(contract.WriteParams[common.Address, *Ad Description: "Calls setPolicyEngine on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -300,7 +300,7 @@ var SetPolicyEngineAllowFailedDetach = contract.NewWrite(contract.WriteParams[co Description: "Calls setPolicyEngineAllowFailedDetach on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -318,7 +318,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: AdvancedPoolHooksABI, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, IsAllowedCaller: contract.OnlyOwner[*AdvancedPoolHooksContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -335,7 +335,7 @@ var GetAllowListEnabled = contract.NewRead(contract.ReadParams[struct{}, bool, * Version: Version, Description: "Calls getAllowListEnabled on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) (bool, error) { return c.GetAllowListEnabled(opts) }, @@ -346,7 +346,7 @@ var GetAllowList = contract.NewRead(contract.ReadParams[struct{}, []common.Addre Version: Version, Description: "Calls getAllowList on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllowList(opts) }, @@ -357,7 +357,7 @@ var GetThresholdAmount = contract.NewRead(contract.ReadParams[struct{}, *big.Int Version: Version, Description: "Calls getThresholdAmount on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) (*big.Int, error) { return c.GetThresholdAmount(opts) }, @@ -368,7 +368,7 @@ var GetPolicyEngine = contract.NewRead(contract.ReadParams[struct{}, common.Addr Version: Version, Description: "Calls getPolicyEngine on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetPolicyEngine(opts) }, @@ -379,7 +379,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, @@ -390,7 +390,7 @@ var GetAllCCVConfigs = contract.NewRead(contract.ReadParams[struct{}, []CCVConfi Version: Version, Description: "Calls getAllCCVConfigs on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args struct{}) ([]CCVConfigArg, error) { return c.GetAllCCVConfigs(opts) }, @@ -401,7 +401,7 @@ var GetCCVConfig = contract.NewRead(contract.ReadParams[uint64, CCVConfig, *Adva Version: Version, Description: "Calls getCCVConfig on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args uint64) (CCVConfig, error) { return c.GetCCVConfig(opts, args) }, @@ -412,7 +412,7 @@ var GetRequiredCCVs = contract.NewRead(contract.ReadParams[GetRequiredCCVsArgs, Version: Version, Description: "Calls getRequiredCCVs on the contract", ContractType: ContractType, - NewContract: NewAdvancedPoolHooksContract, + // NewContract: NewAdvancedPoolHooksContract, CallContract: func(c *AdvancedPoolHooksContract, opts *bind.CallOpts, args GetRequiredCCVsArgs) ([]common.Address, error) { return c.GetRequiredCCVs(opts, args.Arg0, args.RemoteChainSelector, args.Amount, args.Arg3, args.Arg4, args.Direction) }, diff --git a/chains/evm/deployment/v2_0_0/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go b/chains/evm/deployment/v2_0_0/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go index f77f1e21f1..9f52e7ca30 100644 --- a/chains/evm/deployment/v2_0_0/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go +++ b/chains/evm/deployment/v2_0_0/operations/cctp_message_transmitter_proxy/cctp_message_transmitter_proxy.go @@ -104,7 +104,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: CCTPMessageTransmitterProxyABI, - NewContract: NewCCTPMessageTransmitterProxyContract, + // NewContract: NewCCTPMessageTransmitterProxyContract, IsAllowedCaller: contract.OnlyOwner[*CCTPMessageTransmitterProxyContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -121,7 +121,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewCCTPMessageTransmitterProxyContract, + // NewContract: NewCCTPMessageTransmitterProxyContract, CallContract: func(c *CCTPMessageTransmitterProxyContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/cctp_through_ccv_token_pool/cctp_through_ccv_token_pool.go b/chains/evm/deployment/v2_0_0/operations/cctp_through_ccv_token_pool/cctp_through_ccv_token_pool.go index 4eaf56cb85..dcaefd6b36 100644 --- a/chains/evm/deployment/v2_0_0/operations/cctp_through_ccv_token_pool/cctp_through_ccv_token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/cctp_through_ccv_token_pool/cctp_through_ccv_token_pool.go @@ -99,7 +99,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: CCTPThroughCCVTokenPoolABI, - NewContract: NewCCTPThroughCCVTokenPoolContract, + // NewContract: NewCCTPThroughCCVTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*CCTPThroughCCVTokenPoolContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v2_0_0/operations/cctp_verifier/cctp_verifier.go b/chains/evm/deployment/v2_0_0/operations/cctp_verifier/cctp_verifier.go index b07d3efe0c..3fead8a6b8 100644 --- a/chains/evm/deployment/v2_0_0/operations/cctp_verifier/cctp_verifier.go +++ b/chains/evm/deployment/v2_0_0/operations/cctp_verifier/cctp_verifier.go @@ -297,7 +297,7 @@ var ApplyRemoteChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]Rem Description: "Calls applyRemoteChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, []RemoteChainConfigArgs], Validate: func([]RemoteChainConfigArgs) error { return nil }, CallContract: func( @@ -315,7 +315,7 @@ var SetDomains = contract.NewWrite(contract.WriteParams[[]SetDomainArgs, *CCTPVe Description: "Calls setDomains on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, []SetDomainArgs], Validate: func([]SetDomainArgs) error { return nil }, CallContract: func( @@ -333,7 +333,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *CC Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( @@ -351,7 +351,7 @@ var ApplyAllowlistUpdates = contract.NewWrite(contract.WriteParams[[]AllowlistCo Description: "Calls applyAllowlistUpdates on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, []AllowlistConfigArgs], Validate: func([]AllowlistConfigArgs) error { return nil }, CallContract: func( @@ -369,7 +369,7 @@ var UpdateStorageLocations = contract.NewWrite(contract.WriteParams[[]string, *C Description: "Calls updateStorageLocations on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, []string], Validate: func([]string) error { return nil }, CallContract: func( @@ -387,7 +387,7 @@ var SetAllowedFinalityConfig = contract.NewWrite(contract.WriteParams[[4]byte, * Description: "Calls setAllowedFinalityConfig on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, [4]byte], Validate: func([4]byte) error { return nil }, CallContract: func( @@ -405,7 +405,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: CCTPVerifierABI, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CCTPVerifierContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -422,7 +422,7 @@ var VersionTag = contract.NewRead(contract.ReadParams[struct{}, [4]byte, *CCTPVe Version: Version, Description: "Calls versionTag on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.VersionTag(opts) }, @@ -433,7 +433,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -444,7 +444,7 @@ var GetRemoteChainConfig = contract.NewRead(contract.ReadParams[uint64, GetRemot Version: Version, Description: "Calls getRemoteChainConfig on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args uint64) (GetRemoteChainConfigResult, error) { return c.GetRemoteChainConfig(opts, args) }, @@ -455,7 +455,7 @@ var GetDomain = contract.NewRead(contract.ReadParams[uint64, Domain, *CCTPVerifi Version: Version, Description: "Calls getDomain on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args uint64) (Domain, error) { return c.GetDomain(opts, args) }, @@ -466,7 +466,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, GetStaticCo Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args struct{}) (GetStaticConfigResult, error) { return c.GetStaticConfig(opts) }, @@ -477,7 +477,7 @@ var GetStorageLocations = contract.NewRead(contract.ReadParams[struct{}, []strin Version: Version, Description: "Calls getStorageLocations on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args struct{}) ([]string, error) { return c.GetStorageLocations(opts) }, @@ -488,7 +488,7 @@ var GetAllowedFinalityConfig = contract.NewRead(contract.ReadParams[struct{}, [4 Version: Version, Description: "Calls getAllowedFinalityConfig on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.GetAllowedFinalityConfig(opts) }, @@ -499,7 +499,7 @@ var GetFee = contract.NewRead(contract.ReadParams[GetFeeArgs, GetFeeResult, *CCT Version: Version, Description: "Calls getFee on the contract", ContractType: ContractType, - NewContract: NewCCTPVerifierContract, + // NewContract: NewCCTPVerifierContract, CallContract: func(c *CCTPVerifierContract, opts *bind.CallOpts, args GetFeeArgs) (GetFeeResult, error) { return c.GetFee(opts, args.DestChainSelector, args.Arg1, args.Arg2, args.RequestedFinality) }, diff --git a/chains/evm/deployment/v2_0_0/operations/committee_verifier/committee_verifier.go b/chains/evm/deployment/v2_0_0/operations/committee_verifier/committee_verifier.go index 50303df820..382f08d365 100644 --- a/chains/evm/deployment/v2_0_0/operations/committee_verifier/committee_verifier.go +++ b/chains/evm/deployment/v2_0_0/operations/committee_verifier/committee_verifier.go @@ -255,7 +255,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *Co Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( @@ -273,7 +273,7 @@ var ApplyRemoteChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]Rem Description: "Calls applyRemoteChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, []RemoteChainConfigArgs], Validate: func([]RemoteChainConfigArgs) error { return nil }, CallContract: func( @@ -291,7 +291,7 @@ var SetAllowedFinalityConfig = contract.NewWrite(contract.WriteParams[[4]byte, * Description: "Calls setAllowedFinalityConfig on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, [4]byte], Validate: func([4]byte) error { return nil }, CallContract: func( @@ -309,7 +309,7 @@ var ApplyAllowlistUpdates = contract.NewWrite(contract.WriteParams[[]AllowlistCo Description: "Calls applyAllowlistUpdates on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, []AllowlistConfigArgs], Validate: func([]AllowlistConfigArgs) error { return nil }, CallContract: func( @@ -327,7 +327,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -345,7 +345,7 @@ var ApplySignatureConfigs = contract.NewWrite(contract.WriteParams[ApplySignatur Description: "Calls applySignatureConfigs on the contract", ContractType: ContractType, ContractABI: CommitteeVerifierABI, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, IsAllowedCaller: contract.OnlyOwner[*CommitteeVerifierContract, ApplySignatureConfigsArgs], Validate: func(ApplySignatureConfigsArgs) error { return nil }, CallContract: func( @@ -362,7 +362,7 @@ var GetRemoteChainConfig = contract.NewRead(contract.ReadParams[uint64, GetRemot Version: Version, Description: "Calls getRemoteChainConfig on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args uint64) (GetRemoteChainConfigResult, error) { return c.GetRemoteChainConfig(opts, args) }, @@ -373,7 +373,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -384,7 +384,7 @@ var GetSignatureConfig = contract.NewRead(contract.ReadParams[uint64, GetSignatu Version: Version, Description: "Calls getSignatureConfig on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args uint64) (GetSignatureConfigResult, error) { return c.GetSignatureConfig(opts, args) }, @@ -395,7 +395,7 @@ var GetAllowedFinalityConfig = contract.NewRead(contract.ReadParams[struct{}, [4 Version: Version, Description: "Calls getAllowedFinalityConfig on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.GetAllowedFinalityConfig(opts) }, @@ -406,7 +406,7 @@ var GetFee = contract.NewRead(contract.ReadParams[GetFeeArgs, GetFeeResult, *Com Version: Version, Description: "Calls getFee on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args GetFeeArgs) (GetFeeResult, error) { return c.GetFee(opts, args.DestChainSelector, args.Arg1, args.Arg2, args.RequestedFinality) }, @@ -417,7 +417,7 @@ var VersionTag = contract.NewRead(contract.ReadParams[struct{}, [4]byte, *Commit Version: Version, Description: "Calls versionTag on the contract", ContractType: ContractType, - NewContract: NewCommitteeVerifierContract, + // NewContract: NewCommitteeVerifierContract, CallContract: func(c *CommitteeVerifierContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.VersionTag(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/erc20/erc20.go b/chains/evm/deployment/v2_0_0/operations/erc20/erc20.go index 4ae2649f39..a5208efe06 100644 --- a/chains/evm/deployment/v2_0_0/operations/erc20/erc20.go +++ b/chains/evm/deployment/v2_0_0/operations/erc20/erc20.go @@ -95,7 +95,7 @@ var Approve = contract.NewWrite(contract.WriteParams[ApproveArgs, *CrossChainTok Description: "Calls approve on the contract", ContractType: ContractType, ContractABI: CrossChainTokenABI, - NewContract: NewCrossChainTokenContract, + //NewContract: NewCrossChainTokenContract, IsAllowedCaller: contract.AllCallersAllowed[*CrossChainTokenContract, ApproveArgs], Validate: func(ApproveArgs) error { return nil }, CallContract: func( @@ -112,7 +112,7 @@ var BalanceOf = contract.NewRead(contract.ReadParams[common.Address, *big.Int, * Version: Version, Description: "Calls balanceOf on the contract", ContractType: ContractType, - NewContract: NewCrossChainTokenContract, + //NewContract: NewCrossChainTokenContract, CallContract: func(c *CrossChainTokenContract, opts *bind.CallOpts, args common.Address) (*big.Int, error) { return c.BalanceOf(opts, args) }, diff --git a/chains/evm/deployment/v2_0_0/operations/erc20/erc20_custom_operations.go b/chains/evm/deployment/v2_0_0/operations/erc20/erc20_custom_operations.go index 90e762aff8..52117e61f4 100644 --- a/chains/evm/deployment/v2_0_0/operations/erc20/erc20_custom_operations.go +++ b/chains/evm/deployment/v2_0_0/operations/erc20/erc20_custom_operations.go @@ -21,7 +21,7 @@ var ApproveProposalOnly = contract.NewWrite(contract.WriteParams[ApproveArgs, *e Description: "Approves a spender for ERC20 transfers (proposal-only, never executed directly)", ContractType: ContractType, ContractABI: erc20_bindings.ERC20ABI, - NewContract: erc20_bindings.NewERC20, + //NewContract: erc20_bindings.NewERC20, IsAllowedCaller: contract.NoCallersAllowed[*erc20_bindings.ERC20, ApproveArgs], Validate: validateApproveArgs, CallContract: func(token *erc20_bindings.ERC20, opts *bind.TransactOpts, args ApproveArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box.go b/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box.go index 15220fb1f4..28b3c67bf6 100644 --- a/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box.go +++ b/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box.go @@ -108,7 +108,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: ERC20LockBoxABI, - NewContract: NewERC20LockBoxContract, + //NewContract: NewERC20LockBoxContract, IsAllowedCaller: contract.OnlyOwner[*ERC20LockBoxContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -125,7 +125,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewERC20LockBoxContract, + //NewContract: NewERC20LockBoxContract, CallContract: func(c *ERC20LockBoxContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, @@ -137,7 +137,7 @@ var TransferOwnership = contract.NewWrite(contract.WriteParams[common.Address, * Description: "Calls transferOwnership on the contract", ContractType: ContractType, ContractABI: ERC20LockBoxABI, - NewContract: NewERC20LockBoxContract, + //NewContract: NewERC20LockBoxContract, IsAllowedCaller: contract.OnlyOwner[*ERC20LockBoxContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box_custom_operations.go b/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box_custom_operations.go index 970a45ceb0..13a20bbb04 100644 --- a/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box_custom_operations.go +++ b/chains/evm/deployment/v2_0_0/operations/erc20_lock_box/erc20_lock_box_custom_operations.go @@ -26,7 +26,7 @@ var Owner = contract.NewRead(contract.ReadParams[struct{}, common.Address, *ERC2 Version: Version, Description: "Calls owner on the contract", ContractType: ContractType, - NewContract: NewERC20LockBoxContract, + //NewContract: NewERC20LockBoxContract, CallContract: func(c *ERC20LockBoxContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.Owner(opts) }, @@ -38,7 +38,7 @@ var Deposit = contract.NewWrite(contract.WriteParams[DepositArgs, *ERC20LockBoxC Description: "Deposits tokens into the ERC20LockBox", ContractType: ContractType, ContractABI: ERC20LockBoxABI, - NewContract: NewERC20LockBoxContract, + //NewContract: NewERC20LockBoxContract, IsAllowedCaller: func(erc20LockBox *ERC20LockBoxContract, opts *bind.CallOpts, caller common.Address, args DepositArgs) (bool, error) { callers, err := erc20LockBox.GetAllAuthorizedCallers(opts) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/operations/executor/executor.go b/chains/evm/deployment/v2_0_0/operations/executor/executor.go index 1c7a447d09..186603f19e 100644 --- a/chains/evm/deployment/v2_0_0/operations/executor/executor.go +++ b/chains/evm/deployment/v2_0_0/operations/executor/executor.go @@ -160,7 +160,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *Ex Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: ExecutorABI, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, IsAllowedCaller: contract.OnlyOwner[*ExecutorContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( @@ -178,7 +178,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: ExecutorABI, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, IsAllowedCaller: contract.OnlyOwner[*ExecutorContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -195,7 +195,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, CallContract: func(c *ExecutorContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -206,7 +206,7 @@ var GetDestChains = contract.NewRead(contract.ReadParams[struct{}, []RemoteChain Version: Version, Description: "Calls getDestChains on the contract", ContractType: ContractType, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, CallContract: func(c *ExecutorContract, opts *bind.CallOpts, args struct{}) ([]RemoteChainConfigArgs, error) { return c.GetDestChains(opts) }, @@ -217,7 +217,7 @@ var GetAllowedCCVs = contract.NewRead(contract.ReadParams[struct{}, []common.Add Version: Version, Description: "Calls getAllowedCCVs on the contract", ContractType: ContractType, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, CallContract: func(c *ExecutorContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllowedCCVs(opts) }, @@ -228,7 +228,7 @@ var GetMaxCCVsPerMessage = contract.NewRead(contract.ReadParams[struct{}, uint8, Version: Version, Description: "Calls getMaxCCVsPerMessage on the contract", ContractType: ContractType, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, CallContract: func(c *ExecutorContract, opts *bind.CallOpts, args struct{}) (uint8, error) { return c.GetMaxCCVsPerMessage(opts) }, @@ -239,7 +239,7 @@ var GetAllowedFinalityConfig = contract.NewRead(contract.ReadParams[struct{}, [4 Version: Version, Description: "Calls getAllowedFinalityConfig on the contract", ContractType: ContractType, - NewContract: NewExecutorContract, + //NewContract: NewExecutorContract, CallContract: func(c *ExecutorContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.GetAllowedFinalityConfig(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/fee_quoter/fee_quoter.go b/chains/evm/deployment/v2_0_0/operations/fee_quoter/fee_quoter.go index a0857a1097..47806d678e 100644 --- a/chains/evm/deployment/v2_0_0/operations/fee_quoter/fee_quoter.go +++ b/chains/evm/deployment/v2_0_0/operations/fee_quoter/fee_quoter.go @@ -237,7 +237,7 @@ var ApplyDestChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]DestC Description: "Calls applyDestChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, []DestChainConfigArgs], Validate: func([]DestChainConfigArgs) error { return nil }, CallContract: func( @@ -255,7 +255,7 @@ var UpdatePrices = contract.NewWrite(contract.WriteParams[PriceUpdates, *FeeQuot Description: "Calls updatePrices on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, PriceUpdates], Validate: func(PriceUpdates) error { return nil }, CallContract: func( @@ -273,7 +273,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -291,7 +291,7 @@ var ApplyTokenTransferFeeConfigUpdates = contract.NewWrite(contract.WriteParams[ Description: "Calls applyTokenTransferFeeConfigUpdates on the contract", ContractType: ContractType, ContractABI: FeeQuoterABI, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, IsAllowedCaller: contract.OnlyOwner[*FeeQuoterContract, ApplyTokenTransferFeeConfigUpdatesArgs], Validate: func(ApplyTokenTransferFeeConfigUpdatesArgs) error { return nil }, CallContract: func( @@ -308,7 +308,7 @@ var GetDestChainConfig = contract.NewRead(contract.ReadParams[uint64, DestChainC Version: Version, Description: "Calls getDestChainConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (DestChainConfig, error) { return c.GetDestChainConfig(opts, args) }, @@ -319,7 +319,7 @@ var GetDestinationChainGasPrice = contract.NewRead(contract.ReadParams[uint64, T Version: Version, Description: "Calls getDestinationChainGasPrice on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args uint64) (TimestampedPackedUint224, error) { return c.GetDestinationChainGasPrice(opts, args) }, @@ -330,7 +330,7 @@ var GetTokenTransferFeeConfig = contract.NewRead(contract.ReadParams[GetTokenTra Version: Version, Description: "Calls getTokenTransferFeeConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args GetTokenTransferFeeConfigArgs) (TokenTransferFeeConfig, error) { return c.GetTokenTransferFeeConfig(opts, args.DestChainSelector, args.Token) }, @@ -341,7 +341,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -352,7 +352,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewFeeQuoterContract, + //NewContract: NewFeeQuoterContract, CallContract: func(c *FeeQuoterContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/lock_release_token_pool/lock_release_token_pool.go b/chains/evm/deployment/v2_0_0/operations/lock_release_token_pool/lock_release_token_pool.go index cded7f883f..03af7a26b3 100644 --- a/chains/evm/deployment/v2_0_0/operations/lock_release_token_pool/lock_release_token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/lock_release_token_pool/lock_release_token_pool.go @@ -97,7 +97,7 @@ var GetLockBox = contract.NewRead(contract.ReadParams[struct{}, common.Address, Version: Version, Description: "Calls getLockBox on the contract", ContractType: ContractType, - NewContract: NewLockReleaseTokenPoolContract, + //NewContract: NewLockReleaseTokenPoolContract, CallContract: func(c *LockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetLockBox(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/lombard_token_pool/lombard_token_pool.go b/chains/evm/deployment/v2_0_0/operations/lombard_token_pool/lombard_token_pool.go index 5a13cdb614..a2e4c34aae 100644 --- a/chains/evm/deployment/v2_0_0/operations/lombard_token_pool/lombard_token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/lombard_token_pool/lombard_token_pool.go @@ -119,7 +119,7 @@ var SetPath = contract.NewWrite(contract.WriteParams[SetPathArgs, *LombardTokenP Description: "Calls setPath on the contract", ContractType: ContractType, ContractABI: LombardTokenPoolABI, - NewContract: NewLombardTokenPoolContract, + //NewContract: NewLombardTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*LombardTokenPoolContract, SetPathArgs], Validate: func(SetPathArgs) error { return nil }, CallContract: func( @@ -136,7 +136,7 @@ var GetPath = contract.NewRead(contract.ReadParams[uint64, Path, *LombardTokenPo Version: Version, Description: "Calls getPath on the contract", ContractType: ContractType, - NewContract: NewLombardTokenPoolContract, + //NewContract: NewLombardTokenPoolContract, CallContract: func(c *LombardTokenPoolContract, opts *bind.CallOpts, args uint64) (Path, error) { return c.GetPath(opts, args) }, diff --git a/chains/evm/deployment/v2_0_0/operations/lombard_verifier/lombard_verifier.go b/chains/evm/deployment/v2_0_0/operations/lombard_verifier/lombard_verifier.go index ff0f34721d..e03348087c 100644 --- a/chains/evm/deployment/v2_0_0/operations/lombard_verifier/lombard_verifier.go +++ b/chains/evm/deployment/v2_0_0/operations/lombard_verifier/lombard_verifier.go @@ -319,7 +319,7 @@ var ApplyRemoteChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]Rem Description: "Calls applyRemoteChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, []RemoteChainConfigArgs], Validate: func([]RemoteChainConfigArgs) error { return nil }, CallContract: func( @@ -337,7 +337,7 @@ var SetPath = contract.NewWrite(contract.WriteParams[SetPathArgs, *LombardVerifi Description: "Calls setPath on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, SetPathArgs], Validate: func(SetPathArgs) error { return nil }, CallContract: func( @@ -355,7 +355,7 @@ var UpdateSupportedTokens = contract.NewWrite(contract.WriteParams[UpdateSupport Description: "Calls updateSupportedTokens on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, UpdateSupportedTokensArgs], Validate: func(UpdateSupportedTokensArgs) error { return nil }, CallContract: func( @@ -373,7 +373,7 @@ var SetRemoteAdapters = contract.NewWrite(contract.WriteParams[[]RemoteAdapterAr Description: "Calls setRemoteAdapters on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, []RemoteAdapterArgs], Validate: func([]RemoteAdapterArgs) error { return nil }, CallContract: func( @@ -391,7 +391,7 @@ var SetAllowedFinalityConfig = contract.NewWrite(contract.WriteParams[[4]byte, * Description: "Calls setAllowedFinalityConfig on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, [4]byte], Validate: func([4]byte) error { return nil }, CallContract: func( @@ -409,7 +409,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *Lo Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( @@ -427,7 +427,7 @@ var ApplyAllowlistUpdates = contract.NewWrite(contract.WriteParams[[]AllowlistCo Description: "Calls applyAllowlistUpdates on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, []AllowlistConfigArgs], Validate: func([]AllowlistConfigArgs) error { return nil }, CallContract: func( @@ -445,7 +445,7 @@ var RemovePaths = contract.NewWrite(contract.WriteParams[[]uint64, *LombardVerif Description: "Calls removePaths on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, []uint64], Validate: func([]uint64) error { return nil }, CallContract: func( @@ -463,7 +463,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: LombardVerifierABI, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, IsAllowedCaller: contract.OnlyOwner[*LombardVerifierContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -480,7 +480,7 @@ var VersionTag = contract.NewRead(contract.ReadParams[struct{}, [4]byte, *Lombar Version: Version, Description: "Calls versionTag on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.VersionTag(opts) }, @@ -491,7 +491,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -502,7 +502,7 @@ var GetPath = contract.NewRead(contract.ReadParams[uint64, Path, *LombardVerifie Version: Version, Description: "Calls getPath on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args uint64) (Path, error) { return c.GetPath(opts, args) }, @@ -513,7 +513,7 @@ var GetRemoteAdapter = contract.NewRead(contract.ReadParams[GetRemoteAdapterArgs Version: Version, Description: "Calls getRemoteAdapter on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args GetRemoteAdapterArgs) ([32]byte, error) { return c.GetRemoteAdapter(opts, args.RemoteChainSelector, args.Token) }, @@ -524,7 +524,7 @@ var GetRemoteChainConfig = contract.NewRead(contract.ReadParams[uint64, GetRemot Version: Version, Description: "Calls getRemoteChainConfig on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args uint64) (GetRemoteChainConfigResult, error) { return c.GetRemoteChainConfig(opts, args) }, @@ -535,7 +535,7 @@ var GetStorageLocations = contract.NewRead(contract.ReadParams[struct{}, []strin Version: Version, Description: "Calls getStorageLocations on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args struct{}) ([]string, error) { return c.GetStorageLocations(opts) }, @@ -546,7 +546,7 @@ var GetSupportedChains = contract.NewRead(contract.ReadParams[struct{}, []uint64 Version: Version, Description: "Calls getSupportedChains on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args struct{}) ([]uint64, error) { return c.GetSupportedChains(opts) }, @@ -557,7 +557,7 @@ var GetSupportedTokens = contract.NewRead(contract.ReadParams[struct{}, []common Version: Version, Description: "Calls getSupportedTokens on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetSupportedTokens(opts) }, @@ -568,7 +568,7 @@ var IsSupportedToken = contract.NewRead(contract.ReadParams[common.Address, bool Version: Version, Description: "Calls isSupportedToken on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args common.Address) (bool, error) { return c.IsSupportedToken(opts, args) }, @@ -579,7 +579,7 @@ var GetFee = contract.NewRead(contract.ReadParams[GetFeeArgs, GetFeeResult, *Lom Version: Version, Description: "Calls getFee on the contract", ContractType: ContractType, - NewContract: NewLombardVerifierContract, + //NewContract: NewLombardVerifierContract, CallContract: func(c *LombardVerifierContract, opts *bind.CallOpts, args GetFeeArgs) (GetFeeResult, error) { return c.GetFee(opts, args.DestChainSelector, args.Arg1, args.Arg2, args.RequestedFinality) }, diff --git a/chains/evm/deployment/v2_0_0/operations/mock_receiver_v2/mock_receiver_v2.go b/chains/evm/deployment/v2_0_0/operations/mock_receiver_v2/mock_receiver_v2.go index acff1cd840..4a2ca8c035 100644 --- a/chains/evm/deployment/v2_0_0/operations/mock_receiver_v2/mock_receiver_v2.go +++ b/chains/evm/deployment/v2_0_0/operations/mock_receiver_v2/mock_receiver_v2.go @@ -118,7 +118,7 @@ var GetCCVsAndFinalityConfig = contract.NewRead(contract.ReadParams[GetCCVsAndFi Version: Version, Description: "Calls getCCVsAndFinalityConfig on the contract", ContractType: ContractType, - NewContract: NewMockReceiverV2Contract, + //NewContract: NewMockReceiverV2Contract, CallContract: func(c *MockReceiverV2Contract, opts *bind.CallOpts, args GetCCVsAndFinalityConfigArgs) (GetCCVsAndFinalityConfigResult, error) { return c.GetCCVsAndFinalityConfig(opts, args.Arg0, args.Arg1) }, @@ -130,7 +130,7 @@ var SetAllowedFinalityConfig = contract.NewWrite(contract.WriteParams[[4]byte, * Description: "Calls setAllowedFinalityConfig on the contract", ContractType: ContractType, ContractABI: MockReceiverV2ABI, - NewContract: NewMockReceiverV2Contract, + //NewContract: NewMockReceiverV2Contract, IsAllowedCaller: contract.AllCallersAllowed[*MockReceiverV2Contract, [4]byte], Validate: func([4]byte) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v2_0_0/operations/offramp/offramp.go b/chains/evm/deployment/v2_0_0/operations/offramp/offramp.go index b3dc964557..88ac0be579 100644 --- a/chains/evm/deployment/v2_0_0/operations/offramp/offramp.go +++ b/chains/evm/deployment/v2_0_0/operations/offramp/offramp.go @@ -153,7 +153,7 @@ var ApplySourceChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]Sou Description: "Calls applySourceChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: OffRampABI, - NewContract: NewOffRampContract, + //NewContract: NewOffRampContract, IsAllowedCaller: contract.OnlyOwner[*OffRampContract, []SourceChainConfigArgs], Validate: func([]SourceChainConfigArgs) error { return nil }, CallContract: func( @@ -170,7 +170,7 @@ var GetSourceChainConfig = contract.NewRead(contract.ReadParams[uint64, SourceCh Version: Version, Description: "Calls getSourceChainConfig on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + //NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args uint64) (SourceChainConfig, error) { return c.GetSourceChainConfig(opts, args) }, @@ -181,7 +181,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + //NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, @@ -192,7 +192,7 @@ var GetAllSourceChainConfigs = contract.NewRead(contract.ReadParams[struct{}, Ge Version: Version, Description: "Calls getAllSourceChainConfigs on the contract", ContractType: ContractType, - NewContract: NewOffRampContract, + //NewContract: NewOffRampContract, CallContract: func(c *OffRampContract, opts *bind.CallOpts, args struct{}) (GetAllSourceChainConfigsResult, error) { return c.GetAllSourceChainConfigs(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/onramp/onramp.go b/chains/evm/deployment/v2_0_0/operations/onramp/onramp.go index 8e413bd335..0c87759c38 100644 --- a/chains/evm/deployment/v2_0_0/operations/onramp/onramp.go +++ b/chains/evm/deployment/v2_0_0/operations/onramp/onramp.go @@ -169,7 +169,7 @@ var ApplyDestChainConfigUpdates = contract.NewWrite(contract.WriteParams[[]DestC Description: "Calls applyDestChainConfigUpdates on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, []DestChainConfigArgs], Validate: func([]DestChainConfigArgs) error { return nil }, CallContract: func( @@ -187,7 +187,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[DynamicConfig, *On Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, DynamicConfig], Validate: func(DynamicConfig) error { return nil }, CallContract: func( @@ -205,7 +205,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: OnRampABI, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, IsAllowedCaller: contract.OnlyOwner[*OnRampContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -222,7 +222,7 @@ var GetDestChainConfig = contract.NewRead(contract.ReadParams[uint64, DestChainC Version: Version, Description: "Calls getDestChainConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args uint64) (DestChainConfig, error) { return c.GetDestChainConfig(opts, args) }, @@ -233,7 +233,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, DynamicCon Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args struct{}) (DynamicConfig, error) { return c.GetDynamicConfig(opts) }, @@ -244,7 +244,7 @@ var GetStaticConfig = contract.NewRead(contract.ReadParams[struct{}, StaticConfi Version: Version, Description: "Calls getStaticConfig on the contract", ContractType: ContractType, - NewContract: NewOnRampContract, + //NewContract: NewOnRampContract, CallContract: func(c *OnRampContract, opts *bind.CallOpts, args struct{}) (StaticConfig, error) { return c.GetStaticConfig(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/proxy/proxy.go b/chains/evm/deployment/v2_0_0/operations/proxy/proxy.go index 63a43c7476..40fb1f702f 100644 --- a/chains/evm/deployment/v2_0_0/operations/proxy/proxy.go +++ b/chains/evm/deployment/v2_0_0/operations/proxy/proxy.go @@ -118,7 +118,7 @@ var SetTarget = contract.NewWrite(contract.WriteParams[common.Address, *ProxyCon Description: "Calls setTarget on the contract", ContractType: ContractType, ContractABI: ProxyABI, - NewContract: NewProxyContract, + //NewContract: NewProxyContract, IsAllowedCaller: contract.OnlyOwner[*ProxyContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -136,7 +136,7 @@ var SetFeeAggregator = contract.NewWrite(contract.WriteParams[common.Address, *P Description: "Calls setFeeAggregator on the contract", ContractType: ContractType, ContractABI: ProxyABI, - NewContract: NewProxyContract, + //NewContract: NewProxyContract, IsAllowedCaller: contract.OnlyOwner[*ProxyContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -154,7 +154,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[[]common.Address, Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: ProxyABI, - NewContract: NewProxyContract, + //NewContract: NewProxyContract, IsAllowedCaller: contract.OnlyOwner[*ProxyContract, []common.Address], Validate: func([]common.Address) error { return nil }, CallContract: func( @@ -171,7 +171,7 @@ var GetTarget = contract.NewRead(contract.ReadParams[struct{}, common.Address, * Version: Version, Description: "Calls getTarget on the contract", ContractType: ContractType, - NewContract: NewProxyContract, + //NewContract: NewProxyContract, CallContract: func(c *ProxyContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetTarget(opts) }, @@ -182,7 +182,7 @@ var GetFeeAggregator = contract.NewRead(contract.ReadParams[struct{}, common.Add Version: Version, Description: "Calls getFeeAggregator on the contract", ContractType: ContractType, - NewContract: NewProxyContract, + //NewContract: NewProxyContract, CallContract: func(c *ProxyContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetFeeAggregator(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go b/chains/evm/deployment/v2_0_0/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go index 07e5abe6a0..d9b60807a3 100644 --- a/chains/evm/deployment/v2_0_0/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/siloed_lock_release_token_pool/siloed_lock_release_token_pool.go @@ -111,7 +111,7 @@ var GetLockBox = contract.NewRead(contract.ReadParams[uint64, common.Address, *S Version: Version, Description: "Calls getLockBox on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + //NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args uint64) (common.Address, error) { return c.GetLockBox(opts, args) }, @@ -122,7 +122,7 @@ var GetAllLockBoxConfigs = contract.NewRead(contract.ReadParams[struct{}, []Lock Version: Version, Description: "Calls getAllLockBoxConfigs on the contract", ContractType: ContractType, - NewContract: NewSiloedLockReleaseTokenPoolContract, + //NewContract: NewSiloedLockReleaseTokenPoolContract, CallContract: func(c *SiloedLockReleaseTokenPoolContract, opts *bind.CallOpts, args struct{}) ([]LockBoxConfig, error) { return c.GetAllLockBoxConfigs(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/siloed_usdc_token_pool/siloed_usdc_token_pool.go b/chains/evm/deployment/v2_0_0/operations/siloed_usdc_token_pool/siloed_usdc_token_pool.go index c9a685238c..d024e05897 100644 --- a/chains/evm/deployment/v2_0_0/operations/siloed_usdc_token_pool/siloed_usdc_token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/siloed_usdc_token_pool/siloed_usdc_token_pool.go @@ -127,7 +127,7 @@ var ConfigureLockBoxes = contract.NewWrite(contract.WriteParams[[]LockBoxConfig, Description: "Calls configureLockBoxes on the contract", ContractType: ContractType, ContractABI: SiloedUSDCTokenPoolABI, - NewContract: NewSiloedUSDCTokenPoolContract, + //NewContract: NewSiloedUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedUSDCTokenPoolContract, []LockBoxConfig], Validate: func([]LockBoxConfig) error { return nil }, CallContract: func( @@ -145,7 +145,7 @@ var ApplyAuthorizedCallerUpdates = contract.NewWrite(contract.WriteParams[Author Description: "Calls applyAuthorizedCallerUpdates on the contract", ContractType: ContractType, ContractABI: SiloedUSDCTokenPoolABI, - NewContract: NewSiloedUSDCTokenPoolContract, + //NewContract: NewSiloedUSDCTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*SiloedUSDCTokenPoolContract, AuthorizedCallerArgs], Validate: func(AuthorizedCallerArgs) error { return nil }, CallContract: func( @@ -162,7 +162,7 @@ var GetAllAuthorizedCallers = contract.NewRead(contract.ReadParams[struct{}, []c Version: Version, Description: "Calls getAllAuthorizedCallers on the contract", ContractType: ContractType, - NewContract: NewSiloedUSDCTokenPoolContract, + //NewContract: NewSiloedUSDCTokenPoolContract, CallContract: func(c *SiloedUSDCTokenPoolContract, opts *bind.CallOpts, args struct{}) ([]common.Address, error) { return c.GetAllAuthorizedCallers(opts) }, @@ -173,7 +173,7 @@ var GetAllLockBoxConfigs = contract.NewRead(contract.ReadParams[struct{}, []Lock Version: Version, Description: "Calls getAllLockBoxConfigs on the contract", ContractType: ContractType, - NewContract: NewSiloedUSDCTokenPoolContract, + //NewContract: NewSiloedUSDCTokenPoolContract, CallContract: func(c *SiloedUSDCTokenPoolContract, opts *bind.CallOpts, args struct{}) ([]LockBoxConfig, error) { return c.GetAllLockBoxConfigs(opts) }, diff --git a/chains/evm/deployment/v2_0_0/operations/token_pool/token_pool.go b/chains/evm/deployment/v2_0_0/operations/token_pool/token_pool.go index 2de9efde62..75f69cf76f 100644 --- a/chains/evm/deployment/v2_0_0/operations/token_pool/token_pool.go +++ b/chains/evm/deployment/v2_0_0/operations/token_pool/token_pool.go @@ -329,7 +329,7 @@ var SetAllowedFinalityConfig = contract.NewWrite(contract.WriteParams[[4]byte, * Description: "Calls setAllowedFinalityConfig on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, [4]byte], Validate: func([4]byte) error { return nil }, CallContract: func( @@ -347,7 +347,7 @@ var AddRemotePool = contract.NewWrite(contract.WriteParams[AddRemotePoolArgs, *T Description: "Calls addRemotePool on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, AddRemotePoolArgs], Validate: func(AddRemotePoolArgs) error { return nil }, CallContract: func( @@ -365,7 +365,7 @@ var RemoveRemotePool = contract.NewWrite(contract.WriteParams[RemoveRemotePoolAr Description: "Calls removeRemotePool on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, RemoveRemotePoolArgs], Validate: func(RemoveRemotePoolArgs) error { return nil }, CallContract: func( @@ -383,7 +383,7 @@ var SetDynamicConfig = contract.NewWrite(contract.WriteParams[SetDynamicConfigAr Description: "Calls setDynamicConfig on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, SetDynamicConfigArgs], Validate: func(SetDynamicConfigArgs) error { return nil }, CallContract: func( @@ -401,7 +401,7 @@ var WithdrawFeeTokens = contract.NewWrite(contract.WriteParams[WithdrawFeeTokens Description: "Calls withdrawFeeTokens on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, WithdrawFeeTokensArgs], Validate: func(WithdrawFeeTokensArgs) error { return nil }, CallContract: func( @@ -419,7 +419,7 @@ var UpdateAdvancedPoolHooks = contract.NewWrite(contract.WriteParams[common.Addr Description: "Calls updateAdvancedPoolHooks on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( @@ -437,7 +437,7 @@ var ApplyChainUpdates = contract.NewWrite(contract.WriteParams[ApplyChainUpdates Description: "Calls applyChainUpdates on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, ApplyChainUpdatesArgs], Validate: func(ApplyChainUpdatesArgs) error { return nil }, CallContract: func( @@ -455,7 +455,7 @@ var SetRateLimitConfig = contract.NewWrite(contract.WriteParams[[]RateLimitConfi Description: "Calls setRateLimitConfig on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, []RateLimitConfigArgs], Validate: func([]RateLimitConfigArgs) error { return nil }, CallContract: func( @@ -473,7 +473,7 @@ var ApplyTokenTransferFeeConfigUpdates = contract.NewWrite(contract.WriteParams[ Description: "Calls applyTokenTransferFeeConfigUpdates on the contract", ContractType: ContractType, ContractABI: TokenPoolABI, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, IsAllowedCaller: contract.OnlyOwner[*TokenPoolContract, ApplyTokenTransferFeeConfigUpdatesArgs], Validate: func(ApplyTokenTransferFeeConfigUpdatesArgs) error { return nil }, CallContract: func( @@ -490,7 +490,7 @@ var GetDynamicConfig = contract.NewRead(contract.ReadParams[struct{}, GetDynamic Version: Version, Description: "Calls getDynamicConfig on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (GetDynamicConfigResult, error) { return c.GetDynamicConfig(opts) }, @@ -501,7 +501,7 @@ var GetRmnProxy = contract.NewRead(contract.ReadParams[struct{}, common.Address, Version: Version, Description: "Calls getRmnProxy on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetRmnProxy(opts) }, @@ -512,7 +512,7 @@ var GetCurrentRateLimiterState = contract.NewRead(contract.ReadParams[GetCurrent Version: Version, Description: "Calls getCurrentRateLimiterState on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args GetCurrentRateLimiterStateArgs) (GetCurrentRateLimiterStateResult, error) { return c.GetCurrentRateLimiterState(opts, args.RemoteChainSelector, args.FastFinality) }, @@ -523,7 +523,7 @@ var GetAllowedFinalityConfig = contract.NewRead(contract.ReadParams[struct{}, [4 Version: Version, Description: "Calls getAllowedFinalityConfig on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) ([4]byte, error) { return c.GetAllowedFinalityConfig(opts) }, @@ -534,7 +534,7 @@ var GetSupportedChains = contract.NewRead(contract.ReadParams[struct{}, []uint64 Version: Version, Description: "Calls getSupportedChains on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) ([]uint64, error) { return c.GetSupportedChains(opts) }, @@ -545,7 +545,7 @@ var GetRemotePools = contract.NewRead(contract.ReadParams[uint64, [][]byte, *Tok Version: Version, Description: "Calls getRemotePools on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) ([][]byte, error) { return c.GetRemotePools(opts, args) }, @@ -556,7 +556,7 @@ var GetRemoteToken = contract.NewRead(contract.ReadParams[uint64, []byte, *Token Version: Version, Description: "Calls getRemoteToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args uint64) ([]byte, error) { return c.GetRemoteToken(opts, args) }, @@ -567,7 +567,7 @@ var GetToken = contract.NewRead(contract.ReadParams[struct{}, common.Address, *T Version: Version, Description: "Calls getToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetToken(opts) }, @@ -578,7 +578,7 @@ var GetTokenDecimals = contract.NewRead(contract.ReadParams[struct{}, uint8, *To Version: Version, Description: "Calls getTokenDecimals on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (uint8, error) { return c.GetTokenDecimals(opts) }, @@ -589,7 +589,7 @@ var IsSupportedToken = contract.NewRead(contract.ReadParams[common.Address, bool Version: Version, Description: "Calls isSupportedToken on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args common.Address) (bool, error) { return c.IsSupportedToken(opts, args) }, @@ -600,7 +600,7 @@ var GetAdvancedPoolHooks = contract.NewRead(contract.ReadParams[struct{}, common Version: Version, Description: "Calls getAdvancedPoolHooks on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args struct{}) (common.Address, error) { return c.GetAdvancedPoolHooks(opts) }, @@ -611,7 +611,7 @@ var GetTokenTransferFeeConfig = contract.NewRead(contract.ReadParams[GetTokenTra Version: Version, Description: "Calls getTokenTransferFeeConfig on the contract", ContractType: ContractType, - NewContract: NewTokenPoolContract, + //NewContract: NewTokenPoolContract, CallContract: func(c *TokenPoolContract, opts *bind.CallOpts, args GetTokenTransferFeeConfigArgs) (TokenTransferFeeConfig, error) { return c.GetTokenTransferFeeConfig(opts, args.Arg0, args.DestChainSelector, args.Arg2, args.Arg3) }, diff --git a/chains/evm/deployment/v2_0_0/operations/usdc_token_pool_proxy/usdc_token_pool_proxy.go b/chains/evm/deployment/v2_0_0/operations/usdc_token_pool_proxy/usdc_token_pool_proxy.go index 92a009935b..6e958facfd 100644 --- a/chains/evm/deployment/v2_0_0/operations/usdc_token_pool_proxy/usdc_token_pool_proxy.go +++ b/chains/evm/deployment/v2_0_0/operations/usdc_token_pool_proxy/usdc_token_pool_proxy.go @@ -121,7 +121,7 @@ var GetPools = contract.NewRead(contract.ReadParams[struct{}, PoolAddresses, *US Version: Version, Description: "Calls getPools on the contract", ContractType: ContractType, - NewContract: NewUSDCTokenPoolProxyContract, + //NewContract: NewUSDCTokenPoolProxyContract, CallContract: func(c *USDCTokenPoolProxyContract, opts *bind.CallOpts, args struct{}) (PoolAddresses, error) { return c.GetPools(opts) }, @@ -133,7 +133,7 @@ var UpdateLockOrBurnMechanisms = contract.NewWrite(contract.WriteParams[UpdateLo Description: "Calls updateLockOrBurnMechanisms on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolProxyABI, - NewContract: NewUSDCTokenPoolProxyContract, + //NewContract: NewUSDCTokenPoolProxyContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolProxyContract, UpdateLockOrBurnMechanismsArgs], Validate: func(UpdateLockOrBurnMechanismsArgs) error { return nil }, CallContract: func( @@ -151,7 +151,7 @@ var UpdatePoolAddresses = contract.NewWrite(contract.WriteParams[PoolAddresses, Description: "Calls updatePoolAddresses on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolProxyABI, - NewContract: NewUSDCTokenPoolProxyContract, + //NewContract: NewUSDCTokenPoolProxyContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolProxyContract, PoolAddresses], Validate: func(PoolAddresses) error { return nil }, CallContract: func( @@ -169,7 +169,7 @@ var SetFeeAggregator = contract.NewWrite(contract.WriteParams[common.Address, *U Description: "Calls setFeeAggregator on the contract", ContractType: ContractType, ContractABI: USDCTokenPoolProxyABI, - NewContract: NewUSDCTokenPoolProxyContract, + //NewContract: NewUSDCTokenPoolProxyContract, IsAllowedCaller: contract.OnlyOwner[*USDCTokenPoolProxyContract, common.Address], Validate: func(common.Address) error { return nil }, CallContract: func( diff --git a/chains/evm/deployment/v2_0_0/sequences/cctp/configure_cctp_chain_for_lanes.go b/chains/evm/deployment/v2_0_0/sequences/cctp/configure_cctp_chain_for_lanes.go index 98729c494f..b45d28fc0f 100644 --- a/chains/evm/deployment/v2_0_0/sequences/cctp/configure_cctp_chain_for_lanes.go +++ b/chains/evm/deployment/v2_0_0/sequences/cctp/configure_cctp_chain_for_lanes.go @@ -527,9 +527,9 @@ func buildCCTPV1PoolDomainUpdates(dep adapters.ConfigureCCTPChainForLanesDeps, i // applyVerifierResolverOutboundWrites sets the outbound implementation on the CCTPVerifierResolver. func applyVerifierResolverOutboundWrites(b cldf_ops.Bundle, chain evm.Chain, resolverAddress common.Address, args []versioned_verifier_resolver.OutboundImplementationArgs) ([]contract_utils.WriteOutput, error) { report, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyOutboundImplementationUpdates, chain, contract_utils.FunctionInput[[]versioned_verifier_resolver.OutboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: resolverAddress, - Args: args, + // ChainSelector: chain.Selector, + // Address: resolverAddress, + Args: args, }) if err != nil { return nil, fmt.Errorf("failed to set outbound implementation on CCTPVerifierResolver: %w", err) @@ -540,8 +540,8 @@ func applyVerifierResolverOutboundWrites(b cldf_ops.Bundle, chain evm.Chain, res // applyUSDCTokenPoolProxyMechanismWrites updates lock/burn mechanisms on the USDCTokenPoolProxy. func applyUSDCTokenPoolProxyMechanismWrites(b cldf_ops.Bundle, chain evm.Chain, proxyAddress common.Address, remoteChainSelectors []uint64, mechanisms []uint8) ([]contract_utils.WriteOutput, error) { report, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_proxy.UpdateLockOrBurnMechanisms, chain, contract_utils.FunctionInput[usdc_token_pool_proxy.UpdateLockOrBurnMechanismsArgs]{ - ChainSelector: chain.Selector, - Address: proxyAddress, + // ChainSelector: chain.Selector, + // Address: proxyAddress, Args: usdc_token_pool_proxy.UpdateLockOrBurnMechanismsArgs{ RemoteChainSelectors: remoteChainSelectors, Mechanisms: mechanisms, @@ -557,18 +557,18 @@ func applyUSDCTokenPoolProxyMechanismWrites(b cldf_ops.Bundle, chain evm.Chain, func applyCCTPVerifierWrites(b cldf_ops.Bundle, chain evm.Chain, verifierAddress common.Address, setDomainArgs []cctp_verifier.SetDomainArgs, remoteChainConfigArgs []cctp_verifier.RemoteChainConfigArgs) ([]contract_utils.WriteOutput, error) { writes := make([]contract_utils.WriteOutput, 0) remoteConfigReport, err := cldf_ops.ExecuteOperation(b, cctp_verifier.ApplyRemoteChainConfigUpdates, chain, contract_utils.FunctionInput[[]cctp_verifier.RemoteChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: verifierAddress, - Args: remoteChainConfigArgs, + // ChainSelector: chain.Selector, + // Address: verifierAddress, + Args: remoteChainConfigArgs, }) if err != nil { return nil, fmt.Errorf("failed to apply remote chain config updates on CCTPVerifier: %w", err) } writes = append(writes, remoteConfigReport.Output) domainsReport, err := cldf_ops.ExecuteOperation(b, cctp_verifier.SetDomains, chain, contract_utils.FunctionInput[[]cctp_verifier.SetDomainArgs]{ - ChainSelector: chain.Selector, - Address: verifierAddress, - Args: setDomainArgs, + // ChainSelector: chain.Selector, + // Address: verifierAddress, + Args: setDomainArgs, }) if err != nil { return nil, fmt.Errorf("failed to set domains on CCTPVerifier: %w", err) @@ -577,16 +577,17 @@ func applyCCTPVerifierWrites(b cldf_ops.Bundle, chain evm.Chain, verifierAddress desiredFinality := finality.Config{BlockDepth: 1}.Raw() currentFinalityReport, err := cldf_ops.ExecuteOperation(b, cctp_verifier.GetAllowedFinalityConfig, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: verifierAddress, + // ChainSelector: chain.Selector, + // Address: verifierAddress, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get allowed finality config from CCTPVerifier: %w", err) } if currentFinalityReport.Output != desiredFinality { setFinalityReport, err := cldf_ops.ExecuteOperation(b, cctp_verifier.SetAllowedFinalityConfig, chain, contract_utils.FunctionInput[[4]byte]{ - ChainSelector: chain.Selector, - Address: verifierAddress, + // ChainSelector: chain.Selector, + // Address: verifierAddress, Args: desiredFinality, }) if err != nil { @@ -601,8 +602,8 @@ func applyCCTPVerifierWrites(b cldf_ops.Bundle, chain evm.Chain, verifierAddress // applyCCTPV2PoolSetDomainsWrites sets domains on the CCTP V2 token pool. func applyCCTPV2PoolSetDomainsWrites(b cldf_ops.Bundle, chain evm.Chain, poolAddress common.Address, domainUpdates []usdc_token_pool_cctp_v2.DomainUpdate) ([]contract_utils.WriteOutput, error) { report, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_cctp_v2.SetDomains, chain, contract_utils.FunctionInput[[]usdc_token_pool_cctp_v2.DomainUpdate]{ - ChainSelector: chain.Selector, - Address: poolAddress, + // ChainSelector: chain.Selector, + // Address: poolAddress, Args: domainUpdates, }) if err != nil { @@ -614,8 +615,8 @@ func applyCCTPV2PoolSetDomainsWrites(b cldf_ops.Bundle, chain evm.Chain, poolAdd // applyCCTPV1PoolSetDomainsWrites sets domains on the CCTP V1 token pool. func applyCCTPV1PoolSetDomainsWrites(b cldf_ops.Bundle, chain evm.Chain, poolAddress common.Address, domainUpdates []usdc_token_pool.DomainUpdate) ([]contract_utils.WriteOutput, error) { report, err := cldf_ops.ExecuteOperation(b, usdc_token_pool.SetDomains, chain, contract_utils.FunctionInput[[]usdc_token_pool.DomainUpdate]{ - ChainSelector: chain.Selector, - Address: poolAddress, + // ChainSelector: chain.Selector, + // Address: poolAddress, Args: domainUpdates, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_cctp_chain.go b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_cctp_chain.go index 816edcb660..44bcbc3522 100644 --- a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_cctp_chain.go +++ b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_cctp_chain.go @@ -90,7 +90,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Deploy/resolve CCTPMessageTransmitterProxy (v2.0.0 op) for CCTPVerifier + CCTP V2 pool wiring. cctpV2MessageTransmitterProxyRef, err := contract_utils.MaybeDeployContract(b, cctp_message_transmitter_proxy.Deploy, chain, contract_utils.DeployInput[cctp_message_transmitter_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(cctp_message_transmitter_proxy.ContractType, *cctp_message_transmitter_proxy.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: cctp_message_transmitter_proxy.ConstructorArgs{ TokenMessenger: tokenMessengerV2Address, }, @@ -104,7 +104,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Deploy CCTPVerifier if needed cctpVerifierRef, err := contract_utils.MaybeDeployContract(b, cctp_verifier.Deploy, chain, contract_utils.DeployInput[cctp_verifier.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(cctp_verifier.ContractType, *cctp_verifier.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: cctp_verifier.ConstructorArgs{ TokenMessenger: tokenMessengerV2Address, MessageTransmitterProxy: cctpV2MessageTransmitterProxyAddress, @@ -135,7 +135,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Deploy token pools // Deploy CCTPThroughCCVTokenPool if needed cctpV2WithCCVsTokenPoolRef, err := contract_utils.MaybeDeployContract(b, cctp_through_ccv_token_pool.Deploy, chain, contract_utils.DeployInput[cctp_through_ccv_token_pool.ConstructorArgs]{ - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, TypeAndVersion: deployment.NewTypeAndVersion(cctp_through_ccv_token_pool.ContractType, *cctp_through_ccv_token_pool.Version), Args: cctp_through_ccv_token_pool.ConstructorArgs{ Token: usdcTokenAddress, @@ -178,7 +178,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( if enableCCTPV1 { tokenMessengerV1Address := common.HexToAddress(input.TokenMessengerV1) cctpV1PoolAddressRef, err := contract_utils.MaybeDeployContract(b, usdc_token_pool.Deploy, chain, contract_utils.DeployInput[usdc_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, TypeAndVersion: deployment.NewTypeAndVersion( usdc_token_pool.ContractType, *usdc_token_pool.Version, @@ -202,7 +202,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Deploy USDCTokenPoolCCTPV2 (CCTP V2 pool) cctpV2TokenPoolAddressRef, err := contract_utils.MaybeDeployContract(b, usdc_token_pool_cctp_v2.Deploy, chain, contract_utils.DeployInput[usdc_token_pool_cctp_v2.ConstructorArgs]{ - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, TypeAndVersion: deployment.NewTypeAndVersion( usdc_token_pool_cctp_v2.ContractType, *usdc_token_pool_cctp_v2.Version, @@ -225,7 +225,7 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Deploy USDCTokenPoolProxy usdcTokenPoolProxyRef, err := contract_utils.MaybeDeployContract(b, usdc_token_pool_proxy.Deploy, chain, contract_utils.DeployInput[usdc_token_pool_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(usdc_token_pool_proxy.ContractType, *usdc_token_pool_proxy.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: usdc_token_pool_proxy.ConstructorArgs{ Token: usdcTokenAddress, Pools: usdc_token_pool_proxy.PoolAddresses{ @@ -255,8 +255,8 @@ var DeployCCTPChain = cldf_ops.NewSequence( // Set the fee aggregator on the USDCTokenPoolProxy setFeeAggregatorReport, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_proxy.SetFeeAggregator, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: usdcTokenPoolProxyAddress, + // ChainSelector: chain.Selector, + // Address: usdcTokenPoolProxyAddress, Args: feeAggregatorAddress, }) if err != nil { @@ -312,8 +312,9 @@ func configureSiloedPoolProxyWiring( writes := make([]contract_utils.WriteOutput, 0) // Get authorized callers on siloed pool. callersReport, err := cldf_ops.ExecuteOperation(b, siloed_usdc_token_pool.GetAllAuthorizedCallers, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: siloedPoolAddr, + // ChainSelector: chainSelector, + // Address: siloedPoolAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get authorized callers from siloed pool: %w", err) @@ -321,8 +322,8 @@ func configureSiloedPoolProxyWiring( // Authorize proxy if not already authorized. if !slices.Contains(callersReport.Output, proxyAddr) { poolAuthReport, err := cldf_ops.ExecuteOperation(b, siloed_usdc_token_pool.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[siloed_usdc_token_pool.AuthorizedCallerArgs]{ - ChainSelector: chainSelector, - Address: siloedPoolAddr, + // ChainSelector: chainSelector, + // Address: siloedPoolAddr, Args: siloed_usdc_token_pool.AuthorizedCallerArgs{ AddedCallers: []common.Address{proxyAddr}, }, @@ -334,8 +335,9 @@ func configureSiloedPoolProxyWiring( } // Get current pools from proxy. poolsReport, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_proxy.GetPools, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: proxyAddr, + // ChainSelector: chainSelector, + // Address: proxyAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get existing proxy pools: %w", err) @@ -344,8 +346,8 @@ func configureSiloedPoolProxyWiring( // If siloed pool address is not set correctly, update it. if currentPools.SiloedLockReleasePool != siloedPoolAddr { updatePoolsReport, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_proxy.UpdatePoolAddresses, chain, contract_utils.FunctionInput[usdc_token_pool_proxy.PoolAddresses]{ - ChainSelector: chainSelector, - Address: proxyAddr, + // ChainSelector: chainSelector, + // Address: proxyAddr, Args: usdc_token_pool_proxy.PoolAddresses{ CctpV1Pool: currentPools.CctpV1Pool, CctpV2Pool: currentPools.CctpV2Pool, @@ -458,8 +460,8 @@ func applyCCTPAuthorizedCallerWrites( writes := make([]contract_utils.WriteOutput, 0) if enableCCTPV1 { v1MsgTxReport, err := cldf_ops.ExecuteOperation(b, cctp_message_transmitter_proxy_v1_6_2.ConfigureAllowedCallers, chain, contract_utils.FunctionInput[[]cctp_message_transmitter_proxy_v1_6_2.AllowedCallerConfigArgs]{ - ChainSelector: chain.Selector, - Address: cctpV1MessageTransmitterProxyAddr, + // ChainSelector: chain.Selector, + // Address: cctpV1MessageTransmitterProxyAddr, Args: []cctp_message_transmitter_proxy_v1_6_2.AllowedCallerConfigArgs{ {Caller: cctpVerifierAddr, Allowed: true}, {Caller: cctpV1PoolAddr, Allowed: true}, @@ -472,8 +474,8 @@ func applyCCTPAuthorizedCallerWrites( } v2MsgTxReport, err := cldf_ops.ExecuteOperation(b, cctp_message_transmitter_proxy.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[cctp_message_transmitter_proxy.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: cctpV2MessageTransmitterProxyAddr, + // ChainSelector: chain.Selector, + // Address: cctpV2MessageTransmitterProxyAddr, Args: cctp_message_transmitter_proxy.AuthorizedCallerArgs{ AddedCallers: []common.Address{cctpVerifierAddr, cctpV2PoolAddr}, }, @@ -485,8 +487,8 @@ func applyCCTPAuthorizedCallerWrites( if enableCCTPV1 { cctpV1TokenPoolReport, err := cldf_ops.ExecuteOperation(b, usdc_token_pool.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[usdc_token_pool.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: cctpV1PoolAddr, + // ChainSelector: chain.Selector, + // Address: cctpV1PoolAddr, Args: usdc_token_pool.AuthorizedCallerArgs{ AddedCallers: []common.Address{proxyAddr}, }, @@ -498,8 +500,8 @@ func applyCCTPAuthorizedCallerWrites( } cctpV2ThroughCCVTokenPoolReport, err := cldf_ops.ExecuteOperation(b, cctp_through_ccv_token_pool.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[cctp_through_ccv_token_pool.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: cctpV2WithCCVsPoolAddr, + // ChainSelector: chain.Selector, + // Address: cctpV2WithCCVsPoolAddr, Args: cctp_through_ccv_token_pool.AuthorizedCallerArgs{ AddedCallers: []common.Address{proxyAddr}, }, @@ -510,8 +512,8 @@ func applyCCTPAuthorizedCallerWrites( writes = append(writes, cctpV2ThroughCCVTokenPoolReport.Output) cctpV2TokenPoolReport, err := cldf_ops.ExecuteOperation(b, usdc_token_pool_cctp_v2.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[usdc_token_pool_cctp_v2.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: cctpV2PoolAddr, + // ChainSelector: chain.Selector, + // Address: cctpV2PoolAddr, Args: usdc_token_pool_cctp_v2.AuthorizedCallerArgs{ AddedCallers: []common.Address{proxyAddr}, }, @@ -530,15 +532,16 @@ func setCCTPVerifierResolverInbound( cctpVerifierAddr, resolverAddr common.Address, ) ([]contract_utils.WriteOutput, error) { versionTagReport, err := cldf_ops.ExecuteOperation(b, cctp_verifier.VersionTag, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: cctpVerifierAddr, + // ChainSelector: chain.Selector, + // Address: cctpVerifierAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get version tag from CCTPVerifier: %w", err) } report, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyInboundImplementationUpdates, chain, contract_utils.FunctionInput[[]versioned_verifier_resolver.InboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: resolverAddr, + // ChainSelector: chain.Selector, + // Address: resolverAddr, Args: []versioned_verifier_resolver.InboundImplementationArgs{ {Version: versionTagReport.Output, Verifier: cctpVerifierAddr}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release.go b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release.go index 26310c2b03..ac1ad036a2 100644 --- a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release.go +++ b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release.go @@ -58,7 +58,7 @@ var DeploySiloedUSDCLockRelease = cldf_ops.NewSequence( if siloedPoolAddr == "" { poolReport, err := cldf_ops.ExecuteOperation(b, siloed_usdc_token_pool.Deploy, chain, contract_utils.DeployInput[siloed_usdc_token_pool.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(siloed_usdc_token_pool.ContractType, *siloed_usdc_token_pool.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: siloed_usdc_token_pool.ConstructorArgs{ Token: common.HexToAddress(input.USDCToken), LocalTokenDecimals: input.TokenDecimals, @@ -83,7 +83,7 @@ var DeploySiloedUSDCLockRelease = cldf_ops.NewSequence( qualifier := fmt.Sprintf("remoteChainSelector(%d)", sel) lbReport, err := cldf_ops.ExecuteOperation(b, erc20_lock_box.Deploy, chain, contract_utils.DeployInput[erc20_lock_box.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(erc20_lock_box.ContractType, *erc20_lock_box.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Qualifier: &qualifier, Args: erc20_lock_box.ConstructorArgs{ Token: common.HexToAddress(input.USDCToken), @@ -101,8 +101,8 @@ var DeploySiloedUSDCLockRelease = cldf_ops.NewSequence( } cfgReport, err := cldf_ops.ExecuteOperation(b, siloed_usdc_token_pool.ConfigureLockBoxes, chain, contract_utils.FunctionInput[[]siloed_usdc_token_pool.LockBoxConfig]{ - ChainSelector: input.ChainSelector, - Address: siloedPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: siloedPoolAddress, Args: configs, }) if err != nil { @@ -114,11 +114,12 @@ var DeploySiloedUSDCLockRelease = cldf_ops.NewSequence( // Authorize siloed pool on each lockbox for sel := range lockBoxes { lbAddr := lockBoxes[sel] - lockBoxAddress := common.HexToAddress(lbAddr) + // lockBoxAddress := common.HexToAddress(lbAddr) // Check if already authorized callersReport, err := cldf_ops.ExecuteOperation(b, erc20_lock_box.GetAllAuthorizedCallers, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: lockBoxAddress, + // ChainSelector: input.ChainSelector, + // Address: lockBoxAddress, + Args: struct{}{}, }) if err != nil { return DeploySiloedUSDCLockReleaseOutput{}, fmt.Errorf("failed to get authorized callers on lockbox %s (chain %d): %w", lbAddr, sel, err) @@ -126,8 +127,8 @@ var DeploySiloedUSDCLockRelease = cldf_ops.NewSequence( // If not authorized, authorize it if !slices.Contains(callersReport.Output, siloedPoolAddress) { authReport, err := cldf_ops.ExecuteOperation(b, erc20_lock_box.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[erc20_lock_box.AuthorizedCallerArgs]{ - ChainSelector: input.ChainSelector, - Address: lockBoxAddress, + // ChainSelector: input.ChainSelector, + // Address: lockBoxAddress, Args: erc20_lock_box.AuthorizedCallerArgs{ AddedCallers: []common.Address{siloedPoolAddress}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release_test.go b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release_test.go index 97f54b67a9..3dc24901ba 100644 --- a/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/cctp/deploy_siloed_usdc_lock_release_test.go @@ -40,7 +40,7 @@ func setupCCTPTestEnvironment(t *testing.T, e *deployment.Environment, chainSele // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{chain.DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/cctp/migrate_hybrid_lock_release_liquidity.go b/chains/evm/deployment/v2_0_0/sequences/cctp/migrate_hybrid_lock_release_liquidity.go index 31bfc0512c..7fc8ae95bf 100644 --- a/chains/evm/deployment/v2_0_0/sequences/cctp/migrate_hybrid_lock_release_liquidity.go +++ b/chains/evm/deployment/v2_0_0/sequences/cctp/migrate_hybrid_lock_release_liquidity.go @@ -75,8 +75,8 @@ func migrateHybridLockReleaseLiquidity( lockBoxes := make(map[uint64]common.Address, len(selectors)) for _, sel := range selectors { shouldUseReport, err := cldf_ops.ExecuteOperation(b, hybrid_lock_release_usdc_token_pool.ShouldUseLockRelease, chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: hybridPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: hybridPoolAddr, Args: sel, }) if err != nil { @@ -93,8 +93,8 @@ func migrateHybridLockReleaseLiquidity( lockBoxes[sel] = lockBoxAddr lockedReport, err := cldf_ops.ExecuteOperation(b, hybrid_lock_release_usdc_token_pool.GetLockedTokensForChain, chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: hybridPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: hybridPoolAddr, Args: sel, }) if err != nil { @@ -183,8 +183,8 @@ func authorizeLockboxCallers(ctx *migratePhaseCtx) ([]contract_utils.WriteOutput lockBoxAddr := ctx.lockBoxes[sel] lpReport, err := cldf_ops.ExecuteOperation(ctx.b, hybrid_lock_release_usdc_token_pool.GetLiquidityProvider, ctx.chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: ctx.input.ChainSelector, - Address: ctx.hybridPoolAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: ctx.hybridPoolAddr, Args: sel, }) if err != nil { @@ -193,8 +193,8 @@ func authorizeLockboxCallers(ctx *migratePhaseCtx) ([]contract_utils.WriteOutput lp := lpReport.Output callersReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20_lock_box.GetAllAuthorizedCallers, ctx.chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: ctx.input.ChainSelector, - Address: lockBoxAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: lockBoxAddr, Args: struct{}{}, }) if err != nil { @@ -218,8 +218,8 @@ func authorizeLockboxCallers(ctx *migratePhaseCtx) ([]contract_utils.WriteOutput if len(callersToAdd) > 0 { authReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20_lock_box.ApplyAuthorizedCallerUpdates, ctx.chain, contract_utils.FunctionInput[erc20_lock_box.AuthorizedCallerArgs]{ - ChainSelector: ctx.input.ChainSelector, - Address: lockBoxAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: lockBoxAddr, Args: erc20_lock_box.AuthorizedCallerArgs{ AddedCallers: callersToAdd, }, @@ -246,8 +246,8 @@ func migrateLiquidityToLockboxes(ctx *migratePhaseCtx) ([]contract_utils.WriteOu withdrawAmount := new(big.Int).SetUint64(ctx.input.WithdrawAmounts[sel]) withdrawReport, err := cldf_ops.ExecuteOperation(ctx.b, hybrid_lock_release_usdc_token_pool.WithdrawLiquidity, ctx.chain, contract_utils.FunctionInput[hybrid_lock_release_usdc_token_pool.WithdrawLiquidityArgs]{ - ChainSelector: ctx.input.ChainSelector, - Address: ctx.hybridPoolAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: ctx.hybridPoolAddr, Args: hybrid_lock_release_usdc_token_pool.WithdrawLiquidityArgs{ RemoteChainSelector: sel, Amount: withdrawAmount, @@ -259,8 +259,8 @@ func migrateLiquidityToLockboxes(ctx *migratePhaseCtx) ([]contract_utils.WriteOu writes = append(writes, withdrawReport.Output) approveReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20.ApproveProposalOnly, ctx.chain, contract_utils.FunctionInput[erc20.ApproveArgs]{ - ChainSelector: ctx.input.ChainSelector, - Address: ctx.tokenAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: ctx.tokenAddr, Args: erc20.ApproveArgs{ Spender: lockBoxAddr, Value: withdrawAmount, @@ -272,8 +272,8 @@ func migrateLiquidityToLockboxes(ctx *migratePhaseCtx) ([]contract_utils.WriteOu writes = append(writes, approveReport.Output) depositReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20_lock_box.Deposit, ctx.chain, contract_utils.FunctionInput[erc20_lock_box.DepositArgs]{ - ChainSelector: ctx.input.ChainSelector, - Address: lockBoxAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: lockBoxAddr, Args: erc20_lock_box.DepositArgs{ Token: ctx.tokenAddr, RemoteChainSelector: sel, @@ -299,8 +299,8 @@ func transferLockboxOwnershipToLPs(ctx *migratePhaseCtx) ([]contract_utils.Write lockBoxAddr := ctx.lockBoxes[sel] lpReport, err := cldf_ops.ExecuteOperation(ctx.b, hybrid_lock_release_usdc_token_pool.GetLiquidityProvider, ctx.chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: ctx.input.ChainSelector, - Address: ctx.hybridPoolAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: ctx.hybridPoolAddr, Args: sel, }) if err != nil { @@ -313,8 +313,8 @@ func transferLockboxOwnershipToLPs(ctx *migratePhaseCtx) ([]contract_utils.Write } ownerReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20_lock_box.Owner, ctx.chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: ctx.input.ChainSelector, - Address: lockBoxAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: lockBoxAddr, Args: struct{}{}, }) if err != nil { @@ -325,8 +325,8 @@ func transferLockboxOwnershipToLPs(ctx *migratePhaseCtx) ([]contract_utils.Write } transferReport, err := cldf_ops.ExecuteOperation(ctx.b, erc20_lock_box.TransferOwnership, ctx.chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: ctx.input.ChainSelector, - Address: lockBoxAddr, + // ChainSelector: ctx.input.ChainSelector, + // Address: lockBoxAddr, Args: lp, }) if err != nil { @@ -362,8 +362,8 @@ func parseHexAddress(name, address string) (common.Address, error) { func fetchLockBoxesFromSiloedPool(b cldf_ops.Bundle, chain evm.Chain, chainSelector uint64, poolAddress common.Address) (map[uint64]common.Address, error) { lockBoxReport, err := cldf_ops.ExecuteOperation(b, siloed_usdc_token_pool.GetAllLockBoxConfigs, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: poolAddress, + // ChainSelector: chainSelector, + // Address: poolAddress, Args: struct{}{}, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes.go b/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes.go index 1faa1be46a..9d7bdc3f64 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes.go @@ -76,8 +76,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( if !input.AllowOnrampOverride { for remoteSelector := range input.RemoteChains { existing, err := cldf_ops.ExecuteOperation(b, router.GetOnRamp, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: routerAddr, + // ChainSelector: chain.Selector, + // Address: routerAddr, Args: remoteSelector, }) if err != nil { @@ -128,8 +128,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( if remoteConfig.FeeQuoterDestChainConfig.USDPerUnitGas != nil { gasPriceReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.GetDestinationChainGasPrice, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: feeQuoterAddr, + // ChainSelector: chain.Selector, + // Address: feeQuoterAddr, Args: remoteSelector, }) if err != nil { @@ -146,8 +146,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( // Router OnRamp: only add if the router doesn't already point to our OnRamp // for this destination. onRampAddrReport, err := cldf_ops.ExecuteOperation(b, router.GetOnRamp, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: routerAddr, + // ChainSelector: chain.Selector, + // Address: routerAddr, Args: remoteSelector, }) if err != nil { @@ -172,8 +172,9 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( // proxies may point to the same implementation. defaultExecutor := common.HexToAddress(remoteConfig.DefaultExecutor) getTargetReport, err := cldf_ops.ExecuteOperation(b, proxy.GetTarget, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: defaultExecutor, + // ChainSelector: chain.Selector, + // Address: defaultExecutor, + Args: struct{}{}, }) if err != nil { return seqtypes.OnChainOutput{}, fmt.Errorf("failed to get target address of Executor(%s) on chain %s: %w", defaultExecutor, chain, err) @@ -222,8 +223,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( // Each block only emits a write when there are actual changes to apply. if len(offRampArgs) > 0 { offRampReport, err := cldf_ops.ExecuteOperation(b, offramp.ApplySourceChainConfigUpdates, chain, contract.FunctionInput[[]offramp.SourceChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: offRampAddr, + // ChainSelector: chain.Selector, + // Address: offRampAddr, Args: offRampArgs, }) if err != nil { @@ -234,8 +235,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( if len(onRampArgs) > 0 { onRampReport, err := cldf_ops.ExecuteOperation(b, onramp.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]onramp.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: onRampAddr, + // ChainSelector: chain.Selector, + // Address: onRampAddr, Args: onRampArgs, }) if err != nil { @@ -249,8 +250,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( continue } executorReport, err := cldf_ops.ExecuteOperation(b, ExecutorApplyDestChainUpdates, chain, contract.FunctionInput[ExecutorApplyDestChainUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: executorAddr, + // ChainSelector: chain.Selector, + // Address: executorAddr, Args: ExecutorApplyDestChainUpdatesArgs{ DestChainSelectorsToAdd: toAdd, }, @@ -263,8 +264,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( if len(feeQuoterArgs) > 0 { feeQuoterReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]fee_quoter.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: feeQuoterAddr, + // ChainSelector: chain.Selector, + // Address: feeQuoterAddr, Args: feeQuoterArgs, }) if err != nil { @@ -277,8 +278,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( // so they must be applied via FeeQuoter.UpdatePrices. if len(gasPriceUpdates) > 0 { gasPriceReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.UpdatePrices, chain, contract.FunctionInput[fee_quoter.PriceUpdates]{ - ChainSelector: chain.Selector, - Address: feeQuoterAddr, + // ChainSelector: chain.Selector, + // Address: feeQuoterAddr, Args: fee_quoter.PriceUpdates{ GasPriceUpdates: gasPriceUpdates, }, @@ -319,8 +320,8 @@ var ConfigureChainForLanes = cldf_ops.NewSequence( if len(onRampAdds) > 0 || len(offRampAdds) > 0 { routerReport, err := cldf_ops.ExecuteOperation(b, router.ApplyRampUpdates, chain, contract.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: routerAddr, + // ChainSelector: chain.Selector, + // Address: routerAddr, Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: onRampAdds, OffRampRemoves: []router.OffRamp{}, @@ -367,8 +368,8 @@ func maybeAddSourceChainConfigArgOnLocalChain( offRampAddr := common.BytesToAddress(input.OffRamp) currentReport, err := cldf_ops.ExecuteOperation(b, offramp.GetSourceChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: offRampAddr, + // ChainSelector: chain.Selector, + // Address: offRampAddr, Args: remoteSelector, }) if err != nil { @@ -443,8 +444,8 @@ func maybeAddOnRampDestChainConfigArgOnLocalChain( OffRamp: remoteConfig.OffRamp, } currentReport, err := cldf_ops.ExecuteOperation(b, onramp.GetDestChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: onRampAddr, + // ChainSelector: chain.Selector, + // Address: onRampAddr, Args: remoteSelector, }) if err != nil { @@ -590,7 +591,7 @@ func configureCommitteeVerifierAsSource( chainSelector uint64, cv changesetadapters.CommitteeVerifierConfig[datastore.AddressRef], ) ([]contract.WriteOutput, error) { - cvAddr, resolverAddr, err := extractCommitteeVerifierAddresses(cv.CommitteeVerifier, chainSelector) + cvAddr, _, err := extractCommitteeVerifierAddresses(cv.CommitteeVerifier, chainSelector) if err != nil { return nil, err } @@ -608,8 +609,8 @@ func configureCommitteeVerifierAsSource( PayloadSizeBytes: remoteConfig.PayloadSizeBytes, } currentRemoteReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetRemoteChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: remoteSelector, }) if err != nil { @@ -621,8 +622,8 @@ func configureCommitteeVerifierAsSource( remoteChainConfigArgs = append(remoteChainConfigArgs, desired) } else { getFeeReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetFee, chain, contract.FunctionInput[committee_verifier.GetFeeArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: committee_verifier.GetFeeArgs{ DestChainSelector: remoteSelector, }, @@ -653,8 +654,9 @@ func configureCommitteeVerifierAsSource( } currentOutboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.GetAllOutboundImplementations, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(resolverAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(resolverAddr), + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get outbound implementations from CommitteeVerifierResolver on chain %s: %w", chain, err) @@ -678,8 +680,8 @@ func configureCommitteeVerifierAsSource( if len(remoteChainConfigArgs) > 0 { report, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplyRemoteChainConfigUpdates, chain, contract.FunctionInput[[]committee_verifier.RemoteChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: remoteChainConfigArgs, }) if err != nil { @@ -690,8 +692,8 @@ func configureCommitteeVerifierAsSource( if len(allowlistArgs) > 0 { report, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplyAllowlistUpdates, chain, contract.FunctionInput[[]committee_verifier.AllowlistConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: allowlistArgs, }) if err != nil { @@ -702,8 +704,8 @@ func configureCommitteeVerifierAsSource( if len(outboundArgs) > 0 { report, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyOutboundImplementationUpdates, chain, contract.FunctionInput[[]versioned_verifier_resolver.OutboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(resolverAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(resolverAddr), Args: outboundArgs, }) if err != nil { @@ -715,16 +717,17 @@ func configureCommitteeVerifierAsSource( if !cv.AllowedFinalityConfig.IsZero() { desiredFinality := cv.AllowedFinalityConfig.Raw() currentFinalityReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetAllowedFinalityConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get allowed finality config from CommitteeVerifier on chain %s: %w", chain, err) } if currentFinalityReport.Output != desiredFinality { setFinalityReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.SetAllowedFinalityConfig, chain, contract.FunctionInput[[4]byte]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: desiredFinality, }) if err != nil { @@ -749,7 +752,7 @@ func configureCommitteeVerifierAsDest( chainSelector uint64, cv changesetadapters.CommitteeVerifierConfig[datastore.AddressRef], ) ([]contract.WriteOutput, error) { - cvAddr, resolverAddr, err := extractCommitteeVerifierAddresses(cv.CommitteeVerifier, chainSelector) + cvAddr, _, err := extractCommitteeVerifierAddresses(cv.CommitteeVerifier, chainSelector) if err != nil { return nil, err } @@ -766,8 +769,8 @@ func configureCommitteeVerifierAsDest( Signers: signers, } currentSigReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetSignatureConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: remoteSelector, }) if err != nil { @@ -783,8 +786,8 @@ func configureCommitteeVerifierAsDest( if len(signatureConfigs) > 0 { report, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplySignatureConfigs, chain, contract.FunctionInput[committee_verifier.ApplySignatureConfigsArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), Args: committee_verifier.ApplySignatureConfigsArgs{ SignatureConfigs: signatureConfigs, }, @@ -796,8 +799,9 @@ func configureCommitteeVerifierAsDest( } versionTagReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.VersionTag, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(cvAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(cvAddr), + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get version tag from CommitteeVerifier on chain %s: %w", chain, err) @@ -807,8 +811,9 @@ func configureCommitteeVerifierAsDest( Verifier: common.HexToAddress(cvAddr), } currentInboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.GetAllInboundImplementations, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(resolverAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(resolverAddr), + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get inbound implementations from CommitteeVerifierResolver on chain %s: %w", chain, err) @@ -822,8 +827,8 @@ func configureCommitteeVerifierAsDest( } if !inboundAlreadySet { report, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyInboundImplementationUpdates, chain, contract.FunctionInput[[]versioned_verifier_resolver.InboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(resolverAddr), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(resolverAddr), Args: []versioned_verifier_resolver.InboundImplementationArgs{desiredInbound}, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes_test.go b/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes_test.go index bd94868efd..ba06d21455 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_chain_for_lanes_test.go @@ -55,7 +55,7 @@ func deployChain( e.OperationsBundle, create2_factory.Deploy, evmChain, contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{evmChain.DeployerKey.From}}, }, nil, ) @@ -166,20 +166,23 @@ func assertOnChainState( t.Helper() onRampOnRouter, err := operations.ExecuteOperation(b, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + Args: remoteChainSelector, }) require.NoError(t, err) assert.Equal(t, local.onRamp, onRampOnRouter.Output.Hex()) offRampsOnRouter, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + Args: nil, }) require.NoError(t, err) require.Len(t, offRampsOnRouter.Output, 1) assert.Equal(t, local.offRamp, offRampsOnRouter.Output[0].OffRamp.Hex()) srcCfg, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + // Args: remoteChainSelector, }) require.NoError(t, err) assert.True(t, srcCfg.Output.IsEnabled) @@ -190,7 +193,8 @@ func assertOnChainState( assert.Equal(t, local.committeeVerifier, srcCfg.Output.DefaultCCVs[0].Hex()) destCfg, err := operations.ExecuteOperation(b, onramp.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.onRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.onRamp), + Args: remoteChainSelector, }) require.NoError(t, err) assert.Equal(t, local.router, destCfg.Output.Router.Hex()) @@ -200,7 +204,8 @@ func assertOnChainState( assert.Equal(t, local.committeeVerifier, destCfg.Output.DefaultCCVs[0].Hex()) executorDestChains, err := operations.ExecuteOperation(b, executor.GetDestChains, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + Args: struct{}{}, }) require.NoError(t, err) require.Len(t, executorDestChains.Output, 1) @@ -209,7 +214,8 @@ func assertOnChainState( assert.True(t, executorDestChains.Output[0].Config.Enabled) fqDestCfg, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteChainSelector, }) require.NoError(t, err) assert.True(t, fqDestCfg.Output.IsEnabled) @@ -219,7 +225,8 @@ func assertOnChainState( assert.Equal(t, evmFamilySelector, fqDestCfg.Output.ChainFamilySelector) verifierRemoteCfg, err := operations.ExecuteOperation(b, committee_verifier.GetRemoteChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier) + Args: remoteChainSelector, }) require.NoError(t, err) assert.Equal(t, local.router, verifierRemoteCfg.Output.RemoteChainConfig.Router.Hex()) @@ -330,7 +337,8 @@ func TestConfigureChainForLanes_AddingNewLaneDoesNotAffectExistingLane(t *testin assert.True(t, snapshotLaneB.executorEnabled, "lane B executor should be enabled") offRampsOnRouter, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + Args: nil, }) require.NoError(t, err) assert.Len(t, offRampsOnRouter.Output, 2, "router should have offramps for both lanes") @@ -389,7 +397,8 @@ func captureLaneState( var s laneSnapshot srcCfg, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteSelector, }) require.NoError(t, err) s.offRampSourceEnabled = srcCfg.Output.IsEnabled @@ -398,7 +407,8 @@ func captureLaneState( s.offRampDefaultCCVs = srcCfg.Output.DefaultCCVs destCfg, err := operations.ExecuteOperation(b, onramp.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.onRamp), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.onRamp), + Args: remoteSelector, }) require.NoError(t, err) s.onRampDestRouter = destCfg.Output.Router.Hex() @@ -412,7 +422,8 @@ func captureLaneState( s.onRampTokenReceiver = destCfg.Output.TokenReceiverAllowed fqCfg, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteSelector, }) require.NoError(t, err) s.feeQuoterEnabled = fqCfg.Output.IsEnabled @@ -428,7 +439,8 @@ func captureLaneState( s.feeQuoterGasPerByte = fqCfg.Output.DestGasPerPayloadByteBase executorDestChains, err := operations.ExecuteOperation(b, executor.GetDestChains, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + Args: struct{}{}, }) require.NoError(t, err) for _, dc := range executorDestChains.Output { @@ -440,7 +452,8 @@ func captureLaneState( } verifierCfg, err := operations.ExecuteOperation(b, committee_verifier.GetRemoteChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), + Args: remoteSelector, }) require.NoError(t, err) s.verifierRouter = verifierCfg.Output.RemoteChainConfig.Router.Hex() @@ -448,7 +461,7 @@ func captureLaneState( s.verifierAllowedSenders = verifierCfg.Output.AllowedSendersList verifierFee, err := operations.ExecuteOperation(b, committee_verifier.GetFee, evmChain, contract.FunctionInput[committee_verifier.GetFeeArgs]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), Args: committee_verifier.GetFeeArgs{DestChainSelector: remoteSelector}, }) require.NoError(t, err) @@ -457,7 +470,8 @@ func captureLaneState( s.verifierPayloadSize = verifierFee.Output.PayloadSizeBytes sigCfg, err := operations.ExecuteOperation(b, committee_verifier.GetSignatureConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.committeeVerifier), + Args: remoteSelector, }) require.NoError(t, err) s.verifierSigners = sigCfg.Output.Signers @@ -486,7 +500,7 @@ func deployChainWithTestRouter( e.OperationsBundle, create2_factory.Deploy, evmChain, contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{evmChain.DeployerKey.From}}, }, nil, ) @@ -584,33 +598,38 @@ func TestConfigureChainForLanes_ConfiguresMultipleRemoteChainsInSingleCall(t *te b := testsetup.BundleWithFreshReporter(e.OperationsBundle) offRampsOnRouter, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.router), + Args: nil, }) require.NoError(t, err) assert.Len(t, offRampsOnRouter.Output, 2) for _, remoteSelector := range []uint64{remoteA, remoteB} { srcCfg, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteSelector, }) require.NoError(t, err) assert.True(t, srcCfg.Output.IsEnabled, "source chain config for %d should be enabled", remoteSelector) } fqDestA, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteA, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteA, }) require.NoError(t, err) assert.Equal(t, uint32(30_000), fqDestA.Output.MaxDataBytes) fqDestB, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteB, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteB, }) require.NoError(t, err) assert.Equal(t, uint32(50_000), fqDestB.Output.MaxDataBytes) executorDestChains, err := operations.ExecuteOperation(b, executor.GetDestChains, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.executor), + Args: struct{}{}, }) require.NoError(t, err) assert.Len(t, executorDestChains.Output, 2) @@ -828,7 +847,8 @@ func TestConfigureChainForLanes_OverrideExistingFeeQuoterConfig(t *testing.T) { b := testsetup.BundleWithFreshReporter(e.OperationsBundle) fqBefore, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, uint32(30_000), fqBefore.Output.MaxDataBytes) @@ -847,7 +867,8 @@ func TestConfigureChainForLanes_OverrideExistingFeeQuoterConfig(t *testing.T) { b = testsetup.BundleWithFreshReporter(e.OperationsBundle) fqAfterNoOverride, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, uint32(30_000), fqAfterNoOverride.Output.MaxDataBytes, @@ -867,7 +888,8 @@ func TestConfigureChainForLanes_OverrideExistingFeeQuoterConfig(t *testing.T) { b = testsetup.BundleWithFreshReporter(e.OperationsBundle) fqAfterOverride, err := operations.ExecuteOperation(b, fee_quoter.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, uint32(99_000), fqAfterOverride.Output.MaxDataBytes, @@ -903,14 +925,16 @@ func TestConfigureChainForLanes_TestRouterSetup(t *testing.T) { b := testsetup.BundleWithFreshReporter(e.OperationsBundle) onRampOnTestRouter, err := operations.ExecuteOperation(b, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.testRouter), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.testRouter), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, localWithTest.onRamp, onRampOnTestRouter.Output.Hex(), "TestRouter should have OnRamp wired") offRampsOnTestRouter, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.testRouter), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.testRouter), + Args: nil, }) require.NoError(t, err) require.Len(t, offRampsOnTestRouter.Output, 1) @@ -918,35 +942,40 @@ func TestConfigureChainForLanes_TestRouterSetup(t *testing.T) { "TestRouter should have OffRamp wired") onRampOnProdRouter, err := operations.ExecuteOperation(b, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.router), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.router), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, common.Address{}, onRampOnProdRouter.Output, "production Router should NOT have OnRamp wired") offRampsOnProdRouter, err := operations.ExecuteOperation(b, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.router), + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.router), + Args: nil, }) require.NoError(t, err) assert.Empty(t, offRampsOnProdRouter.Output, "production Router should NOT have OffRamps wired") srcCfg, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.offRamp), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.offRamp), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, localWithTest.testRouter, srcCfg.Output.Router.Hex(), "OffRamp source config should reference the TestRouter") destCfg, err := operations.ExecuteOperation(b, onramp.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.onRamp), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.onRamp), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, localWithTest.testRouter, destCfg.Output.Router.Hex(), "OnRamp dest config should reference the TestRouter") verifierCfg, err := operations.ExecuteOperation(b, committee_verifier.GetRemoteChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.committeeVerifier), Args: remoteSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(localWithTest.committeeVerifier), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, localWithTest.testRouter, verifierCfg.Output.RemoteChainConfig.Router.Hex(), @@ -980,7 +1009,8 @@ func TestConfigureChainForLanes_AllowTrafficFromFalseDisablesTraffic(t *testing. b := testsetup.BundleWithFreshReporter(e.OperationsBundle) srcCfgEnabled, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteChainSelector, }) require.NoError(t, err) require.True(t, srcCfgEnabled.Output.IsEnabled, "traffic should be enabled after first run") @@ -998,7 +1028,8 @@ func TestConfigureChainForLanes_AllowTrafficFromFalseDisablesTraffic(t *testing. b = testsetup.BundleWithFreshReporter(e.OperationsBundle) srcCfgDisabled, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteChainSelector, }) require.NoError(t, err) assert.False(t, srcCfgDisabled.Output.IsEnabled, @@ -1032,7 +1063,8 @@ func TestConfigureChainForLanes_AllowTrafficFromFalseToTrueEnablesTraffic(t *tes b := testsetup.BundleWithFreshReporter(e.OperationsBundle) srcCfgDisabled, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteChainSelector, }) require.NoError(t, err) require.False(t, srcCfgDisabled.Output.IsEnabled, "traffic should be disabled after first run") @@ -1047,7 +1079,8 @@ func TestConfigureChainForLanes_AllowTrafficFromFalseToTrueEnablesTraffic(t *tes b = testsetup.BundleWithFreshReporter(e.OperationsBundle) srcCfgEnabled, err := operations.ExecuteOperation(b, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.offRamp), + Args: remoteChainSelector, }) require.NoError(t, err) assert.True(t, srcCfgEnabled.Output.IsEnabled, @@ -1071,8 +1104,8 @@ func TestConfigureChainForLanes_RejectsOnRampOverwriteWhenNotAllowed(t *testing. dummyOnRamp := common.HexToAddress(local.router) _, err = operations.ExecuteOperation(b, router.ApplyRampUpdates, evmChain, contract.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(local.router), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(local.router), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: []router.OnRamp{{DestChainSelector: remoteSelector, OnRamp: dummyOnRamp}}, }, @@ -1092,7 +1125,8 @@ func TestConfigureChainForLanes_RejectsOnRampOverwriteWhenNotAllowed(t *testing. b2 := testsetup.BundleWithFreshReporter(e.OperationsBundle) onRampReport, err := operations.ExecuteOperation(b2, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, Address: common.HexToAddress(local.router), Args: remoteSelector, + // ChainSelector: chainSelector, Address: common.HexToAddress(local.router), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, dummyOnRamp, onRampReport.Output, @@ -1116,8 +1150,8 @@ func TestConfigureChainForLanes_OverwritesOnRampWhenAllowed(t *testing.T) { dummyOnRamp := common.HexToAddress(localWithTest.testRouter) _, err = operations.ExecuteOperation(b, router.ApplyRampUpdates, evmChain, contract.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(localWithTest.testRouter), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(localWithTest.testRouter), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: []router.OnRamp{{DestChainSelector: remoteSelector, OnRamp: dummyOnRamp}}, }, @@ -1136,7 +1170,8 @@ func TestConfigureChainForLanes_OverwritesOnRampWhenAllowed(t *testing.T) { b2 := testsetup.BundleWithFreshReporter(e.OperationsBundle) onRampReport, err := operations.ExecuteOperation(b2, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, Address: common.HexToAddress(localWithTest.testRouter), Args: remoteSelector, + // ChainSelector: chainSelector, Address: common.HexToAddress(localWithTest.testRouter), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, localWithTest.onRamp, onRampReport.Output.Hex(), @@ -1167,7 +1202,8 @@ func TestConfigureChainForLanes_AllowsFirstTimeWriteWithoutOverrideFlag(t *testi evmChain := e.BlockChains.EVMChains()[chainSelector] b := testsetup.BundleWithFreshReporter(e.OperationsBundle) onRampReport, err := operations.ExecuteOperation(b, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, Address: common.HexToAddress(local.router), Args: remoteSelector, + // ChainSelector: chainSelector, Address: common.HexToAddress(local.router), + Args: remoteSelector, }) require.NoError(t, err) assert.Equal(t, local.onRamp, onRampReport.Output.Hex(), @@ -1201,7 +1237,8 @@ func TestConfigureChainForLanes_GasPriceUpdateSkippedWhenAlreadySet(t *testing.T b := testsetup.BundleWithFreshReporter(e.OperationsBundle) gasPrice, err := operations.ExecuteOperation(b, fee_quoter.GetDestinationChainGasPrice, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), Args: remoteChainSelector, + // ChainSelector: evmChain.Selector, Address: common.HexToAddress(local.feeQuoter), + Args: remoteChainSelector, }) require.NoError(t, err) assert.Equal(t, big.NewInt(42_000), gasPrice.Output.Value, "gas price should be 42000 after first run") diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes.go b/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes.go index 93710fd1b8..f2d5267406 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes.go @@ -67,7 +67,7 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not found", input.ChainSelector) } - committeeVerifier, committeeVerifierResolver, err := extractCommitteeVerifierAddresses(input.CommitteeVerifier, input.ChainSelector) + committeeVerifier, _, err := extractCommitteeVerifierAddresses(input.CommitteeVerifier, input.ChainSelector) if err != nil { return sequences.OnChainOutput{}, err } @@ -86,8 +86,8 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( PayloadSizeBytes: remoteConfig.PayloadSizeBytes, } currentRemoteReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetRemoteChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: remoteSelector, }) if err != nil { @@ -100,8 +100,8 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( remoteChainConfigArgs = append(remoteChainConfigArgs, desiredRemoteChainArg) } else { getFeeReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetFee, chain, contract.FunctionInput[committee_verifier.GetFeeArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: committee_verifier.GetFeeArgs{ DestChainSelector: remoteSelector, }, @@ -134,8 +134,9 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( // Build outbound implementation args only for remotes where on-chain verifier differs (idempotent). currentOutboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.GetAllOutboundImplementations, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierResolver), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierResolver), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get outbound implementations from CommitteeVerifierResolver on chain %s: %w", chain, err) @@ -157,8 +158,8 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( if len(remoteChainConfigArgs) > 0 { committeeVerifierReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplyRemoteChainConfigUpdates, chain, contract.FunctionInput[[]committee_verifier.RemoteChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: remoteChainConfigArgs, }) if err != nil { @@ -169,8 +170,8 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( if len(allowlistArgs) > 0 { committeeVerifierAllowlistReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplyAllowlistUpdates, chain, contract.FunctionInput[[]committee_verifier.AllowlistConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: allowlistArgs, }) if err != nil { @@ -181,8 +182,8 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( if len(outboundImplementationArgs) > 0 { outboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyOutboundImplementationUpdates, chain, contract.FunctionInput[[]versioned_verifier_resolver.OutboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierResolver), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierResolver), Args: outboundImplementationArgs, }) if err != nil { @@ -194,16 +195,17 @@ var ConfigureCommitteeVerifierAsSource = cldf_ops.NewSequence( if !input.AllowedFinalityConfig.IsZero() { desiredFinality := input.AllowedFinalityConfig.Raw() currentFinalityReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetAllowedFinalityConfig, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get allowed finality config from CommitteeVerifier on chain %s: %w", chain, err) } if currentFinalityReport.Output != desiredFinality { setFinalityReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.SetAllowedFinalityConfig, chain, contract.FunctionInput[[4]byte]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: desiredFinality, }) if err != nil { @@ -237,7 +239,7 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( return sequences.OnChainOutput{}, fmt.Errorf("chain with selector %d not found", input.ChainSelector) } - committeeVerifier, committeeVerifierResolver, err := extractCommitteeVerifierAddresses(input.CommitteeVerifier, input.ChainSelector) + committeeVerifier, _, err := extractCommitteeVerifierAddresses(input.CommitteeVerifier, input.ChainSelector) if err != nil { return sequences.OnChainOutput{}, err } @@ -255,8 +257,8 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( Signers: signers, } currentSigReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetSignatureConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: remoteSelector, }) if err != nil { @@ -270,8 +272,8 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( if len(signatureConfigs) > 0 { signatureConfigReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.ApplySignatureConfigs, chain, contract.FunctionInput[committee_verifier.ApplySignatureConfigsArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), Args: committee_verifier.ApplySignatureConfigsArgs{ SignatureConfigs: signatureConfigs, }, @@ -284,8 +286,9 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( // Apply inbound implementation updates on CommitteeVerifierResolver only when not already set (idempotent). committeeVerifierVersionTagReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.VersionTag, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifier), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifier), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get version tag from CommitteeVerifier on chain %s: %w", chain, err) @@ -295,8 +298,9 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( Verifier: common.HexToAddress(committeeVerifier), } currentInboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.GetAllInboundImplementations, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierResolver), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierResolver), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get inbound implementations from CommitteeVerifierResolver on chain %s: %w", chain, err) @@ -310,8 +314,8 @@ var ConfigureCommitteeVerifierAsDest = cldf_ops.NewSequence( } if !inboundAlreadySet { inboundReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyInboundImplementationUpdates, chain, contract.FunctionInput[[]versioned_verifier_resolver.InboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierResolver), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierResolver), Args: []versioned_verifier_resolver.InboundImplementationArgs{desiredInbound}, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes_test.go b/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes_test.go index eedcbc972f..7634dc5bb4 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_committee_verifier_for_lanes_test.go @@ -171,7 +171,7 @@ func TestConfigureCommitteeVerifierAsSource(t *testing.T) { // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -207,8 +207,8 @@ func TestConfigureCommitteeVerifierAsSource(t *testing.T) { committee_verifier.GetRemoteChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(input.CommitteeVerifier[0].Address), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(input.CommitteeVerifier[0].Address), Args: remoteSelector, }, ) @@ -328,7 +328,7 @@ func TestConfigureCommitteeVerifierAsDest(t *testing.T) { // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -364,8 +364,8 @@ func TestConfigureCommitteeVerifierAsDest(t *testing.T) { committee_verifier.GetSignatureConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(input.CommitteeVerifier[0].Address), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(input.CommitteeVerifier[0].Address), Args: remoteSelector, }, ) @@ -388,8 +388,9 @@ func TestConfigureCommitteeVerifierAsDest(t *testing.T) { committee_verifier.VersionTag, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(input.CommitteeVerifier[0].Address), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(input.CommitteeVerifier[0].Address), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -496,7 +497,7 @@ func TestConfigureCommitteeVerifierAsSource_RevertWhen_InvalidSupportingContract // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -616,7 +617,7 @@ func TestConfigureCommitteeVerifierAsDest_RevertWhen_InvalidSupportingContracts( // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg.go b/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg.go index f5f4557eb0..87bdd14c57 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg.go @@ -60,8 +60,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( } if len(onRampArgs) > 0 { onRampReport, err := cldf_ops.ExecuteOperation(b, onramp.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]onramp.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceOnRamp), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceOnRamp), Args: onRampArgs, }) if err != nil { @@ -74,8 +74,9 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( destChainSelectorsPerExecutor := make(map[common.Address][]ExecutorRemoteChainConfigArgs) defaultExecutor := common.HexToAddress(sourceChain.DefaultExecutor.Address) getTargetReport, err := cldf_ops.ExecuteOperation(b, proxy.GetTarget, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: defaultExecutor, + // ChainSelector: chain.Selector, + // Address: defaultExecutor, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get target address of Executor(%s) on chain %s: %w", defaultExecutor, chain, err) @@ -96,8 +97,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( continue } executorReport, err := cldf_ops.ExecuteOperation(b, ExecutorApplyDestChainUpdates, chain, contract.FunctionInput[ExecutorApplyDestChainUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: executorAddr, + // ChainSelector: chain.Selector, + // Address: executorAddr, Args: ExecutorApplyDestChainUpdatesArgs{ DestChainSelectorsToAdd: toAdd, }, @@ -138,8 +139,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( } if len(feeQuoterArgs) > 0 { feeQuoterReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]fee_quoter.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceFeeQuoter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceFeeQuoter), Args: feeQuoterArgs, }) if err != nil { @@ -152,8 +153,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( gasPriceUpdates := make([]fee_quoter.GasPriceUpdate, 0, 1) if destChain.FeeQuoterDestChainConfig.V2Params != nil && destChain.FeeQuoterDestChainConfig.V2Params.USDPerUnitGas != nil { gasPriceReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.GetDestinationChainGasPrice, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceFeeQuoter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceFeeQuoter), Args: remoteSelector, }) if err != nil { @@ -168,8 +169,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( } if len(gasPriceUpdates) > 0 { feeQuoterUpdatePricesReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.UpdatePrices, chain, contract.FunctionInput[fee_quoter.PriceUpdates]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceFeeQuoter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceFeeQuoter), Args: fee_quoter.PriceUpdates{ GasPriceUpdates: gasPriceUpdates, }, @@ -187,8 +188,8 @@ var ConfigureLaneLegAsSource = cldf_ops.NewSequence( } if len(onRampAdds) > 0 { routerReport, err := cldf_ops.ExecuteOperation(b, router.ApplyRampUpdates, chain, contract.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceRouter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceRouter), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: onRampAdds, OffRampRemoves: []router.OffRamp{}, @@ -255,8 +256,8 @@ var ConfigureLaneLegAsDest = cldf_ops.NewSequence( } if len(offRampArgs) > 0 { offRampReport, err := cldf_ops.ExecuteOperation(b, offramp.ApplySourceChainConfigUpdates, chain, contract.FunctionInput[[]offramp.SourceChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(destOffRamp), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(destOffRamp), Args: offRampArgs, }) if err != nil { @@ -278,8 +279,8 @@ var ConfigureLaneLegAsDest = cldf_ops.NewSequence( } if len(offRampAdds) > 0 { routerReport, err := cldf_ops.ExecuteOperation(b, router.ApplyRampUpdates, chain, contract.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(destRouter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(destRouter), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: []router.OnRamp{}, OffRampRemoves: []router.OffRamp{}, @@ -342,8 +343,8 @@ func maybeAddSourceChainConfigArg(b cldf_ops.Bundle, chain evm.Chain, input lane LaneMandatedCCVs: laneMandatedInboundCCVs, } offRampCurrentReport, err := cldf_ops.ExecuteOperation(b, offramp.GetSourceChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: input.Dest.Selector, - Address: common.BytesToAddress(input.Dest.OffRamp), + // ChainSelector: input.Dest.Selector, + // Address: common.BytesToAddress(input.Dest.OffRamp), Args: input.Source.Selector, }) if err != nil { @@ -385,8 +386,8 @@ func MaybeAddRouterOnRampsAddsConfigArg(b cldf_ops.Bundle, chain evm.Chain, inpu // Apply Router ramp updates (only when there are changes). onRampAdds := make([]router.OnRamp, 0, 1) onRampAddrReport, err := cldf_ops.ExecuteOperation(b, router.GetOnRamp, chain, contract.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(sourceRouter), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(sourceRouter), Args: remoteSelector, }) if err != nil { @@ -464,8 +465,8 @@ func maybeAddOnRampDestChainConfigArg(b cldf_ops.Bundle, chain evm.Chain, input OffRamp: input.Dest.OffRamp, } onRampCurrentReport, err := cldf_ops.ExecuteOperation(b, onramp.GetDestChainConfig, chain, contract.FunctionInput[uint64]{ - ChainSelector: input.Source.Selector, - Address: common.BytesToAddress(input.Source.OnRamp), + // ChainSelector: input.Source.Selector, + // Address: common.BytesToAddress(input.Source.OnRamp), Args: input.Dest.Selector, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg_test.go b/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg_test.go index 6475892b27..7272576d60 100644 --- a/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/configure_lane_leg_test.go @@ -56,7 +56,7 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -104,7 +104,7 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { create2FactoryRef, err = contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain2, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: remoteChainSelector, + // ChainSelector: remoteChainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain2.DeployerKey.From}, }, @@ -255,8 +255,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check onRamps on router onRampOnRouter, err := operations.ExecuteOperation(e.OperationsBundle, router.GetOnRamp, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(routerAddress), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddress), Args: remoteChainSelector, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -264,8 +264,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check offRamps on router offRampsOnRouter, err := operations.ExecuteOperation(e.OperationsBundle, router.GetOffRamps, evmChain, contract.FunctionInput[any]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(routerAddress), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddress), Args: nil, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -274,8 +274,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check sourceChainConfig on OffRamp sourceChainConfig, err := operations.ExecuteOperation(e.OperationsBundle, offramp.GetSourceChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(offRampAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(offRampAddr), Args: remoteChainSelector, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -287,8 +287,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check destChainConfig on OnRamp destChainConfig, err := operations.ExecuteOperation(e.OperationsBundle, onramp.GetDestChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(onRampAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(onRampAddr), Args: remoteChainSelector, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -300,8 +300,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check destChainConfig on CommitteeVerifier committeeVerifierRemoteChainConfig, err := operations.ExecuteOperation(e.OperationsBundle, committee_verifier.GetRemoteChainConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(committeeVerifierAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(committeeVerifierAddr), Args: remoteChainSelector, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -310,8 +310,8 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check signature quorum on CommitteeVerifier signatureQuorumReport, err := operations.ExecuteOperation(e.OperationsBundle, committee_verifier.GetSignatureConfig, evmChain, contract.FunctionInput[uint64]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(committeeVerifierAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(committeeVerifierAddr), Args: remoteChainSelector, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -327,8 +327,9 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check inbound implementation on CommitteeVerifierResolver versionTagReport, err := operations.ExecuteOperation(e.OperationsBundle, committee_verifier.VersionTag, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(committeeVerifierAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(committeeVerifierAddr), + Args: struct{}{}, }) require.NoError(t, err, "ExecuteOperation should not error") inboundImpl, err := boundResolver.GetInboundImplementation(&bind.CallOpts{Context: t.Context()}, versionTagReport.Output[:]) @@ -337,8 +338,9 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { // Check dest chains on Executor executorDestChains, err := operations.ExecuteOperation(e.OperationsBundle, executor.GetDestChains, evmChain, contract.FunctionInput[struct{}]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(executorAddr), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(executorAddr), + Args: struct{}{}, }) require.NoError(t, err, "ExecuteOperation should not error") require.Len(t, executorDestChains.Output, 1, "There should be one dest chain on Executor") @@ -383,16 +385,16 @@ func TestConfigureLaneLegAsSourceAndDest(t *testing.T) { } fee, err := operations.ExecuteOperation(e.OperationsBundle, router.GetFee, evmChain, contract.FunctionInput[router.CCIPSendArgs]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(routerAddress), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddress), Args: ccipSendArgs, }) require.NoError(t, err, "ExecuteOperation should not error") ccipSendArgs.Value = fee.Output _, err = operations.ExecuteOperation(e.OperationsBundle, router.CCIPSend, evmChain, contract.FunctionInput[router.CCIPSendArgs]{ - ChainSelector: evmChain.Selector, - Address: common.HexToAddress(routerAddress), + // ChainSelector: evmChain.Selector, + // Address: common.HexToAddress(routerAddress), Args: ccipSendArgs, }) require.NoError(t, err, "ExecuteOperation should not error") @@ -414,7 +416,7 @@ func TestMaybeAddRouterOnRampsAddsConfigArg(t *testing.T) { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -459,7 +461,7 @@ func TestMaybeAddRouterOnRampsAddsConfigArg(t *testing.T) { create2FactoryRef, err = contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain2, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: remoteChainSelector, + // ChainSelector: remoteChainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain2.DeployerKey.From}, }, @@ -588,7 +590,7 @@ func TestMaybeAddRouterOnRampsAddsConfigArg(t *testing.T) { // add an onramp with version 1.6.0 // deploy onramp 1.6.0 out, err := operations.ExecuteOperation(testsetup.BundleWithFreshReporter(e.OperationsBundle), onramp2.Deploy, evmChain, contract_utils.DeployInput[onramp2.ConstructorArgs]{ - ChainSelector: chainSelector, + // ChainSelector: chainSelector, TypeAndVersion: onramp2.TypeAndVersion, Args: onramp2.ConstructorArgs{ StaticConfig: onramp2.StaticConfig{ @@ -607,8 +609,8 @@ func TestMaybeAddRouterOnRampsAddsConfigArg(t *testing.T) { deployedOnRampAddr := common.HexToAddress(out.Output.Address) // add this onramp to the router _, err = operations.ExecuteOperation(testsetup.BundleWithFreshReporter(e.OperationsBundle), router.ApplyRampUpdates, evmChain, contract_utils.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(routerAddress), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(routerAddress), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: []router.OnRamp{ { @@ -628,8 +630,8 @@ func TestMaybeAddRouterOnRampsAddsConfigArg(t *testing.T) { remoteChainDef.Router = common.HexToAddress(remoteTestRouterAddr).Bytes() _, err = operations.ExecuteOperation(testsetup.BundleWithFreshReporter(e.OperationsBundle), router.ApplyRampUpdates, evmChain, contract_utils.FunctionInput[router.ApplyRampsUpdatesArgs]{ - ChainSelector: chainSelector, - Address: common.HexToAddress(testRouterAddress), + // ChainSelector: chainSelector, + // Address: common.HexToAddress(testRouterAddress), Args: router.ApplyRampsUpdatesArgs{ OnRampUpdates: []router.OnRamp{ { diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_advanced_pool_hooks_extractor.go b/chains/evm/deployment/v2_0_0/sequences/deploy_advanced_pool_hooks_extractor.go index b03f5f344e..073951ffbe 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_advanced_pool_hooks_extractor.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_advanced_pool_hooks_extractor.go @@ -25,7 +25,7 @@ var DeployAdvancedPoolHooksExtractor = cldf_ops.NewSequence( func(b cldf_ops.Bundle, chain evm.Chain, input DeployAdvancedPoolHooksExtractorInput) (sequences.OnChainOutput, error) { ref, err := contract_utils.MaybeDeployContract(b, advanced_pool_hooks_extractor.Deploy, chain, contract_utils.DeployInput[advanced_pool_hooks_extractor.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(advanced_pool_hooks_extractor.ContractType, *advanced_pool_hooks_extractor.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: advanced_pool_hooks_extractor.ConstructorArgs{}, }, input.ExistingAddresses) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts.go b/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts.go index bcc29d7390..719ea87a11 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts.go @@ -54,7 +54,7 @@ var proxyAcceptOwnership = contract_utils.NewWrite(contract_utils.WriteParams[pr Description: "Accept ownership of the proxy", ContractType: proxy.ContractType, ContractABI: proxy.ProxyABI, - NewContract: proxy_bindings.NewProxy, + //NewContract: proxy_bindings.NewProxy, IsAllowedCaller: func(_ *proxy_bindings.Proxy, _ *bind.CallOpts, _ common.Address, args proxyAcceptOwnershipArgs) (bool, error) { return args.IsProposedOwner, nil }, @@ -165,7 +165,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy WETH wethRef, err := contract_utils.MaybeDeployContract(b, weth.Deploy, chain, contract_utils.DeployInput[weth.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(weth.ContractType, *weth.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, + Args: weth.ConstructorArgs{}, }, input.ExistingAddresses) if err != nil { return output, err @@ -175,7 +176,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy LINK linkRef, err := contract_utils.MaybeDeployContract(b, link.Deploy, chain, contract_utils.DeployInput[link.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(link.ContractType, *link.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, + Args: link.ConstructorArgs{}, }, input.ExistingAddresses) if err != nil { return output, err @@ -185,7 +187,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy RMNRemote rmnRemoteRef, err := contract_utils.MaybeDeployContract(b, rmn_remote.Deploy, chain, contract_utils.DeployInput[rmn_remote.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_remote.ContractType, *input.ContractParams.RMNRemote.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmn_remote.ConstructorArgs{ LocalChainSelector: chain.Selector, LegacyRMN: input.ContractParams.RMNRemote.LegacyRMN, @@ -200,7 +202,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy RMNProxy rmnProxyRef, err := contract_utils.MaybeDeployContract(b, rmn_proxy.Deploy, chain, contract_utils.DeployInput[rmn_proxy.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(rmn_proxy.ContractType, *rmn_proxy.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: rmn_proxy.ConstructorArgs{ RMN: common.HexToAddress(rmnRemoteRef.Address), }, @@ -213,8 +215,9 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the RMN contract address set on the RMNProxy rmnAddressReport, err := cldf_ops.ExecuteOperation(b, rmn_proxy.GetRMN, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(rmnProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(rmnProxyRef.Address), + Args: struct{}{}, }) if err != nil { return output, err @@ -223,8 +226,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Set the RMNRemote on the RMNProxy if diff exists if rmnAddressReport.Output != common.HexToAddress(rmnRemoteRef.Address) { setRMNReport, err := cldf_ops.ExecuteOperation(b, rmn_proxy.SetRMN, chain, contract_utils.FunctionInput[rmn_proxy.SetRMNArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(rmnProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(rmnProxyRef.Address), Args: rmn_proxy.SetRMNArgs{ RMN: common.HexToAddress(rmnRemoteRef.Address), }, @@ -238,7 +241,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy Router routerRef, err := contract_utils.MaybeDeployContract(b, router.Deploy, chain, contract_utils.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.ContractType, *router.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: router.ConstructorArgs{ WrappedNative: common.HexToAddress(wethRef.Address), RMNProxy: common.HexToAddress(rmnProxyRef.Address), @@ -252,8 +255,9 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the wrapped native address set on the Router wrappedNativeAddressReport, err := cldf_ops.ExecuteOperation(b, router.GetWrappedNative, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(routerRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(routerRef.Address), + Args: struct{}{}, }) if err != nil { return output, err @@ -262,8 +266,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Set wrapped native on the Router if diff exists if wrappedNativeAddressReport.Output != common.HexToAddress(wethRef.Address) { setWrappedNativeReport, err := cldf_ops.ExecuteOperation(b, router.SetWrappedNative, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(routerRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(routerRef.Address), Args: common.HexToAddress(wethRef.Address), }) if err != nil { @@ -276,7 +280,7 @@ var DeployChainContracts = cldf_ops.NewSequence( if input.DeployTestRouter { testRouterRef, err := contract_utils.MaybeDeployContract(b, router.DeployTestRouter, chain, contract_utils.DeployInput[router.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(router.TestRouterContractType, *router.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: router.ConstructorArgs{ WrappedNative: common.HexToAddress(wethRef.Address), RMNProxy: common.HexToAddress(rmnProxyRef.Address), @@ -289,8 +293,9 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the wrapped native address set on the Test Router wrappedNativeAddressReport, err = cldf_ops.ExecuteOperation(b, router.GetWrappedNative, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(testRouterRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(testRouterRef.Address), + Args: struct{}{}, }) if err != nil { return output, err @@ -299,8 +304,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Set wrapped native on the Test Router if diff exists if wrappedNativeAddressReport.Output != common.HexToAddress(wethRef.Address) { setWrappedNativeReport, err := cldf_ops.ExecuteOperation(b, router.SetWrappedNative, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(testRouterRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(testRouterRef.Address), Args: common.HexToAddress(wethRef.Address), }) if err != nil { @@ -313,7 +318,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy TokenAdminRegistry tokenAdminRegistryRef, err := contract_utils.MaybeDeployContract(b, token_admin_registry.Deploy, chain, contract_utils.DeployInput[token_admin_registry.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(token_admin_registry.ContractType, *token_admin_registry.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, + Args: token_admin_registry.ConstructorArgs{}, }, input.ExistingAddresses) if err != nil { return output, err @@ -324,7 +330,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy RegistryModuleOwnerCustom registryModuleOwnerCustomRef, err := contract_utils.MaybeDeployContract(b, registry_module_owner_custom.Deploy, chain, contract_utils.DeployInput[registry_module_owner_custom.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(registry_module_owner_custom.ContractType, *registry_module_owner_custom.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: registry_module_owner_custom.ConstructorArgs{ TokenAdminRegistry: common.HexToAddress(tokenAdminRegistryRef.Address), }, @@ -356,7 +362,7 @@ var DeployChainContracts = cldf_ops.NewSequence( } feeQuoterRef, err := contract_utils.MaybeDeployContract(b, fee_quoter.Deploy, chain, contract_utils.DeployInput[fee_quoter.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(fee_quoter.ContractType, *input.ContractParams.FeeQuoter.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: fee_quoter.ConstructorArgs{ StaticConfig: fee_quoter.StaticConfig{ MaxFeeJuelsPerMsg: input.ContractParams.FeeQuoter.MaxFeeJuelsPerMsg, @@ -390,8 +396,8 @@ var DeployChainContracts = cldf_ops.NewSequence( } if len(tokenPriceUpdates) > 0 { updatePricesReport, err := cldf_ops.ExecuteOperation(b, fee_quoter.UpdatePrices, chain, contract_utils.FunctionInput[fee_quoter.PriceUpdates]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(feeQuoterRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(feeQuoterRef.Address), Args: fee_quoter.PriceUpdates{ TokenPriceUpdates: tokenPriceUpdates, }, @@ -405,7 +411,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy OffRamp offRampRef, err := contract_utils.MaybeDeployContract(b, offramp.Deploy, chain, contract_utils.DeployInput[offramp.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(offramp.ContractType, *input.ContractParams.OffRamp.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: offramp.ConstructorArgs{ StaticConfig: offramp.StaticConfig{ LocalChainSelector: chain.Selector, @@ -425,7 +431,7 @@ var DeployChainContracts = cldf_ops.NewSequence( // Deploy OnRamp onRampRef, err := contract_utils.MaybeDeployContract(b, onramp.Deploy, chain, contract_utils.DeployInput[onramp.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(onramp.ContractType, *input.ContractParams.OnRamp.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: onramp.ConstructorArgs{ StaticConfig: onramp.StaticConfig{ ChainSelector: chain.Selector, @@ -447,8 +453,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the dynamic config on the OnRamp dynamicConfigReport, err := cldf_ops.ExecuteOperation(b, onramp.GetDynamicConfig, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(onRampRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(onRampRef.Address), Args: struct{}{}, }) if err != nil { @@ -467,8 +473,8 @@ var DeployChainContracts = cldf_ops.NewSequence( FeeAggregator: input.ContractParams.OnRamp.FeeAggregator, } setDynamicConfigReport, err := cldf_ops.ExecuteOperation(b, onramp.SetDynamicConfig, chain, contract_utils.FunctionInput[onramp.DynamicConfig]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(onRampRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(onRampRef.Address), Args: desiredDynamicConfig, }) if err != nil { @@ -503,7 +509,7 @@ var DeployChainContracts = cldf_ops.NewSequence( } executorRef, err := contract_utils.MaybeDeployContract(b, executor.Deploy, chain, contract_utils.DeployInput[executor.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(executor.ContractType, *executorParam.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: executor.ConstructorArgs{ MaxCCVsPerMsg: executorParam.MaxCCVsPerMsg, DynamicConfig: executorParam.DynamicConfig, @@ -518,8 +524,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the dynamic config on the Executor dynamicConfigReport, err := cldf_ops.ExecuteOperation(b, executor.GetDynamicConfig, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorRef.Address), Args: struct{}{}, }) if err != nil { @@ -535,8 +541,8 @@ var DeployChainContracts = cldf_ops.NewSequence( dynamicConfigReport.Output.AllowedFinalityConfig != executorParam.DynamicConfig.AllowedFinalityConfig || dynamicConfigReport.Output.CcvAllowlistEnabled != executorParam.DynamicConfig.CcvAllowlistEnabled { setDynamicConfigReport, err := cldf_ops.ExecuteOperation(b, executor.SetDynamicConfig, chain, contract_utils.FunctionInput[executor.DynamicConfig]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorRef.Address), Args: executor.DynamicConfig{ FeeAggregator: executorParam.DynamicConfig.FeeAggregator, AllowedFinalityConfig: executorParam.DynamicConfig.AllowedFinalityConfig, @@ -592,8 +598,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Accept ownership of the ExecutorProxy acceptOwnershipReport, err := cldf_ops.ExecuteOperation(b, proxyAcceptOwnership, chain, contract_utils.FunctionInput[proxyAcceptOwnershipArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorProxyRef.Address), Args: proxyAcceptOwnershipArgs{ IsProposedOwner: true, }, @@ -607,8 +613,9 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the target on the ExecutorProxy targetReport, err := cldf_ops.ExecuteOperation(b, proxy.GetTarget, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorProxyRef.Address), + Args: struct{}{}, }) if err != nil { return output, fmt.Errorf("failed to get target on ExecutorProxy: %w", err) @@ -617,8 +624,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Set target on the ExecutorProxy if diff exists if targetReport.Output != common.HexToAddress(executorRef.Address) { setTargetReport, err := cldf_ops.ExecuteOperation(b, proxy.SetTarget, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorProxyRef.Address), Args: common.HexToAddress(executorRef.Address), }) if err != nil { @@ -629,8 +636,9 @@ var DeployChainContracts = cldf_ops.NewSequence( // Fetch the fee aggregator on the ExecutorProxy feeAggregatorReport, err := cldf_ops.ExecuteOperation(b, proxy.GetFeeAggregator, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorProxyRef.Address), + Args: struct{}{}, }) if err != nil { return output, fmt.Errorf("failed to get fee aggregator on ExecutorProxy: %w", err) @@ -639,8 +647,8 @@ var DeployChainContracts = cldf_ops.NewSequence( // Set fee aggregator on the ExecutorProxy if diff exists if feeAggregatorReport.Output != executorParam.DynamicConfig.FeeAggregator { setFeeAggregatorReport, err := cldf_ops.ExecuteOperation(b, proxy.SetFeeAggregator, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(executorProxyRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(executorProxyRef.Address), Args: executorParam.DynamicConfig.FeeAggregator, }) if err != nil { @@ -661,7 +669,7 @@ var DeployChainContracts = cldf_ops.NewSequence( } deployReceiverReport, err := cldf_ops.ExecuteOperation(b, mock_receiver.Deploy, chain, contract_utils.DeployInput[mock_receiver.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(mock_receiver.ContractType, *mockReceiverParams.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: mock_receiver.ConstructorArgs{ Required: requiredVerifiers, Optional: optionalVerifiers, @@ -678,8 +686,8 @@ var DeployChainContracts = cldf_ops.NewSequence( if mockReceiverParams.AllowedFinalityConfig != finality.RawWaitForFinality { // Get the current finality config on the MockReceiver finalityConfigResult, err := cldf_ops.ExecuteOperation(b, mock_receiver_v2.GetCCVsAndFinalityConfig, chain, contract_utils.FunctionInput[mock_receiver_v2.GetCCVsAndFinalityConfigArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(deployReceiverReport.Output.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(deployReceiverReport.Output.Address), Args: mock_receiver_v2.GetCCVsAndFinalityConfigArgs{ Arg0: chain.Selector, Arg1: []byte{}, @@ -691,8 +699,8 @@ var DeployChainContracts = cldf_ops.NewSequence( if finalityConfigResult.Output.AllowedFinalityConfig != mockReceiverParams.AllowedFinalityConfig { // Set the finality config on the MockReceiver setFinalityConfigReport, err := cldf_ops.ExecuteOperation(b, mock_receiver_v2.SetAllowedFinalityConfig, chain, contract_utils.FunctionInput[[4]byte]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(deployReceiverReport.Output.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(deployReceiverReport.Output.Address), Args: mockReceiverParams.AllowedFinalityConfig, }) if err != nil { @@ -895,8 +903,8 @@ func ensureTimelockSelfGoverned( if !adminHasRole { _, err = cldf_ops.ExecuteOperation(b, mcms_ops.OpGrantRoleTimelock, chain, contract_utils.FunctionInput[mcms_ops.OpGrantRoleTimelockInput]{ - ChainSelector: chain.Selector, - Address: timelockAddr, + // ChainSelector: chain.Selector, + // Address: timelockAddr, Args: mcms_ops.OpGrantRoleTimelockInput{ RoleID: mcms_ops.ADMIN_ROLE.ID, Account: newAdmin, @@ -909,8 +917,8 @@ func ensureTimelockSelfGoverned( } _, err = cldf_ops.ExecuteOperation(b, mcms_ops.OpRenounceRoleTimelock, chain, contract_utils.FunctionInput[mcms_ops.OpRenounceRoleTimelockInput]{ - ChainSelector: chain.Selector, - Address: timelockAddr, + // ChainSelector: chain.Selector, + // Address: timelockAddr, Args: mcms_ops.OpRenounceRoleTimelockInput{ RoleID: mcms_ops.ADMIN_ROLE.ID, }, @@ -988,8 +996,8 @@ func MaybeRegisterModuleOnTokenAdminRegistry( ) (contract_utils.WriteOutput, bool, error) { // Check if the module is already registered. isRegisteredReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.IsRegistryModule, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tokenAdminRegistryAddress, + // ChainSelector: chain.Selector, + // Address: tokenAdminRegistryAddress, Args: moduleAddress, }) if err != nil { @@ -1003,8 +1011,8 @@ func MaybeRegisterModuleOnTokenAdminRegistry( // Add the module to the registry. addRegistryModuleReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.AddRegistryModule, chain, contract_utils.FunctionInput[common.Address]{ - ChainSelector: chain.Selector, - Address: tokenAdminRegistryAddress, + // ChainSelector: chain.Selector, + // Address: tokenAdminRegistryAddress, Args: moduleAddress, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts_test.go b/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts_test.go index 4b3af86132..400a08d3a8 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_chain_contracts_test.go @@ -79,7 +79,7 @@ func TestDeployChainContracts_Idempotency(t *testing.T) { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSelector], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSelector].DeployerKey.From}, }, @@ -154,7 +154,7 @@ func TestDeployChainContracts_MultipleDeployments(t *testing.T) { for _, evmChain := range evmChains { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -206,7 +206,7 @@ func TestDeployChainContracts_MultipleDeployments(t *testing.T) { evmChain := evmChains[chainSel] create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -309,7 +309,7 @@ func TestDeployChainContracts_MultipleCommitteeVerifiersAndMultipleMockReceiverC create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSelector], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSelector].DeployerKey.From}, }, @@ -422,7 +422,7 @@ func deployMCMSInstanceForTest( addresses = append(addresses, cancellerReport.Output.Addresses...) timelockRef, err := contract_utils.MaybeDeployContract(b, mcms_ops.OpDeployTimelock, chain, contract_utils.DeployInput[mcms_ops.OpDeployTimelockInput]{ - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Qualifier: qualifierPtr, TypeAndVersion: deployment.NewTypeAndVersion(common_utils.RBACTimelock, *mcms_ops.MCMSVersion), Args: mcms_ops.OpDeployTimelockInput{ @@ -439,7 +439,7 @@ func deployMCMSInstanceForTest( addresses = append(addresses, timelockRef) callProxyRef, err := contract_utils.MaybeDeployContract(b, mcms_ops.OpDeployCallProxy, chain, contract_utils.DeployInput[mcms_ops.OpDeployCallProxyInput]{ - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Qualifier: qualifierPtr, TypeAndVersion: deployment.NewTypeAndVersion(common_utils.CallProxy, *mcms_ops.MCMSVersion), Args: mcms_ops.OpDeployCallProxyInput{ @@ -524,7 +524,7 @@ func TestDeployChainContracts_DefaultOwnershipTransfer(t *testing.T) { e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{deployer}}, }, nil) require.NoError(t, err) @@ -640,7 +640,7 @@ func TestDeployChainContracts_DefaultOwnershipTransfer_Idempotent(t *testing.T) e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{deployer}}, }, nil) require.NoError(t, err) @@ -716,7 +716,7 @@ func TestDeployChainContracts_DeployerKeyOwned(t *testing.T) { e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{deployer}}, }, nil) require.NoError(t, err) @@ -782,7 +782,7 @@ func TestDeployChainContracts_DefaultTransfer_FailsWithoutMCMS(t *testing.T) { e.OperationsBundle, create2_factory.Deploy, chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{deployer}}, }, nil) require.NoError(t, err) diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier.go b/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier.go index 56845c02e4..dce2dc5127 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier.go @@ -53,7 +53,7 @@ var DeployCommitteeVerifier = cldf_ops.NewSequence( } committeeVerifierRef, err := contract_utils.MaybeDeployContract(b, committee_verifier.Deploy, chain, contract_utils.DeployInput[committee_verifier.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(committee_verifier.ContractType, *input.Params.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: committee_verifier.ConstructorArgs{ DynamicConfig: committee_verifier.DynamicConfig{ FeeAggregator: input.Params.FeeAggregator, @@ -72,8 +72,8 @@ var DeployCommitteeVerifier = cldf_ops.NewSequence( // Fetch dynamic config on the CommitteeVerifier dynamicConfigReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.GetDynamicConfig, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierRef.Address), Args: struct{}{}, }) if err != nil { @@ -91,8 +91,8 @@ var DeployCommitteeVerifier = cldf_ops.NewSequence( } if desiredFeeAggregator != dynamicConfigReport.Output.FeeAggregator || desiredAllowlistAdmin != dynamicConfigReport.Output.AllowlistAdmin { setDynamicConfigReport, err := cldf_ops.ExecuteOperation(b, committee_verifier.SetDynamicConfig, chain, contract_utils.FunctionInput[committee_verifier.DynamicConfig]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(committeeVerifierRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(committeeVerifierRef.Address), Args: committee_verifier.DynamicConfig{ AllowlistAdmin: desiredAllowlistAdmin, FeeAggregator: desiredFeeAggregator, diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier_test.go b/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier_test.go index e3dd39b421..0f8500bb5e 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_committee_verifier_test.go @@ -47,7 +47,7 @@ func TestDeployCommitteeVerifier_Idempotency(t *testing.T) { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSelector], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSelector].DeployerKey.From}, }, @@ -111,7 +111,7 @@ func TestDeployCommitteeVerifier_Idempotency_WithPredeployedCommitteeVerifier(t create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSelector], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: chainSelector, + // ChainSelector: chainSelector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSelector].DeployerKey.From}, }, @@ -195,7 +195,7 @@ func TestDeployCommitteeVerifier_MultipleDeployments(t *testing.T) { for _, evmChain := range evmChains { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -249,7 +249,7 @@ func TestDeployCommitteeVerifier_MultipleDeployments(t *testing.T) { create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, evmChain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: evmChain.Selector, + // ChainSelector: evmChain.Selector, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{evmChain.DeployerKey.From}, }, @@ -298,7 +298,7 @@ func TestDeployCommitteeVerifier_MultipleQualifiersOnSameChain(t *testing.T) { // First run with qualifier "alpha" create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *create2_factory.Version), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2.go b/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2.go index 02bd2ea80d..49160c9ee0 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2.go @@ -48,8 +48,8 @@ var DeployContractViaCREATE2 = cldf_ops.NewSequence( } expectedAddressReport, err := cldf_ops.ExecuteOperation(b, create2_factory.ComputeAddress, chain, contract_utils.FunctionInput[create2_factory.ComputeAddressArgs]{ - Address: input.CREATE2Factory, - ChainSelector: chain.Selector, + // Address: input.CREATE2Factory, + // ChainSelector: chain.Selector, Args: computeArgs, }) if err != nil { @@ -64,8 +64,8 @@ var DeployContractViaCREATE2 = cldf_ops.NewSequence( }) deployReport, err := cldf_ops.ExecuteOperation(b, create2_factory.CreateAndTransferOwnership, chain, contract_utils.FunctionInput[create2_factory.CreateAndTransferOwnershipArgs]{ - ChainSelector: chain.Selector, - Address: input.CREATE2Factory, + // ChainSelector: chain.Selector, + // Address: input.CREATE2Factory, Args: create2_factory.CreateAndTransferOwnershipArgs{ ComputeAddressArgs: computeArgs, To: chain.DeployerKey.From, diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2_test.go b/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2_test.go index 0f18689f21..76dd7cbf10 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_contract_via_create2_test.go @@ -31,7 +31,7 @@ func deployTestCreate2Factory(t *testing.T, e *deployment.Environment) string { chain, contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: create2TestChainSel, + // ChainSelector: create2TestChainSel, // Deployer must be in the allow list to call CreateAndTransferOwnership. Args: create2_factory.ConstructorArgs{AllowList: []common.Address{chain.DeployerKey.From}}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/deploy_verifier_resolver_via_create2.go b/chains/evm/deployment/v2_0_0/sequences/deploy_verifier_resolver_via_create2.go index e2f997cda9..91fb2f9080 100644 --- a/chains/evm/deployment/v2_0_0/sequences/deploy_verifier_resolver_via_create2.go +++ b/chains/evm/deployment/v2_0_0/sequences/deploy_verifier_resolver_via_create2.go @@ -38,8 +38,8 @@ var DeployVerifierResolverViaCREATE2 = cldf_ops.NewSequence( // Deploy resolver via CREATE2Factory to ensure deterministic addresses. // Fetch and save the expected address of the resolver. expectedAddressReport, err := cldf_ops.ExecuteOperation(b, create2_factory.ComputeAddress, chain, contract_utils.FunctionInput[create2_factory.ComputeAddressArgs]{ - Address: input.CREATE2Factory, - ChainSelector: chain.Selector, + // Address: input.CREATE2Factory, + // ChainSelector: chain.Selector, Args: create2_factory.ComputeAddressArgs{ ABI: versioned_verifier_resolver_latest.VersionedVerifierResolverMetaData.ABI, Bin: versioned_verifier_resolver_latest.VersionedVerifierResolverMetaData.Bin, @@ -60,8 +60,8 @@ var DeployVerifierResolverViaCREATE2 = cldf_ops.NewSequence( // Then, actually deploy and transfer ownership of the resolver to the deployer key. deployAndTransferResolverReport, err := cldf_ops.ExecuteOperation(b, create2_factory.CreateAndTransferOwnership, chain, contract_utils.FunctionInput[create2_factory.CreateAndTransferOwnershipArgs]{ - ChainSelector: chain.Selector, - Address: input.CREATE2Factory, + // ChainSelector: chain.Selector, + // Address: input.CREATE2Factory, Args: create2_factory.CreateAndTransferOwnershipArgs{ ComputeAddressArgs: create2_factory.ComputeAddressArgs{ ABI: versioned_verifier_resolver_latest.VersionedVerifierResolverMetaData.ABI, @@ -79,8 +79,8 @@ var DeployVerifierResolverViaCREATE2 = cldf_ops.NewSequence( // Finally, accept ownership of the resolver acceptOwnershipReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.AcceptOwnership, chain, contract_utils.FunctionInput[versioned_verifier_resolver.AcceptOwnershipArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(expectedAddressReport.Output.Hex()), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(expectedAddressReport.Output.Hex()), Args: versioned_verifier_resolver.AcceptOwnershipArgs{ IsProposedOwner: true, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/executor_custom.go b/chains/evm/deployment/v2_0_0/sequences/executor_custom.go index 995b1790f9..1a967d4b90 100644 --- a/chains/evm/deployment/v2_0_0/sequences/executor_custom.go +++ b/chains/evm/deployment/v2_0_0/sequences/executor_custom.go @@ -30,7 +30,7 @@ var ExecutorApplyDestChainUpdates = contract_utils.NewWrite(contract_utils.Write Description: "Applies updates to supported destination chains on the Executor", ContractType: executor.ContractType, ContractABI: executor.ExecutorABI, - NewContract: executor_bindings.NewExecutor, + //NewContract: executor_bindings.NewExecutor, IsAllowedCaller: contract_utils.OnlyOwner[*executor_bindings.Executor, ExecutorApplyDestChainUpdatesArgs], Validate: func(ExecutorApplyDestChainUpdatesArgs) error { return nil }, CallContract: func(e *executor_bindings.Executor, opts *bind.TransactOpts, args ExecutorApplyDestChainUpdatesArgs) (*types.Transaction, error) { diff --git a/chains/evm/deployment/v2_0_0/sequences/fee_quoter.go b/chains/evm/deployment/v2_0_0/sequences/fee_quoter.go index 7efa6d850c..f086aaa63b 100644 --- a/chains/evm/deployment/v2_0_0/sequences/fee_quoter.go +++ b/chains/evm/deployment/v2_0_0/sequences/fee_quoter.go @@ -135,7 +135,7 @@ var ( feeQuoterRef, err := contract.MaybeDeployContract( b, fqops.Deploy, chain, contract.DeployInput[fqops.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(fqops.ContractType, *fqops.Version), - ChainSelector: chain.Selector, + // ChainSelector: chain.Selector, Args: input.ConstructorArgs, }, input.ExistingAddresses) if err != nil { @@ -153,8 +153,8 @@ var ( feeQuoterReport, err := cldf_ops.ExecuteOperation( b, fqops.ApplyDestChainConfigUpdates, chain, contract.FunctionInput[[]fqops.DestChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: fqAddr, + // ChainSelector: chain.Selector, + // Address: fqAddr, Args: batch, }) if err != nil { @@ -183,8 +183,8 @@ var ( } feeQuoterUpdatePricesReport, err := cldf_ops.ExecuteOperation( b, fqops.UpdatePrices, chain, contract.FunctionInput[fqops.PriceUpdates]{ - ChainSelector: chain.Selector, - Address: fqAddr, + // ChainSelector: chain.Selector, + // Address: fqAddr, Args: fqops.PriceUpdates{ GasPriceUpdates: gasBatch, TokenPriceUpdates: tokenBatch, @@ -209,8 +209,8 @@ var ( feeQuoterTokenTransferFeeConfigReport, err := cldf_ops.ExecuteOperation( b, fqops.ApplyTokenTransferFeeConfigUpdates, chain, contract.FunctionInput[fqops.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: fqAddr, + // ChainSelector: chain.Selector, + // Address: fqAddr, Args: fqops.ApplyTokenTransferFeeConfigUpdatesArgs{ TokenTransferFeeConfigArgs: batch, TokensToUseDefaultFeeConfigs: defaultFeeConfig, @@ -228,8 +228,8 @@ var ( feeQuoterTokenTransferFeeConfigReport, err := cldf_ops.ExecuteOperation( b, fqops.ApplyTokenTransferFeeConfigUpdates, chain, contract.FunctionInput[fqops.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: chain.Selector, - Address: fqAddr, + // ChainSelector: chain.Selector, + // Address: fqAddr, Args: fqops.ApplyTokenTransferFeeConfigUpdatesArgs{ TokensToUseDefaultFeeConfigs: input.TokenTransferFeeConfigUpdates.TokensToUseDefaultFeeConfigs, }, @@ -246,8 +246,8 @@ var ( feeQuoterAuthorizedCallerReport, err := cldf_ops.ExecuteOperation( b, fqops.ApplyAuthorizedCallerUpdates, chain, contract.FunctionInput[fqops.AuthorizedCallerArgs]{ - ChainSelector: chain.Selector, - Address: fqAddr, + // ChainSelector: chain.Selector, + // Address: fqAddr, Args: input.AuthorizedCallerUpdates, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/lane_config_helpers.go b/chains/evm/deployment/v2_0_0/sequences/lane_config_helpers.go index 493170a266..bea0ec6132 100644 --- a/chains/evm/deployment/v2_0_0/sequences/lane_config_helpers.go +++ b/chains/evm/deployment/v2_0_0/sequences/lane_config_helpers.go @@ -23,8 +23,9 @@ func FilterOffRampAdds( offRampAdds []router.OffRamp, ) ([]router.OffRamp, error) { currentReport, err := cldf_ops.ExecuteOperation(b, router.GetOffRamps, chain, contract.FunctionInput[any]{ - ChainSelector: chain.Selector, - Address: routerAddr, + // ChainSelector: chain.Selector, + // Address: routerAddr, + Args: nil, }) if err != nil { return nil, fmt.Errorf("failed to get off ramps from Router(%s) on chain %v: %w", routerAddr, chain, err) @@ -53,8 +54,9 @@ func FilterExecutorDestChains( out := make(map[common.Address][]ExecutorRemoteChainConfigArgs, len(destChainSelectorsPerExecutor)) for executorAddr, toAdd := range destChainSelectorsPerExecutor { currentReport, err := cldf_ops.ExecuteOperation(b, executor.GetDestChains, chain, contract.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: executorAddr, + // ChainSelector: chain.Selector, + // Address: executorAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get dest chains from Executor(%s) on chain %v: %w", executorAddr, chain, err) diff --git a/chains/evm/deployment/v2_0_0/sequences/lombard/configure_lombard_chain_for_lanes.go b/chains/evm/deployment/v2_0_0/sequences/lombard/configure_lombard_chain_for_lanes.go index 3172834967..9d636a181a 100644 --- a/chains/evm/deployment/v2_0_0/sequences/lombard/configure_lombard_chain_for_lanes.go +++ b/chains/evm/deployment/v2_0_0/sequences/lombard/configure_lombard_chain_for_lanes.go @@ -68,14 +68,14 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( return sequences.OnChainOutput{}, fmt.Errorf("failed to find router ref on chain %d: %w", chain.Selector, err) } - advancedPoolHooksRef, err := datastore_utils.FindAndFormatRef(dep.DataStore, datastore.AddressRef{ - Type: datastore.ContractType(advanced_pool_hooks.ContractType), - Version: advanced_pool_hooks.Version, - Qualifier: *tokenPoolQualifier(input.TokenQualifier), - }, chain.Selector, datastore_utils.FullRef) - if err != nil { - return sequences.OnChainOutput{}, fmt.Errorf("failed to find AdvancedPoolHooks ref on chain %d: %w", chain.Selector, err) - } + // advancedPoolHooksRef, err := datastore_utils.FindAndFormatRef(dep.DataStore, datastore.AddressRef{ + // Type: datastore.ContractType(advanced_pool_hooks.ContractType), + // Version: advanced_pool_hooks.Version, + // Qualifier: *tokenPoolQualifier(input.TokenQualifier), + // }, chain.Selector, datastore_utils.FullRef) + // if err != nil { + // return sequences.OnChainOutput{}, fmt.Errorf("failed to find AdvancedPoolHooks ref on chain %d: %w", chain.Selector, err) + // } tokenPoolRef, err := datastore_utils.FindAndFormatRef(dep.DataStore, datastore.AddressRef{ Type: datastore.ContractType(lombard_token_pool.ContractType), @@ -94,8 +94,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( return sequences.OnChainOutput{}, fmt.Errorf("failed to find TokenAdminRegistry ref on chain %d: %w", chain.Selector, err) } - advancedPoolHooksAddress := common.HexToAddress(advancedPoolHooksRef.Address) - tokenPoolAddress := common.HexToAddress(tokenPoolRef.Address) + // advancedPoolHooksAddress := common.HexToAddress(advancedPoolHooksRef.Address) + // tokenPoolAddress := common.HexToAddress(tokenPoolRef.Address) routerAddress := common.HexToAddress(routerRef.Address) lombardVerifierAddress := common.HexToAddress(lombardVerifierAddressRef.Address) lombardVerifierResolverAddress := common.HexToAddress(lombardVerifierResolverAddressRef.Address) @@ -170,8 +170,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( } existingRemoteAdapterReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.GetRemoteAdapter, chain, contract_utils.FunctionInput[lombard_verifier.GetRemoteAdapterArgs]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, Args: lombard_verifier.GetRemoteAdapterArgs{ RemoteChainSelector: remoteChainSelector, Token: sourceTokenOrAdapterForRemoteAdapterLookup, @@ -210,8 +210,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( }) existingVerifierPathReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.GetPath, chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, Args: remoteChainSelector, }) if err != nil { @@ -220,8 +220,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( if existingVerifierPathReport.Output.LChainId != lchainID || existingVerifierPathReport.Output.AllowedCaller != verifierAllowedCaller { setRemotePathReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.SetPath, chain, contract_utils.FunctionInput[lombard_verifier.SetPathArgs]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, Args: lombard_verifier.SetPathArgs{ RemoteChainSelector: remoteChainSelector, LChainId: lchainID, @@ -237,8 +237,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( // Set outbound implementation on the LombardVerifierResolver for each remote chain setOutboundImplementationReport, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyOutboundImplementationUpdates, chain, contract_utils.FunctionInput[[]versioned_verifier_resolver.OutboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: lombardVerifierResolverAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierResolverAddress, Args: outboundImplementations, }) if err != nil { @@ -248,8 +248,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( // Apply remote chain config updates on the LombardVerifier applyRemoteChainConfigUpdatesReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.ApplyRemoteChainConfigUpdates, chain, contract_utils.FunctionInput[[]lombard_verifier.RemoteChainConfigArgs]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, Args: remoteChainConfigArgs, }) if err != nil { @@ -259,8 +259,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( if len(remoteAdapterArgs) > 0 { setRemoteAdaptersReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.SetRemoteAdapters, chain, contract_utils.FunctionInput[[]lombard_verifier.RemoteAdapterArgs]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, Args: remoteAdapterArgs, }) if err != nil { @@ -271,8 +271,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( // Apply advanced pool hooks CCV config updates advancedPoolHooksApplyReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.ApplyCCVConfigUpdates, chain, contract_utils.FunctionInput[[]advanced_pool_hooks.CCVConfigArg]{ - Address: advancedPoolHooksAddress, - ChainSelector: chain.Selector, + // Address: advancedPoolHooksAddress, + // ChainSelector: chain.Selector, Args: advancedPoolHooks, }) if err != nil { @@ -296,8 +296,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( for _, pathArgs := range tokenPoolPathArgs { existingPathReport, err := cldf_ops.ExecuteOperation(b, lombard_token_pool.GetPath, chain, contract_utils.FunctionInput[uint64]{ - ChainSelector: chain.Selector, - Address: tokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: tokenPoolAddress, Args: pathArgs.RemoteChainSelector, }) if err != nil { @@ -311,8 +311,8 @@ var ConfigureLombardChainForLanes = cldf_ops.NewSequence( } setPathReport, err := cldf_ops.ExecuteOperation(b, lombard_token_pool.SetPath, chain, contract_utils.FunctionInput[lombard_token_pool.SetPathArgs]{ - ChainSelector: chain.Selector, - Address: tokenPoolAddress, + // ChainSelector: chain.Selector, + // Address: tokenPoolAddress, Args: pathArgs, }) if err != nil { diff --git a/chains/evm/deployment/v2_0_0/sequences/lombard/deploy_lombard_chain.go b/chains/evm/deployment/v2_0_0/sequences/lombard/deploy_lombard_chain.go index 324d3064a6..9a6dea0295 100644 --- a/chains/evm/deployment/v2_0_0/sequences/lombard/deploy_lombard_chain.go +++ b/chains/evm/deployment/v2_0_0/sequences/lombard/deploy_lombard_chain.go @@ -84,7 +84,7 @@ var DeployLombardChain = cldf_ops.NewSequence( // Deploy LombardVerifier if needed lombardVerifierRef, err := contract_utils.MaybeDeployContract(b, lombard_verifier.Deploy, chain, contract_utils.DeployInput[lombard_verifier.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(lombard_verifier.ContractType, *lombard_verifier.Version), - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, Qualifier: &ContractQualifier, Args: lombard_verifier.ConstructorArgs{ Bridge: lombardBridgeAddress, @@ -103,8 +103,8 @@ var DeployLombardChain = cldf_ops.NewSequence( lombardVerifierAddress := common.HexToAddress(lombardVerifierRef.Address) _, err = cldf_ops.ExecuteOperation(b, lombard_verifier.UpdateSupportedTokens, chain, contract_utils.FunctionInput[lombard_verifier.UpdateSupportedTokensArgs]{ - ChainSelector: input.ChainSelector, - Address: lombardVerifierAddress, + // ChainSelector: input.ChainSelector, + // Address: lombardVerifierAddress, Args: lombard_verifier.UpdateSupportedTokensArgs{ TokensToSet: []lombard_verifier.SupportedTokenArgs{ { @@ -155,16 +155,17 @@ var DeployLombardChain = cldf_ops.NewSequence( } versionTagReport, err := cldf_ops.ExecuteOperation(b, lombard_verifier.VersionTag, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: chain.Selector, - Address: lombardVerifierAddress, + // ChainSelector: chain.Selector, + // Address: lombardVerifierAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get version tag from LombardVerifier: %w", err) } report, err := cldf_ops.ExecuteOperation(b, versioned_verifier_resolver.ApplyInboundImplementationUpdates, chain, contract_utils.FunctionInput[[]versioned_verifier_resolver.InboundImplementationArgs]{ - ChainSelector: chain.Selector, - Address: common.HexToAddress(lombardVerifierResolverRef.Address), + // ChainSelector: chain.Selector, + // Address: common.HexToAddress(lombardVerifierResolverRef.Address), Args: []versioned_verifier_resolver.InboundImplementationArgs{ {Version: versionTagReport.Output, Verifier: lombardVerifierAddress}, }, @@ -177,7 +178,7 @@ var DeployLombardChain = cldf_ops.NewSequence( // There can be multiple pools / tokens and advancedPoolHooks for Lombard advancedPoolHooksRef, err := contract_utils.MaybeDeployContract(b, advanced_pool_hooks.Deploy, chain, contract_utils.DeployInput[advanced_pool_hooks.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(advanced_pool_hooks.ContractType, *advanced_pool_hooks.Version), - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, Qualifier: tokenPoolQualifier(input.TokenQualifier), Args: advanced_pool_hooks.ConstructorArgs{ Allowlist: []common.Address{}, // Empty allowlist @@ -193,7 +194,7 @@ var DeployLombardChain = cldf_ops.NewSequence( lombardTokenPoolRef, err := contract_utils.MaybeDeployContract(b, lombard_token_pool.Deploy, chain, contract_utils.DeployInput[lombard_token_pool.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(lombard_token_pool.ContractType, *lombard_token_pool.Version), - ChainSelector: input.ChainSelector, + // ChainSelector: input.ChainSelector, Qualifier: tokenPoolQualifier(input.TokenQualifier), Args: lombard_token_pool.ConstructorArgs{ Token: tokenAddress, @@ -215,8 +216,9 @@ var DeployLombardChain = cldf_ops.NewSequence( // Add the newly deployed token pool as an authorized caller on the hooks. { getAuthorizedCallersReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetAllAuthorizedCallers, chain, contract_utils.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: advancedPoolHooksAddress, + // ChainSelector: input.ChainSelector, + // Address: advancedPoolHooksAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get authorized callers from advanced pool hooks %s on %d: %w", advancedPoolHooksAddress, input.ChainSelector, err) @@ -224,8 +226,8 @@ var DeployLombardChain = cldf_ops.NewSequence( if !slices.Contains(getAuthorizedCallersReport.Output, lombardTokenPoolAddress) { applyAuthorizedCallerUpdatesReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.ApplyAuthorizedCallerUpdates, chain, contract_utils.FunctionInput[advanced_pool_hooks.AuthorizedCallerArgs]{ - ChainSelector: input.ChainSelector, - Address: advancedPoolHooksAddress, + // ChainSelector: input.ChainSelector, + // Address: advancedPoolHooksAddress, Args: advanced_pool_hooks.AuthorizedCallerArgs{ AddedCallers: []common.Address{lombardTokenPoolAddress}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/sequence_fee_quoter_input_creation_test.go b/chains/evm/deployment/v2_0_0/sequences/sequence_fee_quoter_input_creation_test.go index cf97ce3ef0..1c55c30cd1 100644 --- a/chains/evm/deployment/v2_0_0/sequences/sequence_fee_quoter_input_creation_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/sequence_fee_quoter_input_creation_test.go @@ -895,7 +895,7 @@ func TestSequenceFeeQuoterInputCreation(t *testing.T) { for _, chainSelector := range chainSelectorList { chain := e.BlockChains.EVMChains()[chainSelector] dRep, err2 := cldf_ops.ExecuteOperation(e.OperationsBundle, routerops.Deploy, chain, contract.DeployInput[routerops.ConstructorArgs]{ - ChainSelector: chainSelector, + // ChainSelector: chainSelector, TypeAndVersion: cldf.NewTypeAndVersion(routerops.ContractType, *routerops.Version), Args: routerops.ConstructorArgs{ WrappedNative: utils2.RandomAddress(), // not relevant to this test, just needs to be populated with a valid address @@ -1251,7 +1251,7 @@ func deployOnRamps(t *testing.T, e *cldf.Environment, chainSelector uint64, remo switch version.String() { case "1.5.0": out, err := cldf_ops.ExecuteOperation(e.OperationsBundle, onrampv1_5ops.DeployOnRamp, chain, contract.DeployInput[onrampv1_5ops.ConstructorArgs]{ - ChainSelector: chainSelector, + // ChainSelector: chainSelector, TypeAndVersion: cldf.NewTypeAndVersion(onrampv1_5ops.ContractType, *onrampv1_5ops.Version), Args: onrampv1_5ops.ConstructorArgs{ StaticConfig: evm_2_evm_onramp_v1_5_0.EVM2EVMOnRampStaticConfig{ @@ -1293,7 +1293,7 @@ func deployOnRamps(t *testing.T, e *cldf.Environment, chainSelector uint64, remo rampAddr = out.Output case "1.6.0": out, err := cldf_ops.ExecuteOperation(e.OperationsBundle, onrampv1_6ops.Deploy, chain, contract.DeployInput[onrampv1_6ops.ConstructorArgs]{ - ChainSelector: chainSelector, + // ChainSelector: chainSelector, TypeAndVersion: cldf.NewTypeAndVersion(onrampv1_6ops.ContractType, *onrampv1_6ops.Version), Args: onrampv1_6ops.ConstructorArgs{ StaticConfig: onrampv1_6ops.StaticConfig{ @@ -1328,8 +1328,8 @@ func deployOnRamps(t *testing.T, e *cldf.Environment, chainSelector uint64, remo } _, err := cldf_ops.ExecuteOperation(e.OperationsBundle, routerops.ApplyRampUpdates, chain, contract.FunctionInput[routerops.ApplyRampsUpdatesArgs]{ - ChainSelector: chainSelector, - Address: routerAddr, + // ChainSelector: chainSelector, + // Address: routerAddr, Args: routerops.ApplyRampsUpdatesArgs{ OnRampUpdates: routerOnRamps, OffRampAdds: []router.RouterOffRamp{}, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers.go index 46d874eeb7..6e02e9a36f 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers.go @@ -54,8 +54,9 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( tokenAddress = common.HexToAddress(input.TokenAddress) } else { tokenAddrReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetToken, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: common.HexToAddress(input.TokenPoolAddress), + // ChainSelector: input.ChainSelector, + // Address: common.HexToAddress(input.TokenPoolAddress), + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token address from token pool with address %s on %s: %w", input.TokenPoolAddress, evmChain, err) @@ -75,8 +76,8 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( } tokenConfigReport, err := cldf_ops.ExecuteOperation(b, tar_ops.GetTokenConfig, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: registryAddress, + // ChainSelector: input.ChainSelector, + // Address: registryAddress, Args: tokenAddress, }) if err != nil { @@ -104,8 +105,8 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( // Validate the pool supports the token isSupported, err := cldf_ops.ExecuteOperation(b, token_pool.IsSupportedToken, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddress, Args: tokenAddress, }) if err != nil { @@ -118,16 +119,17 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( if !input.AllowedFinalityConfig.IsZero() { desiredFinalityConfig := input.AllowedFinalityConfig.Raw() currentAllowedFinalityReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetAllowedFinalityConfig, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get allowed finality config from token pool with address %s on %s: %w", input.TokenPoolAddress, evmChain, err) } if currentAllowedFinalityReport.Output != desiredFinalityConfig { configureMinBlockConfirmationReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetAllowedFinalityConfig, evmChain, evm_contract.FunctionInput[[4]byte]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddress, Args: desiredFinalityConfig, }) if err != nil { @@ -147,8 +149,9 @@ var ConfigureTokenForTransfers = cldf_ops.NewSequence( // Get the advanced pool hooks address advancedPoolHooksAddress, err := cldf_ops.ExecuteOperation(b, token_pool.GetAdvancedPoolHooks, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: tokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: tokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get advanced pool hooks address from token pool with address %s on %s: %w", input.TokenPoolAddress, evmChain, err) diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers_test.go index 3fb3f89456..6cf31b0aea 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_for_transfers_test.go @@ -46,7 +46,7 @@ func TestConfigureTokenForTransfers(t *testing.T) { // Deploy chain contracts create2FactoryRef, err := evm_contract.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], evm_contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -150,8 +150,8 @@ func TestConfigureTokenForTransfers(t *testing.T) { token_admin_registry.GetTokenConfig, e.BlockChains.EVMChains()[chainSel], evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: common.HexToAddress(tokenAdminRegistryAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(tokenAdminRegistryAddress), Args: common.HexToAddress(tokenAddress), }, ) @@ -168,8 +168,9 @@ func TestConfigureTokenForTransfers(t *testing.T) { token_pool.GetToken, e.BlockChains.EVMChains()[chainSel], evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(tokenPoolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(tokenPoolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -188,7 +189,7 @@ func TestConfigureTokenForTransfers(t *testing.T) { create2FactoryRef, err := evm_contract.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], evm_contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool.go index c6dd173814..dfea2a6a5d 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool.go @@ -47,16 +47,17 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // Set threshold amount for additional CCVs (if necessary) if input.ThresholdAmountForAdditionalCCVs != nil { currentThresholdAmountReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetThresholdAmount, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.AdvancedPoolHooks, + // ChainSelector: input.ChainSelector, + // Address: input.AdvancedPoolHooks, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get current threshold amount for additional CCVs on advanced pool hooks with address %s on %s: %w", input.AdvancedPoolHooks, chain, err) } if currentThresholdAmountReport.Output.Cmp(input.ThresholdAmountForAdditionalCCVs) != 0 { setThresholdAmountReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.SetThresholdAmount, chain, evm_contract.FunctionInput[*big.Int]{ - ChainSelector: input.ChainSelector, - Address: input.AdvancedPoolHooks, + // ChainSelector: input.ChainSelector, + // Address: input.AdvancedPoolHooks, Args: input.ThresholdAmountForAdditionalCCVs, }) if err != nil { @@ -69,8 +70,9 @@ var ConfigureTokenPool = cldf_ops.NewSequence( // Set dynamic config (if necessary) if input.RouterAddress != (common.Address{}) || input.RateLimitAdmin != (common.Address{}) || input.FeeAggregator != (common.Address{}) { currentDynamicConfigReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetDynamicConfig, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get current dynamic config from token pool with address %s on %s: %w", input.TokenPoolAddress, chain, err) @@ -95,8 +97,8 @@ var ConfigureTokenPool = cldf_ops.NewSequence( if desiredRouter != currentDynamicConfig.Router || desiredRateLimitAdmin != currentDynamicConfig.RateLimitAdmin || desiredFeeAdmin != currentDynamicConfig.FeeAdmin { setDynamicConfigReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetDynamicConfig, chain, evm_contract.FunctionInput[token_pool.SetDynamicConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.SetDynamicConfigArgs{ Router: desiredRouter, RateLimitAdmin: desiredRateLimitAdmin, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain.go index 7795db929f..162c7b3328 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain.go @@ -95,8 +95,9 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( } localDecimalsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetTokenDecimals, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token decimals: %w", err) @@ -120,9 +121,9 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // Read allowedFinalityConfig to determine whether to use fast finality (custom) or default finality finalityConfigReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetAllowedFinalityConfig, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, - Args: struct{}{}, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get allowed finality config: %w", err) @@ -142,9 +143,9 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( } if needCCVUpdate && ccvArg != nil { setCCVsReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.ApplyCCVConfigUpdates, chain, evm_contract.FunctionInput[[]advanced_pool_hooks.CCVConfigArg]{ - ChainSelector: input.ChainSelector, - Address: input.AdvancedPoolHooks, - Args: []advanced_pool_hooks.CCVConfigArg{*ccvArg}, + // ChainSelector: input.ChainSelector, + // Address: input.AdvancedPoolHooks, + Args: []advanced_pool_hooks.CCVConfigArg{*ccvArg}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to set CCVs: %w", err) @@ -161,9 +162,9 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( if input.RemoteChainAlreadySupported { // Check existing remote token getRemoteTokenReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRemoteToken, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, - Args: input.RemoteChainSelector, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: input.RemoteChainSelector, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get remote token: %w", err) @@ -194,9 +195,9 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( // Check existing remote pools and add any missing (active pool's remote pools first for upgrade, then requested pool) getRemotePoolsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetRemotePools, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, - Args: input.RemoteChainSelector, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: input.RemoteChainSelector, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get remote pools: %w", err) @@ -210,8 +211,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( padded := common.LeftPadBytes(activePoolAddr, 32) if !containsPool(padded) { addReport, err := cldf_ops.ExecuteOperation(b, token_pool.AddRemotePool, chain, evm_contract.FunctionInput[token_pool.AddRemotePoolArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.AddRemotePoolArgs{ RemoteChainSelector: input.RemoteChainSelector, RemotePoolAddress: padded, @@ -226,8 +227,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( } if !containsPool(common.LeftPadBytes(input.RemoteChainConfig.RemotePool, 32)) { addRemotePoolsReport, err := cldf_ops.ExecuteOperation(b, token_pool.AddRemotePool, chain, evm_contract.FunctionInput[token_pool.AddRemotePoolArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.AddRemotePoolArgs{ RemoteChainSelector: input.RemoteChainSelector, RemotePoolAddress: common.LeftPadBytes(input.RemoteChainConfig.RemotePool, 32), @@ -267,8 +268,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( remotePoolAddresses = append(remotePoolAddresses, inputPoolPadded) } applyChainUpdatesReport, err := cldf_ops.ExecuteOperation(b, token_pool.ApplyChainUpdates, chain, evm_contract.FunctionInput[token_pool.ApplyChainUpdatesArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.ApplyChainUpdatesArgs{ RemoteChainSelectorsToRemove: removes, ChainsToAdd: []token_pool.ChainUpdate{ @@ -319,8 +320,8 @@ var ConfigureTokenPoolForRemoteChain = cldf_ops.NewSequence( } if len(tokenTransferFeeConfigUpdates) > 0 { applyTokenTransferFeeConfigUpdatesReport, err := cldf_ops.ExecuteOperation(b, token_pool.ApplyTokenTransferFeeConfigUpdates, chain, evm_contract.FunctionInput[token_pool.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.ApplyTokenTransferFeeConfigUpdatesArgs{ TokenTransferFeeConfigArgs: tokenTransferFeeConfigUpdates, }, @@ -355,9 +356,9 @@ func importConfigFromActivePool( return nil, nil } tokenConfigReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.GetTokenConfig, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSelector, - Address: registryAddress, - Args: tokenAddress, + // ChainSelector: chainSelector, + // Address: registryAddress, + Args: tokenAddress, }) if err != nil { return nil, fmt.Errorf("failed to get token config from registry: %w", err) @@ -367,9 +368,9 @@ func importConfigFromActivePool( return nil, nil } typeAndVersionReport, err := cldf_ops.ExecuteOperation(b, type_and_version.GetTypeAndVersion, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: activePool, - Args: struct{}{}, + // ChainSelector: chainSelector, + // Address: activePool, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get active pool type and version: %w", err) @@ -401,9 +402,9 @@ func importConfigFromActivePoolV150( poolForRateLimits := activePool if strings.Contains(typeStr, "Proxy") { prevReport, err := cldf_ops.ExecuteOperation(b, token_pool_v150.GetPreviousPool, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: activePool, - Args: struct{}{}, + // ChainSelector: chainSelector, + // Address: activePool, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get previous pool from proxy: %w", err) @@ -411,9 +412,9 @@ func importConfigFromActivePoolV150( previousPool := prevReport.Output if previousPool != (common.Address{}) { prevTVReport, err := cldf_ops.ExecuteOperation(b, type_and_version.GetTypeAndVersion, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: previousPool, - Args: struct{}{}, + // ChainSelector: chainSelector, + // Address: previousPool, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get previous pool type and version: %w", err) @@ -443,25 +444,25 @@ func fetchRateLimitsAndRemotePoolV150( remoteChainSelector uint64, ) (*activePoolImportedConfig, error) { inboundReport, err := cldf_ops.ExecuteOperation(b, token_pool_v150.GetCurrentInboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: poolForRateLimits, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: poolForRateLimits, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get inbound rate limiter state: %w", err) } outboundReport, err := cldf_ops.ExecuteOperation(b, token_pool_v150.GetCurrentOutboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: poolForRateLimits, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: poolForRateLimits, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get outbound rate limiter state: %w", err) } remotePoolReport, err := cldf_ops.ExecuteOperation(b, token_pool_v150.GetRemotePool, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: poolForRemotePool, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: poolForRemotePool, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get remote pool: %w", err) @@ -486,25 +487,25 @@ func importConfigFromActivePoolV161( remoteChainSelector uint64, ) (*activePoolImportedConfig, error) { inboundReport, err := cldf_ops.ExecuteOperation(b, token_pool_v161.GetCurrentInboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: activePool, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: activePool, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get active pool inbound rate limiter state: %w", err) } outboundReport, err := cldf_ops.ExecuteOperation(b, token_pool_v161.GetCurrentOutboundRateLimiterState, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: activePool, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: activePool, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get active pool outbound rate limiter state: %w", err) } remotePoolsReport, err := cldf_ops.ExecuteOperation(b, token_pool_v161.GetRemotePools, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSelector, - Address: activePool, - Args: remoteChainSelector, + // ChainSelector: chainSelector, + // Address: activePool, + Args: remoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get active pool remote pools: %w", err) @@ -548,8 +549,8 @@ func maybeUpdateRateLimiters( ) (*evm_contract.WriteOutput, error) { // Check existing rate limiters rateLimiterStateReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetCurrentRateLimiterState, chain, evm_contract.FunctionInput[token_pool.GetCurrentRateLimiterStateArgs]{ - ChainSelector: chainSelector, - Address: tokenPoolAddress, + // ChainSelector: chainSelector, + // Address: tokenPoolAddress, Args: token_pool.GetCurrentRateLimiterStateArgs{ RemoteChainSelector: remoteChainSelector, FastFinality: fastFinality, @@ -567,8 +568,8 @@ func maybeUpdateRateLimiters( if (!rateLimiterConfigsEqual(currentStates.InboundRateLimiterState, desiredInboundRateLimiterConfig) && desiredInboundRateLimiterConfig.IsEnabled) || (!rateLimiterConfigsEqual(currentStates.OutboundRateLimiterState, desiredOutboundRateLimiterConfig) && desiredOutboundRateLimiterConfig.IsEnabled) { setInboundRateLimiterReport, err := cldf_ops.ExecuteOperation(b, token_pool.SetRateLimitConfig, chain, evm_contract.FunctionInput[[]token_pool.RateLimitConfigArgs]{ - ChainSelector: chainSelector, - Address: tokenPoolAddress, + // ChainSelector: chainSelector, + // Address: tokenPoolAddress, Args: []token_pool.RateLimitConfigArgs{ { RemoteChainSelector: remoteChainSelector, @@ -612,8 +613,8 @@ func applyTokenTransferFeeConfigIfNeeded(b cldf_ops.Bundle, chain evm.Chain, inp return nil, nil } report, err := cldf_ops.ExecuteOperation(b, token_pool.ApplyTokenTransferFeeConfigUpdates, chain, evm_contract.FunctionInput[token_pool.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.ApplyTokenTransferFeeConfigUpdatesArgs{ TokenTransferFeeConfigArgs: tokenTransferFeeConfigUpdates, DisableTokenTransferFeeConfigs: nil, @@ -673,9 +674,9 @@ func importTokenTransferFeeConfigFromFeeQuoter( remoteChainSelector uint64, ) (*tokens.TokenTransferFeeConfig, error) { feeQuoterTAVReport, err := cldf_ops.ExecuteOperation(b, type_and_version.GetTypeAndVersion, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: feeQuoterAddr, - Args: struct{}{}, + // ChainSelector: chainSelector, + // Address: feeQuoterAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get type and version of fee quoter %s on chain %s: %w", feeQuoterAddr.Hex(), chain.String(), err) @@ -685,8 +686,8 @@ func importTokenTransferFeeConfigFromFeeQuoter( switch { case feeQuoterVersion.Major() == 1 && feeQuoterVersion.Minor() == 6: tokenTransferFeeConfigReport, err := cldf_ops.ExecuteOperation(b, fqops_v163.GetTokenTransferFeeConfig, chain, evm_contract.FunctionInput[fqops_v163.GetTokenTransferFeeConfigArgs]{ - ChainSelector: chainSelector, - Address: feeQuoterAddr, + // ChainSelector: chainSelector, + // Address: feeQuoterAddr, Args: fqops_v163.GetTokenTransferFeeConfigArgs{ Token: tokenAddress, DestChainSelector: remoteChainSelector, @@ -699,8 +700,8 @@ func importTokenTransferFeeConfigFromFeeQuoter( return v163FeeQuoterConfigToTokenTransferFeeConfig(tokenTransferFeeConfigReport.Output), nil case feeQuoterVersion.String() == fqops.Version.String(): tokenTransferFeeConfigReport, err := cldf_ops.ExecuteOperation(b, fqops.GetTokenTransferFeeConfig, chain, evm_contract.FunctionInput[fqops.GetTokenTransferFeeConfigArgs]{ - ChainSelector: chainSelector, - Address: feeQuoterAddr, + // ChainSelector: chainSelector, + // Address: feeQuoterAddr, Args: fqops.GetTokenTransferFeeConfigArgs{ Token: tokenAddress, DestChainSelector: remoteChainSelector, @@ -720,8 +721,9 @@ func importTokenTransferFeeConfigFromFeeQuoter( func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Chain, input ConfigureTokenPoolForRemoteChainInput) (*tokens.TokenTransferFeeConfig, error) { // get router from token dCfgReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetDynamicConfig, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get token dynamic config for pool %s on chain %s: %w", input.TokenPoolAddress.Hex(), chain.String(), err) @@ -733,9 +735,9 @@ func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Cha } // get onRamp from router for the destination chain onRampOnRouterReport, err := cldf_ops.ExecuteOperation(b, routerops.GetOnRamp, chain, evm_contract.FunctionInput[uint64]{ - ChainSelector: input.ChainSelector, - Address: routerAddr, - Args: input.RemoteChainSelector, + // ChainSelector: input.ChainSelector, + // Address: routerAddr, + Args: input.RemoteChainSelector, }) if err != nil { return nil, fmt.Errorf("failed to get onRamp from router %s for "+ @@ -748,9 +750,9 @@ func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Cha onRampAddr := onRampOnRouterReport.Output // check the version of the onRamp contract onRampTAVReport, err := cldf_ops.ExecuteOperation(b, type_and_version.GetTypeAndVersion, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, - Args: struct{}{}, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get type and version of onRamp %s on chain %s: %w", onRampAddr.Hex(), chain.String(), err) @@ -760,9 +762,9 @@ func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Cha case semver.MustParse("1.5.0").String(): // for onRamp version 1.5.0, import tokenTransferFeeConfig from onRamp 1.5.0 tokenTransferFeeConfigReport, err := cldf_ops.ExecuteOperation(b, onrampops_v150.OnRampGetTokenTransferFeeConfig, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, - Args: input.TokenAddress, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, + Args: input.TokenAddress, }) if err != nil { return nil, fmt.Errorf("failed to get token transfer fee config from onRamp %s for token %s on chain %s: %w", @@ -772,9 +774,9 @@ func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Cha case semver.MustParse("1.6.0").String(): // for onRamp versions 1.6.0 , import tokenTransferFeeConfig from FeeQuoter // get fee quoter from onRamp dCfgOnRamp, err := cldf_ops.ExecuteOperation(b, onrampops_v160.GetDynamicConfig, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, - Args: struct{}{}, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get dynamic config from onRamp %s on chain %s: %w", onRampAddr.Hex(), chain.String(), err) @@ -787,9 +789,9 @@ func importTokenTransferFeeConfigFromActivePool(b cldf_ops.Bundle, chain evm.Cha case onrampops.Version.String(): // get fee quoter from onRamp dCfgOnRamp, err := cldf_ops.ExecuteOperation(b, onrampops.GetDynamicConfig, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: onRampAddr, - Args: struct{}{}, + // ChainSelector: input.ChainSelector, + // Address: onRampAddr, + Args: struct{}{}, }) if err != nil { return nil, fmt.Errorf("failed to get dynamic config from onRamp %s on chain %s: %w", onRampAddr.Hex(), chain.String(), err) @@ -846,8 +848,8 @@ func makeTokenTransferFeeConfigUpdates(b cldf_ops.Bundle, chain evm.Chain, input return nil, nil } report, err := cldf_ops.ExecuteOperation(b, token_pool.GetTokenTransferFeeConfig, chain, evm_contract.FunctionInput[token_pool.GetTokenTransferFeeConfigArgs]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, Args: token_pool.GetTokenTransferFeeConfigArgs{ Arg0: common.Address{}, DestChainSelector: remoteChainSelector, @@ -915,8 +917,9 @@ func makeCCVUpdates(b cldf_ops.Bundle, chain evm.Chain, chainSelector uint64, ad const directionOutbound uint8 = 0 thresholdReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetThresholdAmount, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSelector, - Address: advancedPoolHooksAddr, + // ChainSelector: chainSelector, + // Address: advancedPoolHooksAddr, + Args: struct{}{}, }) if err != nil { return nil, false, fmt.Errorf("get threshold amount: %w", err) @@ -926,8 +929,8 @@ func makeCCVUpdates(b cldf_ops.Bundle, chain evm.Chain, chainSelector uint64, ad getRequiredCCVs := func(amount *big.Int, direction uint8) ([]common.Address, error) { report, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetRequiredCCVs, chain, evm_contract.FunctionInput[advanced_pool_hooks.GetRequiredCCVsArgs]{ - ChainSelector: chainSelector, - Address: advancedPoolHooksAddr, + // ChainSelector: chainSelector, + // Address: advancedPoolHooksAddr, Args: advanced_pool_hooks.GetRequiredCCVsArgs{ RemoteChainSelector: remoteChainSelector, Amount: amount, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain_test.go index 5ba15da446..1444f64191 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chain_test.go @@ -206,7 +206,7 @@ func TestConfigureTokenPoolForRemoteChain(t *testing.T) { // Deploy chain create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -282,7 +282,7 @@ func TestConfigureTokenPoolForRemoteChainUpgradeImport(t *testing.T) { // Deploy chain (includes TokenAdminRegistry) create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -369,8 +369,8 @@ func TestConfigureTokenPoolForRemoteChainUpgradeImport(t *testing.T) { // Verify registration: GetTokenConfig(registry, tokenB) must return pool B as active pool (required for import). // If not set, the framework may not execute RegisterToken's batch in this test env; skip the rest. getCfgReport, err := operations.ExecuteOperation(e.OperationsBundle, token_admin_registry.GetTokenConfig, e.BlockChains.EVMChains()[chainSel], contract_utils.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: registryAddress, + // ChainSelector: chainSel, + // Address: registryAddress, Args: tokenBAddress, }) require.NoError(t, err, "GetTokenConfig should not error") @@ -471,7 +471,7 @@ func TestConfigureTokenPoolForRemoteChain_DynamicFinalityRateLimits(t *testing.T // Deploy chain contracts create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -540,8 +540,8 @@ func TestConfigureTokenPoolForRemoteChain_DynamicFinalityRateLimits(t *testing.T token_pool.SetAllowedFinalityConfig, e.BlockChains.EVMChains()[chainSel], contract_utils.FunctionInput[[4]byte]{ - ChainSelector: chainSel, - Address: tokenPoolAddress, + // ChainSelector: chainSel, + // Address: tokenPoolAddress, Args: finality.Config{BlockDepth: 12}.Raw(), }, ) diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chains.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chains.go index 987aba82e7..a2ca0287fb 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chains.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_for_remote_chains.go @@ -41,8 +41,8 @@ var ConfigureTokenPoolForRemoteChains = cldf_ops.NewSequence( // best-effort and skip validation when the call fails. if input.RegistryAddress != (common.Address{}) && input.TokenAddress != (common.Address{}) { tokenConfigReport, err := cldf_ops.ExecuteOperation(b, token_admin_registry.GetTokenConfig, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: input.ChainSelector, - Address: input.RegistryAddress, + // ChainSelector: input.ChainSelector, + // Address: input.RegistryAddress, Args: input.TokenAddress, }) if err != nil { @@ -51,8 +51,9 @@ var ConfigureTokenPoolForRemoteChains = cldf_ops.NewSequence( activePool := tokenConfigReport.Output.TokenPool if activePool != (common.Address{}) { supportedChainsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetSupportedChains, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: activePool, + // ChainSelector: input.ChainSelector, + // Address: activePool, + Args: struct{}{}, }) if err == nil { // Validate that remoteChains includes all chains the active pool already supports (upgrade safety). @@ -70,8 +71,9 @@ var ConfigureTokenPoolForRemoteChains = cldf_ops.NewSequence( } ops := make([]mcms_types.BatchOperation, 0) supportedChainsReport, err := cldf_ops.ExecuteOperation(b, token_pool.GetSupportedChains, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: input.TokenPoolAddress, + // ChainSelector: input.ChainSelector, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get supported chains from pool: %w", err) diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_test.go index 49622db62e..8d4fbd1afd 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/configure_token_pool_test.go @@ -54,7 +54,7 @@ func TestConfigurePool(t *testing.T) { // Deploy chain create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -101,8 +101,9 @@ func TestConfigurePool(t *testing.T) { token_pool.GetDynamicConfig, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: input.TokenPoolAddress, + // ChainSelector: chainSel, + // Address: input.TokenPoolAddress, + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool.go b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool.go index e617d0a196..674763f3c8 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool.go @@ -29,7 +29,7 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( } hooksDeployReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.Deploy, chain, evm_contract.DeployInput[advanced_pool_hooks.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: deployment.NewTypeAndVersion(advanced_pool_hooks.ContractType, *advanced_pool_hooks.Version), Args: advanced_pool_hooks.ConstructorArgs{ Allowlist: input.AdvancedPoolHooksConfig.Allowlist, @@ -65,7 +65,7 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( switch deployment.ContractType(input.TokenPoolType) { case burn_mint_token_pool.ContractType: report, deployErr := cldf_ops.ExecuteOperation(b, burn_mint_token_pool.Deploy, chain, evm_contract.DeployInput[burn_mint_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: typeAndVersion, Args: burn_mint_token_pool.ConstructorArgs{ Token: constructorArgs.Token, @@ -79,7 +79,7 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( tpDeployReport, err = &report.Output, deployErr case burn_from_mint_token_pool.ContractType: report, deployErr := cldf_ops.ExecuteOperation(b, burn_from_mint_token_pool.Deploy, chain, evm_contract.DeployInput[burn_from_mint_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: typeAndVersion, Args: burn_from_mint_token_pool.ConstructorArgs{ Token: constructorArgs.Token, @@ -93,7 +93,7 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( tpDeployReport, err = &report.Output, deployErr case burn_with_from_mint_token_pool.ContractType: report, deployErr := cldf_ops.ExecuteOperation(b, burn_with_from_mint_token_pool.Deploy, chain, evm_contract.DeployInput[burn_with_from_mint_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: typeAndVersion, Args: burn_with_from_mint_token_pool.ConstructorArgs{ Token: constructorArgs.Token, @@ -131,8 +131,9 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( hooksAddr := common.HexToAddress(hooksDeployReport.Output.Address) getAuthorizedCallersReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetAllAuthorizedCallers, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSel, - Address: hooksAddr, + // ChainSelector: input.ChainSel, + // Address: hooksAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get authorized callers from advanced pool hooks %s on %s: %w", hooksAddr, chain, err) @@ -140,8 +141,8 @@ var DeployBurnMintTokenPool = cldf_ops.NewSequence( if !slices.Contains(getAuthorizedCallersReport.Output, poolAddr) { applyAuthorizedCallerUpdatesReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.ApplyAuthorizedCallerUpdates, chain, evm_contract.FunctionInput[advanced_pool_hooks.AuthorizedCallerArgs]{ - ChainSelector: input.ChainSel, - Address: hooksAddr, + // ChainSelector: input.ChainSel, + // Address: hooksAddr, Args: advanced_pool_hooks.AuthorizedCallerArgs{ AddedCallers: []common.Address{poolAddr}, }, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool_test.go index 81d936178b..2a65c5e4fe 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_burn_mint_token_pool_test.go @@ -227,7 +227,7 @@ func TestDeployTokenPool(t *testing.T) { // Deploy chain create2FactoryRef, err := contract_utils.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract_utils.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -252,7 +252,7 @@ func TestDeployTokenPool(t *testing.T) { burn_mint_erc20_with_drip.Deploy, e.BlockChains.EVMChains()[chainSel], contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *burn_mint_erc20_with_drip.Version), Args: burn_mint_erc20_with_drip.ConstructorArgs{ Name: "Test Token", @@ -279,7 +279,7 @@ func TestDeployTokenPool(t *testing.T) { require.Len(t, poolReport.Output.Addresses, 2, "Expected 2 addresses in output") poolAddress := poolReport.Output.Addresses[0].Address - hooksAddress := poolReport.Output.Addresses[1].Address + // hooksAddress := poolReport.Output.Addresses[1].Address // Check token getTokenReport, err := operations.ExecuteOperation( @@ -287,8 +287,9 @@ func TestDeployTokenPool(t *testing.T) { token_pool.GetToken, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct {}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -300,8 +301,9 @@ func TestDeployTokenPool(t *testing.T) { token_pool.GetDynamicConfig, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -314,8 +316,9 @@ func TestDeployTokenPool(t *testing.T) { token_pool.GetRmnProxy, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -327,8 +330,9 @@ func TestDeployTokenPool(t *testing.T) { advanced_pool_hooks.GetThresholdAmount, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -341,8 +345,9 @@ func TestDeployTokenPool(t *testing.T) { advanced_pool_hooks.GetPolicyEngine, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -355,8 +360,9 @@ func TestDeployTokenPool(t *testing.T) { advanced_pool_hooks.GetAllAuthorizedCallers, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool.go b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool.go index b961f7b0e4..c0853b68aa 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool.go @@ -30,7 +30,7 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( } lockBoxDeployReport, err := cldf_ops.ExecuteOperation(b, erc20_lock_box.Deploy, chain, evm_contract.DeployInput[erc20_lock_box.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: deployment.NewTypeAndVersion(erc20_lock_box.ContractType, *erc20_lock_box.Version), Args: erc20_lock_box.ConstructorArgs{ Token: input.ConstructorArgs.Token, @@ -42,7 +42,7 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( } hooksDeployReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.Deploy, chain, evm_contract.DeployInput[advanced_pool_hooks.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: deployment.NewTypeAndVersion(advanced_pool_hooks.ContractType, *advanced_pool_hooks.Version), Args: advanced_pool_hooks.ConstructorArgs{ Allowlist: input.AdvancedPoolHooksConfig.Allowlist, @@ -61,7 +61,7 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( *input.TokenPoolVersion, ) tpDeployReport, err := cldf_ops.ExecuteOperation(b, lock_release_token_pool.Deploy, chain, evm_contract.DeployInput[lock_release_token_pool.ConstructorArgs]{ - ChainSelector: input.ChainSel, + // ChainSelector: input.ChainSel, TypeAndVersion: typeAndVersion, Args: lock_release_token_pool.ConstructorArgs{ Token: input.ConstructorArgs.Token, @@ -95,8 +95,9 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( hooksAddr := common.HexToAddress(hooksDeployReport.Output.Address) getAuthorizedCallersReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.GetAllAuthorizedCallers, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSel, - Address: hooksAddr, + // ChainSelector: input.ChainSel, + // Address: hooksAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get authorized callers from advanced pool hooks %s on %s: %w", hooksAddr, chain, err) @@ -104,8 +105,8 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( if !slices.Contains(getAuthorizedCallersReport.Output, poolAddr) { applyAuthorizedCallerUpdatesReport, err := cldf_ops.ExecuteOperation(b, advanced_pool_hooks.ApplyAuthorizedCallerUpdates, chain, evm_contract.FunctionInput[advanced_pool_hooks.AuthorizedCallerArgs]{ - ChainSelector: input.ChainSel, - Address: hooksAddr, + // ChainSelector: input.ChainSel, + // Address: hooksAddr, Args: advanced_pool_hooks.AuthorizedCallerArgs{ AddedCallers: []common.Address{poolAddr}, }, @@ -124,8 +125,8 @@ var DeployLockReleaseTokenPool = cldf_ops.NewSequence( // Add lock release token pool to the authorized callers of the lock box. applyAuthorizedCallerUpdatesReport, err := cldf_ops.ExecuteOperation(b, erc20_lock_box.ApplyAuthorizedCallerUpdates, chain, evm_contract.FunctionInput[erc20_lock_box.AuthorizedCallerArgs]{ - ChainSelector: input.ChainSel, - Address: common.HexToAddress(lockBoxDeployReport.Output.Address), + // ChainSelector: input.ChainSel, + // Address: common.HexToAddress(lockBoxDeployReport.Output.Address), Args: erc20_lock_box.AuthorizedCallerArgs{ AddedCallers: []common.Address{ common.HexToAddress(tpDeployReport.Output.Address), diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool_test.go index 1385fd2c76..51c3a5bbd0 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/deploy_lock_release_token_pool_test.go @@ -226,7 +226,7 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { // Deploy CREATE2Factory first create2FactoryRef, err := contract.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, e.BlockChains.EVMChains()[chainSel], contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{e.BlockChains.EVMChains()[chainSel].DeployerKey.From}, }, @@ -253,7 +253,7 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { burn_mint_erc20_with_drip.Deploy, e.BlockChains.EVMChains()[chainSel], contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *burn_mint_erc20_with_drip.Version), Args: burn_mint_erc20_with_drip.ConstructorArgs{ Name: "Test Token", @@ -280,7 +280,7 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { require.Len(t, poolReport.Output.Addresses, 3, "Expected 3 addresses in output (pool, hooks, lockBox)") poolAddress := poolReport.Output.Addresses[0].Address - hooksAddress := poolReport.Output.Addresses[1].Address + // hooksAddress := poolReport.Output.Addresses[1].Address lockBoxAddress := poolReport.Output.Addresses[2].Address // Check token @@ -289,8 +289,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { token_pool.GetToken, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -302,8 +303,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { token_pool.GetDynamicConfig, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -316,8 +318,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { token_pool.GetRmnProxy, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(poolAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(poolAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -329,8 +332,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { advanced_pool_hooks.GetThresholdAmount, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -343,8 +347,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { advanced_pool_hooks.GetPolicyEngine, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -357,8 +362,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { advanced_pool_hooks.GetAllAuthorizedCallers, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(hooksAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(hooksAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") @@ -370,8 +376,9 @@ func TestDeployLockReleaseTokenPool(t *testing.T) { erc20_lock_box.GetAllAuthorizedCallers, e.BlockChains.EVMChains()[chainSel], contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: common.HexToAddress(lockBoxAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(lockBoxAddress), + Args: struct{}{}, }, ) require.NoError(t, err, "ExecuteOperation should not error") diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity.go b/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity.go index 7a52dfe0c2..266f73bba4 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity.go @@ -46,8 +46,9 @@ var MigrateLockReleasePoolLiquidity = cldf_ops.NewSequence( timelockAddr := common.HexToAddress(input.TimelockAddress) tvReport, err := cldf_ops.ExecuteOperation(b, type_and_version.GetTypeAndVersion, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: oldPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: oldPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get typeAndVersion from old pool %s: %w", oldPoolAddr, err) @@ -55,8 +56,9 @@ var MigrateLockReleasePoolLiquidity = cldf_ops.NewSequence( oldPoolType := string(tvReport.Output.Type) tokenReport, err := cldf_ops.ExecuteOperation(b, token_pool_ops.GetToken, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: input.ChainSelector, - Address: newPoolAddr, + // ChainSelector: input.ChainSelector, + // Address: newPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get token address from new pool %s: %w", newPoolAddr, err) @@ -122,8 +124,9 @@ func migrateUnsiloedPool( var ops []evm_contract.WriteOutput lockboxReport, err := cldf_ops.ExecuteOperation(b, lrtp_ops_v170.GetLockBox, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: newPoolAddr, + // ChainSelector: chainSel, + // Address: newPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get lockbox from new pool %s: %w", newPoolAddr, err) @@ -131,8 +134,8 @@ func migrateUnsiloedPool( lockboxAddr := lockboxReport.Output balanceReport, err := cldf_ops.ExecuteOperation(b, erc20_ops.BalanceOf, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: tokenAddr, + // ChainSelector: chainSel, + // Address: tokenAddr, Args: oldPoolAddr, }) if err != nil { @@ -149,8 +152,9 @@ func migrateUnsiloedPool( } rebalancerReport, err := cldf_ops.ExecuteOperation(b, lrtp_ops_v161.GetRebalancer, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get rebalancer from old pool %s: %w", oldPoolAddr, err) @@ -199,8 +203,9 @@ func migrateSiloedPool( var ops []evm_contract.WriteOutput chainsReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.GetSupportedChains, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get supported chains from old siloed pool %s: %w", oldPoolAddr, err) @@ -208,8 +213,9 @@ func migrateSiloedPool( supportedChains := chainsReport.Output lockboxConfigsReport, err := cldf_ops.ExecuteOperation(b, siloed_lrtp_ops_v170.GetAllLockBoxConfigs, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: newPoolAddr, + // ChainSelector: chainSel, + // Address: newPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get lockbox configs from new pool %s: %w", newPoolAddr, err) @@ -221,8 +227,9 @@ func migrateSiloedPool( } rebalancerReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.GetRebalancer, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get unsiloed rebalancer from old pool %s: %w", oldPoolAddr, err) @@ -230,8 +237,8 @@ func migrateSiloedPool( originalUnsiloedRebalancer := rebalancerReport.Output setRebalancerReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.SetRebalancer, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: timelockAddr, }) if err != nil { @@ -248,8 +255,8 @@ func migrateSiloedPool( for _, remoteChain := range supportedChains { isSiloedReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.IsSiloed, evmChain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: remoteChain, }) if err != nil { @@ -258,8 +265,8 @@ func migrateSiloedPool( if isSiloedReport.Output { chainRebalancerReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.GetChainRebalancer, evmChain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: remoteChain, }) if err != nil { @@ -267,8 +274,8 @@ func migrateSiloedPool( } setSiloReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.SetSiloRebalancer, evmChain, evm_contract.FunctionInput[siloed_ops_v161.SetSiloRebalancerArgs]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: siloed_ops_v161.SetSiloRebalancerArgs{ RemoteChainSelector: remoteChain, NewRebalancer: timelockAddr, @@ -308,8 +315,8 @@ func migrateSiloedPool( } availableReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.GetAvailableTokens, evmChain, evm_contract.FunctionInput[uint64]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: info.chainSelector, }) if err != nil { @@ -323,8 +330,8 @@ func migrateSiloedPool( } withdrawReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.WithdrawSiloedLiquidity, evmChain, evm_contract.FunctionInput[siloed_ops_v161.WithdrawSiloedLiquidityArgs]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: siloed_ops_v161.WithdrawSiloedLiquidityArgs{ RemoteChainSelector: info.chainSelector, Amount: siloAmount, @@ -343,8 +350,9 @@ func migrateSiloedPool( } unsiloedReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.GetUnsiloedLiquidity, evmChain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, + Args: struct{}{}, }) if err != nil { return sequences.OnChainOutput{}, fmt.Errorf("failed to get unsiloed liquidity from old pool %s: %w", oldPoolAddr, err) @@ -365,8 +373,8 @@ func migrateSiloedPool( } withdrawUnsiloedReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.WithdrawLiquidity, evmChain, evm_contract.FunctionInput[*big.Int]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: unsiloedAmount, }) if err != nil { @@ -384,8 +392,8 @@ func migrateSiloedPool( for _, info := range siloInfos { if info.isSiloed { restoreReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.SetSiloRebalancer, evmChain, evm_contract.FunctionInput[siloed_ops_v161.SetSiloRebalancerArgs]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: siloed_ops_v161.SetSiloRebalancerArgs{ RemoteChainSelector: info.chainSelector, NewRebalancer: info.originalRebalancer, @@ -399,8 +407,8 @@ func migrateSiloedPool( } restoreUnsiloedReport, err := cldf_ops.ExecuteOperation(b, siloed_ops_v161.SetRebalancer, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: originalUnsiloedRebalancer, }) if err != nil { @@ -410,8 +418,8 @@ func migrateSiloedPool( for lb := range usedLockboxes { removeAuthReport, err := cldf_ops.ExecuteOperation(b, lockbox_ops.ApplyAuthorizedCallerUpdates, evmChain, evm_contract.FunctionInput[lockbox_ops.AuthorizedCallerArgs]{ - ChainSelector: chainSel, - Address: lb, + // ChainSelector: chainSel, + // Address: lb, Args: lockbox_ops.AuthorizedCallerArgs{ AddedCallers: []common.Address{}, RemovedCallers: []common.Address{timelockAddr}, @@ -449,8 +457,8 @@ func appendSetRebalancerAndWithdraw( ops []evm_contract.WriteOutput, ) ([]evm_contract.WriteOutput, error) { setRebalancerReport, err := cldf_ops.ExecuteOperation(b, lrtp_ops_v161.SetRebalancer, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: timelockAddr, }) if err != nil { @@ -459,8 +467,8 @@ func appendSetRebalancerAndWithdraw( ops = append(ops, setRebalancerReport.Output) withdrawReport, err := cldf_ops.ExecuteOperation(b, lrtp_ops_v161.WithdrawLiquidity, evmChain, evm_contract.FunctionInput[*big.Int]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: amount, }) if err != nil { @@ -481,8 +489,8 @@ func appendAuthApproveDeposit( ops []evm_contract.WriteOutput, ) ([]evm_contract.WriteOutput, error) { addAuthReport, err := cldf_ops.ExecuteOperation(b, lockbox_ops.ApplyAuthorizedCallerUpdates, evmChain, evm_contract.FunctionInput[lockbox_ops.AuthorizedCallerArgs]{ - ChainSelector: chainSel, - Address: lockboxAddr, + // ChainSelector: chainSel, + // Address: lockboxAddr, Args: lockbox_ops.AuthorizedCallerArgs{ AddedCallers: []common.Address{timelockAddr}, RemovedCallers: []common.Address{}, @@ -494,8 +502,8 @@ func appendAuthApproveDeposit( ops = append(ops, addAuthReport.Output) approveReport, err := cldf_ops.ExecuteOperation(b, erc20_ops.Approve, evmChain, evm_contract.FunctionInput[erc20_ops.ApproveArgs]{ - ChainSelector: chainSel, - Address: tokenAddr, + // ChainSelector: chainSel, + // Address: tokenAddr, Args: erc20_ops.ApproveArgs{ Spender: lockboxAddr, Value: amount, @@ -507,8 +515,8 @@ func appendAuthApproveDeposit( ops = append(ops, approveReport.Output) depositReport, err := cldf_ops.ExecuteOperation(b, lockbox_ops.Deposit, evmChain, evm_contract.FunctionInput[lockbox_ops.DepositArgs]{ - ChainSelector: chainSel, - Address: lockboxAddr, + // ChainSelector: chainSel, + // Address: lockboxAddr, Args: lockbox_ops.DepositArgs{ Token: tokenAddr, RemoteChainSelector: remoteChainSelector, @@ -531,8 +539,8 @@ func appendCleanup( ops []evm_contract.WriteOutput, ) ([]evm_contract.WriteOutput, error) { removeAuthReport, err := cldf_ops.ExecuteOperation(b, lockbox_ops.ApplyAuthorizedCallerUpdates, evmChain, evm_contract.FunctionInput[lockbox_ops.AuthorizedCallerArgs]{ - ChainSelector: chainSel, - Address: lockboxAddr, + // ChainSelector: chainSel, + // Address: lockboxAddr, Args: lockbox_ops.AuthorizedCallerArgs{ AddedCallers: []common.Address{}, RemovedCallers: []common.Address{timelockAddr}, @@ -544,8 +552,8 @@ func appendCleanup( ops = append(ops, removeAuthReport.Output) restoreRebalancerReport, err := cldf_ops.ExecuteOperation(b, lrtp_ops_v161.SetRebalancer, evmChain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: oldPoolAddr, + // ChainSelector: chainSel, + // Address: oldPoolAddr, Args: originalRebalancer, }) if err != nil { @@ -565,8 +573,8 @@ func appendSetPool( ops []evm_contract.WriteOutput, ) ([]evm_contract.WriteOutput, error) { setPoolReport, err := cldf_ops.ExecuteOperation(b, tar_ops.SetPool, evmChain, evm_contract.FunctionInput[tar_ops.SetPoolArgs]{ - ChainSelector: chainSel, - Address: common.HexToAddress(config.RegistryAddress), + // ChainSelector: chainSel, + // Address: common.HexToAddress(config.RegistryAddress), Args: tar_ops.SetPoolArgs{ TokenAddress: common.HexToAddress(config.TokenAddress), TokenPoolAddress: newPoolAddr, diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity_test.go b/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity_test.go index c8e40df813..f711bc5b8f 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity_test.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/migrate_lock_release_pool_liquidity_test.go @@ -175,7 +175,7 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) create2FactoryRef, err := evm_contract.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, chain, evm_contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{ AllowList: []common.Address{deployer}, }, @@ -210,7 +210,7 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) burn_mint_erc20_with_drip.Deploy, chain, evm_contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *burn_mint_erc20_with_drip.Version), Args: burn_mint_erc20_with_drip.ConstructorArgs{ Name: "Test Token", @@ -226,7 +226,7 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) old_lrtp.Deploy, chain, evm_contract.DeployInput[old_lrtp.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(old_lrtp.ContractType, *old_lrtp.Version), Args: old_lrtp.ConstructorArgs{ Token: tokenAddr, @@ -268,9 +268,9 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) burn_mint_erc20_with_drip.GrantMintAndBurnRoles, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: tokenAddr, - Args: deployer, + // ChainSelector: chainSel, + // Address: tokenAddr, + Args: deployer, }, ) require.NoError(t, err) @@ -280,8 +280,8 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) burn_mint_erc20_with_drip.Mint, chain, evm_contract.FunctionInput[burn_mint_erc20_with_drip.MintArgs]{ - ChainSelector: chainSel, - Address: tokenAddr, + // ChainSelector: chainSel, + // Address: tokenAddr, Args: burn_mint_erc20_with_drip.MintArgs{ Account: oldPoolAddr, Amount: liquidityAmount, @@ -296,9 +296,9 @@ func setupMigrationTest(t *testing.T, chainSel uint64, liquidityAmount *big.Int) erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: tokenAddr, - Args: oldPoolAddr, + // ChainSelector: chainSel, + // Address: tokenAddr, + Args: oldPoolAddr, }, ) require.NoError(t, err) @@ -347,9 +347,9 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedPartialBasisPoints(t *testing.T erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, - Args: s.oldPoolAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, + Args: s.oldPoolAddr, }, ) require.NoError(t, err) @@ -360,9 +360,9 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedPartialBasisPoints(t *testing.T erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, - Args: s.lockBoxAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, + Args: s.lockBoxAddr, }, ) require.NoError(t, err) @@ -374,8 +374,9 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedPartialBasisPoints(t *testing.T old_lrtp.GetRebalancer, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: s.oldPoolAddr, + // ChainSelector: chainSel, + // Address: s.oldPoolAddr, + Args: struct{}{}, }, ) require.NoError(t, err) @@ -388,8 +389,9 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedPartialBasisPoints(t *testing.T erc20_lock_box.GetAllAuthorizedCallers, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: s.lockBoxAddr, + // ChainSelector: chainSel, + // Address: s.lockBoxAddr, + Args: struct{}{}, }, ) require.NoError(t, err) @@ -423,8 +425,8 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedFullBasisPoints(t *testing.T) { erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, Args: s.oldPoolAddr, }, ) @@ -436,8 +438,8 @@ func TestMigrateLockReleasePoolLiquidity_UnsiloedFullBasisPoints(t *testing.T) { erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, Args: s.lockBoxAddr, }, ) @@ -473,8 +475,8 @@ func TestMigrateLockReleasePoolLiquidity_ExactAmount(t *testing.T) { erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, Args: s.oldPoolAddr, }, ) @@ -486,8 +488,8 @@ func TestMigrateLockReleasePoolLiquidity_ExactAmount(t *testing.T) { erc20.BalanceOf, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.tokenAddr, + // ChainSelector: chainSel, + // Address: s.tokenAddr, Args: s.lockBoxAddr, }, ) @@ -508,8 +510,8 @@ func TestMigrateLockReleasePoolLiquidity_RebalancerRestore(t *testing.T) { old_lrtp.SetRebalancer, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, - Address: s.oldPoolAddr, + // ChainSelector: chainSel, + // Address: s.oldPoolAddr, Args: originalRebalancer, }, ) @@ -538,8 +540,9 @@ func TestMigrateLockReleasePoolLiquidity_RebalancerRestore(t *testing.T) { old_lrtp.GetRebalancer, chain, evm_contract.FunctionInput[struct{}]{ - ChainSelector: chainSel, - Address: s.oldPoolAddr, + // ChainSelector: chainSel, + // Address: s.oldPoolAddr, + Args: struct{}{}, }, ) require.NoError(t, err) @@ -603,7 +606,7 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { create2FactoryRef, err := evm_contract.MaybeDeployContract(e.OperationsBundle, create2_factory.Deploy, chain, evm_contract.DeployInput[create2_factory.ConstructorArgs]{ TypeAndVersion: deployment.NewTypeAndVersion(create2_factory.ContractType, *semver.MustParse("2.0.0")), - ChainSelector: chainSel, + // ChainSelector: chainSel, Args: create2_factory.ConstructorArgs{AllowList: []common.Address{deployer}}, }, nil) require.NoError(t, err) @@ -632,7 +635,7 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { tokenReport, err := operations.ExecuteOperation( e.OperationsBundle, burn_mint_erc20_with_drip.Deploy, chain, evm_contract.DeployInput[burn_mint_erc20_with_drip.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(burn_mint_erc20_with_drip.ContractType, *burn_mint_erc20_with_drip.Version), Args: burn_mint_erc20_with_drip.ConstructorArgs{Name: "Test Token", Symbol: "TEST"}, }, @@ -644,7 +647,7 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { oldPoolReport, err := operations.ExecuteOperation( e.OperationsBundle, old_siloed.Deploy, chain, evm_contract.DeployInput[old_siloed.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(old_siloed.ContractType, *old_siloed.Version), Args: old_siloed.ConstructorArgs{ Token: tokenAddr, LocalTokenDecimals: 18, @@ -699,24 +702,24 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { // Set deployer as the unsiloed rebalancer (for provideLiquidity) _, err = operations.ExecuteOperation(e.OperationsBundle, old_siloed.SetRebalancer, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: oldPoolAddr, Args: deployer}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: oldPoolAddr,*/ Args: deployer}) require.NoError(t, err) // Mint tokens to deployer, approve old pool, then provide siloed + unsiloed liquidity _, err = operations.ExecuteOperation(e.OperationsBundle, burn_mint_erc20_with_drip.GrantMintAndBurnRoles, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: tokenAddr, Args: deployer}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: tokenAddr,*/ Args: deployer}) require.NoError(t, err) _, err = operations.ExecuteOperation(e.OperationsBundle, burn_mint_erc20_with_drip.Mint, chain, evm_contract.FunctionInput[burn_mint_erc20_with_drip.MintArgs]{ - ChainSelector: chainSel, Address: tokenAddr, + // ChainSelector: chainSel, Address: tokenAddr, Args: burn_mint_erc20_with_drip.MintArgs{Account: deployer, Amount: totalMint}, }) require.NoError(t, err) _, err = operations.ExecuteOperation(e.OperationsBundle, erc20.Approve, chain, evm_contract.FunctionInput[erc20.ApproveArgs]{ - ChainSelector: chainSel, Address: tokenAddr, + // ChainSelector: chainSel, Address: tokenAddr, Args: erc20.ApproveArgs{Spender: oldPoolAddr, Value: totalMint}, }) require.NoError(t, err) @@ -769,7 +772,7 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { // Deploy per-chain lockboxes lockbox1Report, err := operations.ExecuteOperation(e.OperationsBundle, erc20_lock_box.Deploy, chain, evm_contract.DeployInput[erc20_lock_box.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(erc20_lock_box.ContractType, *erc20_lock_box.Version), Args: erc20_lock_box.ConstructorArgs{Token: tokenAddr}, Qualifier: strPtr("chain1"), @@ -779,7 +782,7 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { lockbox2Report, err := operations.ExecuteOperation(e.OperationsBundle, erc20_lock_box.Deploy, chain, evm_contract.DeployInput[erc20_lock_box.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(erc20_lock_box.ContractType, *erc20_lock_box.Version), Args: erc20_lock_box.ConstructorArgs{Token: tokenAddr}, Qualifier: strPtr("chain2"), @@ -816,21 +819,21 @@ func TestMigrateLockReleasePoolLiquidity_SiloedPool(t *testing.T) { // Verify old pool is drained oldPoolBal, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(e.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: tokenAddr, Args: oldPoolAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: tokenAddr,*/ Args: oldPoolAddr}) require.NoError(t, err) require.Equal(t, 0, big.NewInt(0).Cmp(oldPoolBal.Output), "Old siloed pool should be fully drained") // Verify lockbox1 received silo1 amount lb1Bal, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(e.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: tokenAddr, Args: lockbox1Addr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: tokenAddr,*/ Args: lockbox1Addr}) require.NoError(t, err) require.True(t, lb1Bal.Output.Sign() > 0, "Lockbox 1 should have received tokens") // Verify lockbox2 received silo2 amount lb2Bal, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(e.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: tokenAddr, Args: lockbox2Addr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: tokenAddr,*/ Args: lockbox2Addr}) require.NoError(t, err) require.True(t, lb2Bal.Output.Sign() > 0, "Lockbox 2 should have received tokens") @@ -850,7 +853,7 @@ func TestMigrateLockReleasePoolLiquidity_WithSetPoolConfig(t *testing.T) { tarReport, err := operations.ExecuteOperation( s.env.OperationsBundle, tar.Deploy, chain, evm_contract.DeployInput[tar.ConstructorArgs]{ - ChainSelector: chainSel, + // ChainSelector: chainSel, TypeAndVersion: deployment.NewTypeAndVersion(tar.ContractType, *tar.Version), Args: tar.ConstructorArgs{}, }) @@ -861,7 +864,7 @@ func TestMigrateLockReleasePoolLiquidity_WithSetPoolConfig(t *testing.T) { _, err = operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), tar.ProposeAdministrator, chain, evm_contract.FunctionInput[tar.ProposeAdministratorArgs]{ - ChainSelector: chainSel, Address: tarAddr, + // ChainSelector: chainSel, Address: tarAddr, Args: tar.ProposeAdministratorArgs{TokenAddress: s.tokenAddr, Administrator: s.deployer}, }) require.NoError(t, err) @@ -869,7 +872,7 @@ func TestMigrateLockReleasePoolLiquidity_WithSetPoolConfig(t *testing.T) { _, err = operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), tar.AcceptAdminRole, chain, evm_contract.FunctionInput[tar.AcceptAdminRoleArgs]{ - ChainSelector: chainSel, Address: tarAddr, + // ChainSelector: chainSel, Address: tarAddr, Args: tar.AcceptAdminRoleArgs{TokenAddress: s.tokenAddr}, }) require.NoError(t, err) @@ -898,7 +901,8 @@ func TestMigrateLockReleasePoolLiquidity_WithSetPoolConfig(t *testing.T) { tokenConfig, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), tar.GetTokenConfig, chain, evm_contract.FunctionInput[common.Address]{ - ChainSelector: chainSel, Address: tarAddr, Args: s.tokenAddr, + // ChainSelector: chainSel, Address: tarAddr, + Args: s.tokenAddr, }) require.NoError(t, err) require.Equal(t, s.newPoolAddr, tokenConfig.Output.TokenPool, @@ -907,7 +911,7 @@ func TestMigrateLockReleasePoolLiquidity_WithSetPoolConfig(t *testing.T) { // Verify liquidity was also migrated lockboxBal, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: s.tokenAddr, Args: s.lockBoxAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: s.tokenAddr,*/ Args: s.lockBoxAddr}) require.NoError(t, err) require.Equal(t, 0, totalLiquidity.Cmp(lockboxBal.Output), "Lockbox should hold all liquidity") } @@ -923,7 +927,7 @@ func TestMigrateLockReleasePoolLiquidity_AuthorizedCallerCleanup(t *testing.T) { _, err := operations.ExecuteOperation( s.env.OperationsBundle, erc20_lock_box.ApplyAuthorizedCallerUpdates, chain, evm_contract.FunctionInput[erc20_lock_box.AuthorizedCallerArgs]{ - ChainSelector: chainSel, Address: s.lockBoxAddr, + // ChainSelector: chainSel, Address: s.lockBoxAddr, Args: erc20_lock_box.AuthorizedCallerArgs{ AddedCallers: []common.Address{preExistingCaller}, RemovedCallers: []common.Address{}, @@ -934,7 +938,10 @@ func TestMigrateLockReleasePoolLiquidity_AuthorizedCallerCleanup(t *testing.T) { // Verify pre-existing caller is present before migration preCallersReport, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20_lock_box.GetAllAuthorizedCallers, chain, - evm_contract.FunctionInput[struct{}]{ChainSelector: chainSel, Address: s.lockBoxAddr}) + evm_contract.FunctionInput[struct{}]{ + /*ChainSelector: chainSel, Address: s.lockBoxAddr,*/ + Args: struct{}{}, + }) require.NoError(t, err) require.Contains(t, preCallersReport.Output, preExistingCaller, "Pre-existing caller should be present before migration") @@ -958,7 +965,10 @@ func TestMigrateLockReleasePoolLiquidity_AuthorizedCallerCleanup(t *testing.T) { // Verify pre-existing caller is still present after migration postCallersReport, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20_lock_box.GetAllAuthorizedCallers, chain, - evm_contract.FunctionInput[struct{}]{ChainSelector: chainSel, Address: s.lockBoxAddr}) + evm_contract.FunctionInput[struct{}]{ + // ChainSelector: chainSel, Address: s.lockBoxAddr + Args: struct{}{}, + }) require.NoError(t, err) require.Contains(t, postCallersReport.Output, preExistingCaller, "Pre-existing authorized caller should be preserved after migration") @@ -993,13 +1003,13 @@ func TestMigrateLockReleasePoolLiquidity_MultiplePartialMigrations(t *testing.T) // Verify 50% migrated oldPoolBal1, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: s.tokenAddr, Args: s.oldPoolAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: s.tokenAddr,*/ Args: s.oldPoolAddr}) require.NoError(t, err) require.Equal(t, 0, big.NewInt(5000).Cmp(oldPoolBal1.Output), "Old pool should retain 50%% after first migration") lockboxBal1, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: s.tokenAddr, Args: s.lockBoxAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: s.tokenAddr,*/ Args: s.lockBoxAddr}) require.NoError(t, err) require.Equal(t, 0, big.NewInt(5000).Cmp(lockboxBal1.Output), "Lockbox should hold 50%% after first migration") @@ -1022,20 +1032,23 @@ func TestMigrateLockReleasePoolLiquidity_MultiplePartialMigrations(t *testing.T) // Verify all liquidity migrated oldPoolBal2, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: s.tokenAddr, Args: s.oldPoolAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: s.tokenAddr,*/ Args: s.oldPoolAddr}) require.NoError(t, err) require.Equal(t, 0, big.NewInt(0).Cmp(oldPoolBal2.Output), "Old pool should be fully drained after second migration") lockboxBal2, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), erc20.BalanceOf, chain, - evm_contract.FunctionInput[common.Address]{ChainSelector: chainSel, Address: s.tokenAddr, Args: s.lockBoxAddr}) + evm_contract.FunctionInput[common.Address]{/*ChainSelector: chainSel, Address: s.tokenAddr,*/ Args: s.lockBoxAddr}) require.NoError(t, err) require.Equal(t, 0, totalLiquidity.Cmp(lockboxBal2.Output), "Lockbox should hold all liquidity after second migration") // Verify rebalancer is restored (should be zero address since none was set) rebalancerReport, err := operations.ExecuteOperation( testsetup.BundleWithFreshReporter(s.env.OperationsBundle), old_lrtp.GetRebalancer, chain, - evm_contract.FunctionInput[struct{}]{ChainSelector: chainSel, Address: s.oldPoolAddr}) + evm_contract.FunctionInput[struct{}]{ + //ChainSelector: chainSel, Address: s.oldPoolAddr, + Args: struct{}{}, + }) require.NoError(t, err) require.Equal(t, common.Address{}, rebalancerReport.Output, "Rebalancer should be restored after both migrations") diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/set_allowed_finality_config_for_token_pools.go b/chains/evm/deployment/v2_0_0/sequences/tokens/set_allowed_finality_config_for_token_pools.go index 244a2e89de..0ce4dbcf77 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/set_allowed_finality_config_for_token_pools.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/set_allowed_finality_config_for_token_pools.go @@ -44,8 +44,8 @@ var SetAllowedFinalityConfigForTokenPools = operations.NewSequence( report, err := operations.ExecuteOperation( b, token_pool.SetAllowedFinalityConfig, chain, contract.FunctionInput[[4]byte]{ - ChainSelector: src, - Address: addr, + // ChainSelector: src, + // Address: addr, Args: finalityConfig.Raw(), }, ) diff --git a/chains/evm/deployment/v2_0_0/sequences/tokens/set_token_transfer_fee_config_for_token_pools.go b/chains/evm/deployment/v2_0_0/sequences/tokens/set_token_transfer_fee_config_for_token_pools.go index d25f4a5455..b890a83cc0 100644 --- a/chains/evm/deployment/v2_0_0/sequences/tokens/set_token_transfer_fee_config_for_token_pools.go +++ b/chains/evm/deployment/v2_0_0/sequences/tokens/set_token_transfer_fee_config_for_token_pools.go @@ -68,8 +68,8 @@ var SetTokenTransferFeeConfigForTokenPools = operations.NewSequence( report, err := operations.ExecuteOperation( b, token_pool.ApplyTokenTransferFeeConfigUpdates, chain, contract.FunctionInput[token_pool.ApplyTokenTransferFeeConfigUpdatesArgs]{ - ChainSelector: src, - Address: addr, + // ChainSelector: src, + // Address: addr, Args: args, }, ) diff --git a/chains/evm/deployment/v2_0_0/versioned_verifier_resolver/versioned_verifier_resolver.go b/chains/evm/deployment/v2_0_0/versioned_verifier_resolver/versioned_verifier_resolver.go index 621510b809..64a8588736 100644 --- a/chains/evm/deployment/v2_0_0/versioned_verifier_resolver/versioned_verifier_resolver.go +++ b/chains/evm/deployment/v2_0_0/versioned_verifier_resolver/versioned_verifier_resolver.go @@ -50,7 +50,7 @@ var ApplyInboundImplementationUpdates = contract.NewWrite(contract.WriteParams[[ Description: "Updates verifier implementations for inbound traffic", ContractType: ContractType, ContractABI: versioned_verifier_resolver.VersionedVerifierResolverABI, - NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, + // NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, IsAllowedCaller: contract.OnlyOwner[*versioned_verifier_resolver.VersionedVerifierResolver, []InboundImplementationArgs], Validate: func([]InboundImplementationArgs) error { return nil }, CallContract: func(resolver *versioned_verifier_resolver.VersionedVerifierResolver, opts *bind.TransactOpts, args []InboundImplementationArgs) (*types.Transaction, error) { @@ -64,7 +64,7 @@ var ApplyOutboundImplementationUpdates = contract.NewWrite(contract.WriteParams[ Description: "Updates verifier implementations for outbound traffic", ContractType: ContractType, ContractABI: versioned_verifier_resolver.VersionedVerifierResolverABI, - NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, + // NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, IsAllowedCaller: contract.OnlyOwner[*versioned_verifier_resolver.VersionedVerifierResolver, []OutboundImplementationArgs], Validate: func([]OutboundImplementationArgs) error { return nil }, CallContract: func(resolver *versioned_verifier_resolver.VersionedVerifierResolver, opts *bind.TransactOpts, args []OutboundImplementationArgs) (*types.Transaction, error) { @@ -77,7 +77,7 @@ var GetAllInboundImplementations = contract.NewRead(contract.ReadParams[any, []I Version: Version, Description: "Gets all inbound verifier implementations from the resolver", ContractType: ContractType, - NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, + // NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, CallContract: func(resolver *versioned_verifier_resolver.VersionedVerifierResolver, opts *bind.CallOpts, _ any) ([]InboundImplementationArgs, error) { return resolver.GetAllInboundImplementations(opts) }, @@ -88,7 +88,7 @@ var GetAllOutboundImplementations = contract.NewRead(contract.ReadParams[any, [] Version: Version, Description: "Gets all outbound verifier implementations from the resolver", ContractType: ContractType, - NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, + // NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, CallContract: func(resolver *versioned_verifier_resolver.VersionedVerifierResolver, opts *bind.CallOpts, _ any) ([]OutboundImplementationArgs, error) { return resolver.GetAllOutboundImplementations(opts) }, @@ -100,7 +100,7 @@ var AcceptOwnership = contract.NewWrite(contract.WriteParams[AcceptOwnershipArgs Description: "Accept ownership of the versioned verifier resolver", ContractType: ContractType, ContractABI: versioned_verifier_resolver.VersionedVerifierResolverABI, - NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, + // NewContract: versioned_verifier_resolver.NewVersionedVerifierResolver, IsAllowedCaller: func(resolver *versioned_verifier_resolver.VersionedVerifierResolver, opts *bind.CallOpts, caller common.Address, args AcceptOwnershipArgs) (bool, error) { return args.IsProposedOwner, nil }, diff --git a/chains/evm/go.mod b/chains/evm/go.mod index 7ebc39ca80..873201d971 100644 --- a/chains/evm/go.mod +++ b/chains/evm/go.mod @@ -18,7 +18,7 @@ require ( github.com/smartcontractkit/chainlink-ccv v0.0.1 github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260407150650-8115835abd6e - github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 + github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd github.com/smartcontractkit/chainlink-evm/gethwrappers/helpers v0.0.0-20260304234246-843d03f2badc @@ -206,7 +206,7 @@ require ( github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/go-archive v0.2.0 // indirect github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/spdystream v0.5.0 // indirect + github.com/moby/spdystream v0.5.1 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/user v0.4.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect @@ -262,7 +262,7 @@ require ( github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260211172625-dff40e83b3c9 // indirect github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 // indirect - github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 // indirect + github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 // indirect github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 // indirect github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad // indirect diff --git a/chains/evm/go.sum b/chains/evm/go.sum index 1639e7aadf..2817df6613 100644 --- a/chains/evm/go.sum +++ b/chains/evm/go.sum @@ -615,8 +615,8 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= @@ -790,8 +790,8 @@ github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh github.com/smartcontractkit/chainlink-common/keystore v1.0.2/go.mod h1:rSkIHdomyak3YnUtXLenl6poIq8q0V3UZPiiyYqPdGA= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 h1:dwdKdXGDfzIwg1/PxQ3YxaeaFplyOtL+EPGtFPVGRmM= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0/go.mod h1:vjdYbQDNUd3IznXuxv5Gm7VZB804TKOqjNo1BhFOUDk= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 h1:UmFIN63m3+qXB5sP3ZtNzoMS8iIPDxeDVzYnhFB/U2k= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0/go.mod h1:h2R69nbkSMGUSYHrf1lbrchml1CdR1jP4t9HsBb0xdY= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 h1:h/L6wrXYLQalI/vHm6qg/KBv6d7kMb3geMHV5hCM1t4= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98/go.mod h1:6vCMfxz7cMW0wWseNKtct+b1JJbbRVJJhh/t6pQWN3M= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd h1:sK+pK4epQp20yQ7XztwrVgkTkRAr4FY+TvEegW8RuQk= @@ -818,8 +818,8 @@ github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdo github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 h1:KyPROV+v7P8VdiU7JhVuGLcDlEBsURSpQmSCgNBTY+s= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9/go.mod h1:KpEWZJMLwbdMHeHQz9rbkES0vRrx4nk6OQXyhlHb9/8= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 h1:pzrAgF6QFMQLS/kukXenLN87PCa48SEMlE7QvJxTOHs= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 h1:ZPYXn3VvaZhWOyVHFBsKC543EJbL2d4PthQbdL3WgHs= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 h1:RwZXxdIAOyjp6cwc9Quxgr38k8r7ACz+Lxh9o/A6oH0= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 h1:NgA2+Q0wfHicP/QeY1hgULQ1ZBk1sgBpOJi3GpxfjE8= diff --git a/chains/solana/deployment/go.mod b/chains/solana/deployment/go.mod index 73a3b03015..9ebd666ada 100644 --- a/chains/solana/deployment/go.mod +++ b/chains/solana/deployment/go.mod @@ -27,7 +27,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260312233953-f588f8dc6d7c github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415082832-49507d07fe34 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae81 - github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 + github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 github.com/smartcontractkit/mcms v0.40.1 github.com/stretchr/testify v1.11.1 diff --git a/chains/solana/deployment/go.sum b/chains/solana/deployment/go.sum index eb2c0a64d6..39aac15cf7 100644 --- a/chains/solana/deployment/go.sum +++ b/chains/solana/deployment/go.sum @@ -697,8 +697,8 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs= @@ -851,8 +851,8 @@ github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae81/go.mod h1:Ob7ZRLEvPkDwGUjKdDIiHy0Mxu4+UG6oMBkR7Jv/U6o= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 h1:dwdKdXGDfzIwg1/PxQ3YxaeaFplyOtL+EPGtFPVGRmM= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0/go.mod h1:vjdYbQDNUd3IznXuxv5Gm7VZB804TKOqjNo1BhFOUDk= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 h1:UmFIN63m3+qXB5sP3ZtNzoMS8iIPDxeDVzYnhFB/U2k= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0/go.mod h1:h2R69nbkSMGUSYHrf1lbrchml1CdR1jP4t9HsBb0xdY= github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f h1:8p3vE987AHM3Of1JvnNJXNE/AtWtfNvJhk3TeeAG3Qw= github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f/go.mod h1:Jqt53s27Tr0jDl8mdBXg1xhu6F8Fci8JOuq43tgHOM8= github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 h1:q+VDPcxWrj5k9QizSYfUOSMnDH3Sd5HvbPguZOgfXTY= @@ -865,8 +865,8 @@ github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 h1:AEnxv4HM3WD1Rb github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4/go.mod h1:PjZD54vr6rIKEKQj6HNA4hllvYI/QpT+Zefj3tqkFAs= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 h1:KyPROV+v7P8VdiU7JhVuGLcDlEBsURSpQmSCgNBTY+s= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9/go.mod h1:KpEWZJMLwbdMHeHQz9rbkES0vRrx4nk6OQXyhlHb9/8= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 h1:pzrAgF6QFMQLS/kukXenLN87PCa48SEMlE7QvJxTOHs= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 h1:ZPYXn3VvaZhWOyVHFBsKC543EJbL2d4PthQbdL3WgHs= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 h1:NgA2+Q0wfHicP/QeY1hgULQ1ZBk1sgBpOJi3GpxfjE8= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87/go.mod h1:UmQdvE8BtbLdoOFY0+Adqoc7HT1Hd1bbFY/yymuM0NU= github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 h1:XRNxgcNqagXu6e4smJuS1crRK5cUAcCVd7u+iLduHDM= diff --git a/chains/solana/go.mod b/chains/solana/go.mod index f842674788..944e6e9f02 100644 --- a/chains/solana/go.mod +++ b/chains/solana/go.mod @@ -5,10 +5,13 @@ go 1.25.7 replace github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings => ./gobindings require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 github.com/gagliardetto/binary v0.8.0 + github.com/gagliardetto/gofuzz v1.2.2 github.com/gagliardetto/metaplex-go v0.2.1 github.com/gagliardetto/solana-go v1.13.0 + github.com/gagliardetto/treeout v0.1.4 github.com/pelletier/go-toml/v2 v2.2.4 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink-common v0.10.0 @@ -25,9 +28,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.16.1 // indirect github.com/cloudevents/sdk-go/v2 v2.16.1 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect - github.com/gagliardetto/treeout v0.1.4 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.26.0 // indirect diff --git a/deployment/go.mod b/deployment/go.mod index 8729b8f647..0d8a041306 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/uuid v1.6.0 github.com/smartcontractkit/chain-selectors v1.0.98 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae81 - github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 + github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 github.com/smartcontractkit/mcms v0.40.1 github.com/stretchr/testify v1.11.1 @@ -182,7 +182,7 @@ require ( github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/go-archive v0.2.0 // indirect github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/spdystream v0.5.0 // indirect + github.com/moby/spdystream v0.5.1 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/user v0.4.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect @@ -235,7 +235,7 @@ require ( github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260205130626-db2a2aab956b // indirect github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 // indirect - github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 // indirect + github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 // indirect github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 // indirect github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 // indirect diff --git a/deployment/go.sum b/deployment/go.sum index 4bcf013334..d67344c890 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -593,8 +593,8 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= @@ -750,8 +750,8 @@ github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae github.com/smartcontractkit/chainlink-common v0.11.2-0.20260406055916-9aa6b6c0ae81/go.mod h1:Ob7ZRLEvPkDwGUjKdDIiHy0Mxu4+UG6oMBkR7Jv/U6o= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 h1:dwdKdXGDfzIwg1/PxQ3YxaeaFplyOtL+EPGtFPVGRmM= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0/go.mod h1:vjdYbQDNUd3IznXuxv5Gm7VZB804TKOqjNo1BhFOUDk= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 h1:UmFIN63m3+qXB5sP3ZtNzoMS8iIPDxeDVzYnhFB/U2k= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0/go.mod h1:h2R69nbkSMGUSYHrf1lbrchml1CdR1jP4t9HsBb0xdY= github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f h1:8p3vE987AHM3Of1JvnNJXNE/AtWtfNvJhk3TeeAG3Qw= github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f/go.mod h1:Jqt53s27Tr0jDl8mdBXg1xhu6F8Fci8JOuq43tgHOM8= github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 h1:q+VDPcxWrj5k9QizSYfUOSMnDH3Sd5HvbPguZOgfXTY= @@ -764,8 +764,8 @@ github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 h1:AEnxv4HM3WD1Rb github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4/go.mod h1:PjZD54vr6rIKEKQj6HNA4hllvYI/QpT+Zefj3tqkFAs= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 h1:KyPROV+v7P8VdiU7JhVuGLcDlEBsURSpQmSCgNBTY+s= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9/go.mod h1:KpEWZJMLwbdMHeHQz9rbkES0vRrx4nk6OQXyhlHb9/8= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 h1:pzrAgF6QFMQLS/kukXenLN87PCa48SEMlE7QvJxTOHs= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 h1:ZPYXn3VvaZhWOyVHFBsKC543EJbL2d4PthQbdL3WgHs= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 h1:RwZXxdIAOyjp6cwc9Quxgr38k8r7ACz+Lxh9o/A6oH0= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 h1:NgA2+Q0wfHicP/QeY1hgULQ1ZBk1sgBpOJi3GpxfjE8= diff --git a/devenv/common/seq_home_chain.go b/devenv/common/seq_home_chain.go index 671e311df2..84e222bf1a 100644 --- a/devenv/common/seq_home_chain.go +++ b/devenv/common/seq_home_chain.go @@ -73,8 +73,8 @@ var AddDONAndSetCandidateSequence = operations.NewSequence( cciphomeops.AddDON, deps.HomeChain, contract.FunctionInput[cciphomeops.AddDONOpInput]{ - ChainSelector: deps.HomeChain.Selector, - Address: input.CapabilitiesRegistry, + // ChainSelector: deps.HomeChain.Selector, + // Address: input.CapabilitiesRegistry, Args: cciphomeops.AddDONOpInput{ Nodes: don.PeerIDs, CapabilityConfigurations: []capabilities_registry.CapabilitiesRegistryCapabilityConfiguration{ @@ -139,8 +139,8 @@ var SetCandidateSequence = operations.NewSequence( cciphomeops.UpdateDON, deps.HomeChain, contract.FunctionInput[cciphomeops.UpdateDONOpInput]{ - Address: input.CapabilitiesRegistry, - ChainSelector: deps.HomeChain.Selector, + // Address: input.CapabilitiesRegistry, + // ChainSelector: deps.HomeChain.Selector, Args: cciphomeops.UpdateDONOpInput{ ID: don.ID, Nodes: don.PeerIDs, @@ -208,8 +208,8 @@ var PromoteCandidateSequence = operations.NewSequence( cciphomeops.UpdateDON, deps.HomeChain, contract.FunctionInput[cciphomeops.UpdateDONOpInput]{ - Address: input.CapabilitiesRegistry, - ChainSelector: deps.HomeChain.Selector, + // Address: input.CapabilitiesRegistry, + // ChainSelector: deps.HomeChain.Selector, Args: cciphomeops.UpdateDONOpInput{ ID: don.ID, Nodes: don.PeerIDs, @@ -296,8 +296,8 @@ var ApplyChainConfigUpdatesSequence = operations.NewSequence( cciphomeops.ApplyChainConfigUpdates, deps.HomeChain, contract.FunctionInput[cciphomeops.ApplyChainConfigUpdatesOpInput]{ - Address: input.CCIPHome, - ChainSelector: deps.HomeChain.Selector, + // Address: input.CCIPHome, + // ChainSelector: deps.HomeChain.Selector, Args: batch, }, ) @@ -377,8 +377,8 @@ var SeqAddCapabilityToCapReg = operations.NewSequence( cciphomeops.AddCapabilities, deps.HomeChain, contract.FunctionInput[cciphomeops.AddCapabilitiesOpInput]{ - ChainSelector: chain.Selector, - Address: input.CapReg, + // ChainSelector: chain.Selector, + // Address: input.CapReg, Args: cciphomeops.AddCapabilitiesOpInput{ Capabilities: []capabilities_registry.CapabilitiesRegistryCapability{ capabilityToAdd, @@ -444,8 +444,8 @@ var SeqAddNodeOperatorsToCapReg = operations.NewSequence( cciphomeops.AddNodeOperators, chain, contract.FunctionInput[cciphomeops.AddNodesOperatorsOpInput]{ - ChainSelector: chain.Selector, - Address: input.CapReg, + // ChainSelector: chain.Selector, + // Address: input.CapReg, Args: cciphomeops.AddNodesOperatorsOpInput{ Nodes: nodeOpsToAdd, }, @@ -518,8 +518,8 @@ var SeqAddNodesToCapReg = operations.NewSequence( cciphomeops.AddNodes, chain, contract.FunctionInput[cciphomeops.AddNodesOpInput]{ - ChainSelector: chain.Selector, - Address: input.CapReg, + // ChainSelector: chain.Selector, + // Address: input.CapReg, Args: cciphomeops.AddNodesOpInput{ Nodes: nodeParams, }, diff --git a/devenv/go.mod b/devenv/go.mod index ff96a00789..a682d4f615 100644 --- a/devenv/go.mod +++ b/devenv/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260312233953-f588f8dc6d7c github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260501175227-8c02f90e18d9 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629 - github.com/smartcontractkit/chainlink-deployments-framework v0.98.0 + github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 // indirect github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 diff --git a/devenv/go.sum b/devenv/go.sum index ef010b7a19..49a3956f43 100644 --- a/devenv/go.sum +++ b/devenv/go.sum @@ -1251,8 +1251,8 @@ github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh github.com/smartcontractkit/chainlink-common/keystore v1.0.2/go.mod h1:rSkIHdomyak3YnUtXLenl6poIq8q0V3UZPiiyYqPdGA= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-deployments-framework v0.98.0 h1:Ov/KOEtubOHXX8oa9UtARhHmkQNCOIjWNt+Zi0AuzHM= -github.com/smartcontractkit/chainlink-deployments-framework v0.98.0/go.mod h1:24dwRW1PYolrlxSth///ddG3auGqR+50xaJiXfUHhkg= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 h1:UmFIN63m3+qXB5sP3ZtNzoMS8iIPDxeDVzYnhFB/U2k= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0/go.mod h1:h2R69nbkSMGUSYHrf1lbrchml1CdR1jP4t9HsBb0xdY= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 h1:h/L6wrXYLQalI/vHm6qg/KBv6d7kMb3geMHV5hCM1t4= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98/go.mod h1:6vCMfxz7cMW0wWseNKtct+b1JJbbRVJJhh/t6pQWN3M= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd h1:sK+pK4epQp20yQ7XztwrVgkTkRAr4FY+TvEegW8RuQk= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index f8b2555828..05332c4f2c 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260312233953-f588f8dc6d7c github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260501175227-8c02f90e18d9 - github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 + github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd github.com/smartcontractkit/mcms v0.40.1 @@ -214,7 +214,7 @@ require ( github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/go-archive v0.2.0 // indirect github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/spdystream v0.5.0 // indirect + github.com/moby/spdystream v0.5.1 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/user v0.4.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect @@ -274,7 +274,7 @@ require ( github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260211172625-dff40e83b3c9 // indirect github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 // indirect - github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 // indirect + github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 // indirect github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 // indirect github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 3e5e0a75b7..ecd4603ed9 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -771,8 +771,8 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= @@ -968,8 +968,8 @@ github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh github.com/smartcontractkit/chainlink-common/keystore v1.0.2/go.mod h1:rSkIHdomyak3YnUtXLenl6poIq8q0V3UZPiiyYqPdGA= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0 h1:dwdKdXGDfzIwg1/PxQ3YxaeaFplyOtL+EPGtFPVGRmM= -github.com/smartcontractkit/chainlink-deployments-framework v0.96.0/go.mod h1:vjdYbQDNUd3IznXuxv5Gm7VZB804TKOqjNo1BhFOUDk= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0 h1:UmFIN63m3+qXB5sP3ZtNzoMS8iIPDxeDVzYnhFB/U2k= +github.com/smartcontractkit/chainlink-deployments-framework v0.99.0/go.mod h1:h2R69nbkSMGUSYHrf1lbrchml1CdR1jP4t9HsBb0xdY= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98 h1:h/L6wrXYLQalI/vHm6qg/KBv6d7kMb3geMHV5hCM1t4= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260410162948-2dca02f24e98/go.mod h1:6vCMfxz7cMW0wWseNKtct+b1JJbbRVJJhh/t6pQWN3M= github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd h1:sK+pK4epQp20yQ7XztwrVgkTkRAr4FY+TvEegW8RuQk= @@ -994,8 +994,8 @@ github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdo github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 h1:KyPROV+v7P8VdiU7JhVuGLcDlEBsURSpQmSCgNBTY+s= github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9/go.mod h1:KpEWZJMLwbdMHeHQz9rbkES0vRrx4nk6OQXyhlHb9/8= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 h1:pzrAgF6QFMQLS/kukXenLN87PCa48SEMlE7QvJxTOHs= -github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18 h1:ZPYXn3VvaZhWOyVHFBsKC543EJbL2d4PthQbdL3WgHs= +github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.18/go.mod h1:BALK9cj8sk12e15UF6uDhifHgIApa+6N11TcQfInEro= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 h1:RwZXxdIAOyjp6cwc9Quxgr38k8r7ACz+Lxh9o/A6oH0= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 h1:NgA2+Q0wfHicP/QeY1hgULQ1ZBk1sgBpOJi3GpxfjE8=