Merge branch 'main' into SimulateDeclareDeploy

.github/workflows/rust-tests.yml

@@ -84,19 +84,19 @@ jobs:
   coverage:
     runs-on: ubuntu-20.04
     steps:
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: nightly
-          override: true
-          components: rustfmt, clippy
     - name: Checkout
       uses: actions/checkout@v3
     - uses: actions/setup-python@v2
       with:
         python-version: '3.9'
     - name: Deps
       run: make deps
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        override: true
+        components: rustfmt, clippy
     - name: Coverage
       run: make coverage
     - name: Upload coverage to codecov.io

.gitignore

@@ -5,7 +5,8 @@
 # will have compiled files and executables
 debug/
 target/
-cairo/
+cairo1/
+cairo2/
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 #Cargo.lock
@@ -42,6 +43,8 @@ starknet-venv/
 cairo_programs/cairo_1_contracts/*.sierra
 starknet_programs/cairo1/*.casm
 starknet_programs/cairo1/*.sierra
+starknet_programs/cairo2/*.casm
+starknet_programs/cairo2/*.sierra
 default.profraw
 **.DS_Store
 /scripts/reports