chore: bump cairo compiler 2.7.0 (#130)

* chore: bump cairo compiler to 2.7.0 * fix: add building Cairo compiler to compile target * fix: update overflowing_sub from deprecated methods * feat: add a clean compilation artifacts target * refactor: move out of hints folder Cairo programs not using hints anymore * refactor: use array_append to test Cairo program parsing
kkrt-labs · Aug 7, 2024 · 6f89d74 · 6f89d74
1 parent f035f5c
commit 6f89d74
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -66,9 +66,7 @@ $(COMPILED_CAIRO_FILES): %.json: %.sierra
 
 compile-cairo-zero: $(COMPILED_CAIRO_0_FILES)
 compile-cairo: $(COMPILED_CAIRO_FILES)
-compile: compile-cairo-zero compile-cairo
-
-
+compile: build-cairo compile-cairo-zero compile-cairo
 
 run-all: $(VALID_COMPILED_CAIRO_0_FILES) $(COMPILED_CAIRO_FILES)
 	@failed_tests_ctr=0; \
@@ -156,4 +154,7 @@ clean-diff-test:
 clean-bench:
 	@rm -rf /tmp/$(TMP_PREFIX)-bench*
 
+clean-artifacts:
+	@find cairo_programs -type f \( -name "*.json" -o -name "*.sierra" \) -delete
+
 clean-tmp: clean-diff-test clean-bench
diff --git a/cairo b/cairo
diff --git a/cairo_programs/cairo/hints/u32_overflowing_sub_err.cairo b/cairo_programs/cairo/hints/u32_overflowing_sub_err.cairo
diff --git a/cairo_programs/cairo/hints/u32_overflowing_sub_valid.cairo b/cairo_programs/cairo/hints/u32_overflowing_sub_valid.cairo
diff --git a/cairo_programs/cairo/hints/multiple_fn.cairo → cairo_programs/cairo/multiple_fn.cairo b/cairo_programs/cairo/hints/multiple_fn.cairo → cairo_programs/cairo/multiple_fn.cairo
diff --git a/...ms/cairo/hints/test_less_than_false.cairo → ...programs/cairo/test_less_than_false.cairo b/...ms/cairo/hints/test_less_than_false.cairo → ...programs/cairo/test_less_than_false.cairo
diff --git a/...ams/cairo/hints/test_less_than_true.cairo → ..._programs/cairo/test_less_than_true.cairo b/...ams/cairo/hints/test_less_than_true.cairo → ..._programs/cairo/test_less_than_true.cairo
diff --git a/cairo_programs/cairo/u32_overflowing_sub_err.cairo b/cairo_programs/cairo/u32_overflowing_sub_err.cairo
@@ -0,0 +1,5 @@
+use core::num::traits::OverflowingSub;
+
+fn main() -> (u32, bool) {
+    10_u32.overflowing_sub(12)
+}
diff --git a/cairo_programs/cairo/u32_overflowing_sub_valid.cairo b/cairo_programs/cairo/u32_overflowing_sub_valid.cairo
@@ -0,0 +1,5 @@
+use core::num::traits::OverflowingSub;
+
+fn main() -> (u32, bool) {
+    12_u32.overflowing_sub(10)
+}
diff --git a/src/vm/program.test.ts b/src/vm/program.test.ts
@@ -4,7 +4,6 @@ import * as fs from 'fs';
 
 import { Felt } from 'primitives/felt';
 
-import { OpType } from 'hints/hintParamsSchema';
 import { Hint } from 'hints/hintSchema';
 import { HintName } from 'hints/hintName';
 import { Register } from './instruction';
@@ -27,10 +26,10 @@ describe('program', () => {
     });
   });
 
-  describe('parseCairo1Program', () => {
+  describe('parseCairoProgram', () => {
     test('should correctly parse the program', () => {
       const programContent = fs.readFileSync(
-        'cairo_programs/cairo/hints/test_less_than_true.json',
+        'cairo_programs/cairo/hints/array_append.json',
         'utf8'
       );
       const programJson = JSON.parse(programContent);
@@ -39,24 +38,10 @@ describe('program', () => {
       });
 
       const hints = new Map<number, Hint[]>();
-      hints.set(5, [
+      hints.set(0, [
         {
-          type: HintName.TestLessThan,
-          lhs: {
-            type: OpType.Deref,
-            cell: {
-              register: Register.Ap,
-              offset: 0,
-            },
-          },
-          rhs: {
-            type: OpType.Immediate,
-            value: new Felt(BigInt('0x100000000')),
-          },
-          dst: {
-            register: Register.Ap,
-            offset: -1,
-          },
+          type: HintName.AllocSegment,
+          dst: { register: Register.Ap, offset: 0 },
         },
       ]);