Skip to content

Commit fbf8e9e

Browse files
authored
Merge pull request #55 from scroll-tech/chore-merge-upstream-3f9816e1c
Chore merge upstream 3f9816e
2 parents 5b151dd + 771056c commit fbf8e9e

File tree

303 files changed

+5803
-3292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+5803
-3292
lines changed

.github/assets/hive/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ COPY dist/reth /usr/local/bin
55
COPY LICENSE-* ./
66

77
EXPOSE 30303 30303/udp 9001 8545 8546
8-
ENTRYPOINT ["/usr/local/bin/reth"]
8+
ENV RUST_LOG=debug
9+
ENTRYPOINT ["/usr/local/bin/reth"]

.github/workflows/kurtosis-op.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
if [ $BLOCK_GETH -ge 100 ] && [ $BLOCK_RETH -ge 100 ] ; then exit 0; fi
103103
echo "Waiting for clients to advance..., Reth: $BLOCK_RETH Geth: $BLOCK_GETH"
104104
done
105+
kurtosis service logs -a op-devnet op-el-2-op-reth-op-node-op-kurtosis
106+
kurtosis service logs -a op-devnet op-cl-2-op-node-op-reth-op-kurtosis
105107
exit 1
106108
107109

.github/workflows/unit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
partition: 2
3535
total_partitions: 2
3636
- type: optimism
37-
args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*"
37+
args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
3838
partition: 1
3939
total_partitions: 2
4040
- type: optimism
41-
args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*"
41+
args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum"
4242
partition: 2
4343
total_partitions: 2
4444
- type: book

Cargo.lock

Lines changed: 48 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)