Skip to content

Commit 4e34bc4

Browse files
Merge pull request #16 from threshold-network/fix/go-ethereum-1.17-linkname
fix(codegen): point //go:linkname at abigen for go-ethereum v1.16+
2 parents 2624b12 + 228fee3 commit 4e34bc4

6 files changed

Lines changed: 295 additions & 151 deletions

File tree

.github/workflows/client.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Go
1919
uses: actions/setup-go@v6
2020
with:
21-
go-version: "1.22"
21+
go-version-file: "go.mod"
2222
cache: true
2323

2424
- name: Run Go generators
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup Go
6464
uses: actions/setup-go@v6
6565
with:
66-
go-version: "1.22"
66+
go-version-file: "go.mod"
6767
cache: true
6868

6969
- name: Run Go generators

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@v6
2222
with:
23-
go-version: "1.22"
23+
go-version-file: "go.mod"
2424
cache: true
2525

2626
- name: Run Go generators

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ The format is based on Keep a Changelog and this fork follows Semantic Versionin
77
### Added
88
- Release guide and initial changelog stub for the fork of `keep-core/keep-common`.
99

10+
### Changed
11+
- Bump minimum Go toolchain to 1.24 (required by `github.com/ethereum/go-ethereum` v1.17.3).
12+
1013
## Upstream Baseline - v1.7.0
1114
### Notes
1215
- Latest upstream tag from https://github.com/keep-network/keep-common (tracked via git tags); upstream is unmaintained, so this fork continues independently from that point.

go.mod

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,52 @@
11
module github.com/keep-network/keep-common
22

3-
go 1.18
3+
go 1.24.0
44

55
require (
6-
github.com/ethereum/go-ethereum v1.10.19
6+
github.com/ethereum/go-ethereum v1.17.3
77
github.com/ipfs/go-log v0.0.1
8-
github.com/spf13/cobra v1.5.0
9-
github.com/spf13/pflag v1.0.5
10-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
11-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
12-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
13-
golang.org/x/tools v0.1.11
8+
github.com/spf13/cobra v1.8.1
9+
github.com/spf13/pflag v1.0.6
10+
golang.org/x/crypto v0.47.0
11+
golang.org/x/sync v0.19.0
12+
golang.org/x/time v0.9.0
13+
golang.org/x/tools v0.40.0
1414
)
1515

1616
require (
17-
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
18-
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
17+
github.com/Microsoft/go-winio v0.6.2 // indirect
18+
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
19+
github.com/StackExchange/wmi v1.2.1 // indirect
20+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
1921
github.com/cespare/cp v1.1.1 // indirect
20-
github.com/deckarep/golang-set v1.8.0 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23+
github.com/consensys/gnark-crypto v0.18.1 // indirect
24+
github.com/crate-crypto/go-eth-kzg v1.5.0 // indirect
25+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
2126
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
27+
github.com/ethereum/c-kzg-4844/v2 v2.1.6 // indirect
28+
github.com/fsnotify/fsnotify v1.6.0 // indirect
2229
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
23-
github.com/go-ole/go-ole v1.2.1 // indirect
24-
github.com/go-stack/stack v1.8.0 // indirect
25-
github.com/gogo/protobuf v1.2.1 // indirect
26-
github.com/google/uuid v1.2.0 // indirect
30+
github.com/go-logr/logr v1.4.3 // indirect
31+
github.com/go-logr/stdr v1.2.2 // indirect
32+
github.com/go-ole/go-ole v1.3.0 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/google/uuid v1.6.0 // indirect
2735
github.com/gorilla/websocket v1.4.2 // indirect
28-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
29-
github.com/mattn/go-colorable v0.1.12 // indirect
30-
github.com/mattn/go-isatty v0.0.14 // indirect
36+
github.com/holiman/uint256 v1.3.2 // indirect
37+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
38+
github.com/mattn/go-colorable v0.1.13 // indirect
39+
github.com/mattn/go-isatty v0.0.20 // indirect
3140
github.com/opentracing/opentracing-go v1.1.0 // indirect
32-
github.com/prometheus/tsdb v0.10.0 // indirect
33-
github.com/rjeczalik/notify v0.9.2 // indirect
3441
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
35-
github.com/status-im/keycard-go v0.0.0-20191119114148-6dd40a46baa0 // indirect
36-
github.com/tklauser/go-sysconf v0.3.5 // indirect
37-
github.com/tklauser/numcpus v0.2.2 // indirect
38-
github.com/tyler-smith/go-bip39 v1.0.2 // indirect
42+
github.com/supranational/blst v0.3.16 // indirect
43+
github.com/tklauser/go-sysconf v0.3.12 // indirect
44+
github.com/tklauser/numcpus v0.6.1 // indirect
3945
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect
40-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
41-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
42-
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
46+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
47+
go.opentelemetry.io/otel v1.40.0 // indirect
48+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
49+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
50+
golang.org/x/mod v0.31.0 // indirect
51+
golang.org/x/sys v0.40.0 // indirect
4352
)

0 commit comments

Comments
 (0)