From fa356a676b1f345dce6a4de3bbe2140ba77c9fdc Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Tue, 9 Apr 2024 10:17:19 +0200 Subject: [PATCH 1/5] update protobuf --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2feab5fd..4e87febb 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240403221216-33c1de004dc1 github.com/onflow/flow-go-sdk v1.0.0-preview.17 github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240402163945-74687e7a5b9d - github.com/onflow/flow/protobuf/go/flow v0.3.7 + github.com/onflow/flow/protobuf/go/flow v0.4.0 github.com/prometheus/client_golang v1.18.0 github.com/psiemens/graceland v1.0.0 github.com/psiemens/sconfig v0.1.0 diff --git a/go.sum b/go.sum index 81607ae6..0c69f29c 100644 --- a/go.sum +++ b/go.sum @@ -2018,8 +2018,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240402163945-74687e7a5b9d github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240402163945-74687e7a5b9d h1:9BUEgH1oFUMeOab++UNgok9Jk+rejQIrIHYKNe/TD20= github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240402163945-74687e7a5b9d/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= -github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= +github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E= +github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= From 50830738789a262d54f7366282bd7e091406a402 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Tue, 9 Apr 2024 10:21:19 +0200 Subject: [PATCH 2/5] update flow-go --- go.mod | 12 +++++------- go.sum | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 4e87febb..149b796e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/onflow/cadence v1.0.0-preview.19 github.com/onflow/crypto v0.25.1 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240402184019-90048578066e - github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240403221216-33c1de004dc1 + github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240409075958-ccbe91096438 github.com/onflow/flow-go-sdk v1.0.0-preview.17 github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240402163945-74687e7a5b9d github.com/onflow/flow/protobuf/go/flow v0.4.0 @@ -39,7 +39,7 @@ require ( github.com/StackExchange/wmi v1.2.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.7.0 // indirect + github.com/bits-and-blooms/bitset v1.10.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect @@ -54,7 +54,6 @@ require ( github.com/coreos/go-semver v0.3.0 // indirect github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/deckarep/golang-set/v2 v2.1.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect @@ -66,7 +65,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/ef-ds/deque v1.0.4 // indirect github.com/ethereum/c-kzg-4844 v0.4.0 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect + github.com/ethereum/go-ethereum v1.13.10 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fxamacker/circlehash v0.3.0 // indirect github.com/getsentry/sentry-go v0.18.0 // indirect @@ -93,7 +92,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/uint256 v1.2.3 // indirect + github.com/holiman/uint256 v1.2.4 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/bbloom v0.0.4 // indirect github.com/ipfs/go-block-format v0.2.0 // indirect @@ -106,7 +105,6 @@ require ( github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/ipfs/go-metrics-interface v0.0.1 // indirect - github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jbenet/goprocess v0.1.4 // indirect github.com/k0kubun/pp v3.0.1+incompatible // indirect github.com/kevinburke/go-bindata v3.24.0+incompatible // indirect @@ -143,6 +141,7 @@ require ( github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240402160548-a9c331660956 // indirect github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240402160548-a9c331660956 // indirect github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240402163945-74687e7a5b9d // indirect + github.com/onflow/go-ethereum v1.13.4 // indirect github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect @@ -162,7 +161,6 @@ require ( github.com/sethvargo/go-retry v0.2.3 // indirect github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect github.com/slok/go-http-metrics v0.10.0 // indirect - github.com/sony/gobreaker v0.5.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.0 // indirect diff --git a/go.sum b/go.sum index 0c69f29c..2a3b7cbf 100644 --- a/go.sum +++ b/go.sum @@ -1065,8 +1065,9 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo= github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88= +github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -1189,7 +1190,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= -github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= @@ -1267,8 +1267,9 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= +github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek= +github.com/ethereum/go-ethereum v1.13.10/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -1637,8 +1638,9 @@ github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= @@ -1710,7 +1712,6 @@ github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7Bd github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk= -github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= @@ -2008,8 +2009,8 @@ github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240402160548-a9c331660956 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240402160548-a9c331660956/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240402160548-a9c331660956 h1:Ef9UKtwNcHVG2R8YskYiwRoaTZFhAVmQ0ZN3c0eDUGU= github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240402160548-a9c331660956/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE= -github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240403221216-33c1de004dc1 h1:HqAjOF/BndZMTMHF96a90i97UwjyvgZQDupM2WGJFFM= -github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240403221216-33c1de004dc1/go.mod h1:IB2SxxipIJKEex9fD35R+a7FsR86vAefOCHp21ky3fU= +github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240409075958-ccbe91096438 h1:ciH5Mtb0j3KPogSUPNinho/QNckvO7l0XbzMsmNNucc= +github.com/onflow/flow-go v0.34.0-crescendo-preview.9.0.20240409075958-ccbe91096438/go.mod h1:EZYgaYQ8SUpvUL+0Dr+NRNgmrCz7UFy4dIu35b+qF2c= github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo= github.com/onflow/flow-go-sdk v1.0.0-preview.17 h1:RDW+FCKWJBCX7U6bK7ZEBVqBrhdNS9CIAV+xvVeLLYY= github.com/onflow/flow-go-sdk v1.0.0-preview.17/go.mod h1:2XygOoc/RN2c28o3vebEc3TLhzfAviOEwpn2yQJHojQ= @@ -2020,6 +2021,8 @@ github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240402163945-74687e7a5b9d/g github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E= github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= +github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc= +github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= @@ -2204,8 +2207,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= -github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2415,7 +2416,6 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -2708,7 +2708,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From bb6be02282f0cd218a6c11b3b7a515c3a8ac9328 Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Tue, 9 Apr 2024 10:27:49 +0200 Subject: [PATCH 3/5] update api changes --- adapters/access.go | 66 +++++++++++++++++++++++++++++---- server/access/grpc.go | 21 ++++++----- server/access/rest.go | 23 ++++++------ server/access/streamBackend.go | 68 +++++++++++++++++++++++++--------- storage/migration/cadence1.go | 27 +++++++------- 5 files changed, 144 insertions(+), 61 deletions(-) diff --git a/adapters/access.go b/adapters/access.go index d141059a..d5377421 100644 --- a/adapters/access.go +++ b/adapters/access.go @@ -22,19 +22,19 @@ import ( "context" "fmt" - "github.com/onflow/flow/protobuf/go/flow/entities" - jsoncdc "github.com/onflow/cadence/encoding/json" - "github.com/onflow/flow-emulator/emulator" - "github.com/onflow/flow-emulator/types" - "github.com/onflow/flow-emulator/utils" + "github.com/onflow/flow-go/access" + "github.com/onflow/flow-go/engine/access/subscription" + "github.com/onflow/flow-go/engine/common/rpc/convert" + flowgo "github.com/onflow/flow-go/model/flow" + "github.com/onflow/flow/protobuf/go/flow/entities" "github.com/rs/zerolog" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/onflow/flow-go/access" - "github.com/onflow/flow-go/engine/common/rpc/convert" - flowgo "github.com/onflow/flow-go/model/flow" + "github.com/onflow/flow-emulator/emulator" + "github.com/onflow/flow-emulator/types" + "github.com/onflow/flow-emulator/utils" ) var _ access.API = &AccessAdapter{} @@ -45,6 +45,56 @@ type AccessAdapter struct { emulator emulator.Emulator } +func (a *AccessAdapter) SubscribeBlocksFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlocksFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlocksFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (a *AccessAdapter) SubscribeTransactionStatuses(ctx context.Context, tx *flowgo.TransactionBody) subscription.Subscription { + //TODO implement me + panic("implement me") +} + // NewAccessAdapter returns a new AccessAdapter. func NewAccessAdapter(logger *zerolog.Logger, emulator emulator.Emulator) *AccessAdapter { return &AccessAdapter{ diff --git a/server/access/grpc.go b/server/access/grpc.go index 389d36b0..88174918 100644 --- a/server/access/grpc.go +++ b/server/access/grpc.go @@ -22,23 +22,24 @@ import ( "fmt" "net" - "github.com/onflow/flow-emulator/adapters" - "github.com/onflow/flow-emulator/emulator" - mockModule "github.com/onflow/flow-go/module/mock" - grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/onflow/flow-go/access" legacyaccess "github.com/onflow/flow-go/access/legacy" "github.com/onflow/flow-go/engine/access/state_stream" "github.com/onflow/flow-go/engine/access/state_stream/backend" + "github.com/onflow/flow-go/engine/access/subscription" "github.com/onflow/flow-go/model/flow" flowgo "github.com/onflow/flow-go/model/flow" + mockModule "github.com/onflow/flow-go/module/mock" accessproto "github.com/onflow/flow/protobuf/go/flow/access" "github.com/onflow/flow/protobuf/go/flow/executiondata" legacyaccessproto "github.com/onflow/flow/protobuf/go/flow/legacy/access" "github.com/rs/zerolog" "google.golang.org/grpc" "google.golang.org/grpc/reflection" + + "github.com/onflow/flow-emulator/adapters" + "github.com/onflow/flow-emulator/emulator" ) type mockHeaderCache struct { @@ -67,7 +68,7 @@ func NewGRPCServer(logger *zerolog.Logger, blockchain *emulator.Blockchain, adap me.On("NodeID").Return(flowgo.ZeroID) legacyaccessproto.RegisterAccessAPIServer(grpcServer, legacyaccess.NewHandler(adapter, chain)) - accessproto.RegisterAccessAPIServer(grpcServer, access.NewHandler(adapter, chain, mockHeaderCache{}, me)) + accessproto.RegisterAccessAPIServer(grpcServer, access.NewHandler(adapter, chain, mockHeaderCache{}, me, subscription.DefaultMaxGlobalStreams)) grpcprometheus.Register(grpcServer) @@ -78,11 +79,11 @@ func NewGRPCServer(logger *zerolog.Logger, blockchain *emulator.Blockchain, adap streamConfig := backend.Config{ EventFilterConfig: state_stream.DefaultEventFilterConfig, RpcMetricsEnabled: false, - MaxGlobalStreams: state_stream.DefaultMaxGlobalStreams, - ClientSendTimeout: state_stream.DefaultSendTimeout, - ClientSendBufferSize: state_stream.DefaultSendBufferSize, - ResponseLimit: state_stream.DefaultResponseLimit, - HeartbeatInterval: state_stream.DefaultHeartbeatInterval, + MaxGlobalStreams: subscription.DefaultMaxGlobalStreams, + ClientSendTimeout: subscription.DefaultSendTimeout, + ClientSendBufferSize: subscription.DefaultSendBufferSize, + ResponseLimit: subscription.DefaultResponseLimit, + HeartbeatInterval: subscription.DefaultHeartbeatInterval, } streamBackend := NewStateStreamBackend(blockchain, *logger) handler := backend.NewHandler(streamBackend, chain, streamConfig) diff --git a/server/access/rest.go b/server/access/rest.go index 9db3747b..309d2879 100644 --- a/server/access/rest.go +++ b/server/access/rest.go @@ -26,20 +26,19 @@ import ( "net/http" "os" - "github.com/onflow/flow-go/engine/access/state_stream" - "github.com/onflow/flow-go/engine/access/state_stream/backend" - "github.com/prometheus/client_golang/prometheus" - "github.com/rs/zerolog" - - "github.com/onflow/flow-emulator/emulator" - "github.com/onflow/flow-go/engine/access/rest" "github.com/onflow/flow-go/engine/access/rest/routes" + "github.com/onflow/flow-go/engine/access/state_stream" + "github.com/onflow/flow-go/engine/access/state_stream/backend" + "github.com/onflow/flow-go/engine/access/subscription" "github.com/onflow/flow-go/model/flow" "github.com/onflow/flow-go/module" "github.com/onflow/flow-go/module/metrics" + "github.com/prometheus/client_golang/prometheus" + "github.com/rs/zerolog" "github.com/onflow/flow-emulator/adapters" + "github.com/onflow/flow-emulator/emulator" ) type RestServer struct { @@ -101,11 +100,11 @@ func NewRestServer(logger *zerolog.Logger, blockchain *emulator.Blockchain, adap streamConfig := backend.Config{ EventFilterConfig: state_stream.DefaultEventFilterConfig, RpcMetricsEnabled: false, - MaxGlobalStreams: state_stream.DefaultMaxGlobalStreams, - ClientSendTimeout: state_stream.DefaultSendTimeout, - ClientSendBufferSize: state_stream.DefaultSendBufferSize, - ResponseLimit: state_stream.DefaultResponseLimit, - HeartbeatInterval: state_stream.DefaultHeartbeatInterval, + MaxGlobalStreams: subscription.DefaultMaxGlobalStreams, + ClientSendTimeout: subscription.DefaultSendTimeout, + ClientSendBufferSize: subscription.DefaultSendBufferSize, + ResponseLimit: subscription.DefaultResponseLimit, + HeartbeatInterval: subscription.DefaultHeartbeatInterval, } srv, err := rest.NewServer( diff --git a/server/access/streamBackend.go b/server/access/streamBackend.go index 824582fe..f1f4445b 100644 --- a/server/access/streamBackend.go +++ b/server/access/streamBackend.go @@ -24,19 +24,20 @@ import ( "fmt" "time" - "github.com/onflow/flow-emulator/emulator" - "github.com/onflow/flow-emulator/types" "github.com/onflow/flow-go/engine/access/state_stream" "github.com/onflow/flow-go/engine/access/state_stream/backend" + "github.com/onflow/flow-go/engine/access/subscription" "github.com/onflow/flow-go/engine/common/rpc" - "github.com/onflow/flow-go/storage" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "github.com/onflow/flow-go/model/flow" "github.com/onflow/flow-go/module/executiondatasync/execution_data" + "github.com/onflow/flow-go/storage" "github.com/onflow/flow-go/utils/logging" "github.com/rs/zerolog" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/onflow/flow-emulator/emulator" + "github.com/onflow/flow-emulator/types" ) type StateStreamBackend struct { @@ -51,13 +52,43 @@ type StateStreamBackend struct { getStartHeight GetStartHeightFunc } +func (b *StateStreamBackend) SubscribeEventsFromStartBlockID(ctx context.Context, startBlockID flow.Identifier, filter state_stream.EventFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (b *StateStreamBackend) SubscribeEventsFromStartHeight(ctx context.Context, startHeight uint64, filter state_stream.EventFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (b *StateStreamBackend) SubscribeEventsFromLatest(ctx context.Context, filter state_stream.EventFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromStartBlockID(ctx context.Context, startBlockID flow.Identifier, filter state_stream.AccountStatusFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromStartHeight(ctx context.Context, startHeight uint64, filter state_stream.AccountStatusFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromLatestBlock(ctx context.Context, filter state_stream.AccountStatusFilter) subscription.Subscription { + //TODO implement me + panic("implement me") +} + func NewStateStreamBackend(blockchain *emulator.Blockchain, log zerolog.Logger) *StateStreamBackend { return &StateStreamBackend{ blockchain: blockchain, log: log, - sendTimeout: state_stream.DefaultSendTimeout, - responseLimit: state_stream.DefaultResponseLimit, - sendBufferSize: state_stream.DefaultSendBufferSize, + sendTimeout: subscription.DefaultSendTimeout, + responseLimit: subscription.DefaultResponseLimit, + sendBufferSize: subscription.DefaultSendBufferSize, getExecutionData: getExecutionDataFunc(blockchain), getStartHeight: getStartHeightFunc(blockchain), } @@ -183,15 +214,15 @@ func (b *StateStreamBackend) GetExecutionDataByBlockID(ctx context.Context, bloc return executionData.BlockExecutionData, nil } -func (b *StateStreamBackend) SubscribeExecutionData(ctx context.Context, startBlockID flow.Identifier, startHeight uint64) state_stream.Subscription { +func (b *StateStreamBackend) SubscribeExecutionData(ctx context.Context, startBlockID flow.Identifier, startHeight uint64) subscription.Subscription { nextHeight, err := b.getStartHeight(startBlockID, startHeight) if err != nil { - return backend.NewFailedSubscription(err, "could not get start height") + return subscription.NewFailedSubscription(err, "could not get start height") } - sub := backend.NewHeightBasedSubscription(b.sendBufferSize, nextHeight, b.getResponse) + sub := subscription.NewHeightBasedSubscription(b.sendBufferSize, nextHeight, b.getResponse) - go backend.NewStreamer(b.log, b.blockchain.Broadcaster(), b.sendTimeout, b.responseLimit, sub).Stream(ctx) + go subscription.NewStreamer(b.log, b.blockchain.Broadcaster(), b.sendTimeout, b.responseLimit, sub).Stream(ctx) return sub } @@ -209,22 +240,23 @@ func (b *StateStreamBackend) getResponse(ctx context.Context, height uint64) (in } type GetExecutionDataFunc func(context.Context, uint64) (*execution_data.BlockExecutionDataEntity, error) + type GetStartHeightFunc func(flow.Identifier, uint64) (uint64, error) -func (b StateStreamBackend) SubscribeEvents(ctx context.Context, startBlockID flow.Identifier, startHeight uint64, filter state_stream.EventFilter) state_stream.Subscription { +func (b StateStreamBackend) SubscribeEvents(ctx context.Context, startBlockID flow.Identifier, startHeight uint64, filter state_stream.EventFilter) subscription.Subscription { nextHeight, err := b.getStartHeight(startBlockID, startHeight) if err != nil { - return backend.NewFailedSubscription(err, "could not get start height") + return subscription.NewFailedSubscription(err, "could not get start height") } - sub := backend.NewHeightBasedSubscription(b.sendBufferSize, nextHeight, b.getResponseFactory(filter)) + sub := subscription.NewHeightBasedSubscription(b.sendBufferSize, nextHeight, b.getResponseFactory(filter)) - go backend.NewStreamer(b.log, b.blockchain.Broadcaster(), b.sendTimeout, b.responseLimit, sub).Stream(ctx) + go subscription.NewStreamer(b.log, b.blockchain.Broadcaster(), b.sendTimeout, b.responseLimit, sub).Stream(ctx) return sub } -func (b StateStreamBackend) getResponseFactory(filter state_stream.EventFilter) backend.GetDataByHeightFunc { +func (b StateStreamBackend) getResponseFactory(filter state_stream.EventFilter) subscription.GetDataByHeightFunc { return func(ctx context.Context, height uint64) (interface{}, error) { executionData, err := b.getExecutionData(ctx, height) if err != nil { diff --git a/storage/migration/cadence1.go b/storage/migration/cadence1.go index 228b9e60..ac6d642b 100644 --- a/storage/migration/cadence1.go +++ b/storage/migration/cadence1.go @@ -22,13 +22,12 @@ import ( "runtime" "github.com/onflow/flow-go/cmd/util/ledger/migrations" + "github.com/onflow/flow-go/cmd/util/ledger/reporters" + "github.com/onflow/flow-go/cmd/util/ledger/util" "github.com/onflow/flow-go/model/flow" "github.com/rs/zerolog" "github.com/onflow/flow-emulator/storage/sqlite" - - "github.com/onflow/flow-go/cmd/util/ledger/reporters" - "github.com/onflow/flow-go/cmd/util/ledger/util" ) func MigrateCadence1( @@ -50,16 +49,18 @@ func MigrateCadence1( cadence1Migrations := migrations.NewCadence1Migrations( logger, rwf, - nWorker, - flow.Emulator, - false, - false, - false, - evmContractChange, - burnerContractChange, - stagedContracts, - false, - 0, + migrations.Options{ + NWorker: nWorker, + DiffMigrations: false, + LogVerboseDiff: false, + CheckStorageHealthBeforeMigration: false, + ChainID: flow.Emulator, + EVMContractChange: evmContractChange, + BurnerContractChange: burnerContractChange, + StagedContracts: stagedContracts, + Prune: false, + MaxAccountSize: 0, + }, ) for _, migration := range cadence1Migrations { From 27cb9bd3642b211efc38565cb294b720baa2416e Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Tue, 9 Apr 2024 10:33:02 +0200 Subject: [PATCH 4/5] missing methods --- server/access/streamBackend.go | 76 ++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/server/access/streamBackend.go b/server/access/streamBackend.go index f1f4445b..d676b18e 100644 --- a/server/access/streamBackend.go +++ b/server/access/streamBackend.go @@ -52,36 +52,6 @@ type StateStreamBackend struct { getStartHeight GetStartHeightFunc } -func (b *StateStreamBackend) SubscribeEventsFromStartBlockID(ctx context.Context, startBlockID flow.Identifier, filter state_stream.EventFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (b *StateStreamBackend) SubscribeEventsFromStartHeight(ctx context.Context, startHeight uint64, filter state_stream.EventFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (b *StateStreamBackend) SubscribeEventsFromLatest(ctx context.Context, filter state_stream.EventFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (b *StateStreamBackend) SubscribeAccountStatusesFromStartBlockID(ctx context.Context, startBlockID flow.Identifier, filter state_stream.AccountStatusFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (b *StateStreamBackend) SubscribeAccountStatusesFromStartHeight(ctx context.Context, startHeight uint64, filter state_stream.AccountStatusFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (b *StateStreamBackend) SubscribeAccountStatusesFromLatestBlock(ctx context.Context, filter state_stream.AccountStatusFilter) subscription.Subscription { - //TODO implement me - panic("implement me") -} - func NewStateStreamBackend(blockchain *emulator.Blockchain, log zerolog.Logger) *StateStreamBackend { return &StateStreamBackend{ blockchain: blockchain, @@ -96,6 +66,52 @@ func NewStateStreamBackend(blockchain *emulator.Blockchain, log zerolog.Logger) var _ state_stream.API = &StateStreamBackend{} +func (b *StateStreamBackend) SubscribeEventsFromStartBlockID( + ctx context.Context, + startBlockID flow.Identifier, + filter state_stream.EventFilter, +) subscription.Subscription { + return nil +} + +func (b *StateStreamBackend) SubscribeEventsFromStartHeight( + ctx context.Context, + startHeight uint64, + filter state_stream.EventFilter, +) subscription.Subscription { + return nil +} + +func (b *StateStreamBackend) SubscribeEventsFromLatest( + ctx context.Context, + filter state_stream.EventFilter, +) subscription.Subscription { + return nil +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromStartBlockID( + ctx context.Context, + startBlockID flow.Identifier, + filter state_stream.AccountStatusFilter, +) subscription.Subscription { + return nil +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromStartHeight( + ctx context.Context, + startHeight uint64, + filter state_stream.AccountStatusFilter, +) subscription.Subscription { + return nil +} + +func (b *StateStreamBackend) SubscribeAccountStatusesFromLatestBlock( + ctx context.Context, + filter state_stream.AccountStatusFilter, +) subscription.Subscription { + return nil +} + func getStartHeightFunc(blockchain *emulator.Blockchain) GetStartHeightFunc { return func(blockID flow.Identifier, height uint64) (uint64, error) { // try with start at blockID From 64051af62dee7ead9fbbcefe291c576b031dddff Mon Sep 17 00:00:00 2001 From: Gregor Gololicic Date: Tue, 9 Apr 2024 10:35:40 +0200 Subject: [PATCH 5/5] add missing --- adapters/access.go | 90 +++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) diff --git a/adapters/access.go b/adapters/access.go index d5377421..60b5406c 100644 --- a/adapters/access.go +++ b/adapters/access.go @@ -45,56 +45,6 @@ type AccessAdapter struct { emulator emulator.Emulator } -func (a *AccessAdapter) SubscribeBlocksFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlocksFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlocksFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockHeadersFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockHeadersFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockHeadersFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockDigestsFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockDigestsFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeBlockDigestsFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { - //TODO implement me - panic("implement me") -} - -func (a *AccessAdapter) SubscribeTransactionStatuses(ctx context.Context, tx *flowgo.TransactionBody) subscription.Subscription { - //TODO implement me - panic("implement me") -} - // NewAccessAdapter returns a new AccessAdapter. func NewAccessAdapter(logger *zerolog.Logger, emulator emulator.Emulator) *AccessAdapter { return &AccessAdapter{ @@ -550,6 +500,46 @@ func (a *AccessAdapter) GetNodeVersionInfo( return nil, fmt.Errorf("not supported") } +func (a *AccessAdapter) SubscribeBlocksFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlocksFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlocksFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockHeadersFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromStartBlockID(ctx context.Context, startBlockID flowgo.Identifier, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromStartHeight(ctx context.Context, startHeight uint64, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeBlockDigestsFromLatest(ctx context.Context, blockStatus flowgo.BlockStatus) subscription.Subscription { + return nil +} + +func (a *AccessAdapter) SubscribeTransactionStatuses(ctx context.Context, tx *flowgo.TransactionBody) subscription.Subscription { + return nil +} + func ConvertCCFEventsToJsonEvents(events []flowgo.Event) ([]flowgo.Event, error) { converted := make([]flowgo.Event, 0, len(events))