Skip to content

Commit 4205d79

Browse files
peterarguepeterargue
authored
Merge pull request #793 from m-Peter/mpeter/update-flow-go-dependency
Update `flow-go` dependency and fix the breaking changes
2 parents 1ae543b + 61af3af commit 4205d79

File tree

4 files changed

+247
-190
lines changed

4 files changed

+247
-190
lines changed

‎emulator/templates/systemChunkTransactionTemplate.cdc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import RandomBeaconHistory from "RandomBeaconHistory"
1+
import "RandomBeaconHistory"
22
import EVM from "EVM"
33

44
transaction {

‎go.mod

+44-43
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ require (
1616
github.com/logrusorgru/aurora v2.0.3+incompatible
1717
github.com/onflow/cadence v1.3.1
1818
github.com/onflow/crypto v0.25.2
19-
github.com/onflow/flow-core-contracts/lib/go/templates v1.4.0
20-
github.com/onflow/flow-go v0.38.0-util.0.20250130182921-c8d283b60d12
19+
github.com/onflow/flow-core-contracts/lib/go/templates v1.5.1-preview
20+
github.com/onflow/flow-go v0.38.1-0.20250218174738-2181389f9f7d
2121
github.com/onflow/flow-go-sdk v1.3.1
22-
github.com/onflow/flow-nft/lib/go/contracts v1.2.2
23-
github.com/onflow/flow/protobuf/go/flow v0.4.7
22+
github.com/onflow/flow-nft/lib/go/contracts v1.2.3
23+
github.com/onflow/flow/protobuf/go/flow v0.4.9
2424
github.com/prometheus/client_golang v1.20.5
2525
github.com/psiemens/graceland v1.0.0
2626
github.com/psiemens/sconfig v0.1.0
@@ -29,8 +29,8 @@ require (
2929
github.com/stretchr/testify v1.10.0
3030
go.uber.org/atomic v1.11.0
3131
go.uber.org/mock v0.5.0
32-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
33-
google.golang.org/grpc v1.64.1
32+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
33+
google.golang.org/grpc v1.67.1
3434
)
3535

3636
require github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
@@ -43,7 +43,7 @@ require (
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/bits-and-blooms/bitset v1.10.0 // indirect
4545
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
46-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
46+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4747
github.com/cespare/xxhash v1.1.0 // indirect
4848
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4949
github.com/cockroachdb/errors v1.11.3 // indirect
@@ -59,7 +59,7 @@ require (
5959
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
6060
github.com/davecgh/go-spew v1.1.1 // indirect
6161
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
62-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
62+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
6363
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
6464
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6565
github.com/dgraph-io/ristretto v0.1.0 // indirect
@@ -77,19 +77,19 @@ require (
7777
github.com/getsentry/sentry-go v0.27.0 // indirect
7878
github.com/go-kit/kit v0.12.0 // indirect
7979
github.com/go-kit/log v0.2.1 // indirect
80-
github.com/go-logfmt/logfmt v0.5.1 // indirect
81-
github.com/go-logr/logr v1.4.1 // indirect
80+
github.com/go-logfmt/logfmt v0.6.0 // indirect
81+
github.com/go-logr/logr v1.4.2 // indirect
8282
github.com/go-logr/stdr v1.2.2 // indirect
8383
github.com/go-ole/go-ole v1.3.0 // indirect
8484
github.com/gofrs/flock v0.8.1 // indirect
8585
github.com/gogo/protobuf v1.3.2 // indirect
86-
github.com/golang/glog v1.2.0 // indirect
86+
github.com/golang/glog v1.2.2 // indirect
8787
github.com/golang/protobuf v1.5.4 // indirect
8888
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
8989
github.com/google/uuid v1.6.0 // indirect
90-
github.com/gorilla/websocket v1.5.0 // indirect
90+
github.com/gorilla/websocket v1.5.3 // indirect
9191
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
92-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
92+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
9393
github.com/hashicorp/errwrap v1.1.0 // indirect
9494
github.com/hashicorp/go-multierror v1.1.1 // indirect
9595
github.com/hashicorp/golang-lru v1.0.2 // indirect
@@ -114,13 +114,13 @@ require (
114114
github.com/jbenet/goprocess v0.1.4 // indirect
115115
github.com/k0kubun/pp v3.0.1+incompatible // indirect
116116
github.com/kevinburke/go-bindata v3.24.0+incompatible // indirect
117-
github.com/klauspost/compress v1.17.9 // indirect
118-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
117+
github.com/klauspost/compress v1.17.11 // indirect
118+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
119119
github.com/kr/pretty v0.3.1 // indirect
120120
github.com/kr/text v0.2.0 // indirect
121121
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
122-
github.com/libp2p/go-libp2p v0.32.2 // indirect
123-
github.com/libp2p/go-libp2p-pubsub v0.10.0 // indirect
122+
github.com/libp2p/go-libp2p v0.38.2 // indirect
123+
github.com/libp2p/go-libp2p-pubsub v0.13.0 // indirect
124124
github.com/libp2p/go-msgio v0.3.0 // indirect
125125
github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
126126
github.com/magiconair/properties v1.8.7 // indirect
@@ -134,17 +134,18 @@ require (
134134
github.com/mr-tron/base58 v1.2.0 // indirect
135135
github.com/multiformats/go-base32 v0.1.0 // indirect
136136
github.com/multiformats/go-base36 v0.2.0 // indirect
137-
github.com/multiformats/go-multiaddr v0.12.2 // indirect
137+
github.com/multiformats/go-multiaddr v0.14.0 // indirect
138+
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
138139
github.com/multiformats/go-multibase v0.2.0 // indirect
139140
github.com/multiformats/go-multicodec v0.9.0 // indirect
140141
github.com/multiformats/go-multihash v0.2.3 // indirect
141-
github.com/multiformats/go-multistream v0.5.0 // indirect
142+
github.com/multiformats/go-multistream v0.6.0 // indirect
142143
github.com/multiformats/go-varint v0.0.7 // indirect
143144
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
144145
github.com/olekukonko/tablewriter v0.0.5 // indirect
145146
github.com/onflow/atree v0.9.0 // indirect
146147
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 // indirect
147-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.4.0 // indirect
148+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.5.1-preview // indirect
148149
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
149150
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
150151
github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
@@ -153,21 +154,21 @@ require (
153154
github.com/onflow/sdks v0.6.0-preview.1 // indirect
154155
github.com/onflow/wal v1.0.2 // indirect
155156
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
156-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
157+
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
157158
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
158159
github.com/pkg/errors v0.9.1 // indirect
159160
github.com/pmezard/go-difflib v1.0.0 // indirect
160161
github.com/prometheus/client_model v0.6.1 // indirect
161-
github.com/prometheus/common v0.55.0 // indirect
162+
github.com/prometheus/common v0.61.0 // indirect
162163
github.com/prometheus/procfs v0.15.1 // indirect
163164
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
164165
github.com/rivo/uniseg v0.4.4 // indirect
165-
github.com/rogpeppe/go-internal v1.10.0 // indirect
166+
github.com/rogpeppe/go-internal v1.13.1 // indirect
166167
github.com/rs/cors v1.8.0 // indirect
167168
github.com/schollz/progressbar/v3 v3.13.1 // indirect
168169
github.com/sethvargo/go-retry v0.2.3 // indirect
169170
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
170-
github.com/slok/go-http-metrics v0.10.0 // indirect
171+
github.com/slok/go-http-metrics v0.12.0 // indirect
171172
github.com/spaolacci/murmur3 v1.1.0 // indirect
172173
github.com/spf13/afero v1.10.0 // indirect
173174
github.com/spf13/cast v1.5.0 // indirect
@@ -189,28 +190,28 @@ require (
189190
github.com/vmihailenco/tagparser v0.1.1 // indirect
190191
github.com/x448/float16 v0.8.4 // indirect
191192
github.com/zeebo/blake3 v0.2.4 // indirect
192-
go.opentelemetry.io/otel v1.24.0 // indirect
193-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
194-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
195-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
196-
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
197-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
198-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
193+
go.opentelemetry.io/otel v1.31.0 // indirect
194+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
195+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
196+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
197+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
198+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
199+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
199200
go.uber.org/multierr v1.11.0 // indirect
200-
go.uber.org/zap v1.26.0 // indirect
201-
golang.org/x/crypto v0.28.0 // indirect
202-
golang.org/x/net v0.26.0 // indirect
203-
golang.org/x/sync v0.8.0 // indirect
204-
golang.org/x/sys v0.26.0 // indirect
205-
golang.org/x/term v0.25.0 // indirect
206-
golang.org/x/text v0.19.0 // indirect
201+
go.uber.org/zap v1.27.0 // indirect
202+
golang.org/x/crypto v0.31.0 // indirect
203+
golang.org/x/net v0.33.0 // indirect
204+
golang.org/x/sync v0.10.0 // indirect
205+
golang.org/x/sys v0.28.0 // indirect
206+
golang.org/x/term v0.27.0 // indirect
207+
golang.org/x/text v0.21.0 // indirect
207208
golang.org/x/time v0.5.0 // indirect
208-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
209-
gonum.org/v1/gonum v0.14.0 // indirect
209+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
210+
gonum.org/v1/gonum v0.15.0 // indirect
210211
google.golang.org/appengine v1.6.8 // indirect
211-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
212-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
213-
google.golang.org/protobuf v1.34.2 // indirect
212+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
213+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
214+
google.golang.org/protobuf v1.36.0 // indirect
214215
gopkg.in/ini.v1 v1.67.0 // indirect
215216
gopkg.in/yaml.v3 v3.0.1 // indirect
216217
lukechampine.com/blake3 v1.3.0 // indirect

0 commit comments

Comments
 (0)