paritytech · pgherveou · Feb 7, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
@@ -13,7 +13,6 @@ concurrency:
 
 env:
   ETH_RPC_IMAGE_NAME: "docker.io/paritypr/eth-rpc"
-  ETH_INDEXER_IMAGE_NAME: "docker.io/paritypr/eth-indexer"
 
 jobs:
   set-variables:
@@ -53,15 +52,6 @@ jobs:
           tags: |
             ${{ env.ETH_RPC_IMAGE_NAME }}:${{ env.VERSION }}
 
-      - name: Build eth-indexer Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile
-          push: false
-          tags: |
-            ${{ env.ETH_INDEXER_IMAGE_NAME }}:${{ env.VERSION }}
-
   build_push_docker:
     name: Build and push docker images
     runs-on: parity-large
@@ -88,11 +78,3 @@ jobs:
           tags: |
             ${{ env.ETH_RPC_IMAGE_NAME }}:${{ env.VERSION }}
 
-      - name: Build eth-indexer Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile
-          push: true
-          tags: |
-            ${{ env.ETH_INDEXER_IMAGE_NAME }}:${{ env.VERSION }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prdoc/pr_7493.prdoc b/prdoc/pr_7493.prdoc
@@ -0,0 +1,9 @@
+title: '[pallet-revive] fix eth-rpc indexing'
+doc:
+- audience: Runtime Dev
+  description: |-
+    - Fix a deadlock on the RWLock cache
+    -  Remove eth-indexer, we won't need it anymore, the indexing will be started from within eth-rpc directly
+crates:
+- name: pallet-revive-eth-rpc
+  bump: minor
diff --git a/...ive/rpc/.sqlx/query-027a434a38822c2ba4439e8f9f9c1135227c1150f2c5083d1c7c6086b717ada0.json b/...ive/rpc/.sqlx/query-027a434a38822c2ba4439e8f9f9c1135227c1150f2c5083d1c7c6086b717ada0.json
diff --git a/...ive/rpc/.sqlx/query-29af64347f700919dc2ee12463f332be50096d4e37be04ed8b6f46ac5c242043.json b/...ive/rpc/.sqlx/query-29af64347f700919dc2ee12463f332be50096d4e37be04ed8b6f46ac5c242043.json
diff --git a/...ive/rpc/.sqlx/query-de639fe0ac0c3cfdfbbfa07e81a61dae3a284ad4f7979dacb0ccff32cdc39051.json b/...ive/rpc/.sqlx/query-de639fe0ac0c3cfdfbbfa07e81a61dae3a284ad4f7979dacb0ccff32cdc39051.json
diff --git a/substrate/frame/revive/rpc/Cargo.toml b/substrate/frame/revive/rpc/Cargo.toml
@@ -13,10 +13,6 @@ default-run = "eth-rpc"
 name = "eth-rpc"
 path = "src/main.rs"
 
-[[bin]]
-name = "eth-indexer"
-path = "src/eth-indexer.rs"
-
 [[bin]]
 name = "eth-rpc-tester"
 path = "src/eth-rpc-tester.rs"

diff --git a/substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile b/substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile
diff --git a/substrate/frame/revive/rpc/examples/js/.prettierrc.json b/substrate/frame/revive/rpc/examples/js/.prettierrc.json
@@ -1,6 +1,6 @@
 {
-    "trailingComma": "es5",
-    "tabWidth": 4,
-    "semi": false,
-    "singleQuote": true
+	"trailingComma": "es5",
+	"tabWidth": 4,
+	"semi": false,
+	"singleQuote": true
 }
diff --git a/substrate/frame/revive/rpc/examples/js/contracts/.solhint.json b/substrate/frame/revive/rpc/examples/js/contracts/.solhint.json
@@ -1,3 +1,3 @@
 {
-  "extends": "solhint:recommended"
+	"extends": "solhint:recommended"
 }
diff --git a/substrate/frame/revive/rpc/examples/js/package.json b/substrate/frame/revive/rpc/examples/js/package.json
@@ -6,7 +6,8 @@
 	"scripts": {
 		"dev": "vite",
 		"build": "tsc && vite build",
-		"preview": "vite preview"
+		"preview": "vite preview",
+		"prettier": "prettier --write ."
 	},
 	"dependencies": {
 		"@parity/revive": "^0.0.9",