Skip to content

chore: upstream sync#36

Closed
refcell wants to merge 106 commits intoclabby/op-rethfrom
refcell/rebase-conflicts
Closed

chore: upstream sync#36
refcell wants to merge 106 commits intoclabby/op-rethfrom
refcell/rebase-conflicts

Conversation

@refcell
Copy link

@refcell refcell commented Jul 31, 2023

No description provided.

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
clabby and others added 23 commits July 31, 2023 17:10
@clabby
More conflict resolution / updates
491cb19 
x
@clabby
Reimplement @merklefruit's changes
dbcaec0
@clabby
🧹
7c1c695
@merklefruit
chore: removed useless import
facbadb
@roberto-bayardo
fix build failures with optimism feature
0256fd8
@clabby
Fix feature flag
a4ee26f
@BrianBland
Use TTD(0) fork condition for OP_GOERLI Paris hardfork
3a41f8f 
Signed-off-by: Brian Bland <brian.t.bland@gmail.com>
@clabby
Resolve conflict
3f576b4
@BrianBland
Fix encoding/decoding for deposit transactions
c828f80
@BrianBland
Add compact support for txs with type values >3 via variable encoding
9f33012 
Signed-off-by: Brian Bland <brian.t.bland@gmail.com>
@BrianBland
Fix unrelated partial_cmp clippy warning
459c079
@BrianBland
Fix optimism_goerli_forkids test with genesis and regolith conditions
42be018
@roberto-bayardo
fix reth build when optimism feature flag is default
b40876c
@BrianBland
Add variable-length compact support for TxType and Transaction
81fbdce
@BrianBland
Revert custom Transaction (de)serialization in favor of TxType.to/fro…
568adc3 
…m_compact
@refcell
Remove .vscode in gitignore
82a4ee4
@refcell
Fix cargo manifest
e5fd94d
@refcell
Fix merge
8eb82b0
@BrianBland
[trivial] Fix dev chainspec when optimism feature enabled
2e10213
@refcell
Fix clippy lints in base
817e665
@roberto-bayardo
add op-node specific command line flags
436d62d
@refcell @merklefruit
Update bin/reth/src/args/rollup_args.rs
53b81fe 
Co-authored-by: nicolas <48695862+merklefruit@users.noreply.github.com>
@refcell @merklefruit
Update bin/reth/src/args/rollup_args.rs
abd084c 
Co-authored-by: nicolas <48695862+merklefruit@users.noreply.github.com>
@refcell refcell requested a review from rkrasiuk as a code owner July 31, 2023 17:13
@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
Copy link
Author

refcell commented Jul 31, 2023

Attempted rebasing upstream changes ontop of clabby/op-reth but failed miserably here i guess...

we can just use the merge approach in #35 unless someone knows a better method

@refcell refcell closed this Jul 31, 2023
@merklefruit
Copy link

merklefruit commented Jul 31, 2023

I wish I knew a faster way 😄

@emhane emhane deleted the refcell/rebase-conflicts branch September 25, 2025 09:35
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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.