diff --git a/README.md b/README.md
index 5f282536..41422abe 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,9 @@ External dependency
 ## Install
 Start by downloading ipld-eth-server and moving into the repo:
 
-`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server/v3`
+`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server/v4`
 
-`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server/v3@v3.x.x`
+`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server/v4@v4.x.x`
 
 Then, build the binary:
 
diff --git a/cmd/root.go b/cmd/root.go
index 4683f170..3327f3c5 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/v3/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
 )
 
 var (
diff --git a/cmd/serve.go b/cmd/serve.go
index 4ba7f17c..fd8ec91d 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -32,12 +32,12 @@ import (
 	"github.com/spf13/viper"
 	"github.com/vulcanize/gap-filler/pkg/mux"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	fill "github.com/vulcanize/ipld-eth-server/v3/pkg/fill"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/graphql"
-	srpc "github.com/vulcanize/ipld-eth-server/v3/pkg/rpc"
-	s "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
-	v "github.com/vulcanize/ipld-eth-server/v3/version"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	fill "github.com/vulcanize/ipld-eth-server/v4/pkg/fill"
+	"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"
 )
 
 var ErrNoRpcEndpoints = errors.New("no rpc endpoints is available")
diff --git a/cmd/subscribe.go b/cmd/subscribe.go
index cd3cc2cc..50b2c5f0 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/v3/pkg/client"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	w "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
+	"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"
 )
 
 // subscribeCmd represents the subscribe command
diff --git a/cmd/validate.go b/cmd/validate.go
index 04338a4a..12acf579 100644
--- a/cmd/validate.go
+++ b/cmd/validate.go
@@ -25,7 +25,7 @@ import (
 	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/v3/pkg/serve"
+	s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
 )
 
 const GroupName = "statedb-validate"
diff --git a/cmd/version.go b/cmd/version.go
index f2939e44..c794915d 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/v3/version"
+	v "github.com/vulcanize/ipld-eth-server/v4/version"
 )
 
 // versionCmd represents the version command
diff --git a/documentation/apis.md b/documentation/apis.md
index 13eced40..e8db74c0 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/v3/pkg/client"
-        "github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-        "github.com/vulcanize/ipld-eth-server/v3/pkg/watch"
+        "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"
     )
 
     config, _ := eth.NewEthSubscriptionConfig()
@@ -160,9 +160,9 @@ An example of how to subscribe to a real-time Bitcoin data feed from ipld-eth-se
     	"github.com/ethereum/go-ethereum/rpc"
     	"github.com/spf13/viper"
 
-    	"github.com/vulcanize/ipld-eth-server/v3/pkg/btc"
-    	"github.com/vulcanize/ipld-eth-server/v3/pkg/client"
-    	"github.com/vulcanize/ipld-eth-server/v3/pkg/watch"
+    	"github.com/vulcanize/ipld-eth-server/v4/pkg/btc"
+    	"github.com/vulcanize/ipld-eth-server/v4/pkg/client"
+    	"github.com/vulcanize/ipld-eth-server/v4/pkg/watch"
     )
 
     config, _ := btc.NewBtcSubscriptionConfig()
diff --git a/go.mod b/go.mod
index f52ce67f..ef9eae11 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/vulcanize/ipld-eth-server/v3
+module github.com/vulcanize/ipld-eth-server/v4
 
 go 1.15
 
