Integrate RMNRemote and OffRamp #1360

RyanRHall · 2024-08-23T20:51:00Z

Motivation

Remove the requirement for self-transmitted RMN blessings

Solution

Allow the commit DON to include RMN blessings at commitment time
This PR has a dependency on changes to chainlink-ccip

github-actions · 2024-08-23T21:01:00Z

LCOV of commit `0e7f614` during Solidity Foundry #8012

Summary coverage rate:
  lines......: 97.6% (2152 of 2204 lines)
  functions..: 94.9% (408 of 430 functions)
  branches...: 93.4% (511 of 547 branches)

Files changed coverage rate: n/a

contracts/src/v0.8/ccip/interfaces/IRMNRemote.sol

This reverts commit a4d7135.

This reverts commit 1fc4936.

…CCIP-2455-off-chain-blessing-off-ramp-contract-changes

## Motivation Bootstrap P2P IDs are no longer needed in the OCR config in CCIPConfig. See #1348's description for more details. ## Solution Remove bootstrap P2P IDs from the OCR config in CCIPConfig. ## Related PRs smartcontractkit/chainlink-ccip#89

…CCIP-2455-off-chain-blessing-off-ramp-contract-changes

makramkd · 2024-09-04T20:13:16Z

contracts/src/v0.8/ccip/offRamp/OffRamp.sol

-    uint64 sourceChainSelector; // Remote source chain selector that the Merkle Root is scoped to
-    bytes32 merkleRoot; // Merkle root of a single remote source chain
+    Internal.MerkleRoot[] merkleRoots; // Collection of merkle roots per source chain to commit
+    IRMNV2.Signature[] rmnSignatures; // RMN signatures on the merkle roots


If we want to be accurate these aren't signatures on the merkle roots exactly. They're signatures on a particular RMN report that consists of "lane updates" that match the updates in the merkleRoots array above. Maybe reference RMNRemote.verify() for folks who want to see the exact message being signed.

you're right. If I make additional changes, I'll fix the comment :)

contracts/src/v0.8/ccip/rmn/RMNRemote.sol

contracts/src/v0.8/ccip/interfaces/IRMNV2.sol

makramkd · 2024-09-04T20:28:49Z

contracts/src/v0.8/ccip/interfaces/IRMNV2.sol

+    bytes32 s;
+  }
+
+  function verify(Internal.MerkleRoot[] memory merkleRoots, Signature[] memory signatures) external view;


A basic docstring on the expected behavior of this function might be useful (e.g maybe for implementing mocks), i.e "verifies RMN signatures against provided MerkleRoot structs and reverts on invalid signatures"

cl-sonarqube-production · 2024-09-04T20:39:17Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarQube

