Skip to content

Commit 2b51c6d

Browse files
authored
fix(vm): update deps (#4019)
## What ❔ <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- The `Why` has to be clear to non-Matter Labs entities running their own ZK Chain --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Is this a breaking change? - [ ] Yes - [ ] No ## Operational changes <!-- Any config changes? Any new flags? Any changes to any scripts? --> <!-- Please add anything that non-Matter Labs entities running their own ZK Chain may need to know --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. --------- Signed-off-by: Danil <[email protected]>
1 parent 76a80eb commit 2b51c6d

File tree

5 files changed

+105
-115
lines changed

5 files changed

+105
-115
lines changed

core/Cargo.lock

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

core/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,19 +243,19 @@ rust-eigenda-client = "0.1.3"
243243
# However, for the historical version of protocol crates, we have lax requirements. Otherwise,
244244
# Bumping a crypto dependency like `boojum` would require us to republish all the historical packages.
245245

246-
circuit_encodings = "=0.152.2"
247-
circuit_sequencer_api = "=0.152.2"
248-
circuit_definitions = "=0.152.2"
246+
circuit_encodings = "=0.152.3"
247+
circuit_sequencer_api = "=0.152.3"
248+
circuit_definitions = "=0.152.3"
249249
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.32.1" }
250250

251-
kzg = { package = "zksync_kzg", version = "=0.152.2" }
251+
kzg = { package = "zksync_kzg", version = "=0.152.3" }
252252

253253
zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" }
254254
zk_evm_1_3_3 = { package = "zk_evm", version = "0.133" }
255255
zk_evm_1_4_0 = { package = "zk_evm", version = "0.140" }
256256
zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
257-
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.151.5" }
258-
zk_evm_1_5_2 = { package = "zk_evm", version = "=0.152.2" }
257+
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.151.7" }
258+
zk_evm_1_5_2 = { package = "zk_evm", version = "=0.152.3" }
259259

260260
fflonk = "=0.32.1"
261261

core/lib/multivm/src/versions/vm_latest/old_vm/memory.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -278,30 +278,20 @@ impl<H: HistoryMode> Memory for SimpleMemory<H> {
278278

279279
fn finish_global_frame(
280280
&mut self,
281-
base_page: MemoryPage,
281+
_base_page: MemoryPage,
282282
last_callstack_this: Address,
283283
returndata_fat_pointer: FatPointer,
284284
timestamp: Timestamp,
285285
) {
286286
// Safe to unwrap here, since `finish_global_frame` is never called with empty stack
287-
let current_observable_pages = self.observable_pages.inner().current_frame();
287+
let _current_observable_pages = self.observable_pages.inner().current_frame();
288288
let returndata_page = returndata_fat_pointer.memory_page;
289289

290290
// This is code oracle and some preimage has been decommitted into its memory.
291291
// We must keep this memory page forever for future decommits.
292292
let is_returndata_page_static =
293293
last_callstack_this == CODE_ORACLE_ADDRESS && returndata_fat_pointer.length > 0;
294294

295-
for &page in current_observable_pages {
296-
// If the page's number is greater than or equal to the `base_page`,
297-
// it means that it was created by the internal calls of this contract.
298-
// We need to add this check as the calldata pointer is also part of the
299-
// observable pages.
300-
if page >= base_page.0 && page != returndata_page {
301-
self.memory.clear_page(page as usize, timestamp);
302-
}
303-
}
304-
305295
self.observable_pages.clear_frame(timestamp);
306296
self.observable_pages.merge_frame(timestamp);
307297

0 commit comments

Comments
 (0)