Merge branch 'segment-arena-builtin' into verify-secure-program-segme…

…nt-size

.github/workflows/bench.yml

@@ -26,7 +26,7 @@ jobs:
       with:
         python-version: '3.9'
     - name: Install test dependencies
-      run: pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
+      run: pip install -r requirements.txt
     - name: Run benchmark
       run: make benchmark-action
     - name: Store benchmark result

.github/workflows/bench_pull_request.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         python-version: '3.9'
     - name: Install test dependencies
-      run: pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
+      run: pip install -r requirements.txt
     - name: Run benchmark
       run: make benchmark-action
     - name: Store benchmark result

.github/workflows/iai_main.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: '3.9'
     - name: Install test dependencies
       run: |
-        pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
+        pip install -r requirements.txt
         sudo apt update
         sudo apt install -y valgrind
     - uses: actions/checkout@v3

.github/workflows/iai_pr.yml

@@ -18,15 +18,16 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.base.sha }}
     - name: Install test dependencies
     # Note: change cairo-lang version is not set to 0.11 because main is still on 0.10.3 and this workflow would fail
       run: |
-        pip install ecdsa fastecdsa sympy typeguard==2.13.0 cairo-lang==0.10.3 
+        pip install ecdsa fastecdsa sympy typeguard==2.13.0 cairo-lang==0.10.3
         sudo apt update
         sudo apt install -y valgrind
-    - uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.base.sha }}
     - name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }}
       uses: actions/cache@v3
       id: cache-iai-results
@@ -54,12 +55,13 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
+    - name: Checkout
+      uses: actions/checkout@v3
     - name: Install test dependencies
       run: |
-        pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
+        pip install -r requirements.txt
         sudo apt update
         sudo apt install -y valgrind
-    - uses: actions/checkout@v3
     - name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }}
       uses: actions/cache@v3
       id: cache-iai-results

.github/workflows/publish.yml

@@ -18,6 +18,10 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
+    - name: Publish crate cairo-take_until_unbalanced
+      env:
+          CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      run: cargo publish --token ${CRATES_TOKEN} --all-features --manifest-path ./deps/parse-hyperlinks/Cargo.toml
     - name: Publish crate cairo-felt
       env:
           CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/rust.yml

@@ -35,12 +35,12 @@ jobs:
 
     - name: Set up cargo cache
       uses: Swatinem/rust-cache@v2
-
-    - name: Install test dependencies
-      run: pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
-    - uses: actions/checkout@v3
+    - name: Checkout
+      uses: actions/checkout@v3
       with:
-        fetch-depth: 0
+        fetch-depth: 0 
+    - name: Install test dependencies
+      run: pip install -r requirements.txt
     - name: Format
       run: cargo fmt --all -- --check
     - name: Build
@@ -63,7 +63,7 @@ jobs:
     - name: Restore timestamps
       uses: chetan/git-restore-mtime-action@v1
     - name: Install dependencies
-      run: pip install ecdsa fastecdsa sympy cairo-lang==0.11.0
+      run: pip install -r requirements.txt
     - name: Run tests
       run: make -j test
     - name: Run tests no_std

Cargo.toml

@@ -3,7 +3,7 @@ members = [".", "felt", "cairo-vm-cli", "./deps/parse-hyperlinks"]
 
 [package]
 name = "cairo-vm"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Blazing fast Cairo interpreter"
@@ -48,10 +48,10 @@ serde_json = { version = "1.0", features = [
     "arbitrary_precision",
 ], default-features = false }
 hex = { version = "0.4.3", default-features = false }
-bincode = { tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git", default-features = false, features = [
+bincode = { version = "2.0.0-rc.2", tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git", default-features = false, features = [
     "serde",
 ] }
