Skip to content

Commit

Permalink
bump alloy
Browse files Browse the repository at this point in the history
  • Loading branch information
@klkvr
klkvr committed Apr 6, 2024
1 parent 3ebf3ab commit c734de4
Show file tree
Hide file tree
Showing 47 changed files with 481 additions and 545 deletions.
45 changes: 22 additions & 23 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ foundry-compilers = { version = "0.3.14", default-features = false }
# no default features to avoid c-kzg
revm = { version = "8", default-features = false }
revm-primitives = { version = "3", default-features = false }
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "75c6ad0", features = [
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "c34b770", features = [
"serde",
] }

Expand All @@ -157,27 +157,27 @@ ethers-signers = { version = "2.0.14", default-features = false }
ethers-middleware = { version = "2.0.14", default-features = false }

## alloy
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-signer-aws = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-signer-ledger = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-signer-trezor = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda", default-features = false }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-signer-aws = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-signer-ledger = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-signer-trezor = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "17633df", default-features = false }
alloy-primitives = { version = "0.7.0", features = ["getrandom"] }
alloy-dyn-abi = "0.7.0"
alloy-json-abi = "0.7.0"
Expand Down
18 changes: 9 additions & 9 deletions crates/anvil/core/src/eth/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ impl Block {
logs_bloom: partial_header.logs_bloom,
difficulty: partial_header.difficulty,
number: partial_header.number,
gas_limit: partial_header.gas_limit,
gas_used: partial_header.gas_used,
gas_limit: partial_header.gas_limit as u64,
gas_used: partial_header.gas_used as u64,
timestamp: partial_header.timestamp,
extra_data: partial_header.extra_data,
mix_hash: partial_header.mix_hash,
Expand All @@ -70,7 +70,7 @@ impl Block {
excess_blob_gas: None,
parent_beacon_block_root: None,
nonce: partial_header.nonce,
base_fee_per_gas: partial_header.base_fee,
base_fee_per_gas: partial_header.base_fee.map(|v| v as u64),
},
transactions,
ommers,
Expand All @@ -88,13 +88,13 @@ pub struct PartialHeader {
pub logs_bloom: Bloom,
pub difficulty: U256,
pub number: u64,
pub gas_limit: u64,
pub gas_used: u64,
pub gas_limit: u128,
pub gas_used: u128,
pub timestamp: u64,
pub extra_data: Bytes,
pub mix_hash: B256,
pub nonce: u64,
pub base_fee: Option<u64>,
pub base_fee: Option<u128>,
}

impl From<Header> for PartialHeader {
Expand All @@ -107,13 +107,13 @@ impl From<Header> for PartialHeader {
logs_bloom: value.logs_bloom,
difficulty: value.difficulty,
number: value.number,
gas_limit: value.gas_limit,
gas_used: value.gas_used,
gas_limit: value.gas_limit as u128,
gas_used: value.gas_used as u128,
timestamp: value.timestamp,
extra_data: value.extra_data,
mix_hash: value.mix_hash,
nonce: value.nonce,
base_fee: value.base_fee_per_gas,
base_fee: value.base_fee_per_gas.map(|v| v as u128),
}
}
}
Expand Down
Loading

0 comments on commit c734de4

Please sign in to comment.