Merge branch 'ccip-develop' into feature/lbtc-init

smartcontractkit · Nov 29, 2024 · 174f1af · 174f1af
2 parents 79b9108 + bca2fe0
commit 174f1af
Show file tree

Hide file tree

Showing 237 changed files with 9,798 additions and 5,910 deletions.
diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
@@ -146,8 +146,6 @@ jobs:
       contents: read
     env:
       CHAINLINK_ENV_USER: ${{ github.actor }}
-      SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
-      SLACK_CHANNEL: ${{ secrets.QA_SLACK_CHANNEL }}
       TEST_LOG_LEVEL: info
       REF_NAME: ${{ github.head_ref || github.ref_name }}
       CHAINLINK_TEST_VERSION: ${{ github.sha }}
@@ -248,8 +246,6 @@ jobs:
       contents: read
     env:
       CHAINLINK_ENV_USER: ${{ github.actor }}
-      SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
-      SLACK_CHANNEL: ${{ secrets.QA_SLACK_CHANNEL }}
       TEST_LOG_LEVEL: info
       REF_NAME: ${{ github.head_ref || github.ref_name }}
     strategy:
@@ -417,7 +413,7 @@ jobs:
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         id: slack
         with:
-          channel-id: "#test-run-notifications"
+          channel-id: "#ccip-testing"
           payload: |
             {
               "attachments": [

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
@@ -32,7 +32,7 @@ jobs:
             { "name": "functions", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "keystone", "setup": { "run-coverage": true, "min-coverage": 72.8, "run-gas-snapshot": false, "run-forge-fmt": false }},
             { "name": "l2ep", "setup": { "run-coverage": true, "min-coverage": 61.0, "run-gas-snapshot": true, "run-forge-fmt": false }},
-            { "name": "liquiditymanager", "setup": { "run-coverage": true, "min-coverage": 46.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
+            { "name": "liquiditymanager", "setup": { "run-coverage": true, "min-coverage": 44.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "llo-feeds", "setup": { "run-coverage": true, "min-coverage": 49.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "operatorforwarder", "setup": { "run-coverage": true, "min-coverage": 55.7, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "shared", "setup": { "run-coverage": true, "extra-coverage-params": "--no-match-path='*CallWithExactGas*'", "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},

diff --git a/contracts/.changeset/metal-ducks-hunt.md b/contracts/.changeset/metal-ducks-hunt.md
@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+#feature adds OZ AccessControl support to the registry module
+
+
+PR issue: CCIP-4105
+
+Solidity Review issue: CCIP-3966
diff --git a/contracts/.changeset/wet-eyes-accept.md b/contracts/.changeset/wet-eyes-accept.md
@@ -0,0 +1,7 @@
+---
+'@chainlink/contracts': patch
+---
+
+Refactor MockCCIPRouter to support EVMExtraArgsV2
+
+PR issue : CCIP-4288
diff --git a/contracts/GNUmakefile b/contracts/GNUmakefile
@@ -43,7 +43,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-515a4cc8aba1627a717a1057ff4f09c8cd3bf51f
+	foundryup --version nightly-fb5f0e1c4d9b9b0861be3e3bd07963524c5ac08e
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry

diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -95,7 +95,7 @@ test = 'src/v0.8/transmission/test'
 optimizer_runs = 1_000_000
 src = 'src/v0.8/shared'
 test = 'src/v0.8/shared/test'
-solc_version = '0.8.19'
+solc_version = '0.8.24'
 
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
diff --git a/contracts/gas-snapshots/functions.gas-snapshot b/contracts/gas-snapshots/functions.gas-snapshot
@@ -229,13 +229,13 @@ FunctionsTermsOfServiceAllowList_UnblockSender:test_UnblockSender_RevertIfNotOwn
 FunctionsTermsOfServiceAllowList_UnblockSender:test_UnblockSender_Success() (gas: 96240)
 FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_RevertIfNotOwner() (gas: 13819)
 FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_Success() (gas: 22824)
-Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84725)
-Gas_AddConsumer:test_AddConsumer_Gas() (gas: 79140)
+Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 81752)
+Gas_AddConsumer:test_AddConsumer_Gas() (gas: 76167)
 Gas_CreateSubscription:test_CreateSubscription_Gas() (gas: 73419)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20562)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20024)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501184)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202376)
-Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38518)
-Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 984338)
-Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181561)
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 17589)
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 17051)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 498189)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 199381)
+Gas_FundSubscription:test_FundSubscription_Gas() (gas: 35545)
+Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 981365)
+Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 178588)