Skip to content

Commit 57c21f4

Browse files
robvanmieghemrobvanmieghem
committed
Go 1.21 compatibility
Solves #272
1 parent 209790a commit 57c21f4

File tree

4 files changed

+231
-266
lines changed

4 files changed

+231
-266
lines changed

‎bridges/stellar-evm/api/bridge/signer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (s *SignersClient) signMint(ctx context.Context, id peer.ID, signRequest Et
276276
arHost := s.host.(*autorelay.AutoRelayHost)
277277

278278
if err := client.ConnectToPeer(ctx, arHost, s.router, s.relay, id); err != nil {
279-
return nil, errors.Wrapf(err, "failed to connect to host id '%s'", id.Pretty())
279+
return nil, errors.Wrapf(err, "failed to connect to host id '%s'", id)
280280
}
281281

282282
var response EthSignResponse

‎bridges/stellar-evm/api/bridge/signer_server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type SignerService struct {
5656
}
5757

5858
func NewSignerServer(host host.Host, bridgeMasterAddress string, bridgeContract *BridgeContract, stellarWallet *stellar.Wallet, depositFee int64) error {
59-
log.Info("server started", "identity", host.ID().Pretty())
59+
log.Info("server started", "identity", host.ID())
6060
partialMA, err := multiaddr.NewMultiaddr(fmt.Sprintf("/p2p/%s", host.ID()))
6161
if err != nil {
6262
return err

‎bridges/stellar-evm/go.mod

+66-78
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
module github.com/threefoldfoundation/tft/bridges/stellar-evm
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/ethereum/go-ethereum v1.11.6
7-
github.com/libp2p/go-libp2p v0.27.1
8-
github.com/libp2p/go-libp2p-gorpc v0.5.0
9-
github.com/libp2p/go-libp2p-kad-dht v0.23.0
10-
github.com/libp2p/go-libp2p-tls v0.5.0
11-
github.com/multiformats/go-multiaddr v0.9.0
12-
github.com/rs/zerolog v1.29.1
7+
github.com/libp2p/go-libp2p v0.32.2
8+
github.com/libp2p/go-libp2p-gorpc v0.6.0
9+
github.com/multiformats/go-multiaddr v0.12.1
10+
github.com/pkg/errors v0.9.1
11+
github.com/shopspring/decimal v1.3.1
1312
github.com/spf13/pflag v1.0.5
14-
github.com/stellar/go v0.0.0-20230427175813-d795eeefe6f1
13+
github.com/stellar/go v0.0.0-20240118205351-77cb331d374d
14+
github.com/stretchr/testify v1.8.4
15+
github.com/threefoldtech/libp2p-relay v1.0.0-b3
1516
)
1617

18+
require github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
19+
1720
require (
1821
github.com/DataDog/zstd v1.5.5 // indirect
1922
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
20-
github.com/benbjohnson/clock v1.3.3 // indirect
23+
github.com/benbjohnson/clock v1.3.5 // indirect
2124
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/btcsuite/btcd v0.22.1 // indirect
2325
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
24-
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
2526
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2627
github.com/cockroachdb/errors v1.9.1 // indirect
2728
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
2829
github.com/cockroachdb/pebble v0.0.0-20230428220915-dc0efbd4333b // indirect
2930
github.com/cockroachdb/redact v1.1.3 // indirect
3031
github.com/containerd/cgroups v1.1.0 // indirect
3132
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
32-
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
33+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect; indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
3434
github.com/deckarep/golang-set/v2 v2.3.0 // indirect
3535
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
3636
github.com/docker/go-units v0.5.0 // indirect
@@ -42,7 +42,7 @@ require (
4242
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
4343
github.com/getsentry/sentry-go v0.20.0 // indirect
4444
github.com/go-chi/chi v4.1.2+incompatible // indirect
45-
github.com/go-errors/errors v1.4.2 // indirect
45+
github.com/go-errors/errors v1.5.1 // indirect
4646
github.com/go-logr/logr v1.2.4 // indirect
4747
github.com/go-logr/stdr v1.2.2 // indirect
4848
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -51,129 +51,117 @@ require (
5151
github.com/godbus/dbus/v5 v5.1.0 // indirect
5252
github.com/gofrs/flock v0.8.1 // indirect
5353
github.com/gogo/protobuf v1.3.2 // indirect
54-
github.com/golang/mock v1.6.0 // indirect
5554
github.com/golang/protobuf v1.5.3 // indirect
5655
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
5756
github.com/google/gopacket v1.1.19 // indirect
58-
github.com/google/pprof v0.0.0-20230429030804-905365eefe3e // indirect
59-
github.com/google/uuid v1.3.0 // indirect
57+
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
58+
github.com/google/uuid v1.4.0 // indirect
6059
github.com/gorilla/schema v1.2.0 // indirect
6160
github.com/gorilla/websocket v1.5.0 // indirect
6261
github.com/hashicorp/errwrap v1.1.0 // indirect
6362
github.com/hashicorp/go-multierror v1.1.1 // indirect
64-
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
63+
github.com/hashicorp/golang-lru v1.0.2 // indirect
6564
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
66-
github.com/holiman/uint256 v1.2.2 // indirect
67-
github.com/huin/goupnp v1.1.0 // indirect
68-
github.com/ipfs/boxo v0.8.1 // indirect
65+
github.com/holiman/uint256 v1.2.4 // indirect
66+
github.com/huin/goupnp v1.3.0 // indirect
67+
github.com/ipfs/boxo v0.10.0 // indirect
6968
github.com/ipfs/go-cid v0.4.1 // indirect
7069
github.com/ipfs/go-datastore v0.6.0 // indirect
71-
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
7270
github.com/ipfs/go-log v1.0.5 // indirect
7371
github.com/ipfs/go-log/v2 v2.5.1 // indirect
7472
github.com/ipld/go-ipld-prime v0.20.0 // indirect
7573
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
7674
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
7775
github.com/jbenet/goprocess v0.1.4 // indirect
78-
github.com/klauspost/compress v1.16.5 // indirect
79-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
76+
github.com/klauspost/compress v1.17.2 // indirect
77+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
8078
github.com/koron/go-ssdp v0.0.4 // indirect
8179
github.com/kr/pretty v0.3.1 // indirect
8280
github.com/kr/text v0.2.0 // indirect
8381
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
8482
github.com/libp2p/go-cidranger v1.1.0 // indirect
8583
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
8684
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
87-
github.com/libp2p/go-libp2p-core v0.20.0 // indirect
88-
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
85+
github.com/libp2p/go-libp2p-kad-dht v0.25.2 // indirect
86+
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
8987
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
88+
github.com/libp2p/go-libp2p-routing-helpers v0.7.2 // indirect
9089
github.com/libp2p/go-msgio v0.3.0 // indirect
91-
github.com/libp2p/go-nat v0.1.0 // indirect
90+
github.com/libp2p/go-nat v0.2.0 // indirect
9291
github.com/libp2p/go-netroute v0.2.1 // indirect
93-
github.com/libp2p/go-openssl v0.1.0 // indirect
94-
github.com/libp2p/go-reuseport v0.3.0 // indirect
95-
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
92+
github.com/libp2p/go-reuseport v0.4.0 // indirect
93+
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
9694
github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 // indirect
9795
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
98-
github.com/mattn/go-colorable v0.1.13 // indirect
99-
github.com/mattn/go-isatty v0.0.18 // indirect
100-
github.com/mattn/go-pointer v0.0.1 // indirect
96+
github.com/mattn/go-isatty v0.0.20 // indirect
10197
github.com/mattn/go-runewidth v0.0.14 // indirect
10298
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
103-
github.com/miekg/dns v1.1.54 // indirect
99+
github.com/miekg/dns v1.1.56 // indirect
104100
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
105101
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
106-
github.com/minio/sha256-simd v1.0.0 // indirect
107-
github.com/mitchellh/mapstructure v1.5.0 // indirect
102+
github.com/minio/sha256-simd v1.0.1 // indirect
108103
github.com/mr-tron/base58 v1.2.0 // indirect
109104
github.com/multiformats/go-base32 v0.1.0 // indirect
110105
github.com/multiformats/go-base36 v0.2.0 // indirect
111106
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
112107
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
113108
github.com/multiformats/go-multibase v0.2.0 // indirect
114109
github.com/multiformats/go-multicodec v0.9.0 // indirect
115-
github.com/multiformats/go-multihash v0.2.1 // indirect
116-
github.com/multiformats/go-multistream v0.4.1 // indirect
110+
github.com/multiformats/go-multihash v0.2.3 // indirect
111+
github.com/multiformats/go-multistream v0.5.0 // indirect
117112
github.com/multiformats/go-varint v0.0.7 // indirect
118113
github.com/olekukonko/tablewriter v0.0.5 // indirect
119-
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
120-
github.com/opencontainers/runtime-spec v1.1.0-rc.2 // indirect
114+
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
115+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
121116
github.com/opentracing/opentracing-go v1.2.0 // indirect
122117
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
123-
github.com/pkg/errors v0.9.1 // indirect
124-
github.com/pmezard/go-difflib v1.0.0 // indirect
118+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
125119
github.com/polydawn/refmt v0.89.0 // indirect
126-
github.com/prometheus/client_golang v1.15.0 // indirect
127-
github.com/prometheus/client_model v0.3.0 // indirect
128-
github.com/prometheus/common v0.42.0 // indirect
129-
github.com/prometheus/procfs v0.9.0 // indirect
120+
github.com/prometheus/client_golang v1.17.0 // indirect
121+
github.com/prometheus/client_model v0.5.0 // indirect
122+
github.com/prometheus/common v0.44.0 // indirect
123+
github.com/prometheus/procfs v0.12.0 // indirect
130124
github.com/quic-go/qpack v0.4.0 // indirect
131-
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
132-
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
133-
github.com/quic-go/quic-go v0.34.0 // indirect
134-
github.com/quic-go/webtransport-go v0.5.2 // indirect
125+
github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
126+
github.com/quic-go/quic-go v0.39.4 // indirect
127+
github.com/quic-go/webtransport-go v0.6.0 // indirect
135128
github.com/raulk/go-watchdog v1.3.0 // indirect
136129
github.com/rivo/uniseg v0.4.4 // indirect
137-
github.com/rogpeppe/go-internal v1.10.0 // indirect
138-
github.com/rs/cors v1.9.0 // indirect
130+
github.com/rogpeppe/go-internal v1.11.0 // indirect
139131
github.com/segmentio/go-loggly v0.5.1-0.20171222203950-eb91657e62b2 // indirect
140132
github.com/sergi/go-diff v1.1.0 // indirect
141133
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
142-
github.com/shopspring/decimal v1.3.1 // indirect
143-
github.com/sirupsen/logrus v1.9.0 // indirect
144-
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
134+
github.com/sirupsen/logrus v1.9.3 // indirect
145135
github.com/spaolacci/murmur3 v1.1.0 // indirect
146-
github.com/stellar/go-xdr v0.0.0-20211103144802-8017fc4bdfee // indirect
147-
github.com/stretchr/objx v0.5.0 // indirect
148-
github.com/stretchr/testify v1.8.2 // indirect
136+
github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 // indirect
137+
github.com/stretchr/objx v0.5.1 // indirect
149138
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
150-
github.com/threefoldtech/libp2p-relay v1.0.0-b2 // indirect
151-
github.com/tklauser/go-sysconf v0.3.11 // indirect
152-
github.com/tklauser/numcpus v0.6.0 // indirect
139+
github.com/tklauser/go-sysconf v0.3.12 // indirect
140+
github.com/tklauser/numcpus v0.6.1 // indirect
153141
github.com/ugorji/go/codec v1.2.11 // indirect
154142
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
155143
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
156144
github.com/yusufpapurcu/wmi v1.2.2 // indirect
157145
go.opencensus.io v0.24.0 // indirect
158-
go.opentelemetry.io/otel v1.15.0 // indirect
159-
go.opentelemetry.io/otel/trace v1.15.0 // indirect
160-
go.uber.org/atomic v1.10.0 // indirect
161-
go.uber.org/dig v1.16.1 // indirect
162-
go.uber.org/fx v1.19.2 // indirect
146+
go.opentelemetry.io/otel v1.19.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
149+
go.uber.org/dig v1.17.1 // indirect
150+
go.uber.org/fx v1.20.1 // indirect
151+
go.uber.org/mock v0.3.0 // indirect
163152
go.uber.org/multierr v1.11.0 // indirect
164-
go.uber.org/zap v1.24.0 // indirect
165-
golang.org/x/crypto v0.8.0 // indirect
166-
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
167-
golang.org/x/mod v0.10.0 // indirect
168-
golang.org/x/net v0.9.0 // indirect
169-
golang.org/x/sync v0.1.0 // indirect
170-
golang.org/x/sys v0.7.0 // indirect
171-
golang.org/x/text v0.9.0 // indirect
172-
golang.org/x/tools v0.8.0 // indirect
153+
go.uber.org/zap v1.26.0 // indirect
154+
golang.org/x/crypto v0.17.0 // indirect
155+
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
156+
golang.org/x/mod v0.14.0 // indirect
157+
golang.org/x/net v0.19.0 // indirect
158+
golang.org/x/sync v0.5.0 // indirect
159+
golang.org/x/sys v0.16.0 // indirect
160+
golang.org/x/text v0.14.0 // indirect
161+
golang.org/x/tools v0.15.0 // indirect
173162
gonum.org/v1/gonum v0.13.0 // indirect
174-
google.golang.org/protobuf v1.30.0 // indirect
163+
google.golang.org/protobuf v1.32.0 // indirect
175164
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
176165
gopkg.in/yaml.v3 v3.0.1 // indirect
177-
lukechampine.com/blake3 v1.1.7 // indirect
178-
nhooyr.io/websocket v1.8.7 // indirect
166+
lukechampine.com/blake3 v1.2.1 // indirect
179167
)

0 commit comments

Comments
 (0)