Skip to content

Commit f619d32

Browse files
authored
feat: use akash forks of ledger repos (#2022)
Signed-off-by: Artur Troian <[email protected]> Co-authored-by: Artur Troian <[email protected]>
1 parent 3983fc3 commit f619d32

File tree

7 files changed

+139
-110
lines changed

7 files changed

+139
-110
lines changed

.github/actions/setup-ubuntu/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
- name: Install dependencies
1515
# Shell must explicitly specify the shell for each step. https://github.com/orgs/community/discussions/18597
1616
shell: bash
17-
run: sudo apt install -y make direnv unzip lz4 wget curl npm jq pv coreutils
17+
run: sudo apt install -y make direnv unzip lz4 wget curl npm jq pv coreutils libudev-dev
1818
- name: Setup npm
1919
uses: actions/setup-node@v4
2020
with:

.goreleaser-docker.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ dist: ./.cache/goreleaser/docker
44
env:
55
- GO111MODULE=on
66
- CGO_ENABLED=1
7+
before:
8+
hooks:
9+
- apt update
10+
- apt install -y pkg-config libudev-dev:amd64 libudev-dev:arm64
711
builds:
812
- id: akash-linux-amd64
913
binary: akash
@@ -23,7 +27,7 @@ builds:
2327
- "{{ .Env.BUILD_VARS }}"
2428
- "{{ .Env.STRIP_FLAGS }}"
2529
- "-linkmode={{ .Env.LINKMODE }}"
26-
- -extldflags "-lc -lrt -lpthread --static"
30+
- -extldflags "-lc -lrt -lpthread"
2731
- id: akash-linux-arm64
2832
binary: akash
2933
main: ./cmd/akash
@@ -42,7 +46,7 @@ builds:
4246
- "{{ .Env.BUILD_VARS }}"
4347
- "{{ .Env.STRIP_FLAGS }}"
4448
- "-linkmode={{ .Env.LINKMODE }}"
45-
- -extldflags "-lc -lrt -lpthread --static"
49+
- -extldflags "-lc -lrt -lpthread"
4650
dockers:
4751
- dockerfile: _build/Dockerfile.akash
4852
use: buildx

.goreleaser-test-bins.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
project_name: node
33
version: 2
44
dist: ./.cache/goreleaser/test-bins
5+
before:
6+
hooks:
7+
- apt update
8+
- apt install -y pkg-config libudev-dev:amd64 libudev-dev:arm64
59
env:
610
- GO111MODULE=on
711
- CGO_ENABLED=1
@@ -60,7 +64,7 @@ builds:
6064
- "{{ .Env.BUILD_VARS }}"
6165
- "{{ .Env.STRIP_FLAGS }}"
6266
- "-linkmode={{ .Env.LINKMODE }}"
63-
- -extldflags "-lc -lrt -lpthread --static"
67+
- -extldflags "-lc -lrt -lpthread"
6468
- id: akash-linux-arm64
6569
binary: akash
6670
main: ./cmd/akash
@@ -79,7 +83,7 @@ builds:
7983
- "{{ .Env.BUILD_VARS }}"
8084
- "{{ .Env.STRIP_FLAGS }}"
8185
- "-linkmode={{ .Env.LINKMODE }}"
82-
- -extldflags "-lc -lrt -lpthread --static"
86+
- -extldflags "-lc -lrt -lpthread"
8387
universal_binaries:
8488
- id: akash-darwin-universal
8589
ids:

.goreleaser.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ dist: ./.cache/goreleaser/main
55
env:
66
- GO111MODULE=on
77
- CGO_ENABLED=1
8+
before:
9+
hooks:
10+
- apt update
11+
- apt install -y pkg-config libudev-dev:amd64 libudev-dev:arm64
812
builds:
913
- id: akash-darwin-amd64
1014
binary: akash
@@ -60,7 +64,7 @@ builds:
6064
- "{{ .Env.BUILD_VARS }}"
6165
- "{{ .Env.STRIP_FLAGS }}"
6266
- "-linkmode={{ .Env.LINKMODE }}"
63-
- -extldflags "-lc -lrt -lpthread --static"
67+
- -extldflags "-lc -lrt -lpthread"
6468
- id: akash-linux-arm64
6569
binary: akash
6670
main: ./cmd/akash
@@ -79,7 +83,7 @@ builds:
7983
- "{{ .Env.BUILD_VARS }}"
8084
- "{{ .Env.STRIP_FLAGS }}"
8185
- "-linkmode={{ .Env.LINKMODE }}"
82-
- -extldflags "-lc -lrt -lpthread --static"
86+
- -extldflags "-lc -lrt -lpthread"
8387
universal_binaries:
8488
- id: akash-darwin-universal
8589
ids:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ IS_STABLE ?= false
2626

2727
GO_LINKMODE ?= external
2828
GOMOD ?= readonly
29-
BUILD_TAGS ?= osusergo,netgo,ledger
29+
BUILD_TAGS ?= osusergo,netgo,hidraw,ledger
3030
GORELEASER_STRIP_FLAGS ?=
3131

3232
ifeq ($(IS_MAINNET), true)

go.mod

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ require (
2929
github.com/grpc-ecosystem/grpc-gateway v1.16.0
3030
github.com/ianlancetaylor/cgosymbolizer v0.0.0-20250410214317-b8ecc8b6bbe6
3131
github.com/pkg/errors v0.9.1
32-
github.com/prometheus/client_golang v1.22.0
32+
github.com/prometheus/client_golang v1.23.0
3333
github.com/rakyll/statik v0.1.7
3434
github.com/regen-network/cosmos-proto v0.3.1
3535
github.com/rs/zerolog v1.34.0
3636
github.com/spf13/cast v1.9.2
3737
github.com/spf13/cobra v1.9.1
3838
github.com/spf13/pflag v1.0.7
3939
github.com/spf13/viper v1.20.1
40-
github.com/stretchr/testify v1.10.0
40+
github.com/stretchr/testify v1.11.1
4141
go.step.sm/crypto v0.45.1
42-
golang.org/x/mod v0.25.0
42+
golang.org/x/mod v0.26.0
4343
golang.org/x/oauth2 v0.30.0
4444
golang.org/x/sync v0.16.0
45-
google.golang.org/grpc v1.74.2
45+
google.golang.org/grpc v1.75.0
4646
gopkg.in/yaml.v3 v3.0.1
4747
gotest.tools/v3 v3.5.2
4848
pkg.akt.dev/go v0.1.5
@@ -63,13 +63,20 @@ replace (
6363

6464
github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2
6565

66+
// use akash version of cosmos ledger api
67+
github.com/cosmos/ledger-cosmos-go => github.com/akash-network/ledger-go/cosmos v0.16.0
68+
6669
// Use regen gogoproto fork
6770
// To be replaced by cosmos/gogoproto in future versions
6871
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
6972

7073
// as per v0.53.x migration guide goleveldb version must be pinned for the app to work correctly
7174
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
7275

76+
github.com/zondax/hid => github.com/troian/hid v0.14.0
77+
78+
github.com/zondax/ledger-go => github.com/akash-network/ledger-go v0.16.0
79+
7380
// stick with compatible version or x/exp in v0.47.x line
7481
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
7582
// stick with compatible version of rapid in v0.47.x line
@@ -79,9 +86,9 @@ replace (
7986
require (
8087
cel.dev/expr v0.24.0 // indirect
8188
cloud.google.com/go v0.120.0 // indirect
82-
cloud.google.com/go/auth v0.16.0 // indirect
89+
cloud.google.com/go/auth v0.16.4 // indirect
8390
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
84-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
91+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
8592
cloud.google.com/go/iam v1.5.2 // indirect
8693
cloud.google.com/go/monitoring v1.24.2 // indirect
8794
cloud.google.com/go/storage v1.50.0 // indirect
@@ -92,7 +99,7 @@ require (
9299
github.com/99designs/keyring v1.2.2 // indirect
93100
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
94101
github.com/DataDog/zstd v1.5.7 // indirect
95-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
102+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
96103
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
97104
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
98105
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -147,9 +154,9 @@ require (
147154
github.com/felixge/httpsnoop v1.0.4 // indirect
148155
github.com/fsnotify/fsnotify v1.9.0 // indirect
149156
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
150-
github.com/getsentry/sentry-go v0.32.0 // indirect
157+
github.com/getsentry/sentry-go v0.35.0 // indirect
151158
github.com/go-errors/errors v1.5.1 // indirect
152-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
159+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
153160
github.com/go-kit/kit v0.13.0 // indirect
154161
github.com/go-kit/log v0.2.1 // indirect
155162
github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -169,7 +176,7 @@ require (
169176
github.com/google/s2a-go v0.1.9 // indirect
170177
github.com/google/uuid v1.6.0 // indirect
171178
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
172-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
179+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
173180
github.com/gorilla/handlers v1.5.2 // indirect
174181
github.com/goware/urlx v0.3.2 // indirect
175182
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -181,7 +188,7 @@ require (
181188
github.com/hashicorp/go-metrics v0.5.4 // indirect
182189
github.com/hashicorp/go-plugin v1.6.3 // indirect
183190
github.com/hashicorp/go-safetemp v1.0.0 // indirect
184-
github.com/hashicorp/go-version v1.6.0 // indirect
191+
github.com/hashicorp/go-version v1.7.0 // indirect
185192
github.com/hashicorp/golang-lru v1.0.2 // indirect
186193
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
187194
github.com/hashicorp/yamux v0.1.2 // indirect
@@ -218,17 +225,17 @@ require (
218225
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
219226
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
220227
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
221-
github.com/prometheus/client_model v0.6.1 // indirect
222-
github.com/prometheus/common v0.63.0 // indirect
223-
github.com/prometheus/procfs v0.15.1 // indirect
228+
github.com/prometheus/client_model v0.6.2 // indirect
229+
github.com/prometheus/common v0.65.0 // indirect
230+
github.com/prometheus/procfs v0.16.1 // indirect
224231
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
225232
github.com/rogpeppe/go-internal v1.14.1 // indirect
226233
github.com/rs/cors v1.11.1 // indirect
227234
github.com/russross/blackfriday/v2 v2.1.0 // indirect
228-
github.com/sagikazarmark/locafero v0.7.0 // indirect
235+
github.com/sagikazarmark/locafero v0.9.0 // indirect
229236
github.com/sasha-s/go-deadlock v0.3.5 // indirect
230237
github.com/sourcegraph/conc v0.3.0 // indirect
231-
github.com/spf13/afero v1.12.0 // indirect
238+
github.com/spf13/afero v1.14.0 // indirect
232239
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
233240
github.com/stretchr/objx v0.5.2 // indirect
234241
github.com/subosito/gotenv v1.6.0 // indirect
@@ -242,34 +249,36 @@ require (
242249
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
243250
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
244251
github.com/zeebo/errs v1.4.0 // indirect
252+
github.com/zondax/golem v0.27.0 // indirect
245253
github.com/zondax/hid v0.9.2 // indirect
246-
github.com/zondax/ledger-go v0.14.3 // indirect
254+
github.com/zondax/ledger-go v0.15.0 // indirect
247255
go.etcd.io/bbolt v1.4.0 // indirect
248256
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
249257
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
250-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
251-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
252-
go.opentelemetry.io/otel v1.36.0 // indirect
253-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
254-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
255-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
256-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
258+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
259+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
260+
go.opentelemetry.io/otel v1.37.0 // indirect
261+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
262+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
263+
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
264+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
257265
go.uber.org/mock v0.5.2 // indirect
258266
go.uber.org/multierr v1.11.0 // indirect
267+
go.uber.org/zap v1.27.0 // indirect
259268
go.yaml.in/yaml/v2 v2.4.2 // indirect
260269
golang.org/x/arch v0.15.0 // indirect
261-
golang.org/x/crypto v0.40.0 // indirect
270+
golang.org/x/crypto v0.41.0 // indirect
262271
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
263-
golang.org/x/net v0.42.0 // indirect
264-
golang.org/x/sys v0.34.0 // indirect
265-
golang.org/x/term v0.33.0 // indirect
266-
golang.org/x/text v0.27.0 // indirect
267-
golang.org/x/time v0.11.0 // indirect
268-
google.golang.org/api v0.229.0 // indirect
272+
golang.org/x/net v0.43.0 // indirect
273+
golang.org/x/sys v0.35.0 // indirect
274+
golang.org/x/term v0.34.0 // indirect
275+
golang.org/x/text v0.28.0 // indirect
276+
golang.org/x/time v0.12.0 // indirect
277+
google.golang.org/api v0.247.0 // indirect
269278
google.golang.org/genproto v0.0.0-20250728155136-f173205681a0 // indirect
270279
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
271-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
272-
google.golang.org/protobuf v1.36.6 // indirect
280+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
281+
google.golang.org/protobuf v1.36.8 // indirect
273282
gopkg.in/inf.v0 v0.9.1 // indirect
274283
gopkg.in/yaml.v2 v2.4.0 // indirect
275284
k8s.io/api v0.33.3 // indirect

0 commit comments

Comments
 (0)