-starknet-crypto = { version = "0.4.1", default-features = false, features = ["signature-display"] }
+starknet-crypto = { version = "0.4.2", default-features = false, features = ["signature-display"] }
 sha3 = { version = "0.10.1", default-features = false }
 rand_core = { version = "0.6.4", default-features = false }
 lazy_static = { version = "1.4.0", default-features = false, features = [
@@ -71,8 +71,8 @@ thiserror-no-std = "2.0.2"
 # https://stackoverflow.com/questions/70630556/parse-allowing-nested-parentheses-in-nom
 # There is a proposal for extending nom::delimited to use this function:
 # https://github.com/Geal/nom/issues/1253
-parse-hyperlinks = { path = "./deps/parse-hyperlinks", version = "0.23.4", default-features = false }
-felt = { package = "cairo-felt", path = "./felt", version = "0.2.0", default-features = false }
+parse-hyperlinks = { package = "cairo-take_until_unbalanced", path = "./deps/parse-hyperlinks", version = "0.24.1", default-features = false }
+felt = { package = "cairo-felt", path = "./felt", version = "0.2.2", default-features = false }
 bitvec = "1"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

Makefile

@@ -96,10 +96,10 @@ deps:
 	cargo install --version 0.5.9 cargo-llvm-cov
 	pyenv install pypy3.7-7.3.9
 	pyenv global pypy3.7-7.3.9
-	pip install typeguard==2.13.0 cairo-lang==0.10.3
+	pip install -r requirements.txt
 	pyenv install 3.7.12
 	pyenv global 3.7.12
-	pip install typeguard==2.13.0 cairo-lang==0.10.3
+	pip install -r requirements.txt
 
 $(RELBIN):
 	cargo build --release

cairo-vm-cli/src/main.rs

@@ -108,6 +108,7 @@ fn main() -> Result<(), Error> {
     let cairo_run_config = cairo_run::CairoRunConfig {
         entrypoint: &args.entrypoint,
         trace_enabled,
+        relocate_mem: args.memory_file.is_some(),
         layout: &args.layout,
         proof_mode: args.proof_mode,
         secure_run: args.secure_run,

cairo_programs/benchmarks/blake2s_integration_benchmark.cairo

@@ -2,7 +2,7 @@ from blake2s_integration_tests import run_tests
 from starkware.cairo.common.cairo_builtins import BitwiseBuiltin
 
 func main{range_check_ptr, bitwise_ptr: BitwiseBuiltin*}() {
-    run_tests(100);
+    run_tests(300);
 
     return ();
 }

cairo_programs/benchmarks/compare_arrays_200000.cairo

@@ -23,7 +23,7 @@ func fill_array(array: felt*, base: felt, step: felt, array_length: felt, iterat
 
 func main() {
     alloc_locals;
-    tempvar array_length = 50000;
+    tempvar array_length = 250000;
     let (array_a: felt*) = alloc();
     let (array_b: felt*) = alloc();
     fill_array(array_a, 7, 3, array_length, 0);

cairo_programs/benchmarks/dict_integration_benchmark.cairo

@@ -1,7 +1,7 @@
 from dict_integration_tests import run_tests
 
 func main{range_check_ptr: felt}() {
-    run_tests(100);
+    run_tests(200);
 
     return ();
 }

cairo_programs/benchmarks/factorial_multirun.cairo

@@ -7,21 +7,11 @@ func factorial(n) -> (result: felt) {
     return (n * a,);
 }
 
-// factorial(n), t + 1 times
-func factorial_wrapper(n, t) {
-    factorial(n);
-    if (t != 0) {
-        factorial_wrapper(n, t - 1);
-    }
-    return ();
-}
-
 func main() {
     // Make sure the factorial(10) == 3628800
     let (y) = factorial(10);
     y = 3628800;
 
-    // factorial(10000), 11 times
-    factorial_wrapper(10000, 10);
+    factorial(2000000);
     return ();
 }

cairo_programs/benchmarks/fibonacci_1000_multirun.cairo

@@ -1,17 +1,6 @@
 func main() {
-    fib_wrapper(50);
-    ret;
-}
+    fib(1, 1, 1500000);
 
-func fib_wrapper(n) {
-    // Call fib(1, 1, 1000).
-    let result: felt = fib(1, 1, 1000);
-
-    // Make sure the 1000th Fibonacci number is 222450955505511890955301767713383614666194461405743219770606958667979327682.
-    assert result = 222450955505511890955301767713383614666194461405743219770606958667979327682;
-    if (n != 0) {
-        fib_wrapper(n - 1);
-    }
     ret;
 }
 

cairo_programs/benchmarks/integration_builtins.cairo

@@ -79,7 +79,7 @@ func main{
 }() {
     let num_a = 123568;
     let num_b = 5673940;
-    builtins_wrapper_iter(num_a, num_b, 1000);
+    builtins_wrapper_iter(num_a, num_b, 10000);
 
     return ();
 }

cairo_programs/benchmarks/keccak_integration_benchmark.cairo

@@ -2,6 +2,6 @@ from keccak_integration_tests import run_test
 from starkware.cairo.common.cairo_builtins import BitwiseBuiltin
 
 func main{range_check_ptr: felt, bitwise_ptr: BitwiseBuiltin*}() -> () {
-    run_test(100);
+    run_test(300);
     return ();
 }

cairo_programs/benchmarks/linear_search.cairo

@@ -25,11 +25,11 @@ func main() {
     alloc_locals;
     let (felt_array: felt*) = alloc();
 
-    fill_array(felt_array, 10001, 0);
+    fill_array(felt_array, 400001, 0);
 
-    let (index_1) = search(10000, felt_array, 0, 10001);
-    assert index_1 = 10000;
-    let (index_2) = search(5000, felt_array, 0, 10001);
-    assert index_2 = 5000;
+    let (index_1) = search(400000, felt_array, 0, 400001);
+    assert index_1 = 400000;
+    let (index_2) = search(200000, felt_array, 0, 400001);
+    assert index_2 = 200000;
     ret;
 }

cairo_programs/benchmarks/math_cmp_and_pow_integration_benchmark.cairo

@@ -1,6 +1,6 @@
 from math_cmp_and_pow_integration_tests import run_tests
 
 func main{range_check_ptr}() -> () {
-    run_tests(100);
+    run_tests(30000);
     return ();
 }

cairo_programs/benchmarks/math_integration_benchmark.cairo

@@ -1,6 +1,16 @@
 from math_integration_tests import run_tests
 
-func main{range_check_ptr}() -> () {
+func repeat{range_check_ptr}(n) -> () {
+    if (n == 0) {
+        return ();
+    }
     run_tests(1000);
+    return repeat(n - 1);
+}
+
+func main{range_check_ptr}() -> () {
+    //FIXME: there seems to be a bug that causes failures for bigger values.
+    //For now just run these several times instead.
+    repeat(8);
     return ();
 }

cairo_programs/benchmarks/memory_integration_benchmark.cairo

@@ -1,6 +1,6 @@
 from memory_integration_tests import run_tests
 
 func main() -> () {
-    run_tests(100, 100);
+    run_tests(200, 300);
     return ();
 }

cairo_programs/benchmarks/operations_with_data_structures_benchmarks.cairo

@@ -2,6 +2,6 @@ from operations_with_data_structures import run_tests
 from starkware.cairo.common.cairo_builtins import BitwiseBuiltin
 
 func main{range_check_ptr: felt, bitwise_ptr: BitwiseBuiltin*}() {
-    run_tests(0, 300);
+    run_tests(0, 500);
     return ();
 }

cairo_programs/benchmarks/secp_integration_benchmark.cairo

@@ -1,6 +1,6 @@
 from secp_integration_tests import run_tests
 
 func main{range_check_ptr}() {
-    run_tests(0, 4);
+    run_tests(0, 10);
     return ();
 }

cairo_programs/benchmarks/set_integration_benchmark.cairo

@@ -1,6 +1,6 @@
 from set_integration_tests import run_tests
 
 func main{range_check_ptr}() -> () {
-    run_tests(1000);
+    run_tests(8000);
     return ();
 }

cairo_programs/benchmarks/uint256_integration_benchmark.cairo

@@ -2,6 +2,6 @@ from starkware.cairo.common.cairo_builtins import BitwiseBuiltin
 from uint256_integration_tests import run_tests
 
 func main{range_check_ptr, bitwise_ptr: BitwiseBuiltin*}() -> () {
-    run_tests(1000);
+    run_tests(4000);
     return ();
 }