CCIP-4420 Merging back CCIP codebase #15890

mateusz-sekara · 2025-01-10T11:44:34Z

This PR focuses on moving back the business logic of ccip. IntegrationTests and Scripts will be backported in the followup - I don't want to introduce too many changes at once and rather optimize for reviewable PRs which don't wait for too long to be merged.

Merging the following directories:

core/services/ocr2/plugins/ccip
core/services/relay/evm
core/chains/evm

Using state from the ccip repo at smartcontractkit/ccip@ecc1fb0

Merge was done using the following command

git remote add  upstream ****@github.com:smartcontractkit/ccip.git
git fetch --prune upstream
git merge upstream/ccip-develop

* add case for gnosis * add changeset * fix typo * typo --------- Co-authored-by: Prashant Yadav <34992934+prashantkumar1982@users.noreply.github.com>

* add error handling for service unavailable for arbitrum * add changeset * update error message --------- Co-authored-by: Prashant Yadav <34992934+prashantkumar1982@users.noreply.github.com>

## Motivation ## Solution

…1311)

## Motivation getPreviousPool was missing ## Solution Add getPreviousPool

- NOTE ~5k is generated protobuf code to unblock. That will be imported once exposed. - We put the deployment/configuration logic in integration-tests module for a few reasons: - Keeps the chain dependencies out of the core module, in particular helpful for eventual cross family tests - It can become the canonical deployment logic to be used for CRIB envs as well (eventually can replace the actions + contracts dirs) - To accomplish the lightweight tests (chainlink.Application + simulated.Backend) we expose some test utilities in util/testutils/ - integration-tests/deployment holds product agnostic deployment utilities including a general purpose environment structure to write environment abstracted code against and migration output components (address books, proposals etc) - integration-tests/deployment/ccip holds all product specific deployment code including - Top level migrations and migration tests where a "migration" is defined to be a function which operates against an environment and outputs a MigrationOutput structure with one or more artifacts (MCMS proposals, job specs). Notably migration tests can apply those outputs to an ephemeral environment to ensure correctness. These migrations are intended for export and use against real environments (testnet/mainnet). - Re-usable product specific components of top level migrations and associated tests Next steps / follow up PRs: - Port testutils export to chainlink repo - Example solana setup - Once cross family validated, start deeper testing and real CCIP use cases --------- Co-authored-by: Adam Hamrick <adam.hamrick@smartcontract.com> Co-authored-by: AnieeG <anindita.ghosh@smartcontract.com>

## Motivation Needed a script to update compiled json artifacts in G++ ## Solution Added few more options in solc compile Generated a shell script and make command to update artifacts in G++ path for specific contracts

## Motivation CCIP Config can go to larger size and any query from offchain components via rpc call can cause timeout issues ## Solution add pagination to `getAllCCIPConfig` function which takes - pageSize - startIndex --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Makram Kamaleddine <makramkd@users.noreply.github.com>

#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: smartcontractkit/ccip#1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>

## Motivation Use the commit plugin state machine implementation. ## Solution Use the commit plugin state machine implementation.

Signed-off-by: chainchad <96362174+chainchad@users.noreply.github.com>

## Motivation ## Solution

Cleanup & more realistic values for gas overheads

* No new finalized Heads Implementation * fixed tests * update defaults for NoNewFinalizedHeadsThreshold * Update common/client/node_lifecycle.go Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com> * Update common/client/node_lifecycle_test.go Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com> * Update common/client/node_lifecycle_test.go Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com> * rename HeadIsNotIncreasing to NoNewHead * move and add docs for syncIssue consts * rename syncIssue to syncStatus --------- Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com>

* allow to configure RPCTimeouts * Custom (30s) timeout for Hedera RPC requests with large payloads (SendTransaction, CallContext, etc.) * fix linter

* Added post-broadcast nonce validation for Hedera * Added changeset * Updated chaintype docs for Hedera * Fixed lint errors * Added condition to handle on-chain seq less than tx seq and updated comment

* Custom Astar finality * fix merge artifact * fix lint issue * simplify isRequestingFinalizedBlock * avoid iterating through the whole batch again * fix errors wrapping

Cherry pick of #14132 Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com>

…or-gnosis-and-arbitrum

