Skip to content

Commit 307b9eb

Browse files
silathdiirsilathdiir
committed
Update dependencies.
1 parent cc50651 commit 307b9eb

File tree

14 files changed

+423
-323
lines changed

14 files changed

+423
-323
lines changed

‎Cargo.lock

Lines changed: 304 additions & 228 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ members = [
1414
resolver = "2"
1515

1616
[workspace.dependencies]
17-
alloy = { version = "0.2", default-features = false, features = [
17+
alloy = { version = "0.4", default-features = false, features = [
1818
"consensus",
1919
"contract",
2020
"getrandom",
@@ -33,17 +33,30 @@ alloy = { version = "0.2", default-features = false, features = [
3333
] }
3434
anyhow = "1.0"
3535
base64 = "0.22"
36+
bb8 = "0.8.5"
37+
bb8-postgres = "0.8.1"
3638
bincode = "1.3"
39+
camelpaste = "0.1"
40+
clap = { version = "4.5", features = ["derive"] }
41+
colored = "2.1"
3742
csv = "1.3"
43+
delegate = "0.13"
44+
derive_more = { version = "1.0", features = ["constructor"] }
45+
dialoguer = { version = "0.11", features = ["fuzzy-select"] }
3846
env_logger = "0.11"
47+
envconfig = "0.11"
3948
# TODO: see if we can revert to upstream repo: originally used
4049
# to fetch proof with "node" instead of already encoded struct
50+
ethereum-types = "0.14.1"
4151
eth_trie = { git = "https://github.com/nikkolasg/eth-trie.rs" }
52+
futures = "0.3"
4253
glob = "0.3"
4354
gobuild = "0.1.0-alpha.1"
44-
hashbrown = "0.14"
55+
hashbrown = "0.15"
4556
hex = "0.4"
46-
itertools = "0.12"
57+
itertools = "0.13"
58+
jammdb = "0.11.0"
59+
lazy_static = "1.5.0"
4760
log = "0.4"
4861
num = "0.4"
4962
paste = "1.0"
@@ -55,16 +68,36 @@ plonky2_ecgfp5 = { git = "https://github.com/Lagrange-Labs/plonky2-ecgfp5" }
5568
plonky2_monolith = "0.1.0"
5669
plonky2x = { git = "https://github.com/Lagrange-Labs/succinctx", branch = "fix-build" }
5770
poseidon2_plonky2 = { git = "https://github.com/Lagrange-Labs/plonky2", branch = "upstream" }
71+
postgres-types = { version = "0.2.6", features = ["with-serde_json-1"] }
5872
rand = "0.8"
73+
rand_chacha = "0.3.1"
5974
revm = { version = "3.5", default-features = false }
6075
rlp = "0.5"
61-
rstest = "0.18"
76+
rstest = "0.23"
6277
serde = { version = "1.0", features = ["derive"] }
6378
serde_json = "1.0"
6479
serial_test = "3.0"
6580
sha2 = "0.10"
81+
sha256 = { version = "1.5.0", default-features = false }
6682
sha3 = "0.10"
67-
tokio = { version = "1.34", features = ["macros", "rt-multi-thread", "fs"] }
83+
simple_logger = { version = "5.0.0", default-features = false, features = [
84+
"colors",
85+
] }
86+
sqlparser = "0.49"
87+
stderrlog = { version = "0.6.0", default-features = false }
88+
tabled = { version = "0.16", features = ["ansi"] }
89+
test-log = "0.2.16"
90+
testfile = "0.1.5"
91+
thiserror = "2.0"
92+
tokio = { version = "1.34", features = [
93+
"sync",
94+
"macros",
95+
"macros",
96+
"rt-multi-thread",
97+
"fs",
98+
] }
99+
tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] }
100+
tracing = "0.1.40"
68101

69102
# just for test
70103
ethers = { git = "https://github.com/Lagrange-Labs/ethers-rs", default-features = false, features = [

‎inspect/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ edition = "2021"
55

66
[dependencies]
77
anyhow.workspace = true
8+
clap.workspace = true
9+
colored.workspace = true
10+
dialoguer.workspace = true
811
hex.workspace = true
912
itertools.workspace = true
1013
serde.workspace = true
11-
12-
clap = { version = "4.5.17", features = ["derive"] }
13-
colored = "2.1.0"
14-
dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
15-
tabled = { version = "0.16.0", features = ["ansi"] }
16-
tokio = { version = "1.34", features = ["sync", "macros"], default-features = false }
14+
tabled.workspace = true
15+
tokio.workspace = true
1716

1817
ryhope = { path = "../ryhope" }
1918
mp2_v1 = { path = "../mp2-v1" }

‎mp2-common/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
anyhow.workspace = true
87
alloy.workspace = true
8+
anyhow.workspace = true
99
bincode.workspace = true
10-
derive_more = "0.99.18"
10+
derive_more.workspace = true
1111
eth_trie.workspace = true
12+
ethereum-types.workspace = true
1213
hashbrown.workspace = true
1314
hex.workspace = true
1415
itertools.workspace = true
@@ -23,16 +24,15 @@ rand.workspace = true
2324
rlp.workspace = true
2425
serde.workspace = true
2526
sha3.workspace = true
26-
ethereum-types = "0.14.1"
2727

2828
[dev-dependencies]
29+
ethers.workspace = true
2930
hex.workspace = true
3031
rand.workspace = true
32+
rstest.workspace = true
3133
tokio.workspace = true
32-
ethers.workspace = true
3334

3435
mp2_test = { path = "../mp2-test" }
35-
rstest.workspace = true
3636

3737
[features]
3838
ci = ["mp2_test/ci"]

‎mp2-common/src/eth.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//! such as fetching blocks, transactions, creating MPTs, getting proofs, etc.
33
use alloy::{
44
eips::BlockNumberOrTag,
5+
network::primitives::BlockTransactionsKind,
56
primitives::{Address, B256},
67
providers::{Provider, RootProvider},
78
rlp::Encodable as AlloyEncodable,
@@ -266,7 +267,7 @@ fn from_rpc_header_to_consensus(h: &alloy::rpc::types::Header) -> alloy::consens
266267
withdrawals_root: h.withdrawals_root,
267268
logs_bloom: h.logs_bloom,
268269
difficulty: h.difficulty,
269-
number: h.number.unwrap(),
270+
number: h.number,
270271
gas_limit: h.gas_limit,
271272
gas_used: h.gas_used,
272273
timestamp: h.timestamp,
@@ -537,13 +538,13 @@ mod test {
537538
println!("URL given = {}", url);
538539
let provider = ProviderBuilder::new().on_http(url.parse().unwrap());
539540
let block = provider
540-
.get_block_by_number(BlockNumberOrTag::Latest, true)
541+
.get_block_by_number(BlockNumberOrTag::Latest, BlockTransactionsKind::Full.into())
541542
.await?
542543
.unwrap();
543544
let previous_block = provider
544545
.get_block_by_number(
545-
BlockNumberOrTag::Number(block.header.number.unwrap() - 1),
546-
true,
546+
BlockNumberOrTag::Number(block.header.number - 1),
547+
BlockTransactionsKind::Full.into(),
547548
)
548549
.await?
549550
.unwrap();
@@ -556,14 +557,11 @@ mod test {
556557
let ethers_provider = ethers::providers::Provider::<Http>::try_from(url)
557558
.expect("could not instantiate HTTP Provider");
558559
let ethers_block = ethers_provider
559-
.get_block_with_txs(BlockNumber::Number(U64::from(block.header.number.unwrap())))
560+
.get_block_with_txs(BlockNumber::Number(U64::from(block.header.number)))
560561
.await?
561562
.unwrap();
562563
// sanity check that ethers manual rlp implementation works
563-
assert_eq!(
564-
block.header.hash.unwrap().as_slice(),
565-
ethers_block.block_hash()
566-
);
564+
assert_eq!(block.header.hash.as_slice(), ethers_block.block_hash());
567565
let ethers_rlp = ethers_block.rlp();
568566
let alloy_rlp = from_rpc_header_to_consensus(&block.header).rlp();
569567
assert_eq!(ethers_rlp, alloy_rlp);
@@ -575,7 +573,7 @@ mod test {
575573

576574
let previous_computed = previous_block.block_hash();
577575
assert_eq!(&previous_computed, block.header.parent_hash.as_slice());
578-
let alloy_given = block.header.hash.unwrap();
576+
let alloy_given = block.header.hash;
579577
assert_eq!(alloy_given, alloy_computed);
580578
Ok(())
581579
}

‎mp2-v1/Cargo.toml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7+
alloy.workspace = true
78
anyhow.workspace = true
9+
bb8-postgres.workspace = true
10+
bb8.workspace = true
811
bincode.workspace = true
12+
derive_more.workspace = true
913
eth_trie.workspace = true
14+
futures.workspace = true
1015
hashbrown.workspace = true
11-
alloy.workspace = true
16+
hex.workspace = true
1217
itertools.workspace = true
1318
log.workspace = true
1419
paste.workspace = true
@@ -18,43 +23,38 @@ plonky2_ecgfp5.workspace = true
1823
rand.workspace = true
1924
rlp.workspace = true
2025
serde.workspace = true
26+
serde_json.workspace = true
27+
tokio-postgres.workspace = true
2128

2229
mp2_common = { path = "../mp2-common" }
2330
recursion_framework = { path = "../recursion-framework" }
2431
ryhope = { path = "../ryhope" }
2532
parsil = { path = "../parsil" }
2633
verifiable-db = { path = "../verifiable-db" }
27-
derive_more = "0.99.18"
28-
hex.workspace = true
29-
serde_json.workspace = true
30-
bb8 = "0.8.5"
31-
bb8-postgres = "0.8.1"
32-
tokio-postgres = "0.7.12"
33-
futures = "0.3.30"
3434

3535
[dev-dependencies]
3636
alloy.workspace = true
37+
bb8-postgres.workspace = true
38+
bb8.workspace = true
39+
bincode.workspace = true
3740
csv.workspace = true
41+
env_logger.workspace = true
42+
envconfig.workspace = true
43+
futures.workspace = true
3844
hex.workspace = true
45+
jammdb.workspace = true
46+
lazy_static.workspace = true
47+
rand_chacha.workspace = true
3948
serde_json.workspace = true
40-
tokio.workspace = true
4149
serial_test.workspace = true
50+
sqlparser.workspace = true
51+
test-log.workspace = true
52+
testfile.workspace = true
53+
tokio-postgres.workspace = true
54+
tokio.workspace = true
4255

4356
mp2_test = { path = "../mp2-test" }
4457
parsil = { path = "../parsil" }
45-
env_logger.workspace = true
46-
envconfig = "0.10.0"
47-
test-log = "0.2.16"
48-
jammdb = "0.11.0"
49-
bincode.workspace = true
50-
futures = "0.3.30"
51-
lazy_static = "1.5.0"
52-
rand_chacha = "0.3.1"
53-
bb8 = "0.8.5"
54-
bb8-postgres = "0.8.1"
55-
tokio-postgres = "0.7.11"
56-
sqlparser = "0.49.0"
57-
testfile = "0.1.5"
5858

5959
[features]
6060
original_poseidon = ["mp2_common/original_poseidon"]

‎mp2-v1/src/block_extraction/circuit.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ mod test {
126126

127127
use alloy::{
128128
eips::BlockNumberOrTag,
129+
network::primitives::BlockTransactionsKind,
129130
providers::{Provider, ProviderBuilder},
130131
};
131132
use mp2_common::{eth::left_pad_generic, u256, utils::ToFields, C, F};
@@ -154,7 +155,7 @@ mod test {
154155
let provider = ProviderBuilder::new().on_http(url.parse().unwrap());
155156
let block_number = BlockNumberOrTag::Latest;
156157
let block = provider
157-
.get_block_by_number(block_number, true)
158+
.get_block_by_number(block_number, BlockTransactionsKind::Full.into())
158159
.await
159160
.unwrap()
160161
.unwrap();
@@ -174,7 +175,7 @@ mod test {
174175
.0
175176
.pack(Endianness::Little)
176177
.to_fields();
177-
let block_number_buff = block.header.number.unwrap().to_be_bytes();
178+
let block_number_buff = block.header.number.to_be_bytes();
178179
const NUM_LIMBS: usize = u256::NUM_LIMBS;
179180
let block_number =
180181
left_pad_generic::<u32, NUM_LIMBS>(&block_number_buff.pack(Endianness::Big))
@@ -189,13 +190,7 @@ mod test {
189190
assert_eq!(pi.block_hash_raw(), &block_hash);
190191
assert_eq!(
191192
pi.block_hash_raw(),
192-
block
193-
.header
194-
.hash
195-
.unwrap()
196-
.0
197-
.pack(Endianness::Little)
198-
.to_fields()
193+
block.header.hash.0.pack(Endianness::Little).to_fields()
199194
);
200195
assert_eq!(pi.state_root_raw(), &state_root);
201196
assert_eq!(pi.block_number_raw(), &block_number);

‎mp2-v1/src/block_extraction/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ impl PublicParameters {
6464
mod test {
6565
use alloy::{
6666
eips::BlockNumberOrTag,
67+
network::primitives::BlockTransactionsKind,
6768
primitives::U256,
6869
providers::{Provider, ProviderBuilder},
6970
};
@@ -84,7 +85,7 @@ mod test {
8485
let provider = ProviderBuilder::new().on_http(url.parse().unwrap());
8586
let block_number = BlockNumberOrTag::Latest;
8687
let block = provider
87-
.get_block_by_number(block_number, true)
88+
.get_block_by_number(block_number, BlockTransactionsKind::Full.into())
8889
.await
8990
.unwrap()
9091
.unwrap();
@@ -104,7 +105,6 @@ mod test {
104105
block
105106
.header
106107
.hash
107-
.unwrap()
108108
// XXX unclear why that fails when one removes the ".0" since we access things
109109
// directly underneath when calling pack directly or using as_slice, both fail.
110110
// XXX unclear why it is needed here but not for previous hash...
@@ -122,7 +122,7 @@ mod test {
122122
);
123123
assert_eq!(
124124
U256::from_fields(pi.block_number_raw()),
125-
U256::from(block.header.number.unwrap())
125+
U256::from(block.header.number),
126126
);
127127
assert_eq!(
128128
pi.state_root_raw(),

‎mp2-v1/tests/common/block_extraction.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ impl TestContext {
2727

2828
let pproof = deserialize_proof::<F, C, D>(&proof)?;
2929
let pi = block_extraction::PublicInputs::from_slice(&pproof.public_inputs);
30-
let block_number = U256::from(block.header.number.unwrap()).to_fields();
30+
let block_number = U256::from(block.header.number).to_fields();
3131
let block_hash = block
3232
.header
3333
.hash
34-
.unwrap()
3534
.as_slice()
3635
.pack(Endianness::Little)
3736
.to_fields();

‎mp2-v1/tests/common/final_extraction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ impl TestContext {
6969
let pproof = ProofWithVK::deserialize(&proof)?;
7070
let block = self.query_current_block().await;
7171

72-
let block_hash = HashOutput::from(block.header.hash.unwrap().0);
72+
let block_hash = HashOutput::from(block.header.hash.0);
7373
let prev_block_hash = HashOutput::from(block.header.parent_hash.0);
7474

7575
let pis = PublicInputs::from_slice(pproof.proof().public_inputs.as_slice());
76-
assert_eq!(pis.block_number(), block.header.number.unwrap());
76+
assert_eq!(pis.block_number(), block.header.number);
7777
assert_eq!(pis.block_hash_raw(), block_hash.to_fields());
7878
assert_eq!(pis.prev_block_hash_raw(), prev_block_hash.to_fields());
7979
debug!(" FINAL EXTRACTION MPT - digest: {:?}", pis.value_point());

‎parsil/Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ required-features = ["cli"]
1515
[dependencies]
1616
alloy.workspace = true
1717
anyhow.workspace = true
18-
camelpaste = "0.1.0"
18+
camelpaste.workspace = true
19+
clap = { workspace = true, optional = true }
1920
log.workspace = true
20-
ryhope = { path = "../ryhope" }
2121
serde.workspace = true
2222
serde_json.workspace = true
23-
sqlparser = "0.49.0"
23+
sqlparser.workspace = true
24+
stderrlog = { workspace = true, optional = true }
25+
thiserror.workspace = true
26+
27+
ryhope = { path = "../ryhope" }
2428
verifiable-db = { path = "../verifiable-db" }
25-
clap = { version = "4.5.4", features = ["derive"], optional = true }
26-
stderrlog = { version = "0.6.0", default-features = false, optional = true }
27-
thiserror = "1.0.63"
2829

2930
[features]
3031
cli = ["dep:stderrlog", "dep:clap"]

0 commit comments

Comments
 (0)