CCIP-3730 Misc ccip onchain changes #14845

RensR · 2024-10-18T11:46:51Z

Fixes various comments, imports and typo's.

Most impactful change is fixing the ordering of _applyFeeTokensUpdates, with removes first to be in line with the other code.

github-actions · 2024-10-18T11:49:54Z

I see you updated files related to core. Please run pnpm changeset in the root directory to add a changeset as well as in the text include at least one of the following tags:

#added For any new functionality added.
#breaking_change For any functionality that requires manual action for the node to boot.
#bugfix For bug fixes.
#changed For any change to the existing functionality.
#db_update For any feature that introduces updates to database schema.
#deprecation_notice For any upcoming deprecation functionality.
#internal For changesets that need to be excluded from the final changelog.
#nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
#removed For any functionality/config that is removed.
#updated For any functionality that is updated.
#wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

RensR · 2024-10-18T13:57:48Z

.github/workflows/solidity-foundry.yml

@@ -28,7 +28,7 @@ jobs:
          cat <<EOF > matrix.json
          [
            { "name": "automation", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }},
-            { "name": "ccip", "setup": { "run-coverage": true, "min-coverage": 97.6, "run-gas-snapshot": true, "run-forge-fmt": true }},
+            { "name": "ccip", "setup": { "run-coverage": true, "min-coverage": 98.8, "run-gas-snapshot": true, "run-forge-fmt": true }},


this is in line with current cov (98.81%)

RensR · 2024-10-18T13:58:08Z

contracts/src/v0.8/ccip/FeeQuoter.sol

 import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IFeeQuoter} from "./interfaces/IFeeQuoter.sol";
 import {IPriceRegistry} from "./interfaces/IPriceRegistry.sol";

+import {KeystoneFeedsPermissionHandler} from "../keystone/KeystoneFeedsPermissionHandler.sol";


keystone is not third party

RensR · 2024-10-18T13:58:43Z

contracts/src/v0.8/ccip/FeeQuoter.sol

-    //                                  │ Extra data availability bytes that are returned from the source pool and sent
-    uint32 destBytesOverhead; //        │ to the destination pool. Must be >= Pool.CCIP_LOCK_OR_BURN_V1_RET_BYTES
-    bool isEnabled; // ─────────────────╯ Whether this token has custom transfer fees
+    uint32 minFeeUSDCents; // ────╮ Minimum fee to charge per token transfer, multiples of 0.01 USD


there's no reason so add long ──── lines. At most 2 on the shortest leg of these comments

contracts/src/v0.8/ccip/FeeQuoter.sol

contracts/src/v0.8/ccip/onRamp/OnRamp.sol

improve tests

github-actions · 2024-10-22T11:17:17Z

AER Report: CI Core ran successfully ✅

aer_workflow , commit

github-actions · 2024-10-22T11:50:43Z

AER Report: CI Core ran successfully ✅

aer_workflow , commit

AER Report: Operator UI CI ran successfully ✅

aer_workflow , commit

RyanRHall · 2024-10-22T14:14:24Z

contracts/src/v0.8/liquiditymanager/ocr/OCR3Base.sol

