Emilia Hane fffcc9f364 Fix merge conflicts

2024-06-17 10:40:56 +02:00

..

blockchain-tree

chore(deps): use workspace deps (#8824)

2024-06-14 11:55:23 +00:00

blockchain-tree-api

fix: save last finalized block (#8473)

2024-06-06 15:31:56 +00:00

cli/runner

fix: add a 5 second timeout for tokio_runtime shutdown (#8771)

2024-06-12 18:49:05 +00:00

config

chore: move primitives/prune to reth-prune-types (#8676)

2024-06-07 15:24:39 +00:00

consensus

fix: re-add validate_against_parent_4844 to optimism header validation (#8835)

2024-06-15 17:10:09 +00:00

e2e-test-utils

Merge branch 'main' into matt/scaffold-ethapi

2024-06-13 15:44:41 +02:00

engine-primitives

chore: re-export payload types from engine types (#8841)

2024-06-14 16:11:26 +00:00

errors

chore(op): L1 receipt rpc methods default trait methods (#8437)

2024-05-31 18:31:17 +02:00

ethereum

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

ethereum-forks

Add fjord activation times/blocks for Base (#8619)

2024-06-05 19:34:44 +00:00

etl

chore: split db abstraction into new crate (#8594)

2024-06-04 21:45:57 +00:00

evm

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

exex

fix: Use OptimismBeaconConsensus in the OptimismNode (#8487)

2024-06-11 17:40:23 +00:00

fs-util

add doc_markdown clippy lint (#8552)

2024-06-03 13:21:45 +00:00

metrics

add explicit_iter_loop clippy lint (#8570)

2024-06-03 18:14:50 +00:00

net

fix(net): use real tcp port for local node record (#8853)

2024-06-14 21:38:19 +00:00

node

chore: remove reth-rpc-types dep in node-events (#8854)

2024-06-14 21:15:22 +00:00

node-core

fix(ci): add missing const fn (#8822)

2024-06-14 10:07:39 +00:00

optimism

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

payload

chore(deps): move futures-core to workspace (#8857)

2024-06-15 13:19:01 +02:00

primitives

feat: support no_std for reth-primitives (#8817)

2024-06-17 06:57:46 +00:00

primitives-traits

chore: move primitives/constants to reth-primitives-traits (#8842)

2024-06-14 16:07:35 +00:00

prune

chore: move primitives/exex to reth-exex-types (#8677)

2024-06-07 16:31:24 +00:00

revm

chore: move proof types and root functions from primitives/proofs into reth-trie-common (#8724)

2024-06-13 16:36:18 +00:00

rpc

Fix merge conflicts

2024-06-17 10:40:56 +02:00

stages

chore: move gas units to primitives constants (#8849)

2024-06-14 19:28:08 +00:00

static-file

feat: add append_receipts function (#8718)

2024-06-13 14:08:57 +00:00

storage

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

tasks

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

tokio-util

chore: downgrade error message (#8561)

2024-06-03 15:07:46 +00:00

tracing

fix: ensure jsonrpsee logs are off by default (#8689)

2024-06-08 08:05:36 +00:00

transaction-pool

Merge branch 'main' into matt/scaffold-ethapi

2024-06-17 10:06:28 +02:00

trie

fix(ci): add missing const fn (#8822)

2024-06-14 10:07:39 +00:00