merge branch main-v0.13.4 into main (without conflicts)

starkware-libs · Jan 8, 2025 · bbd4439 · bbd4439
1 parent 41080c5
commit bbd4439
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 591 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config/sequencer/default_config.json b/config/sequencer/default_config.json
@@ -269,13 +269,6 @@
     "param_type": "String",
     "privacy": "TemporaryValue"
   },
-<<<<<<< HEAD
-  "compiler_config.max_casm_bytecode_size": {
-    "description": "Limitation of the result CASM contract bytecode size.",
-||||||| 535775d43
-  "compiler_config.max_bytecode_size": {
-    "description": "Limitation of contract bytecode size.",
-=======
   "compiler_config.libcairo_native_runtime_path": {
     "description": "The path to the Cairo native runtime library file.",
     "privacy": "Public",
@@ -288,7 +281,6 @@
   },
   "compiler_config.max_casm_bytecode_size": {
     "description": "Limitation of compiled casm bytecode size.",
->>>>>>> origin/main-v0.13.4
     "privacy": "Public",
     "value": 81920
   },