sdk-py: Move to src/sdk/python

Cargo.toml

@@ -43,7 +43,8 @@ members = [
     "bin/zktool",
 
     "src/sdk",
-    "src/sdk/src/sdk-py",
+    "src/sdk/python",
+
     "src/serial",
     "src/serial/derive",
     "src/serial/derive-internal",

src/sdk/src/sdk-py/Cargo.toml → src/sdk/python/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "darkfi-sdk-py"
 description = "Python bindings for Darkfi SDK"
-version = "0.1.0"
+version = "0.4.1"
 edition = "2021"
 authors = ["Dyne.org foundation <foundation@dyne.org>"]
 license = "AGPL-3.0-only"
@@ -14,8 +14,8 @@ name = "darkfi_sdk_py"
 crate-type = ["cdylib"]
 
 [dependencies]
-darkfi = { path = "../../../../", features = ["zk", "zkas"] }
-darkfi-sdk = { path = "../../" }
+darkfi = { path = "../../../", features = ["zk", "zkas"] }
+darkfi-sdk = { path = "../" }
 halo2_gadgets = "0.3.0"
 pasta_curves = "0.5.1"
 pyo3 = "0.19.0"

src/sdk/src/sdk-py/pyproject.toml → src/sdk/python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "darkfi-sdk-py"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",

src/zk/vm.rs

@@ -389,7 +389,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
 
                 _ => {
                     error!(target: "zk::vm", "Invalid constant name: {}", constant.as_str());
-                    return Err(plonk::Error::Synthesis);
+                    return Err(plonk::Error::Synthesis)
                 }
             }
         }
@@ -404,12 +404,12 @@ impl Circuit<pallas::Base> for ZkCircuit {
                     Ok(v) => litheap.push(v),
                     Err(e) => {
                         error!(target: "zk::vm", "Failed converting u64 literal: {}", e);
-                        return Err(plonk::Error::Synthesis);
+                        return Err(plonk::Error::Synthesis)
                     }
                 },
                 _ => {
                     error!(target: "zk::vm", "Invalid literal: {:?}", literal);
-                    return Err(plonk::Error::Synthesis);
+                    return Err(plonk::Error::Synthesis)
                 }
             }
         }
@@ -447,7 +447,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
 
                 Witness::EcFixedPoint(_) => {
                     error!(target: "zk::vm", "Unable to witness EcFixedPoint, this is unimplemented.");
-                    return Err(plonk::Error::Synthesis);
+                    return Err(plonk::Error::Synthesis)
                 }
 
                 Witness::Base(w) => {
@@ -770,7 +770,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
                         }
                         x => {
                             error!(target: "zk::vm", "Unsupported bit-range {} for range_check", x);
-                            return Err(plonk::Error::Synthesis);
+                            return Err(plonk::Error::Synthesis)
                         }
                     }
                 }
@@ -890,7 +890,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
 
                 _ => {
                     error!(target: "zk::vm", "Unsupported opcode");
-                    return Err(plonk::Error::Synthesis);
+                    return Err(plonk::Error::Synthesis)
                 }
             }
         }