Add checks to token implementation

contracts/ccip/factory/daml.yaml

@@ -1,7 +1,7 @@
 sdk-version: 3.4.11
 name: ccip-factory-v2
 source: daml
-version: 2.1.0
+version: 2.1.1
 upgrades: ../../dars/released/ccip-factory-v2-2.0.0.dar
 build-options:
   - "-Wno-crypto-text-is-alpha"
@@ -14,7 +14,7 @@ data-dependencies:
 
   - ../../mcms/api/.daml/dist/mcms-api-1.0.0.dar
   - ../../chainlink/api/.daml/dist/chainlink-api-2.0.0.dar
-  - ../../link/.daml/dist/link-2.0.0.dar
+  - ../../link/.daml/dist/link-2.1.0.dar
 
   - ../codec/.daml/dist/ccip-codec-v2-2.0.0.dar
   - ../api/.daml/dist/ccip-api-v2-2.0.0.dar

contracts/ccip/test/daml.yaml

@@ -14,7 +14,7 @@ data-dependencies:
 
   - ../../mcms/api/.daml/dist/mcms-api-1.0.0.dar
   - ../../chainlink/api/.daml/dist/chainlink-api-2.0.0.dar
-  - ../../link/.daml/dist/link-2.0.0.dar
+  - ../../link/.daml/dist/link-2.1.0.dar
 
   - ../codec/.daml/dist/ccip-codec-v2-2.0.0.dar
   - ../api/.daml/dist/ccip-api-v2-2.0.0.dar
@@ -34,7 +34,7 @@ data-dependencies:
 
   - ../sender/.daml/dist/ccip-sender-v2-2.1.0.dar
   - ../receiver/.daml/dist/ccip-receiver-v2-2.1.0.dar
-  - ../factory/.daml/dist/ccip-factory-v2-2.1.0.dar
+  - ../factory/.daml/dist/ccip-factory-v2-2.1.1.dar
 dependencies:
   - daml-prim
   - daml-stdlib

contracts/link/daml.yaml

@@ -2,10 +2,12 @@ sdk-version: 3.4.11
 name: link
 source: daml
 init-script: Main:runAll
-version: 2.0.0
+version: 2.1.0
+upgrades: ../dars/released/link-2.0.0.dar
 build-options:
   - "-Wno-crypto-text-is-alpha"
   - "-Werror=unused-dependency"
+  - "-Wno-upgraded-template-expression-changed"
 data-dependencies:
   - ../dependencies/splice/splice-api-token-metadata-v1-1.0.0.dar
   - ../dependencies/splice/splice-api-token-holding-v1-1.0.0.dar

contracts/link/daml/Link/Token.daml

@@ -23,6 +23,7 @@ template LinkHolding
     meta : MetadataV1.Metadata
   where
     signatory holdingOwner, holdingAdmin
+    ensure holdingInstrumentId.admin == holdingAdmin
 
     interface instance HoldingV1.Holding for LinkHolding where
       view = HoldingV1.HoldingView with
@@ -83,6 +84,7 @@ template LinkTransferInstruction
   where
     signatory instructionAdmin, instructionTransfer.sender
     observer instructionTransfer.receiver
+    ensure instructionTransfer.instrumentId.admin == instructionAdmin
 
     interface instance TransferV1.TransferInstruction for LinkTransferInstruction where
       view = TransferV1.TransferInstructionView with
@@ -96,6 +98,8 @@ template LinkTransferInstruction
         assertMsg "LinkTransferInstruction.TransferInstruction_Accept: transfer instruction expired"
           (instructionTransfer.executeBefore > now)
         lockedHolding <- fetch instructionLockedHoldingCid
+        assertMsg "LinkTransferInstruction.TransferInstruction_Accept: locked holding admin mismatch"
+          (lockedHolding.lockedAdmin == instructionAdmin)
         archive instructionLockedHoldingCid
         let mergedMeta = mergeAcceptMeta arg.extraArgs.meta lockedHolding.meta
 
@@ -132,6 +136,7 @@ template LockedLinkHolding
   where
     signatory lockedAdmin, lockedSender
     observer lockedReceiver
+    ensure lockedInstrumentId.admin == lockedAdmin
 
 template LinkRegistry
   with
@@ -192,6 +197,8 @@ template LinkRegistry
           holding <- fetch linkHoldingCid
           assertMsg "LinkRegistry.BurnMintFactory_BurnMint: input instrumentId mismatch"
             (holding.holdingInstrumentId == registryInstrumentId)
+          assertMsg "LinkRegistry.BurnMintFactory_BurnMint: input holding admin mismatch"
+            (holding.holdingAdmin == registryAdmin)
           assertAuthorizedOwner registryAdmin arg.extraActors holding.holdingOwner
           archive linkHoldingCid
 
@@ -245,6 +252,7 @@ sumAndArchiveInputs sender instrumentId cids =
       let linkHoldingCid = coerceContractId cid : ContractId LinkHolding
       holding <- fetch linkHoldingCid
       assertMsg "Link: input instrumentId mismatch" (holding.holdingInstrumentId == instrumentId)
+      assertMsg "Link: input instrumentId admin mismatch" (holding.holdingInstrumentId.admin == holding.holdingAdmin)
       assertMsg "Link: input owner mismatch" (holding.holdingOwner == sender)
       archive linkHoldingCid
       pure (acc + holding.holdingAmount))
@@ -349,6 +357,8 @@ validateTransferFactoryCall admin instrumentId arg = do
     (arg.expectedAdmin == admin)
   assertMsg "LinkRegistry.TransferFactory_Transfer: instrumentId mismatch"
     (transfer.instrumentId == instrumentId)
+  assertMsg "LinkRegistry.TransferFactory_Transfer: instrumentId admin mismatch"
+    (transfer.instrumentId.admin == admin)
   assertMsg "LinkRegistry.TransferFactory_Transfer: amount must be positive"
     (transfer.amount > 0.0)
   assertMsg "LinkRegistry.TransferFactory_Transfer: requestedAt must not be in the future"

contracts/link/test/daml.yaml

@@ -16,4 +16,4 @@ dependencies:
   - daml-prim
   - daml-stdlib
   - daml-script
-  - ../.daml/dist/link-2.0.0.dar
+  - ../.daml/dist/link-2.1.0.dar