Skip to content

Commit 5e8ed30

Browse files
PaulSnowclaude
andcommitted
Issue #3862: Add BPT sharding configuration and downgrade Go to 1.24
- Downgrade Go version from 1.25.0 to 1.24.0 for compatibility - Add BPT sharding configuration in types.yml (enabled flag and depth) - Configure BPT sharding in docker-compose (enabled=true, depth=4) - Update Dockerfile to use golang:1.24 base image - Update .gitignore to exclude accumulated-dagbft and loadtest-12k binaries - Regenerate go.sum with updated dependencies Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent a766310 commit 5e8ed30

6 files changed

Lines changed: 127 additions & 108 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Binaries (mac, linux)
22
accumulated
3+
accumulated-dagbft
34
accumulate
45
play-accumulate
56
golangci-lint
@@ -51,6 +52,7 @@ test/cmd/testreport/testreport
5152
# Build artifacts
5253
/accumulated-testnet
5354
/load-generator
55+
/test/docker/loadtest-12k
5456

5557
# Orchestrator artifacts
5658
/reviews/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 as build
1+
FROM golang:1.24 as build
22

33
ARG GIT_DESCRIBE
44
ARG GIT_COMMIT

go.mod

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ retract (
55
v1.1.0 // Causes consensus failure when run alongside v1.0.x
66
)
77

8-
go 1.25.0
8+
go 1.24.0
9+
10+
toolchain go1.24.4
911

1012
replace github.com/julienschmidt/httprouter v1.3.0 => github.com/firelizzard18/httprouter v0.0.0-20231019203155-74063b4f447c
1113

