Skip to content

Commit eae0a5a

Browse files
author
Ilan
committed
Merge branch 'main' into anvil-zksync
2 parents b5d31e3 + 2e43648 commit eae0a5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+69947
-2020
lines changed

.github/workflows/docker-test.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
types: [labeled]
77
paths-ignore:
8-
- 'tools/**'
8+
- 'tools/**'
99

1010
jobs:
1111
eth_env:
@@ -26,12 +26,11 @@ jobs:
2626
- name: Checkout the Repo
2727
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2828
- name: Install Go
29-
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@d2f9642bcc24a73400568756f24b72c188ac7a9a # v2.3.31
29+
uses: smartcontractkit/.github/actions/setup-golang@01d931b0455a754d12e7143cc54a5a3521a8f6f6 #v 0.3.1
3030
with:
31-
test_download_vendor_packages_command: cd lib && go mod download
32-
go_mod_path: ./lib/go.mod
33-
cache_key_id: ctf-go
34-
cache_restore_only: 'false'
31+
# test_download_vendor_packages_command: cd lib && go mod download
32+
go-version-file: ./lib/go.mod
33+
use-go-cache: "true"
3534
- name: Install gotestloghelper
3635
working-directory: lib
3736
run: make gotestloghelper_build

.github/workflows/framework-golden-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ jobs:
8484
- name: Set up Go
8585
uses: actions/setup-go@v5
8686
with:
87-
go-version: 1.23
87+
go-version: stable
8888
- name: Cache Go modules
89-
uses: actions/cache@v3
89+
uses: actions/cache@v4
9090
with:
9191
path: |
9292
~/.cache/go-build

.github/workflows/framework.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Go
3939
uses: actions/setup-go@v5
4040
with:
41-
go-version: 1.23
41+
go-version: stable
4242
- name: Cache Go modules
4343
uses: actions/cache@v4
4444
with:

.github/workflows/lint.yaml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
name: Clean go mods
2727
runs-on: ubuntu-latest
2828
steps:
29-
- name: Set up Go 1.23.3
29+
- name: Set up Go
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: '1.23.3'
32+
go-version: stable
3333
- name: Install gomods
3434
run: go install github.com/jmank88/[email protected]
3535
- name: Check out code
@@ -82,14 +82,13 @@ jobs:
8282
- name: Check out Code
8383
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
8484
- name: Install Go
85-
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@d2f9642bcc24a73400568756f24b72c188ac7a9a # v2.3.31
85+
uses: smartcontractkit/.github/actions/setup-golang@3835daadbcefcae06d12dc42a405a856c980d2cc
8686
with:
87-
test_download_vendor_packages_command: cd ${{ matrix.project.path }} && go mod download
88-
go_mod_path: ${{ matrix.project.path }}go.mod
89-
cache_key_id: ctf-go-${{ matrix.project.name }}
90-
cache_restore_only: 'false'
87+
go-version-file: ${{ matrix.project.path }}go.mod
88+
use-go-cache: true
89+
go-cache-dep-path: ${{ matrix.project.path }}go.sum
9190
- name: golangci-lint ${{ needs.tools.outputs.golangci-lint-version }}
92-
uses: golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc # v5.1.0
91+
uses: golangci/golangci-lint-action@818ec4d51a1feacefc42ff1b3ec25d4962690f39 # v6.4.1
9392
with:
9493
version: v${{ needs.tools.outputs.golangci-lint-version }}
9594
args: --out-format checkstyle:golangci-lint-report.xml
@@ -113,12 +112,11 @@ jobs:
113112
- name: Check out Code
114113
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
115114
- name: Install Go
116-
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@d2f9642bcc24a73400568756f24b72c188ac7a9a # v2.3.31
115+
uses: smartcontractkit/.github/actions/setup-golang@3835daadbcefcae06d12dc42a405a856c980d2cc
117116
with:
118-
test_download_vendor_packages_command: cd lib && go mod download
119-
go_mod_path: ./lib/go.mod
120-
cache_key_id: ctf-go
121-
cache_restore_only: 'false'
117+
go-version-file: ./lib/go.mod
118+
use-go-cache: true
119+
go-cache-dep-path: ./lib/go.sum
122120
- name: Write Go List
123121
working-directory: lib
124122
run: go list -json -deps ./... > ../go.list

