From badcb123d3c4e9269e47439267dfb3014de6331f Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 13 Jun 2023 08:42:42 +0200 Subject: [PATCH] sdk-py: Move to src/sdk/python --- Cargo.toml | 3 ++- src/sdk/{src/sdk-py => python}/.gitignore | 0 src/sdk/{src/sdk-py => python}/Cargo.toml | 6 +++--- src/sdk/{src/sdk-py => python}/README.md | 0 src/sdk/{src/sdk-py => python}/pyproject.toml | 2 +- src/sdk/{src/sdk-py => python}/src/affine.rs | 0 src/sdk/{src/sdk-py => python}/src/base.rs | 0 src/sdk/{src/sdk-py => python}/src/lib.rs | 0 src/sdk/{src/sdk-py => python}/src/point.rs | 0 src/sdk/{src/sdk-py => python}/src/proof.rs | 0 src/sdk/{src/sdk-py => python}/src/proving_key.rs | 0 src/sdk/{src/sdk-py => python}/src/scalar.rs | 0 src/sdk/{src/sdk-py => python}/src/verifying_key.rs | 0 src/sdk/{src/sdk-py => python}/src/zk_binary.rs | 0 src/sdk/{src/sdk-py => python}/src/zk_circuit.rs | 0 src/zk/vm.rs | 12 ++++++------ 16 files changed, 12 insertions(+), 11 deletions(-) rename src/sdk/{src/sdk-py => python}/.gitignore (100%) rename src/sdk/{src/sdk-py => python}/Cargo.toml (81%) rename src/sdk/{src/sdk-py => python}/README.md (100%) rename src/sdk/{src/sdk-py => python}/pyproject.toml (93%) rename src/sdk/{src/sdk-py => python}/src/affine.rs (100%) rename src/sdk/{src/sdk-py => python}/src/base.rs (100%) rename src/sdk/{src/sdk-py => python}/src/lib.rs (100%) rename src/sdk/{src/sdk-py => python}/src/point.rs (100%) rename src/sdk/{src/sdk-py => python}/src/proof.rs (100%) rename src/sdk/{src/sdk-py => python}/src/proving_key.rs (100%) rename src/sdk/{src/sdk-py => python}/src/scalar.rs (100%) rename src/sdk/{src/sdk-py => python}/src/verifying_key.rs (100%) rename src/sdk/{src/sdk-py => python}/src/zk_binary.rs (100%) rename src/sdk/{src/sdk-py => python}/src/zk_circuit.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index a6d90909a..1aaf3c164 100644 --- a/Cargo.toml +++ b/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", diff --git a/src/sdk/src/sdk-py/.gitignore b/src/sdk/python/.gitignore similarity index 100% rename from src/sdk/src/sdk-py/.gitignore rename to src/sdk/python/.gitignore diff --git a/src/sdk/src/sdk-py/Cargo.toml b/src/sdk/python/Cargo.toml similarity index 81% rename from src/sdk/src/sdk-py/Cargo.toml rename to src/sdk/python/Cargo.toml index 5c5bbfc50..87b89d811 100644 --- a/src/sdk/src/sdk-py/Cargo.toml +++ b/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 "] 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" diff --git a/src/sdk/src/sdk-py/README.md b/src/sdk/python/README.md similarity index 100% rename from src/sdk/src/sdk-py/README.md rename to src/sdk/python/README.md diff --git a/src/sdk/src/sdk-py/pyproject.toml b/src/sdk/python/pyproject.toml similarity index 93% rename from src/sdk/src/sdk-py/pyproject.toml rename to src/sdk/python/pyproject.toml index 55c1bec72..9f36ea01e 100644 --- a/src/sdk/src/sdk-py/pyproject.toml +++ b/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", diff --git a/src/sdk/src/sdk-py/src/affine.rs b/src/sdk/python/src/affine.rs similarity index 100% rename from src/sdk/src/sdk-py/src/affine.rs rename to src/sdk/python/src/affine.rs diff --git a/src/sdk/src/sdk-py/src/base.rs b/src/sdk/python/src/base.rs similarity index 100% rename from src/sdk/src/sdk-py/src/base.rs rename to src/sdk/python/src/base.rs diff --git a/src/sdk/src/sdk-py/src/lib.rs b/src/sdk/python/src/lib.rs similarity index 100% rename from src/sdk/src/sdk-py/src/lib.rs rename to src/sdk/python/src/lib.rs diff --git a/src/sdk/src/sdk-py/src/point.rs b/src/sdk/python/src/point.rs similarity index 100% rename from src/sdk/src/sdk-py/src/point.rs rename to src/sdk/python/src/point.rs diff --git a/src/sdk/src/sdk-py/src/proof.rs b/src/sdk/python/src/proof.rs similarity index 100% rename from src/sdk/src/sdk-py/src/proof.rs rename to src/sdk/python/src/proof.rs diff --git a/src/sdk/src/sdk-py/src/proving_key.rs b/src/sdk/python/src/proving_key.rs similarity index 100% rename from src/sdk/src/sdk-py/src/proving_key.rs rename to src/sdk/python/src/proving_key.rs diff --git a/src/sdk/src/sdk-py/src/scalar.rs b/src/sdk/python/src/scalar.rs similarity index 100% rename from src/sdk/src/sdk-py/src/scalar.rs rename to src/sdk/python/src/scalar.rs diff --git a/src/sdk/src/sdk-py/src/verifying_key.rs b/src/sdk/python/src/verifying_key.rs similarity index 100% rename from src/sdk/src/sdk-py/src/verifying_key.rs rename to src/sdk/python/src/verifying_key.rs diff --git a/src/sdk/src/sdk-py/src/zk_binary.rs b/src/sdk/python/src/zk_binary.rs similarity index 100% rename from src/sdk/src/sdk-py/src/zk_binary.rs rename to src/sdk/python/src/zk_binary.rs diff --git a/src/sdk/src/sdk-py/src/zk_circuit.rs b/src/sdk/python/src/zk_circuit.rs similarity index 100% rename from src/sdk/src/sdk-py/src/zk_circuit.rs rename to src/sdk/python/src/zk_circuit.rs diff --git a/src/zk/vm.rs b/src/zk/vm.rs index 27cbb7ad7..ee3ab47a1 100644 --- a/src/zk/vm.rs +++ b/src/zk/vm.rs @@ -389,7 +389,7 @@ impl Circuit 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 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 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 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 for ZkCircuit { _ => { error!(target: "zk::vm", "Unsupported opcode"); - return Err(plonk::Error::Synthesis); + return Err(plonk::Error::Synthesis) } } }