Skip to content

Refactor CCIP interfaces #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
friedemannf wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Refactor CCIP interfaces #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/burnminttokenpool/burnminttokenpool.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/ccipruntime/ccipruntime.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/committeeverifier/committeeverifier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/executor/executor.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions bindings/generated/latest/ccip/extensionapi/extensionapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/factory/factory.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/lockreleasetokenpool/lockreleasetokenpool.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/receiver/receiver.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/sender/sender.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions contracts/ccip/committee-verifier/daml/CCIP/CommitteeVerifier.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,18 @@ template CommitteeVerifier
storageLocations = storageLocations

crossChainVerifier_verifyMessageImpl self arg = do
exercise (fromInterfaceContractId @CommitteeVerifier self) VerifyMessage
coerceContractId <$> exercise (fromInterfaceContractId @CommitteeVerifier self) VerifyMessage
with
rmnRemoteCid = arg.rmnRemoteCid
rmnRemoteCid = coerceContractId arg.rmnRemoteCid
extraContext = arg.extraContext
executingMessageCid = arg.executingMessageCid
executingMessageCid = coerceContractId arg.executingMessageCid
verifierResults = arg.verifierResults
caller = arg.caller

crossChainVerifier_calculateFeeImpl self arg = do
exercise (fromInterfaceContractId @CommitteeVerifier self) CalculateFee
coerceContractId <$> exercise (fromInterfaceContractId @CommitteeVerifier self) CalculateFee
with
sendingMessageCid = arg.sendingMessageCid
sendingMessageCid = coerceContractId arg.sendingMessageCid
extraContext = arg.extraContext
caller = arg.caller

Expand All @@ -134,11 +134,11 @@ template CommitteeVerifier
caller = arg.caller

crossChainVerifier_forwardToVerifierImpl self arg = do
exercise (fromInterfaceContractId @CommitteeVerifier self) ForwardToVerifier
coerceContractId <$> exercise (fromInterfaceContractId @CommitteeVerifier self) ForwardToVerifier
with
rmnRemoteCid = arg.rmnRemoteCid
rmnRemoteCid = coerceContractId arg.rmnRemoteCid
extraContext = arg.extraContext
sendingMessageCid = arg.sendingMessageCid
sendingMessageCid = coerceContractId arg.sendingMessageCid
verifierArgs = arg.verifierArgs
caller = arg.caller

Expand Down
4 changes: 2 additions & 2 deletions contracts/ccip/executor/daml/CCIP/Executor.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ template Executor
owner = owner

executor_calculateFeeImpl self arg = do
exercise (fromInterfaceContractId @Executor self) CalculateFee with
coerceContractId <$> exercise (fromInterfaceContractId @Executor self) CalculateFee with
expectedExecutor = arg.expectedExecutor
sendingMessageCid = arg.sendingMessageCid
sendingMessageCid = coerceContractId arg.sendingMessageCid
executorArgs = arg.executorArgs
extraContext = arg.extraContext
caller = arg.caller
Expand Down
3 changes: 0 additions & 3 deletions contracts/ccip/extension-api/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ build-options:
data-dependencies:
- ../../dependencies/splice/splice-api-token-metadata-v1-1.0.0.dar
- ../../dependencies/splice/splice-api-token-holding-v1-1.0.0.dar
- ../../dependencies/splice/splice-api-token-burn-mint-v1-1.0.0.dar
- ../../dependencies/splice/splice-api-token-transfer-instruction-v1-1.0.0.dar
dependencies:
- daml-prim
- daml-stdlib
- ../../chainlink/api/.daml/dist/chainlink-api-2.0.0.dar
- ../../mcms/api/.daml/dist/mcms-api-1.0.0.dar
- ../core/.daml/dist/ccip-core-2.0.0.dar

@friedemannf friedemannf Jun 11, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove ccip-core from extension-api's dependencies

29 changes: 11 additions & 18 deletions contracts/ccip/extension-api/daml/CCIP/Interfaces/CrossChainVerifier.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,30 @@ import DA.Crypto.Text (BytesHex)

import Splice.Api.Token.MetadataV1 (ChoiceContext)

import qualified CCIP.ExecutingMessageV1
import qualified CCIP.Internal
import qualified CCIP.RMNRemote
import qualified CCIP.SendingMessageV1

