Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,451 changes: 1,439 additions & 1,012 deletions Cargo.lock

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ debug = 2
opt-level = 3

[workspace.dependencies]
alloy = { version = "1.8.2", features = [
alloy = { version = "2.0.0", features = [
"rlp",
"asm-keccak",
"full",
Expand All @@ -73,36 +73,36 @@ alloy = { version = "1.8.2", features = [
"contract",
] }
alloy-chains = { version = "0.2.33", default-features = false }
alloy-consensus = { version = "1.8.2", default-features = false }
alloy-contract = { version = "1.8.2" }
alloy-consensus = { version = "2.0.0", default-features = false }
alloy-contract = { version = "2.0.0" }
alloy-dyn-abi = "1.5.6"
alloy-eips = { version = "1.8.2", default-features = false }
alloy-genesis = { version = "1.8.2", default-features = false }
alloy-json-rpc = { version = "1.8.2", default-features = false }
alloy-network = { version = "1.8.2", default-features = false }
alloy-node-bindings = { version = "1.8.2", default-features = false }
alloy-eips = { version = "2.0.0", default-features = false }
alloy-genesis = { version = "2.0.0", default-features = false }
alloy-json-rpc = { version = "2.0.0", default-features = false }
alloy-network = { version = "2.0.0", default-features = false }
alloy-node-bindings = { version = "2.0.0", default-features = false }
alloy-primitives = { version = "1.5.6", default-features = false, features = ["map-foldhash", "asm-keccak"] }
alloy-provider = { version = "1.8.2", default-features = false, features = ["reqwest"] }
alloy-pubsub = { version = "1.8.2", default-features = false }
alloy-provider = { version = "2.0.0", default-features = false, features = ["reqwest"] }
alloy-pubsub = { version = "2.0.0", default-features = false }
alloy-rlp = "0.3.13"
alloy-rlp-derive = "0.3.13"
alloy-rpc-client = { version = "1.8.2", default-features = false }
alloy-rpc-types = { version = "1.8.2", default-features = false, features = ["eth"] }
alloy-rpc-types-admin = { version = "1.8.2", default-features = false }
alloy-rpc-types-anvil = { version = "1.8.2", default-features = false }
alloy-rpc-types-beacon = { version = "1.8.2", default-features = false }
alloy-rpc-types-engine = { version = "1.8.2", default-features = false }
alloy-rpc-types-eth = { version = "1.8.2", default-features = false }
alloy-rpc-types-txpool = { version = "1.8.2", default-features = false }
alloy-serde = { version = "1.8.2", default-features = false }
alloy-signer = { version = "1.8.2", default-features = false }
alloy-signer-local = { version = "1.8.2", default-features = false }
alloy-rpc-client = { version = "2.0.0", default-features = false }
alloy-rpc-types = { version = "2.0.0", default-features = false, features = ["eth"] }
alloy-rpc-types-admin = { version = "2.0.0", default-features = false }
alloy-rpc-types-anvil = { version = "2.0.0", default-features = false }
alloy-rpc-types-beacon = { version = "2.0.0", default-features = false }
alloy-rpc-types-engine = { version = "2.0.0", default-features = false }
alloy-rpc-types-eth = { version = "2.0.0", default-features = false }
alloy-rpc-types-txpool = { version = "2.0.0", default-features = false }
alloy-serde = { version = "2.0.0", default-features = false }
alloy-signer = { version = "2.0.0", default-features = false }
alloy-signer-local = { version = "2.0.0", default-features = false }
alloy-sol-macro = "1.5.6"
alloy-sol-types = "1.5.6"
alloy-transport = { version = "1.8.2" }
alloy-transport-http = { version = "1.8.2", features = ["reqwest-rustls-tls"], default-features = false }
alloy-transport-ipc = { version = "1.8.2", default-features = false }
alloy-transport-ws = { version = "1.8.2", default-features = false }
alloy-transport = { version = "2.0.0" }
alloy-transport-http = { version = "2.0.0", features = ["reqwest-rustls-tls"], default-features = false }
alloy-transport-ipc = { version = "2.0.0", default-features = false }
alloy-transport-ws = { version = "2.0.0", default-features = false }
alloy-trie = { version = "0.9.0", default-features = false }
angstrom = { path = "./bin/angstrom/" }
angstrom-amm-quoter = { path = "./crates/amm-quoter/" }
Expand Down Expand Up @@ -173,52 +173,52 @@ quote = "1"
rand = "0.9.0"
rand_distr = "0.5.1"
rayon = "1"
reth = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-codecs = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-discv4 = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-ecies = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0", features = [
reth = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-codecs = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-discv4 = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-ecies = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0", features = [
"serde",
] }
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-network = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-node-types = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-primitives-traits = "0.1.0"
reth-provider = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-tokio-util = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
reth-trie-common = { git = "https://github.com/paradigmxyz/reth", version = "2.0.0", tag = "v2.0.0" }
revm = { version = "36.0.0", features = [
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-network = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-node-types = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-primitives-traits = "0.3.0"
reth-provider = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-tokio-util = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
reth-trie-common = { git = "https://github.com/paradigmxyz/reth", version = "2.1.0", tag = "v2.1.0" }
revm = { version = "38.0.0", features = [
"std",
"secp256k1",
"optional_balance_check",
"optional_block_gas_limit",
], default-features = false }
revm-bytecode = { version = "9.0.0", default-features = false }
revm-database = { version = "12.0.0", default-features = false }
revm-interpreter = { version = "34.0.0", default-features = false }
revm-primitives = { version = "22.1.0", default-features = false }
revm-state = { version = "10.0.0", default-features = false }
revm-bytecode = { version = "10.0.0", default-features = false }
revm-database = { version = "13.0.0", default-features = false }
revm-interpreter = { version = "35.0.0", default-features = false }
revm-primitives = { version = "23.0.0", default-features = false }
revm-state = { version = "11.0.0", default-features = false }
ring = "=0.17.12"
secp256k1 = { version = "0.30", default-features = false, features = ["global-context", "rand", "recovery"] }
serde = { version = "1", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion abi-v4/GetUniswapV4PoolData.sol/GetUniswapV4PoolData.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion abi-v4/GetUniswapV4TickData.sol/GetUniswapV4TickData.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/sepolia-bundle-lander/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::{collections::HashSet, sync::Arc};

use alloy::{
eips::Encodable2718,
network::TransactionBuilder,
network::{NetworkTransactionBuilder, TransactionBuilder},
primitives::{Address, Bytes, U256, aliases::I24},
providers::{
Identity, Provider, ProviderBuilder, RootProvider,
Expand Down
2 changes: 1 addition & 1 deletion bin/testnet/tests/testnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::time::Duration;

use alloy::{
eips::{Encodable2718, eip1559::ETHEREUM_BLOCK_GAS_LIMIT_30M},
network::TransactionBuilder,
network::{NetworkTransactionBuilder, TransactionBuilder},
providers::Provider,
sol_types::SolCall
};
Expand Down
13 changes: 9 additions & 4 deletions crates/types/src/reth_db_wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use reth_provider::{
};
use reth_storage_api::{StateRootProvider, StorageRootProvider};
use reth_trie::{
AccountProof, HashedPostState, HashedStorage, MultiProof, StorageMultiProof, TrieInput,
updates::TrieUpdates
AccountProof, ExecutionWitnessMode, HashedPostState, HashedStorage, MultiProof,
StorageMultiProof, TrieInput, updates::TrieUpdates
};
use revm::state::AccountInfo;
use revm_bytecode::Bytecode;
Expand Down Expand Up @@ -371,8 +371,13 @@ where
self.db.latest()?.proof(input, address, slots)
}

fn witness(&self, input: TrieInput, target: HashedPostState) -> ProviderResult<Vec<Bytes>> {
self.db.latest()?.witness(input, target)
fn witness(
&self,
input: TrieInput,
target: HashedPostState,
mode: ExecutionWitnessMode
) -> ProviderResult<Vec<Bytes>> {
self.db.latest()?.witness(input, target, mode)
}

fn multiproof(
Expand Down
2 changes: 1 addition & 1 deletion crates/types/src/submission/angstrom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::fmt::Debug;

use alloy::{
eips::Encodable2718,
network::TransactionBuilder,
network::{NetworkTransactionBuilder, TransactionBuilder},
primitives::Bytes,
providers::{Provider, RootProvider},
rpc::client::ClientBuilder
Expand Down
2 changes: 1 addition & 1 deletion crates/types/src/submission/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::{ops::Deref, pin::Pin, sync::Arc};
use alloy::{
consensus::{EthereumTxEnvelope, TxEip4844Variant},
eips::eip1559::Eip1559Estimation,
network::TransactionBuilder,
network::{NetworkTransactionBuilder, TransactionBuilder},
primitives::Address,
providers::Provider,
rpc::types::TransactionRequest,
Expand Down
Loading