From fc0d7a6dd60767a9343fb9ab5a9374ed70ecb801 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 20 Sep 2022 11:52:06 -0400 Subject: [PATCH] Cerc refactor (#193) * cerc refactor waiting on unpublished dependencies * cerc refactor updates for dependencies * Describe imports got removed * cleaning up more vulcanize refs in ci/cd * another test lost Describe imports * another test lost Describe imports... not caught in go build -a??? * more cerc-io migrations to utilize new git.vdb.to gitea instance * switching back to github for running unit test * first try at git.vdb.to as conatiner repository * targeted tag was incomplete --- .github/workflows/on-pr-publish.yaml | 14 +++++++------- .github/workflows/run_unit_test.sh | 1 + .github/workflows/tests.yaml | 8 ++++---- Dockerfile | 10 +++++----- Makefile | 2 +- README.md | 6 +++--- cmd/root.go | 2 +- cmd/serve.go | 12 ++++++------ cmd/subscribe.go | 6 +++--- cmd/validate.go | 6 +++--- cmd/version.go | 2 +- docker-compose.yml | 2 +- documentation/apis.md | 6 +++--- go.mod | 14 +++++++------- go.sum | 22 ++++++++++++---------- main.go | 2 +- pkg/client/client.go | 4 ++-- pkg/eth/api.go | 2 +- pkg/eth/api_test.go | 9 ++++----- pkg/eth/backend.go | 6 +++--- pkg/eth/cid_retriever.go | 2 +- pkg/eth/cid_retriever_test.go | 7 +++---- pkg/eth/eth_state_test.go | 9 ++++----- pkg/eth/filterer_test.go | 6 +++--- pkg/eth/ipld_fetcher.go | 2 +- pkg/eth/ipld_fetcher_test.go | 6 +++--- pkg/eth/ipld_retriever.go | 4 ++-- pkg/eth/test_helpers/test_data.go | 2 +- pkg/graphql/graphql.go | 4 ++-- pkg/graphql/graphql_test.go | 10 +++++----- pkg/graphql/service.go | 2 +- pkg/net/api_test.go | 2 +- pkg/rpc/ipc.go | 2 +- pkg/rpc/ws.go | 2 +- pkg/serve/api.go | 2 +- pkg/serve/config.go | 4 ++-- pkg/serve/service.go | 4 ++-- test/direct_proxy_integration_test.go | 4 ++-- test/integration_test.go | 4 ++-- test/watch_address_integration_test.go | 2 +- test_config/test_config.go | 2 +- 41 files changed, 109 insertions(+), 109 deletions(-) diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index ff98f2a6..c046ab7d 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -47,11 +47,11 @@ jobs: - name: Run docker build run: make docker-build - name: Tag docker image - run: docker tag vulcanize/ipld-eth-server docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.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: Docker Login - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - name: Docker Push - run: docker push docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + 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 @@ -68,12 +68,12 @@ jobs: 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://docker.pkg.github.com -u vulcanize --password-stdin + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u cerccicd --password-stdin - name: Docker Pull - run: docker pull docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} + 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 - run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} vulcanize/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}} cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} - name: Docker Push to Docker Hub - run: docker push vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}} + run: docker push cerc-io/ipld-eth-server:${{steps.vars.outputs.tag}} diff --git a/.github/workflows/run_unit_test.sh b/.github/workflows/run_unit_test.sh index 24ce36c8..050c074f 100755 --- a/.github/workflows/run_unit_test.sh +++ b/.github/workflows/run_unit_test.sh @@ -13,6 +13,7 @@ cd ipld-eth-server rm -f /tmp/git_head_ref /tmp/git_repository # Spin up DB and run migrations +echo 'docker-compose up -d migrations ipld-eth-db' docker-compose up -d migrations ipld-eth-db trap "docker-compose down -v --remove-orphans; cd $start_dir ; rm -r $temp_dir" SIGINT SIGTERM ERR sleep 30 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9046321d..fcb0c353 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -102,12 +102,12 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ inputs.GO_ETHEREUM_REF }} - repository: vulcanize/go-ethereum + repository: cerc-io/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 with: ref: ${{ inputs.IPLD_ETH_DB_REF }} - repository: vulcanize/ipld-eth-db + repository: cerc-io/ipld-eth-db path: "./ipld-eth-db/" - name: Create config file run: | @@ -170,12 +170,12 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ inputs.GO_ETHEREUM_REF }} - repository: vulcanize/go-ethereum + repository: cerc-io/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 with: ref: ${{ inputs.IPLD_ETH_DB_REF }} - repository: vulcanize/ipld-eth-db + repository: cerc-io/ipld-eth-db path: "./ipld-eth-db/" - name: Create config file run: | diff --git a/Dockerfile b/Dockerfile index bc269fe9..e4bc84eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk --update --no-cache add make git g++ linux-headers RUN apk add busybox-extras # Build ipld-eth-server -WORKDIR /go/src/github.com/vulcanize/ipld-eth-server +WORKDIR /go/src/github.com/cerc-io/ipld-eth-server # Cache the modules ENV GO111MODULE=on @@ -37,13 +37,13 @@ USER $USER # chown first so dir is writable # note: using $USER is merged, but not in the stable release yet -COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipld-eth-server/$CONFIG_FILE config.toml -COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipld-eth-server/entrypoint.sh . +COPY --chown=5000:5000 --from=builder /go/src/github.com/cerc-io/ipld-eth-server/$CONFIG_FILE config.toml +COPY --chown=5000:5000 --from=builder /go/src/github.com/cerc-io/ipld-eth-server/entrypoint.sh . # keep binaries immutable -COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-server/ipld-eth-server ipld-eth-server +COPY --from=builder /go/src/github.com/cerc-io/ipld-eth-server/ipld-eth-server ipld-eth-server COPY --from=builder /goose goose -COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-server/environments environments +COPY --from=builder /go/src/github.com/cerc-io/ipld-eth-server/environments environments ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/Makefile b/Makefile index a45346a4..8d99d56a 100644 --- a/Makefile +++ b/Makefile @@ -135,4 +135,4 @@ import: ## Build docker image .PHONY: docker-build docker-build: - docker build -t vulcanize/ipld-eth-server . + docker build -t cerc-io/ipld-eth-server . diff --git a/README.md b/README.md index b2d6f7f1..3a8355ae 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,14 @@ Minimal build dependencies * This repository External dependency -* Postgres database populated by [ipld-eth-db](https://github.com/vulcanize/ipld-eth-db) +* Postgres database populated by [ipld-eth-db](https://github.com/cerc-io/ipld-eth-db) ## Install Start by downloading ipld-eth-server and moving into the repo: -`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server/v4` +`GO111MODULE=off go get -d github.com/cerc-io/ipld-eth-server/v4` -`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server/v4@v4.x.x` +`cd $GOPATH/src/github.com/cerc-io/ipld-eth-server/v4@v4.x.x` Then, build the binary: diff --git a/cmd/root.go b/cmd/root.go index 3327f3c5..e494ea80 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-server/v4/pkg/prom" + "github.com/cerc-io/ipld-eth-server/v4/pkg/prom" ) var ( diff --git a/cmd/serve.go b/cmd/serve.go index 7f55cdae..59b9fbc4 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -17,6 +17,7 @@ package cmd import ( "errors" + "github.com/mailgun/groupcache/v2" "net/http" "net/url" "os" @@ -26,17 +27,16 @@ import ( "time" "github.com/ethereum/go-ethereum/rpc" - "github.com/mailgun/groupcache/v2" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/vulcanize/gap-filler/pkg/mux" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/graphql" - srpc "github.com/vulcanize/ipld-eth-server/v4/pkg/rpc" - s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve" - v "github.com/vulcanize/ipld-eth-server/v4/version" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/graphql" + srpc "github.com/cerc-io/ipld-eth-server/v4/pkg/rpc" + s "github.com/cerc-io/ipld-eth-server/v4/pkg/serve" + v "github.com/cerc-io/ipld-eth-server/v4/version" ) var ErrNoRpcEndpoints = errors.New("no rpc endpoints is available") diff --git a/cmd/subscribe.go b/cmd/subscribe.go index 50b2c5f0..d99e3e4f 100644 --- a/cmd/subscribe.go +++ b/cmd/subscribe.go @@ -27,9 +27,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-server/v4/pkg/client" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - w "github.com/vulcanize/ipld-eth-server/v4/pkg/serve" + "github.com/cerc-io/ipld-eth-server/v4/pkg/client" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + w "github.com/cerc-io/ipld-eth-server/v4/pkg/serve" ) // subscribeCmd represents the subscribe command diff --git a/cmd/validate.go b/cmd/validate.go index 12acf579..c514f8c2 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -18,14 +18,14 @@ package cmd import ( "time" + validator "github.com/cerc-io/eth-ipfs-state-validator/v4/pkg" + ipfsethdb "github.com/cerc-io/ipfs-ethdb/v4/postgres" "github.com/ethereum/go-ethereum/common" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" - validator "github.com/vulcanize/eth-ipfs-state-validator/v4/pkg" - ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres" - s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve" + s "github.com/cerc-io/ipld-eth-server/v4/pkg/serve" ) const GroupName = "statedb-validate" diff --git a/cmd/version.go b/cmd/version.go index c794915d..2cf2317d 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -19,7 +19,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - v "github.com/vulcanize/ipld-eth-server/v4/version" + v "github.com/cerc-io/ipld-eth-server/v4/version" ) // versionCmd represents the version command diff --git a/docker-compose.yml b/docker-compose.yml index 0a4f7da9..805eac62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: restart: on-failure depends_on: - ipld-eth-db - image: vulcanize/ipld-eth-db:v4.2.1-alpha + image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v4.2.1-alpha-unstable environment: DATABASE_USER: "vdbm" DATABASE_NAME: "vulcanize_testing" diff --git a/documentation/apis.md b/documentation/apis.md index e8db74c0..190e4b22 100644 --- a/documentation/apis.md +++ b/documentation/apis.md @@ -40,9 +40,9 @@ An example of how to subscribe to a real-time Ethereum data feed from ipld-eth-s "github.com/ethereum/go-ethereum/rpc" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-server/v4/pkg/client" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/watch" + "github.com/cerc-io/ipld-eth-server/v4/pkg/client" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/watch" ) config, _ := eth.NewEthSubscriptionConfig() diff --git a/go.mod b/go.mod index 9becddb5..dcde08b7 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ -module github.com/vulcanize/ipld-eth-server/v4 +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/graph-gophers/graphql-go v1.3.0 github.com/ipfs/go-block-format v0.0.3 @@ -18,12 +20,10 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.19.0 github.com/prometheus/client_golang v1.12.1 - github.com/sirupsen/logrus v1.8.1 + github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.11.0 - github.com/vulcanize/eth-ipfs-state-validator/v4 v4.0.7-alpha github.com/vulcanize/gap-filler v0.4.0 - github.com/vulcanize/ipfs-ethdb/v4 v4.0.7-alpha gorm.io/driver/postgres v1.3.7 gorm.io/gorm v1.23.5 ) @@ -41,6 +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/cespare/xxhash/v2 v2.1.2 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/containerd/cgroups v1.0.3 // indirect @@ -256,7 +257,6 @@ require ( github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect github.com/urfave/cli/v2 v2.10.2 // indirect github.com/valyala/fastjson v1.6.3 // indirect - github.com/vulcanize/go-eth-state-node-iterator v1.1.4 // indirect github.com/wI2L/jsondiff v0.2.0 // indirect github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect @@ -279,7 +279,7 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect golang.org/x/tools v0.1.10 // indirect @@ -293,4 +293,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.23 => github.com/vulcanize/go-ethereum v1.10.23-statediff-4.2.0-alpha +replace github.com/ethereum/go-ethereum v1.10.23 => github.com/cerc-io/go-ethereum v1.10.23-statediff-4.2.0-alpha diff --git a/go.sum b/go.sum index 82953363..6688b27f 100644 --- a/go.sum +++ b/go.sum @@ -145,6 +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/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= @@ -1676,8 +1684,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= @@ -1775,16 +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/eth-ipfs-state-validator/v4 v4.0.7-alpha h1:7i5AoYfFKA+67alUSgX9xEGmdsHp7P/2h0+B9wAoccw= -github.com/vulcanize/eth-ipfs-state-validator/v4 v4.0.7-alpha/go.mod h1:rQoGaKZQ2rSOSxnvOY0Z9ZbFdsZwu6IIGNKPRnNFzek= 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/go-eth-state-node-iterator v1.1.4 h1:2jIbgZ/yxrNZt5zmsXtvUPSxT0sP5k1PR5/O1GN/Ma0= -github.com/vulcanize/go-eth-state-node-iterator v1.1.4/go.mod h1:kFzlSi7rUB9mJWZf08xIEiiGuXnnUEn48It+WMHzxPc= -github.com/vulcanize/go-ethereum v1.10.23-statediff-4.2.0-alpha h1:iy1uhdazPIlUJcCu6Kal+hFQiZblTDwSe2i644o167Y= -github.com/vulcanize/go-ethereum v1.10.23-statediff-4.2.0-alpha/go.mod h1:lKBVBWksSwBDR/5D9CAxaGQzDPIS3ueWb6idy7X1Shg= -github.com/vulcanize/ipfs-ethdb/v4 v4.0.7-alpha h1:UdOYaVmK/QaFyUDg44eEcEaNivP6059hmK6Qeh+3Mg8= -github.com/vulcanize/ipfs-ethdb/v4 v4.0.7-alpha/go.mod h1:gK23M2S0428yKsJoiUzBMTMVRt6OdOuFEFPcnO/ksGA= 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= @@ -2195,8 +2196,9 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/main.go b/main.go index 72fb53c8..2e1bb119 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ package main import ( "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/cmd" + "github.com/cerc-io/ipld-eth-server/v4/cmd" ) func main() { diff --git a/pkg/client/client.go b/pkg/client/client.go index 656a564d..524f0c36 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -22,8 +22,8 @@ import ( "github.com/ethereum/go-ethereum/rpc" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/serve" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/serve" ) // Client is used to subscribe to the ipld-eth-server ipld data stream diff --git a/pkg/eth/api.go b/pkg/eth/api.go index bb842469..1dfde7b2 100644 --- a/pkg/eth/api.go +++ b/pkg/eth/api.go @@ -42,7 +42,7 @@ import ( "github.com/ethereum/go-ethereum/statediff" "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) // APIName is the namespace for the watcher's eth api diff --git a/pkg/eth/api_test.go b/pkg/eth/api_test.go index 1dcea155..feb500bf 100644 --- a/pkg/eth/api_test.go +++ b/pkg/eth/api_test.go @@ -21,6 +21,10 @@ import ( "math/big" "strconv" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" + ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" @@ -35,11 +39,6 @@ import ( "github.com/jmoiron/sqlx" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" - ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/eth/backend.go b/pkg/eth/backend.go index e0981ab8..0a1d9517 100644 --- a/pkg/eth/backend.go +++ b/pkg/eth/backend.go @@ -24,6 +24,8 @@ import ( "math/big" "time" + validator "github.com/cerc-io/eth-ipfs-state-validator/v4/pkg" + ipfsethdb "github.com/cerc-io/ipfs-ethdb/v4/postgres" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/consensus" @@ -42,12 +44,10 @@ import ( "github.com/ethereum/go-ethereum/trie" "github.com/jmoiron/sqlx" log "github.com/sirupsen/logrus" - validator "github.com/vulcanize/eth-ipfs-state-validator/v4/pkg" - ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres" ethServerShared "github.com/ethereum/go-ethereum/statediff/indexer/shared" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/eth/cid_retriever.go b/pkg/eth/cid_retriever.go index bab05da3..63302af7 100644 --- a/pkg/eth/cid_retriever.go +++ b/pkg/eth/cid_retriever.go @@ -30,7 +30,7 @@ import ( "gorm.io/driver/postgres" "gorm.io/gorm" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) // Retriever interface for substituting mocks in tests diff --git a/pkg/eth/cid_retriever_test.go b/pkg/eth/cid_retriever_test.go index 5488cb93..29f9c6c8 100644 --- a/pkg/eth/cid_retriever_test.go +++ b/pkg/eth/cid_retriever_test.go @@ -19,6 +19,9 @@ package eth_test import ( "math/big" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" @@ -28,10 +31,6 @@ import ( "github.com/jmoiron/sqlx" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/eth/eth_state_test.go b/pkg/eth/eth_state_test.go index 95f46c5e..2fe62e89 100644 --- a/pkg/eth/eth_state_test.go +++ b/pkg/eth/eth_state_test.go @@ -23,6 +23,10 @@ import ( "math/big" "time" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" + ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" @@ -36,11 +40,6 @@ import ( "github.com/jmoiron/sqlx" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" - ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/eth/filterer_test.go b/pkg/eth/filterer_test.go index 4ce73f16..530ec01a 100644 --- a/pkg/eth/filterer_test.go +++ b/pkg/eth/filterer_test.go @@ -25,9 +25,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/eth/ipld_fetcher.go b/pkg/eth/ipld_fetcher.go index ea435b63..9a686695 100644 --- a/pkg/eth/ipld_fetcher.go +++ b/pkg/eth/ipld_fetcher.go @@ -22,11 +22,11 @@ import ( "math/big" "strconv" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/statediff/indexer/models" "github.com/jmoiron/sqlx" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" ) // Fetcher interface for substituting mocks in tests diff --git a/pkg/eth/ipld_fetcher_test.go b/pkg/eth/ipld_fetcher_test.go index 10ac52e2..38d7d84c 100644 --- a/pkg/eth/ipld_fetcher_test.go +++ b/pkg/eth/ipld_fetcher_test.go @@ -23,9 +23,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) var _ = Describe("IPLDFetcher", func() { diff --git a/pkg/eth/ipld_retriever.go b/pkg/eth/ipld_retriever.go index 5786ae0c..217ab563 100644 --- a/pkg/eth/ipld_retriever.go +++ b/pkg/eth/ipld_retriever.go @@ -20,10 +20,10 @@ import ( "fmt" "strconv" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/statediff/trie_helpers" sdtypes "github.com/ethereum/go-ethereum/statediff/types" "github.com/jmoiron/sqlx" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" @@ -33,7 +33,7 @@ import ( const ( // node type removed value. - // https://github.com/vulcanize/go-ethereum/blob/271f4d01e7e2767ffd8e0cd469bf545be96f2a84/statediff/indexer/helpers.go#L34 + // https://github.com/cerc-io/go-ethereum/blob/271f4d01e7e2767ffd8e0cd469bf545be96f2a84/statediff/indexer/helpers.go#L34 removedNode = 3 RetrieveHeadersByHashesPgStr = `SELECT cid, data diff --git a/pkg/eth/test_helpers/test_data.go b/pkg/eth/test_helpers/test_data.go index df6200f7..2efea8c3 100644 --- a/pkg/eth/test_helpers/test_data.go +++ b/pkg/eth/test_helpers/test_data.go @@ -38,7 +38,7 @@ import ( "github.com/multiformats/go-multihash" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" ) // Test variables diff --git a/pkg/graphql/graphql.go b/pkg/graphql/graphql.go index 798d36e3..9047839d 100644 --- a/pkg/graphql/graphql.go +++ b/pkg/graphql/graphql.go @@ -35,8 +35,8 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) var ( diff --git a/pkg/graphql/graphql_test.go b/pkg/graphql/graphql_test.go index 7c90b3e6..aae047ce 100644 --- a/pkg/graphql/graphql_test.go +++ b/pkg/graphql/graphql_test.go @@ -36,11 +36,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers" - "github.com/vulcanize/ipld-eth-server/v4/pkg/graphql" - "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" - ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-server/v4/pkg/graphql" + "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" + ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) var _ = Describe("GraphQL", func() { diff --git a/pkg/graphql/service.go b/pkg/graphql/service.go index 4df31762..498e221d 100644 --- a/pkg/graphql/service.go +++ b/pkg/graphql/service.go @@ -29,7 +29,7 @@ import ( "github.com/graph-gophers/graphql-go/relay" "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" ) // Service encapsulates a GraphQL service. diff --git a/pkg/net/api_test.go b/pkg/net/api_test.go index 70f249f6..99a8a44a 100644 --- a/pkg/net/api_test.go +++ b/pkg/net/api_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/net" + "github.com/cerc-io/ipld-eth-server/v4/pkg/net" ) var _ = Describe("API", func() { diff --git a/pkg/rpc/ipc.go b/pkg/rpc/ipc.go index f3434331..e18fe4af 100644 --- a/pkg/rpc/ipc.go +++ b/pkg/rpc/ipc.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/netutil" "github.com/ethereum/go-ethereum/rpc" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/prom" + "github.com/cerc-io/ipld-eth-server/v4/pkg/prom" ) var ( diff --git a/pkg/rpc/ws.go b/pkg/rpc/ws.go index 79a977b2..adebac8f 100644 --- a/pkg/rpc/ws.go +++ b/pkg/rpc/ws.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" - "github.com/vulcanize/ipld-eth-server/v4/pkg/prom" + "github.com/cerc-io/ipld-eth-server/v4/pkg/prom" ) // StartWSEndpoint starts a websocket endpoint. diff --git a/pkg/serve/api.go b/pkg/serve/api.go index a59bcca7..aa2d6c3e 100644 --- a/pkg/serve/api.go +++ b/pkg/serve/api.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/statediff/types" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" ) // APIName is the namespace used for the state diffing service API diff --git a/pkg/serve/config.go b/pkg/serve/config.go index f7b1abf1..09e484cb 100644 --- a/pkg/serve/config.go +++ b/pkg/serve/config.go @@ -32,8 +32,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-server/v4/pkg/prom" - ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared" + "github.com/cerc-io/ipld-eth-server/v4/pkg/prom" + ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ) // Env variables diff --git a/pkg/serve/service.go b/pkg/serve/service.go index f556ba10..10f97ee9 100644 --- a/pkg/serve/service.go +++ b/pkg/serve/service.go @@ -31,8 +31,8 @@ import ( "github.com/jmoiron/sqlx" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - "github.com/vulcanize/ipld-eth-server/v4/pkg/net" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + "github.com/cerc-io/ipld-eth-server/v4/pkg/net" ) const ( diff --git a/test/direct_proxy_integration_test.go b/test/direct_proxy_integration_test.go index ef2f5013..e6c980a4 100644 --- a/test/direct_proxy_integration_test.go +++ b/test/direct_proxy_integration_test.go @@ -13,8 +13,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - integration "github.com/vulcanize/ipld-eth-server/v4/test" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + integration "github.com/cerc-io/ipld-eth-server/v4/test" ) var _ = Describe("Integration test", func() { diff --git a/test/integration_test.go b/test/integration_test.go index 02274505..0706df66 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -16,8 +16,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-server/v4/pkg/eth" - integration "github.com/vulcanize/ipld-eth-server/v4/test" + "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" + integration "github.com/cerc-io/ipld-eth-server/v4/test" ) const nonExistingBlockHash = "0x111111111111111111111111111111111111111111111111111111111111111" diff --git a/test/watch_address_integration_test.go b/test/watch_address_integration_test.go index 20d31bd0..ffa00aee 100644 --- a/test/watch_address_integration_test.go +++ b/test/watch_address_integration_test.go @@ -13,7 +13,7 @@ import ( sdtypes "github.com/ethereum/go-ethereum/statediff/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - integration "github.com/vulcanize/ipld-eth-server/v4/test" + integration "github.com/cerc-io/ipld-eth-server/v4/test" ) var ( diff --git a/test_config/test_config.go b/test_config/test_config.go index cc2d0eb8..db0d36c2 100644 --- a/test_config/test_config.go +++ b/test_config/test_config.go @@ -33,7 +33,7 @@ func init() { func setTestConfig() { vip := viper.New() vip.SetConfigName("testing") - vip.AddConfigPath("$GOPATH/src/github.com/vulcanize/ipld-eth-server/environments/") + vip.AddConfigPath("$GOPATH/src/github.com/cerc-io/ipld-eth-server/environments/") if err := vip.ReadInConfig(); err != nil { logrus.Fatal(err) }