Skip to content

Commit

Permalink
Merge pull request #35 from paradigmxyz/matt/bump-reth115
Browse files Browse the repository at this point in the history 
chore: update reth 1.1.5
  • Loading branch information
@mattsse
mattsse authored Jan 7, 2025
2 parents f8fcf76 + fe23297 commit a7dc6e0
Show file tree
Hide file tree
Showing 8 changed files with 1,083 additions and 893 deletions.
1,897 changes: 1,044 additions & 853 deletions Cargo.lock
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,35 @@ publish = false

[workspace.dependencies]
# reth
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-discv5 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3", features = ["serde"] }
reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3", features = ["test-utils"] }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-discv5 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5", features = ["serde"] }
reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5", features = ["test-utils"] }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }

# alloy
alloy-eips = { version = "0.7", default-features = false }
alloy-genesis = { version = "0.7", default-features = false }
alloy-consensus = { version = "0.7", default-features = false }
alloy-eips = { version = "0.9", default-features = false }
alloy-genesis = { version = "0.9", default-features = false }
alloy-consensus = { version = "0.9", default-features = false }
alloy-rlp = "0.3.4"
alloy-rpc-types = { version = "0.7", features = [
alloy-rpc-types = { version = "0.9", features = [
"eth",
], default-features = false }
alloy-signer = { version = "0.7", default-features = false }
alloy-signer-local = { version = "0.7", default-features = false }
alloy-signer = { version = "0.9", default-features = false }
alloy-signer-local = { version = "0.9", default-features = false }

alloy-primitives = { version = "0.8", default-features = false }
alloy-sol-types = { version = "0.8", features = ["json"] }
Expand All @@ -75,5 +75,5 @@ serde_json = "1"
eyre = "0.6"

# testing
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.3" }
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" }
2 changes: 1 addition & 1 deletion backfill/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ fn process_committed_chain(chain: &Chain) -> eyre::Result<()> {
// Calculate the number of blocks and transactions in the committed chain
let blocks = chain.blocks().len();
let transactions =
chain.blocks().values().map(|block| block.body.transactions.len()).sum::<usize>();
chain.blocks().values().map(|block| block.transactions().len()).sum::<usize>();

info!(first_block = %chain.execution_outcome().first_block, %blocks, %transactions, "Processed committed blocks");
Ok(())
Expand Down
4 changes: 2 additions & 2 deletions in-memory-state/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ mod tests {
let block_number_1 = block_1.header().number();
let execution_outcome1 = ExecutionOutcome::new(
BundleState::default(),
vec![random_receipt(&mut rng, &block_1.body.transactions[0], None)].into(),
vec![random_receipt(&mut rng, &block_1.body().transactions[0], None)].into(),
block_1.header().number(),
vec![],
);
Expand All @@ -129,7 +129,7 @@ mod tests {
.ok_or(eyre::eyre!("failed to recover senders"))?;
let execution_outcome2 = ExecutionOutcome::new(
BundleState::default(),
vec![random_receipt(&mut rng, &block_2.body.transactions[0], None)].into(),
vec![random_receipt(&mut rng, &block_2.body().transactions[0], None)].into(),
block_2.header().number(),
vec![],
);
Expand Down
6 changes: 3 additions & 3 deletions op-bridge/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ fn decode_chain_into_events(
// Get all receipts
.flat_map(|(block, receipts)| {
block
.body
.body()
.transactions
.iter()
.zip(receipts.iter().flatten())
Expand Down Expand Up @@ -395,7 +395,7 @@ mod tests {
from_address.to_string(),
to_address.to_string(),
deposit_event.amount.to_string(),
block.body.transactions[0].hash().to_string()
block.body().transactions[0].hash().to_string()
)
);

Expand All @@ -415,7 +415,7 @@ mod tests {
from_address.to_string(),
to_address.to_string(),
withdrawal_event.amount.to_string(),
block.body.transactions[1].hash().to_string()
block.body().transactions[1].hash().to_string()
)
);

Expand Down
9 changes: 4 additions & 5 deletions remote/src/codec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ impl TryFrom<&reth::providers::Chain> for proto::Chain {
header: Some(block.header.header().into()),
}),
body: block
.body
.body()
.transactions
.iter()
.map(TryInto::try_into)
.collect::<eyre::Result<_>>()?,
ommers: block.body.ommers.iter().map(Into::into).collect(),
ommers: block.body().ommers.iter().map(Into::into).collect(),
senders: block.senders.iter().map(|sender| sender.to_vec()).collect(),
})
})
Expand Down Expand Up @@ -251,7 +251,7 @@ impl TryFrom<&reth::primitives::TransactionSigned> for proto::Transaction {

Ok(proto::AuthorizationListItem {
authorization: Some(proto::Authorization {
chain_id: authorization.chain_id().to_le_bytes().to_vec(),
chain_id: authorization.chain_id().to_le_bytes_vec(),
address: authorization.address().to_vec(),
nonce: authorization.nonce(),
}),
Expand Down Expand Up @@ -646,7 +646,6 @@ impl TryFrom<&proto::Header> for reth::primitives::Header {
.transpose()?,
requests_hash: None,
extra_data: header.extra_data.as_slice().to_vec().into(),
target_blobs_per_block: None,
})
}
}
Expand Down Expand Up @@ -814,7 +813,7 @@ impl TryFrom<&proto::Transaction> for reth::primitives::TransactionSigned {
let authorization =
authorization.authorization.as_ref().ok_or_eyre("no authorization")?;

let chain_id: u64 = u64::from_le_bytes(
let chain_id = U256::from_le_bytes::<{ U256::BYTES }>(
authorization
.chain_id
.as_slice()
Expand Down
2 changes: 1 addition & 1 deletion rollup/src/execution.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fn configure_evm<'a>(
);

let mut cfg = CfgEnvWithHandlerCfg::new_with_spec_id(evm.cfg().clone(), evm.spec_id());
config.fill_cfg_and_block_env(&mut cfg, evm.block_mut(), header, U256::ZERO);
config.fill_cfg_and_block_env(&mut cfg, evm.block_mut(), header);
*evm.cfg_mut() = cfg.cfg_env;

evm
Expand Down
4 changes: 2 additions & 2 deletions rollup/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ where
tx_hash = %tx.recalculate_hash(),
chain_id = %header.rollupChainId,
sequence = %header.sequence,
transactions = block.body.transactions.len(),
transactions = block.body().transactions.len(),
"Block submitted, executed and inserted into database"
);
}
Expand Down Expand Up @@ -246,7 +246,7 @@ fn decode_chain_into_rollup_events(
// Get all receipts
.flat_map(|(block, receipts)| {
block
.body
.body()
.transactions
.iter()
.zip(receipts.iter().flatten())
Expand Down

0 comments on commit a7dc6e0

Please sign in to comment.