Skip to content

Remove ccvRegistry from OnRampDeps #760

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

Open
JohnChangUK wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove ccvRegistry from OnRampDeps #760

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
18 changes: 1 addition & 17 deletions 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.

5 changes: 1 addition & 4 deletions 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/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.

6 changes: 1 addition & 5 deletions contracts/ccip/factory/daml/CCIP/Factory.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -819,16 +817,14 @@ 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
globalConfig
rmnRemote
tokenAdminRegistry
feeQuoter
ccvRegistry
maxUSDCentsPerMsg

decodeDeployOffRampParams : BytesHex -> Optional DeployOffRampParams
Expand Down
1 change: 0 additions & 1 deletion contracts/ccip/runtime/daml/CCIP/OnRamp.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions contracts/ccip/runtime/daml/CCIP/OnRampCodecGen.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ encodeOnRampDeps params =
<> encodeRawInstanceAddress params.rmnRemote
<> encodeRawInstanceAddress params.tokenAdminRegistry
<> encodeRawInstanceAddress params.feeQuoter
<> encodeRawInstanceAddress params.ccvRegistry

decodeOnRampDepsAt : BytesHex -> Int -> Optional (OnRampDeps, Int)
decodeOnRampDepsAt encoded offset = do
(globalConfig, offset) <- decodeRawInstanceAddressAt encoded offset
(rmnRemote, offset) <- decodeRawInstanceAddressAt encoded offset
(tokenAdminRegistry, offset) <- decodeRawInstanceAddressAt encoded offset
(feeQuoter, offset) <- decodeRawInstanceAddressAt encoded offset
(ccvRegistry, offset) <- decodeRawInstanceAddressAt encoded offset
Some (OnRampDeps{..}, offset)


Expand All @@ -46,15 +44,13 @@ 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
(globalConfig, offset) <- decodeOptional encoded offset decodeRawInstanceAddressAt
(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)


Expand Down
2 changes: 0 additions & 2 deletions contracts/ccip/runtime/daml/CCIP/OnRampTypes.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ data OnRampDeps = OnRampDeps
rmnRemote : RawInstanceAddress
tokenAdminRegistry : RawInstanceAddress
feeQuoter : RawInstanceAddress
ccvRegistry : RawInstanceAddress
deriving (Eq, Show)

data SetDepsParams = SetDepsParams
Expand All @@ -17,5 +16,4 @@ data SetDepsParams = SetDepsParams
rmnRemote : Optional RawInstanceAddress
tokenAdminRegistry : Optional RawInstanceAddress
feeQuoter : Optional RawInstanceAddress
ccvRegistry : Optional RawInstanceAddress
deriving (Eq, Show)
5 changes: 2 additions & 3 deletions contracts/ccip/test/daml/CCIP/FactoryTest/FactoryCodecTest.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ encodeDeployOnRampParams params =
<> encodeRawInstanceAddress params.rmnRemote
<> encodeRawInstanceAddress params.tokenAdminRegistry
<> encodeRawInstanceAddress params.feeQuoter
<> encodeRawInstanceAddress params.ccvRegistry
<> encodeNumeric0 params.maxUSDCentsPerMsg

encodeDeployOffRampParams : DeployOffRampParams -> BytesHex
Expand Down Expand Up @@ -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

Expand All @@ -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 ()
Expand Down
2 changes: 1 addition & 1 deletion contracts/ccip/test/daml/CCIP/FactoryTest/FactoryMCMSTest.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions contracts/ccip/test/daml/CCIP/OnRampTest/OnRampCodecTest.daml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -38,7 +38,7 @@ testSetDepsParamsRoundtrip_AllNone = do
rmnRemote = None
tokenAdminRegistry = None
feeQuoter = None
ccvRegistry = None


encoded = encodeSetDepsParams params

Expand All @@ -55,7 +55,7 @@ testSetDepsParamsRoundtrip_Mixed = do
rmnRemote = None
tokenAdminRegistry = None
feeQuoter = Some (RawInstanceAddress "fq@owner")
ccvRegistry = None


encoded = encodeSetDepsParams params

Expand All @@ -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

Expand All @@ -87,7 +87,7 @@ testOnRampDepsRoundtrip = do
decoded.rmnRemote === deps.rmnRemote
decoded.tokenAdminRegistry === deps.tokenAdminRegistry
decoded.feeQuoter === deps.feeQuoter
decoded.ccvRegistry === deps.ccvRegistry


pure ()

Expand All @@ -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

Expand All @@ -109,7 +109,7 @@ testOnRampDepsSpecialCharacters = do
decoded.rmnRemote === deps.rmnRemote
decoded.tokenAdminRegistry === deps.tokenAdminRegistry
decoded.feeQuoter === deps.feeQuoter
decoded.ccvRegistry === deps.ccvRegistry


pure ()

Expand Down
Loading
Loading