diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d2b1ad0..bfd2279 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,8 +4,8 @@ on: env: STACK_ORCHESTRATOR_REF: "f2fd766f5400fcb9eb47b50675d2e3b1f2753702" - GO_ETHEREUM_REF: "v1.10.25-statediff-4.2.1-alpha" # Use the tag, we are going to download the bin not build it. - IPLD_ETH_DB_REF: "d4d704616ba0f87733853c78787bf54c9868d2ac" + GO_ETHEREUM_REF: "v1.10.26-statediff-4.2.2-alpha" # Use the tag, we are going to download the bin not build it. + IPLD_ETH_DB_REF: "a4961e5e597148c0ff6dd7a34958bdf8c469a47e" jobs: integrationtest: @@ -77,14 +77,12 @@ jobs: with: go-version: "1.18.0" check-latest: true - - name: Checkout code uses: actions/checkout@v2 - + - name: Spin up database run: | docker-compose up -d - - name: Run unit tests run: | sleep 30 diff --git a/cmd/root.go b/cmd/root.go index 0ec4a02..5a85894 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-db-validator/pkg/prom" + "github.com/cerc-io/ipld-eth-db-validator/pkg/prom" ) var ( diff --git a/cmd/state_validator.go b/cmd/state_validator.go index 8b59ac7..5d095f5 100644 --- a/cmd/state_validator.go +++ b/cmd/state_validator.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-db-validator/pkg/validator" + "github.com/cerc-io/ipld-eth-db-validator/pkg/validator" ) // stateValidatorCmd represents the stateValidator command diff --git a/docker-compose.yml b/docker-compose.yml index fbfa0db..d68712f 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.0-alpha + image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v4.2.2-alpha environment: DATABASE_USER: "vdbm" DATABASE_NAME: "vulcanize_testing" diff --git a/go.mod b/go.mod index 80bfc24..1393d8d 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/vulcanize/ipld-eth-db-validator +module github.com/cerc-io/ipld-eth-db-validator go 1.18 require ( - github.com/cerc-io/ipfs-ethdb/v4 v4.0.9-alpha - github.com/cerc-io/ipld-eth-server/v4 v4.1.9-alpha - github.com/ethereum/go-ethereum v1.10.25 + github.com/cerc-io/ipfs-ethdb/v4 v4.0.10-alpha + github.com/cerc-io/ipld-eth-server/v4 v4.2.2-alpha + github.com/ethereum/go-ethereum v1.10.26 github.com/jmoiron/sqlx v1.3.5 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.19.0 @@ -28,8 +28,8 @@ 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/eth-ipfs-state-validator/v4 v4.0.9-alpha // indirect - github.com/cerc-io/go-eth-state-node-iterator v1.1.8 // indirect + github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.10-alpha // indirect + github.com/cerc-io/go-eth-state-node-iterator v1.1.9 // 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 @@ -277,4 +277,4 @@ require ( lukechampine.com/blake3 v1.1.7 // indirect ) -replace github.com/ethereum/go-ethereum v1.10.25 => github.com/cerc-io/go-ethereum v1.10.25-statediff-4.2.1-alpha +replace github.com/ethereum/go-ethereum v1.10.26 => github.com/cerc-io/go-ethereum v1.10.26-statediff-4.2.2-alpha diff --git a/go.sum b/go.sum index 10bcbf7..8baffb4 100644 --- a/go.sum +++ b/go.sum @@ -134,16 +134,16 @@ 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.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/cerc-io/ipld-eth-server/v4 v4.1.9-alpha h1:GRuIKrQVwwUpnNzaTWl+W9dvHrkGR8w39evmmHbVj6c= -github.com/cerc-io/ipld-eth-server/v4 v4.1.9-alpha/go.mod h1:5jTmlYnXRBZFGSPMO1D4cUIMOL59XNJcMP+pBA1RteI= +github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.10-alpha h1:3titSea2MxnhOTRfsFenOV3Nz8AhHt3YZXzO+4Wqnro= +github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.10-alpha/go.mod h1:i7PVGu+1jo8aPnRT70ZU+PZrxw1s8tCOzHPWAMJ+Dw8= +github.com/cerc-io/go-eth-state-node-iterator v1.1.9 h1:ecwgx8ri3VOux9LuFy5N6W+/aWca+aORNBwMoxfdPC8= +github.com/cerc-io/go-eth-state-node-iterator v1.1.9/go.mod h1:cTRY0YXObI0ILZ19/oopchujJZTxQnkLbJJNXVdZii0= +github.com/cerc-io/go-ethereum v1.10.26-statediff-4.2.2-alpha h1:gesMZEbNU+fcAMctITi+KO/AK80YdTq6TVB5lb4EfnU= +github.com/cerc-io/go-ethereum v1.10.26-statediff-4.2.2-alpha/go.mod h1:lKBVBWksSwBDR/5D9CAxaGQzDPIS3ueWb6idy7X1Shg= +github.com/cerc-io/ipfs-ethdb/v4 v4.0.10-alpha h1:5iqNXeitkj3g7FxyKK/Pz+1HN7Ac9JZzCRj3Lv+uHiw= +github.com/cerc-io/ipfs-ethdb/v4 v4.0.10-alpha/go.mod h1:dPscFRMvTWPKnoZ4U0D9v4bsrw6XdH7sOp8hUrVzOWA= +github.com/cerc-io/ipld-eth-server/v4 v4.2.2-alpha h1:0hrBSI19BVBCisIW5WKTHNqpsbvmH7HMfu/WaFhNAkI= +github.com/cerc-io/ipld-eth-server/v4 v4.2.2-alpha/go.mod h1:JJGcaSbKhu3yEqbBRpGzrZnQ30iPomxZBFzOxkzfKpc= 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= @@ -1685,6 +1685,8 @@ github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= 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/ipld-eth-db-validator v0.0.0-20220927132403-e51b12413001 h1:2TL8T8jJgku5t98xy922OQdW7kw9Kygg7onpWRb8tUo= +github.com/vulcanize/ipld-eth-db-validator v0.0.0-20220927132403-e51b12413001/go.mod h1:Jb9wa8NDR7z74USgzIYZZPIVYUs2OJzPhBrwC7ZKBSk= 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= diff --git a/main.go b/main.go index 51c26e9..d08ed8a 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,7 @@ package main -import "github.com/vulcanize/ipld-eth-db-validator/cmd" +import "github.com/cerc-io/ipld-eth-db-validator/cmd" func main() { cmd.Execute() diff --git a/pkg/validator/config.go b/pkg/validator/config.go index 3301e4e..e2fc863 100644 --- a/pkg/validator/config.go +++ b/pkg/validator/config.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" "github.com/jmoiron/sqlx" "github.com/spf13/viper" - "github.com/vulcanize/ipld-eth-db-validator/pkg/prom" + "github.com/cerc-io/ipld-eth-db-validator/pkg/prom" ) var IntegrationTestChainConfig = ¶ms.ChainConfig{ diff --git a/pkg/validator/validator.go b/pkg/validator/validator.go index 7a62d91..b3acb29 100644 --- a/pkg/validator/validator.go +++ b/pkg/validator/validator.go @@ -43,7 +43,7 @@ import ( ipldEth "github.com/cerc-io/ipld-eth-server/v4/pkg/eth" ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" - "github.com/vulcanize/ipld-eth-db-validator/pkg/prom" + "github.com/cerc-io/ipld-eth-db-validator/pkg/prom" ) var ( diff --git a/test/integration_test.go b/test/integration_test.go index 8c500f5..1321378 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-db-validator/pkg/validator" - integration "github.com/vulcanize/ipld-eth-db-validator/test" + "github.com/cerc-io/ipld-eth-db-validator/pkg/validator" + integration "github.com/cerc-io/ipld-eth-db-validator/test" "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" ethServerIntegration "github.com/cerc-io/ipld-eth-server/v4/test" diff --git a/validator_test/chain_maker.go b/validator_test/chain_maker.go index 1665ef4..c8ab127 100644 --- a/validator_test/chain_maker.go +++ b/validator_test/chain_maker.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/params" log "github.com/sirupsen/logrus" - "github.com/vulcanize/ipld-eth-db-validator/pkg/validator" + "github.com/cerc-io/ipld-eth-db-validator/pkg/validator" ) // Test variables diff --git a/validator_test/ref_integrity_test.go b/validator_test/ref_integrity_test.go index f06b883..51b92e5 100644 --- a/validator_test/ref_integrity_test.go +++ b/validator_test/ref_integrity_test.go @@ -13,7 +13,7 @@ import ( "github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers" "github.com/cerc-io/ipld-eth-server/v4/pkg/shared" - "github.com/vulcanize/ipld-eth-db-validator/pkg/validator" + "github.com/cerc-io/ipld-eth-db-validator/pkg/validator" ) var _ = Describe("RefIntegrity", func() { diff --git a/validator_test/validator_test.go b/validator_test/validator_test.go index 84e71e8..f25ba29 100644 --- a/validator_test/validator_test.go +++ b/validator_test/validator_test.go @@ -16,8 +16,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/ipld-eth-db-validator/pkg/validator" - "github.com/vulcanize/ipld-eth-db-validator/validator_test" + "github.com/cerc-io/ipld-eth-db-validator/pkg/validator" + "github.com/cerc-io/ipld-eth-db-validator/validator_test" ) const (