Merge 0.11 into main #498

SantiagoPittella · 2023-05-17T19:01:14Z

No description provided.

* Migrate to cairo 0.11 * Fix toml in starknet-rs-py * Change layout

* Warnings * Cargo fmt * fmt * Migrate to cairo 0.11 (#234) * Migrate to cairo 0.11 * Fix toml in starknet-rs-py * Change layout * Rolling back using the deprecated names * Fixing VM to use included builtin * Removing dead code * fmt * Renames fmt --------- Co-authored-by: mmsc2 <88055861+mmsc2@users.noreply.github.com>

* Update cairo-rs version & Fix new changes * Change cair-lang to 0.11 & Fix serialization issue * Remove old modules from starknet_rs_py * Comment starknet_rs_py_test due to failure in CI

* add new BLSH struct * Rename old trait * use renamed trait

* Initialized SegmentArenaBuiltin for CairoRunner in execution_entry_point * Updated error message expected in test

* Prefix syscalls with Deprecated * Add SyscallResponse common fields * Rename `syscall_response` -> `body` * Remove `failure_flag` field * Add utils::get_felt_range * Add missing variants

…o own files (#332)

…onseBody (#331) * Refactor for optionality in field ResponseBody * Change visibility level to crate

* Rename old syscall functions & Add new syscall req * Add implementation FromPtr to new syscall * Add new syscall to SyscallHandler * Add incomplete impl of BLSyscall Handler * Add send_message_to_L1 for BLSyscall Handler * Refactor ResponseBody as optional field * Add missing changes

* Migrate to cairo 0.11 * Fix toml in starknet-rs-py * Change layout * Implement declare version 2 * Add version 2 of declare * Sierra compiler * comments to fix sierra * Add structs for version 2 * Port functions to hash internal declare v2 * Add hash value into declare v2 structure * comment function to fix in another ticker * Fix clippy errors * test * delete core lib * add test json * Order change and poseidon builtin * Remove old comments * delete debug info * Comment declare v2 test till sierra compiler is working * move ContractClass to ContractClasses::ContractClass * Update starknet-rs-py * rename ContractClass to DeprecatedContractClass * Revert commits move ContractClass to ContractClasses::ContractClass, Update starknet-rs-py and rename ContractClass to DeprecatedContractClass * fix conflicts of merge * Restore pre commit --------- Co-authored-by: Nacho <amigoigna@gmail.com> Co-authored-by: igamigo <ignacio.amigo@lambdaclass.com> Co-authored-by: Pedro Fontana <pedro.fontana@lamdaclass.com>

* Add StorageWriteRequest * Add storage_write syscall * Update syscall_storage_write

* Moved current ContractClass to deprecated_conctract_class module and added Casm and Compiled Contract Classes * Used Box to prevent clippy warning * Made to_cairo_runner_program function public

* Add SyscallHandler::deploy related methods * Rename old FromPtr trait and add new one * Add request * Code restructuration * Fix format * merge main * Add todo comment * Add to do comment * Fix merge * fix clippy * Fix merge conflict * Add allocate_segment function --------- Co-authored-by: Milton <milton.scuderi@lambdaclass.com> Co-authored-by: mmsc2 <88055861+mmsc2@users.noreply.github.com>

* Adding map * Adding missing newline after copying file * Initializing with lazy_static * Format macro code

* Implement functins in state reader trait * Fix function calls and borrow checker warnings * Fix internals * Add field to InMemoryStateReader * Add setters

* Add SyscallHandler * Add call_contract signature * Add cairo-lang reference code * Add SyscallHandler.read_and_validate_syscall_request * Add BusinessLogicSyscallHandler.increment_syscall_count() * Add SyscallHandler.read_syscall_request() * Refactor: separate deprecated syscall handler in different files * Add BusinessLogicSyscallHandler.expected_syscall_ptr * Add Call parameters * Add execution_entry_point * Add call execution * Update SyscallHandler.call_contract * Fix compile errors * Remove unused file * Update syscall call_contract * Implement new `library_call` syscall and deprecate older one (#325) * Library call syscall merge * Change syscall ptr to request * Merge fixes * clippy fmt * Fix merge issues * Fix ExecutionEntryPoint::new --------- Co-authored-by: igamigo <ignacio.amigo@lambdaclass.com> Co-authored-by: Nacho <amigoigna@gmail.com>

* Add StateDiff.class_hash_to_compiled_class * Implement squash for class_hash_to_compiled_class * Update StateDiff.class_hash_to_compiled_class data type * Add StateCache.compiled_class_hash * Update StateDiff.from_cached_state * Fix tests * Add TODO * Remove unused CompiledClass

* save work * save work * add impl of req/res structs * fix clippy errors * use syscallRequest instead of reloc ptr * remove unnecessary allow

* Implement utils::get_felt_range * New SyscallRequest:EmitEvent and deprecate old one * Implement new syscall emit_event * use syscallResponse instead of empty result * rename EmitEvent request struct * refactor emit_event method to use request struct instead of pointer * fix function call * remove unnecessary allow --------- Co-authored-by: SantiagoPittella <pittellasantiago@gmail.com>

* Implement cairo-lang's syscall() * Update business_logic_syscall_handler.rs * Retrieve gas as u64 * clippy fmt * merge fixes * Addressing reviews * Merge conflicts fix

* Refactor StateReader.get_compiled_class * Remove unwrap * Add _execute_version0_class * Update InternalDeclare * Fix compile error * Revert "Fix compile error" This reverts commit 32fdc99. * Revert fix * Revert "Update InternalDeclare" This reverts commit 726b09e. * Remove get_compiled_classes * Fix get_compiled_class * Fix get_compiled_class * Move deprecated/casm branch execution to execute()

cairo_programs/compiled_class.cairo

omerfirmak · 2023-05-18T14:38:13Z

src/business_logic/state/state_api.rs

+    fn get_class_hash_at(&mut self, contract_address: &Address) -> Result<&ClassHash, StateError>;
    /// Returns the nonce of the given contract instance.
-    fn get_nonce_at(&mut self, contract_address: &Address) -> Result<Felt252, StateError>;
+    fn get_nonce_at(&mut self, contract_address: &Address) -> Result<&Felt252, StateError>;
    /// Returns the storage value under the given key in the given contract instance.
-    fn get_storage_at(&mut self, storage_entry: &StorageEntry) -> Result<Felt252, StateError>;
+    fn get_storage_at(&mut self, storage_entry: &StorageEntry) -> Result<&Felt252, StateError>;


Please keep the old owned return types for the reasons explained here

cc: @kkovaacs

Sorry, my bad. I will address your comments in a moment. Thanks!

I just pushed a new commit fixing this. LMK if I done that correctly.

src/business_logic/state/state_api.rs

src/core/syscalls/deprecated_syscall_handler.rs

src/core/syscalls/syscall_info.rs

src/starknet_runner/runner.rs

src/business_logic/transaction/objects/internal_deploy_account.rs

codecov-commenter · 2023-05-19T19:53:37Z

Codecov Report

Merging #498 (54b450a) into main (3b980f7) will decrease coverage by 7.86%.
The diff coverage is 76.80%.

@@            Coverage Diff             @@
##             main     #498      +/-   ##
==========================================
- Coverage   94.13%   86.28%   -7.86%     
==========================================
  Files          46       53       +7     
  Lines        4726     9745    +5019     
==========================================
+ Hits         4449     8408    +3959     
- Misses        277     1337    +1060

Impacted Files	Coverage Δ
src/business_logic/state/state_api.rs	`0.00% <0.00%> (ø)`
src/business_logic/transaction/error.rs	`100.00% <ø> (ø)`
src/core/errors/contract_address_errors.rs	`0.00% <ø> (ø)`
src/core/errors/state_errors.rs	`100.00% <ø> (ø)`
src/core/errors/syscall_handler_errors.rs	`100.00% <ø> (ø)`
...rc/core/syscalls/business_logic_syscall_handler.rs	`0.00% <0.00%> (-88.00%)`	⬇️
src/core/syscalls/syscall_handler.rs	`0.00% <0.00%> (-93.61%)`	⬇️
src/core/syscalls/syscall_request.rs	`0.00% <0.00%> (-85.83%)`	⬇️
src/core/syscalls/syscall_response.rs	`0.00% <ø> (-87.01%)`	⬇️
src/parser_errors.rs	`0.00% <ø> (ø)`
... and 30 more

... and 4 files with indirect coverage changes

juanbono

LGTM

…_in_rust into merge-0.11-w-rebase

mmsc2 and others added 30 commits March 30, 2023 10:56

Migrate to cairo 0.11 (#234)

cfecb1b

* Migrate to cairo 0.11 * Fix toml in starknet-rs-py * Change layout

rename BusinessLogicSyscallHandler (#268)

b4fba73

merge main

0be0e6f

Fix cargo lock

fbbf159

Fix merge issues from main (#278)

4aa8d77

Update to the new release of cairo-rs (#269)

84b5af4

* Update cairo-rs version & Fix new changes * Change cair-lang to 0.11 & Fix serialization issue * Remove old modules from starknet_rs_py * Comment starknet_rs_py_test due to failure in CI

Add BusinessLogicSyscallHandlerStruct (#279)

12eb643

* add new BLSH struct * Rename old trait * use renamed trait

Use segment arena builtin (#283)

799d384

* Initialized SegmentArenaBuiltin for CairoRunner in execution_entry_point * Updated error message expected in test

add empty syscallhandler trait (#321)

a026957

Rename deprecated syscall request/response structs/modules (#327)

2b46991

* Prefix syscalls with Deprecated * Add SyscallResponse common fields * Rename `syscall_response` -> `body` * Remove `failure_flag` field * Add utils::get_felt_range * Add missing variants

Refactor: separate deprecated BLSyscallHandler and SyscallHandler int…

a1dd654

…o own files (#332)

Refactor SyscallResponse for crate visibility and optionality in Resp…

7611b51

…onseBody (#331) * Refactor for optionality in field ResponseBody * Change visibility level to crate

Add storage_write syscall (#345)

2a0600a

* Add StorageWriteRequest * Add storage_write syscall * Update syscall_storage_write

Adding CompiledContractClass (#353)

1075d2c

* Moved current ContractClass to deprecated_conctract_class module and added Casm and Compiled Contract Classes * Used Box to prevent clippy warning * Made to_cairo_runner_program function public

Selector to syscall map (#346)

e3dbe03

* Adding map * Adding missing newline after copying file * Initializing with lazy_static * Format macro code

Implement storage cached state (#363)

7d523e9

* Implement functins in state reader trait * Fix function calls and borrow checker warnings * Fix internals * Add field to InMemoryStateReader * Add setters

Update storage_write syscall (#354)

23d553a

add necessary step for actions to run on queue (#373)

0a4e831

Add storage read syscall (#340)

95638cc

* save work * save work * add impl of req/res structs * fix clippy errors * use syscallRequest instead of reloc ptr * remove unnecessary allow

Implement syscall() and minor refactors (#371)

748752f

* Implement cairo-lang's syscall() * Update business_logic_syscall_handler.rs * Retrieve gas as u64 * clippy fmt * merge fixes * Addressing reviews * Merge conflicts fix

add get_block_timestamp implementation (#378)

1fb64b3

get block number syscall (#379)

bcef895

SantiagoPittella added 2 commits May 17, 2023 10:21

fix tests

f598986

Merge branch '0.11' into merge-0.11-w-rebase

8d35bd3

SantiagoPittella changed the title ~~Merge 0.11 w rebase~~ Merge 0.11 into main May 17, 2023

fmoletta reviewed May 18, 2023

View reviewed changes

cairo_programs/compiled_class.cairo Outdated Show resolved Hide resolved

omerfirmak reviewed May 18, 2023

View reviewed changes

src/business_logic/state/state_api.rs Outdated Show resolved Hide resolved

fmoletta reviewed May 18, 2023

View reviewed changes

src/core/syscalls/deprecated_syscall_handler.rs Outdated Show resolved Hide resolved

fmoletta reviewed May 18, 2023

View reviewed changes

src/core/syscalls/syscall_info.rs Outdated Show resolved Hide resolved

fmoletta reviewed May 18, 2023

View reviewed changes

src/starknet_runner/runner.rs Outdated Show resolved Hide resolved

kkovaacs reviewed May 19, 2023

View reviewed changes

src/business_logic/transaction/objects/internal_deploy_account.rs Outdated Show resolved Hide resolved

SantiagoPittella added 2 commits May 19, 2023 10:57

Remove references to rs-py

9aac5f8

update starknet-api version

7bc7fe7

SantiagoPittella marked this pull request as ready for review May 19, 2023 15:10

SantiagoPittella added 5 commits May 19, 2023 12:11

add newline at EOF

13f730d

Remove references in storage related things

edbc6fe

Remove unused function

7de5426

change wrong unreachable code

6c37645

remove unnecessary clone()

a1bdb41

Oppen approved these changes May 19, 2023

View reviewed changes

juanbono approved these changes May 20, 2023

View reviewed changes

juanbono added 3 commits May 20, 2023 10:49

Merge branch 'merge-0.11-w-rebase' of github.com:lambdaclass/starknet…

f8832dd

…_in_rust into merge-0.11-w-rebase

merge from main

4dbf07e

fix tests

54b450a

juanbono added this pull request to the merge queue May 20, 2023

Merged via the queue into main with commit 2501a16 May 20, 2023

This was referenced May 21, 2023

v0.11 #265

Closed

Add apply_state_update method to trait State #500

Merged

juanbono deleted the merge-0.11-w-rebase branch May 25, 2023 20:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 0.11 into main #498

Merge 0.11 into main #498

SantiagoPittella commented May 17, 2023

omerfirmak May 18, 2023

omerfirmak May 18, 2023

SantiagoPittella May 19, 2023

SantiagoPittella May 19, 2023

codecov-commenter commented May 19, 2023 •

edited

Loading

juanbono left a comment

Merge 0.11 into main #498

Merge 0.11 into main #498

Conversation

SantiagoPittella commented May 17, 2023

omerfirmak May 18, 2023

Choose a reason for hiding this comment

omerfirmak May 18, 2023

Choose a reason for hiding this comment

SantiagoPittella May 19, 2023

Choose a reason for hiding this comment

SantiagoPittella May 19, 2023

Choose a reason for hiding this comment

codecov-commenter commented May 19, 2023 • edited Loading

Codecov Report

juanbono left a comment

Choose a reason for hiding this comment

codecov-commenter commented May 19, 2023 •

edited

Loading