forked from privacy-scaling-explorations/zkevm-circuits
-
Notifications
You must be signed in to change notification settings - Fork 391
/
Copy pathl2.rs
361 lines (330 loc) · 13.1 KB
/
l2.rs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
pub use super::block::{BlockContext, Blocks};
use crate::{
circuit_input_builder::{self, Block, CircuitInputBuilder, CircuitsParams},
error::Error,
};
use eth_types::{
self,
l2_types::{trace::collect_codes, BlockTrace, StorageTrace},
state_db::{self, CodeDB, StateDB},
Address, EthBlock, ToWord, Word, H256,
};
use ethers_core::types::Bytes;
use mpt_zktrie::state::ZktrieState;
use std::collections::hash_map::HashMap;
fn dump_code_db(cdb: &CodeDB) {
for (k, v) in &cdb.0 {
assert!(!k.is_zero());
log::trace!("codedb codehash {:?}, len {}", k, v.len());
}
}
impl CircuitInputBuilder {
fn apply_l2_trace(&mut self, block_trace: BlockTrace) -> Result<(), Error> {
log::trace!(
"apply_l2_trace start, block num {:?}",
block_trace.header.number
);
//self.sdb.list_accounts();
//dump_code_db(&self.code_db);
let eth_block = EthBlock::from(&block_trace);
log::trace!("eth_block block number {:?}", eth_block.number);
let geth_trace: Vec<eth_types::GethExecTrace> = block_trace
.execution_results
.into_iter()
.map(From::from)
.collect();
assert_eq!(
self.block.chain_id, block_trace.chain_id,
"unexpected chain id in new block_trace"
);
// Scroll EVM disables BLOCKHASH opcode, so here we don't need any hashes.
let mut block = Block::new_with_l1_queue_index(
self.block.chain_id,
block_trace.start_l1_queue_index,
Vec::new(),
ð_block,
)?;
// override zeroed minder field with additional "coinbase" field in blocktrace
block.coinbase = block_trace.coinbase.address;
let block_num = block.number.as_u64();
// TODO: should be check the block number is in sequence?
self.block.add_block(block);
// note the actions when `handle_rwc_reversion` argument (the 4th one)
// is true is executing outside this closure
self.handle_block_inner(ð_block, &geth_trace)?;
// TODO: remove this when GethExecStep don't contains heap data
// send to another thread to drop the heap data
// here we use a magic number from benchmark to decide whether to
// spawn-drop or not
if !geth_trace.is_empty() && geth_trace[0].struct_logs.len() > 2000 {
std::thread::spawn(move || {
std::mem::drop(eth_block);
std::mem::drop(geth_trace);
});
}
log::debug!("apply_l2_trace done for block {:?}", block_num);
//self.sdb.list_accounts();
Ok(())
}
fn collect_account_proofs(
storage_trace: &StorageTrace,
) -> impl Iterator<Item = (&Address, impl IntoIterator<Item = &[u8]>)> + Clone {
storage_trace.proofs.iter().flat_map(|kv_map| {
kv_map
.iter()
.map(|(k, bts)| (k, bts.iter().map(Bytes::as_ref)))
})
}
fn collect_storage_proofs(
storage_trace: &StorageTrace,
) -> impl Iterator<Item = (&Address, &H256, impl IntoIterator<Item = &[u8]>)> + Clone {
storage_trace.storage_proofs.iter().flat_map(|(k, kv_map)| {
kv_map
.iter()
.map(move |(sk, bts)| (k, sk, bts.iter().map(Bytes::as_ref)))
})
}
/// Create a new CircuitInputBuilder from the given `eth_block` and
/// `StateDB`, `CodeDB`, `ZktrieState`
pub fn new_with_trie_state(
sdb: StateDB,
code_db: CodeDB,
mpt_init_state: ZktrieState,
block: &Blocks,
) -> Self {
Self {
sdb,
code_db,
block: block.clone(),
block_ctx: BlockContext::new(),
mpt_init_state: Some(mpt_init_state),
}
}
/// Create a new CircuitInputBuilder from the given `l2_trace` and `circuits_params`
pub fn new_from_l2_trace(
circuits_params: CircuitsParams,
l2_trace: BlockTrace,
) -> Result<Self, Error> {
let chain_id = l2_trace.chain_id;
let old_root = l2_trace.storage_trace.root_before;
log::debug!(
"building zktrie state for block {:?}, old root {}",
l2_trace.header.number,
hex::encode(old_root),
);
let mpt_init_state = if !l2_trace.storage_trace.flatten_proofs.is_empty() {
log::info!("always init mpt state with flatten proofs");
let mut state = ZktrieState::construct(old_root);
let zk_db = state.expose_db();
for (k, bytes) in &l2_trace.storage_trace.flatten_proofs {
zk_db.add_node_bytes(bytes, Some(k.as_bytes())).unwrap();
}
zk_db.with_key_cache(
l2_trace
.storage_trace
.address_hashes
.iter()
.map(|(k, v)| (k.as_bytes(), v.as_bytes())),
);
zk_db.with_key_cache(
l2_trace
.storage_trace
.store_key_hashes
.iter()
.map(|(k, v)| (k.as_bytes(), v.as_bytes())),
);
log::debug!(
"building partial ZktrieState done from new trace, root {}",
hex::encode(state.root())
);
Some(state)
} else {
let mpt_init_state = ZktrieState::from_trace_with_additional(
old_root,
Self::collect_account_proofs(&l2_trace.storage_trace),
Self::collect_storage_proofs(&l2_trace.storage_trace),
l2_trace
.storage_trace
.deletion_proofs
.iter()
.map(Bytes::as_ref),
)
.map_err(Error::IoError)?;
log::debug!(
"building partial ZktrieState done, root {}",
hex::encode(mpt_init_state.root())
);
Some(mpt_init_state)
};
let mut sdb = StateDB::new();
if let Some(zk_state) = &mpt_init_state {
for (addr, acc) in zk_state.query_accounts(
Self::collect_account_proofs(&l2_trace.storage_trace).map(|(addr, _)| addr),
) {
if let Some(acc) = acc {
log::trace!("sdb trace[query mode] {:?} {:?}", addr, acc);
sdb.set_account(&addr, state_db::Account::from(&acc));
} else {
log::trace!("sdb trace[query mode] {:?} for zero account", addr);
sdb.set_account(&addr, state_db::Account::zero());
}
}
for ((addr, key), val) in zk_state.query_storages(
Self::collect_storage_proofs(&l2_trace.storage_trace)
.map(|(addr, key, _)| (addr, key)),
) {
let key = key.to_word();
if let Some(val) = val {
log::trace!(
"sdb trace storage[query mode] {:?} {:?} {:?}",
addr,
key,
val
);
*sdb.get_storage_mut(&addr, &key).1 = val.into();
} else {
log::trace!(
"sdb trace storage[query mode] {:?} {:?} for zero",
addr,
key
);
*sdb.get_storage_mut(&addr, &key).1 = Default::default();
}
}
} else {
for parsed in ZktrieState::parse_account_from_proofs(Self::collect_account_proofs(
&l2_trace.storage_trace,
)) {
let (addr, acc) = parsed.map_err(Error::IoError)?;
log::trace!("sdb trace {:?} {:?}", addr, acc);
sdb.set_account(&addr, state_db::Account::from(&acc));
}
for parsed in ZktrieState::parse_storage_from_proofs(Self::collect_storage_proofs(
&l2_trace.storage_trace,
)) {
let ((addr, key), val) = parsed.map_err(Error::IoError)?;
let key = key.to_word();
log::trace!("sdb trace storage {:?} {:?} {:?}", addr, key, val);
*sdb.get_storage_mut(&addr, &key).1 = val.into();
}
}
let mut code_db = CodeDB::new();
code_db.insert(Vec::new());
let codes = collect_codes(&l2_trace)?;
for (hash, code) in codes {
code_db.insert_with_hash(hash, code);
}
let mut builder_block = circuit_input_builder::Blocks::init(chain_id, circuits_params);
builder_block.prev_state_root = old_root;
builder_block.start_l1_queue_index = l2_trace.start_l1_queue_index;
let mut builder = Self {
sdb,
code_db,
block: builder_block,
block_ctx: BlockContext::new(),
mpt_init_state,
};
builder.apply_l2_trace(l2_trace)?;
Ok(builder)
}
/// Apply more l2 traces
pub fn add_more_l2_trace(&mut self, l2_trace: BlockTrace) -> Result<(), Error> {
// update init state new data from storage
if !l2_trace.storage_trace.flatten_proofs.is_empty() {
let mpt_state = self
.mpt_init_state
.as_mut()
.expect("should have inited with flatten proof");
log::info!("add more flatten proofs to mpt state");
let zk_db = mpt_state.expose_db();
for (k, bytes) in &l2_trace.storage_trace.flatten_proofs {
zk_db.add_node_bytes(bytes, Some(k.as_bytes())).unwrap();
}
zk_db.with_key_cache(
l2_trace
.storage_trace
.address_hashes
.iter()
.map(|(k, v)| (k.as_bytes(), v.as_bytes())),
);
zk_db.with_key_cache(
l2_trace
.storage_trace
.store_key_hashes
.iter()
.map(|(k, v)| (k.as_bytes(), v.as_bytes())),
);
} else if let Some(mpt_init_state) = &mut self.mpt_init_state {
mpt_init_state.update_from_trace(
Self::collect_account_proofs(&l2_trace.storage_trace),
Self::collect_storage_proofs(&l2_trace.storage_trace),
l2_trace
.storage_trace
.deletion_proofs
.iter()
.map(Bytes::as_ref),
);
}
let filtered_accounts =
Self::collect_account_proofs(&l2_trace.storage_trace).filter(|(addr, _)| {
let (existed, _) = self.sdb.get_account(addr);
!existed
});
let new_accounts = if let Some(zk_state) = &self.mpt_init_state {
zk_state
.query_accounts(filtered_accounts.map(|(addr, _)| addr))
.fold(HashMap::new(), |mut m, (addr, acc)| {
m.insert(addr, acc.unwrap_or_default());
m
})
} else {
ZktrieState::parse_account_from_proofs(filtered_accounts).try_fold(
HashMap::new(),
|mut m, parsed| -> Result<HashMap<_, _>, Error> {
let (addr, acc) = parsed.map_err(Error::IoError)?;
m.insert(addr, acc);
Ok(m)
},
)?
};
for (addr, acc) in new_accounts {
self.sdb.set_account(&addr, state_db::Account::from(&acc));
}
let filtered_storages =
Self::collect_storage_proofs(&l2_trace.storage_trace).filter(|(addr, key, _)| {
let key = key.to_word();
let (existed, _) = self.sdb.get_committed_storage(addr, &key);
!existed
});
let new_storages = if let Some(zk_state) = &self.mpt_init_state {
zk_state
.query_storages(filtered_storages.map(|(addr, key, _)| (addr, key)))
.fold(HashMap::new(), |mut m, ((addr, key), val)| {
if let Some(val) = val {
m.insert((addr, key.to_word()), val.into());
} else {
m.insert((addr, key.to_word()), Default::default());
}
m
})
} else {
ZktrieState::parse_storage_from_proofs(filtered_storages).try_fold(
HashMap::new(),
|mut m, parsed| -> Result<HashMap<(Address, Word), Word>, Error> {
let ((addr, key), val) = parsed.map_err(Error::IoError)?;
m.insert((addr, key.to_word()), val.into());
Ok(m)
},
)?
};
for ((addr, key), val) in new_storages {
*self.sdb.get_storage_mut(&addr, &key).1 = val;
}
let codes = collect_codes(&l2_trace)?;
for (hash, code) in codes {
self.code_db.insert_with_hash(hash, code);
}
self.apply_l2_trace(l2_trace)?;
Ok(())
}
}