Skip to content

Commit 8f866b9

Browse files
committed
fixed Pectra fork issues
1 parent 8f717a2 commit 8f866b9

File tree

11 files changed

+203
-80
lines changed

11 files changed

+203
-80
lines changed

.github/workflows/actions_temp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build tss-svc docker image
22
on:
33
push:
44
branches:
5-
- 'dev/bitcoin'
5+
- 'develop'
66

77
env:
88
CI_ACCESS_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }}

go.mod

+25-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyle-team/tss-svc
22

3-
go 1.23
3+
go 1.23.1
44

55
replace (
66
// tss-lib fix ed25519
@@ -23,7 +23,7 @@ require (
2323
github.com/btcsuite/btcd/btcutil v1.1.5
2424
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
2525
github.com/cosmos/cosmos-sdk v0.46.13
26-
github.com/ethereum/go-ethereum v1.10.26
26+
github.com/ethereum/go-ethereum v1.15.5
2727
github.com/go-chi/chi/v5 v5.0.7
2828
github.com/go-ozzo/ozzo-validation/v4 v4.2.1
2929
github.com/gogo/protobuf v1.3.3
@@ -54,11 +54,13 @@ require (
5454
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
5555
github.com/99designs/keyring v1.2.1 // indirect
5656
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
57+
github.com/Microsoft/go-winio v0.6.2 // indirect
5758
github.com/StackExchange/wmi v1.2.1 // indirect
5859
github.com/agl/ed25519 v0.0.0-20200225211852-fd4d107ace12 // indirect
5960
github.com/armon/go-metrics v0.4.1 // indirect
6061
github.com/beorn7/perks v1.0.1 // indirect
6162
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
63+
github.com/bits-and-blooms/bitset v1.17.0 // indirect
6264
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
6365
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
6466
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
@@ -68,15 +70,19 @@ require (
6870
github.com/cespare/xxhash v1.1.0 // indirect
6971
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7072
github.com/confio/ics23/go v0.9.0 // indirect
73+
github.com/consensys/bavard v0.1.22 // indirect
74+
github.com/consensys/gnark-crypto v0.14.0 // indirect
7175
github.com/cosmos/btcutil v1.0.5 // indirect
7276
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
7377
github.com/cosmos/go-bip39 v1.0.0 // indirect
7478
github.com/cosmos/gorocksdb v1.2.0 // indirect
7579
github.com/cosmos/iavl v0.20.0 // indirect
7680
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
81+
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
82+
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
7783
github.com/danieljoos/wincred v1.1.2 // indirect
7884
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
79-
github.com/deckarep/golang-set v1.8.0 // indirect
85+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
8086
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
8187
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect
8288
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
@@ -85,6 +91,8 @@ require (
8591
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
8692
github.com/dustin/go-humanize v1.0.1 // indirect
8793
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
94+
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
95+
github.com/ethereum/go-verkle v0.2.2 // indirect
8896
github.com/fsnotify/fsnotify v1.7.0 // indirect
8997
github.com/getsentry/raven-go v0.2.0 // indirect
9098
github.com/getsentry/sentry-go v0.27.0 // indirect
@@ -94,12 +102,11 @@ require (
94102
github.com/go-kit/kit v0.12.0 // indirect
95103
github.com/go-kit/log v0.2.1 // indirect
96104
github.com/go-logfmt/logfmt v0.6.0 // indirect
97-
github.com/go-ole/go-ole v1.2.6 // indirect
98-
github.com/go-stack/stack v1.8.0 // indirect
105+
github.com/go-ole/go-ole v1.3.0 // indirect
99106
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
100107
github.com/golang/glog v1.2.2 // indirect
101108
github.com/golang/protobuf v1.5.4 // indirect
102-
github.com/golang/snappy v0.0.4 // indirect
109+
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
103110
github.com/google/btree v1.1.2 // indirect
104111
github.com/google/jsonapi v0.0.0-20200226002910-c8283f632fb7 // indirect
105112
github.com/google/uuid v1.6.0 // indirect
@@ -120,6 +127,7 @@ require (
120127
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
121128
github.com/hashicorp/hcl v1.0.0 // indirect
122129
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
130+
github.com/holiman/uint256 v1.3.2 // indirect
123131
github.com/inconshreveable/mousetrap v1.1.0 // indirect
124132
github.com/ipfs/go-log v1.0.5 // indirect
125133
github.com/ipfs/go-log/v2 v2.1.3 // indirect
@@ -136,6 +144,7 @@ require (
136144
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
137145
github.com/mitchellh/go-homedir v1.1.0 // indirect
138146
github.com/mitchellh/mapstructure v1.5.0 // indirect
147+
github.com/mmcloughlin/addchain v0.4.0 // indirect
139148
github.com/mtibben/percent v0.2.1 // indirect
140149
github.com/oklog/ulid v1.3.1 // indirect
141150
github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -149,7 +158,6 @@ require (
149158
github.com/prometheus/procfs v0.9.0 // indirect
150159
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
151160
github.com/regen-network/cosmos-proto v0.3.1 // indirect
152-
github.com/rjeczalik/notify v0.9.3 // indirect
153161
github.com/ryanuber/go-glob v1.0.0 // indirect
154162
github.com/sagikazarmark/locafero v0.4.0 // indirect
155163
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -161,8 +169,9 @@ require (
161169
github.com/spf13/cast v1.6.0 // indirect
162170
github.com/spf13/pflag v1.0.5 // indirect
163171
github.com/spf13/viper v1.18.2 // indirect
164-
github.com/stretchr/testify v1.8.4 // indirect
172+
github.com/stretchr/testify v1.10.0 // indirect
165173
github.com/subosito/gotenv v1.6.0 // indirect
174+
github.com/supranational/blst v0.3.14 // indirect
166175
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
167176
github.com/tendermint/go-amino v0.16.0 // indirect
168177
github.com/tendermint/tm-db v0.6.7 // indirect
@@ -171,8 +180,8 @@ require (
171180
github.com/tidwall/match v1.1.1 // indirect
172181
github.com/tidwall/pretty v1.2.0 // indirect
173182
github.com/tidwall/sjson v1.2.5 // indirect
174-
github.com/tklauser/go-sysconf v0.3.11 // indirect
175-
github.com/tklauser/numcpus v0.6.0 // indirect
183+
github.com/tklauser/go-sysconf v0.3.12 // indirect
184+
github.com/tklauser/numcpus v0.6.1 // indirect
176185
github.com/zondax/hid v0.9.1 // indirect
177186
github.com/zondax/ledger-go v0.14.1 // indirect
178187
gitlab.com/distributed_lab/figure v2.1.2+incompatible // indirect
@@ -181,18 +190,18 @@ require (
181190
go.etcd.io/bbolt v1.3.7 // indirect
182191
go.uber.org/multierr v1.9.0 // indirect
183192
go.uber.org/zap v1.23.0 // indirect
184-
golang.org/x/crypto v0.31.0 // indirect
193+
golang.org/x/crypto v0.32.0 // indirect
185194
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
186-
golang.org/x/net v0.33.0 // indirect
187-
golang.org/x/sys v0.28.0 // indirect
188-
golang.org/x/term v0.27.0 // indirect
195+
golang.org/x/net v0.34.0 // indirect
196+
golang.org/x/sys v0.29.0 // indirect
197+
golang.org/x/term v0.28.0 // indirect
189198
golang.org/x/text v0.21.0 // indirect
190-
golang.org/x/time v0.5.0 // indirect
199+
golang.org/x/time v0.9.0 // indirect
191200
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
192201
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
193202
gopkg.in/ini.v1 v1.67.0 // indirect
194-
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
195203
gopkg.in/yaml.v2 v2.4.0 // indirect
196204
gopkg.in/yaml.v3 v3.0.1 // indirect
205+
rsc.io/tmplfunc v0.0.3 // indirect
197206
sigs.k8s.io/yaml v1.3.0 // indirect
198207
)

0 commit comments

Comments
 (0)