…ip repo (#14345) * Misc golfs and fixes (#1402) Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> * Increase max signers (#1405) Improve tests and error checks --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> * rename CCIPSendRequested to CCIPMessageSent (#1409) * Skip report execution on curse (#1408) ## Motivation The goal of this PR is to remove reverts on lane cursing for DON execution transactions. If a lane is cursed, reverting will cause the whole execution transaction to fail so any execution reports for other lanes will be blocked. ## Solution For DON execution transactions the behavior is now to skip the report and emit a `SkippedReportExecution`. For manual execution we still revert, otherwise the transaction will silently fail for the users. --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> * remove bootstrapP2PIds (#1388) ## Motivation Bootstrap P2P IDs are no longer needed in the OCR config in CCIPConfig. See #1348's description for more details. ## Solution Remove bootstrap P2P IDs from the OCR config in CCIPConfig. ## Related PRs smartcontractkit/chainlink-ccip#89 * fixes * Integrate RMNRemote and OffRamp (#1360) Remove the requirement for self-transmitted RMN blessings Allow the commit DON to include RMN blessings at commitment time This PR has a dependency on changes to [chainlink-ccip](smartcontractkit/chainlink-ccip#84) --------- Co-authored-by: Makram <[email protected]> * contracts/scripts: reduce offramp optimizations (#1414) ## Motivation The offramp was failing to deploy due to too many optimizations causing a max code size exceeded error. ## Solution Reduce the number of optimizations by 1. Also, add a test that deploys v1.6 contracts and ensures that they are deployable on the simulated backend. * more fixes * remove isBlessed from contract reader cfg * deploy RMNRemote instead of MockRMN * bump chainlink-ccip * bump chainlink-ccip and add changesets --------- Co-authored-by: Rens Rooimans <[email protected]> Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Suryansh <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Ryan Hall <[email protected]>

RyanRHall temporarily deployed to sdlc August 23, 2024 20:51 — with GitHub Actions Inactive

app-token-issuer-infra-releng bot had a problem deploying to sdlc August 23, 2024 20:56 Failure

RyanRHall had a problem deploying to sdlc August 23, 2024 21:10 — with GitHub Actions Failure

RyanRHall marked this pull request as ready for review August 23, 2024 21:11

RyanRHall requested review from makramkd, elatoskinas, RayXpub and a team as code owners August 23, 2024 21:11

RyanRHall changed the title ~~Ccip 2455 off chain blessing off ramp contract changes~~ Integrate IRMNRemote and offchain blessing verification Aug 23, 2024

RayXpub reviewed Aug 24, 2024

View reviewed changes

contracts/src/v0.8/ccip/interfaces/IRMNRemote.sol Outdated Show resolved Hide resolved

RayXpub reviewed Aug 24, 2024

View reviewed changes

contracts/src/v0.8/ccip/interfaces/IRMNRemote.sol Outdated Show resolved Hide resolved

RyanRHall had a problem deploying to sdlc August 25, 2024 15:32 — with GitHub Actions Failure

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from 76d74d5 to e830e38 Compare August 26, 2024 13:16

RyanRHall had a problem deploying to sdlc August 26, 2024 13:16 — with GitHub Actions Failure

RyanRHall had a problem deploying to sdlc August 26, 2024 15:59 — with GitHub Actions Failure

RyanRHall mentioned this pull request Aug 27, 2024

Update MerkleRoot struct to flat layout, matching contract smartcontractkit/chainlink-ccip#84

Merged

RyanRHall requested a review from a team as a code owner August 27, 2024 14:40

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from ce7ec8f to 3289314 Compare August 27, 2024 15:53

RyanRHall requested a review from a team as a code owner August 27, 2024 15:53

RyanRHall temporarily deployed to sdlc August 27, 2024 15:53 — with GitHub Actions Inactive

RyanRHall temporarily deployed to sdlc August 27, 2024 16:01 — with GitHub Actions Inactive

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from e490109 to 8847c12 Compare August 27, 2024 16:18

RyanRHall temporarily deployed to sdlc August 27, 2024 16:18 — with GitHub Actions Inactive

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from 8847c12 to 5093308 Compare August 27, 2024 16:26

RyanRHall temporarily deployed to sdlc August 27, 2024 16:27 — with GitHub Actions Inactive

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from 5093308 to 3015456 Compare August 28, 2024 19:17

RyanRHall requested a review from a team as a code owner August 28, 2024 19:17

RyanRHall temporarily deployed to sdlc August 28, 2024 19:17 — with GitHub Actions Inactive

RyanRHall added 6 commits August 30, 2024 16:16

Revert "remove RMN from OnRamp"

d286c8b

This reverts commit a4d7135.

update OnRamp to use RMNRemote

8a79cbf

make PR suggested changes

207e166

Revert "upgrade solhint"

3597ed5

This reverts commit 1fc4936.

move MerkleRoot to Internal lib

60ecdc0

Merge branch 'ccip-develop' of github.com:smartcontractkit/ccip into …

24ab8e3

…CCIP-2455-off-chain-blessing-off-ramp-contract-changes

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from 60c211c to 24ab8e3 Compare September 3, 2024 19:02

RyanRHall temporarily deployed to sdlc September 3, 2024 19:02 — with GitHub Actions Inactive

app-token-issuer-infra-releng bot temporarily deployed to sdlc September 3, 2024 19:08 Inactive

forge fmt

522d0e1

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from f961f92 to bec52a5 Compare September 3, 2024 20:30

RyanRHall temporarily deployed to sdlc September 3, 2024 20:31 — with GitHub Actions Inactive

Merge branch 'ccip-develop' of github.com:smartcontractkit/ccip into …

796523a

…CCIP-2455-off-chain-blessing-off-ramp-contract-changes

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch 2 times, most recently from 441eef3 to 412e4a8 Compare September 4, 2024 17:29

RyanRHall temporarily deployed to sdlc September 4, 2024 17:29 — with GitHub Actions Inactive

makramkd and others added 2 commits September 4, 2024 15:47

remove bootstrapP2PIds (#1388)

8b2ff48

## Motivation Bootstrap P2P IDs are no longer needed in the OCR config in CCIPConfig. See #1348's description for more details. ## Solution Remove bootstrap P2P IDs from the OCR config in CCIPConfig. ## Related PRs smartcontractkit/chainlink-ccip#89

rename IRMNRemote -> IRMNV2

aaed373

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from 412e4a8 to cfd706e Compare September 4, 2024 19:49

RyanRHall added 2 commits September 4, 2024 15:50

Merge branch 'ccip-develop' of github.com:smartcontractkit/ccip into …

afec448

…CCIP-2455-off-chain-blessing-off-ramp-contract-changes

update wrappers & snapshot

0e7f614

RyanRHall force-pushed the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch from cfd706e to 0e7f614 Compare September 4, 2024 20:05

RyanRHall temporarily deployed to sdlc September 4, 2024 20:05 — with GitHub Actions Inactive

RyanRHall enabled auto-merge (squash) September 4, 2024 20:05

makramkd reviewed Sep 4, 2024

View reviewed changes

makramkd approved these changes Sep 4, 2024

View reviewed changes

RyanRHall merged commit d2c51be into ccip-develop Sep 4, 2024
127 checks passed

RyanRHall deleted the CCIP-2455-off-chain-blessing-off-ramp-contract-changes branch September 4, 2024 20:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate RMNRemote and OffRamp #1360

Integrate RMNRemote and OffRamp #1360

RyanRHall commented Aug 23, 2024 •

edited

Loading

github-actions bot commented Aug 23, 2024 •

edited

Loading

makramkd Sep 4, 2024

RyanRHall Sep 4, 2024

makramkd Sep 4, 2024

cl-sonarqube-production bot commented Sep 4, 2024

Integrate RMNRemote and OffRamp #1360

Integrate RMNRemote and OffRamp #1360

Conversation

RyanRHall commented Aug 23, 2024 • edited Loading

Motivation

Solution

github-actions bot commented Aug 23, 2024 • edited Loading

LCOV of commit 0e7f614 during Solidity Foundry #8012

makramkd Sep 4, 2024

Choose a reason for hiding this comment

RyanRHall Sep 4, 2024

Choose a reason for hiding this comment

makramkd Sep 4, 2024

Choose a reason for hiding this comment

cl-sonarqube-production bot commented Sep 4, 2024

Quality Gate passed

RyanRHall commented Aug 23, 2024 •

edited

Loading

github-actions bot commented Aug 23, 2024 •

edited

Loading

LCOV of commit `0e7f614` during Solidity Foundry #8012