Executor fixes

Author: kylesmartin

ccv/chains/evm/deployment/v1_7_0/adapters/chain_family_test.go

@@ -83,7 +83,7 @@ func makeChainConfig(chainSelector uint64, remoteChainSelector uint64) v1_7_0_ch
 					},
 				},
 				DefaultExecutor: datastore.AddressRef{
-					Type:      datastore.ContractType(executor.ContractType),
+					Type:      datastore.ContractType(executor.ProxyType),
 					Version:   semver.MustParse("1.7.0"),
 					Qualifier: "default",
 				},

ccv/chains/evm/deployment/v1_7_0/operations/proxy/proxy.go

@@ -45,3 +45,14 @@ var AcceptOwnership = contract.NewWrite(contract.WriteParams[AcceptOwnershipArgs
 		return proxy.AcceptOwnership(opts)
 	},
 })
+
+var GetTarget = contract.NewRead(contract.ReadParams[any, common.Address, *proxy.Proxy]{
+	Name:         "proxy:get-target",
+	Version:      semver.MustParse("1.7.0"),
+	Description:  "Gets the target address on the proxy",
+	ContractType: ContractType,
+	NewContract:  proxy.NewProxy,
+	CallContract: func(proxy *proxy.Proxy, opts *bind.CallOpts, args any) (common.Address, error) {
+		return proxy.GetTarget(opts)
+	},
+})

ccv/chains/evm/deployment/v1_7_0/sequences/configure_chain_for_lanes.go

@@ -9,6 +9,7 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/fee_quoter"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/offramp"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/onramp"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/proxy"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
@@ -74,7 +75,7 @@ var ConfigureChainForLanes = cldf_ops.NewSequence(
 				BaseExecutionGasCost: remoteConfig.BaseExecutionGasCost,
 				DefaultCCVs:          defaultOutboundCCVs,
 				LaneMandatedCCVs:     laneMandatedOutboundCCVs,
-				DefaultExecutor:      common.HexToAddress(remoteConfig.DefaultExecutor),
+				DefaultExecutor:      common.HexToAddress(remoteConfig.DefaultExecutor), // The proxy address
 				OffRamp:              remoteConfig.OffRamp,
 			})
 			feeQuoterArgs = append(feeQuoterArgs, fee_quoter.DestChainConfigArgs{
@@ -94,10 +95,17 @@ var ConfigureChainForLanes = cldf_ops.NewSequence(
 				OffRamp:             common.HexToAddress(input.OffRamp),
 			})
 			defaultExecutor := common.HexToAddress(remoteConfig.DefaultExecutor)
-			if destChainSelectorsPerExecutor[defaultExecutor] == nil {
-				destChainSelectorsPerExecutor[defaultExecutor] = []executor.RemoteChainConfigArgs{}
+			getTargetReport, err := cldf_ops.ExecuteOperation(b, proxy.GetTarget, chain, contract.FunctionInput[any]{
+				ChainSelector: chain.Selector,
+				Address:       defaultExecutor,
+			})
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to get target address of Executor(%s) on chain %s: %w", defaultExecutor, chain, err)
+			}
+			if destChainSelectorsPerExecutor[getTargetReport.Output] == nil {
+				destChainSelectorsPerExecutor[getTargetReport.Output] = []executor.RemoteChainConfigArgs{}
 			}
-			destChainSelectorsPerExecutor[defaultExecutor] = append(destChainSelectorsPerExecutor[defaultExecutor], executor.RemoteChainConfigArgs{
+			destChainSelectorsPerExecutor[getTargetReport.Output] = append(destChainSelectorsPerExecutor[getTargetReport.Output], executor.RemoteChainConfigArgs{
 				DestChainSelector: remoteSelector,
 				Config:            remoteConfig.ExecutorDestChainConfig,
 			})
@@ -126,18 +134,18 @@ var ConfigureChainForLanes = cldf_ops.NewSequence(
 		writes = append(writes, onRampReport.Output)
 
 		// ApplyDestChainUpdates on each Executor
-		for ExecutorAddr, destChainSelectorsToAdd := range destChainSelectorsPerExecutor {
-			ExecutorReport, err := cldf_ops.ExecuteOperation(b, executor.ApplyDestChainUpdates, chain, contract.FunctionInput[executor.ApplyDestChainUpdatesArgs]{
+		for executorAddr, destChainSelectorsToAdd := range destChainSelectorsPerExecutor {
+			executorReport, err := cldf_ops.ExecuteOperation(b, executor.ApplyDestChainUpdates, chain, contract.FunctionInput[executor.ApplyDestChainUpdatesArgs]{
 				ChainSelector: chain.Selector,
-				Address:       ExecutorAddr,
+				Address:       executorAddr,
 				Args: executor.ApplyDestChainUpdatesArgs{
 					DestChainSelectorsToAdd: destChainSelectorsToAdd,
 				},
 			})
 			if err != nil {
-				return sequences.OnChainOutput{}, fmt.Errorf("failed to apply dest chain config updates to Executor(%s) on chain %s: %w", ExecutorAddr, chain, err)
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to apply dest chain config updates to Executor(%s) on chain %s: %w", executorAddr, chain, err)
 			}
-			writes = append(writes, ExecutorReport.Output)
+			writes = append(writes, executorReport.Output)
 		}
 
 		// ApplyDestChainConfigUpdates on FeeQuoter

ccv/chains/evm/deployment/v1_7_0/sequences/configure_chain_for_lanes_test.go

@@ -73,7 +73,7 @@ func TestConfigureChainForLanes(t *testing.T) {
 					offRamp = addr.Address
 				case datastore.ContractType(committee_verifier.ContractType):
 					committeeVerifier = addr.Address
-				case datastore.ContractType(executor.ContractType):
+				case datastore.ContractType(executor.ProxyType):
 					executorAddress = addr.Address
 				case datastore.ContractType(committee_verifier.ResolverType):
 					committeeVerifierResolver = addr.Address