Merge branch 'main' into pin-resolver

lambdaclass · Jul 4, 2023 · cf0723e · cf0723e
2 parents b85d0b8 + 7328075
commit cf0723e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,10 @@
 
 * fix: specify resolver version 2 in the virtual workspace's manifest [#1311](https://github.com/lambdaclass/cairo-vm/pull/1311)
 
+* feat: add `lambdaworks-felt` feature to `cairo-vm-cli` [#1308](https://github.com/lambdaclass/cairo-vm/pull/1308)
+
 * chore: update dependencies, particularly clap 3.2 -> 4.3 [#1309](https://github.com/lambdaclass/cairo-vm/pull/1309)
+
   * this removes dependency on _atty_, that's no longer mantained
 
 * chore: remove unused dependencies [#1307](https://github.com/lambdaclass/cairo-vm/pull/1307)

diff --git a/cairo-vm-cli/Cargo.toml b/cairo-vm-cli/Cargo.toml
@@ -21,3 +21,4 @@ rstest = "0.17.0"
 [features]
 default = ["with_mimalloc"]
 with_mimalloc = ["cairo-vm/with_mimalloc", "mimalloc"]
+lambdaworks-felt = ["cairo-vm/lambdaworks-felt"]