diff --git a/bindings/generated/latest/ccip/ccipruntime/ccipruntime.go b/bindings/generated/latest/ccip/ccipruntime/ccipruntime.go index 09568f17e..819138647 100644 --- a/bindings/generated/latest/ccip/ccipruntime/ccipruntime.go +++ b/bindings/generated/latest/ccip/ccipruntime/ccipruntime.go @@ -29,7 +29,7 @@ var ( const ( PackageName = "ccip-runtime" - PackageID = "e72c7b81e9cc09ed2d35ba3333f561851d5f8a5f81527d05249060ad1edd1eb5" + PackageID = "95817e77485fd17017bcb30ad5fde6e401dddc042534d7045972e817def1730b" SDKVersion = "3.4.11" ) @@ -2225,7 +2225,6 @@ type OnRampDeps struct { RmnRemote chainlinkapi.RawInstanceAddress `json:"rmnRemote"` TokenAdminRegistry chainlinkapi.RawInstanceAddress `json:"tokenAdminRegistry"` FeeQuoter chainlinkapi.RawInstanceAddress `json:"feeQuoter"` - CcvRegistry chainlinkapi.RawInstanceAddress `json:"ccvRegistry"` } // ToMap converts OnRampDeps to a map for DAML arguments @@ -2240,8 +2239,6 @@ func (t OnRampDeps) ToMap() map[string]any { m["feeQuoter"] = model.NestedToDAMLValue(t.FeeQuoter) - m["ccvRegistry"] = model.NestedToDAMLValue(t.CcvRegistry) - return m } @@ -3325,7 +3322,6 @@ type SetDepsParams struct { RmnRemote *chainlinkapi.RawInstanceAddress `json:"rmnRemote" hex:"optional"` TokenAdminRegistry *chainlinkapi.RawInstanceAddress `json:"tokenAdminRegistry" hex:"optional"` FeeQuoter *chainlinkapi.RawInstanceAddress `json:"feeQuoter" hex:"optional"` - CcvRegistry *chainlinkapi.RawInstanceAddress `json:"ccvRegistry" hex:"optional"` } // ToMap converts SetDepsParams to a map for DAML arguments @@ -3380,18 +3376,6 @@ func (t SetDepsParams) ToMap() map[string]any { } } - if t.CcvRegistry != nil { - m["ccvRegistry"] = map[string]any{ - "_type": "optional", - "value": model.NestedToDAMLValue(*t.CcvRegistry), - } - } else { - m["ccvRegistry"] = map[string]any{ - "_type": "optional", - "value": nil, - } - } - return m } diff --git a/bindings/generated/latest/ccip/factory/factory.go b/bindings/generated/latest/ccip/factory/factory.go index 596eb4711..a055b0ae6 100644 --- a/bindings/generated/latest/ccip/factory/factory.go +++ b/bindings/generated/latest/ccip/factory/factory.go @@ -34,7 +34,7 @@ var ( const ( PackageName = "ccip-factory" - PackageID = "9fe505c991e91a2e1b1cdaf3bb666a4354415bdd72e906b2fce2cfd4e8bd6edd" + PackageID = "dba101b0b2f406a642620b12e6a24aa7a0e15df5e744b72d0790b5a452801b9e" SDKVersion = "3.4.11" ) @@ -1321,7 +1321,6 @@ type DeployOnRampParams struct { RmnRemote chainlinkapi.RawInstanceAddress `json:"rmnRemote"` TokenAdminRegistry chainlinkapi.RawInstanceAddress `json:"tokenAdminRegistry"` FeeQuoter chainlinkapi.RawInstanceAddress `json:"feeQuoter"` - CcvRegistry chainlinkapi.RawInstanceAddress `json:"ccvRegistry"` MaxUSDCentsPerMsg types.NUMERIC `json:"maxUSDCentsPerMsg"` } @@ -1339,8 +1338,6 @@ func (t DeployOnRampParams) ToMap() map[string]any { m["feeQuoter"] = model.NestedToDAMLValue(t.FeeQuoter) - m["ccvRegistry"] = model.NestedToDAMLValue(t.CcvRegistry) - m["maxUSDCentsPerMsg"] = t.MaxUSDCentsPerMsg return m diff --git a/bindings/generated/latest/ccip/receiver/receiver.go b/bindings/generated/latest/ccip/receiver/receiver.go index f783a2d21..ba8fa6dd9 100644 --- a/bindings/generated/latest/ccip/receiver/receiver.go +++ b/bindings/generated/latest/ccip/receiver/receiver.go @@ -27,7 +27,7 @@ var ( const ( PackageName = "ccip-receiver" - PackageID = "3e02facd4c5b02dad1b4dd07f43339e2437bcce8b5e669660b3c8d72c9355d95" + PackageID = "e6ba4f03db80457c6734592c17c088289e70fe07af575474be712f1eaaa8ec19" SDKVersion = "3.4.11" ) diff --git a/bindings/generated/latest/ccip/sender/sender.go b/bindings/generated/latest/ccip/sender/sender.go index d08a55612..8c105265e 100644 --- a/bindings/generated/latest/ccip/sender/sender.go +++ b/bindings/generated/latest/ccip/sender/sender.go @@ -26,7 +26,7 @@ var ( const ( PackageName = "ccip-sender" - PackageID = "5783dfc7c23e899cdc6446dfdf113815bb2e029dffba0055139757253068350b" + PackageID = "1086e407f86380da41e6d4bed217bb02731ea14575b00c0ad43f8067e36ee622" SDKVersion = "3.4.11" ) diff --git a/contracts/ccip/factory/daml/CCIP/Factory.daml b/contracts/ccip/factory/daml/CCIP/Factory.daml index 06f62159a..89047090d 100644 --- a/contracts/ccip/factory/daml/CCIP/Factory.daml +++ b/contracts/ccip/factory/daml/CCIP/Factory.daml @@ -517,7 +517,6 @@ data DeployOnRampParams = DeployOnRampParams rmnRemote : RawInstanceAddress.RawInstanceAddress tokenAdminRegistry : RawInstanceAddress.RawInstanceAddress feeQuoter : RawInstanceAddress.RawInstanceAddress - ccvRegistry : RawInstanceAddress.RawInstanceAddress maxUSDCentsPerMsg : Numeric 0 deriving (Eq, Show) @@ -664,7 +663,6 @@ mkOnRampContract ccipOwner params = CCIP.OnRamp.OnRamp with rmnRemote = params.rmnRemote tokenAdminRegistry = params.tokenAdminRegistry feeQuoter = params.feeQuoter - ccvRegistry = params.ccvRegistry mkOffRampContract : Party -> DeployOffRampParams -> CCIP.OffRamp.OffRamp mkOffRampContract ccipOwner params = CCIP.OffRamp.OffRamp with @@ -819,8 +817,7 @@ decodeDeployOnRampParams encoded = do (rmnRemote, offset3) <- decodeRawInstanceAddressAt encoded offset2 (tokenAdminRegistry, offset4) <- decodeRawInstanceAddressAt encoded offset3 (feeQuoter, offset5) <- decodeRawInstanceAddressAt encoded offset4 - (ccvRegistry, offset6) <- decodeRawInstanceAddressAt encoded offset5 - (maxUSDCentsPerMsg, finalOffset) <- decodeNumeric0At encoded offset6 + (maxUSDCentsPerMsg, finalOffset) <- decodeNumeric0At encoded offset5 assertOffset finalOffset (byteCount encoded) Some DeployOnRampParams with instanceId @@ -828,7 +825,6 @@ decodeDeployOnRampParams encoded = do rmnRemote tokenAdminRegistry feeQuoter - ccvRegistry maxUSDCentsPerMsg decodeDeployOffRampParams : BytesHex -> Optional DeployOffRampParams diff --git a/contracts/ccip/runtime/daml/CCIP/OnRamp.daml b/contracts/ccip/runtime/daml/CCIP/OnRamp.daml index 5a4f71d9c..744a7d289 100644 --- a/contracts/ccip/runtime/daml/CCIP/OnRamp.daml +++ b/contracts/ccip/runtime/daml/CCIP/OnRamp.daml @@ -265,7 +265,6 @@ template OnRamp rmnRemote = fromOptional deps.rmnRemote newDeps.rmnRemote tokenAdminRegistry = fromOptional deps.tokenAdminRegistry newDeps.tokenAdminRegistry feeQuoter = fromOptional deps.feeQuoter newDeps.feeQuoter - ccvRegistry = fromOptional deps.ccvRegistry newDeps.ccvRegistry create this with deps = mergedDeps -- | Get required CCV raw instance addresses for outbound message. diff --git a/contracts/ccip/runtime/daml/CCIP/OnRampCodecGen.daml b/contracts/ccip/runtime/daml/CCIP/OnRampCodecGen.daml index ba202ba97..6bcf81c61 100644 --- a/contracts/ccip/runtime/daml/CCIP/OnRampCodecGen.daml +++ b/contracts/ccip/runtime/daml/CCIP/OnRampCodecGen.daml @@ -24,7 +24,6 @@ encodeOnRampDeps params = <> encodeRawInstanceAddress params.rmnRemote <> encodeRawInstanceAddress params.tokenAdminRegistry <> encodeRawInstanceAddress params.feeQuoter - <> encodeRawInstanceAddress params.ccvRegistry decodeOnRampDepsAt : BytesHex -> Int -> Optional (OnRampDeps, Int) decodeOnRampDepsAt encoded offset = do @@ -32,7 +31,6 @@ decodeOnRampDepsAt encoded offset = do (rmnRemote, offset) <- decodeRawInstanceAddressAt encoded offset (tokenAdminRegistry, offset) <- decodeRawInstanceAddressAt encoded offset (feeQuoter, offset) <- decodeRawInstanceAddressAt encoded offset - (ccvRegistry, offset) <- decodeRawInstanceAddressAt encoded offset Some (OnRampDeps{..}, offset) @@ -46,7 +44,6 @@ encodeSetDepsParams params = <> encodeOptional params.rmnRemote encodeRawInstanceAddress <> encodeOptional params.tokenAdminRegistry encodeRawInstanceAddress <> encodeOptional params.feeQuoter encodeRawInstanceAddress - <> encodeOptional params.ccvRegistry encodeRawInstanceAddress decodeSetDepsParamsAt : BytesHex -> Int -> Optional (SetDepsParams, Int) decodeSetDepsParamsAt encoded offset = do @@ -54,7 +51,6 @@ decodeSetDepsParamsAt encoded offset = do (rmnRemote, offset) <- decodeOptional encoded offset decodeRawInstanceAddressAt (tokenAdminRegistry, offset) <- decodeOptional encoded offset decodeRawInstanceAddressAt (feeQuoter, offset) <- decodeOptional encoded offset decodeRawInstanceAddressAt - (ccvRegistry, offset) <- decodeOptional encoded offset decodeRawInstanceAddressAt Some (SetDepsParams{..}, offset) diff --git a/contracts/ccip/runtime/daml/CCIP/OnRampTypes.daml b/contracts/ccip/runtime/daml/CCIP/OnRampTypes.daml index 170ed8c39..4a4416d41 100644 --- a/contracts/ccip/runtime/daml/CCIP/OnRampTypes.daml +++ b/contracts/ccip/runtime/daml/CCIP/OnRampTypes.daml @@ -8,7 +8,6 @@ data OnRampDeps = OnRampDeps rmnRemote : RawInstanceAddress tokenAdminRegistry : RawInstanceAddress feeQuoter : RawInstanceAddress - ccvRegistry : RawInstanceAddress deriving (Eq, Show) data SetDepsParams = SetDepsParams @@ -17,5 +16,4 @@ data SetDepsParams = SetDepsParams rmnRemote : Optional RawInstanceAddress tokenAdminRegistry : Optional RawInstanceAddress feeQuoter : Optional RawInstanceAddress - ccvRegistry : Optional RawInstanceAddress deriving (Eq, Show) diff --git a/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryCodecTest.daml b/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryCodecTest.daml index 73e591e24..394e49864 100644 --- a/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryCodecTest.daml +++ b/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryCodecTest.daml @@ -81,7 +81,6 @@ encodeDeployOnRampParams params = <> encodeRawInstanceAddress params.rmnRemote <> encodeRawInstanceAddress params.tokenAdminRegistry <> encodeRawInstanceAddress params.feeQuoter - <> encodeRawInstanceAddress params.ccvRegistry <> encodeNumeric0 params.maxUSDCentsPerMsg encodeDeployOffRampParams : DeployOffRampParams -> BytesHex @@ -266,7 +265,7 @@ testDecodeDeployOnRampParams = script do rmnRemote = RawInstanceAddress "rmn@owner" tokenAdminRegistry = RawInstanceAddress "tar@owner" feeQuoter = RawInstanceAddress "fq@owner" - ccvRegistry = RawInstanceAddress "ccv@owner" + maxUSDCentsPerMsg = 12345.0 encoded = encodeDeployOnRampParams params @@ -278,7 +277,7 @@ testDecodeDeployOnRampParams = script do decoded.rmnRemote === params.rmnRemote decoded.tokenAdminRegistry === params.tokenAdminRegistry decoded.feeQuoter === params.feeQuoter - decoded.ccvRegistry === params.ccvRegistry + decoded.maxUSDCentsPerMsg === params.maxUSDCentsPerMsg pure () diff --git a/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryMCMSTest.daml b/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryMCMSTest.daml index 42a39d2a9..29937dca4 100644 --- a/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryMCMSTest.daml +++ b/contracts/ccip/test/daml/CCIP/FactoryTest/FactoryMCMSTest.daml @@ -473,7 +473,7 @@ testDeployOnRamp_MCMS = script do rmnRemote = RawInstanceAddress "rmn@owner" tokenAdminRegistry = RawInstanceAddress "tar@owner" feeQuoter = RawInstanceAddress "fq@owner" - ccvRegistry = RawInstanceAddress "ccv@owner" + maxUSDCentsPerMsg = 12345.0 encoded = encodeDeployOnRampParams params diff --git a/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampCodecTest.daml b/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampCodecTest.daml index bdf52299c..5190a274f 100644 --- a/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampCodecTest.daml +++ b/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampCodecTest.daml @@ -21,7 +21,7 @@ testSetDepsParamsRoundtrip_AllSome = do rmnRemote = Some (RawInstanceAddress "rmn-instance@another-party") tokenAdminRegistry = Some (RawInstanceAddress "tar-instance@yet-another") feeQuoter = Some (RawInstanceAddress "fq-instance@fee-owner") - ccvRegistry = Some (RawInstanceAddress "ccv-registry@registry-owner") + encoded = encodeSetDepsParams params @@ -38,7 +38,7 @@ testSetDepsParamsRoundtrip_AllNone = do rmnRemote = None tokenAdminRegistry = None feeQuoter = None - ccvRegistry = None + encoded = encodeSetDepsParams params @@ -55,7 +55,7 @@ testSetDepsParamsRoundtrip_Mixed = do rmnRemote = None tokenAdminRegistry = None feeQuoter = Some (RawInstanceAddress "fq@owner") - ccvRegistry = None + encoded = encodeSetDepsParams params @@ -76,7 +76,7 @@ testOnRampDepsRoundtrip = do rmnRemote = RawInstanceAddress "rmnremote@ccip_owner" tokenAdminRegistry = RawInstanceAddress "tar@ccip_owner" feeQuoter = RawInstanceAddress "feequoter@ccip_owner" - ccvRegistry = RawInstanceAddress "ccvregistry@ccip_owner" + encoded = encodeOnRampDeps deps @@ -87,7 +87,7 @@ testOnRampDepsRoundtrip = do decoded.rmnRemote === deps.rmnRemote decoded.tokenAdminRegistry === deps.tokenAdminRegistry decoded.feeQuoter === deps.feeQuoter - decoded.ccvRegistry === deps.ccvRegistry + pure () @@ -98,7 +98,7 @@ testOnRampDepsSpecialCharacters = do rmnRemote = RawInstanceAddress "rmn_with_underscores@party2::namespace2" tokenAdminRegistry = RawInstanceAddress "tar.with.dots@party3" feeQuoter = RawInstanceAddress "fq/with/slashes@party4" - ccvRegistry = RawInstanceAddress "ccv:with:colons@party5" + encoded = encodeOnRampDeps deps @@ -109,7 +109,7 @@ testOnRampDepsSpecialCharacters = do decoded.rmnRemote === deps.rmnRemote decoded.tokenAdminRegistry === deps.tokenAdminRegistry decoded.feeQuoter === deps.feeQuoter - decoded.ccvRegistry === deps.ccvRegistry + pure () diff --git a/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampMCMSTest.daml b/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampMCMSTest.daml index f9397d203..c73d85fbd 100644 --- a/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampMCMSTest.daml +++ b/contracts/ccip/test/daml/CCIP/OnRampTest/OnRampMCMSTest.daml @@ -28,7 +28,7 @@ testOnRampMCMSEntrypoint_SetDeps = script do rmnRemote = RawInstanceAddress "rmn-old@owner" tokenAdminRegistry = RawInstanceAddress "tar-old@owner" feeQuoter = RawInstanceAddress "fq-old@owner" - ccvRegistry = RawInstanceAddress "ccv-old@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -45,7 +45,7 @@ testOnRampMCMSEntrypoint_SetDeps = script do rmnRemote = Some (RawInstanceAddress "rmn-new@owner") tokenAdminRegistry = Some (RawInstanceAddress "tar-new@owner") feeQuoter = Some (RawInstanceAddress "fq-new@owner") - ccvRegistry = Some (RawInstanceAddress "ccv-new@owner") + encoded = encodeSetDepsParams newDeps @@ -62,12 +62,12 @@ testOnRampMCMSEntrypoint_SetDeps = script do onRamp.deps.rmnRemote === RawInstanceAddress "rmn-new@owner" onRamp.deps.tokenAdminRegistry === RawInstanceAddress "tar-new@owner" onRamp.deps.feeQuoter === RawInstanceAddress "fq-new@owner" - onRamp.deps.ccvRegistry === RawInstanceAddress "ccv-new@owner" + _ -> abort "Expected exactly one OnRamp contract" pure () --- | Test partial update: only update feeQuoter and ccvRegistry +-- | Test partial update: only update feeQuoter testOnRampMCMSEntrypoint_SetDeps_Partial : Script () testOnRampMCMSEntrypoint_SetDeps_Partial = script do ccipOwner <- allocateParty "ccip_owner" @@ -78,7 +78,7 @@ testOnRampMCMSEntrypoint_SetDeps_Partial = script do rmnRemote = RawInstanceAddress "rmn-old@owner" tokenAdminRegistry = RawInstanceAddress "tar-old@owner" feeQuoter = RawInstanceAddress "fq-old@owner" - ccvRegistry = RawInstanceAddress "ccv-old@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -95,7 +95,7 @@ testOnRampMCMSEntrypoint_SetDeps_Partial = script do rmnRemote = None tokenAdminRegistry = None feeQuoter = Some (RawInstanceAddress "fq-new@owner") - ccvRegistry = Some (RawInstanceAddress "ccv-new@owner") + encoded = encodeSetDepsParams partialDeps @@ -112,7 +112,7 @@ testOnRampMCMSEntrypoint_SetDeps_Partial = script do onRamp.deps.rmnRemote === RawInstanceAddress "rmn-old@owner" onRamp.deps.tokenAdminRegistry === RawInstanceAddress "tar-old@owner" onRamp.deps.feeQuoter === RawInstanceAddress "fq-new@owner" - onRamp.deps.ccvRegistry === RawInstanceAddress "ccv-new@owner" + _ -> abort "Expected exactly one OnRamp contract" pure () @@ -128,7 +128,7 @@ testOnRampMCMSEntrypoint_SetDeps_Replace = script do rmnRemote = RawInstanceAddress "rmn1@owner" tokenAdminRegistry = RawInstanceAddress "tar1@owner" feeQuoter = RawInstanceAddress "fq1@owner" - ccvRegistry = RawInstanceAddress "ccv1@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -145,7 +145,7 @@ testOnRampMCMSEntrypoint_SetDeps_Replace = script do rmnRemote = Some (RawInstanceAddress "rmn2@owner") tokenAdminRegistry = Some (RawInstanceAddress "tar2@owner") feeQuoter = Some (RawInstanceAddress "fq2@owner") - ccvRegistry = Some (RawInstanceAddress "ccv2@owner") + encoded1 = encodeSetDepsParams deps2 newContractIds1 <- submit ccipOwner do @@ -165,7 +165,7 @@ testOnRampMCMSEntrypoint_SetDeps_Replace = script do rmnRemote = Some (RawInstanceAddress "rmn3@owner") tokenAdminRegistry = Some (RawInstanceAddress "tar3@owner") feeQuoter = Some (RawInstanceAddress "fq3@owner") - ccvRegistry = Some (RawInstanceAddress "ccv3@owner") + encoded2 = encodeSetDepsParams deps3 newContractIds2 <- submit ccipOwner do @@ -199,7 +199,7 @@ testOnRampMCMSEntrypoint_UnknownFunction = script do rmnRemote = RawInstanceAddress "rmn@owner" tokenAdminRegistry = RawInstanceAddress "tar@owner" feeQuoter = RawInstanceAddress "fq@owner" - ccvRegistry = RawInstanceAddress "ccv@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -229,7 +229,7 @@ testOnRampMCMSEntrypoint_InvalidParams = script do rmnRemote = RawInstanceAddress "rmn@owner" tokenAdminRegistry = RawInstanceAddress "tar@owner" feeQuoter = RawInstanceAddress "fq@owner" - ccvRegistry = RawInstanceAddress "ccv@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -259,7 +259,7 @@ testOnRampMCMSEntrypoint_MissingSelfCid = script do rmnRemote = RawInstanceAddress "rmn@owner" tokenAdminRegistry = RawInstanceAddress "tar@owner" feeQuoter = RawInstanceAddress "fq@owner" - ccvRegistry = RawInstanceAddress "ccv@owner" + onRampCid <- submit ccipOwner do createCmd OnRamp with @@ -274,9 +274,7 @@ testOnRampMCMSEntrypoint_MissingSelfCid = script do globalConfig = Some deps.globalConfig rmnRemote = Some deps.rmnRemote tokenAdminRegistry = Some deps.tokenAdminRegistry - feeQuoter = Some deps.feeQuoter - ccvRegistry = Some deps.ccvRegistry) - + feeQuoter = Some deps.feeQuoter) submitMustFail ccipOwner do exerciseCmd targetAsMcmsReceiver MCMSReceiver_Entrypoint with functionName = "SetDeps" diff --git a/contracts/ccip/test/daml/CCVMaxBounds.daml b/contracts/ccip/test/daml/CCVMaxBounds.daml index 04ff1e178..87c57bc9a 100644 --- a/contracts/ccip/test/daml/CCVMaxBounds.daml +++ b/contracts/ccip/test/daml/CCVMaxBounds.daml @@ -211,7 +211,7 @@ setupOutboundFixture suffix = do rmnRemote = RawInstanceAddress.make rmnInstanceId rmnOwner tokenAdminRegistry = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner feeQuoter = RawInstanceAddress.make feeQuoterInstanceId ccipOwner - ccvRegistry = RawInstanceAddress.make ("ccvregistry-bounds-" <> suffix) ccipOwner + router <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouter with diff --git a/contracts/ccip/test/daml/ExecutorExpectedExecutorTest.daml b/contracts/ccip/test/daml/ExecutorExpectedExecutorTest.daml index 2c33c34ba..6380c6ec0 100644 --- a/contracts/ccip/test/daml/ExecutorExpectedExecutorTest.daml +++ b/contracts/ccip/test/daml/ExecutorExpectedExecutorTest.daml @@ -181,7 +181,7 @@ setupFeeFixture suffix useDefaultExecutor = do rmnRemote = RawInstanceAddress.make ("rmn-unused-" <> suffix) ccipOwner tokenAdminRegistry = RawInstanceAddress.make ("tar-unused-" <> suffix) ccipOwner feeQuoter = RawInstanceAddress.make feeQuoterInstanceId ccipOwner - ccvRegistry = RawInstanceAddress.make ("ccvregistry-unused-" <> suffix) ccipOwner + router <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouter with diff --git a/contracts/ccip/test/daml/FeeQuoter.daml b/contracts/ccip/test/daml/FeeQuoter.daml index 03d31a8e1..bd379a872 100644 --- a/contracts/ccip/test/daml/FeeQuoter.daml +++ b/contracts/ccip/test/daml/FeeQuoter.daml @@ -1253,7 +1253,7 @@ testCalculateFeeResult_CCVRoundingMatchesFinalizeFee = script do rmnRemote = RawInstanceAddress.make "rmn-ccv-rounding-quote" owner tokenAdminRegistry = RawInstanceAddress.make "tar-ccv-rounding-quote" owner feeQuoter = RawInstanceAddress.make "test-feequoter-ccv-rounding-quote" owner - ccvRegistry = RawInstanceAddress.make "ccvregistry-ccv-rounding-quote" owner + feeQuote <- submit owner do exerciseCmd onRamp OnRamp.GetFeeFromRouter with diff --git a/contracts/ccip/test/daml/PerPartyRouter.daml b/contracts/ccip/test/daml/PerPartyRouter.daml index 713ce161c..ade9fa7f9 100644 --- a/contracts/ccip/test/daml/PerPartyRouter.daml +++ b/contracts/ccip/test/daml/PerPartyRouter.daml @@ -202,7 +202,6 @@ testCCIPSendAllFeePayouts = script do let onRampInstanceId = "test-onramp-all-fees" let rmnInstanceId = "test-rmn-all-fees" let tokenAdminRegistryInstanceId = "test-tar-all-fees" - let ccvRegistryInstanceId = "test-ccvregistry-all-fees" let executorInstanceId = "test-executor-all-fees" let sourceChainSelector : Numeric 0 = 1111111114.0 let destChainSelector : Numeric 0 = 2222222225.0 @@ -214,7 +213,6 @@ testCCIPSendAllFeePayouts = script do let globalConfigInstanceAddress = RawInstanceAddress.make globalConfigInstanceId ccipOwner let rmnRemoteInstanceAddress = RawInstanceAddress.make rmnInstanceId rmnOwner let tokenAdminRegistryInstanceAddress = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner - let ccvRegistryInstanceAddress = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner let executorInstanceAddress = RawInstanceAddress.make executorInstanceId executorOwner let ccvInstanceAddress = RawInstanceAddress.make ccvInstanceId ccvOwner @@ -288,7 +286,6 @@ testCCIPSendAllFeePayouts = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = RawInstanceAddress.make "test-feequoter-all-fees" ccipOwner - ccvRegistry = ccvRegistryInstanceAddress executor <- submit executorOwner do createCmd CCIP.Executor.Executor with @@ -525,7 +522,6 @@ testCCIPSend = script do let rmnInstanceId = "test-rmn" let factoryInstanceId = "test-factory" let tokenAdminRegistryInstanceId = "test-tar" - let ccvRegistryInstanceId = "test-ccvregistry" let sourceChainSelector : Numeric 0 = 1111111111.0 let destChainSelector : Numeric 0 = 2222222222.0 @@ -537,7 +533,6 @@ testCCIPSend = script do let globalConfigInstanceAddress = RawInstanceAddress.make globalConfigInstanceId ccipOwner let rmnRemoteInstanceAddress = RawInstanceAddress.make rmnInstanceId rmnOwner let tokenAdminRegistryInstanceAddress = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner - let ccvRegistryInstanceAddress = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner -- Deploy GlobalConfig with network fee fields globalConfig <- submit ccipOwner do @@ -613,7 +608,6 @@ testCCIPSend = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = RawInstanceAddress.make "test-feequoter" ccipOwner - ccvRegistry = ccvRegistryInstanceAddress -- Deploy production Executor executor <- submit ccipOwner do @@ -990,7 +984,6 @@ testPrepareSendExtraArgs = script do let rmnInstanceId = "test-rmn" let factoryInstanceId = "test-factory" let tokenAdminRegistryInstanceId = "test-tar" - let ccvRegistryInstanceId = "test-ccvregistry" let sourceChainSelector : Numeric 0 = 1111111111.0 let destChainSelector : Numeric 0 = 2222222222.0 let destChainSelector2 : Numeric 0 = 3333333333.0 @@ -1003,7 +996,6 @@ testPrepareSendExtraArgs = script do let globalConfigInstanceAddress = RawInstanceAddress.make globalConfigInstanceId ccipOwner let rmnRemoteInstanceAddress = RawInstanceAddress.make rmnInstanceId rmnOwner let tokenAdminRegistryInstanceAddress = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner - let ccvRegistryInstanceAddress = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner globalConfig <- submit ccipOwner do createCmd CCIP.GlobalConfig.GlobalConfig with @@ -1086,7 +1078,6 @@ testPrepareSendExtraArgs = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = RawInstanceAddress.make "test-feequoter" ccipOwner - ccvRegistry = ccvRegistryInstanceAddress factory <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouterFactory with @@ -1252,7 +1243,6 @@ testPrepareSendRejectsOversizedPayload = script do let rmnInstanceId = "test-rmn-payload" let factoryInstanceId = "test-factory-payload" let tokenAdminRegistryInstanceId = "test-tar-payload" - let ccvRegistryInstanceId = "test-ccvregistry-payload" let feeQuoterInstanceId = "test-feequoter-payload" let sourceChainSelector : Numeric 0 = 1111111111.0 let destChainSelector : Numeric 0 = 2222222222.0 @@ -1264,7 +1254,6 @@ testPrepareSendRejectsOversizedPayload = script do let globalConfigInstanceAddress = RawInstanceAddress.make globalConfigInstanceId ccipOwner let rmnRemoteInstanceAddress = RawInstanceAddress.make rmnInstanceId rmnOwner let tokenAdminRegistryInstanceAddress = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner - let ccvRegistryInstanceAddress = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner globalConfig <- submit ccipOwner do createCmd CCIP.GlobalConfig.GlobalConfig with @@ -1335,7 +1324,6 @@ testPrepareSendRejectsOversizedPayload = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = RawInstanceAddress.make feeQuoterInstanceId ccipOwner - ccvRegistry = ccvRegistryInstanceAddress factory <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouterFactory with @@ -1688,7 +1676,6 @@ testPrepareSendRejectsDuplicateSenderRequiredCCVs = script do let rmnInstanceId = "test-rmn-dup-ccvs" let factoryInstanceId = "test-factory-dup-ccvs" let tokenAdminRegistryInstanceId = "test-tar-dup-ccvs" - let ccvRegistryInstanceId = "test-ccvregistry-dup-ccvs" let feeQuoterInstanceId = "test-feequoter-dup-ccvs" let sourceChainSelector : Numeric 0 = 1111111111.0 let destChainSelector : Numeric 0 = 2222222222.0 @@ -1700,7 +1687,6 @@ testPrepareSendRejectsDuplicateSenderRequiredCCVs = script do let globalConfigInstanceAddress = RawInstanceAddress.make globalConfigInstanceId ccipOwner let rmnRemoteInstanceAddress = RawInstanceAddress.make rmnInstanceId rmnOwner let tokenAdminRegistryInstanceAddress = RawInstanceAddress.make tokenAdminRegistryInstanceId ccipOwner - let ccvRegistryInstanceAddress = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner globalConfig <- submit ccipOwner do createCmd CCIP.GlobalConfig.GlobalConfig with @@ -1759,7 +1745,6 @@ testPrepareSendRejectsDuplicateSenderRequiredCCVs = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = RawInstanceAddress.make feeQuoterInstanceId ccipOwner - ccvRegistry = ccvRegistryInstanceAddress factory <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouterFactory with @@ -1843,7 +1828,6 @@ testPrepareSendRejectsSequenceNumberOverflow = script do let onRampInstanceId = "test-onramp-seq" let rmnInstanceId = "test-rmn-seq" let tokenAdminRegistryInstanceId = "test-tar-seq" - let ccvRegistryInstanceId = "test-ccvregistry-seq" let feeQuoterInstanceId = "test-feequoter-seq" let sourceChainSelector : Numeric 0 = 1111111111.0 let destChainSelector : Numeric 0 = 2222222222.0 @@ -1928,7 +1912,6 @@ testPrepareSendRejectsSequenceNumberOverflow = script do rmnRemote = rmnRemoteInstanceAddress tokenAdminRegistry = tokenAdminRegistryInstanceAddress feeQuoter = feeQuoterInstanceAddress - ccvRegistry = RawInstanceAddress.make ccvRegistryInstanceId ccipOwner router <- submit ccipOwner do createCmd CCIP.PerPartyRouter.PerPartyRouter with diff --git a/contracts/dars/current/ccip-factory-current.dar b/contracts/dars/current/ccip-factory-current.dar index b7108985f..e58a2f195 100644 Binary files a/contracts/dars/current/ccip-factory-current.dar and b/contracts/dars/current/ccip-factory-current.dar differ diff --git a/contracts/dars/current/ccip-receiver-current.dar b/contracts/dars/current/ccip-receiver-current.dar index 806e7ddea..2947939af 100644 Binary files a/contracts/dars/current/ccip-receiver-current.dar and b/contracts/dars/current/ccip-receiver-current.dar differ diff --git a/contracts/dars/current/ccip-runtime-current.dar b/contracts/dars/current/ccip-runtime-current.dar index c77204a09..02ea6c6fb 100644 Binary files a/contracts/dars/current/ccip-runtime-current.dar and b/contracts/dars/current/ccip-runtime-current.dar differ diff --git a/contracts/dars/current/ccip-sender-current.dar b/contracts/dars/current/ccip-sender-current.dar index 8ad004359..54d2db1d8 100644 Binary files a/contracts/dars/current/ccip-sender-current.dar and b/contracts/dars/current/ccip-sender-current.dar differ diff --git a/contracts/dars/current/ccip-test-current.dar b/contracts/dars/current/ccip-test-current.dar index 3c46ac418..e4fad3070 100644 Binary files a/contracts/dars/current/ccip-test-current.dar and b/contracts/dars/current/ccip-test-current.dar differ diff --git a/deployment/README.md b/deployment/README.md index a5b38abd4..41c4fd3e5 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -306,10 +306,9 @@ Deploy creates **TokenAdminRegistry** (core). Token **pools** and **rate limiter | Ref needed by | Must exist first | Checked in | |---|---|---| | CV template `Deps.RmnRemote` | RMN deployed | `DeployCCVFromFactory` preconditions | -| Core `CcvRegistryBinding` | CV deployed | `DeployCCIPChainContractsFromFactory` | | OnRamp/OffRamp `Deps.RmnRemote` | RMN deployed | core sequence templates | -On-ledger: creating OnRamp with a missing RMN or CV registry ref **fails at execute time** even if proposal generation succeeded. +On-ledger: creating OnRamp with a missing RMN ref **fails at execute time** even if proposal generation succeeded. --- diff --git a/deployment/changesets/deploy_from_factory.go b/deployment/changesets/deploy_from_factory.go index f96ee27f5..ed916072b 100644 --- a/deployment/changesets/deploy_from_factory.go +++ b/deployment/changesets/deploy_from_factory.go @@ -109,9 +109,6 @@ func (d DeployCCIPChainContractsFromFactory) VerifyPreconditions(e cldf.Environm if err := requireFactoryDeployOwnerParties(config.Config.OwnerParty, config.Config.CCIPOwnerParty); err != nil { return err } - if config.Config.Params.CcvRegistryBinding.Unpack == "" { - return fmt.Errorf("CcvRegistryBinding is required for core CCIP factory deploy") - } _, err := dsutils.FactoryAddressRef(e.DataStore, config.ChainSelector, dsutils.QualifierCCIP) if err != nil { return fmt.Errorf("core CCIPFactory must be deployed first: %w", err) diff --git a/deployment/operations/ccip/factory/factory.go b/deployment/operations/ccip/factory/factory.go index 383533b15..215ffe07b 100644 --- a/deployment/operations/ccip/factory/factory.go +++ b/deployment/operations/ccip/factory/factory.go @@ -245,7 +245,6 @@ func encodeDeployOnRamp(args factorybindings.DeployOnRamp) (*bind.EncodedChoice, RmnRemote: args.Contract.Deps.RmnRemote, TokenAdminRegistry: args.Contract.Deps.TokenAdminRegistry, FeeQuoter: args.Contract.Deps.FeeQuoter, - CcvRegistry: args.Contract.Deps.CcvRegistry, MaxUSDCentsPerMsg: args.Contract.MaxUSDCentsPerMsg, }) } diff --git a/deployment/sequences/deploy_chain_contracts.go b/deployment/sequences/deploy_chain_contracts.go index 011570b8d..b8fead1a1 100644 --- a/deployment/sequences/deploy_chain_contracts.go +++ b/deployment/sequences/deploy_chain_contracts.go @@ -16,7 +16,6 @@ import ( "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/committeeverifier" "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/core" executorBinding "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/executor" - "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/chainlink/chainlinkapi" "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/splice/splice_api_token_holding_v1" "github.com/smartcontractkit/chainlink-canton/contracts" "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/committee_verifier" @@ -88,8 +87,6 @@ type DeployChainContractsParams struct { RMNFactoryAddressRef datastore.AddressRef // ProposalDriven enables MCMS proposal generation for factory-backed deploys. ProposalDriven bool - // CcvRegistryBinding is required for OnRamp deps when CommitteeVerifiers is empty (CCV deployed separately). - CcvRegistryBinding chainlinkapi.RawInstanceAddress // RmnRemoteRawInstanceAddress is required for production split deploy paths. RmnRemoteRawInstanceAddress contracts.RawInstanceAddress // DevenvBundledDeploy runs RMN+CV+core in one sequence (devenv adapter only). Mutually exclusive with RmnRemoteRawInstanceAddress. @@ -256,7 +253,6 @@ var DeployChainContracts = operations.NewSequence( RmnRemote: rmnRemoteRawInstanceAddress.Binding(), TokenAdminRegistry: tokenAdminRegistryRawInstanceAddress.Binding(), FeeQuoter: feeQuoterRawInstanceAddress.Binding(), - CcvRegistry: chainlinkapi.RawInstanceAddress{}, }, }, OwnerParty: types.PARTY(input.CCIPOwnerParty), diff --git a/deployment/sequences/deploy_chain_contracts_from_factory.go b/deployment/sequences/deploy_chain_contracts_from_factory.go index f4d0abcf8..ea38a3001 100644 --- a/deployment/sequences/deploy_chain_contracts_from_factory.go +++ b/deployment/sequences/deploy_chain_contracts_from_factory.go @@ -17,7 +17,6 @@ import ( "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/committeeverifier" "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/core" factorybindings "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/ccip/factory" - "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/chainlink/chainlinkapi" "github.com/smartcontractkit/chainlink-canton/bindings/generated/latest/splice/splice_api_token_holding_v1" "github.com/smartcontractkit/chainlink-canton/contracts" "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/committee_verifier" @@ -155,13 +154,6 @@ var DeployChainContractsFromFactory = operations.NewSequence( feeQuoterRawInstanceAddress := feeQuoterInstanceID.RawInstanceAddress(ccipOwnerParty) addresses = append(addresses, newAddressRef(deps.ChainSelector(), feeQuoterRawInstanceAddress, fee_quoter.ContractType, fee_quoter.Version, "")) - var firstCommitteeVerifierBinding chainlinkapi.RawInstanceAddress - if len(input.CommitteeVerifiers) == 0 { - if input.CcvRegistryBinding.Unpack == "" { - return sequences.OnChainOutput{}, fmt.Errorf("CcvRegistryBinding is required when CommitteeVerifiers is empty") - } - firstCommitteeVerifierBinding = input.CcvRegistryBinding - } var ccvOwnerParty types.PARTY if len(input.CommitteeVerifiers) > 0 { ccvOwnerParty, err = requireCCVOwnerParty(input) @@ -198,9 +190,6 @@ var DeployChainContractsFromFactory = operations.NewSequence( } proposalOutputs = appendExerciseOutput(proposalOutputs, deployCommitteeVerifierReport.Output, input.ProposalDriven) committeeVerifierRawInstanceAddress := committeeVerifierInstanceID.RawInstanceAddress(committeeVerifierOwner) - if i == 0 { - firstCommitteeVerifierBinding = committeeVerifierRawInstanceAddress.Binding() - } addresses = append(addresses, newAddressRef(deps.ChainSelector(), committeeVerifierRawInstanceAddress, committee_verifier.ContractType, committee_verifier.Version, qualifier)) } @@ -238,7 +227,6 @@ var DeployChainContractsFromFactory = operations.NewSequence( RmnRemote: rmnRemoteRawInstanceAddress.Binding(), TokenAdminRegistry: tokenAdminRegistryRawInstanceAddress.Binding(), FeeQuoter: feeQuoterRawInstanceAddress.Binding(), - CcvRegistry: firstCommitteeVerifierBinding, }, } deployOnRampReport, err := operations.ExecuteOperation(b, factoryops.DeployOnRamp, deps, newChoiceInput(factoryRawInstanceAddress, factorybindings.DeployOnRamp{Contract: onRampTemplate}, input.ProposalDriven)) diff --git a/integration-tests/mcms/ccip_factory_mcms_decparty_test.go b/integration-tests/mcms/ccip_factory_mcms_decparty_test.go index 8dd495bbf..ade866989 100644 --- a/integration-tests/mcms/ccip_factory_mcms_decparty_test.go +++ b/integration-tests/mcms/ccip_factory_mcms_decparty_test.go @@ -173,7 +173,6 @@ func TestCCIP_MCMSFactoryDeploy_DecentralizedParty(t *testing.T) { RmnRemote: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(rmnInstanceAddr)}, TokenAdminRegistry: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(tarInstanceAddr)}, FeeQuoter: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(fqInstanceAddr)}, - CcvRegistry: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(ccvInstanceAddr)}, MaxUSDCentsPerMsg: types.NUMERIC("100000"), } factoryCid, mcmsCid = mcmsFactoryDeployWithMCMSQueryParty(t, participant, mcmsEncoder, ccipOwner, decentralizedParty, mcmsCid, mcmsInstanceAddr, factoryCid, factoryInstanceAddr, chainID, sortedSigners, factoryEncoder, "DeployOnRampParams", onRampParams) diff --git a/integration-tests/mcms/ccip_factory_mcms_test.go b/integration-tests/mcms/ccip_factory_mcms_test.go index 77f82128d..862763837 100644 --- a/integration-tests/mcms/ccip_factory_mcms_test.go +++ b/integration-tests/mcms/ccip_factory_mcms_test.go @@ -169,7 +169,6 @@ func TestCCIP_MCMSFactoryDeploy(t *testing.T) { RmnRemote: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(rmnInstanceAddr)}, TokenAdminRegistry: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(tarInstanceAddr)}, FeeQuoter: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(fqInstanceAddr)}, - CcvRegistry: chainlinkapi.RawInstanceAddress{Unpack: types.TEXT(ccvInstanceAddr)}, MaxUSDCentsPerMsg: types.NUMERIC("100000"), } factoryCid, mcmsCid = mcmsFactoryDeploy(t, participant, mcmsEncoder, ccipOwner, mcmsCid, mcmsInstanceAddr, factoryCid, factoryInstanceAddr, chainID, sortedSigners, factoryEncoder, "DeployOnRampParams", onRampParams)