Skip to content

Commit 53548d3

Browse files
authored
Merge pull request #893 from onflow/bastian/replace-geth-fork
2 parents dc0eec9 + 70f4c2c commit 53548d3

7 files changed

Lines changed: 88 additions & 66 deletions

File tree

account_proof.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"fmt"
2525
"strings"
2626

27-
"github.com/onflow/go-ethereum/rlp"
27+
"github.com/ethereum/go-ethereum/rlp"
2828
)
2929

3030
// AccountProofNonceMinLenBytes is the minimum length of account proof nonces in bytes.

examples/go.mod

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
module github.com/onflow/flow-go-sdk/examples
22

3-
go 1.23
3+
go 1.23.7
44

5-
toolchain go1.23.4
5+
toolchain go1.24.2
66

77
replace github.com/onflow/flow-go-sdk => ../
88

99
require (
10-
github.com/onflow/cadence v1.3.3
10+
github.com/onflow/cadence v1.6.3
1111
github.com/onflow/flow-go-sdk v1.2.2
1212
github.com/onflow/flowkit v1.19.0
1313
github.com/spf13/afero v1.11.0
14-
google.golang.org/grpc v1.64.1
14+
google.golang.org/grpc v1.74.2
1515
)
1616

1717
require (
18-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
19-
cloud.google.com/go/iam v1.1.6 // indirect
20-
cloud.google.com/go/kms v1.15.7 // indirect
18+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
19+
cloud.google.com/go/iam v1.5.2 // indirect
20+
cloud.google.com/go/kms v1.22.0 // indirect
2121
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
22-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
22+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
2323
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
2424
github.com/coreos/go-semver v0.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
27-
github.com/ethereum/go-ethereum v1.13.10 // indirect
27+
github.com/ethereum/go-ethereum v1.16.2 // indirect
2828
github.com/felixge/httpsnoop v1.0.4 // indirect
2929
github.com/fsnotify/fsnotify v1.6.0 // indirect
30-
github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c // indirect
30+
github.com/fxamacker/cbor/v2 v2.8.1-0.20250402194037-6f932b086829 // indirect
3131
github.com/fxamacker/circlehash v0.3.0 // indirect
32-
github.com/go-logr/logr v1.4.1 // indirect
32+
github.com/go-logr/logr v1.4.3 // indirect
3333
github.com/go-logr/stdr v1.2.2 // indirect
3434
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3535
github.com/golang/protobuf v1.5.4 // indirect
36-
github.com/google/s2a-go v0.1.7 // indirect
37-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
38-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
36+
github.com/google/s2a-go v0.1.9 // indirect
37+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
38+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
3939
github.com/hashicorp/hcl v1.0.0 // indirect
40-
github.com/holiman/uint256 v1.3.0 // indirect
40+
github.com/holiman/uint256 v1.3.2 // indirect
4141
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
4242
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4343
github.com/invopop/jsonschema v0.7.0 // indirect
@@ -59,21 +59,21 @@ require (
5959
github.com/multiformats/go-multibase v0.2.0 // indirect
6060
github.com/multiformats/go-multihash v0.2.3 // indirect
6161
github.com/multiformats/go-varint v0.0.7 // indirect
62-
github.com/onflow/atree v0.9.0 // indirect
63-
github.com/onflow/crypto v0.25.2 // indirect
62+
github.com/onflow/atree v0.10.0 // indirect
63+
github.com/onflow/crypto v0.25.3 // indirect
6464
github.com/onflow/flow-core-contracts/lib/go/templates v1.4.0 // indirect
6565
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
6666
github.com/onflow/flow-go v0.38.0-preview.0.0.20241022154145-6a254edbec23 // indirect
6767
github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
68-
github.com/onflow/flow/protobuf/go/flow v0.4.7 // indirect
68+
github.com/onflow/flow/protobuf/go/flow v0.4.11 // indirect
6969
github.com/onflow/go-ethereum v1.14.7 // indirect
7070
github.com/onflow/sdks v0.6.0-preview.1 // indirect
7171
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
7272
github.com/pkg/errors v0.9.1 // indirect
7373
github.com/pmezard/go-difflib v1.0.0 // indirect
7474
github.com/psiemens/sconfig v0.1.0 // indirect
7575
github.com/rivo/uniseg v0.4.4 // indirect
76-
github.com/rogpeppe/go-internal v1.10.0 // indirect
76+
github.com/rogpeppe/go-internal v1.13.1 // indirect
7777
github.com/sirupsen/logrus v1.9.3 // indirect
7878
github.com/spaolacci/murmur3 v1.1.0 // indirect
7979
github.com/spf13/cast v1.5.0 // indirect
@@ -92,29 +92,29 @@ require (
9292
github.com/x448/float16 v0.8.4 // indirect
9393
github.com/zeebo/blake3 v0.2.4 // indirect
9494
go.opencensus.io v0.24.0 // indirect
95-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
96-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
97-
go.opentelemetry.io/otel v1.24.0 // indirect
98-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
99-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
96+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
97+
go.opentelemetry.io/otel v1.36.0 // indirect
98+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
100100
go.uber.org/goleak v1.3.0 // indirect
101-
golang.org/x/crypto v0.28.0 // indirect
101+
golang.org/x/crypto v0.39.0 // indirect
102102
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
103-
golang.org/x/net v0.26.0 // indirect
104-
golang.org/x/oauth2 v0.18.0 // indirect
105-
golang.org/x/sync v0.8.0 // indirect
106-
golang.org/x/sys v0.26.0 // indirect
107-
golang.org/x/text v0.19.0 // indirect
108-
golang.org/x/time v0.5.0 // indirect
103+
golang.org/x/net v0.41.0 // indirect
104+
golang.org/x/oauth2 v0.30.0 // indirect
105+
golang.org/x/sync v0.15.0 // indirect
106+
golang.org/x/sys v0.33.0 // indirect
107+
golang.org/x/text v0.26.0 // indirect
108+
golang.org/x/time v0.12.0 // indirect
109109
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
110-
gonum.org/v1/gonum v0.14.0 // indirect
111-
google.golang.org/api v0.162.0 // indirect
110+
gonum.org/v1/gonum v0.16.0 // indirect
111+
google.golang.org/api v0.241.0 // indirect
112112
google.golang.org/appengine v1.6.8 // indirect
113-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
114-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
115-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
116-
google.golang.org/protobuf v1.34.2 // indirect
113+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
114+
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
115+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
116+
google.golang.org/protobuf v1.36.6 // indirect
117117
gopkg.in/ini.v1 v1.67.0 // indirect
118118
gopkg.in/yaml.v3 v3.0.1 // indirect
119-
lukechampine.com/blake3 v1.3.0 // indirect
119+
lukechampine.com/blake3 v1.4.0 // indirect
120120
)

0 commit comments

Comments
 (0)