## Motivation Cherry-pick of #14021 cherry-pick of #13957 cherry-pick of #13876 cherry-pick of #13907

…or-gnosis-and-arbitrum

Cherry-Pick: classify arbitrum sequencer inaccessible error as retryable (#14100) Cherry-Pick: fix unhandled already seen tx error for gnosis chiado (#14099) Requires: “alreadyknown” is properly classified Errors are classified to be Retryable

## Motivation Want to be maximally defensive for the address book to prevent corruption. ## Solution - Type contract and version - Let products compose type and version at deploy/state gen time to avoid a combinatorial number of strings

@dimkouv

## Motivation There were many transactions which needed to be executed. ## Solution Finish the work that @dimkouv started in #631 --------- Co-authored-by: Abdelrahman Soliman (Boda) <2677789+asoliman92@users.noreply.github.com>

core/chains/evm/gas/models.go

core/chains/evm/gas/rollups/l1_oracle.go

mateusz-sekara · 2025-01-10T14:54:27Z

core/services/ocr2/plugins/ccip/estimatorconfig/interceptors/mantle/interceptor.go

+// getMantleTokenRatio Requests and returns a token ratio value for the Mantle chain.
+func (i *Interceptor) getMantleTokenRatio(ctx context.Context) (*big.Int, error) {
+	// FIXME it's removed from chainlink repo
+	// precompile := common.HexToAddress(rollups.OPGasOracleAddress)


@matYang @amit-momin hey folks, you are the ones who might have a context on that, could you please help resolve that conflict? It seems that the code in the chainlink repository is completely different from what we have in ccip

This I don't have much context on so I'll defer to Matt on this. Although, I might be missing something but I don't think I see the estimatorconfig directory in the chainlink repo

given it is Mantle specific, let's use a constant address here 0x420000000000000000000000000000000000000F for simplicity

cl-sonarqube-production · 2025-01-10T16:41:41Z

Quality Gate failed

Failed conditions
24.8% Duplication on New Code (required ≤ 10%)

See analysis details on SonarQube

huangzhen1997 and others added 30 commits August 15, 2024 13:45

fix unhandled already seen tx error for gnosis chiado (#14099)

5129735

* add case for gnosis * add changeset * fix typo * typo --------- Co-authored-by: Prashant Yadav <34992934+prashantkumar1982@users.noreply.github.com>

classify arbitrum sequencer inaccessible error as retryable (#14100)

e5ea998

* add error handling for service unavailable for arbitrum * add changeset * update error message --------- Co-authored-by: Prashant Yadav <34992934+prashantkumar1982@users.noreply.github.com>

fix hh compile and bump publish-prod version (#1299)

48e4152

## Motivation ## Solution

Reducing baseline test requirements until all perf items are solved (#…

d003a22

…1311)

add getPreviousPool (#1312)

7985d31

## Motivation getPreviousPool was missing ## Solution Add getPreviousPool

create a script to generate artifacts for G++ (#1315)

5cf71a9

## Motivation Needed a script to update compiled json artifacts in G++ ## Solution Added few more options in solc compile Generated a shell script and make command to update artifacts in G++ path for specific contracts

bump ccip version in license (#1309)

5f52675

core/capabilities/ccip: use commit plugin w/ state machine (#1321)

cc8d128

## Motivation Use the commit plugin state machine implementation. ## Solution Use the commit plugin state machine implementation.

Finalize date on changelog for 2.15.0 (#14144)

883c9f9

Signed-off-by: chainchad <96362174+chainchad@users.noreply.github.com>

Fix import paths (#1316)

f1f63fd

## Motivation ## Solution

set more correct gas overheads (#1319)

11c2759

Cleanup & more realistic values for gas overheads

BCI-3842 custom timeouts for Hedera (#13876)

d496c99

* allow to configure RPCTimeouts * Custom (30s) timeout for Hedera RPC requests with large payloads (SendTransaction, CallContext, etc.) * fix linter

Add nonce validation after broadcast for Hedera (#13957)

64a2343

* Added post-broadcast nonce validation for Hedera * Added changeset * Updated chaintype docs for Hedera * Fixed lint errors * Added condition to handle on-chain seq less than tx seq and updated comment

Custom Astar finality (#14021)

611a928

* Custom Astar finality * fix merge artifact * fix lint issue * simplify isRequestingFinalizedBlock * avoid iterating through the whole batch again * fix errors wrapping

Docs update

655289d

Cherry-Pick: Update ZK overflow detection logic (#14132) (#1317)

12d4cd9

Cherry pick of #14132 Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com>

Updating LogPollInterval according to the block_time (#1320)

d2f26ae

fix stale comment (#1327)

4e52098

Merge branch 'ccip-develop' into cherry-pick-handle-errors-handling-f…

fcce450

…or-gnosis-and-arbitrum

Merge branch 'ccip-develop' into Astar_hedera_cherrypick

f5fca9d

Astar & Hedera changes cherry-picked (#1324)

a1ade94

## Motivation Cherry-pick of #14021 cherry-pick of #13957 cherry-pick of #13876 cherry-pick of #13907

Merge branch 'ccip-develop' into cherry-pick-handle-errors-handling-f…

66405be

…or-gnosis-and-arbitrum

Stronger address book typing (#1326)

0227b9f

## Motivation Want to be maximally defensive for the address book to prevent corruption. ## Solution - Type contract and version - Let products compose type and version at deploy/state gen time to avoid a combinatorial number of strings

Rename ramps and rmn (#1323)

377f0db

mateusz-sekara commented Jan 10, 2025

View reviewed changes

core/chains/evm/gas/models.go Outdated Show resolved Hide resolved

mateusz-sekara commented Jan 10, 2025

View reviewed changes

core/chains/evm/gas/rollups/l1_oracle.go Outdated Show resolved Hide resolved

mateusz-sekara commented Jan 10, 2025

View reviewed changes

mateusz-sekara force-pushed the ccip-merge branch 6 times, most recently from 4c75674 to 143d5cd Compare January 10, 2025 16:16

Post merge fixes

4077590

mateusz-sekara force-pushed the ccip-merge branch from 143d5cd to 4077590 Compare January 10, 2025 16:28

mateusz-sekara marked this pull request as ready for review January 10, 2025 16:28

mateusz-sekara requested review from a team as code owners January 10, 2025 16:28

mateusz-sekara requested a review from Atrax1 January 10, 2025 16:28

mateusz-sekara requested a review from amit-momin January 10, 2025 16:44

amit-momin approved these changes Jan 10, 2025

View reviewed changes

AnieeG approved these changes Jan 10, 2025

View reviewed changes

RensR approved these changes Jan 10, 2025

View reviewed changes

mateusz-sekara changed the base branch from develop to ccip-merge-branch January 10, 2025 18:46

mateusz-sekara merged commit 79d0e20 into ccip-merge-branch Jan 10, 2025
186 of 188 checks passed

mateusz-sekara deleted the ccip-merge branch January 10, 2025 18:47

mateusz-sekara mentioned this pull request Jan 10, 2025

CCIP-4420 Merging back CCIP codebase (#15890) #15894

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jan 10, 2025

CCIP-4420 Merging back CCIP codebase (#15890) (#15894)

5156cfe

This was referenced Jan 13, 2025

CCIP-4420 Mantle gas interceptor #15900

Merged

CCIP-4420 Merging integration tests and scripts #15902

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CCIP-4420 Merging back CCIP codebase #15890

CCIP-4420 Merging back CCIP codebase #15890

mateusz-sekara commented Jan 10, 2025 •

edited

Loading

mateusz-sekara Jan 10, 2025

amit-momin Jan 10, 2025

matYang Jan 12, 2025

cl-sonarqube-production bot commented Jan 10, 2025

CCIP-4420 Merging back CCIP codebase #15890

CCIP-4420 Merging back CCIP codebase #15890

Conversation

mateusz-sekara commented Jan 10, 2025 • edited Loading

mateusz-sekara Jan 10, 2025

Choose a reason for hiding this comment

amit-momin Jan 10, 2025

Choose a reason for hiding this comment

matYang Jan 12, 2025

Choose a reason for hiding this comment

cl-sonarqube-production bot commented Jan 10, 2025

Quality Gate failed

mateusz-sekara commented Jan 10, 2025 •

edited

Loading