Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump alloy #10537

Merged
merged 14 commits into from
Aug 29, 2024
Merged

chore(deps): bump alloy #10537

merged 14 commits into from
Aug 29, 2024

Conversation

klkvr
Copy link
Collaborator

@klkvr klkvr commented Aug 26, 2024

Bump alloy to latest commit. This currently uses several patches:

Main changes:

  • alloy_rpc_types_eth::Transaction no more has other field, so I've updated code that relies on it to use WithOtherFields<Transaction> instead. Also updated NetworkTypes value to AnyNetwork.
  • Updated Compact impl for Bytecode. It was incorrect for EOF and needed an impl for EIP7702 case

There's now deposit_receipt_version field on OptimismTransactionFields. I've left it as None for now, not sure how we should populate it

@mattsse
Copy link
Collaborator

mattsse commented Aug 26, 2024

There's now deposit_receipt_version field on OptimismTransactionFields. I've left it as None for now, not sure how we should populate it

yeah we can leave this None for now, we need to add support for this separately

@@ -94,7 +95,7 @@ where
From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
AddOns::EthApi: EthApiSpec + EthTransactions + TraceExt,
<AddOns::EthApi as EthApiTypes>::NetworkTypes:
Network<TransactionResponse = alloy_rpc_types::Transaction>,
Network<TransactionResponse = WithOtherFields<alloy_rpc_types::Transaction>>,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emhane how feasible do you think using OpNetwork is after this pr?

@klkvr
Copy link
Collaborator Author

klkvr commented Aug 27, 2024

lint job is failing because reth-primitives only needs op-alloy-rpc-types if both optimism and alloy-compat features are enabled, and compiling it only with optimism causes unused dependency warning

should I just disable this check for that case?

@mattsse
Copy link
Collaborator

mattsse commented Aug 27, 2024

I think we can cheat here by doing

or add use op_alloy_rpc_types as _; to the crate root

@emhane
Copy link
Member

emhane commented Aug 28, 2024

I think we can cheat here by doing

or add use op_alloy_rpc_types as _; to the crate root

prefer using longer path...valuable to recognise all deps when reading a file for experienced devs

@onbjerg
Copy link
Member

onbjerg commented Aug 29, 2024

revm released

Copy link
Member

@onbjerg onbjerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mattsse mattsse marked this pull request as ready for review August 29, 2024 13:09
@mattsse mattsse requested a review from joshieDo as a code owner August 29, 2024 13:09
@onbjerg onbjerg enabled auto-merge August 29, 2024 13:20
@mattsse mattsse added the A-dependencies Pull requests or issues that are about dependencies label Aug 29, 2024
@onbjerg onbjerg added this pull request to the merge queue Aug 29, 2024
Merged via the queue into main with commit ec5ce21 Aug 29, 2024
35 checks passed
@onbjerg onbjerg deleted the klkvr/bump-alloy branch August 29, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependencies Pull requests or issues that are about dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants