Skip to content

chore: upstream sync#35

Merged
refcell merged 53 commits intoclabby/op-rethfrom
refcell/fix-merge-conflicts
Aug 1, 2023
Merged

chore: upstream sync#35
refcell merged 53 commits intoclabby/op-rethfrom
refcell/fix-merge-conflicts

Conversation

@refcell
Copy link

@refcell refcell commented Jul 31, 2023 •
edited
Loading

Description

Sync clabby/op-reth branch with upstream reth changes and resolve conflicts.

Resolved conflicts

  • crates/primitives/src/chain/spec.rs
  • crates/primitives/src/hardfork.rs
  • crates/primitives/src/receipt.rs
  • crates/primitives/src/transaction/mod.rs
  • crates/primitives/src/transaction/tx_type.rs
  • crates/rpc/rpc-types/src/eth/engine/payload.rs
  • crates/transaction-pool/Cargo.toml
  • crates/transaction-pool/src/test_utils/mock.rs
  • crates/transaction-pool/src/traits.rs

mattsse and others added 30 commits July 26, 2023 16:33
@mattsse
feat: use tracing pool for tracing calls (paradigmxyz#3914)
49e1127
@shekhirin
feat(bin): db clear (paradigmxyz#3934)
1c4d127
@shekhirin
feat(pruner): percentage progress and prune only if key exists (parad…
0cfc424 
…igmxyz#3932)
@mattsse
feat: _V3 engine api skeletons (paradigmxyz#3931)
96b108f
@mattsse @Rjected
feat: add Hardfork::Cancun (paradigmxyz#3933)
aa5d39d 
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
@shekhirin
fix(stages): transaction lookup stage checkpoint calculation (paradig…
74bbe5a 
…mxyz#3909)
@shekhirin
docs: db clear CLI (paradigmxyz#3936)
a71ad1e
@int88
test: cover index storage history stage with stage_test_suite_ext tes…
adce7ea 
…ts (paradigmxyz#3898)
@shekhirin
Revert "test(ethereum): ignore invalid string sequence in ethereum st…
9adab0b 
…ate tests (paradigmxyz#3307)" (paradigmxyz#3937)
@int88
feat: metric of reorg depth of blockchain tree (paradigmxyz#3860)
b5a44ae
@mattsse
feat: add eip4844 tx type id (paradigmxyz#3928)
72ab361
@mattsse
feat: add fcu v3 skeleton (paradigmxyz#3940)
f98b152
@mattsse
feat: more blobtx functions (paradigmxyz#3943)
0147e50
@tcoratger
feat(doc): Document JsTracerBuilder (paradigmxyz#3949)
4ab924c
@petertdavies @shekhirin @mattsse
refactor(storage): historical state lookup (better comments) (paradig…
f577e14 
…mxyz#3867)

Co-authored-by: Alexey Shekhirin <a.shekhirin@gmail.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@tcoratger
feat(rpc): perform js inspector on spawn_with_call_at async tracing…
717bad8 
… task (paradigmxyz#3957)
@mattsse
chore: make auth-port default (paradigmxyz#3962)
fc431bc
@mattsse
chore: move some functions to Cli struct (paradigmxyz#3961)
2aae8c8
@PanGan21
refactor(transactions): move TxEip1559, TxEip1559 and TxEip4844 to se…
e651a18 
…parate files (paradigmxyz#3946)
@rkrasiuk
bench(txpool): reordering (paradigmxyz#3882)
a298756
@mattsse
chore: move some tests to engine crate (paradigmxyz#3968)
68a74b2
@rkrasiuk
fix(cli): eta div by zero (paradigmxyz#3971)
465f0dc
@tcoratger
feat(eip4844): add EIP4844 to the TxType enum (paradigmxyz#3953)
369b9a7
@mattsse
perf(rpc): move frame gen into task (paradigmxyz#3950)
f3a7ae1
@rkrasiuk
fix(txpool): pendind pool reordering (paradigmxyz#3955)
3601e7d
@Rjected
chore(rpc-types): remove EngineRpcError (paradigmxyz#3975)
efd4895
@abdullathedruid
chore: update link to contributing/code of conduct in bug report (par…
4d31b3a 
…adigmxyz#3978)
@altugbakan
Add price bump config (paradigmxyz#3967)
d2cdd10
@ngotchac @mattsse
refactor(rpc): simplify the inner definitions of topics & address fil…
0892833 
…ters (paradigmxyz#3876)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@rkrasiuk
feat(cli): in-memory merkle debug script (paradigmxyz#3895)
703d5c7
alessandromazza98 and others added 20 commits July 28, 2023 14:42
@alessandromazza98
add defaults to some rpc server cli args (paradigmxyz#3969)
b05b848
@0xprames
feat(txpool) - add flag for local tx propagation (paradigmxyz#3977)
15bb1c9
@Rjected
feat: add 4844 header fields and consensus checks (paradigmxyz#3972)
334d606
@DaniPopes
ci: deny warnings only in lint jobs (paradigmxyz#3982)
555a1dd
@mattsse
chore: cargo update (paradigmxyz#3988)
f41386d
@mattsse
chore: bump jsonrpsee 0.19 (paradigmxyz#3989)
73652ed
@joshieDo
docs: add additional documentation to TxType (paradigmxyz#3996)
ed3d736
@mattsse
chore(deps): bump itertools (paradigmxyz#3998)
e214248
@mattsse
chore(deps): make jsonrpsee types a feature (paradigmxyz#3999)
922d35d
@DaniPopes
ci: add weekly cargo update workflow (paradigmxyz#3986)
56b2ef1
@mattsse
fix: prevent child call out of bounds (paradigmxyz#3920)
da3bc64
@pistomat
fix(tracing): extend Parity tracing VmExecutedOperation (paradigmxyz#…
3118e27 
…3997)
@joshieDo @onbjerg
fix(pipeline): clear MerkleStage checkpoints on invalid root (parad…
0b913e2 
…igmxyz#3973)

Co-authored-by: Bjerg <onbjerg@users.noreply.github.com>
Co-authored-by: Oliver Nordbjerg <hi@notbjerg.me>
@alessandromazza98 @onbjerg
feat: store logs in different folders based on the chain (paradigmxyz…
5823255 
…#3948)

Co-authored-by: Bjerg <onbjerg@users.noreply.github.com>
Co-authored-by: Oliver Nordbjerg <hi@notbjerg.me>
@Rjected
feat: reth db diff (paradigmxyz#3917)
1ac2f15
@joshieDo
feat(pruning): prune ChangeSets & History during pipeline (paradigmxy…
134fe81 
…z#3728)
@tcoratger
feat(p2p): Add GetReceipts eth handler implementation (paradigmxyz#…
c0544ed 
…3959)
@mattsse
feat: Add RethCliExt (paradigmxyz#3983)
a1e6815
@mattsse
fix: serde rename revertReason (paradigmxyz#4002)
dee14c7
Merge upstream changes and resolve conflicts
1fda171
@refcell refcell requested a review from rkrasiuk as a code owner July 31, 2023 16:48
@refcell
Copy link
Author

refcell commented Jul 31, 2023

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@refcell refcell mentioned this pull request Jul 31, 2023
Closed
@refcell refcell requested a review from clabby July 31, 2023 16:49
@refcell refcell mentioned this pull request Jul 31, 2023
Closed
@refcell refcell merged commit eb339e3 into clabby/op-reth Aug 1, 2023
@refcell refcell deleted the refcell/fix-merge-conflicts branch August 1, 2023 23:23
@refcell refcell mentioned this pull request Aug 1, 2023
Merged
@refcell refcell restored the refcell/fix-merge-conflicts branch August 1, 2023 23:24
@emhane emhane deleted the refcell/fix-merge-conflicts branch September 25, 2025 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rkrasiuk rkrasiuk Awaiting requested review from rkrasiuk

@clabby clabby Awaiting requested review from clabby

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.