Skip to content

Commit 23cf2c2

Browse files
yacovmyacovm
authored
Merge branch 'master' into pingpong
2 parents da53bea + 55b655b commit 23cf2c2

File tree

14 files changed

+820
-89
lines changed

14 files changed

+820
-89
lines changed

‎.golangci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,23 @@ linters:
3333
default: none
3434
enable:
3535
- asciicheck
36+
- bidichk
3637
- bodyclose
3738
- copyloopvar
3839
- depguard
40+
- durationcheck
3941
- errcheck
4042
- errorlint
4143
- forbidigo
4244
- goconst
45+
- gocheckcompilerdirectives
4346
- gocritic
4447
- goprintffuncname
4548
- gosec
4649
- govet
4750
- importas
4851
- ineffassign
52+
- mirror
4953
- misspell
5054
- nakedret
5155
- nilerr
@@ -54,6 +58,7 @@ linters:
5458
- perfsprint
5559
- prealloc
5660
- predeclared
61+
- reassign
5762
- revive
5863
- spancheck
5964
- staticcheck

‎Taskfile.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ tasks:
208208
LABELS: '{{.LABELS | default ""}}'
209209
BENCHMARK_OUTPUT_FILE: '{{.BENCHMARK_OUTPUT_FILE | default ""}}'
210210
METRICS_SERVER_ENABLED: '{{.METRICS_SERVER_ENABLED | default "false"}}'
211+
METRICS_SERVER_PORT: '{{.METRICS_SERVER_PORT}}'
211212
METRICS_COLLECTOR_ENABLED: '{{.METRICS_COLLECTOR_ENABLED | default "false"}}'
212213
cmd: |
213214
CURRENT_STATE_DIR={{.CURRENT_STATE_DIR}} \
@@ -219,6 +220,7 @@ tasks:
219220
LABELS={{.LABELS}} \
220221
BENCHMARK_OUTPUT_FILE={{.BENCHMARK_OUTPUT_FILE}} \
221222
METRICS_SERVER_ENABLED={{.METRICS_SERVER_ENABLED}} \
223+
METRICS_SERVER_PORT={{.METRICS_SERVER_PORT}} \
222224
METRICS_COLLECTOR_ENABLED={{.METRICS_COLLECTOR_ENABLED}} \
223225
bash -x ./scripts/benchmark_cchain_range.sh
224226
@@ -235,6 +237,7 @@ tasks:
235237
LABELS: '{{.LABELS | default ""}}'
236238
BENCHMARK_OUTPUT_FILE: '{{.BENCHMARK_OUTPUT_FILE | default ""}}'
237239
METRICS_SERVER_ENABLED: '{{.METRICS_SERVER_ENABLED | default "false"}}'
240+
METRICS_SERVER_PORT: '{{.METRICS_SERVER_PORT}}'
238241
METRICS_COLLECTOR_ENABLED: '{{.METRICS_COLLECTOR_ENABLED | default "false"}}'
239242
cmds:
240243
- task: import-cchain-reexecute-range
@@ -253,6 +256,7 @@ tasks:
253256
LABELS: '{{.LABELS}}'
254257
BENCHMARK_OUTPUT_FILE: '{{.BENCHMARK_OUTPUT_FILE}}'
255258
METRICS_SERVER_ENABLED: '{{.METRICS_SERVER_ENABLED}}'
259+
METRICS_SERVER_PORT: '{{.METRICS_SERVER_PORT}}'
256260
METRICS_COLLECTOR_ENABLED: '{{.METRICS_COLLECTOR_ENABLED}}'
257261

258262
test-bootstrap-monitor-e2e:

‎api/info/service.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ type PeersReply struct {
254254
Peers []Peer `json:"peers"`
255255
}
256256

