Merge main-v0.13.4 into main #3995
Conversation
|
Src Dst crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs |
|
This change is |
There was a problem hiding this comment.
Reviewable status: 0 of 47 files reviewed, 1 unresolved discussion
crates/blockifier/feature_contracts/cairo1/test_contract.cairo line 750 at r14 (raw file):
#[external(v0)] fn test_pedersen (ref self: ContractState) {
@noaov1 / @meship-starkware we should fix the format of this file. Please run the cairo formatter on it (in 0.13.4)
Code quote:
#[external(v0)]
fn test_pedersen (ref self: ContractState) {
There was a problem hiding this comment.
Reviewed 3 of 35 files at r5, 1 of 5 files at r6, 2 of 4 files at r8, 6 of 21 files at r9, 3 of 13 files at r11, 1 of 5 files at r12, 4 of 4 files at r13, 27 of 28 files at r14, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion
There was a problem hiding this comment.
Reviewed 2 of 35 files at r5, 1 of 5 files at r6, 1 of 4 files at r8, 3 of 21 files at r9, 2 of 13 files at r11, 1 of 5 files at r12, 4 of 4 files at r13, 14 of 28 files at r14.
Reviewable status: all files reviewed, 1 unresolved discussion
Yoni-Starkware
force-pushed
the
yonatan/merge-main-v0.13.4-into-main-1738827577
branch
3 times, most recently
from
27d8133 to
ba27928
Compare
There was a problem hiding this comment.
Reviewed 3 of 7 files at r15, 2 of 6 files at r16, all commit messages.
Reviewable status: 43 of 49 files reviewed, 2 unresolved discussions (waiting on @meship-starkware and @Yoni-Starkware)
crates/blockifier/src/state/contract_class_manager.rs line 0 at r16 (raw file):
what happened here? why isn't this from the merge (why is it in r4<>r16)?
crates/papyrus_state_reader/src/papyrus_state.rs line 0 at r16 (raw file):
@noaov1 PTAL?
crates/blockifier/src/state/global_cache.rs line 0 at r16 (raw file):
@noaov1 PTAL?
There was a problem hiding this comment.
Reviewable status: 43 of 49 files reviewed, 2 unresolved discussions (waiting on @dorimedini-starkware, @elintul, and @meship-starkware)
crates/blockifier/src/state/contract_class_manager.rs line at r16 (raw file):
Previously, dorimedini-starkware wrote…
what happened here? why isn't this from the merge (why is it in r4<>r16)?
@elintul moved a struct to a different crate, so I couldn't impl it from this crate.
Instead, I created a struct holding the type and impled it.
Yoni-Starkware
force-pushed
the
yonatan/merge-main-v0.13.4-into-main-1738827577
branch
2 times, most recently
from
5f2ca23 to
45a98bc
Compare
There was a problem hiding this comment.
Reviewed 1 of 21 files at r9, 3 of 7 files at r15, 6 of 7 files at r18, all commit messages.
Reviewable status: 46 of 49 files reviewed, 3 unresolved discussions (waiting on @dorimedini-starkware, @elintul, @meship-starkware, and @Yoni-Starkware)
crates/blockifier/src/state/global_cache.rs line 185 at r14 (raw file):
Self(Arc::new(Mutex::new(ContractLRUCache::<T>::with_size(cache_size)))) } }
Where is it defined now?
Code quote:
pub const GLOBAL_CONTRACT_CACHE_SIZE_FOR_TEST: usize = 600;
impl<T: Clone> GlobalContractCache<T> {
/// Locks the cache for atomic access. Although conceptually shared, writing to this cache is
/// only possible for one writer at a time.
pub fn lock(&self) -> LockedClassCache<'_, T> {
self.0.lock().expect("Global contract cache is poisoned.")
}
pub fn get(&self, class_hash: &ClassHash) -> Option<T> {
self.lock().cache_get(class_hash).cloned()
}
pub fn set(&self, class_hash: ClassHash, contract_class: T) {
self.lock().cache_set(class_hash, contract_class);
}
pub fn clear(&mut self) {
self.lock().cache_clear();
}
pub fn new(cache_size: usize) -> Self {
Self(Arc::new(Mutex::new(ContractLRUCache::<T>::with_size(cache_size))))
}
}
There was a problem hiding this comment.
Reviewed 2 of 7 files at r17, 1 of 7 files at r18.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @dorimedini-starkware, @elintul, @meship-starkware, and @Yoni-Starkware)
crates/starknet_sequencer_node/Cargo.toml line 10 at r17 (raw file):
[features] cairo_native = [] testing = []
No?
Suggestion:
testing = []
Yoni-Starkware
force-pushed
the
yonatan/merge-main-v0.13.4-into-main-1738827577
branch
from
45a98bc to
924d8c3
Compare
There was a problem hiding this comment.
Reviewed 1 of 7 files at r17.
Reviewable status: 47 of 49 files reviewed, 4 unresolved discussions (waiting on @dorimedini-starkware, @elintul, @meship-starkware, and @noaov1)
crates/blockifier/src/state/global_cache.rs line 185 at r14 (raw file):
Previously, noaov1 (Noa Oved) wrote…
Where is it defined now?
@elintul moved it to starknet_api::class_cache::GlobalContractCache;
crates/starknet_sequencer_node/Cargo.toml line 10 at r17 (raw file):
Previously, noaov1 (Noa Oved) wrote…
No?
Done.
Yoni-Starkware
force-pushed
the
yonatan/merge-main-v0.13.4-into-main-1738827577
branch
from
924d8c3 to
6653f75
Compare
There was a problem hiding this comment.
Reviewed 2 of 2 files at r19, 2 of 2 files at r20, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @dorimedini-starkware, @meship-starkware, and @noaov1)
There was a problem hiding this comment.
Reviewed 1 of 2 files at r20.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @Yoni-Starkware)
No description provided.