Skip to content

Commit

Permalink
[pallet-revive] fix eth-rpc indexing (#7493)
Browse files Browse the repository at this point in the history
- 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

---------

Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
pgherveou and github-actions[bot] authored Feb 7, 2025
1 parent de3c420 commit 4ec221e
Show file tree
Hide file tree
Showing 27 changed files with 311 additions and 430 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/build-publish-eth-rpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
31 changes: 15 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions prdoc/pr_7493.prdoc
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions substrate/frame/revive/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 0 additions & 28 deletions substrate/frame/revive/rpc/dockerfiles/eth-indexer/Dockerfile

This file was deleted.

8 changes: 4 additions & 4 deletions substrate/frame/revive/rpc/examples/js/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "solhint:recommended"
"extends": "solhint:recommended"
}
3 changes: 2 additions & 1 deletion substrate/frame/revive/rpc/examples/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 4ec221e

Please sign in to comment.