Skip to content

Commit 944c049

Browse files
jribbinkjribbink
authored
Bump Flow dependencies (#345)
1 parent f225ca3 commit 944c049

File tree

7 files changed

+409
-129
lines changed

7 files changed

+409
-129
lines changed

‎blockchain/flowkit.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package blockchain
2121
import (
2222
"context"
2323
"fmt"
24+
2425
userErr "github.com/dapperlabs/flow-playground-api/middleware/errors"
2526
"github.com/onflow/cadence"
2627
jsoncdc "github.com/onflow/cadence/encoding/json"

‎blockchain/flowkit_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ package blockchain
2020

2121
import (
2222
"context"
23-
"fmt"
23+
"testing"
24+
2425
"github.com/onflow/flow-cli/flowkit/accounts"
2526
"github.com/onflow/flow-go-sdk"
2627
"github.com/stretchr/testify/assert"
27-
"testing"
2828
)
2929

3030
// Test_NewEmulator tests creating a large number of new accounts and validates corresponding storage addresses
@@ -89,12 +89,10 @@ func Test_FlowJsonExport(t *testing.T) {
8989
const Networks = `"networks": {
9090
"emulator": "127.0.0.1:3569",
9191
"mainnet": "access.mainnet.nodes.onflow.org:9000",
92-
"sandboxnet": "access.sandboxnet.nodes.onflow.org:9000",
92+
"testing": "127.0.0.1:3569",
9393
"testnet": "access.devnet.nodes.onflow.org:9000"
9494
}`
9595

96-
fmt.Println(flowJson)
97-
9896
assert.Contains(t, flowJson, FungibleToken)
9997
assert.Contains(t, flowJson, Networks)
10098

‎blockchain/readerwriter.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
package blockchain
2020

2121
import (
22-
kit "github.com/onflow/flow-cli/flowkit"
2322
"os"
23+
24+
kit "github.com/onflow/flow-cli/flowkit"
2425
)
2526

2627
type InternalReaderWriter struct {
@@ -41,3 +42,7 @@ func (rw *InternalReaderWriter) WriteFile(_ string, data []byte, _ os.FileMode)
4142
rw.data = data
4243
return nil
4344
}
45+
46+
func (rw *InternalReaderWriter) MkdirAll(_ string, _ os.FileMode) error {
47+
return nil
48+
}

‎e2eTest/project_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
package e2eTest
2020

2121
import (
22+
"strconv"
23+
"testing"
24+
"time"
25+
2226
"github.com/dapperlabs/flow-playground-api/e2eTest/client"
2327
"github.com/dapperlabs/flow-playground-api/model"
2428
"github.com/google/uuid"
2529
"github.com/stretchr/testify/assert"
2630
"github.com/stretchr/testify/require"
27-
"strconv"
28-
"testing"
29-
"time"
3031
)
3132

3233
func TestProjects(t *testing.T) {
@@ -559,10 +560,10 @@ func TestExportFlowJson(t *testing.T) {
559560
)
560561
require.NoError(t, err)
561562

562-
const Networks = `"networks": {
563+
const Networks = ` "networks": {
563564
"emulator": "127.0.0.1:3569",
564565
"mainnet": "access.mainnet.nodes.onflow.org:9000",
565-
"sandboxnet": "access.sandboxnet.nodes.onflow.org:9000",
566+
"testing": "127.0.0.1:3569",
566567
"testnet": "access.devnet.nodes.onflow.org:9000"
567568
}`
568569

‎go.mod

Lines changed: 63 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ require (
88
github.com/TV4/logrus-stackdriver-formatter v0.1.0
99
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38
1010
github.com/alecthomas/chroma v0.8.1
11-
github.com/getsentry/sentry-go v0.13.0
11+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
12+
github.com/getsentry/sentry-go v0.18.0
1213
github.com/go-chi/chi v4.1.2+incompatible
1314
github.com/go-chi/httplog v0.2.5
1415
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
15-
github.com/google/uuid v1.3.0
16-
github.com/gorilla/mux v1.8.0
16+
github.com/google/uuid v1.3.1
17+
github.com/gorilla/mux v1.8.1
1718
github.com/gorilla/sessions v1.2.0
1819
github.com/gorilla/websocket v1.5.0
1920
github.com/icza/bitio v1.1.0
2021
github.com/kelseyhightower/envconfig v1.4.0
2122
github.com/mitchellh/mapstructure v1.5.0
22-
github.com/onflow/cadence v0.40.0
23-
github.com/onflow/flow-cli/flowkit v1.3.2
24-
github.com/onflow/flow-emulator v0.54.0
25-
github.com/onflow/flow-go-sdk v0.41.10
23+
github.com/onflow/cadence v0.42.5
24+
github.com/onflow/flow-cli/flowkit v1.7.0
25+
github.com/onflow/flow-emulator v0.57.3
26+
github.com/onflow/flow-go-sdk v0.41.16
2627
github.com/pkg/errors v0.9.1
2728
github.com/prometheus/client_golang v1.16.0
2829
github.com/robfig/cron v1.2.0
@@ -37,66 +38,78 @@ require (
3738
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
3839
go.opentelemetry.io/otel/sdk v1.16.0
3940
go.opentelemetry.io/otel/trace v1.16.0
40-
google.golang.org/grpc v1.56.1
41+
google.golang.org/grpc v1.59.0
4142
gorm.io/driver/postgres v1.3.10
4243
gorm.io/driver/sqlite v1.3.6
4344
gorm.io/gorm v1.23.9
4445
)
4546

4647
require (
47-
cloud.google.com/go/compute v1.19.1 // indirect
48+
cloud.google.com/go/compute v1.23.0 // indirect
4849
cloud.google.com/go/compute/metadata v0.2.3 // indirect
49-
cloud.google.com/go/iam v0.13.0 // indirect
50-
cloud.google.com/go/kms v1.10.1 // indirect
50+
cloud.google.com/go/iam v1.1.1 // indirect
51+
cloud.google.com/go/kms v1.15.0 // indirect
52+
github.com/DataDog/zstd v1.5.2 // indirect
5153
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
5254
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
5355
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 // indirect
56+
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
57+
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
5458
github.com/agnivade/levenshtein v1.1.1 // indirect
5559
github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 // indirect
5660
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 // indirect
5761
github.com/beorn7/perks v1.0.1 // indirect
58-
github.com/bits-and-blooms/bitset v1.5.0 // indirect
62+
github.com/bits-and-blooms/bitset v1.7.0 // indirect
5963
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
6064
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6165
github.com/cespare/xxhash v1.1.0 // indirect
6266
github.com/cespare/xxhash/v2 v2.2.0 // indirect
67+
github.com/cockroachdb/errors v1.9.1 // indirect
68+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
69+
github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
70+
github.com/cockroachdb/redact v1.1.3 // indirect
6371
github.com/coreos/go-semver v0.3.0 // indirect
6472
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
6573
github.com/davecgh/go-spew v1.1.1 // indirect
6674
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
75+
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
6776
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
6877
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6978
github.com/dgraph-io/ristretto v0.1.0 // indirect
7079
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
7180
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
72-
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
81+
github.com/dlclark/regexp2 v1.7.0 // indirect
7382
github.com/dustin/go-humanize v1.0.1 // indirect
7483
github.com/ef-ds/deque v1.0.4 // indirect
75-
github.com/ethereum/go-ethereum v1.10.22 // indirect
84+
github.com/ethereum/go-ethereum v1.12.0 // indirect
7685
github.com/fsnotify/fsnotify v1.6.0 // indirect
7786
github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c // indirect
7887
github.com/fxamacker/circlehash v0.3.0 // indirect
7988
github.com/glebarez/go-sqlite v1.21.1 // indirect
8089
github.com/go-chi/chi/v5 v5.0.7 // indirect
8190
github.com/go-logr/logr v1.2.4 // indirect
8291
github.com/go-logr/stdr v1.2.2 // indirect
92+
github.com/go-ole/go-ole v1.2.6 // indirect
8393
github.com/go-redis/redis/v8 v8.11.5 // indirect
84-
github.com/go-stack/stack v1.8.0 // indirect
85-
github.com/go-test/deep v1.1.0 // indirect
94+
github.com/go-stack/stack v1.8.1 // indirect
95+
github.com/gofrs/flock v0.8.1 // indirect
8696
github.com/gogo/protobuf v1.3.2 // indirect
87-
github.com/golang/glog v1.1.0 // indirect
97+
github.com/golang/glog v1.1.2 // indirect
8898
github.com/golang/protobuf v1.5.3 // indirect
89-
github.com/golang/snappy v0.0.4 // indirect
90-
github.com/google/go-cmp v0.5.9 // indirect
99+
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
100+
github.com/google/s2a-go v0.1.4 // indirect
91101
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
92-
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
102+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
93103
github.com/gorilla/securecookie v1.1.1 // indirect
94104
github.com/gosuri/uilive v0.0.4 // indirect
95105
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
96106
github.com/hashicorp/errwrap v1.1.0 // indirect
97107
github.com/hashicorp/go-multierror v1.1.1 // indirect
98108
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
109+
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
99110
github.com/hashicorp/hcl v1.0.0 // indirect
111+
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
112+
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
100113
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
101114
github.com/inconshreveable/mousetrap v1.1.0 // indirect
102115
github.com/invopop/jsonschema v0.7.0 // indirect
@@ -123,9 +136,12 @@ require (
123136
github.com/jbenet/goprocess v0.1.4 // indirect
124137
github.com/jinzhu/inflection v1.0.0 // indirect
125138
github.com/jinzhu/now v1.1.5 // indirect
139+
github.com/k0kubun/pp/v3 v3.2.0 // indirect
126140
github.com/kevinburke/go-bindata v3.23.0+incompatible // indirect
127141
github.com/klauspost/compress v1.16.5 // indirect
128142
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
143+
github.com/kr/pretty v0.3.1 // indirect
144+
github.com/kr/text v0.2.0 // indirect
129145
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
130146
github.com/libp2p/go-libp2p v0.28.1 // indirect
131147
github.com/lmars/go-slip10 v0.0.0-20190606092855-400ba44fee12 // indirect
@@ -134,6 +150,7 @@ require (
134150
github.com/magiconair/properties v1.8.7 // indirect
135151
github.com/mattn/go-colorable v0.1.13 // indirect
136152
github.com/mattn/go-isatty v0.0.19 // indirect
153+
github.com/mattn/go-runewidth v0.0.14 // indirect
137154
github.com/mattn/go-sqlite3 v1.14.16 // indirect
138155
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
139156
github.com/minio/sha256-simd v1.0.1 // indirect
@@ -146,14 +163,15 @@ require (
146163
github.com/multiformats/go-multihash v0.2.3 // indirect
147164
github.com/multiformats/go-multistream v0.4.1 // indirect
148165
github.com/multiformats/go-varint v0.0.7 // indirect
166+
github.com/olekukonko/tablewriter v0.0.5 // indirect
149167
github.com/onflow/atree v0.6.0 // indirect
150-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20230703193002-53362441b57d // indirect
151-
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3 // indirect
152-
github.com/onflow/flow-ft/lib/go/contracts v0.7.0 // indirect
153-
github.com/onflow/flow-go v0.31.1-0.20230808172820-f074502a67e3 // indirect
154-
github.com/onflow/flow-go/crypto v0.24.9 // indirect
168+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f // indirect
169+
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f // indirect
170+
github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect
171+
github.com/onflow/flow-go v0.32.4-0.20231111003039-3b479f6b0995 // indirect
172+
github.com/onflow/flow-go/crypto v0.24.10 // indirect
155173
github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect
156-
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20230628215638-83439d22e0ce // indirect
174+
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231018182244-e72527c55c63 // indirect
157175
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead // indirect
158176
github.com/onflow/sdks v0.5.0 // indirect
159177
github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -168,20 +186,25 @@ require (
168186
github.com/psiemens/sconfig v0.1.0 // indirect
169187
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
170188
github.com/rivo/uniseg v0.4.4 // indirect
189+
github.com/rogpeppe/go-internal v1.9.0 // indirect
171190
github.com/sergi/go-diff v1.1.0 // indirect
172191
github.com/sethvargo/go-retry v0.2.3 // indirect
192+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
173193
github.com/slok/go-http-metrics v0.10.0 // indirect
174194
github.com/spaolacci/murmur3 v1.1.0 // indirect
175195
github.com/spf13/afero v1.9.4 // indirect
176196
github.com/spf13/cast v1.5.0 // indirect
177-
github.com/spf13/cobra v1.7.0 // indirect
197+
github.com/spf13/cobra v1.8.0 // indirect
178198
github.com/spf13/jwalterweatherman v1.1.0 // indirect
179199
github.com/spf13/pflag v1.0.5 // indirect
180200
github.com/spf13/viper v1.15.0 // indirect
181201
github.com/subosito/gotenv v1.4.2 // indirect
202+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
182203
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect
204+
github.com/tklauser/go-sysconf v0.3.9 // indirect
205+
github.com/tklauser/numcpus v0.3.0 // indirect
183206
github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect
184-
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
207+
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
185208
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
186209
github.com/vmihailenco/msgpack/v4 v4.3.11 // indirect
187210
github.com/vmihailenco/tagparser v0.1.1 // indirect
@@ -194,20 +217,23 @@ require (
194217
go.uber.org/atomic v1.11.0 // indirect
195218
go.uber.org/multierr v1.11.0 // indirect
196219
go.uber.org/zap v1.24.0 // indirect
197-
golang.org/x/crypto v0.10.0 // indirect
220+
golang.org/x/crypto v0.12.0 // indirect
198221
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
199-
golang.org/x/net v0.10.0 // indirect
200-
golang.org/x/oauth2 v0.7.0 // indirect
201-
golang.org/x/sync v0.2.0 // indirect
202-
golang.org/x/sys v0.9.0 // indirect
203-
golang.org/x/text v0.10.0 // indirect
222+
golang.org/x/net v0.14.0 // indirect
223+
golang.org/x/oauth2 v0.11.0 // indirect
224+
golang.org/x/sync v0.3.0 // indirect
225+
golang.org/x/sys v0.11.0 // indirect
226+
golang.org/x/text v0.12.0 // indirect
204227
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
205228
gonum.org/v1/gonum v0.13.0 // indirect
206-
google.golang.org/api v0.114.0 // indirect
229+
google.golang.org/api v0.126.0 // indirect
207230
google.golang.org/appengine v1.6.7 // indirect
208-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
209-
google.golang.org/protobuf v1.30.0 // indirect
231+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
232+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
233+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
234+
google.golang.org/protobuf v1.31.0 // indirect
210235
gopkg.in/ini.v1 v1.67.0 // indirect
236+
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
211237
gopkg.in/yaml.v3 v3.0.1 // indirect
212238
lukechampine.com/blake3 v1.2.1 // indirect
213239
modernc.org/libc v1.24.1 // indirect

0 commit comments

Comments
 (0)