sdk-py: cargo fmt

Cargo.toml

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

doc/src/zkas/bincode.md

@@ -180,7 +180,7 @@ TBD
 | `EcMul`               | `ec_mul(EcPoint a, EcPoint c)`                          | `(EcPoint c)` |
 | `EcMulBase`           | `ec_mul_base(Base a, EcFixedPointBase b)`               | `(EcPoint c)` |
 | `EcMulShort`          | `ec_mul_short(Base a, EcFixedPointShort b)`             | `(EcPoint c)` |
-| `EcMulVarBase`        | `ec_mul_var_base()`                                     | `()`          |
+| `EcMulVarBase`        | `ec_mul_var_base(Base a, EcNiPoint)`                    | `(EcPoint c)` |
 | `EcGetX`              | `ec_get_x(EcPoint a)`                                   | `(Base x)`    |
 | `EcGetY`              | `ec_get_y(EcPoint a)`                                   | `(Base y)`    |
 | `PoseidonHash`        | `poseidon_hash(Base a, ..., Base n)`                    | `(Base h)`    |

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

@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = "0.19.0"
-darkfi-sdk = { path = "../sdk" }
+darkfi-sdk = { path = "../../../sdk" }
 rand = "0.8.5"
 halo2_gadgets = "0.3.0"
-darkfi = { path = "../../", features = ["zk", "zkas"] }
+darkfi = { path = "../../../../", features = ["zk", "zkas"] }

src/sdk-py/src/point.rs → src/sdk/src/sdk-py/src/point.rs

@@ -16,9 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use crate::affine::Affine;
-use crate::base::Base;
-use crate::scalar::Scalar;
+use crate::{affine::Affine, base::Base, scalar::Scalar};
 use darkfi_sdk::{
     crypto::{
         constants::{
@@ -59,21 +57,19 @@ impl Point {
 
     #[staticmethod]
     fn mul_short(value: &Base) -> Self {
-        // QUESTION: Why does v need to be a random element from EP?
-        // Why not NullifierK.generator() or some other pre-determined generator?
         let hasher = ValueCommit::hash_to_curve(VALUE_COMMITMENT_PERSONALIZATION);
         let v = hasher(&VALUE_COMMITMENT_V_BYTES);
         Self(v * mod_r_p(value.0))
     }
 
-    // why value doesn't need to be a Pycell
+    // Why value doesn't need to be a Pycell?
     #[staticmethod]
     fn mul_base(value: &Base) -> Self {
         let v = NullifierK.generator();
         Self(v * mod_r_p(value.0))
     }
 
-    // why not a pycell
+    // Why not a pycell?
     #[staticmethod]
     fn mul_r_generator(blind: &Scalar) -> Self {
         let hasher = ValueCommit::hash_to_curve(VALUE_COMMITMENT_PERSONALIZATION);

src/sdk-py/src/proof.rs → src/sdk/src/sdk-py/src/proof.rs

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use crate::base::Base;
-use crate::proving_key::ProvingKey;
-use crate::verifying_key::VerifyingKey;
-use crate::zk_circuit::ZkCircuit;
+use crate::{
+    base::Base, proving_key::ProvingKey, verifying_key::VerifyingKey, zk_circuit::ZkCircuit,
+};
 use darkfi::zk::{proof, vm};
 use darkfi_sdk::crypto::pallas;
 use pyo3::prelude::*;

src/sdk-py/src/scalar.rs → src/sdk/src/sdk-py/src/scalar.rs

@@ -23,7 +23,6 @@ use darkfi_sdk::crypto::{
 use pyo3::prelude::*;
 use rand::rngs::OsRng;
 
-/// Why does Vesta use Fq?
 /// The scalar field of the Pallas and iso-Pallas curves.
 #[pyclass]
 pub struct Scalar(pub(crate) pallas::Scalar);

src/sdk-py/src/zk_circuit.rs → src/sdk/src/sdk-py/src/zk_circuit.rs

@@ -16,10 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use crate::base::Base;
-use crate::point::Point;
-use crate::scalar::Scalar;
-use crate::zk_binary::ZkBinary;
+use crate::{base::Base, point::Point, scalar::Scalar, zk_binary::ZkBinary};
 use darkfi::zk::{halo2::Value, vm, vm_heap::empty_witnesses};
 use darkfi_sdk::crypto::MerkleNode;
 use pyo3::prelude::*;
@@ -28,7 +25,6 @@ use std::ops::Deref;
 #[pyclass]
 pub struct ZkCircuit(pub(crate) vm::ZkCircuit, pub(crate) Vec<vm::Witness>);
 
-/// QUESTION: how to deal with witness?
 /// Like Builder Object
 #[pymethods]
 impl ZkCircuit {