Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/scroll rpc #136

Merged
merged 95 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 88 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
955319d
init scroll rpc
frisitano Dec 8, 2024
53f5538
add scroll alloy
georgehao Dec 16, 2024
370bbd1
merge scroll branch
georgehao Dec 16, 2024
c489b49
add all featrues for rpc
georgehao Dec 19, 2024
92df35a
lint
georgehao Dec 20, 2024
1b1525b
fix ci
georgehao Dec 20, 2024
66f6d78
fix lint
georgehao Dec 20, 2024
a0e7e6b
fix transation unit
georgehao Dec 20, 2024
14dac7f
fix receipt unit test
georgehao Dec 21, 2024
8bcf115
fix unit test
georgehao Dec 21, 2024
e7de38e
fix unit test
georgehao Dec 22, 2024
1295c6b
fix unit test
georgehao Dec 22, 2024
ea228e2
update
georgehao Dec 22, 2024
0a6649c
Merge branch 'scroll' of github.com:scroll-tech/reth into feat/scroll…
georgehao Dec 22, 2024
53958fb
fix lint
georgehao Dec 22, 2024
c0a6ec9
fix lint
georgehao Dec 22, 2024
7c4fd43
fix lint
georgehao Dec 22, 2024
fac876a
resolve conflict
georgehao Jan 6, 2025
933e56d
fix clippy
georgehao Jan 6, 2025
ac6575e
fix cippy
georgehao Jan 7, 2025
121fab7
fix tranasction
georgehao Jan 7, 2025
f49eef9
fix transaction
georgehao Jan 7, 2025
d4cb63c
replace TxL1Message
georgehao Jan 7, 2025
04a5a80
fix
georgehao Jan 7, 2025
fdbbd94
fix scroll cippy
georgehao Jan 8, 2025
8cad4fb
fix lint&& clippy
georgehao Jan 8, 2025
9bd3171
fix conflict
georgehao Jan 8, 2025
672e718
fix lint
georgehao Jan 8, 2025
e58bc06
fix zepter check
georgehao Jan 8, 2025
b0df29f
fix unit test
georgehao Jan 8, 2025
4d34209
fix lint
georgehao Jan 8, 2025
92f4fd4
fix unit test
georgehao Jan 9, 2025
5bbec68
fix conflict
georgehao Jan 9, 2025
06da2a7
fix conflict
georgehao Jan 9, 2025
80755c1
sync scroll
georgehao Jan 10, 2025
f62691f
fix bug
georgehao Jan 10, 2025
60d16af
fix udeps issue
georgehao Jan 10, 2025
e94ea17
sync scroll
georgehao Jan 13, 2025
0016be2
submit some fix
georgehao Jan 13, 2025
95ab5bb
fix addons builder
georgehao Jan 13, 2025
0ce0803
fix api error
georgehao Jan 14, 2025
521f57c
fix lint
georgehao Jan 14, 2025
379ec93
fix conflict
georgehao Jan 14, 2025
25b22e3
fix lint
georgehao Jan 14, 2025
58c2b50
fix Zepter
georgehao Jan 14, 2025
744ae5e
fix conflict
georgehao Jan 15, 2025
5d1ccdf
fix lint
georgehao Jan 15, 2025
4ec620a
fix udeps
georgehao Jan 16, 2025
5798942
address comments
georgehao Jan 16, 2025
5fb1a0b
add line
georgehao Jan 16, 2025
3150d67
add line
georgehao Jan 16, 2025
990a963
add new line
georgehao Jan 16, 2025
71aca5a
fix format
georgehao Jan 16, 2025
1f4713c
revert
georgehao Jan 16, 2025
b3c8b44
fix comments
georgehao Jan 16, 2025
5e505f2
remove l1 message's serde_bincode_compat
georgehao Jan 16, 2025
2cfea98
fix unit test faile
georgehao Jan 16, 2025
e9d89f8
update
georgehao Jan 16, 2025
e34cb7f
format
georgehao Jan 17, 2025
24b3e1f
address comment
georgehao Jan 19, 2025
77abf3f
fix alloy request http error
georgehao Jan 19, 2025
ec18070
fix lint
georgehao Jan 20, 2025
d22a49b
fix lint
georgehao Jan 20, 2025
a4fea38
fix lint
georgehao Jan 20, 2025
7db94a1
fix lint
georgehao Jan 20, 2025
7ad0d25
fix lint
georgehao Jan 20, 2025
42de38f
trigger ci
georgehao Jan 20, 2025
d34bd3e
trigger ci
georgehao Jan 20, 2025
067cc4d
update
georgehao Jan 20, 2025
2582a58
update
georgehao Jan 20, 2025
3013de6
test
georgehao Jan 20, 2025
59a2ad0
update
georgehao Jan 20, 2025
e69ae52
test
georgehao Jan 20, 2025
44f528c
large runner
georgehao Jan 20, 2025
98a0b0b
remove unused code
georgehao Jan 20, 2025
f4d07e2
change runner
georgehao Jan 20, 2025
d450932
update
georgehao Jan 20, 2025
e8eb440
update
georgehao Jan 20, 2025
6c5ca69
test timeout
georgehao Jan 21, 2025
ba207f5
update
georgehao Jan 21, 2025
ec836f3
update
georgehao Jan 21, 2025
4d66a59
update
georgehao Jan 21, 2025
f40fdc3
update
georgehao Jan 21, 2025
b971e1b
update
georgehao Jan 21, 2025
4adf46f
update
georgehao Jan 21, 2025
43e315c
update
georgehao Jan 21, 2025
226e01d
rollback timeout
georgehao Jan 21, 2025
82a801d
configure custom runner
Thegaram Jan 21, 2025
15c8c8e
Update crates/scroll/alloy/rpc-types/src/receipt.rs
georgehao Jan 21, 2025
7026d1c
Update crates/scroll/alloy/consensus/README.md
georgehao Jan 21, 2025
43964b8
remove unused macro
georgehao Jan 21, 2025
6000f2e
Merge branch 'feat/scroll-rpc1' of github.com:scroll-tech/reth into f…
georgehao Jan 21, 2025
02a5317
feat: scroll primitives (#142)
greged93 Jan 22, 2025
b4a5db9
address comments
georgehao Jan 22, 2025
f050c40
Merge branch 'feat/scroll-rpc1' of github.com:scroll-tech/reth into f…
georgehao Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/assets/check_wasm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ exclude_crates=(
reth-scroll-chainspec # tokio
reth-scroll-evm # tokio
reth-scroll-engine # tokio
reth-scroll-rpc #tokio
)

# Array to hold the results
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ jobs:
--exclude op-reth --exclude "example-*" --exclude reth --exclude reth-payload-primitives \
--exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
--exclude reth-node-ethereum --exclude reth-scroll-cli --exclude reth-scroll-evm \
--exclude reth-scroll-node --exclude "scroll-reth" --exclude reth-scroll-engine
--exclude reth-scroll-node --exclude "scroll-reth" --exclude reth-scroll-engine --exclude reth-scroll-rpc \
--exclude reth-scroll-trie

book:
name: book
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
runs-on: ubuntu-latest
runs-on:
group: scroll-reth-runner-group
env:
RUST_BACKTRACE: 1
strategy:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# will have compiled files and executables
./debug/
target/
datadir/

# These are backup files generated by rustfmt
**/*.rs.bk
Expand Down
119 changes: 97 additions & 22 deletions Cargo.lock

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

34 changes: 20 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ members = [
"crates/rpc/rpc-testing-util/",
"crates/rpc/rpc-types-compat/",
"crates/rpc/rpc/",
"crates/scroll/alloy/consensus",
"crates/scroll/alloy/network",
"crates/scroll/alloy/rpc-types",
"crates/scroll/bin/scroll-reth",
"crates/scroll/chainspec",
"crates/scroll/cli",
Expand All @@ -106,7 +109,7 @@ members = [
"crates/scroll/evm",
"crates/scroll/hardforks",
"crates/scroll/node",
"crates/scroll/primitives",
"crates/scroll/rpc",
"crates/scroll/trie",
"crates/stages/api/",
"crates/stages/stages/",
Expand Down Expand Up @@ -408,15 +411,6 @@ reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types", default-features = fal
reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
reth-rpc-types-compat = { path = "crates/rpc/rpc-types-compat" }
reth-scroll-chainspec = { path = "crates/scroll/chainspec" }
reth-scroll-cli = { path = "crates/scroll/cli" }
reth-scroll-consensus = { path = "crates/scroll/consensus" }
reth-scroll-engine = { path = "crates/scroll/engine" }
reth-scroll-evm = { path = "crates/scroll/evm" }
reth-scroll-forks = { path = "crates/scroll/hardforks" }
reth-scroll-node = { path = "crates/scroll/node" }
reth-scroll-primitives = { path = "crates/scroll/primitives" }
reth-scroll-trie = { path = "crates/scroll/trie" }
reth-stages = { path = "crates/stages/stages" }
reth-stages-api = { path = "crates/stages/api" }
reth-stages-types = { path = "crates/stages/types" }
Expand Down Expand Up @@ -489,15 +483,27 @@ alloy-transport-ipc = { version = "0.9.2", default-features = false }
alloy-transport-ws = { version = "0.9.2", default-features = false }

# scroll
scroll-alloy-consensus = { path = "crates/scroll/alloy/consensus" }
scroll-alloy-rpc-types = { path = "crates/scroll/alloy/rpc-types" }
scroll-alloy-network = { path = "crates/scroll/alloy/network" }
reth-scroll-chainspec = { path = "crates/scroll/chainspec" }
reth-scroll-cli = { path = "crates/scroll/cli" }
reth-scroll-consensus = { path = "crates/scroll/consensus" }
reth-scroll-evm = { path = "crates/scroll/evm" }
reth-scroll-engine = { path = "crates/scroll/engine" }
reth-scroll-forks = { path = "crates/scroll/hardforks" }
reth-scroll-node = { path = "crates/scroll/node" }
reth-scroll-trie = { path = "crates/scroll/trie" }
reth-scroll-rpc = { path = "crates/scroll/rpc" }
# TODO (scroll): point to crates.io/tag once the crate is published/a tag is created.
poseidon-bn254 = { git = "https://github.com/scroll-tech/poseidon-bn254", rev = "526a64a", features = ["bn254"] }

# op
op-alloy-rpc-types = { version = "0.9.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.9.0", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.9.0", default-features = false }
op-alloy-network = { version = "0.9.0", default-features = false }
op-alloy-consensus = { version = "0.9.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.9.0", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.9.0", default-features = false }
op-alloy-network = { version = "0.9.0", default-features = false }
op-alloy-consensus = { version = "0.9.0", default-features = false }

# misc
aquamarine = "0.6"
Expand Down
36 changes: 35 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,37 @@ lint-other-targets:
--all-features \
-- -D warnings

lint-scroll-reth:
cargo +nightly clippy \
--workspace \
--bin "scroll-reth" \
--lib \
--examples \
--tests \
--benches \
--features "scroll $(BIN_OTHER_FEATURES) skip-state-root-validation" \
-- -D warnings

lint-all:
cargo +nightly clippy \
--workspace \
--lib \
--examples \
--tests \
--benches \
--all-features \
--locked

lint-udeps:
cargo +nightly udeps --workspace --lib --examples --tests --benches --all-features --locked \
--exclude reth-optimism-cli --exclude reth-optimism-consensus --exclude reth-optimism-payload-builder \
--exclude reth-optimism-node --exclude reth-optimism-evm --exclude reth-optimism-node --exclude reth-optimism-rpc \
--exclude op-reth --exclude "example-*" --exclude reth --exclude reth-payload-primitives \
--exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
--exclude reth-node-ethereum --exclude reth-scroll-cli --exclude reth-scroll-evm \
--exclude reth-scroll-node --exclude "scroll-reth" --exclude reth-scroll-engine --exclude reth-scroll-rpc \
--exclude reth-scroll-trie

lint-codespell: ensure-codespell
codespell --skip "*.json"

Expand All @@ -403,8 +434,11 @@ lint:
make fmt && \
make lint-reth && \
make lint-op-reth && \
make lint-scroll-reth && \
make lint-other-targets && \
make lint-codespell
make lint-codespell && \
make lint-all && \
make lint-udeps

fix-lint-reth:
cargo +nightly clippy \
Expand Down
Loading
Loading