Manta-RS Integration

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,7 +24,7 @@ write a little note why.
 - [ ] Re-reviewed `Files changed` in the Github PR explorer.
 - [ ] Update the version numbers properly:
    * Cargo.toml
+   * ui/package.json
+   * ui/public/about.html
    * ui/src-tauri/Cargo.toml
    * ui/src-tauri/tauri.conf.json
-   * ui/public/about.html
-   * ui/package.json

.github/workflows/e2e.yml

@@ -10,7 +10,6 @@ on:
       - master
     paths-ignore:
       - '**.md'
-
 jobs:
   build_code:
     name: End to end test
@@ -21,7 +20,6 @@ jobs:
         node-version: [16.x]
     env:
       MANTA_SDK_BRANCH: "main"
-
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.9.1
@@ -39,41 +37,11 @@ jobs:
           cd js
           yarn install --immutable | grep -v 'YN0013'
           yarn build
-
       - name: Enable test scripts
         run: |
-          chmod +x "${GITHUB_WORKSPACE}/.github/workflows/e2e/get_latest_sdk_version.sh"
-          chmod +x "${GITHUB_WORKSPACE}/.github/workflows/e2e/move_proving_keys.sh"
           chmod +x "${GITHUB_WORKSPACE}/.github/workflows/e2e/get_node.sh"
           chmod +x "${GITHUB_WORKSPACE}/.github/workflows/e2e/run_test.sh"
-
-      - name: Get latest Manta sdk version
-        run: |
-          LATEST_SDK_VERSION=`"${GITHUB_WORKSPACE}/.github/workflows/e2e/get_latest_sdk_version.sh" ${{ env.MANTA_SDK_BRANCH }}`
-          echo $LATEST_SDK_VERSION
-          echo "LATEST_SDK_VERSION=$LATEST_SDK_VERSION" >> $GITHUB_ENV
-      - name: Load proving keys from cache
-        id: load-cache-proving-keys
-        uses: actions/cache@v2
-        env:
-          cache-name: proving-keys
-        with:
-          path: ~/.local/share/manta-signer
-          key: ${{ env.cache-name }}-${{ env.LATEST_SDK_VERSION }}
-      - name: Get proving keys
-        if: steps.load-cache-proving-keys.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
-        with:
-          repository: Manta-Network/sdk
-          path: sdk
-          fetch-depth: 1
-          lfs: true
-      - name: Move proving keys
-        if: steps.load-cache-proving-keys.outputs.cache-hit != 'true'
-        run: "${GITHUB_WORKSPACE}/.github/workflows/e2e/move_proving_keys.sh"
-
       - name: Get Dolphin node
         run: "${GITHUB_WORKSPACE}/.github/workflows/e2e/get_node.sh"
-
       - name: Run test
         run: "${GITHUB_WORKSPACE}/.github/workflows/e2e/run_test.sh"

.github/workflows/e2e/run_test.sh

@@ -7,14 +7,21 @@ cat out.json
 
 # Run 3 headless copies of signer
 cd ../../..
-cargo run --example test_server --release --features=unsafe-disable-cors -- http://127.0.0.1:29988 &
-cargo run --example test_server --release --features=unsafe-disable-cors -- http://127.0.0.1:29989 &
-cargo run --example test_server --release --features=unsafe-disable-cors -- http://127.0.0.1:29990 &
+./target/release/examples/test_server 127.0.0.1:29988 &
+./target/release/examples/test_server 127.0.0.1:29989 &
+./target/release/examples/test_server 127.0.0.1:29990 &
 
 # Run node
-~/Manta/manta  --chain dev --ws-port 9944 --port 30333 --alice \
---tmp --rpc-cors all --unsafe-ws-external --unsafe-rpc-external \
---rpc-methods=Unsafe &
+~/Manta/manta             \
+    --chain dev           \
+    --ws-port 9944        \
+    --port 30333          \
+    --alice               \
+    --tmp                 \
+    --rpc-cors all        \
+    --unsafe-ws-external  \
+    --unsafe-rpc-external \
+    --rpc-methods=Unsafe  &
 
 # Run test
 cd js

.github/workflows/release.yml

@@ -78,15 +78,6 @@ jobs:
             ${{ matrix.os }}-build-${{ env.cache-name }}-
             ${{ matrix.os }}-build-
             ${{ matrix.os }}-
