Skip to content

Commit 6338b58

Browse files
peterarguepeterargue
committed
Update event fetching to request CCF encoded events
1 parent bab50a2 commit 6338b58

File tree

4 files changed

+301
-341
lines changed

4 files changed

+301
-341
lines changed

‎access/access.go

+13-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import (
77
"crypto/x509"
88
"encoding/hex"
99
"fmt"
10-
"go.opentelemetry.io/otel/attribute"
11-
"go.opentelemetry.io/otel/metric"
1210
"math/rand"
1311
"strconv"
1412
"strings"
1513
"time"
1614

15+
"go.opentelemetry.io/otel/attribute"
16+
"go.opentelemetry.io/otel/metric"
17+
1718
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
1819
libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls"
1920
"github.com/onflow/cadence"
@@ -165,8 +166,9 @@ func (c Client) BlockEvents(ctx context.Context, blockID []byte, typ string) ([]
165166
resp, err := c.client.GetEventsForBlockIDs(
166167
ctx,
167168
&access.GetEventsForBlockIDsRequest{
168-
BlockIds: [][]byte{blockID},
169-
Type: typ,
169+
BlockIds: [][]byte{blockID},
170+
Type: typ,
171+
EventEncodingVersion: entities.EventEncodingVersion_CCF_V0,
170172
},
171173
)
172174
cancel()
@@ -406,8 +408,9 @@ func (c Client) TransactionResult(ctx context.Context, blockID []byte, txnIndex
406408
resp, err := c.client.GetTransactionResultByIndex(
407409
ctx,
408410
&access.GetTransactionByIndexRequest{
409-
BlockId: blockID,
410-
Index: txnIndex,
411+
BlockId: blockID,
412+
Index: txnIndex,
413+
EventEncodingVersion: entities.EventEncodingVersion_CCF_V0,
411414
},
412415
)
413416
cancel()
@@ -428,7 +431,8 @@ func (c Client) TransactionResultByHash(ctx context.Context, hash []byte) (*acce
428431
resp, err := c.client.GetTransactionResult(
429432
ctx,
430433
&access.GetTransactionRequest{
431-
Id: hash,
434+
Id: hash,
435+
EventEncodingVersion: entities.EventEncodingVersion_CCF_V0,
432436
},
433437
)
434438
cancel()
@@ -453,7 +457,8 @@ func (c Client) TransactionResultsByBlockID(ctx context.Context, blockID []byte)
453457
resp, err := c.client.GetTransactionResultsByBlockID(
454458
ctx,
455459
&access.GetTransactionsByBlockIDRequest{
456-
BlockId: blockID,
460+
BlockId: blockID,
461+
EventEncodingVersion: entities.EventEncodingVersion_CCF_V0,
457462
},
458463
)
459464
cancel()

‎go.mod

+73-54
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
88
github.com/dgraph-io/badger/v2 v2.2007.4
99
github.com/dgraph-io/badger/v3 v3.2103.2
10-
github.com/ethereum/go-ethereum v1.10.18
10+
github.com/ethereum/go-ethereum v1.13.5
1111
github.com/golang/protobuf v1.5.3
1212
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
1313
github.com/libp2p/go-libp2p v0.28.1
14-
github.com/onflow/cadence v0.41.1
15-
github.com/onflow/flow-go v0.32.1-0.20231005181129-9c6f9fff84a0
16-
github.com/onflow/flow-go/crypto v0.24.9
17-
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20230915140723-432828f7afb9
14+
github.com/onflow/cadence v0.42.9
15+
github.com/onflow/flow-go v0.33.9
16+
github.com/onflow/flow-go/crypto v0.25.0
17+
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231213135419-ae911cc351a2
1818
github.com/rs/zerolog v1.29.0
1919
github.com/stretchr/testify v1.8.4
2020
go.opentelemetry.io/otel v1.17.0
@@ -26,61 +26,68 @@ require (
2626
go.opentelemetry.io/otel/sdk/metric v0.40.0
2727
go.opentelemetry.io/otel/trace v1.17.0
2828
go.uber.org/zap v1.24.0
29-
golang.org/x/crypto v0.10.0
30-
google.golang.org/grpc v1.57.0
29+
golang.org/x/crypto v0.17.0
30+
google.golang.org/grpc v1.58.3
3131
google.golang.org/protobuf v1.31.0
3232
lukechampine.com/blake3 v1.2.1
3333
)
3434

3535
require (
36-
cloud.google.com/go v0.110.0 // indirect
37-
cloud.google.com/go/compute v1.19.1 // indirect
36+
cloud.google.com/go v0.110.4 // indirect
37+
cloud.google.com/go/compute v1.21.0 // indirect
3838
cloud.google.com/go/compute/metadata v0.2.3 // indirect
39-
cloud.google.com/go/iam v0.13.0 // indirect
40-
cloud.google.com/go/storage v1.28.1 // indirect
41-
github.com/DataDog/zstd v1.4.5 // indirect
42-
github.com/aws/aws-sdk-go-v2 v1.17.7 // indirect
43-
github.com/aws/aws-sdk-go-v2/config v1.18.19 // indirect
44-
github.com/aws/aws-sdk-go-v2/credentials v1.13.18 // indirect
45-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect
39+
cloud.google.com/go/iam v1.1.1 // indirect
40+
cloud.google.com/go/storage v1.30.1 // indirect
41+
github.com/DataDog/zstd v1.5.2 // indirect
42+
github.com/Microsoft/go-winio v0.6.1 // indirect
43+
github.com/StackExchange/wmi v1.2.1 // indirect
44+
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
45+
github.com/aws/aws-sdk-go-v2 v1.21.2 // indirect
46+
github.com/aws/aws-sdk-go-v2/config v1.18.45 // indirect
47+
github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect
48+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect
4649
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.1 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect
48-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 // indirect
49-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect
5053
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect
5255
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.0 // indirect
5356
github.com/aws/aws-sdk-go-v2/service/s3 v1.15.0 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
57-
github.com/aws/smithy-go v1.13.5 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect
60+
github.com/aws/smithy-go v1.15.0 // indirect
5861
github.com/benbjohnson/clock v1.3.5 // indirect
5962
github.com/beorn7/perks v1.0.1 // indirect
60-
github.com/bits-and-blooms/bitset v1.5.0 // indirect
63+
github.com/bits-and-blooms/bitset v1.7.0 // indirect
6164
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
6265
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
6366
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6467
github.com/cespare/xxhash v1.1.0 // indirect
6568
github.com/cespare/xxhash/v2 v2.2.0 // indirect
66-
github.com/cockroachdb/errors v1.8.1 // indirect
67-
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
68-
github.com/cockroachdb/pebble v0.0.0-20230829171545-74d4bb649d92 // indirect
69-
github.com/cockroachdb/redact v1.0.8 // indirect
70-
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
69+
github.com/cockroachdb/errors v1.9.1 // indirect
70+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
71+
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
72+
github.com/cockroachdb/redact v1.1.3 // indirect
7173
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
74+
github.com/consensys/bavard v0.1.13 // indirect
75+
github.com/consensys/gnark-crypto v0.12.1 // indirect
7276
github.com/containerd/cgroups v1.1.0 // indirect
7377
github.com/coreos/go-semver v0.3.0 // indirect
7478
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
79+
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
7580
github.com/cskr/pubsub v1.0.2 // indirect
7681
github.com/davecgh/go-spew v1.1.1 // indirect
7782
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
83+
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
7884
github.com/dgraph-io/ristretto v0.1.0 // indirect
7985
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
8086
github.com/docker/go-units v0.5.0 // indirect
8187
github.com/dustin/go-humanize v1.0.1 // indirect
8288
github.com/ef-ds/deque v1.0.4 // indirect
8389
github.com/elastic/gosigar v0.14.2 // indirect
90+
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
8491
github.com/flynn/noise v1.0.0 // indirect
8592
github.com/francoispqt/gojay v1.2.13 // indirect
8693
github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -89,6 +96,7 @@ require (
8996
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
9097
github.com/gammazero/deque v0.1.0 // indirect
9198
github.com/gammazero/workerpool v1.1.2 // indirect
99+
github.com/getsentry/sentry-go v0.18.0 // indirect
92100
github.com/go-kit/kit v0.12.0 // indirect
93101
github.com/go-kit/log v0.2.1 // indirect
94102
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -98,21 +106,23 @@ require (
98106
github.com/go-playground/locales v0.14.1 // indirect
99107
github.com/go-playground/universal-translator v0.18.1 // indirect
100108
github.com/go-playground/validator/v10 v10.14.1 // indirect
109+
github.com/go-stack/stack v1.8.1 // indirect
101110
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
102-
github.com/go-test/deep v1.1.0 // indirect
103111
github.com/godbus/dbus/v5 v5.1.0 // indirect
112+
github.com/gofrs/flock v0.8.1 // indirect
104113
github.com/gogo/protobuf v1.3.2 // indirect
105114
github.com/golang/glog v1.1.0 // indirect
106115
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
107116
github.com/golang/mock v1.6.0 // indirect
108-
github.com/golang/snappy v0.0.4 // indirect
117+
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
109118
github.com/google/flatbuffers v1.12.1 // indirect
110119
github.com/google/go-cmp v0.5.9 // indirect
111120
github.com/google/gopacket v1.1.19 // indirect
112121
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
122+
github.com/google/s2a-go v0.1.4 // indirect
113123
github.com/google/uuid v1.3.0 // indirect
114124
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
115-
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
125+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
116126
github.com/gorilla/mux v1.8.0 // indirect
117127
github.com/gorilla/websocket v1.5.0 // indirect
118128
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.2 // indirect
@@ -124,7 +134,9 @@ require (
124134
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
125135
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
126136
github.com/hashicorp/hcl v1.0.0 // indirect
127-
github.com/huin/goupnp v1.2.0 // indirect
137+
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
138+
github.com/holiman/uint256 v1.2.3 // indirect
139+
github.com/huin/goupnp v1.3.0 // indirect
128140
github.com/inconshreveable/mousetrap v1.0.1 // indirect
129141
github.com/ipfs/bbloom v0.0.4 // indirect
130142
github.com/ipfs/boxo v0.10.0 // indirect
@@ -153,6 +165,7 @@ require (
153165
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
154166
github.com/jbenet/goprocess v0.1.4 // indirect
155167
github.com/jmespath/go-jmespath v0.4.0 // indirect
168+
github.com/k0kubun/pp/v3 v3.2.0 // indirect
156169
github.com/kevinburke/go-bindata v3.23.0+incompatible // indirect
157170
github.com/klauspost/compress v1.16.5 // indirect
158171
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
@@ -179,15 +192,16 @@ require (
179192
github.com/magiconair/properties v1.8.7 // indirect
180193
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
181194
github.com/mattn/go-colorable v0.1.13 // indirect
182-
github.com/mattn/go-isatty v0.0.19 // indirect
183-
github.com/mattn/go-runewidth v0.0.14 // indirect
195+
github.com/mattn/go-isatty v0.0.20 // indirect
196+
github.com/mattn/go-runewidth v0.0.15 // indirect
184197
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
185198
github.com/miekg/dns v1.1.54 // indirect
186199
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
187200
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
188201
github.com/minio/sha256-simd v1.0.1 // indirect
189202
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
190203
github.com/mitchellh/mapstructure v1.5.0 // indirect
204+
github.com/mmcloughlin/addchain v0.4.0 // indirect
191205
github.com/mr-tron/base58 v1.2.0 // indirect
192206
github.com/multiformats/go-base32 v0.1.0 // indirect
193207
github.com/multiformats/go-base36 v0.2.0 // indirect
@@ -199,11 +213,12 @@ require (
199213
github.com/multiformats/go-multihash v0.2.3 // indirect
200214
github.com/multiformats/go-multistream v0.4.1 // indirect
201215
github.com/multiformats/go-varint v0.0.7 // indirect
216+
github.com/olekukonko/tablewriter v0.0.5 // indirect
202217
github.com/onflow/atree v0.6.0 // indirect
203218
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20230703193002-53362441b57d // indirect
204219
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3 // indirect
205-
github.com/onflow/flow-ft/lib/go/contracts v0.7.0 // indirect
206-
github.com/onflow/flow-go-sdk v0.41.10 // indirect
220+
github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect
221+
github.com/onflow/flow-go-sdk v0.41.18 // indirect
207222
github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect
208223
github.com/onflow/go-bitswap v0.0.0-20230703214630-6d3db958c73d // indirect
209224
github.com/onflow/sdks v0.5.0 // indirect
@@ -233,6 +248,7 @@ require (
233248
github.com/rogpeppe/go-internal v1.10.0 // indirect
234249
github.com/schollz/progressbar/v3 v3.13.1 // indirect
235250
github.com/sethvargo/go-retry v0.2.3 // indirect
251+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
236252
github.com/shirou/gopsutil/v3 v3.22.2 // indirect
237253
github.com/slok/go-http-metrics v0.10.0 // indirect
238254
github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -244,9 +260,11 @@ require (
244260
github.com/spf13/viper v1.15.0 // indirect
245261
github.com/stretchr/objx v0.5.0 // indirect
246262
github.com/subosito/gotenv v1.4.2 // indirect
263+
github.com/supranational/blst v0.3.11 // indirect
264+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
247265
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect
248-
github.com/tklauser/go-sysconf v0.3.9 // indirect
249-
github.com/tklauser/numcpus v0.3.0 // indirect
266+
github.com/tklauser/go-sysconf v0.3.12 // indirect
267+
github.com/tklauser/numcpus v0.6.1 // indirect
250268
github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect
251269
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
252270
github.com/vmihailenco/msgpack/v4 v4.3.11 // indirect
@@ -263,24 +281,25 @@ require (
263281
go.uber.org/dig v1.17.0 // indirect
264282
go.uber.org/fx v1.19.2 // indirect
265283
go.uber.org/multierr v1.11.0 // indirect
266-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
267-
golang.org/x/mod v0.10.0 // indirect
268-
golang.org/x/net v0.10.0 // indirect
269-
golang.org/x/oauth2 v0.8.0 // indirect
270-
golang.org/x/sync v0.2.0 // indirect
271-
golang.org/x/sys v0.11.0 // indirect
272-
golang.org/x/term v0.9.0 // indirect
273-
golang.org/x/text v0.10.0 // indirect
274-
golang.org/x/time v0.1.0 // indirect
275-
golang.org/x/tools v0.9.1 // indirect
284+
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
285+
golang.org/x/mod v0.14.0 // indirect
286+
golang.org/x/net v0.19.0 // indirect
287+
golang.org/x/oauth2 v0.10.0 // indirect
288+
golang.org/x/sync v0.5.0 // indirect
289+
golang.org/x/sys v0.15.0 // indirect
290+
golang.org/x/term v0.15.0 // indirect
291+
golang.org/x/text v0.14.0 // indirect
292+
golang.org/x/time v0.3.0 // indirect
293+
golang.org/x/tools v0.16.0 // indirect
276294
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
277295
gonum.org/v1/gonum v0.13.0 // indirect
278-
google.golang.org/api v0.114.0 // indirect
296+
google.golang.org/api v0.126.0 // indirect
279297
google.golang.org/appengine v1.6.7 // indirect
280-
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
281-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
282-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
298+
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
299+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
300+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
283301
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0 // indirect
284302
gopkg.in/ini.v1 v1.67.0 // indirect
285303
gopkg.in/yaml.v3 v3.0.1 // indirect
304+
rsc.io/tmplfunc v0.0.3 // indirect
286305
)

0 commit comments

Comments
 (0)