Add support for declaring contract compiled with cairo 2.6 #1314

tkumor3 · 2024-03-07T08:03:31Z

Add support for declaring contract compiled with cairo 2.6

Introduced changes

This PR contains breaking changes

tkumor3 · 2024-03-07T12:21:55Z

starknet_py/hash/casm_class_hash_test.py

+@pytest.mark.parametrize(
+    "casm_contract_class_source, expected_casm_class_hash",
+    [
+        ("starknet_contract.casm", 0x603dd72504d8b0bc54df4f1102fdcf87fc3b2b94750a9083a5876913eec08e4),


Taken from Slack conversation with the Staknet team

people will see this link and won't be able to access an info behind it.

codecov · 2024-03-07T12:49:12Z

Codecov Report

Attention: Patch coverage is 86.11111% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 97.82%. Comparing base (67049e0) to head (019225c).
Report is 3 commits behind head on development.

Additional details and impacted files

@@               Coverage Diff               @@
##           development    #1314      +/-   ##
===============================================
- Coverage        98.01%   97.82%   -0.20%     
===============================================
  Files               93       94       +1     
  Lines             4580     4728     +148     
===============================================
+ Hits              4489     4625     +136     
- Misses              91      103      +12

Files	Coverage Δ
starknet_py/net/client_models.py	`99.77% <100.00%> (+0.01%)`	⬆️
starknet_py/net/schemas/gateway.py	`96.55% <100.00%> (+0.04%)`	⬆️
starknet_py/hash/casm_class_hash.py	`97.95% <96.66%> (-2.05%)`	⬇️
starknet_py/hash/compiled_class_hash_objects.py	`77.50% <77.50%> (ø)`

... and 1 file with indirect coverage changes

fix

update tests clean up

clean up

fix

THenry14 · 2024-03-11T09:33:57Z

.github/workflows/checks.yml

+
+      - uses: actions/checkout@v4
+        with:
+          repository: starkware-libs/cairo


why not use scarb?

These changes are moved to the new PR #1322

.vscode/settings.json

.github/workflows/checks.yml

THenry14 · 2024-03-11T09:42:04Z

starknet_py/hash/casm_class_hash_test.py

+@pytest.mark.parametrize(
+    "casm_contract_class_source, expected_casm_class_hash",
+    [
+        ("starknet_contract.casm", 0x603dd72504d8b0bc54df4f1102fdcf87fc3b2b94750a9083a5876913eec08e4),


people will see this link and won't be able to access an info behind it.

THenry14 · 2024-03-11T09:42:29Z

starknet_py/tests/e2e/mock/compile_contracts_v2_6.sh

+MANIFEST_PATH=`cat starknet_py/tests/e2e/manifest-path`
+if [ -z "$MANIFEST_PATH" ]
+then
+      echo "File 'manifest-path' was not found in directory 'starknet_py/tests/e2e'. More info here: https://starknetpy.readthedocs.io/en/latest/development.html#setup"


nitpick: in bash, use 2 spaces instead of 4 for indentation

These changes will be added in #1322

THenry14 · 2024-03-11T09:44:20Z

starknet_py/tests/e2e/mock/compile_contracts_v2_6.sh

@@ -0,0 +1,58 @@
+#!/bin/bash


This script has several smaller issues. Did you copy it over from some place, or did you write it from scratch? (I'm wondering if we should just make an issue to fix those, or should this script be fixed in this PR)

it's copied from starknet_py/tests/e2e/mock/compile_contracts_v2.sh

IMO we should make an issue and change this scripts to use scarb

ddoktorski · 2024-03-12T18:44:43Z

starknet_py/tests/e2e/mock/compile_contracts_v2_6.sh

It seems that the only difference between this script and the ones for v1 and v2 are the paths for CONTRACTS_DIRECTORY and CONTRACTS_COMPILED_DIRECTORY. I'm wondering if we really need three separate scripts for this. Could you please combine them into a single file?

It will be done in #1322. Probably we will migrate scripts to Scarb

ddoktorski · 2024-03-12T18:47:57Z

starknet_py/tests/e2e/mock/contracts_compiled_v2_6/starknet_contract.casm

What is this contract? Can we also have the source code in cairo?

This contract is taken from a conversation with Starknet on Slack. They sent only this contract file and the correct class_hash for it

ddoktorski · 2024-03-12T18:59:23Z

starknet_py/tests/e2e/mock/contracts_v2_6/abi_types.cairo

If this is supposed to be a contract for Cairo v2.6, let's add some specific features from v2.6 here. Otherwise let's use the same contract from the contracts_v2 directory for compilation.

it's cleaning up in #1322, so the mentioned PR aims is to compile contracts_v2 with the current Cairo version and run all tests with it. Extended with precompiled contract tests to verify if class_hashs are computed well for previous Sierra versions

ddoktorski · 2024-03-12T19:05:59Z

starknet_py/tests/e2e/declare/declare_test.py

+):
+    declare_tx = await account.sign_declare_v3(
+        compiled_contract=abi_types_compiled_contract_and_class_hash_v2_6[0],
+        compiled_class_hash=abi_types_compiled_contract_and_class_hash_v2_6[1],


As you've noticed this is not a very valuable test, given that in the devnet we can pass anything to compiled_class_hash and it will be successful. Nevertheless, I'm fine with leaving it, as perhaps it will be fixed at some point. However, instead of adding a new test, please make test_declare_v3 a parameterized test for 2 contracts.

test with starknet_contract.casm cover this test case

I think we can remove this test and most of the things related to the 2.6 contract. The truth is that we need only starknet_contract.casm

starknet_py/net/schemas/gateway.py

THenry14

looks good to me, but let's wait for @ddoktorski approval as well

starknet_py/hash/casm_class_hash.py

github-actions bot assigned tkumor3 Mar 7, 2024

tkumor3 requested review from ddoktorski and THenry14 March 7, 2024 12:10

tkumor3 commented Mar 7, 2024

View reviewed changes

tkumor3 marked this pull request as ready for review March 7, 2024 12:33

tkumor3 changed the title ~~Tomaszkumor/compiled class hash v2 6~~ Add support for declaring contract compiled with cairo 2.6 Mar 7, 2024

tkumor3 force-pushed the tomaszkumor/compiled_class_hash_v2_6 branch 23 times, most recently from acc06e4 to 2934b7e Compare March 8, 2024 13:49

Base automatically changed from ddoktorski/support-rpc-0.7.0 to development March 8, 2024 15:02

tkumor3 added 5 commits March 11, 2024 10:29

Add support for declaring contracts compiled with 2.6.0

6df76e9

Add support for declaring contracts compiled with 2.6.0

5d9457f

fix

adds test for cairo v2.6 contract hash

613eef0

update tests clean up

add comment about copied code

67078cc

clean up

fix cache for contracts v0

866018a

fix

tkumor3 force-pushed the tomaszkumor/compiled_class_hash_v2_6 branch 2 times, most recently from 5722a86 to 866018a Compare March 11, 2024 09:41

THenry14 reviewed Mar 11, 2024

View reviewed changes

remove config file

f79c71b

tkumor3 requested a review from THenry14 March 11, 2024 10:36

tkumor3 mentioned this pull request Mar 11, 2024

Move compiling contracts on github actions #1322

Merged

1 task

ddoktorski reviewed Mar 12, 2024

View reviewed changes

tkumor3 added 2 commits March 13, 2024 10:01

Remove building contract in 2.6 separate

89dd4e6

fix linter

0384245

tkumor3 requested a review from ddoktorski March 13, 2024 09:29

THenry14 approved these changes Mar 13, 2024

View reviewed changes

ddoktorski approved these changes Mar 13, 2024

View reviewed changes

starknet_py/hash/casm_class_hash.py Outdated Show resolved Hide resolved

clean up code

019225c

tkumor3 merged commit 0a2cbf2 into development Mar 14, 2024
16 checks passed

kkawula deleted the tomaszkumor/compiled_class_hash_v2_6 branch August 26, 2024 13:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for declaring contract compiled with cairo 2.6 #1314

Add support for declaring contract compiled with cairo 2.6 #1314

tkumor3 commented Mar 7, 2024 •

edited

Loading

tkumor3 Mar 7, 2024 •

edited

Loading

THenry14 Mar 11, 2024

codecov bot commented Mar 7, 2024 •

edited

Loading

THenry14 Mar 11, 2024

tkumor3 Mar 11, 2024

THenry14 Mar 11, 2024

THenry14 Mar 11, 2024

tkumor3 Mar 12, 2024

THenry14 Mar 11, 2024

tkumor3 Mar 11, 2024

tkumor3 Mar 11, 2024

ddoktorski Mar 12, 2024

tkumor3 Mar 13, 2024

ddoktorski Mar 12, 2024

tkumor3 Mar 13, 2024

ddoktorski Mar 12, 2024

tkumor3 Mar 13, 2024 •

edited

Loading

ddoktorski Mar 12, 2024

tkumor3 Mar 13, 2024

tkumor3 Mar 13, 2024

THenry14 left a comment

Add support for declaring contract compiled with cairo 2.6 #1314

Add support for declaring contract compiled with cairo 2.6 #1314

Conversation

tkumor3 commented Mar 7, 2024 • edited Loading

Introduced changes

tkumor3 Mar 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Mar 7, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tkumor3 Mar 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

THenry14 left a comment

Choose a reason for hiding this comment

tkumor3 commented Mar 7, 2024 •

edited

Loading

tkumor3 Mar 7, 2024 •

edited

Loading

codecov bot commented Mar 7, 2024 •

edited

Loading

tkumor3 Mar 13, 2024 •

edited

Loading