@@ -9,7 +9,6 @@ require (
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-ipfs-blockstore v1.0.1
 	github.com/ipfs/go-ipfs-ds-help v1.0.0
-	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/joho/godotenv v1.4.0
 	github.com/lib/pq v1.10.5
diff --git a/main.go b/main.go
index 724af69e..72fb53c8 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ package main
 import (
 	"github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v3/cmd"
+	"github.com/vulcanize/ipld-eth-server/v4/cmd"
 )
 
 func main() {
diff --git a/pkg/client/client.go b/pkg/client/client.go
index c470ff41..656a564d 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/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/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 34451e95..5c05e1c5 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/v3/pkg/shared"
+	"github.com/vulcanize/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 b3ef9d9f..305c8e52 100644
--- a/pkg/eth/api_test.go
+++ b/pkg/eth/api_test.go
@@ -36,10 +36,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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 5cc1f878..20c3b153 100644
--- a/pkg/eth/backend.go
+++ b/pkg/eth/backend.go
@@ -48,7 +48,7 @@ import (
 
 	ethServerShared "github.com/ethereum/go-ethereum/statediff/indexer/shared"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
 )
 
 var (
diff --git a/pkg/eth/cid_retriever.go b/pkg/eth/cid_retriever.go
index f2414acb..c7968594 100644
--- a/pkg/eth/cid_retriever.go
+++ b/pkg/eth/cid_retriever.go
@@ -28,7 +28,7 @@ import (
 	"github.com/lib/pq"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"github.com/vulcanize/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 c4c13ce6..5488cb93 100644
--- a/pkg/eth/cid_retriever_test.go
+++ b/pkg/eth/cid_retriever_test.go
@@ -29,9 +29,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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 999ee3c9..95f46c5e 100644
--- a/pkg/eth/eth_state_test.go
+++ b/pkg/eth/eth_state_test.go
@@ -37,10 +37,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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 73b428cc..4ce73f16 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/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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/ipld_fetcher.go b/pkg/eth/ipld_fetcher.go
index 9e539b8c..e8b459d5 100644
--- a/pkg/eth/ipld_fetcher.go
+++ b/pkg/eth/ipld_fetcher.go
@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/statediff/indexer/models"
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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 5ac47009..10ac52e2 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/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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 _ = Describe("IPLDFetcher", func() {
diff --git a/pkg/eth/test_helpers/test_data.go b/pkg/eth/test_helpers/test_data.go
index f1154470..96d525d7 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/v3/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
 )
 
 // Test variables
diff --git a/pkg/fill/service.go b/pkg/fill/service.go
index cd3d3df6..6f239797 100644
--- a/pkg/fill/service.go
+++ b/pkg/fill/service.go
@@ -28,7 +28,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
 )
 
 // WatchedAddress type is used to process currently watched addresses
diff --git a/pkg/fill/service_test.go b/pkg/fill/service_test.go
index 439635f7..1511200a 100644
--- a/pkg/fill/service_test.go
+++ b/pkg/fill/service_test.go
@@ -28,10 +28,10 @@ import (
 	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	"github.com/jmoiron/sqlx"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	fill "github.com/vulcanize/ipld-eth-server/v3/pkg/fill"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	fill "github.com/vulcanize/ipld-eth-server/v4/pkg/fill"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
 )
 
 var _ = Describe("Service", func() {
diff --git a/pkg/graphql/graphql.go b/pkg/graphql/graphql.go
index 465bf286..9c8431e4 100644
--- a/pkg/graphql/graphql.go
+++ b/pkg/graphql/graphql.go
@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
 )
 
 var (
diff --git a/pkg/graphql/graphql_test.go b/pkg/graphql/graphql_test.go
index 50375b3a..535c84f5 100644
--- a/pkg/graphql/graphql_test.go
+++ b/pkg/graphql/graphql_test.go
@@ -35,11 +35,11 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/graphql"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"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"
 )
 
 var _ = Describe("GraphQL", func() {
diff --git a/pkg/graphql/service.go b/pkg/graphql/service.go
index 10ea5981..4df31762 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/v3/pkg/eth"
+	"github.com/vulcanize/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 f47829c7..70f249f6 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/v3/pkg/net"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/net"
 )
 
 var _ = Describe("API", func() {
diff --git a/pkg/rpc/ipc.go b/pkg/rpc/ipc.go
index eedf5184..f3434331 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/v3/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
 )
 
 var (
diff --git a/pkg/rpc/ws.go b/pkg/rpc/ws.go
index a19d5cc1..068653c8 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/v3/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
 )
 
 // StartWSEndpoint starts a websocket endpoint.
diff --git a/pkg/serve/api.go b/pkg/serve/api.go
index 4a9dfbde..a59bcca7 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/v3/pkg/eth"
+	"github.com/vulcanize/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 14fdd19b..a4d4c9a2 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/v3/pkg/prom"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
+	ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
 )
 
 // Env variables
diff --git a/pkg/serve/service.go b/pkg/serve/service.go
index b22963cc..f556ba10 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/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v3/pkg/net"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/net"
 )
 
 const (
diff --git a/test/direct_proxy_integration_test.go b/test/direct_proxy_integration_test.go
index 69c4746e..2e6faaa0 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/v3/pkg/eth"
-	integration "github.com/vulcanize/ipld-eth-server/v3/test"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	integration "github.com/vulcanize/ipld-eth-server/v4/test"
 )
 
 var _ = Describe("Integration test", func() {
diff --git a/test/integration_test.go b/test/integration_test.go
index fa5eb6b1..69b019d4 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/v3/pkg/eth"
-	integration "github.com/vulcanize/ipld-eth-server/v3/test"
+	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	integration "github.com/vulcanize/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 b8e5f049..d9b3223e 100644
--- a/test/watch_address_integration_test.go
+++ b/test/watch_address_integration_test.go
@@ -10,11 +10,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/statediff/types"
 	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	integration "github.com/vulcanize/ipld-eth-server/v3/test"
+	integration "github.com/vulcanize/ipld-eth-server/v4/test"
 )
 
 var (
@@ -229,8 +228,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("one contract being watched", func() {
 		It("indexes state only for the watched contract", func() {
-			operation := types.Add
-			args := []types.WatchAddressArg{
+			operation := sdtypes.Add
+			args := []sdtypes.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -311,8 +310,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("contract added to a non-empty watch-list", func() {
 		It("indexes state only for the watched contracts", func() {
-			operation := types.Add
-			args := []types.WatchAddressArg{
+			operation := sdtypes.Add
+			args := []sdtypes.WatchAddressArg{
 				{
 					Address:   contract2.Address,
 					CreatedAt: uint64(contract2.BlockNumber),
@@ -395,8 +394,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("contract removed from the watch-list", func() {
 		It("indexes state only for the watched contract", func() {
-			operation := types.Remove
-			args := []types.WatchAddressArg{
+			operation := sdtypes.Remove
+			args := []sdtypes.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -477,8 +476,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("list of watched addresses set", func() {
 		It("indexes state only for the watched contracts", func() {
-			operation := types.Set
-			args := []types.WatchAddressArg{
+			operation := sdtypes.Set
+			args := []sdtypes.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -565,8 +564,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("list of watched addresses cleared", func() {
 		It("indexes state for all the contracts", func() {
-			operation := types.Clear
-			args := []types.WatchAddressArg{}
+			operation := sdtypes.Clear
+			args := []sdtypes.WatchAddressArg{}
 			ipldErr := ipldRPCClient.Call(nil, ipldMethod, operation, args)
 			Expect(ipldErr).ToNot(HaveOccurred())
 
@@ -659,7 +658,7 @@ var _ = Describe("WatchAddress integration test", func() {
 		})
 
 		It("returns an error on args of invalid type", func() {
-			operation := types.Add
+			operation := sdtypes.Add
 			args := []string{"WrongArg"}
 
 			gethErr := gethRPCClient.Call(nil, gethMethod, operation, args)
diff --git a/test/watched_address_gap_filling_service_integration_test.go b/test/watched_address_gap_filling_service_integration_test.go
index d507261c..7cb3fa8d 100644
--- a/test/watched_address_gap_filling_service_integration_test.go
+++ b/test/watched_address_gap_filling_service_integration_test.go
@@ -14,7 +14,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	integration "github.com/vulcanize/ipld-eth-server/v3/test"
+	integration "github.com/vulcanize/ipld-eth-server/v4/test"
 )
 
 var _ = Describe("Watched address gap filling service integration test", func() {