Skip to content

Commit 280df4e

Browse files
authored
Merge pull request #8188 from onflow/auto-update-onflow-cadence-v1.8.5
Update to Cadence v1.8.5
2 parents 1cb4e42 + f624a97 commit 280df4e

File tree

7 files changed

+431
-431
lines changed

7 files changed

+431
-431
lines changed

fvm/evm/emulator/state/collection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ func (v ByteStringValue) StoredValue(_ atree.SlabStorage) (atree.Value, error) {
257257
return v, nil
258258
}
259259

260-
func (v ByteStringValue) Storable(storage atree.SlabStorage, address atree.Address, maxInlineSize uint64) (atree.Storable, error) {
261-
if uint64(v.ByteSize()) <= maxInlineSize {
260+
func (v ByteStringValue) Storable(storage atree.SlabStorage, address atree.Address, maxInlineSize uint32) (atree.Storable, error) {
261+
if v.ByteSize() <= maxInlineSize {
262262
return v, nil
263263
}
264264

go.mod

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/onflow/flow-go
33
go 1.25.0
44

55
require (
6-
cloud.google.com/go/compute/metadata v0.8.0
6+
cloud.google.com/go/compute/metadata v0.9.0
77
cloud.google.com/go/profiler v0.3.0
88
cloud.google.com/go/storage v1.50.0
99
github.com/antihax/optional v1.0.0
10-
github.com/aws/aws-sdk-go-v2/config v1.31.13
10+
github.com/aws/aws-sdk-go-v2/config v1.31.20
1111
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.1
1212
github.com/aws/aws-sdk-go-v2/service/s3 v1.15.0
1313
github.com/btcsuite/btcd/btcec/v2 v2.3.4
@@ -16,7 +16,7 @@ require (
1616
github.com/dgraph-io/badger/v2 v2.2007.4
1717
github.com/ef-ds/deque v1.0.4
1818
github.com/ethereum/go-ethereum v1.16.7
19-
github.com/fxamacker/cbor/v2 v2.8.1-0.20250402194037-6f932b086829
19+
github.com/fxamacker/cbor/v2 v2.9.1-0.20251019205732-39888e6be013
2020
github.com/gammazero/workerpool v1.1.3
2121
github.com/gogo/protobuf v1.3.2
2222
github.com/golang/mock v1.6.0
@@ -27,7 +27,7 @@ require (
2727
github.com/gorilla/mux v1.8.1
2828
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
2929
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
30-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0
30+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
3131
github.com/hashicorp/go-multierror v1.1.1
3232
github.com/improbable-eng/grpc-web v0.15.0
3333
github.com/ipfs/go-block-format v0.2.0
@@ -46,13 +46,13 @@ require (
4646
github.com/multiformats/go-multiaddr v0.14.0
4747
github.com/multiformats/go-multiaddr-dns v0.4.1
4848
github.com/multiformats/go-multihash v0.2.3
49-
github.com/onflow/atree v0.11.0
50-
github.com/onflow/cadence v1.8.3
49+
github.com/onflow/atree v0.12.0
50+
github.com/onflow/cadence v1.8.5
5151
github.com/onflow/crypto v0.25.3
5252
github.com/onflow/flow v0.4.15
5353
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.2
5454
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.2
55-
github.com/onflow/flow-go-sdk v1.9.2
55+
github.com/onflow/flow-go-sdk v1.9.4
5656
github.com/onflow/flow/protobuf/go/flow v0.4.18
5757
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
5858
github.com/pkg/errors v0.9.1
@@ -68,24 +68,24 @@ require (
6868
github.com/spf13/viper v1.15.0
6969
github.com/stretchr/testify v1.11.1
7070
github.com/vmihailenco/msgpack/v4 v4.3.11
71-
go.opentelemetry.io/otel v1.37.0
71+
go.opentelemetry.io/otel v1.38.0
7272
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0
73-
go.opentelemetry.io/otel/sdk v1.37.0
74-
go.opentelemetry.io/otel/trace v1.37.0
73+
go.opentelemetry.io/otel/sdk v1.38.0
74+
go.opentelemetry.io/otel/trace v1.38.0
7575
go.uber.org/atomic v1.11.0
7676
go.uber.org/multierr v1.11.0
77-
golang.org/x/crypto v0.41.0
77+
golang.org/x/crypto v0.43.0
7878
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
79-
golang.org/x/sync v0.16.0
80-
golang.org/x/sys v0.36.0
81-
golang.org/x/text v0.28.0
79+
golang.org/x/sync v0.17.0
80+
golang.org/x/sys v0.37.0
81+
golang.org/x/text v0.30.0
8282
golang.org/x/time v0.12.0
83-
golang.org/x/tools v0.36.0
83+
golang.org/x/tools v0.37.0
8484
google.golang.org/api v0.247.0
8585
google.golang.org/genproto v0.0.0-20250603155806-513f23925822
86-
google.golang.org/grpc v1.75.1
86+
google.golang.org/grpc v1.77.0
8787
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
88-
google.golang.org/protobuf v1.36.9
88+
google.golang.org/protobuf v1.36.10
8989
gotest.tools v2.2.0+incompatible
9090
pgregory.net/rapid v1.1.0
9191
)
@@ -114,7 +114,7 @@ require (
114114
github.com/sony/gobreaker v0.5.0
115115
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0
116116
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
117-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c
117+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8
118118
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250804133106-a7a43d27e69b
119119
gopkg.in/yaml.v2 v2.4.0
120120
)
@@ -126,6 +126,7 @@ require (
126126
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
127127
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
128128
github.com/ferranbt/fastssz v0.1.4 // indirect
129+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
129130
)
130131

131132
require (
@@ -136,7 +137,7 @@ require (
136137
cloud.google.com/go/iam v1.5.2 // indirect
137138
cloud.google.com/go/monitoring v1.24.2 // indirect
138139
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
139-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
140+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
140141
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
141142
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
142143
github.com/Jorropo/jsync v1.0.1 // indirect
@@ -145,26 +146,26 @@ require (
145146
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
146147
github.com/StackExchange/wmi v1.2.1 // indirect
147148
github.com/VictoriaMetrics/fastcache v1.13.0 // indirect
148-
github.com/aws/aws-sdk-go-v2 v1.39.3 // indirect
149-
github.com/aws/aws-sdk-go-v2/credentials v1.18.17 // indirect
150-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.10 // indirect
151-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 // indirect
152-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 // indirect
149+
github.com/aws/aws-sdk-go-v2 v1.39.6 // indirect
150+
github.com/aws/aws-sdk-go-v2/credentials v1.18.24 // indirect
151+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
152+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
153+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
153154
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
154-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
155-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 // indirect
155+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
156+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
156157
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.0 // indirect
157-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.7 // indirect
158-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.2 // indirect
159-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.7 // indirect
160-
github.com/aws/smithy-go v1.23.1 // indirect
158+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect
159+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect
160+
github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 // indirect
161+
github.com/aws/smithy-go v1.23.2 // indirect
161162
github.com/benbjohnson/clock v1.3.5 // indirect
162163
github.com/beorn7/perks v1.0.1 // indirect
163164
github.com/bits-and-blooms/bitset v1.24.0 // indirect
164165
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
165166
github.com/cespare/xxhash v1.1.0 // indirect
166167
github.com/cespare/xxhash/v2 v2.3.0 // indirect
167-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
168+
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
168169
github.com/cockroachdb/crlib v0.0.0-20241015224233-894974b3ad94 // indirect
169170
github.com/cockroachdb/errors v1.11.3 // indirect
170171
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
@@ -184,7 +185,7 @@ require (
184185
github.com/dgraph-io/ristretto v0.1.0 // indirect
185186
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
186187
github.com/elastic/gosigar v0.14.3 // indirect
187-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
188+
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
188189
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
189190
github.com/ethereum/go-verkle v0.2.2 // indirect
190191
github.com/felixge/fgprof v0.9.3 // indirect
@@ -197,7 +198,7 @@ require (
197198
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
198199
github.com/gammazero/deque v1.0.0 // indirect
199200
github.com/getsentry/sentry-go v0.27.0 // indirect
200-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
201+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
201202
github.com/go-kit/kit v0.12.0 // indirect
202203
github.com/go-kit/log v0.2.1 // indirect
203204
github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -304,7 +305,7 @@ require (
304305
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
305306
github.com/polydawn/refmt v0.89.0 // indirect
306307
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
307-
github.com/prometheus/client_model v0.6.1 // indirect
308+
github.com/prometheus/client_model v0.6.2 // indirect
308309
github.com/prometheus/common v0.61.0 // indirect
309310
github.com/prometheus/procfs v0.15.1 // indirect
310311
github.com/psiemens/sconfig v0.1.0 // indirect
@@ -313,13 +314,13 @@ require (
313314
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
314315
github.com/raulk/go-watchdog v1.3.0 // indirect
315316
github.com/rivo/uniseg v0.4.7 // indirect
316-
github.com/rogpeppe/go-internal v1.13.1 // indirect
317+
github.com/rogpeppe/go-internal v1.14.1 // indirect
317318
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
318319
github.com/spaolacci/murmur3 v1.1.0 // indirect
319320
github.com/spf13/afero v1.10.0 // indirect
320321
github.com/spf13/cast v1.5.0 // indirect
321322
github.com/spf13/jwalterweatherman v1.1.0 // indirect
322-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
323+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
323324
github.com/stretchr/objx v0.5.2 // indirect
324325
github.com/subosito/gotenv v1.4.2 // indirect
325326
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
@@ -334,27 +335,26 @@ require (
334335
github.com/x448/float16 v0.8.4 // indirect
335336
github.com/yusufpapurcu/wmi v1.2.2 // indirect
336337
github.com/zeebo/blake3 v0.2.4 // indirect
337-
github.com/zeebo/errs v1.4.0 // indirect
338338
go.opencensus.io v0.24.0 // indirect
339-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
340-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
339+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
340+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
341341
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
342342
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
343343
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
344-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
345-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
346-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
344+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
345+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
346+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
347347
go.uber.org/dig v1.18.0 // indirect
348348
go.uber.org/fx v1.23.0 // indirect
349349
go.uber.org/mock v0.5.0 // indirect
350350
go.uber.org/zap v1.27.0 // indirect
351-
golang.org/x/mod v0.27.0 // indirect
352-
golang.org/x/net v0.43.0 // indirect
353-
golang.org/x/oauth2 v0.30.0 // indirect
354-
golang.org/x/term v0.34.0 // indirect
351+
golang.org/x/mod v0.28.0 // indirect
352+
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect
353+
golang.org/x/oauth2 v0.32.0 // indirect
354+
golang.org/x/term v0.36.0 // indirect
355355
gonum.org/v1/gonum v0.16.0 // indirect
356356
google.golang.org/appengine v1.6.8 // indirect
357-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
357+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
358358
gopkg.in/ini.v1 v1.67.0 // indirect
359359
gopkg.in/yaml.v3 v3.0.1 // indirect
360360
lukechampine.com/blake3 v1.4.1 // indirect

0 commit comments

Comments
 (0)