Skip to content

Commit d5cb55c

Browse files
skudasovskudasov
committed
Merge branch 'main' into anvil-miner
2 parents 4bcfe72 + 997f5b5 commit d5cb55c

File tree

18 files changed

+197
-306
lines changed

18 files changed

+197
-306
lines changed

‎.github/workflows/k8s-e2e.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: (k8s package) E2E tests
2-
on:
3-
pull_request:
2+
# disabling for now, as they always fail
3+
#on:
4+
# pull_request:
45

56
concurrency:
67
group: e2e-tests-k8s-${{ github.ref }}

‎.github/workflows/wasp-test-e2e.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: WASP E2E tests
2-
on: [push]
2+
# disabling for now, as they always fail
3+
#on:
4+
# push:
35
concurrency:
46
group: ${{ github.workflow }}-${{ github.ref }}
57
cancel-in-progress: true

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
golang 1.22.3
1+
golang 1.23.3
22
nodejs 18.20.3
33
k3d 5.6.3
44
act 0.2.52

‎havoc/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/json-iterator/go v1.1.12 // indirect
4242
github.com/mailru/easyjson v0.7.7 // indirect
4343
github.com/mattn/go-colorable v0.1.13 // indirect
44-
github.com/mattn/go-isatty v0.0.19 // indirect
44+
github.com/mattn/go-isatty v0.0.20 // indirect
4545
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4646
github.com/modern-go/reflect2 v1.0.2 // indirect
4747
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

‎havoc/go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
8484
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
8585
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
8686
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
87-
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
8887
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
88+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
89+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
8990
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
9091
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
9192
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎lib/.changeset/v1.50.17.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- New tests, bug fixes and `shuffle` option for Flakeguard
2+
- Test example of controlling block speed with `Anvil`
3+
- Updated `WASP` documentation
4+
- Changed default `Postgres` version to `12.0` (it's the lowest one supported by the Chainlink node)
5+
- Bumped `go-ethereum` to `v1.14.11`
6+
- Retracted more `lib/*` tags that were used for testing purposed (`v.1.99x`)

‎lib/go.mod‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/chaos-mesh/chaos-mesh/api v0.0.0-20240709130330-9f4feec7553f
1616
github.com/docker/docker v27.3.1+incompatible
1717
github.com/docker/go-connections v0.5.0
18-
github.com/ethereum/go-ethereum v1.13.8
18+
github.com/ethereum/go-ethereum v1.14.11
1919
github.com/go-resty/resty/v2 v2.15.3
2020
github.com/google/go-github/v41 v41.0.0
2121
github.com/google/uuid v1.6.0
@@ -51,7 +51,11 @@ require (
5151
k8s.io/kubectl v0.31.2
5252
)
5353

54-
require github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect
54+
require (
55+
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
56+
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
57+
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect
58+
)
5559

5660
require (
5761
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
@@ -65,7 +69,7 @@ require (
6569
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
6670
github.com/Microsoft/go-winio v0.6.2 // indirect
6771
github.com/OneOfOne/xxhash v1.2.8 // indirect
68-
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
72+
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
6973
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
7074
github.com/armon/go-metrics v0.4.1 // indirect
7175
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -85,9 +89,9 @@ require (
8589
github.com/aws/smithy-go v1.22.0 // indirect
8690
github.com/benbjohnson/clock v1.3.5 // indirect
8791
github.com/beorn7/perks v1.0.1 // indirect
88-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
92+
github.com/bits-and-blooms/bitset v1.13.0 // indirect
8993
github.com/blang/semver/v4 v4.0.0 // indirect
90-
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
94+
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
9195
github.com/buger/jsonparser v1.1.1 // indirect
9296
github.com/bytedance/sonic v1.9.1 // indirect
9397
github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
@@ -97,10 +101,10 @@ require (
97101
github.com/cespare/xxhash/v2 v2.3.0 // indirect
98102
github.com/chai2010/gettext-go v1.0.2 // indirect
99103
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
100-
github.com/cockroachdb/errors v1.9.1 // indirect
104+
github.com/cockroachdb/errors v1.11.3 // indirect
101105
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
102-
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
103-
github.com/cockroachdb/redact v1.1.3 // indirect
106+
github.com/cockroachdb/pebble v1.1.2 // indirect
107+
github.com/cockroachdb/redact v1.1.5 // indirect
104108
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
105109
github.com/consensys/bavard v0.1.13 // indirect
106110
github.com/consensys/gnark-crypto v0.12.1 // indirect
@@ -109,10 +113,10 @@ require (
109113
github.com/coreos/go-semver v0.3.1 // indirect
110114
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
111115
github.com/cpuguy83/dockercfg v0.3.2 // indirect
112-
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
113-
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
116+
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
117+
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
114118
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
115-
github.com/deckarep/golang-set/v2 v2.3.0 // indirect
119+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
116120
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
117121
github.com/dennwc/varint v1.0.0 // indirect
118122
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -121,7 +125,7 @@ require (
121125
github.com/dustin/go-humanize v1.0.1 // indirect
122126
github.com/edsrzf/mmap-go v1.1.0 // indirect
123127
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
124-
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
128+
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
125129
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
126130
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
127131
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
@@ -131,16 +135,15 @@ require (
131135
github.com/fsnotify/fsnotify v1.7.0 // indirect
132136
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
133137
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
134-
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
135-
github.com/getsentry/sentry-go v0.19.0 // indirect
138+
github.com/getsentry/sentry-go v0.27.0 // indirect
136139
github.com/gin-contrib/sse v0.1.0 // indirect
137140
github.com/gin-gonic/gin v1.9.1 // indirect
138141
github.com/go-errors/errors v1.4.2 // indirect
139142
github.com/go-kit/log v0.2.1 // indirect
140143
github.com/go-logfmt/logfmt v0.6.0 // indirect
141144
github.com/go-logr/logr v1.4.2 // indirect
142145
github.com/go-logr/stdr v1.2.2 // indirect
143-
github.com/go-ole/go-ole v1.2.6 // indirect
146+
github.com/go-ole/go-ole v1.3.0 // indirect
144147
github.com/go-openapi/analysis v0.21.4 // indirect
145148
github.com/go-openapi/errors v0.20.4 // indirect
146149
github.com/go-openapi/jsonpointer v0.20.0 // indirect
@@ -267,7 +270,7 @@ require (
267270
github.com/sony/gobreaker v0.5.0 // indirect
268271
github.com/spf13/cast v1.3.1 // indirect
269272
github.com/stretchr/objx v0.5.2 // indirect
270-
github.com/supranational/blst v0.3.11 // indirect
273+
github.com/supranational/blst v0.3.13 // indirect
271274
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
272275
github.com/tklauser/go-sysconf v0.3.12 // indirect
273276
github.com/tklauser/numcpus v0.6.1 // indirect

0 commit comments

Comments
 (0)