useDefaultCCVs = CCIP.Internal.useDefaultCCVs

interface ICrossChainVerifier where
viewtype CrossChainVerifierView

crossChainVerifier_verifyMessageImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_VerifyMessage -> Update (ContractId CCIP.ExecutingMessageV1.ExecutingMessageV1)
crossChainVerifier_calculateFeeImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_CalculateFee -> Update (ContractId CCIP.SendingMessageV1.SendingMessageV1)
crossChainVerifier_verifyMessageImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_VerifyMessage -> Update (ContractId ())
crossChainVerifier_calculateFeeImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_CalculateFee -> Update (ContractId ())
crossChainVerifier_getFeeImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_GetFee -> Update CrossChainVerifierFeeQuote
crossChainVerifier_forwardToVerifierImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_ForwardToVerifier -> Update (ContractId CCIP.SendingMessageV1.SendingMessageV1)
crossChainVerifier_forwardToVerifierImpl : ContractId ICrossChainVerifier -> CrossChainVerifier_ForwardToVerifier -> Update (ContractId ())

-- Verify an inbound message and append a CCV verification to ExecutingMessageV1.
nonconsuming choice CrossChainVerifier_VerifyMessage : ContractId CCIP.ExecutingMessageV1.ExecutingMessageV1
nonconsuming choice CrossChainVerifier_VerifyMessage : ContractId ()
with
rmnRemoteCid : ContractId CCIP.RMNRemote.RMNRemote
rmnRemoteCid : ContractId ()
extraContext : ChoiceContext
executingMessageCid : ContractId CCIP.ExecutingMessageV1.ExecutingMessageV1
executingMessageCid : ContractId ()
verifierResults : BytesHex
caller : Party
controller caller
do crossChainVerifier_verifyMessageImpl this self arg

-- Calculate fee for outbound message (USD cents only).
nonconsuming choice CrossChainVerifier_CalculateFee
: ContractId CCIP.SendingMessageV1.SendingMessageV1
: ContractId ()
with
sendingMessageCid : ContractId CCIP.SendingMessageV1.SendingMessageV1
sendingMessageCid : ContractId ()
extraContext : ChoiceContext
caller : Party
controller caller
Expand All @@ -51,11 +44,11 @@ interface ICrossChainVerifier where
-- Forward message for verification and append verifier data to
-- SendingMessageV1.
nonconsuming choice CrossChainVerifier_ForwardToVerifier
: ContractId CCIP.SendingMessageV1.SendingMessageV1
: ContractId ()
with
rmnRemoteCid : ContractId CCIP.RMNRemote.RMNRemote
rmnRemoteCid : ContractId ()
extraContext : ChoiceContext
sendingMessageCid : ContractId CCIP.SendingMessageV1.SendingMessageV1
sendingMessageCid : ContractId ()
verifierArgs : BytesHex
caller : Party
controller caller
Expand Down
7 changes: 3 additions & 4 deletions contracts/ccip/extension-api/daml/CCIP/Interfaces/Executor.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import DA.Crypto.Text (BytesHex)

import Splice.Api.Token.MetadataV1 (ChoiceContext)

import qualified CCIP.SendingMessageV1
import Chainlink.InstanceAddress (RawInstanceAddress)
import Chainlink.InstanceAddress qualified as RawInstanceAddress

Expand All @@ -14,16 +13,16 @@ interface IExecutor where
executor_calculateFeeImpl :
ContractId IExecutor ->
Executor_CalculateFee ->
Update (ContractId CCIP.SendingMessageV1.SendingMessageV1)
Update (ContractId ())
executor_getFeeImpl :
ContractId IExecutor ->
Executor_GetFee ->
Update ExecutorFeeQuote

nonconsuming choice Executor_CalculateFee : ContractId CCIP.SendingMessageV1.SendingMessageV1
nonconsuming choice Executor_CalculateFee : ContractId ()
with
expectedExecutor : RawInstanceAddress
sendingMessageCid : ContractId CCIP.SendingMessageV1.SendingMessageV1
sendingMessageCid : ContractId ()
executorArgs : BytesHex
extraContext : ChoiceContext
caller : Party
Expand Down
Loading
Loading