From 44ccf2bd0ba1d1262a808ba55f492f81ec343789 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Wed, 14 Sep 2022 01:20:16 -0400 Subject: [PATCH] cerc refactor waiting on unpublished dependencies --- Dockerfile | 10 +++++----- 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 | 10 +++++----- main.go | 2 +- pkg/client/client.go | 4 ++-- pkg/eth/api.go | 2 +- pkg/eth/api_test.go | 11 ++++------- pkg/eth/backend.go | 6 +++--- pkg/eth/cid_retriever.go | 2 +- pkg/eth/cid_retriever_test.go | 9 +++------ pkg/eth/eth_state_test.go | 11 ++++------- pkg/eth/filterer_test.go | 6 +++--- pkg/eth/ipld_fetcher.go | 2 +- pkg/eth/ipld_fetcher_test.go | 6 +++--- pkg/eth/ipld_retriever.go | 2 +- 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 +- 36 files changed, 81 insertions(+), 90 deletions(-) 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/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..2102d943 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: cerc-io/ipld-eth-db:v4.2.1-alpha 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..9134c78d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vulcanize/ipld-eth-server/v4 +module github.com/cerc-io/ipld-eth-server/v4 go 1.18 @@ -21,9 +21,9 @@ require ( github.com/sirupsen/logrus v1.8.1 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/cerc-io/eth-ipfs-state-validator/v4 v4.0.8-alpha github.com/vulcanize/gap-filler v0.4.0 - github.com/vulcanize/ipfs-ethdb/v4 v4.0.7-alpha + github.com/cerc-io/ipfs-ethdb/v4 v4.0.8-alpha gorm.io/driver/postgres v1.3.7 gorm.io/gorm v1.23.5 ) @@ -256,7 +256,7 @@ 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/cerc-io/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 @@ -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/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..f57a7700 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" @@ -33,13 +37,6 @@ import ( "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" sdtypes "github.com/ethereum/go-ethereum/statediff/types" "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..260dfa54 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" @@ -26,12 +29,6 @@ import ( "github.com/ethereum/go-ethereum/statediff/indexer/models" "github.com/ethereum/go-ethereum/trie" "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..55182ef1 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" @@ -34,13 +38,6 @@ import ( "github.com/ethereum/go-ethereum/statediff" sdtypes "github.com/ethereum/go-ethereum/statediff/types" "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..053a2da4 100644 --- a/pkg/eth/ipld_retriever.go +++ b/pkg/eth/ipld_retriever.go @@ -23,7 +23,7 @@ import ( "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/cerc-io/ipld-eth-server/v4/pkg/shared" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" 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) }