-      - name: Fetch Proving Keys
-        uses: actions/checkout@v2
-        with:
-          repository: Manta-Network/sdk
-          path: sdk
-          fetch-depth: 1
-          lfs: false
-      - name: Move Proving Keys
-        run: mv ./sdk/legacy/proving/* ui/src-tauri/
       - name: Hack For Ubuntu Builds
         run: cd ui/src-tauri; sed -i /icns/d tauri.conf.json
         if: matrix.os_type == 'ubuntu'
@@ -106,10 +97,15 @@ jobs:
       - name: Append version suffix
         run: node ./scripts/suffix.js ${{ steps.suffixed.outputs.SUFFIXED }}
       - name: Build & Sign
-        run: cd ui;yarn && yarn tauri build
+        run: cd ui;yarn && yarn add @tauri-apps/cli && yarn tauri build -v
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.3

.rustfmt.toml

@@ -1,3 +1,3 @@
-imports_granularity="Crate"
+imports_granularity = "Crate"
 license_template_path = "FILE_TEMPLATE"
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "manta-signer"
-edition = "2018"
-version = "0.5.2"
+edition = "2021"
+version = "0.6.0"
 authors = ["Manta Network <contact@manta.network>"]
 readme = "README.md"
 license-file = "LICENSE"
@@ -25,34 +25,32 @@ is-it-maintained-open-issues = { repository = "Manta-Network/manta-signer" }
 maintenance = { status = "actively-developed" }
 
 [features]
-# Disable CORS Check
+# Enable Logging
+log = []
+
+# Disable CORS Check: This is UNSAFE in general and should only be used in debug builds.
 unsafe-disable-cors = []
 
 [dependencies]
-ark-serialize = { version = "0.3.0", default-features = false }
-async-std = { version = "1.10.0" }
-bip0039 = { version = "0.10.0" }
-bip32 = { version = "0.2.2" }
-bs58 = { version = "0.4.0" }
-cocoon = { version = "0.3.0" }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive", "full" ] }
+argon2 = { version = "0.3.4", default-features = false, features = ["alloc", "password-hash"] }
+chrono = { version = "0.4.19", default-features = false, features = ["clock"] }
 derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
-dirs-next = { version = "2.0.0" }
-futures = { version = "0.3.17", default-features = false }
+dirs-next = { version = "2.0.0", default-features = false }
+futures = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-types = { version = "2.12.0", default-features = false }
-manta-api = { git = "https://github.com/Manta-Network/manta-api", branch = "manta", default-features = false, features = ["signer", "testnet"] }
-manta-asset = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" }
-manta-crypto = { git = "https://github.com/Manta-Network/manta-crypto", branch = "manta" }
-manta-data = { git = "https://github.com/Manta-Network/manta-types", branch = "manta" }
-rand = { version = "0.8.4", default-features = false }
-rand_chacha = { version = "0.3.1", default-features = false }
+manta-accounting = { git = "https://github.com/manta-network/manta-rs", features = ["cocoon-fs"] }
+manta-crypto = { git = "https://github.com/manta-network/manta-rs", features = ["getrandom"] }
+manta-pay = { git = "https://github.com/manta-network/manta-rs", features = ["bs58", "groth16", "serde", "wallet"] }
+manta-sdk = { git = "https://github.com/manta-network/sdk", features = ["download"] }
+manta-util = { git = "https://github.com/manta-network/manta-rs" }
+parking_lot = { version = "0.12.0", default-features = false }
+password-hash = { version = "0.3.2", default-features = false, features = ["alloc"] }
 secrecy = { version = "0.8.0", default-features = false, features = ["alloc"] }
-serde = { version = "1.0.131", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.68", default-features = false }
-subtle = { version = "2.4.1" }
-tide = { version = "0.16.0" }
+subtle = { version = "2.4.1", default-features = false }
+tide = { version = "0.16.0", default-features = false, features = ["h1-server"] }
+tokio = { version = "1.17.0", default-features = false, features = ["fs", "io-std", "io-util", "rt", "sync", "time"] }
 
 [dev-dependencies]
-async-std = { version = "1.10.0", features = ["attributes"] }
-tempfile = { version = "3.2.0" }
-
+async-std = { version = "1.11.0", default-features = false, features = ["attributes", "tokio1"] }
+tempfile = { version = "3.3.0", default-features = false }

README.md

@@ -1,18 +1,15 @@
-manta-signer
-============
+# manta-signer
 
 `manta-signer` is manta's native client that **turbo charges** zero-knowledge-proof generation.
 
-<img width="655" alt="Screen Shot 2021-11-21 at 3 50 01 PM" src="https://user-images.githubusercontent.com/720571/142786609-ce7455e1-dbe7-4a6d-8a78-4aa22984a3d7.png">
+<img width="655" src="https://user-images.githubusercontent.com/720571/142786609-ce7455e1-dbe7-4a6d-8a78-4aa22984a3d7.png">
 
 Disclaimer: `manta-signer` is experimental software, use it at your own risk.
 
 ## Project Organization
-```
--src: manta-signer zkp generation
--ui: manta-signer desktop UI
--js: external Javascript libraries that interact with manta-signer
-```
+- `src`: `manta-signer` zkp generation
+- `ui`: `manta-signer` desktop UI
+- `js`: external Javascript libraries that interact with `manta-signer`
 
 <br/>
 To remove your private account data completely and set up a new account, you should remove these files.

docs/manta-signer-state-machine.tex

@@ -20,14 +20,13 @@
 \vspace{2em}
 
 \begin{center}
-% https://tikzcd.yichuanshen.de/#N4Igdg9gJgpgziAXAbVABwnAlgFyxMJZABgBoBGAXVJADcBDAGwFcYkQAdDnGADxzgAzYAGUAogCUAapIC+IWaXSZc+QigDMpAEzU6TVuy49+wAIIBjCxGZgcAAjG8scAQH55i5djwEiWjT0GFjZETm4+AWEAGQgAcywwTyUQDB81IgBWUkCaYMMw40ihYABhACcYeh57S2tbHGTvVT9NCiCDUPCTKOAAVQBJJtSVX3VkLQAWDpCjCP4SkRgwKHsABXo4OAB3CHKoYbSW8bJpvM65uABHZnpKhRSjsaIyTJmC7uKYiHpVpZgDg9ms82gAOd5dLjXW73LwjdKtEikABsELmPUWMHKtBgh1GGRQZAA7GjCvMcOZmDgABZ7LAALxgHiB8OORHIpHB51mZIxwjMVNp5QZuJZTwJSPIVG5HyKC2EIiwcSSYvxiI55GIpPC0LubDh4sRWk12rlvSWK3Wmx2e0BBrV4y0AE5TeSSmtyhAALZoRqqhEnCi6GWQjgWLDlCz+tltKWu8OR6MgpFakPoyIAIwVABUzBJs3iA-5SG807yvsAABJYWCePQAuLwIigQSer1IDkgHAQJDaGiMegZmCMNYO9iJbCwEBlz7y4AATTEImGre9HZo3aQWn0PNnvQAcgB5eT9wfD0dFsITmv6lKr9uISYbnuIchw++95+fkCMCAQNBENoRJkIITBwDAegDkOI5jleYCTmwM5miU2z0LgJ4-okXRQJs1IAiyH6INum5Ef2f4ASg5CgmQODlKwkFnjBl4gNeU5IW6wioeh06YWA2G4fh75tt+JGZEJa6kV2L5iXewmINkUlIMi7F8sA4ErBhUHnrBLHwTePGMFh7BQDYGaMIhIB4b8SBgMwjCMBuaGMOwkB8QRclkIpiDKbx-FwHhUAGYxF4xrpCE8fkoaqZUFi0BhVmBYgtn2Y5WDOWErm3i2ck+SRRLiQ+RJfogToFUgTrFZqZWvp5JFSqe0EhSCYX6SpFaLsu7kSZqlV9jusoccAR6acFOmsVlICERVXnTb+-5EE6IFgRBDXacx40RRc5Zzlxfr9kZYQ4f5gmyd1nYkaCq1MaFG1tXOaBtr6mkHSAcAQIZgWpelXZOV1D71V55DboZbmHQJn0-qN616Wx-VRRWMVxX9HZPoDwNQzdMMWZF6ZzupgL7aDIAmcwZkWQlNl2Q5P1pS5BATYRl2AwpWnXc1t1w7jvT+RA2wrnJ5AKXVkzVYLlUs+RgHAaQoGMOBDGNWNWMGS9R0BZtu7IZxaF+qLxEvuQ2ii31dXIqLuUvtNQ4rEgkylad-2o3V+UO0gtUvqjrNNQSLWwzj23c7SfM8Tgv1hKHtOi0zJHENVQsG-b2XddNF2E356tXd7rS+9jW17iUhmuMs-PdUVgNW8siUALR27IlCyEAA
 \begin{tikzcd}
 \textbf{START} \arrow[d]                                                                                        &                                                                                                                    &  &                                                                                                            &  &                                                                                                                     \\
 \textsf{SERVER} \arrow[ddd, "\textsf{recv}" description, dashed] \arrow[rrr, "\textsf{show}" description, tail] &                                                                                                                    &  & \textsf{UI} \arrow[d]                                                                                      &  &                                                                                                                     \\
                                                                                                                 &                                                                                                                    &  & \text{Account Exists?} \arrow[d, "\textsf{YES}" description] \arrow[rrd, "\textsf{NO}" description]        &  &                                                                                                                     \\
                                                                                                                 &                                                                                                                    &  & \textsf{Login} \arrow["\textsf{wait}" description, dashed, loop, distance=2em, in=215, out=145] \arrow[d]  &  & \textsf{Create Account} \arrow["\textsf{wait}" description, dashed, loop, distance=2em, in=55, out=125] \arrow[lld] \\
 \square \arrow[d]                                                                                               &                                                                                                                    &  & \textsf{Send Password} \arrow[lll, "\textsf{send}" description, Rightarrow] \arrow[d]                      &  &                                                                                                                     \\
-\textsf{Load Seed} \arrow[d]                                                                                    &                                                                                                                    &  & \textsf{Hide} \arrow[ddd, "\textsf{listen}" description, dashed]                                           &  &                                                                                                                     \\
+\textsf{Load State} \arrow[d]                                                                                    &                                                                                                                    &  & \textsf{Hide} \arrow[ddd, "\textsf{listen}" description, dashed]                                           &  &                                                                                                                     \\
 \textsf{Serve} \arrow[d] \arrow["\textsf{wait}" description, dashed, loop, distance=2em, in=35, out=325]        &                                                                                                                    &  &                                                                                                            &  &                                                                                                                     \\
 \text{Authorize?} \arrow[rd, "\textsf{YES}" description] \arrow[dddd, "\textsf{NO}" description]                &                                                                                                                    &  &                                                                                                            &  &                                                                                                                     \\
                                                                                                                 & \textsf{Authorize} \arrow[rr, "\textsf{prompt}" description, tail] \arrow[dd, "\textsf{recv}" description, dashed] &  & \square \arrow[d, "\textsf{show}" description]                                                             &  &                                                                                                                     \\

examples/test_server.rs

@@ -16,81 +16,47 @@
 
 //! Test Signer Server
 
-use async_std::io;
+use manta_crypto::rand::{CryptoRng, OsRng, RngCore, Sample};
 use manta_signer::{
     config::Config,
-    secret::{
-        create_account, sample_password, Authorizer, Password, PasswordFuture, SecretString,
-        UnitFuture,
-    },
-    service::{Prompt, Service},
+    secret::{Authorizer, Password, PasswordFuture, SecretString},
+    service::{self, Error},
 };
-use rand::thread_rng;
 
 /// Mock User
 pub struct MockUser {
-    /// Stored Password
+    /// User Password
     password: SecretString,
 }
 
 impl MockUser {
     /// Builds a new [`MockUser`] from `password`.
     #[inline]
-    fn new(password: SecretString) -> Self {
-        Self { password }
+    pub fn new<R>(rng: &mut R) -> Self
+    where
+        R: CryptoRng + RngCore + ?Sized,
+    {
+        Self {
+            password: SecretString::new(u128::gen(rng).to_string()),
+        }
     }
 }
 
 impl Authorizer for MockUser {
-    type Prompt = Prompt;
-
-    type Message = ();
-
-    type Error = ();
-
     #[inline]
     fn password(&mut self) -> PasswordFuture {
         Box::pin(async move { Password::from_known(self.password.clone()) })
     }
-
-    #[inline]
-    fn setup<'s>(&'s mut self, config: &'s Config) -> UnitFuture<'s> {
-        Box::pin(async move {
-            let _ = create_account(&config.root_seed_file, &self.password)
-                .await
-                .expect("Unable to create account for a mock user.");
-        })
-    }
-}
-
-/// Test Service
-pub struct TestService(Service<MockUser>);
-
-impl TestService {
-    /// Builds a new [`TestService`] with the given `config` and a random password.
-    #[inline]
-    pub fn build(config: Config) -> Self {
-        Self(Service::build(
-            config,
-            MockUser::new(sample_password(&mut thread_rng())),
-        ))
-    }
-
-    /// Starts the test service.
-    #[inline]
-    pub async fn serve(self) -> io::Result<()> {
-        self.0.serve().await
-    }
 }
 
 #[async_std::main]
-async fn main() -> io::Result<()> {
+async fn main() -> Result<(), Error> {
     let test_dir = tempfile::tempdir()?;
     let mut config =
         Config::try_default().expect("Unable to generate the default server configuration.");
-    config.root_seed_file = test_dir.path().join("root_seed.aes");
+    config.data_path = test_dir.path().join("storage.dat");
     if let Some(url) = std::env::args().nth(1) {
         config.service_url = url;
     }
-    TestService::build(config).serve().await
+    service::start(config, MockUser::new(&mut OsRng)).await
 }