From 513cd6de091706b268c78092ac87d62995c22f29 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Fri, 23 Sep 2022 15:02:28 -0400 Subject: [PATCH 1/3] dependency updates for geth 1.10.25 --- go.mod | 12 ++++++------ go.sum | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index dcde08b7..6d0c7cea 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/cerc-io/ipld-eth-server/v4 go 1.18 require ( - github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.8-alpha - github.com/cerc-io/ipfs-ethdb/v4 v4.0.8-alpha - github.com/ethereum/go-ethereum v1.10.23 + github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.9-alpha + github.com/cerc-io/ipfs-ethdb/v4 v4.0.9-alpha + github.com/ethereum/go-ethereum v1.10.25 github.com/graph-gophers/graphql-go v1.3.0 github.com/ipfs/go-block-format v0.0.3 github.com/ipfs/go-cid v0.2.0 @@ -23,7 +23,7 @@ require ( github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.11.0 - github.com/vulcanize/gap-filler v0.4.0 + github.com/vulcanize/gap-filler v0.4.1 gorm.io/driver/postgres v1.3.7 gorm.io/gorm v1.23.5 ) @@ -41,7 +41,7 @@ require ( github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect - github.com/cerc-io/go-eth-state-node-iterator v1.1.7 // indirect + github.com/cerc-io/go-eth-state-node-iterator v1.1.8 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/containerd/cgroups v1.0.3 // indirect @@ -293,4 +293,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/cerc-io/go-ethereum v1.10.23-statediff-4.2.0-alpha +replace github.com/ethereum/go-ethereum v1.10.25 => github.com/cerc-io/go-ethereum v1.10.25-statediff-4.2.1-alpha diff --git a/go.sum b/go.sum index 6688b27f..a0c50fa2 100644 --- a/go.sum +++ b/go.sum @@ -145,14 +145,14 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/ceramicnetwork/go-dag-jose v0.1.0 h1:yJ/HVlfKpnD3LdYP03AHyTvbm3BpPiz2oZiOeReJRdU= -github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.8-alpha h1:q3PNFMMruwRbI0lsV/TFFeFuP05jl8fvbJnC02z0m3A= -github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.8-alpha/go.mod h1:1Pzc5tCwAVa9gcOMAXlAeFD8VXIypF7mI5Tyr8PFLVs= -github.com/cerc-io/go-eth-state-node-iterator v1.1.7 h1:i4zCKkfowJ4aUVpqVyMpOZIbD5WVm/iijhMAPgcLJ44= -github.com/cerc-io/go-eth-state-node-iterator v1.1.7/go.mod h1:BBh4BetpBoHUbAiKAdatR3ij7IzDlgN9nPzZ7snn/lo= -github.com/cerc-io/go-ethereum v1.10.23-statediff-4.2.0-alpha h1:Na4mum/Qkw1mRHnq/TIRPIF5exZAEBznVs3G3/YSENo= -github.com/cerc-io/go-ethereum v1.10.23-statediff-4.2.0-alpha/go.mod h1:lKBVBWksSwBDR/5D9CAxaGQzDPIS3ueWb6idy7X1Shg= -github.com/cerc-io/ipfs-ethdb/v4 v4.0.8-alpha h1:+05O+US8WosZO9RP3i1j9B0QpBYwg9SlhJeBdRBgzgA= -github.com/cerc-io/ipfs-ethdb/v4 v4.0.8-alpha/go.mod h1:3zlBgkDTgSLlgMgY8BttUzQxxVAzZQ1jZUH4qaP09Pc= +github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.9-alpha h1:DnvtP8HG+MGMbYd9fUiMExfOG4Sh2fyzNXBxTBgaszk= +github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.9-alpha/go.mod h1:ICCf43FMljndh257VarEYejb+hK8i8n83Kd8mxHinwk= +github.com/cerc-io/go-eth-state-node-iterator v1.1.8 h1:DKXrvxRbWuAJWAAEeEL4IQOf7mKLcwfgwN9IiohzAv0= +github.com/cerc-io/go-eth-state-node-iterator v1.1.8/go.mod h1:rj+3CZ0Vf9uiS1M0gYzfapMUNZbxpA5HDVyRkiOU6Kc= +github.com/cerc-io/go-ethereum v1.10.25-statediff-4.2.1-alpha h1:SDzJBohLSNO9sFYXqtwJWuYjg+fxxJ/2IpnHZw4x03o= +github.com/cerc-io/go-ethereum v1.10.25-statediff-4.2.1-alpha/go.mod h1:lKBVBWksSwBDR/5D9CAxaGQzDPIS3ueWb6idy7X1Shg= +github.com/cerc-io/ipfs-ethdb/v4 v4.0.9-alpha h1:MKPRU/BjC7Z9XzWFJ/6ceX26NlnK4bjAhoCbiAdQ4NI= +github.com/cerc-io/ipfs-ethdb/v4 v4.0.9-alpha/go.mod h1:ygzT8+1pHIsf+LgMALrAlp1LrsKkb8Cp+su6ANoq3oQ= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -1784,8 +1784,8 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= -github.com/vulcanize/gap-filler v0.4.0 h1:5VD9PG7UrjEub4rLxZmstWoHnBnVtXz9silIVdrnTsM= -github.com/vulcanize/gap-filler v0.4.0/go.mod h1:5awUyotIoJi6AuG0JPEm7SIwFZBD7Ecg0I8x7CdxcHI= +github.com/vulcanize/gap-filler v0.4.1 h1:7bIkhevmki7ddzaMOQwjTZw5Rl3FBE5qSzklN9LAQ1s= +github.com/vulcanize/gap-filler v0.4.1/go.mod h1:ntZYON20Itj/6vlzSGZWIbY/UgnnvR9GBUmb/hmxuNw= github.com/wI2L/jsondiff v0.2.0 h1:dE00WemBa1uCjrzQUUTE/17I6m5qAaN0EMFOg2Ynr/k= github.com/wI2L/jsondiff v0.2.0/go.mod h1:axTcwtBkY4TsKuV+RgoMhHyHKKFRI6nnjRLi8LLYQnA= github.com/wangjia184/sortedset v0.0.0-20160527075905-f5d03557ba30/go.mod h1:YkocrP2K2tcw938x9gCOmT5G5eCD6jsTz0SZuyAqwIE= -- 2.45.2 From 24df1f186eb23d79cfaf613271e8a897b73f8966 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Fri, 23 Sep 2022 17:03:09 -0400 Subject: [PATCH 2/3] pr publish cleanup/refactor --- .github/workflows/on-pr-publish.yaml | 45 ++++++++-------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index 6b07b704..a4c9e19c 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -29,8 +29,8 @@ jobs: BUILD_KEY: ${{ secrets.BUILD_KEY }} with: STACK_ORCHESTRATOR_REF: "f2fd766f5400fcb9eb47b50675d2e3b1f2753702" - GO_ETHEREUM_REF: "0c1e451c9865d8d47797b35526c4875f0d224772" - IPLD_ETH_DB_REF: "be345e0733d2c025e4082c5154e441317ae94cf7" + GO_ETHEREUM_REF: "2ddad81c1a04ff494a706f2f757a0f75d2616fbd" + IPLD_ETH_DB_REF: "d4d704616ba0f87733853c78787bf54c9868d2ac" build: name: Run docker build runs-on: ubuntu-latest @@ -41,39 +41,20 @@ jobs: github.event_name == 'release' steps: - uses: actions/checkout@v2 - - name: Get the version - id: vars - run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) - - name: Run docker build - run: make docker-build - - name: Tag docker image - run: docker tag cerc-io/ipld-eth-server git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - - name: Docker Login - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - - name: Docker Push - run: docker push git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - - push_to_registries: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - if: | - always() && - (needs.build.result == 'success') && - github.event_name == 'release' - needs: build - steps: - name: Get the version id: vars run: | echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) - - name: Docker Login to Github Registry - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - - name: Docker Pull - run: docker pull git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - - name: Docker Login to Docker Registry - run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin - - name: Tag docker image + - name: Run docker build + run: make docker-build + - name: Tag docker image SHA + run: docker tag cerc-io/ipld-eth-server git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + - name: Tag docker image TAG run: docker tag git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} - - name: Docker Push to Docker Hub - run: docker push cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} + - name: Docker Login + run: echo ${{ secrets.GITEA_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin + - name: Docker Push SHA + run: docker push git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + - name: Docker Push TAG + run: docker push git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.tag}} -- 2.45.2 From 8ce29ab85707a0cd5a7d50647eb57366844f9e21 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Fri, 23 Sep 2022 17:34:03 -0400 Subject: [PATCH 3/3] git.vdb.to fully qualified docker tag --- .github/workflows/on-pr-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index a4c9e19c..cf70b9eb 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -51,7 +51,7 @@ jobs: - name: Tag docker image SHA run: docker tag cerc-io/ipld-eth-server git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} - name: Tag docker image TAG - run: docker tag git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} + run: docker tag git.vdb.to/cerc-io/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} git.vdb.to/cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} - name: Docker Login run: echo ${{ secrets.GITEA_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - name: Docker Push SHA -- 2.45.2