257-
// Peers returns the list of current validators
257+
// Peers returns the current peers this node is connected to. If nodeIDs are
258+
// provided, the response is filtered to just include peers that match those
259+
// IDs.
258260
func (i *Info) Peers(_ *http.Request, args *PeersArgs, reply *PeersReply) error {
259261
i.log.Debug("API called",
260262
zap.String("service", "info"),

‎config/config.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ You can configure your node to continuously run memory/CPU profiles and save the
217217
| Flag | Env Var | Type | Default | Description |
218218
|--------|--------|------|----|--------------------|
219219
| `--profile-continuous-enabled` | `AVAGO_PROFILE_CONTINUOUS_ENABLED` | boolean | `false` | Whether the app should continuously produce performance profiles. |
220-
| `--profile-dir` | `AVAGO_PROFILE_DIR` | string | `$HOME/.avalanchego/profiles/` | If profiling enabled, node continuously runs memory/CPU profiles and puts them at this directory. |
220+
| `--profile-dir` | `AVAGO_PROFILE_DIR` | string | `$HOME/.avalanchego/profiles/` | If profiling is enabled, node continuously runs memory/CPU profiles and puts them at this directory. |
221221
| `--profile-continuous-freq` | `AVAGO_PROFILE_CONTINUOUS_FREQ` | duration | `15m` | How often a new CPU/memory profile is created. |
222-
| `--profile-continuous-max-files` | `AVAGO_PROFILE_CONTINUOUS_MAX_FILES` | int | `5` | Maximum number of CPU/memory profiles files to keep. |
222+
| `--profile-continuous-max-files` | `AVAGO_PROFILE_CONTINUOUS_MAX_FILES` | int | `5` | Maximum number of CPU/memory profile files to keep. |
223223

224224
### Network
225225

@@ -551,4 +551,4 @@ Nodes gossip peers to each other so that each node can have an up-to-date peer l
551551
- [Example configurations](https://github.com/ava-labs/avalanchego/tree/master/config)
552552
- [Network upgrade schedules](https://build.avax.network/docs/quick-start/primary-network)
553553

554-
</div>
554+
</div>

‎go.mod‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ require (
2121
github.com/DataDog/zstd v1.5.2
2222
github.com/StephenButtolph/canoto v0.17.2
2323
github.com/antithesishq/antithesis-sdk-go v0.3.8
24-
github.com/ava-labs/coreth v0.15.4-rc.4
24+
github.com/ava-labs/coreth v0.15.5-0.20251022172030-6c57d8ace537
2525
github.com/ava-labs/ledger-avalanche-go v1.1.0
26-
github.com/ava-labs/libevm v1.13.15-0.20251002164226-35926db4d661
26+
github.com/ava-labs/libevm v1.13.15-0.20251016142715-1bccf4f2ddb2
27+
github.com/ava-labs/subnet-evm v0.8.0-fuji-rc.0.0.20251028200304-b91527f73c61
2728
github.com/btcsuite/btcd/btcutil v1.1.3
2829
github.com/cespare/xxhash/v2 v2.3.0
2930
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593
@@ -39,7 +40,7 @@ require (
3940
github.com/huin/goupnp v1.3.0
4041
github.com/jackpal/gateway v1.0.6
4142
github.com/jackpal/go-nat-pmp v1.0.2
42-
github.com/leanovate/gopter v0.2.9
43+
github.com/leanovate/gopter v0.2.11
4344
github.com/mitchellh/mapstructure v1.5.0
4445
github.com/mr-tron/base58 v1.2.0
4546
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d
@@ -68,14 +69,14 @@ require (
6869
go.uber.org/goleak v1.3.0
6970
go.uber.org/mock v0.5.0
7071
go.uber.org/zap v1.27.0
71-
golang.org/x/crypto v0.42.0
72+
golang.org/x/crypto v0.43.0
7273
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
73-
golang.org/x/mod v0.28.0
74-
golang.org/x/net v0.44.0
74+
golang.org/x/mod v0.29.0
75+
golang.org/x/net v0.46.0
7576
golang.org/x/sync v0.17.0
76-
golang.org/x/term v0.35.0
77+
golang.org/x/term v0.36.0
7778
golang.org/x/time v0.12.0
78-
golang.org/x/tools v0.37.0
79+
golang.org/x/tools v0.38.0
7980
gonum.org/v1/gonum v0.16.0
8081
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c
8182
google.golang.org/grpc v1.75.0
@@ -93,22 +94,21 @@ require (
9394
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
9495
github.com/Microsoft/go-winio v0.6.1 // indirect
9596
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
96-
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.12 // indirect
97+
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.13 // indirect
9798
github.com/ava-labs/simplex v0.0.0-20250919142550-9cdfff10fd19
9899
github.com/beorn7/perks v1.0.1 // indirect
99-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
100+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
100101
github.com/btcsuite/btcd/btcec/v2 v2.3.5 // indirect
101102
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
102103
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
103104
github.com/cockroachdb/errors v1.9.1 // indirect
104105
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
105106
github.com/cockroachdb/redact v1.1.3 // indirect
106107
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
107-
github.com/consensys/bavard v0.1.13 // indirect
108-
github.com/consensys/gnark-crypto v0.12.1 // indirect
108+
github.com/consensys/gnark-crypto v0.18.1 // indirect
109109
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
110110
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
111-
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
111+
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
112112
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
113113
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
114114
github.com/distribution/reference v0.5.0 // indirect
@@ -159,7 +159,6 @@ require (
159159
github.com/mattn/go-runewidth v0.0.13 // indirect
160160
github.com/mattn/go-shellwords v1.0.12 // indirect
161161
github.com/mitchellh/pointerstructure v1.2.0 // indirect
162-
github.com/mmcloughlin/addchain v0.4.0 // indirect
163162
github.com/moby/spdystream v0.2.0 // indirect
164163
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
165164
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -195,14 +194,13 @@ require (
195194
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
196195
go.uber.org/multierr v1.11.0 // indirect
197196
golang.org/x/oauth2 v0.30.0 // indirect
198-
golang.org/x/sys v0.36.0 // indirect
199-
golang.org/x/text v0.29.0 // indirect
197+
golang.org/x/sys v0.37.0 // indirect
198+
golang.org/x/text v0.30.0 // indirect
200199
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
201200
gopkg.in/inf.v0 v0.9.1 // indirect
202201
gopkg.in/yaml.v2 v2.4.0 // indirect
203202
k8s.io/klog/v2 v2.110.1 // indirect
204203
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
205-
rsc.io/tmplfunc v0.0.3 // indirect
206204
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
207205
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
208206
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)