Skip to content

Commit

Permalink
Merge branch 'SHIP-1754-Consolidate-all-FinalityDepth-settings' of gi…
Browse files Browse the repository at this point in the history
…thub.com:smartcontractkit/ccip into SHIP-1754-Consolidate-all-FinalityDepth-settings
  • Loading branch information
adityavadhavkar1215 committed Jul 8, 2024
2 parents 03c1f14 + d6a1873 commit f5998dd
Show file tree
Hide file tree
Showing 209 changed files with 16,119 additions and 13,894 deletions.
5 changes: 5 additions & 0 deletions .changeset/lucky-bears-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ccip": patch
---

NewCommitServices + NewExecServices use a provider
5 changes: 5 additions & 0 deletions .changeset/nervous-humans-march.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ccip": patch
---

Added tests and cleanup of liquidity graph #changed
4 changes: 2 additions & 2 deletions .github/workflows/build-publish-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
ecr-image-name: ccip-develop
ecr-tag-suffix: ${{ matrix.image.tag-suffix }}
dockerfile: ${{ matrix.image.dockerfile }}
dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }}
git-commit-sha: ${{ steps.git-ref.outputs.checked-out || github.sha }}

- name: Collect Metrics
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-publish-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
sign-images: false
ecr-hostname: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
ecr-image-name: ${{ env.ECR_IMAGE_NAME }}
dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }}

- name: Collect Metrics
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ jobs:
cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }}
cosign-public-key: ${{ secrets.COSIGN_PUBLIC_KEY }}
cosign-password: ${{ secrets.COSIGN_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }}
verify-signature: true
- name: Collect Metrics
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
if: ${{ steps.change.outputs.changelog-only == 'false' }}
uses: ./.github/actions/build-sign-publish-chainlink
with:
dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }}
publish: false
sign-images: false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CCIP On-Demand Live Testnet Tests
name: CCIP On-Demand Live Network Tests
on:
schedule:
- cron: '0 */6 * * *'
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/ccip-ocr3-build-lint-test.yml

This file was deleted.

33 changes: 23 additions & 10 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,13 @@ jobs:
fail-fast: false
matrix:
product:
- name: ccip-lm-smoke
nodes: 1
os: ubuntu-latest
file: lm
dir: ccip-tests/smoke
run: -run ^TestLmBasic$
# LM Smoke Test is disabled since project is paused
# - name: ccip-lm-smoke
# nodes: 1
# os: ubuntu-latest
# file: lm
# dir: ccip-tests/smoke
# run: -run ^TestLmBasic$
- name: ccip-smoke
nodes: 1
os: ubuntu-latest
Expand Down Expand Up @@ -342,6 +343,12 @@ jobs:
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPRateLimit$
- name: ccip-smoke-rate-limit
nodes: 1
dir: ccip-tests/smoke
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPTokenPoolRateLimits$
- name: ccip-smoke-multicall
nodes: 1
dir: ccip-tests/smoke
Expand All @@ -354,18 +361,24 @@ jobs:
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPManuallyExecuteAfterExecutionFailingDueToInsufficientGas$
- name: ccip-smoke-self-serve-offramp-arl
- name: ccip-smoke-on-ramp-limits
nodes: 1
dir: ccip-tests/smoke
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPOnRampLimits$
- name: ccip-smoke-off-ramp-capacity
nodes: 1
dir: ccip-tests/smoke
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPSelfServeRateLimitOffRamp$
- name: ccip-smoke-self-serve-onramp-arl
run: -run ^TestSmokeCCIPOffRampCapacityLimit$
- name: ccip-smoke-off-ramp-agg-rate-limit
nodes: 1
dir: ccip-tests/smoke
os: ubuntu-latest
file: ccip
run: -run ^TestSmokeCCIPSelfServeRateLimitOnRamp$
run: -run ^TestSmokeCCIPOffRampAggRateLimit$
- name: runlog
id: runlog
nodes: 2
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/live-vrf-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ env:
TEST_LOG_LEVEL: debug

jobs:

# Build Test Dependencies
# Build Test Dependencies

build-chainlink:
environment: integration
Expand Down Expand Up @@ -107,7 +106,6 @@ jobs:
cache_restore_only: "true"
binary_name: tests


# End Build Test Dependencies

live-smoke-tests:
Expand All @@ -120,7 +118,7 @@ jobs:
needs: [build-chainlink, build-tests]
strategy:
fail-fast: false
matrix:
matrix:
network: ${{fromJson(needs.build-tests.outputs.matrix)}}
name: Smoke Tests on ${{ matrix.network }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -177,8 +175,8 @@ jobs:
cl_repo: ${{ env.CHAINLINK_IMAGE }}
cl_image_tag: ${{ github.sha }}
aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }}
dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }}
artifacts_location: ./logs
token: ${{ secrets.GITHUB_TOKEN }}
cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
Expand All @@ -190,4 +188,4 @@ jobs:
if: always()
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
with:
test_directory: "./"
test_directory: "./"
4 changes: 2 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ flake.lock @smartcontractkit/prodsec-public
/core/services/relay/evm/liquidity_manager.go @smartcontractkit/liquidity-manager
/contracts/**/liquiditymanager/ @smartcontractkit/liquidity-manager

# CCIP ARM
# CCIP RMN
/contracts/src/v0.8/ccip/RMN.sol @smartcontractkit/rmn
/contracts/src/v0.8/ccip/ARMProxy.sol @smartcontractkit/rmn
/contracts/src/v0.8/ccip/interfaces/IARM.sol @smartcontractkit/rmn
/contracts/src/v0.8/ccip/interfaces/IRMN.sol @smartcontractkit/rmn
/contracts/src/v0.8/ccip/test/arm @smartcontractkit/rmn
Loading

0 comments on commit f5998dd

Please sign in to comment.