@@ -232,7 +232,7 @@ abstract contract OCR3Base is OwnerIsCreator, OCR3Abstract {
    // Scoping this reduces stack pressure and gas usage
    {
      uint256 expectedDataLength = uint256(TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT) +
-        report.length + // one byte pure entry in _report


RyanRHall

LGTM 👍

…ue-get-allowlist # Conflicts: # contracts/gas-snapshots/ccip.gas-snapshot # core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt

github-actions · 2024-10-22T18:00:42Z

AER Report: CI Core ran successfully ✅

aer_workflow , commit

AER Report: Operator UI CI ran successfully ✅

aer_workflow , commit

cl-sonarqube-production · 2024-10-22T18:17:33Z

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

* improve return value get allowlist * update order of applyFeeTokensUpdates improve tests * consistent naming of allowlist * fix typo, dedup error * improve comments * fix offchain * changeset + fix lint * remove non-allowed state transition * fix naming of allowListUpdates * re run CI

* develop: rm gethwrappers from codeowners offchain (#14919) CCIP-3899 fix sender encoding (#14877) ccip: use unknown address type. (#14836) [chore] Add changeset entry for RequestRoundTracker fix (#14912) various Solidity Foundry updates (#14866) CCIP-3710 create new custom calldata L1 (DA) gas oracle (#14710) CCIP owns smoke test (#14906) core/services/ocr2/plugins/ccip/internal/ccipdata/factory: check error from TypeAndVersion (#14861) CCIP-3730 Misc ccip onchain changes (#14845) Chain fee integration tests (#14829) release/2.17.0 -> develop (#14721) Solana: re-enable disabled test with updated version (#14892)

* improve return value get allowlist * update order of applyFeeTokensUpdates improve tests * consistent naming of allowlist * fix typo, dedup error * improve comments * fix offchain * changeset + fix lint * remove non-allowed state transition * fix naming of allowListUpdates * re run CI

RensR requested review from a team, matYang, jhweintraub, 0xsuryansh, RyanRHall, RayXpub and elatoskinas as code owners October 18, 2024 11:46

RensR requested a review from jmank88 October 18, 2024 11:46

smartcontractkit deleted a comment from github-actions bot Oct 18, 2024

RensR force-pushed the improve-return-value-get-allowlist branch from 7180423 to 33a147e Compare October 18, 2024 12:17

RensR requested a review from a team as a code owner October 18, 2024 12:17

RensR commented Oct 18, 2024

View reviewed changes

contracts/src/v0.8/ccip/FeeQuoter.sol Show resolved Hide resolved

RayXpub reviewed Oct 19, 2024

View reviewed changes

contracts/src/v0.8/ccip/onRamp/OnRamp.sol Outdated Show resolved Hide resolved

RayXpub reviewed Oct 19, 2024

View reviewed changes

contracts/src/v0.8/ccip/onRamp/OnRamp.sol Outdated Show resolved Hide resolved

RayXpub previously approved these changes Oct 21, 2024

View reviewed changes

0xsuryansh previously approved these changes Oct 21, 2024

View reviewed changes

RensR added 8 commits October 21, 2024 13:49

improve return value get allowlist

5fa9022

update order of applyFeeTokensUpdates

5017fac

improve tests

consistent naming of allowlist

278bf85

fix typo, dedup error

c104345

improve comments

fc03ecf

fix offchain

51d818c

changeset + fix lint

7ec2b26

remove non-allowed state transition

e5028ae

RensR dismissed stale reviews from 0xsuryansh and patrickhuie19 via 90857db October 22, 2024 10:56

RensR changed the title ~~Misc ccip onchain changes~~ CCIP-3730 Misc ccip onchain changes Oct 22, 2024

RayXpub previously approved these changes Oct 22, 2024

View reviewed changes

re run CI

8e2f3d7

RensR dismissed RayXpub’s stale review via 8e2f3d7 October 22, 2024 11:49

RyanRHall reviewed Oct 22, 2024

View reviewed changes

RyanRHall previously approved these changes Oct 22, 2024

View reviewed changes

jhweintraub previously approved these changes Oct 22, 2024

View reviewed changes

patrickhuie19 previously approved these changes Oct 22, 2024

View reviewed changes

Merge remote-tracking branch 'origin/develop' into improve-return-val…

4b90ba2

…ue-get-allowlist # Conflicts: # contracts/gas-snapshots/ccip.gas-snapshot # core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt

RensR dismissed stale reviews from patrickhuie19, jhweintraub, and RyanRHall via 4b90ba2 October 22, 2024 17:59

patrickhuie19 approved these changes Oct 22, 2024

View reviewed changes

RyanRHall approved these changes Oct 22, 2024

View reviewed changes

matYang approved these changes Oct 22, 2024

View reviewed changes

erikburt approved these changes Oct 22, 2024

View reviewed changes

RensR added this pull request to the merge queue Oct 22, 2024

Merged via the queue into develop with commit 3f955bf Oct 22, 2024
165 of 167 checks passed

RensR deleted the improve-return-value-get-allowlist branch October 22, 2024 19:31

chainchad mentioned this pull request Nov 1, 2024

release/2.18.0 -> develop #15076

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CCIP-3730 Misc ccip onchain changes #14845

CCIP-3730 Misc ccip onchain changes #14845

RensR commented Oct 18, 2024

github-actions bot commented Oct 18, 2024 •

edited

Loading

RensR Oct 18, 2024

RensR Oct 18, 2024

RensR Oct 18, 2024

github-actions bot commented Oct 22, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024 •

edited

Loading

RyanRHall Oct 22, 2024

RyanRHall left a comment

github-actions bot commented Oct 22, 2024 •

edited

Loading

cl-sonarqube-production bot commented Oct 22, 2024

CCIP-3730 Misc ccip onchain changes #14845

CCIP-3730 Misc ccip onchain changes #14845

Conversation

RensR commented Oct 18, 2024

github-actions bot commented Oct 18, 2024 • edited Loading

RensR Oct 18, 2024

Choose a reason for hiding this comment

RensR Oct 18, 2024

Choose a reason for hiding this comment

RensR Oct 18, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 22, 2024 • edited Loading

AER Report: CI Core ran successfully ✅

github-actions bot commented Oct 22, 2024 • edited Loading

AER Report: CI Core ran successfully ✅

AER Report: Operator UI CI ran successfully ✅

RyanRHall Oct 22, 2024

Choose a reason for hiding this comment

RyanRHall left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 22, 2024 • edited Loading

AER Report: CI Core ran successfully ✅

AER Report: Operator UI CI ran successfully ✅

cl-sonarqube-production bot commented Oct 22, 2024

Quality Gate passed

github-actions bot commented Oct 18, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024 •

edited

Loading