From f0067165464fec404f299bafa7eed0d812068031 Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 10:32:30 -0700 Subject: [PATCH 1/6] Fix the build Author: Miklos Szegedi --- Makefile | 10 ++++++++++ service/tracker/execution.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..a319fc6df --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ + +all: flow-go + go build --tags=relic ./... + +flow-go: clean + git clone https://github.com/onflow/flow-go.git + export _P=$(PWD) && cd ./flow-go/crypto && go generate && go build + +clean: + rm -rf ./flow-go diff --git a/service/tracker/execution.go b/service/tracker/execution.go index 1f29f39f5..11477757f 100644 --- a/service/tracker/execution.go +++ b/service/tracker/execution.go @@ -61,7 +61,7 @@ func NewExecution(log zerolog.Logger, db *badger.DB, stream RecordStreamer) (*Ex return nil, fmt.Errorf("could not retrieve root header: %w", err) } var sealID flow.Identifier - err = db.View(operation.LookupBlockSeal(blockID, &sealID)) + err = db.View(operation.LookupBySealedBlockID(blockID, &sealID)) if err != nil { return nil, fmt.Errorf("could not look up root seal: %w", err) } From 51987366803c43a7b44aa8945a0de7cbe87dceb0 Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 10:43:22 -0700 Subject: [PATCH 2/6] go mod tidy Author: Miklos Szegedi --- go.mod | 8 ++++---- go.sum | 17 +++++++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 67ebe277f..8b093f513 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/onflow/flow-dps -go 1.17 +go 1.18 require ( cloud.google.com/go/storage v1.23.0 @@ -14,7 +14,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2 github.com/hashicorp/go-multierror v1.1.1 github.com/klauspost/compress v1.15.1 - github.com/labstack/echo/v4 v4.5.0 + github.com/labstack/echo/v4 v4.7.2 github.com/onflow/cadence v0.24.3 github.com/onflow/flow-go v0.26.12 github.com/onflow/flow-go-sdk v0.26.2 @@ -26,7 +26,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/srikrsna/protoc-gen-gotag v0.6.1 github.com/stretchr/testify v1.7.1 - github.com/ziflex/lecho/v2 v2.5.1 + github.com/ziflex/lecho/v2 v2.5.2 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f google.golang.org/api v0.85.0 google.golang.org/grpc v1.47.0 @@ -137,7 +137,7 @@ require ( github.com/kevinburke/go-bindata v3.22.0+incompatible // indirect github.com/klauspost/cpuid/v2 v2.0.12 // indirect github.com/koron/go-ssdp v0.0.2 // indirect - github.com/labstack/gommon v0.3.0 // indirect + github.com/labstack/gommon v0.3.1 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/libp2p/go-buffer-pool v0.0.2 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect diff --git a/go.sum b/go.sum index b3695e3a4..361451c19 100644 --- a/go.sum +++ b/go.sum @@ -829,10 +829,12 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo/v4 v4.5.0 h1:JXk6H5PAw9I3GwizqUHhYyS4f45iyGebR/c1xNCeOCY= -github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= -github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= +github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k= +github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI= +github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= +github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= @@ -1172,6 +1174,7 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= @@ -1509,7 +1512,7 @@ github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubr github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= -github.com/rs/zerolog v1.24.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= +github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -1699,8 +1702,8 @@ github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= -github.com/ziflex/lecho/v2 v2.5.1 h1:Qw8XYmlXpuxZIFsZRgODLd/gyasyhMMvt4t+cmKtv7M= -github.com/ziflex/lecho/v2 v2.5.1/go.mod h1:qJLHJa+1MZpgpAQK84xBlctSJ2hCF4gB+53FgRW0wRg= +github.com/ziflex/lecho/v2 v2.5.2 h1:MLCNS5BflZf1c7draa2vUK5gFkyL6dGWPhfYB+eXu9Y= +github.com/ziflex/lecho/v2 v2.5.2/go.mod h1:sqrt0SoTqEi1+oHrw3aOlMJNatEEiq7TflLPAM/aLlA= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -1906,6 +1909,7 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -2065,6 +2069,7 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025112917-711f33c9992c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From f08965c8faa6b160c84d6ccf9fc67fdddbe829d2 Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 10:58:17 -0700 Subject: [PATCH 3/6] Use Go 1.18 in CI Author: Miklos Szegedi --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e4b9bc3c..38324a8c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.18 - name: Cache Go modules uses: actions/cache@v2 From f3bbefdb8a2fb896c081da92ca9728c8208168b3 Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 11:45:57 -0700 Subject: [PATCH 4/6] Fix protoc 3.19.4 in CI Author: Miklos Szegedi --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38324a8c1..982a42c26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,8 @@ jobs: - name: Install Protobuf compiler run: | PB_REL="https://github.com/protocolbuffers/protobuf/releases" - curl -LO $PB_REL/download/v3.17.3/protoc-3.17.3-linux-x86_64.zip - unzip protoc-3.17.3-linux-x86_64.zip -d $HOME/.local + curl -LO $PB_REL/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d $HOME/.local export PATH="$PATH:$HOME/.local/bin" git clean -fd From 22113319bf819118a28d8a6fd814ef99a42329ed Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 11:53:07 -0700 Subject: [PATCH 5/6] Fix crypto Author: Miklos Szegedi --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8b093f513..ce81330a8 100644 --- a/go.mod +++ b/go.mod @@ -280,4 +280,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -// replace github.com/onflow/flow-go/crypto => ../flow-go/crypto +replace github.com/onflow/flow-go/crypto => ./flow-go/crypto From 7cbe2b22ab3f29672d597b10788da7681829b593 Mon Sep 17 00:00:00 2001 From: GetElastech Date: Wed, 6 Jul 2022 12:29:06 -0700 Subject: [PATCH 6/6] Address review comments Author: Miklos Szegedi Reviewer: Peter Argue --- service/tracker/execution.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/tracker/execution.go b/service/tracker/execution.go index 11477757f..be0957f17 100644 --- a/service/tracker/execution.go +++ b/service/tracker/execution.go @@ -61,7 +61,7 @@ func NewExecution(log zerolog.Logger, db *badger.DB, stream RecordStreamer) (*Ex return nil, fmt.Errorf("could not retrieve root header: %w", err) } var sealID flow.Identifier - err = db.View(operation.LookupBySealedBlockID(blockID, &sealID)) + err = db.View(operation.LookupLatestSealAtBlock(blockID, &sealID)) if err != nil { return nil, fmt.Errorf("could not look up root seal: %w", err) }