Merge remote-tracking branch 'origin' into feat/self-healing-l1-events

Author: jonastheis

Cargo.lock

@@ -124,74 +124,75 @@ strip = "none"
 
 [workspace.dependencies]
 # alloy
-alloy-chains = { version = "0.2.9", default-features = false }
+alloy-chains = { version = "0.2.5", default-features = false }
 alloy-consensus = { version = "1.0.37", default-features = false }
 alloy-eips = { version = "1.0.37", default-features = false }
 alloy-json-rpc = { version = "1.0.37", default-features = false }
 alloy-network = { version = "1.0.37", default-features = false }
-alloy-primitives = { version = "1.3.1", default-features = false }
+alloy-primitives = { version = "1.4.1", default-features = false }
 alloy-provider = { version = "1.0.37", default-features = false }
 alloy-rpc-client = { version = "1.0.37", default-features = false }
 alloy-rpc-types-engine = { version = "1.0.37", default-features = false }
 alloy-rpc-types-eth = { version = "1.0.37", default-features = false }
-alloy-sol-types = { version = "1.3.1", default-features = false }
+alloy-sol-types = { version = "1.4.1", default-features = false }
 alloy-signer = { version = "1.0.37", default-features = false }
 alloy-signer-local = { version = "1.0.37", default-features = false }
 alloy-transport = { version = "1.0.37", default-features = false }
 
 # scroll-alloy
-scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-rpc-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
 
 # reth
-reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git" }
-reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-core = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tasks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tracing = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-revm = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-evm = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1" }
+reth-eth-wire = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-network = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-network-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-network-p2p = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-network-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-node-core = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-node-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-node-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-provider = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-rpc-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-rpc-eth-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-rpc-eth-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-rpc-layer = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-tasks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-tracing = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-transaction-pool = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-trie-db = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-revm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-engine-local = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-cli-util = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
 
 # reth-scroll
-reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-consensus = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-cli = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-evm = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-rpc = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
+reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", tag = "scroll-v91.1", default-features = false }
 
 # rollup node
 rollup-node = { path = "crates/node" }
@@ -223,6 +224,7 @@ metrics = "0.24.0"
 metrics-derive = "0.1"
 parking_lot = "0.12"
 rand = { version = "0.9" }
+rayon = "1.7"
 reqwest = "0.12"
 serde = { version = "1.0" }
 serde_json = { version = "1.0" }
@@ -235,8 +237,8 @@ tracing = "0.1.0"
 getrandom = { version = "0.2", features = ["js"] }
 
 [patch.crates-io]
-revm = { git = "https://github.com/scroll-tech/revm" }
-op-revm = { git = "https://github.com/scroll-tech/revm" }
+revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
+op-revm = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
 
 # [patch."https://github.com/scroll-tech/reth.git"]
 # reth-chainspec = { path = "../reth/crates/chainspec" }

Cargo.toml

@@ -2,3 +2,4 @@
 
 - [Introduction](./chapter_1.md)
 - [Running a Node](./running-a-node.md)
+- [Running with Docker Compose](./docker-operations.md)