@@ -25,19 +27,19 @@ require (
2527
github.com/prometheus/client_golang v1.19.1
2628
github.com/prometheus/common v0.53.0
2729
github.com/rinchsan/gosimports v0.1.5
28-
github.com/rs/zerolog v1.29.0
30+
github.com/rs/zerolog v1.33.0
2931
github.com/spf13/cobra v1.8.1
30-
github.com/spf13/pflag v1.0.5
31-
github.com/spf13/viper v1.15.0
32+
github.com/spf13/pflag v1.0.6
33+
github.com/spf13/viper v1.20.0
3234
github.com/stretchr/testify v1.10.0
3335
gitlab.com/ethan.reesor/vscode-notebooks/go-playbooks v0.0.0-20220417214602-1121b9fae118
3436
gitlab.com/ethan.reesor/vscode-notebooks/yaegi v0.0.0-20220417214422-5c573557938e
35-
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
37+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
3638
golang.org/x/sync v0.19.0
37-
golang.org/x/sys v0.42.0
38-
golang.org/x/term v0.40.0
39-
golang.org/x/text v0.34.0
40-
golang.org/x/tools v0.42.0
39+
golang.org/x/sys v0.39.0
40+
golang.org/x/term v0.38.0
41+
golang.org/x/text v0.32.0
42+
golang.org/x/tools v0.39.0
4143
gopkg.in/yaml.v3 v3.0.1
4244
gotest.tools/gotestsum v1.8.1
4345
)
@@ -55,7 +57,7 @@ require (
5557
github.com/gdamore/tcell/v2 v2.13.8
5658
github.com/gobeam/stringy v0.0.6
5759
github.com/golangci/plugin-module-register v0.1.1
58-
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e
60+
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5
5961
github.com/google/uuid v1.6.0
6062
github.com/ipfs/go-cid v0.4.1
6163
github.com/julienschmidt/httprouter v1.3.0
@@ -75,7 +77,7 @@ require (
7577
github.com/robfig/cron/v3 v3.0.0
7678
github.com/sergi/go-diff v1.2.0
7779
github.com/ulikunitz/xz v0.5.11
78-
github.com/vektra/mockery/v2 v2.42.3
80+
github.com/vektra/mockery/v2 v2.53.3
7981
gitlab.com/accumulatenetwork/core/schema v0.2.1-0.20241205222729-1b1e71c42b78
8082
gitlab.com/firelizzard/go-script v0.0.0-20240404234115-d5f0a716003d
8183
go.opentelemetry.io/otel v1.29.0
@@ -86,9 +88,9 @@ require (
8688
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0
8789
go.opentelemetry.io/otel/log v0.3.0
8890
go.opentelemetry.io/otel/metric v1.29.0
89-
go.opentelemetry.io/otel/sdk v1.27.0
91+
go.opentelemetry.io/otel/sdk v1.29.0
9092
go.opentelemetry.io/otel/sdk/log v0.3.0
91-
go.opentelemetry.io/otel/sdk/metric v1.27.0
93+
go.opentelemetry.io/otel/sdk/metric v1.29.0
9294
go.opentelemetry.io/otel/trace v1.29.0
9395
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
9496
)
@@ -145,7 +147,7 @@ require (
145147
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
146148
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
147149
github.com/godbus/dbus/v5 v5.1.0 // indirect
148-
github.com/golang/glog v1.2.1 // indirect
150+
github.com/golang/glog v1.2.2 // indirect
149151
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
150152
github.com/golangci/go-printf-func-name v0.1.0 // indirect
151153
github.com/google/flatbuffers v1.12.1 // indirect
@@ -157,7 +159,7 @@ require (
157159
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
158160
github.com/huandu/xstrings v1.4.0 // indirect
159161
github.com/huin/goupnp v1.3.0 // indirect
160-
github.com/iancoleman/strcase v0.2.0 // indirect
162+
github.com/iancoleman/strcase v0.3.0 // indirect
161163
github.com/ipfs/boxo v0.10.0 // indirect
162164
github.com/ipfs/go-datastore v0.6.0 // indirect
163165
github.com/ipfs/go-log v1.0.5 // indirect
@@ -166,7 +168,7 @@ require (
166168
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
167169
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
168170
github.com/jbenet/goprocess v0.1.4 // indirect
169-
github.com/jinzhu/copier v0.3.5 // indirect
171+
github.com/jinzhu/copier v0.4.0 // indirect
170172
github.com/jjti/go-spancheck v0.6.4 // indirect
171173
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
172174
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
@@ -220,10 +222,12 @@ require (
220222
github.com/raulk/go-watchdog v1.3.0 // indirect
221223
github.com/rivo/uniseg v0.4.7 // indirect
222224
github.com/rogpeppe/go-internal v1.13.1 // indirect
225+
github.com/sagikazarmark/locafero v0.7.0 // indirect
223226
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
224227
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
225228
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
226229
github.com/smartystreets/assertions v1.13.0 // indirect
230+
github.com/sourcegraph/conc v0.3.0 // indirect
227231
github.com/spaolacci/murmur3 v1.1.0 // indirect
228232
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
229233
github.com/timonwong/loggercheck v0.10.1 // indirect
@@ -240,10 +244,12 @@ require (
240244
go.uber.org/fx v1.20.1 // indirect
241245
go.uber.org/mock v0.4.0 // indirect
242246
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
243-
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
247+
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
248+
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
249+
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
244250
gonum.org/v1/gonum v0.13.0 // indirect
245-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
246-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
251+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
252+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
247253
gotest.tools/v3 v3.2.0 // indirect
248254
lukechampine.com/blake3 v1.2.1 // indirect
249255
)
@@ -280,7 +286,7 @@ require (
280286
github.com/dnephin/pflag v1.0.7 // indirect
281287
github.com/ettle/strcase v0.2.0 // indirect
282288
github.com/fatih/structtag v1.2.0 // indirect
283-
github.com/fsnotify/fsnotify v1.6.0 // indirect
289+
github.com/fsnotify/fsnotify v1.8.0 // indirect
284290
github.com/fzipp/gocyclo v0.6.0 // indirect
285291
github.com/ghodss/yaml v1.0.0
286292
github.com/go-critic/go-critic v0.11.5 // indirect
@@ -318,7 +324,6 @@ require (
318324
github.com/hashicorp/errwrap v1.1.0 // indirect
319325
github.com/hashicorp/go-multierror v1.1.1 // indirect
320326
github.com/hashicorp/go-version v1.7.0 // indirect
321-
github.com/hashicorp/hcl v1.0.0 // indirect
322327
github.com/hexops/gotextdiff v1.0.3 // indirect
323328
github.com/inconshreveable/mousetrap v1.1.0 // indirect
324329
github.com/jgautheron/goconst v1.7.1 // indirect
@@ -337,10 +342,9 @@ require (
337342
github.com/leonklingele/grouper v1.1.2 // indirect
338343
github.com/lib/pq v1.10.9 // indirect
339344
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
340-
github.com/magiconair/properties v1.8.7 // indirect
341345
github.com/maratori/testpackage v1.1.1 // indirect
342346
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
343-
github.com/mattn/go-colorable v0.1.13 // indirect
347+
github.com/mattn/go-colorable v0.1.14 // indirect
344348
github.com/mattn/go-isatty v0.0.20 // indirect
345349
github.com/mattn/go-runewidth v0.0.16 // indirect
346350
github.com/mgechev/revive v1.5.1 // indirect
@@ -354,7 +358,7 @@ require (
354358
github.com/olekukonko/tablewriter v0.0.5
355359
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
356360
github.com/pkg/errors v0.9.1 // indirect
357-
github.com/pmezard/go-difflib v1.0.0 // indirect
361+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
358362
github.com/polyfloyd/go-errorlint v1.7.0 // indirect
359363
github.com/prometheus/client_model v0.6.1
360364
github.com/prometheus/procfs v0.15.0 // indirect
@@ -375,12 +379,11 @@ require (
375379
github.com/sivchari/tenv v1.12.1 // indirect
376380
github.com/sonatard/noctx v0.1.0 // indirect
377381
github.com/sourcegraph/go-diff v0.7.0 // indirect
378-
github.com/spf13/afero v1.11.0 // indirect
379-
github.com/spf13/cast v1.5.0 // indirect
380-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
382+
github.com/spf13/afero v1.12.0 // indirect
383+
github.com/spf13/cast v1.7.1 // indirect
381384
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
382385
github.com/stretchr/objx v0.5.2 // indirect
383-
github.com/subosito/gotenv v1.4.2 // indirect
386+
github.com/subosito/gotenv v1.6.0 // indirect
384387
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
385388
github.com/tdakkota/asciicheck v0.3.0 // indirect
386389
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -398,12 +401,11 @@ require (
398401
go.etcd.io/bbolt v1.3.6
399402
go.uber.org/multierr v1.11.0 // indirect
400403
go.uber.org/zap v1.27.0 // indirect
401-
golang.org/x/crypto v0.48.0
402-
golang.org/x/mod v0.33.0 // indirect
403-
golang.org/x/net v0.50.0 // indirect
404-
google.golang.org/grpc v1.66.2 // indirect
405-
google.golang.org/protobuf v1.34.2
406-
gopkg.in/ini.v1 v1.67.0 // indirect
404+
golang.org/x/crypto v0.46.0
405+
golang.org/x/mod v0.30.0 // indirect
406+
golang.org/x/net v0.47.0 // indirect
407+
google.golang.org/grpc v1.67.3 // indirect
408+
google.golang.org/protobuf v1.36.1
407409
gopkg.in/src-d/go-git.v4 v4.13.1
408410
gopkg.in/yaml.v2 v2.4.0 // indirect
409411
honnef.co/go/tools v0.5.1 // indirect

0 commit comments

Comments
 (0)