Merge branch 'main' into add-mainnet-test

Author: SantiagoPittella

Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [features]
 default = ["with_mimalloc"]
-with_mimalloc = ["mimalloc"]
+with_mimalloc = ["dep:mimalloc"]
 cairo_1_tests = []
 
 [workspace]

Makefile

@@ -98,7 +98,7 @@ CAIRO_2_COMPILED_SIERRA_CONTRACTS:=$(patsubst $(CAIRO_2_CONTRACTS_TEST_DIR)/%.ca
 CAIRO_2_COMPILED_CASM_CONTRACTS:= $(patsubst $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra, $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm, $(CAIRO_2_COMPILED_SIERRA_CONTRACTS))
 
 $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.cairo
-	$(STARKNET_COMPILE_CAIRO_2) --single-file $< $@
+	$(STARKNET_COMPILE_CAIRO_2) $< $@
 
 $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra
 	$(STARKNET_SIERRA_COMPILE_CAIRO_2) --add-pythonic-hints $< $@
@@ -107,7 +107,7 @@ compile-cairo-2-sierra: $(CAIRO_2_COMPILED_SIERRA_CONTRACTS)
 compile-cairo-2-casm: $(CAIRO_2_COMPILED_CASM_CONTRACTS)
 
 
-CAIRO_2_VERSION=2.1.0-rc2
+CAIRO_2_VERSION=2.0.2
 
 cairo-repo-2-dir = cairo2
 cairo-repo-2-dir-macos = cairo2-macos

cli/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 
 [features]
 default = ["with_mimalloc"]
-with_mimalloc = ["mimalloc"]
+with_mimalloc = ["dep:mimalloc"]
 
 [dependencies]
 starknet_in_rust = { path = "../", version = "0.3.0" }
 num-traits = "0.2.15"
 serde = { version = "1.0.152", features = ["derive"] }
-cairo-vm = { workspace=true, features = ["cairo-1-hints"]}
+cairo-vm = { workspace = true, features = ["cairo-1-hints"] }
 clap = { version = "4.1.8", features = ["derive"] }
 actix-web = "4.3.1"
 awc = "3.1.1"