Merge pull request #1862 from dusk-network/test-wallet-core

Replace `dusk-wallet-core` dependency for local `test-wallet`
dusk-network · Jun 17, 2024 · 71104a3 · 71104a3
2 parents 37d55eb + fe897a3
commit 71104a3
Show file tree

Hide file tree

Showing 23 changed files with 1,762 additions and 30 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,6 +26,9 @@ members = [
     "node-data",
     "consensus",
     "node",
+
+    # Test utils
+    "test-wallet",
 ]
 resolver = "2"
 

diff --git a/execution-core/Cargo.toml b/execution-core/Cargo.toml
@@ -8,7 +8,7 @@ dusk-bls12_381 = { version = "0.13", default-features = false, features = ["rkyv
 dusk-jubjub = { version = "0.14", default-features = false, features = ["rkyv-impl"] }
 dusk-poseidon = { version = "0.33", default-features = false, features = ["rkyv-impl", "alloc"] }
 bls12_381-bls = { version = "0.2", default-features = false, features = ["rkyv-impl"] }
-jubjub-schnorr = { version = "0.2", default-features = false, features = ["rkyv-impl"] }
+jubjub-schnorr = { version = "0.2", default-features = false, features = ["rkyv-impl", "double"] }
 phoenix-core = { version = "0.26", default-features = false, features = ["rkyv-impl", "alloc"] }
 dusk-bytes = "0.1"
 rkyv = { version = "0.7", default-features = false,  features = ["size_32"] }

diff --git a/execution-core/src/lib.rs b/execution-core/src/lib.rs
@@ -40,7 +40,7 @@ pub type StakeAggPublicKey = BlsAggPublicKey;
 
 pub use jubjub_schnorr::{
     PublicKey as SchnorrPublicKey, SecretKey as SchnorrSecretKey,
-    Signature as SchnorrSignature,
+    Signature as SchnorrSignature, SignatureDouble as SchnorrSignatureDouble,
 };
 /// Secret key associated with a note.
 pub type NoteSecretKey = SchnorrSecretKey;

diff --git a/node-data/src/ledger.rs b/node-data/src/ledger.rs
@@ -494,7 +494,7 @@ pub mod faker {
     /// gas price.
     pub fn gen_dummy_tx(gas_price: u64) -> Transaction {
         // TODO: Replace this blob with making a valid transaction once
-        // dusk_wallet_core::Transaction allows this
+        // execution_core::Transaction allows this
         let fixed = "31858df61df8a7208b64540f1dafffcce0ec7613f38d6147ca4393c101d45e600200000000000000f1afb77f1551f559f1226f88b2efbbc37c811218cc50531f0a8a704c98c35a32e1b905bb45a09cbca4e003a9f9d2eb6c16adf6fa49ca8afd8dfdfca449f354700100000000000000017918bbfc50c9a07b4abf98e605085f543cca07ca802b94afe1d992995543335a2d6307d9dc46929cb072d09bc790b6214671fc55df8e8d7af1bb3ef33529d31dce2982d5fef7fd0f7e36ba3e88d119fb807a546f3e273d09380dbdf48d0c57f0513c03a5c1e98e40493acde840d384c965bfccdb26af78aec81333fe24028fc2ffffffffffffffffe2f34d13ef74e08d966ced4a75ea36af891247031f848b003755dff9e8060b01104e6237b437d401ba7ad37a2435fbcb39ad17e3308a0a80c97acbe336e68851d034589b1859998aeced6f060874daf17299ae5cba212020f6bb80701afb1f410065cd1d00000000GASPRICEd870bd7510b7d51655ce1122829ec083b7d0a5a4db2ffe16589b3eabaec51d0f7a600e3dae06a4f740336cedd2b5bbeaf50428fbee075bd29cef630bab5f86a9001004000000000000a0f630636f64629f0a4422b00d5dbccb0405c4124603b4f00b29ef1ab49a617bacda7c6ea142a7ca80b1817f072a0c8491a6966f8b648c6e552b4afaa4fc5d1867448d1e3a1a360cccb68d54f100e47ab0a98464e8e8bbcca13c057ea89bb0f1b1aedd1ed10e18b5661f2dd029ecb7060110cd784837675c5588cbc5721b9075eb9b6c6a1dacff8fd9ae5e2587994f0e8b74ecc9cd9254916dcb7518d807d452ba551a5590d3045283739f8f954d3550ae08717f717bcff71a8c87d3725135abb0e1cf62b16d3e0185d589f2c84f04b577ec154ab770719eec1b3e935736021a49dbfdbd0fc76e12d33d516e3ab187b680b5a42b6f9d8104699a0e5d440db122698bbc0e7d7907d32d73664b88a4efe650bcd2cd8e17b6e1060fb99e0ba7cea790bae9e87f920bd37bb5d95946e679150560659f037cc148780745b21a8f8f726a82ec597f8195622fda20700cc38bdeb1d64eb47a240c3c72b4e1752677e39157764231ee2667ab36ccdbfba42457f8aa78190e9f349fdb0f39419a0118585b830e1f5384814e9656b8979aa59833641c241d35c05dc76d7e364aee2450106ab83406673fc18e931b92e5ccdb9c147b867649519adf577c562d87284c4674ee2b4300dc24d0f1a6dc1181b28b14322e7102cb0bf4959f2d49c55f76b438bb3b98b1ae81660da05395dd2780c2b7a57f91dfea8ab8e0ef39c6d3aa90b6a9c796dc7a5442582066d7eb35d61e41e26ad02c5bec835f0e56f87369a55eb8aa9267638b4cffbf8595a67158f55c8dc85e4c607c114f2d51f5bbd0424906bd3a49b3979ccc1fd3266c11b4f6fee01452a215c2537200e2f96527fbfb2a2525cf4a856a3d7ad224f90e77ebd1564d83a75c34e4bfbb3a2e9112af6d5d684c693079671817d04798e47a891313e74401893d3cbed23ffcba13c62a9815a2207d3b4791a77bcd52326a8acd57918a371552bb46e486f1a6217e10ae74f5f8e4c1984c28ef8ac960abeb001c26282439eae48249cce5272acaba1be1ce770cd90c68efbda84dd3ccf2f2ce51d9b7351703d7cb6d928f27d0a662c26e54a6342d509e877b8355a50c2fb23f8f680c063a49d6ab31a2b34a17038141b04c19221df2f229ce7ca70b837ebf0c3a030527fc7037172d0ddc595e1aaba4774c1746a83dff4867b5986c5afe399c93ead34e37aaa79e48def89950118f5ab0c7d66074dd680fbc7146c977135a6aef55617befeba25f269b606a21f8880ce2c30e0ce8b898643c08871773ac1e41f62d86c24060b1072418275ded45bb819939ca45d681878ec16257902ce4d4aebc709027d77f2c8c622ce7f1a7f79a2d5efd460266a059ad242ff7b64947f44d1b9bd8d29a633b9223fb75ce14deb158c81e9a1703395531d173bdd88b8df90bee088618e12b875e42f45ff5cc7159b136e05b2426628b0dafa076e5dcc223a37cf5f0df7e75607f040101000000000000000000000000000000000000000000000000000000000000000400000000000000726f6f747aaa96c657582d963de258f184da3d7c95042920db92a2b2591c181466ea5a5311b5ef84f135b3d567120eaae941f35f8d5d62a8f42c8c9dacd2c78cc6f02e558d0d18fc4e78997967851fef237755ee6ee490036925c7fb100eefdbec1c033b8332252314a8fd0c05a01f9a8b87372381ee179818e8ffff36dc94a411c0d75e9ded4fcdf533fd58fc80c8dae586d783ed32168744d0f952dee4f02ce4e25f552327ac75c4aba87513dc54e4a5c2e2e36835828113ef92fea59dbf2457575903bf3156016acac7a44a1d6b546f4199bba7b24966c739ddc433a521ee5a776148349a0a53a6cd16d1cd20e13120bd404fd23a752a8f3facd53b78d360d3f3a03e57bf726eed5f1d8d4c530cd187919796fbb4cdc4dceb809f3839bcb453ae7022ae10a0f7ee7f4355e9d74fbf55d3221bb0beb1bf9ae1f6927e9d3cce9f24581640d55c7bf2cd4b6f130ef439a20b990223bb9022446b7e02e502619b4dd3f80d31e6ca8a4c8785453c9a4886d5e9159bcd1974030e70d1cdd008f3408845871c4cbfb0554963f5f47b91a81a0d1f7370be7c072d77a9e03489921981f503ec2f29a07829b2b4f9f285e2ff0d50378d59b12ad2fb8386001e561c3c3c5e66df31256fac5c58b056a49ffe0c23e8e583944e0252529b1c8438fbd22be0d89d5838bc023097bb353188a830dc1a280a0d36ad045d0691354f4a3cdf06724101be6bc23a3f90ad62b7eb699b215644326e61c546068bb46871cc5007e81aa117c1538a9297e803ff05b1f631d15791d5f3e179718a3a752649ef7c13f4e03f0390117a7e8542930b0d81da721a28e246a451c995bcc2f6a1961b56c6e0c030563068b32b6a97b404c884d9430e60d070354accd59c9e4e01f816c149898241f7f42e8724c0af7e5e84b28c9d830add2ab94c78dc474e06ca84d444267d37c86697615396cd4c74e95815fafd25e0f96ea952a9d2de0fbb646e83bf25147ed597df42";
 
         let utx_bytes = hex::decode(fixed.replace(

diff --git a/rusk-prover/Cargo.toml b/rusk-prover/Cargo.toml
@@ -4,18 +4,23 @@ version = "0.3.0"
 edition = "2021"
 autobins = false
 
-
 [dependencies]
 dusk-bytes = { version = "0.1" }
-dusk-wallet-core = { version = "0.25.0-phoenix.0.26", default-features = false }
+dusk-plonk = { version = "0.19", default-features = false }
+poseidon-merkle = { version = "0.5", features = ["rkyv-impl"] }
+rand_core = "0.6"
+
+rkyv = { version = "0.7", default-features = false, features = ["size_32"] }
+bytecheck = { version = "0.6", default-features = false }
+
+rusk-abi = { version = "0.13.0-rc", path = "../rusk-abi", default-features = false }
+execution-core = { version = "0.1.0", path = "../execution-core" }
 
 ## feature local_prover
 once_cell = { version = "1.9", optional = true }
-dusk-plonk = { version = "0.19", optional = true }
 rand = { version = "0.8", optional = true }
 rusk-profile = { version = "0.6", path = "../rusk-profile", optional = true }
 transfer-circuits = { version = "0.5", path = "../circuits/transfer", optional = true }
-execution-core = { version = "0.1.0", path = "../execution-core", optional = true }
 
 [dev-dependencies]
 hex = "0.4"
@@ -25,10 +30,11 @@ tokio = { version = "1.17.0", features = ["full"] }
 default = ["local_prover"]
 local_prover = [
     "once_cell",
-    "dusk-plonk",
+    "dusk-plonk/std",
     "rand",
     "rusk-profile",
     "transfer-circuits",
-    "execution-core",
+    "std",
 ]
 no_random = []
+std = []
diff --git a/rusk-prover/src/errors.rs b/rusk-prover/src/errors.rs
@@ -4,8 +4,8 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use std::error;
-use std::fmt;
+use alloc::string::String;
+use core::fmt;
 
 #[derive(Debug)]
 pub enum ProverError {
@@ -15,10 +15,13 @@ pub enum ProverError {
     },
     Other(String),
 }
+
 impl ProverError {
     pub fn invalid_data(field: &'static str, inner: dusk_bytes::Error) -> Self {
         Self::InvalidData { field, inner }
     }
+
+    #[cfg(feature = "std")]
     pub fn with_context<E: std::error::Error>(
         context: &'static str,
         err: E,
@@ -27,8 +30,9 @@ impl ProverError {
     }
 }
 
-impl error::Error for ProverError {
-    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
+#[cfg(feature = "std")]
+impl std::error::Error for ProverError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         None
     }
 }

diff --git a/rusk-prover/src/lib.rs b/rusk-prover/src/lib.rs
@@ -4,14 +4,24 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std;
+
+use alloc::vec::Vec;
+
 mod errors;
+mod tx;
 
 #[cfg(feature = "local_prover")]
 pub mod prover;
 #[cfg(feature = "local_prover")]
 pub use crate::prover::LocalProver;
 
 pub use errors::ProverError;
+pub use tx::{UnprovenTransaction, UnprovenTransactionInput};
 
 pub type ProverResult = Result<Vec<u8>, ProverError>;
 

diff --git a/rusk-prover/src/prover/execute.rs b/rusk-prover/src/prover/execute.rs
@@ -5,15 +5,17 @@
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
 use super::*;
-use crate::prover::fetch_prover;
-use dusk_wallet_core::UnprovenTransaction;
+
 use execution_core::transfer::TRANSFER_TREE_DEPTH;
 use rand::{CryptoRng, RngCore};
 use transfer_circuits::{
     ExecuteCircuitFourTwo, ExecuteCircuitOneTwo, ExecuteCircuitThreeTwo,
     ExecuteCircuitTwoTwo,
 };
 
+use crate::prover::fetch_prover;
+use crate::UnprovenTransaction;
+
 pub static EXEC_1_2_PROVER: Lazy<PlonkProver> =
     Lazy::new(|| fetch_prover("ExecuteCircuitOneTwo"));