.github/workflows/parrot-release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,16 @@ jobs:
3131
mask-password: 'true'
3232
env:
3333
AWS_REGION: ${{ secrets.AWS_REGION }}
34+
- name: Login to Docker Hub
35+
uses: docker/login-action@v3
36+
with:
37+
username: kalverra
38+
password: ${{ secrets.KALVERRA_DOCKER_PASSWORD }}
3439
- name: Set up Go
3540
uses: actions/setup-go@v5
3641
with:
3742
go-version: stable
43+
cache-dependency-path: ./parrot/go.mod
3844
- name: Goreleaser Release
3945
uses: goreleaser/goreleaser-action@v6
4046
with:
@@ -45,4 +51,6 @@ jobs:
4551
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4652
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
4753
IMAGE_PREFIX: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
48-
IMAGE_TAG: ${{ github.ref_name}}
54+
IMAGE_TAG: ${{ github.ref_name }}
55+
DOCKER_USERNAME: kalverra
56+
DOCKER_PASSWORD: ${{ secrets.KALVERRA_DOCKER_PASSWORD }}

.golangci.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ linters-settings:
2727
local-prefixes: github.com/smartcontractkit/chainlink-testing-framework/lib
2828
gosec:
2929
exclude-generated: true
30-
govet:
31-
# report about shadowed variables
32-
check-shadowing: false
3330
errorlint:
3431
# Allow formatting of errors without %w
3532
errorf: false
@@ -71,12 +68,8 @@ linters-settings:
7168
- name: modifies-parameter
7269
- name: identical-branches
7370
- name: get-return
74-
# - name: flag-parameter
75-
# - name: early-return
7671
- name: defer
7772
- name: constant-logical-expr
78-
# - name: confusing-naming
79-
# - name: confusing-results
8073
- name: bool-literal-in-expr
8174
- name: atomic
8275
issues:

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
golang 1.23.3
1+
golang 1.23.4
22
nodejs 18.20.3
33
k3d 5.6.3
44
act 0.2.52
5-
golangci-lint 1.62.0
5+
golangci-lint 1.64.5
66
actionlint 1.6.26
77
shellcheck 0.9.0
88
helm 3.15.2

book/src/SUMMARY.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
- [Framework](./framework/overview.md)
55
- [Getting Started](./framework/getting_started.md)
66
- [Your First Test](./framework/first_test.md)
7-
- [Connecting Chainlink Node](./framework/connecting_chainlink_node.md)
8-
- [Connecting Chainlink Node (Multiple networks)]()
97
- [NodeSet Environment](./framework/nodeset_environment.md)
8+
- [NodeSet Environment (Import Keys)](./framework/nodeset_environment_import.md)
109
- [NodeSet with Capabilities](./framework/nodeset_capabilities.md)
1110
- [NodeSet (Local Docker builds)](./framework/nodeset_docker_rebuild.md)
1211
- [NodeSet Compat Environment](./framework/nodeset_compatibility.md)
@@ -20,6 +19,7 @@
2019
- [Test Configuration](./framework/test_configuration_overrides.md)
2120
- [Exposing Components](framework/components/state.md)
2221
- [Debugging Tests](framework/components/debug.md)
22+
- [Debugging CI Runs](framework/components/debug_ci.md)
2323
- [Debugging K8s Chaos Tests](framework/chaos/debug-k8s.md)
2424
- [Components Cleanup](framework/components/cleanup.md)
2525
- [Components Caching](framework/components/caching.md)
@@ -99,6 +99,7 @@
9999
- [Start local observability stack](./libs/wasp/how-to/start_local_observability_stack.md)
100100
- [Try it out quickly](./libs/wasp/how-to/run_included_tests.md)
101101
- [Chose between RPS and VUs](./libs/wasp/how-to/chose_rps_vu.md)
102+
- [Configure requests per minute or hour](./libs/wasp/how-to/rps_per_minute.md)
102103
- [Define NFRs and check alerts](./libs/wasp/how-to/define_nfr_check_alerts.md)
103104
- [Use labels](./libs/wasp/how-to/use_labels.md)
104105
- [Incorporate load tests in your workflow](./libs/wasp/how-to/incorporate_load_tests.md)

book/src/framework/chaos/debug-k8s.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd infra/chaosmesh-playground
88
devbox run up
99
```
1010

11-
Overview the services
11+
Check the services
1212
```
1313
devbox shell
1414
k9s

book/src/framework/components/blockchains/solana.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ arm64 f4hrenh9it/solana:latest - used locally
1616
contracts_dir = "."
1717
# optional, in case you need some custom image
1818
# image = "solanalabs/solana:v1.18.26"
19+
# you can add docker cmd params, for example to clone some contracts
20+
docker_cmd_params = ["--clone", "y9MdSjD9Beg9EFaeQGdMpESFWLNdSfZKQKeYLBfmnjJ", "-u", "https://api.mainnet-beta.solana.com"]
21+
1922

2023
# optional
2124
# To deploy a solana program, we can provide a mapping of program name to program id.

0 commit comments

Comments
 (0)