Trigger rewarded_set update on bootstrap error

Type safe bounds (#1179 )
* Type safe bounds * Debug get_all_delegations * List raw delegations * query all delegation values * Get all keys and values * Differentiate on len * Clean up duplicates * Remove stop gap * Cleanup, fix paged query key * Reduce queries required to get all delegations * Sandbox migration * Delete migration
2022-03-30 14:35:03 +02:00 · 2022-03-30 12:20:03 +02:00 · 2022-03-30 09:35:22 +01:00 · 2022-03-30 09:34:17 +01:00 · 2022-03-29 17:02:56 +02:00 · 2022-03-29 10:02:48 +01:00
805 changed files with 78007 additions and 135316 deletions
@@ -0,0 +1,63 @@
+name: CI for ts-packages
+
+on:
+  push:
+    paths:
+      - 'ts-packages/**'
+
+jobs:
+  build:
+    runs-on: custom-runner-linux
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install rsync
+      run: sudo apt-get install rsync
+    - uses: rlespinasse/github-slug-action@v3.x
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+    - name: Setup yarn
+      run: npm install -g yarn
+    - name: Build
+      run: yarn && yarn build && yarn build:ci
+    - name: Deploy branch to CI www (storybook)
+      continue-on-error: true
+      uses: easingthemes/ssh-deploy@main
+      env:
+        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+        ARGS: "-rltgoDzvO --delete"
+        SOURCE: "ts-packages/dist/storybook/"
+        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ts-${{ env.GITHUB_REF_SLUG }}
+        EXCLUDE: "/dist/, /node_modules/"
+    - name: Deploy branch to CI www (example)
+      continue-on-error: true
+      uses: easingthemes/ssh-deploy@main
+      env:
+        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+        ARGS: "-rltgoDzvO --delete"
+        SOURCE: "ts-packages/dist/example/"
+        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ts-${{ env.GITHUB_REF_SLUG }}-example
+        EXCLUDE: "/dist/, /node_modules/"
+    - name: Keybase - Node Install
+      run: npm install
+      working-directory: .github/workflows/support-files
+    - name: Keybase - Send Notification
+      env:
+        NYM_NOTIFICATION_KIND: ts-packages
+        NYM_PROJECT_NAME: "ts-packages"
+        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
+        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-ts-packages"
+        IS_SUCCESS: "${{ job.status == 'success' }}"
+      uses: docker://keybaseio/client:stable-node
+      with:
+        args: .github/workflows/support-files/notifications/entry_point.sh
@@ -33,13 +33,13 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --all
+          args: --workspace

      - name: Run all tests
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all
+          args: --workspace --all-features

      - name: Check formatting
        uses: actions-rs/cargo@v1
@@ -57,19 +57,19 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: clippy
-          args: -- -D warnings
+          args: --workspace -- -D warnings

      - name: Build all binaries with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --all --features=coconut
+          args: --workspace --features=coconut

      - name: Run all tests with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all --features=coconut
+          args: --workspace --features=coconut

      - name: Run clippy with coconut enabled
        uses: actions-rs/cargo@v1
@@ -45,7 +45,7 @@ jobs:
          RUSTFLAGS: '-C link-arg=-s'
        with:
          command: build
-          args: --manifest-path contracts/Cargo.toml --all --target wasm32-unknown-unknown
+          args: --manifest-path contracts/Cargo.toml --workspace --target wasm32-unknown-unknown

      - uses: actions-rs/cargo@v1
        with:
@@ -61,4 +61,4 @@ jobs:
        if: ${{ matrix.rust != 'nightly' }}
        with:
          command: clippy
-          args: --manifest-path contracts/Cargo.toml --all -- -D warnings
+          args: --manifest-path contracts/Cargo.toml --workspace -- -D warnings
@@ -16,8 +16,9 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: '14'
-      - run: npm install
+          node-version: '16'
+      - name: Setup yarn
+        run: npm install -g yarn
      - name: Run ESLint
        # GitHub should automatically annotate the PR
-        run: npm run lint
+        run: yarn && yarn lint
@@ -19,14 +19,17 @@ jobs:
    - uses: rlespinasse/github-slug-action@v3.x
    - uses: actions/setup-node@v2
      with:
-        node-version: '14'
-    - run: npm install
+        node-version: '16'
+    - name: Setup yarn
+      run: npm install -g yarn
      continue-on-error: true
+    - name: Build shared packages
+      run: cd .. && yarn && yarn build
    - name: Set environment from the example
      run: cp .env.prod .env
-    - run: npm run test
-      continue-on-error: true
-    - run: npm run build
+#    - run: yarn test
+#      continue-on-error: true
+    - run: yarn && yarn build
      continue-on-error: true
    - name: Deploy branch to CI www
      continue-on-error: true
@@ -42,13 +42,13 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --all
+          args: --workspace

      - name: Run all tests
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all
+          args: --workspace

      - name: Check formatting
        uses: actions-rs/cargo@v1
@@ -56,6 +56,12 @@ jobs:
          command: fmt
          args: --all -- --check

+      - name: Reclaim some disk space (because Windows is being annoying)
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.os == 'windows-latest' }}
+        with:
+          command: clean
+
      - uses: actions-rs/clippy-check@v1
        name: Clippy checks
        with:
@@ -67,33 +73,28 @@ jobs:
        if: ${{ matrix.rust != 'nightly' }}
        with:
          command: clippy
-          args: -- -D warnings
+          args: --workspace --all-targets -- -D warnings

-#        COCONUT stuff
-      - name: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean

+      # COCONUT stuff
      - name: Build all binaries with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --all --features=coconut
+          args: --workspace --features=coconut

      - name: Run all tests with coconut enabled
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all --features=coconut
+          args: --workspace --features=coconut

      - name: Run clippy with coconut enabled
        uses: actions-rs/cargo@v1
        if: ${{ matrix.rust != 'nightly' }}
        with:
          command: clippy
-          args: --features=coconut -- -D warnings
+          args: --workspace --all-targets --features=coconut -- -D warnings
  notification:
    needs: build
    runs-on: ubuntu-latest
@@ -0,0 +1,43 @@
+name: Publish Nym binaries
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-nym:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Check the release tag starts with `nym-binaries-`
+        if: startsWith(github.ref, 'refs/tags/nym-binaries-') == false
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-binaries-...')
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build all binaries
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace --release
+
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
+            target/release/nym-socks5-client
+            target/release/nym-validator-api
@@ -0,0 +1,71 @@
+name: Publish Nym Wallet (Windows 10)
+on:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-wallet
+
+jobs:
+  publish-tauri:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [windows10]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Clean up first
+        continue-on-error: true
+        working-directory: .
+        run: |
+          cd ..
+          del /s /q /A:H nym
+          rmdir /s /q nym
+
+      - uses: actions/checkout@v3
+
+      - name: Check the release tag starts with `nym-wallet-`
+        if: startsWith(github.ref, 'refs/tags/nym-wallet-') == false
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-wallet-...')
+
+      - name: Import signing certificate
+        env:
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+        run: |
+          New-Item -ItemType directory -Path certificate
+          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
+          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
+          Remove-Item -path certificate -include tempCert.txt
+          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
+
+      - name: Node v16
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install app dependencies
+        run: yarn
+
+      - name: Build and sign it
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+        run: yarn build
+
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        with:
+          files: nym-wallet/target/release/bundle/msi/*.msi
@@ -1,32 +0,0 @@
-name: Generate TS types
-
-on:
-  push:
-    paths-ignore:
-      - "explorer/**"
-  pull_request:
-    paths-ignore:
-      - "explorer/**"
-
-jobs:
-  nym-wallet-types:
-    runs-on: [ self-hosted, custom-linux-exoscale ]
-    # Enable sccache
-    env:
-      RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
-    if: ${{ github.event_name != 'pull_request' }}
-    steps:
-      - name: Prepare
-        run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libatk1.0-dev libgdk-pixbuf2.0-dev libsoup2.4-dev librust-gdk-dev libwebkit2gtk-4.0-dev
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Generate TS
-        run: cd nym-wallet/src-tauri && cargo test
-      - uses: EndBug/add-and-commit@v7.2.1 # https://github.com/marketplace/actions/add-commit
-        with:
-          add: '["nym-wallet"]'
-          message: "[ci skip] Generate TS types"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -3,7 +3,7 @@ require('dotenv').config();
 const Bot = require('keybase-bot');

 let context = {
-  kinds: ['network-explorer', 'nightly'],
+  kinds: ['ts-packages', 'network-explorer', 'nightly'],
 };

 /**
@@ -0,0 +1,29 @@
+const Handlebars = require('handlebars');
+const fs = require('fs');
+const path = require('path');
+
+async function addToContextAndValidate(context) {
+  if (!context.env.NYM_CI_WWW_LOCATION) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
+  }
+  if (!context.env.NYM_CI_WWW_BASE) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
+  }
+}
+
+async function getMessageBody(context) {
+  const source = fs
+    .readFileSync(
+      context.env.IS_SUCCESS === 'true'
+        ? path.resolve(__dirname, 'templates', 'success')
+        : path.resolve(__dirname, 'templates', 'failure'),
+    )
+    .toString();
+  const template = Handlebars.compile(source);
+  return template(context);
+}
+
+module.exports = {
+  addToContextAndValidate,
+  getMessageBody,
+};
@@ -0,0 +1,11 @@
+🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
+> :rocket: {{ env.NYM_PROJECT_NAME }}
+> 🔴 **FAILURE** :cry:
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
+Commit message:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -0,0 +1,16 @@
+🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
+> :rocket: {{ env.NYM_PROJECT_NAME }}
+> ✅ **SUCCESS**
+
+> ➡️➡️➡️➡️➡️ **View output:**
+> `storybook`: https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}
+> `example`: https://{{ env.NYM_CI_WWW_LOCATION }}-example.{{ env.NYM_CI_WWW_BASE }}
+
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
+Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -35,4 +35,6 @@ contracts/mixnet/Justfile
 contracts/mixnet/Makefile
 validator-config
 *.patch
-validator-api-config.toml
+validator-api-config.toml
+dist
+storybook-static
@@ -0,0 +1,6 @@
+{
+  "mainnet":[{
+    "nymd_url":"https://rpc.nyx.nodes.guru/",
+    "api_url":"https://api.nyx.nodes.guru/"
+  }]
+}
@@ -17,7 +17,7 @@ members = [
    "clients/native",
    "clients/native/websocket-requests",
    "clients/socks5",
-    "clients/tauri-client/src-tauri",
+    # "clients/tauri-client/src-tauri",
    "common/client-libs/gateway-client",
    "common/client-libs/mixnet-client",
    "common/client-libs/validator-client",
@@ -1,9 +1,10 @@
 test: build clippy-all cargo-test wasm fmt
+no-clippy: build cargo-test wasm fmt
 happy: fmt clippy-happy test
 clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet
 clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet
 cargo-test: test-main test-contracts test-wallet
-build: build-main build-contracts build-wallet
+build: build-contracts build-wallet build-main
 fmt: fmt-main fmt-contracts fmt-wallet

 clippy-happy-main:
@@ -12,20 +13,20 @@ clippy-happy-main:
 clippy-happy-contracts:
 	cargo clippy --manifest-path contracts/Cargo.toml --target wasm32-unknown-unknown

-clippy-happy-wallet: 
+clippy-happy-wallet:
 	cargo clippy --manifest-path nym-wallet/Cargo.toml

 clippy-all-main:
-	cargo clippy --all-features -- -D warnings 
+	cargo clippy --workspace --all-features -- -D warnings

 clippy-all-contracts:
-	cargo clippy --manifest-path contracts/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings
+	cargo clippy --workspace --manifest-path contracts/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings

-clippy-all-wallet: 
-	cargo clippy --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings
+clippy-all-wallet:
+	cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings

 test-main:
-	cargo test --all-features
+	cargo test --all-features --workspace

 test-contracts:
 	cargo test --manifest-path contracts/Cargo.toml --all-features
@@ -34,13 +35,13 @@ test-wallet:
 	cargo test --manifest-path nym-wallet/Cargo.toml --all-features

 build-main:
-	cargo build --all
+	cargo build --workspace

 build-contracts:
-	cargo build --manifest-path contracts/Cargo.toml --all
+	cargo build --manifest-path contracts/Cargo.toml --workspace

 build-wallet:
-	cargo build --manifest-path nym-wallet/Cargo.toml --all
+	cargo build --manifest-path nym-wallet/Cargo.toml --workspace

 fmt-main:
 	cargo fmt --all
@@ -28,6 +28,8 @@ Wallet build instructions are also available on [our docs site](https://nymtech.

 There's a `.env.sample-dev` file provided which you can rename to `.env` if you want convenient logging, backtrace, or other environment variables pre-set. The `.env` file is ignored so you don't need to worry about checking it in.

+For Typescript components, please see [ts-packages](./ts-packages).
+
 ### Developer chat

 You can chat to us in [Keybase](https://keybase.io). Download their chat app, then click **Teams -> Join a team**. Type **nymtech.friends** into the team name and hit **continue**. For general chat, hang out in the **#general** channel. Our development takes places in the **#dev** channel. Node operators should be in the **#node-operators** channel.
@@ -0,0 +1,12 @@
+# Shared assets
+
+This directory contains asset files shared by many projects in this repo.
+
+You will find:
+
+- favicons
+- logos
+- shared fonts
+- shared icon SVGs
+
+See [ts-packages/react-webpack-with-theme-example](../ts-packages/react-webpack-with-theme-example) for examples of usage.
@@ -0,0 +1,10 @@
+<svg width="64" height="64" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path d="M40 78.5C61.263 78.5 78.5 61.263 78.5 40C78.5 18.737 61.263 1.5 40 1.5C18.737 1.5 1.5 18.737 1.5 40C1.5 61.263 18.737 78.5 40 78.5Z" fill="#070B15" stroke="url(#paint0_linear_0_1)" stroke-width="3"/>
+	<path d="M31.4894 27.56L41.8623 56H48.5106H56V24H48.5106V52.4L38.1777 24H31.4894H24V56H31.4894V27.56Z" fill="white"/>
+	<defs>
+		<linearGradient id="paint0_linear_0_1" x1="0.839161" y1="80" x2="80" y2="80" gradientUnits="userSpaceOnUse">
+			<stop offset="0.09375" stop-color="#FB6E4E"/>
+			<stop offset="1" stop-color="#F51473"/>
+		</linearGradient>
+	</defs>
+</svg>
@@ -0,0 +1,6 @@
+@font-face {
+    font-family: 'Open Sans';
+    src: url('./OpenSans-VariableFont_wdth,wght.ttf') format('truetype-variations'),
+    url('./OpenSans-Italic-VariableFont_wdth,wght.ttf') format('truetype-variations');
+    font-weight: 100 1000;
+}
@@ -0,0 +1,10 @@
+<svg width="64" height="64" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M40 78.5C61.263 78.5 78.5 61.263 78.5 40C78.5 18.737 61.263 1.5 40 1.5C18.737 1.5 1.5 18.737 1.5 40C1.5 61.263 18.737 78.5 40 78.5Z" fill="#070B15" stroke="url(#paint0_linear_0_1)" stroke-width="3"/>
+    <path d="M31.4894 27.56L41.8623 56H48.5106H56V24H48.5106V52.4L38.1777 24H31.4894H24V56H31.4894V27.56Z" fill="white"/>
+    <defs>
+        <linearGradient id="paint0_linear_0_1" x1="0.839161" y1="80" x2="80" y2="80" gradientUnits="userSpaceOnUse">
+            <stop offset="0.09375" stop-color="#FB6E4E"/>
+            <stop offset="1" stop-color="#F51473"/>
+        </linearGradient>
+    </defs>
+</svg>
@@ -0,0 +1,13 @@
+<svg width="300" height="300" viewBox="0 0 296 296" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M148 296C229.738 296 296 229.738 296 148C296 66.2619 229.738 0 148 0C66.2619 0 0 66.2619 0 148C0 229.738 66.2619 296 148 296Z" fill="url(#paint0_linear_113_1244)"/>
+    <path d="M148 285.875C224.147 285.875 285.875 224.146 285.875 148C285.875 71.8536 224.147 10.1248 148 10.1248C71.8538 10.1248 10.125 71.8536 10.125 148C10.125 224.146 71.8538 285.875 148 285.875Z" fill="#121725"/>
+    <path d="M88.8829 120.143H88.7169V120.281V168.637L68.3289 120.226L68.3012 120.143H68.1905H56.6272H43.653H43.5146V120.281V175.719V175.857H43.653H56.6272H56.7655V175.719V127.28L77.2365 175.774L77.2642 175.857H77.3748H88.8829H101.829H101.968V175.719V120.281V120.143H101.829H88.8829Z" fill="white"/>
+    <path d="M252.347 120.143H227.616H227.477L227.45 120.253L214.78 168.858L202.082 120.253L202.054 120.143H201.944H177.157H176.991V120.281V175.719V175.857H177.157H190.104H190.242V175.719V127.667L202.774 175.747L202.801 175.857H202.94H226.564H226.675L226.703 175.747L239.234 127.667V175.719V175.857H239.373H252.347H252.485V175.719V120.281V120.143H252.347Z" fill="white"/>
+    <path d="M155.663 120.143H155.58L155.552 120.198L139.812 147.557L123.988 120.198L123.96 120.143H123.877H108.911H108.635L108.773 120.364L133.145 162.579V175.719V175.857H133.283H146.257H146.396V175.719V162.579L170.767 120.364L170.905 120.143H170.629H155.663Z" fill="white"/>
+    <defs>
+        <linearGradient id="paint0_linear_113_1244" x1="0" y1="148" x2="296" y2="148" gradientUnits="userSpaceOnUse">
+            <stop offset="0.09375" stop-color="#FB6E4E"/>
+            <stop offset="1" stop-color="#FC1D60"/>
+        </linearGradient>
+    </defs>
+</svg>
@@ -0,0 +1,5 @@
+<svg width="210" height="56" viewBox="0 0 210 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M45.8829 0.142822H45.7169V0.28114V48.637L25.3289 0.225818L25.3012 0.142822H25.1905H13.6272H0.652966H0.514648V0.28114V55.7189V55.8572H0.652966H13.6272H13.7655V55.7189V7.28002L34.2365 55.7742L34.2642 55.8572H34.3748H45.8829H58.8294H58.9677V55.7189V0.28114V0.142822H58.8294H45.8829Z"/>
+    <path d="M209.347 0.142822H184.616H184.477L184.45 0.253483L171.78 48.8583L159.082 0.253483L159.054 0.142822H158.944H134.157H133.991V0.28114V55.7189V55.8572H134.157H147.104H147.242V55.7189V7.66731L159.774 55.7466L159.801 55.8572H159.94H183.564H183.675L183.703 55.7466L196.234 7.66731V55.7189V55.8572H196.373H209.347H209.485V55.7189V0.28114V0.142822H209.347Z"/>
+    <path d="M112.663 0.142822H112.58L112.552 0.198153L96.8116 27.5574L80.988 0.198153L80.9604 0.142822H80.8774H65.9114H65.6348L65.7731 0.364136L90.1447 42.5787V55.7189V55.8572H90.283H103.257H103.396V55.7189V42.5787L127.767 0.364136L127.905 0.142822H127.629H112.663Z"/>
+</svg>
@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="white"/>
+    <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="#070B15"/>
+    <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="white"/>
+</svg>
@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="#141521"/>
+    <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="white"/>
+    <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="#141521"/>
+</svg>
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "0.12.0"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -1,10 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crypto::generic_array::typenum::Unsigned;
 use log::*;
 use nymsphinx::anonymous_replies::{
-    encryption_key::EncryptionKeyDigest, encryption_key::Unsigned, SurbEncryptionKey,
-    SurbEncryptionKeySize,
+    encryption_key::EncryptionKeyDigest, SurbEncryptionKey, SurbEncryptionKeySize,
 };
 use std::path::Path;

@@ -43,7 +43,7 @@ impl ReplyKeyStorage {
        // if this fails it means we have some database corruption and we
        // absolutely can't continue

-        if key_bytes_ref.len() != SurbEncryptionKeySize::to_usize() {
+        if key_bytes_ref.len() != SurbEncryptionKeySize::USIZE {
            error!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
            panic!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
        }
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 rust-version = "1.56"
@@ -18,14 +18,12 @@
  "author": "Dave Hrycyszyn",
  "license": "Apache-2.0",
  "devDependencies": {
-    "autoprefixer": "^10.2.6",
-    "clean-webpack-plugin": "^3.0.0",
-    "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0"
+    "clean-webpack-plugin": "^4.0.0",
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.4"
  },
  "dependencies": {
-    "core-js": "^3.6.5",
-    "html-webpack-plugin": "^4.2.0"
+    "html-webpack-plugin": "^5.5.0"
  }
 }
@@ -1,9 +1,9 @@
-const autoprefixer = require('autoprefixer');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');

 module.exports = {
+    mode: 'production',
    entry: './src/index.js',
    output: {
        filename: 'bundle.js',
@@ -18,7 +18,7 @@ module.exports = {
        })
    ],
    devServer: {
-        contentBase: path.join(__dirname, 'dist'),
+        static: path.join(__dirname, 'dist'),
        compress: true,
        port: 8888
    }
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "0.12.1"
+version = "1.0.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.56"
@@ -1,5 +0,0 @@
-.DS_Store
-/node_modules/
-/src/node_modules/@sapper/
-yarn-error.log
-/__sapper__/
@@ -1,33 +0,0 @@
-## Prerequisites
-
-On Ubuntu-ish systems (not tested on Debian but may work):
-
-```
-sudo apt update && sudo apt install libwebkit2gtk-4.0-dev \
-    build-essential \
-    curl \
-    wget \
-    libssl-dev \
-    libgtk-3-dev \
-    libappindicator3-dev \
-    patchelf \
-    librsvg2-dev```
-
-
-
-## Getting started
-
-1. Start Sapper([docs](https://sapper.svelte.dev/docs/)) -> `yarn run dev`
-2. Start Tauri([docs](https://tauri.studio/en/)) in another terminal -> `yarn tauri dev`
-3. Start validator-api locally, or override `validator-urls` in `index.svelte`
-
-## Getting around
-
-+ Frontend -> `tauri-client/`
-  + logic -> `tauri-client/src/routes/index.svelte`
-  + assets -> `tauri-client/static`
-+ Backend -> `tauri-client/src/src-tauri`
-
-## Build standalone app
-
-+ yarn tauri build [--debug]
@@ -1,38 +0,0 @@
-{
-  "name": "TODO",
-  "description": "TODO",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "sapper dev",
-    "build": "sapper build --legacy",
-    "export": "sapper export --legacy",
-    "start": "node __sapper__/build"
-  },
-  "dependencies": {
-    "@tauri-apps/api": "^1.0.0-beta.4",
-    "compression": "^1.7.1",
-    "polka": "next",
-    "qrious": "^4.0.2",
-    "sirv": "^1.0.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "@rollup/plugin-babel": "^5.0.0",
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.0.0",
-    "@rollup/plugin-replace": "^2.4.0",
-    "@rollup/plugin-url": "^5.0.0",
-    "@tauri-apps/cli": "^1.0.0-beta.5",
-    "rollup": "^2.3.4",
-    "rollup-plugin-svelte": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "sapper": "^0.28.0",
-    "sass": "^1.35.2",
-    "svelte": "^3.17.3",
-    "svelte-preprocess": "^4.7.4"
-  }
-}
@@ -1,140 +0,0 @@
-import path from "path";
-import resolve from "@rollup/plugin-node-resolve";
-import replace from "@rollup/plugin-replace";
-import commonjs from "@rollup/plugin-commonjs";
-import url from "@rollup/plugin-url";
-import svelte from "rollup-plugin-svelte";
-import babel from "@rollup/plugin-babel";
-import { terser } from "rollup-plugin-terser";
-import config from "sapper/config/rollup.js";
-import pkg from "./package.json";
-import sveltePreprocess from "svelte-preprocess";
-
-const mode = process.env.NODE_ENV;
-const dev = mode === "development";
-const legacy = !!process.env.SAPPER_LEGACY_BUILD;
-
-const onwarn = (warning, onwarn) =>
-  (warning.code === "MISSING_EXPORT" && /'preload'/.test(warning.message)) ||
-  (warning.code === "CIRCULAR_DEPENDENCY" &&
-    /[/\\]@sapper[/\\]/.test(warning.message)) ||
-  onwarn(warning);
-
-export default {
-  client: {
-    input: config.client.input(),
-    output: config.client.output(),
-    plugins: [
-      replace({
-        preventAssignment: true,
-        values: {
-          "process.browser": true,
-          "process.env.NODE_ENV": JSON.stringify(mode),
-        },
-      }),
-      svelte({
-        compilerOptions: {
-          dev,
-          hydratable: true,
-        },
-        preprocess: sveltePreprocess(),
-      }),
-      url({
-        sourceDir: path.resolve(__dirname, "src/node_modules/images"),
-        publicPath: "/client/",
-      }),
-      resolve({
-        browser: true,
-        dedupe: ["svelte"],
-      }),
-      commonjs(),
-
-      legacy &&
-        babel({
-          extensions: [".js", ".mjs", ".html", ".svelte"],
-          babelHelpers: "runtime",
-          exclude: ["node_modules/@babel/**"],
-          presets: [
-            [
-              "@babel/preset-env",
-              {
-                targets: "> 0.25%, not dead",
-              },
-            ],
-          ],
-          plugins: [
-            "@babel/plugin-syntax-dynamic-import",
-            [
-              "@babel/plugin-transform-runtime",
-              {
-                useESModules: true,
-              },
-            ],
-          ],
-        }),
-
-      !dev &&
-        terser({
-          module: true,
-        }),
-    ],
-
-    preserveEntrySignatures: false,
-    onwarn,
-  },
-
-  server: {
-    input: config.server.input(),
-    output: config.server.output(),
-    plugins: [
-      replace({
-        preventAssignment: true,
-        values: {
-          "process.browser": false,
-          "process.env.NODE_ENV": JSON.stringify(mode),
-        },
-      }),
-      svelte({
-        compilerOptions: {
-          dev,
-          generate: "ssr",
-          hydratable: true,
-        },
-        emitCss: false,
-      }),
-      url({
-        sourceDir: path.resolve(__dirname, "src/node_modules/images"),
-        publicPath: "/client/",
-        emitFiles: false, // already emitted by client build
-      }),
-      resolve({
-        dedupe: ["svelte"],
-      }),
-      commonjs(),
-    ],
-    external: Object.keys(pkg.dependencies).concat(
-      require("module").builtinModules
-    ),
-    preserveEntrySignatures: "strict",
-    onwarn,
-  },
-
-  serviceworker: {
-    input: config.serviceworker.input(),
-    output: config.serviceworker.output(),
-    plugins: [
-      resolve(),
-      replace({
-        preventAssignment: true,
-        values: {
-          "process.browser": true,
-          "process.env.NODE_ENV": JSON.stringify(mode),
-        },
-      }),
-      commonjs(),
-      !dev && terser(),
-    ],
-    preserveEntrySignatures: false,
-    onwarn,
-  },
-};
@@ -1,304 +0,0 @@
-/**
- * Run this script to convert the project to TypeScript. This is only guaranteed to work
- * on the unmodified default template; if you have done code changes you are likely need
- * to touch up the generated project manually.
- */
-
-// @ts-check
-const fs = require('fs');
-const path = require('path');
-const { argv } = require('process');
-
-const projectRoot = argv[2] || path.join(__dirname, '..');
-
-const isRollup = fs.existsSync(path.join(projectRoot, "rollup.config.js"));
-
-function warn(message) {
-	console.warn('Warning: ' + message);
-}
-
-function replaceInFile(fileName, replacements) {
-	if (fs.existsSync(fileName)) {
-		let contents = fs.readFileSync(fileName, 'utf8');
-		let hadUpdates = false;
-
-		replacements.forEach(([from, to]) => {
-			const newContents = contents.replace(from, to);
-
-			const isAlreadyApplied = typeof to !== 'string' || contents.includes(to);
-
-			if (newContents !== contents) {
-				contents = newContents;
-				hadUpdates = true;
-			} else if (!isAlreadyApplied) {
-				warn(`Wanted to update "${from}" in ${fileName}, but did not find it.`);
-			}
-		});
-
-		if (hadUpdates) {
-			fs.writeFileSync(fileName, contents);
-		} else {
-			console.log(`${fileName} had already been updated.`);
-		}
-	} else {
-		warn(`Wanted to update ${fileName} but the file did not exist.`);
-	}
-}
-
-function createFile(fileName, contents) {
-	if (fs.existsSync(fileName)) {
-		warn(`Wanted to create ${fileName}, but it already existed. Leaving existing file.`);
-	} else {
-		fs.writeFileSync(fileName, contents);
-	}
-}
-
-function addDepsToPackageJson() {
-	const pkgJSONPath = path.join(projectRoot, 'package.json');
-	const packageJSON = JSON.parse(fs.readFileSync(pkgJSONPath, 'utf8'));
-	packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, {
-		...(isRollup ? { '@rollup/plugin-typescript': '^6.0.0' } : { 'ts-loader': '^8.0.4' }),
-		'@tsconfig/svelte': '^1.0.10',
-		'@types/compression': '^1.7.0',
-		'@types/node': '^14.11.1',
-		'@types/polka': '^0.5.1',
-		'svelte-check': '^1.0.46',
-		'svelte-preprocess': '^4.3.0',
-		tslib: '^2.0.1',
-		typescript: '^4.0.3'
-	});
-
-	// Add script for checking
-	packageJSON.scripts = Object.assign(packageJSON.scripts, {
-		validate: 'svelte-check --ignore src/node_modules/@sapper'
-	});
-
-	// Write the package JSON
-	fs.writeFileSync(pkgJSONPath, JSON.stringify(packageJSON, null, '  '));
-}
-
-function changeJsExtensionToTs(dir) {
-	const elements = fs.readdirSync(dir, { withFileTypes: true });
-
-	for (let i = 0; i < elements.length; i++) {
-		if (elements[i].isDirectory()) {
-			changeJsExtensionToTs(path.join(dir, elements[i].name));
-		} else if (elements[i].name.match(/^[^_]((?!json).)*js$/)) {
-			fs.renameSync(path.join(dir, elements[i].name), path.join(dir, elements[i].name).replace('.js', '.ts'));
-		}
-	}
-}
-
-function updateSingleSvelteFile({ view, vars, contextModule }) {
-	replaceInFile(path.join(projectRoot, 'src', `${view}.svelte`), [
-		[/(?:<script)(( .*?)*?)>/gm, (m, attrs) => `<script${attrs}${!attrs.includes('lang="ts"') ? ' lang="ts"' : ''}>`],
-		...(vars ? vars.map(({ name, type }) => [`export let ${name};`, `export let ${name}: ${type};`]) : []),
-		...(contextModule ? contextModule.map(({ js, ts }) => [js, ts]) : [])
-	]);
-}
-
-// Switch the *.svelte file to use TS
-function updateSvelteFiles() {
-	[
-		{
-			view: 'components/Nav',
-			vars: [{ name: 'segment', type: 'string' }]
-		},
-		{
-			view: 'routes/_layout',
-			vars: [{ name: 'segment', type: 'string' }]
-		},
-		{
-			view: 'routes/_error',
-			vars: [
-				{ name: 'status', type: 'number' },
-				{ name: 'error', type: 'Error' }
-			]
-		},
-		{
-			view: 'routes/blog/index',
-			vars: [{ name: 'posts', type: '{ slug: string; title: string, html: any }[]' }],
-			contextModule: [
-				{
-					js: '.then(r => r.json())',
-					ts: '.then((r: { json: () => any; }) => r.json())'
-				},
-				{
-					js: '.then(posts => {',
-					ts: '.then((posts: { slug: string; title: string, html: any }[]) => {'
-				}
-			]
-		},
-		{
-			view: 'routes/blog/[slug]',
-			vars: [{ name: 'post', type: '{ slug: string; title: string, html: any }' }]
-		}
-	].forEach(updateSingleSvelteFile);
-}
-
-function updateRollupConfig() {
-	// Edit rollup config
-	replaceInFile(path.join(projectRoot, 'rollup.config.js'), [
-		// Edit imports
-		[
-			/'rollup-plugin-terser';\n(?!import sveltePreprocess)/,
-			`'rollup-plugin-terser';
-import sveltePreprocess from 'svelte-preprocess';
-import typescript from '@rollup/plugin-typescript';
-`
-		],
-		// Edit inputs
-		[
-			/(?<!THIS_IS_UNDEFINED[^\n]*\n\s*)onwarn\(warning\);/,
-			`(warning.code === 'THIS_IS_UNDEFINED') ||\n\tonwarn(warning);`
-		],
-		[/input: config.client.input\(\)(?!\.replace)/, `input: config.client.input().replace(/\\.js$/, '.ts')`],
-		[
-			/input: config.server.input\(\)(?!\.replace)/,
-			`input: { server: config.server.input().server.replace(/\\.js$/, ".ts") }`
-		],
-		[
-			/input: config.serviceworker.input\(\)(?!\.replace)/,
-			`input: config.serviceworker.input().replace(/\\.js$/, '.ts')`
-		],
-		// Add preprocess
-		[/compilerOptions/g, 'preprocess: sveltePreprocess({ sourceMap: dev }),\n\t\t\t\tcompilerOptions'],
-		// Add TypeScript
-		[/commonjs\(\)(?!,\n\s*typescript)/g, 'commonjs(),\n\t\t\ttypescript({ sourceMap: dev })']
-	]);
-}
-
-function updateWebpackConfig() {
-	// Edit webpack config
-	replaceInFile(path.join(projectRoot, 'webpack.config.js'), [
-		// Edit imports
-		[
-			/require\('webpack-modules'\);\n(?!const sveltePreprocess)/,
-			`require('webpack-modules');\nconst sveltePreprocess = require('svelte-preprocess');\n`
-		],
-		// Edit extensions
-		[
-			/\['\.mjs', '\.js', '\.json', '\.svelte', '\.html'\]/,
-			`['.mjs', '.js', '.ts', '.json', '.svelte', '.html']`
-		],
-		// Edit entries
-		[
-			/entry: config\.client\.entry\(\)/,
-			`entry: { main: config.client.entry().main.replace(/\\.js$/, '.ts') }`
-		],
-		[
-			/entry: config\.server\.entry\(\)/,
-			`entry: { server: config.server.entry().server.replace(/\\.js$/, '.ts') }`
-		],
-		[
-			/entry: config\.serviceworker\.entry\(\)/,
-			`entry: { 'service-worker': config.serviceworker.entry()['service-worker'].replace(/\\.js$/, '.ts') }`
-		],
-		[
-      /loader: 'svelte-loader',\n\t\t\t\t\t\toptions: {/g,
-      'loader: \'svelte-loader\',\n\t\t\t\t\t\toptions: {\n\t\t\t\t\t\t\tpreprocess: sveltePreprocess({ sourceMap: dev }),'
-    ],
-		// Add TypeScript rules for client and server
-		[
-			/module: {\n\s*rules: \[\n\s*(?!{\n\s*test: \/\\\.ts\$\/)/g,
-			`module: {\n\t\t\trules: [\n\t\t\t\t{\n\t\t\t\t\ttest: /\\.ts$/,\n\t\t\t\t\tloader: 'ts-loader'\n\t\t\t\t},\n\t\t\t\t`
-		],
-		// Add TypeScript rules for serviceworker
-		[
-			/output: config\.serviceworker\.output\(\),\n\s*(?!module)/,
-			`output: config.serviceworker.output(),\n\t\tmodule: {\n\t\t\trules: [\n\t\t\t\t{\n\t\t\t\t\ttest: /\\.ts$/,\n\t\t\t\t\tloader: 'ts-loader'\n\t\t\t\t}\n\t\t\t]\n\t\t},\n\t\t`
-		],
-		// Edit outputs
-		[
-			/output: config\.serviceworker\.output\(\),\n\s*(?!resolve)/,
-			`output: config.serviceworker.output(),\n\t\tresolve: { extensions: ['.mjs', '.js', '.ts', '.json'] },\n\t\t`
-		]
-	]);
-}
-
-function updateServiceWorker() {
-	replaceInFile(path.join(projectRoot, 'src', 'service-worker.ts'), [
-		[`shell.concat(files);`, `(shell as string[]).concat(files as string[]);`],
-		[`self.skipWaiting();`, `((self as any) as ServiceWorkerGlobalScope).skipWaiting();`],
-		[`self.clients.claim();`, `((self as any) as ServiceWorkerGlobalScope).clients.claim();`],
-		[`fetchAndCache(request)`, `fetchAndCache(request: Request)`],
-		[`self.addEventListener('activate', event =>`, `self.addEventListener('activate', (event: ExtendableEvent) =>`],
-		[`self.addEventListener('install', event =>`, `self.addEventListener('install', (event: ExtendableEvent) =>`],
-		[`addEventListener('fetch', event =>`, `addEventListener('fetch', (event: FetchEvent) =>`],
-	]);
-}
-
-function createTsConfig() {
-	const tsconfig = `{
-		"extends": "@tsconfig/svelte/tsconfig.json",
-		"compilerOptions": {
-			"lib": ["DOM", "ES2017", "WebWorker"]
-		},
-		"include": ["src/**/*", "src/node_modules/**/*"],
-		"exclude": ["node_modules/*", "__sapper__/*", "static/*"]
-	}`;
-
-	createFile(path.join(projectRoot, 'tsconfig.json'), tsconfig);
-}
-
-// Adds the extension recommendation
-function configureVsCode() {
-	const dir = path.join(projectRoot, '.vscode');
-
-	if (!fs.existsSync(dir)) {
-		fs.mkdirSync(dir);
-	}
-
-	createFile(path.join(projectRoot, '.vscode', 'extensions.json'), `{"recommendations": ["svelte.svelte-vscode"]}`);
-}
-
-function deleteThisScript() {
-	fs.unlinkSync(path.join(__filename));
-
-	// Check for Mac's DS_store file, and if it's the only one left remove it
-	const remainingFiles = fs.readdirSync(path.join(__dirname));
-	if (remainingFiles.length === 1 && remainingFiles[0] === '.DS_store') {
-		fs.unlinkSync(path.join(__dirname, '.DS_store'));
-	}
-
-	// Check if the scripts folder is empty
-	if (fs.readdirSync(path.join(__dirname)).length === 0) {
-		// Remove the scripts folder
-		fs.rmdirSync(path.join(__dirname));
-	}
-}
-
-console.log(`Adding TypeScript with ${isRollup ? "Rollup" : "webpack" }...`);
-
-addDepsToPackageJson();
-
-changeJsExtensionToTs(path.join(projectRoot, 'src'));
-
-updateSvelteFiles();
-
-if (isRollup) {
-	updateRollupConfig();
-} else {
-	updateWebpackConfig();
-}
-
-updateServiceWorker();
-
-createTsConfig();
-
-configureVsCode();
-
-// Delete this script, but not during testing
-if (!argv[2]) {
-	deleteThisScript();
-}
-
-console.log('Converted to TypeScript.');
-
-if (fs.existsSync(path.join(projectRoot, 'node_modules'))) {
-	console.log(`
-Next:
-1. run 'npm install' again to install TypeScript dependencies
-2. run 'npm run build' for the @sapper imports in your project to work
-`);
-}
@@ -1,4 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-WixTools
@@ -1,30 +0,0 @@
-[package]
-name = "app"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
-default-run = "app"
-edition = "2021"
-build = "src/build.rs"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-tauri-build = { version = "1.0.0-beta.2" }
-
-[dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.0.0-beta.4", features = [] }
-tokio = "1.4"
-url = "2.2"
-
-coconut-interface = { path = "../../../common/coconut-interface" }
-credentials = { path = "../../../common/credentials" }
-validator-client = {path = "../../../common/client-libs/validator-client"}
-
-[features]
-default = ["custom-protocol"]
-custom-protocol = ["tauri/custom-protocol"]
@@ -1,13 +0,0 @@
-max_width = 100
-hard_tabs = false
-tab_spaces = 2
-newline_style = "Auto"
-use_small_heuristics = "Default"
-reorder_imports = true
-reorder_modules = true
-remove_nested_parens = true
-edition = "2018"
-merge_derives = true
-use_try_shorthand = false
-use_field_init_shorthand = false
-force_explicit_abi = true
@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}
@@ -1,211 +0,0 @@
-#![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
-)]
-
-use std::sync::Arc;
-
-use tokio::sync::RwLock;
-use url::Url;
-
-use coconut_interface::{
-  self, hash_to_scalar, Attribute, Credential, Parameters, Signature, Theta, VerificationKey,
-};
-use credentials::{obtain_aggregate_signature, obtain_aggregate_verification_key};
-
-struct State {
-  signatures: Vec<Signature>,
-  n_attributes: u32,
-  params: Parameters,
-  serial_number: Attribute,
-  binding_number: Attribute,
-  voucher_value: Attribute,
-  voucher_info: Attribute,
-  aggregated_verification_key: Option<VerificationKey>,
-}
-
-impl State {
-  fn init(public_attributes_bytes: Vec<Vec<u8>>, private_attributes_bytes: Vec<Vec<u8>>) -> State {
-    let n_attributes = (public_attributes_bytes.len() + private_attributes_bytes.len()) as u32;
-    let params = Parameters::new(n_attributes).unwrap();
-    let public_attributes = public_attributes_bytes
-      .iter()
-      .map(hash_to_scalar)
-      .collect::<Vec<Attribute>>();
-    let private_attributes = private_attributes_bytes
-      .iter()
-      .map(hash_to_scalar)
-      .collect::<Vec<Attribute>>();
-    State {
-      signatures: Vec::new(),
-      n_attributes,
-      params,
-      serial_number: private_attributes[0],
-      binding_number: private_attributes[1],
-      voucher_value: public_attributes[0],
-      voucher_info: public_attributes[1],
-      aggregated_verification_key: None,
-    }
-  }
-}
-
-fn parse_url_validators(raw: &[String]) -> Result<Vec<Url>, String> {
-  let mut parsed_urls = Vec::with_capacity(raw.len());
-  for url in raw {
-    let parsed_url: Url = url
-      .parse()
-      .map_err(|err| format!("one of validator urls is malformed - {}", err))?;
-    parsed_urls.push(parsed_url)
-  }
-  Ok(parsed_urls)
-}
-
-#[tauri::command]
-async fn randomise_credential(
-  idx: usize,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<Vec<Signature>, String> {
-  let mut state = state.write().await;
-  let signature = state.signatures.remove(idx);
-  let (new_signature, _) = signature.randomise(&state.params);
-  state.signatures.insert(idx, new_signature);
-  Ok(state.signatures.clone())
-}
-
-#[tauri::command]
-async fn delete_credential(
-  idx: usize,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<Vec<Signature>, String> {
-  let mut state = state.write().await;
-  state.signatures.remove(idx);
-  Ok(state.signatures.clone())
-}
-
-#[tauri::command]
-async fn list_credentials(
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<Vec<Signature>, String> {
-  let state = state.read().await;
-  Ok(state.signatures.clone())
-}
-
-async fn get_aggregated_verification_key(
-  validator_urls: Vec<String>,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<VerificationKey, String> {
-  if let Some(verification_key) = &state.read().await.aggregated_verification_key {
-    return Ok(verification_key.clone());
-  }
-
-  let parsed_urls = parse_url_validators(&validator_urls)?;
-  let key = obtain_aggregate_verification_key(&parsed_urls)
-    .await
-    .map_err(|err| format!("failed to obtain aggregate verification key - {:?}", err))?;
-
-  state
-    .write()
-    .await
-    .aggregated_verification_key
-    .replace(key.clone());
-
-  Ok(key)
-}
-
-async fn prove_credential(
-  idx: usize,
-  validator_urls: Vec<String>,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<Theta, String> {
-  let verification_key = get_aggregated_verification_key(validator_urls, state.clone()).await?;
-  let state = state.read().await;
-
-  if let Some(signature) = state.signatures.get(idx) {
-    match coconut_interface::prove_bandwidth_credential(
-      &state.params,
-      &verification_key,
-      signature,
-      state.serial_number,
-      state.binding_number,
-    ) {
-      Ok(theta) => Ok(theta),
-      Err(e) => Err(format!("{:?}", e)),
-    }
-  } else {
-    Err("Got invalid Signature idx".to_string())
-  }
-}
-
-#[tauri::command]
-async fn verify_credential(
-  idx: usize,
-  validator_urls: Vec<String>,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<bool, String> {
-  // the API needs to be improved but at least it should compile (in theory)
-  let verification_key =
-    get_aggregated_verification_key(validator_urls.clone(), state.clone()).await?;
-  let theta = prove_credential(idx, validator_urls, state.clone()).await?;
-
-  let state = state.read().await;
-
-  let public_attributes_bytes = vec![
-    state.voucher_value.to_bytes().to_vec(),
-    state.voucher_info.to_bytes().to_vec(),
-  ];
-
-  let credential = Credential::new(
-    state.n_attributes,
-    theta,
-    public_attributes_bytes,
-    state
-      .signatures
-      .get(idx)
-      .ok_or("Got invalid signature idx")?,
-  );
-
-  Ok(credential.verify(&verification_key))
-}
-
-#[tauri::command]
-async fn get_credential(
-  validator_urls: Vec<String>,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<Vec<Signature>, String> {
-  let guard = state.read().await;
-  let parsed_urls = parse_url_validators(&validator_urls)?;
-  let public_attributes = vec![guard.voucher_value, guard.voucher_info];
-  let private_attributes = vec![guard.serial_number, guard.binding_number];
-
-  let signature = obtain_aggregate_signature(
-    &guard.params,
-    &public_attributes,
-    &private_attributes,
-    &parsed_urls,
-  )
-  .await
-  .map_err(|err| format!("failed to obtain aggregate signature - {:?}", err))?;
-
-  let mut state = state.write().await;
-  state.signatures.push(signature);
-  Ok(state.signatures.clone())
-}
-
-fn main() {
-  let public_attributes = vec![b"public_key".to_vec()];
-  let private_attributes = vec![b"private_key".to_vec()];
-  tauri::Builder::default()
-    .manage(Arc::new(RwLock::new(State::init(
-      public_attributes,
-      private_attributes,
-    ))))
-    .invoke_handler(tauri::generate_handler![
-      get_credential,
-      randomise_credential,
-      delete_credential,
-      list_credentials,
-      verify_credential
-    ])
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
-}
@@ -1,65 +0,0 @@
-{
-  "package": {
-    "productName": "nym-tauri-client",
-    "version": "0.1.0"
-  },
-  "build": {
-    "distDir": "../__sapper__/export",
-    "devPath": "http://localhost:3000",
-    "beforeDevCommand": "",
-    "beforeBuildCommand": "yarn run export"
-  },
-  "tauri": {
-    "bundle": {
-      "active": true,
-      "targets": "all",
-      "identifier": "com.tauri.dev",
-      "icon": [
-        "icons/32x32.png",
-        "icons/128x128.png",
-        "icons/128x128@2x.png",
-        "icons/icon.icns",
-        "icons/icon.ico"
-      ],
-      "resources": [],
-      "externalBin": [],
-      "copyright": "",
-      "category": "DeveloperTool",
-      "shortDescription": "",
-      "longDescription": "",
-      "deb": {
-        "depends": [],
-        "useBootstrapper": false
-      },
-      "macOS": {
-        "frameworks": [],
-        "minimumSystemVersion": "",
-        "useBootstrapper": false,
-        "exceptionDomain": "",
-        "signingIdentity": null,
-        "entitlements": null
-      },
-      "windows": {
-        "certificateThumbprint": null,
-        "digestAlgorithm": "sha256",
-        "timestampUrl": ""
-      }
-    },
-    "updater": {
-      "active": false
-    },
-    "allowlist": {},
-    "windows": [
-      {
-        "title": "Nym Client",
-        "width": 800,
-        "height": 1000,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ],
-    "security": {
-      "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
-    }
-  }
-}
@@ -1,39 +0,0 @@
-/**
- * These declarations tell TypeScript that we allow import of images, e.g.
- * ```
-		<script lang='ts'>
-			import successkid from 'images/successkid.jpg';
-		</script>
-
-		<img src="{successkid}">
-	 ```
- */
-declare module "*.gif" {
-	const value: string;
-	export default value;
-}
-
-declare module "*.jpg" {
-	const value: string;
-	export default value;
-}
-
-declare module "*.jpeg" {
-	const value: string;
-	export default value;
-}
-
-declare module "*.png" {
-	const value: string;
-	export default value;
-}
-
-declare module "*.svg" {
-	const value: string;
-	export default value;
-}
-
-declare module "*.webp" {
-	const value: string;
-	export default value;
-}
@@ -1,5 +0,0 @@
-import * as sapper from '@sapper/app';
-
-sapper.start({
-	target: document.querySelector('#sapper')
-});
@@ -1,3 +0,0 @@
-<nav>
-	<img src="coconut-120.png" style="width: 120px" alt=""/>
-</nav>
@@ -1,40 +0,0 @@
-<script>
-	export let status;
-	export let error;
-
-	const dev = process.env.NODE_ENV === 'development';
-</script>
-
-<style>
-	h1, p {
-		margin: 0 auto;
-	}
-
-	h1 {
-		font-size: 2.8em;
-		font-weight: 700;
-		margin: 0 0 0.5em 0;
-	}
-
-	p {
-		margin: 1em auto;
-	}
-
-	@media (min-width: 480px) {
-		h1 {
-			font-size: 4em;
-		}
-	}
-</style>
-
-<svelte:head>
-	<title>{status}</title>
-</svelte:head>
-
-<h1>{status}</h1>
-
-<p>{error.message}</p>
-
-{#if dev && error.stack}
-	<pre>{error.stack}</pre>
-{/if}
@@ -1,22 +0,0 @@
-<script>
-	import Nav from '../components/Nav.svelte';
-
-	// export let segment;
-</script>
-
-<style>
-	main {
-		position: relative;
-		max-width: 56em;
-		/* background-color: white; */
-		padding: 2em;
-		margin: 0 auto;
-		box-sizing: border-box;
-	}
-</style>
-
-<Nav />
-
-<main>
-	<slot></slot>
-</main>
@@ -1,119 +0,0 @@
-<script>
-  import {invoke} from "@tauri-apps/api/tauri";
-  import {onMount} from "svelte";
-  import QRious from "qrious";
-
-  const validator_urls = ["http://localhost:8080"];
-  let signatures = [];
-  let qrVisible = false;
-
-  async function getCredential() {
-    signatures = await invoke("get_credential", {
-      validatorUrls: validator_urls,
-    });
-  }
-
-  async function randomiseCredential(idx) {
-    signatures = await invoke("randomise_credential", {
-      idx: idx,
-    });
-  }
-
-  async function verifyCredential(idx) {
-    const response = await invoke("verify_credential", {
-      idx: idx,
-      validatorUrls: validator_urls,
-    });
-    alert(response);
-  }
-
-  async function deleteCredential(idx) {
-    signatures = await invoke("delete_credential", {
-      idx: idx,
-    });
-  }
-
-  async function listCredentials() {
-    signatures = await invoke("list_credentials");
-  }
-
-  function signatureQR(idx) {
-    qrVisible = true;
-    const signature = signatures[idx];
-    new QRious({
-      element: document.getElementById("qr"),
-      value: signature,
-      foreground: "white",
-      background: "black",
-      size: 148,
-    });
-  }
-
-  onMount(() => {
-    listCredentials();
-  });
-</script>
-
-<svelte:head>
-  <title>Coconut</title>
-</svelte:head>
-
-<button class="btn btn-success" on:click={getCredential}>Get Credential</button>
-<hr />
-<table class="table table-dark">
-  {#each signatures as signature, idx}
-    <tr>
-      <td><p>{signature.slice(0, 12)}</p></td>
-      <td>
-        <div class="btn-group" role="group" aria-label="Basic example">
-          <button
-            class="btn btn-primary"
-            on:click={() => {
-              randomiseCredential(idx);
-            }}>Randomize</button
-          ><button
-            class="btn btn-danger"
-            on:click={() => {
-              deleteCredential(idx);
-            }}>Delete</button
-          >
-          <button
-            class="btn btn-info"
-            on:click={() => {
-              signatureQR(idx);
-            }}>QR</button
-          >
-          <button
-            class="btn btn-primary"
-            on:click={() => {
-              verifyCredential(idx);
-            }}>Verify</button
-          >
-        </div></td
-      >
-    </tr>
-  {/each}
-</table>
-
-<div
-  class="modal"
-  tabindex="-1"
-  style={qrVisible ? "display: block" : "display: none"}
->
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-      <div class="modal-body">
-        <canvas id="qr"></canvas>
-        <button
-          type="button"
-          class="close"
-          on:click={() => (qrVisible = false)}
-        >
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- <div><br /></div> -->
@@ -1,17 +0,0 @@
-import sirv from 'sirv';
-import polka from 'polka';
-import compression from 'compression';
-import * as sapper from '@sapper/server';
-
-const { PORT, NODE_ENV } = process.env;
-const dev = NODE_ENV === 'development';
-
-polka() // You can also use Express
-	.use(
-		compression({ threshold: 0 }),
-		sirv('static', { dev }),
-		sapper.middleware()
-	)
-	.listen(PORT, err => {
-		if (err) console.log('error', err);
-	});
@@ -1,86 +0,0 @@
-import { timestamp, files, shell } from '@sapper/service-worker';
-
-const ASSETS = `cache${timestamp}`;
-
-// `shell` is an array of all the files generated by the bundler,
-// `files` is an array of everything in the `static` directory
-const to_cache = shell.concat(files);
-const staticAssets = new Set(to_cache);
-
-self.addEventListener('install', event => {
-	event.waitUntil(
-		caches
-			.open(ASSETS)
-			.then(cache => cache.addAll(to_cache))
-			.then(() => {
-				self.skipWaiting();
-			})
-	);
-});
-
-self.addEventListener('activate', event => {
-	event.waitUntil(
-		caches.keys().then(async keys => {
-			// delete old caches
-			for (const key of keys) {
-				if (key !== ASSETS) await caches.delete(key);
-			}
-
-			self.clients.claim();
-		})
-	);
-});
-
-
-/**
- * Fetch the asset from the network and store it in the cache. 
- * Fall back to the cache if the user is offline.
- */
-async function fetchAndCache(request) {
-	const cache = await caches.open(`offline${timestamp}`)
-
-	try {
-		const response = await fetch(request);
-		cache.put(request, response.clone());
-		return response;
-	} catch (err) {
-		const response = await cache.match(request);
-		if (response) return response;
-
-		throw err;
-	}
-}
-
-self.addEventListener('fetch', event => {
-	if (event.request.method !== 'GET' || event.request.headers.has('range')) return;
-
-	const url = new URL(event.request.url);
-
-	// don't try to handle e.g. data: URIs
-	const isHttp = url.protocol.startsWith('http');
-	const isDevServerRequest = url.hostname === self.location.hostname && url.port !== self.location.port;
-	const isStaticAsset = url.host === self.location.host && staticAssets.has(url.pathname);
-	const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset;
-
-	if (isHttp && !isDevServerRequest && !skipBecauseUncached) {
-		event.respondWith(
-			(async () => {
-				// always serve static files and bundler-generated assets from cache.
-				// if your application has other URLs with data that will never change,
-				// set this variable to true for them and they will only be fetched once.
-				const cachedAsset = isStaticAsset && await caches.match(event.request);
-
-				// for pages, you might want to serve a shell `service-worker-index.html` file,
-				// which Sapper has generated for you. It's not right for every
-				// app, but if it's right for yours then uncomment this section
-				/*
-				if (!cachedAsset && url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) {
-					return caches.match('/service-worker-index.html');
-				}
-				*/
-
-				return cachedAsset || fetchAndCache(event.request);
-			})()
-		);
-	}
-});
@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-
-	%sapper.base%
-
-	<link rel="stylesheet" href="stylesheets/bootstrap.min.css">
-	<link rel="stylesheet" href="stylesheets/bootstrap-grid.min.css">
-	<link rel="stylesheet" href="stylesheets/bootstrap-reboot.min.css"> 
-	<link rel="stylesheet" href="stylesheets/bundle.min.css">
-	<link rel="manifest" href="manifest.json" crossorigin="use-credentials">
-	<link rel="icon" type="image/png" href="favicon.png">
-	<link rel="apple-touch-icon" href="logo-192.png">
-
-	<!-- Sapper creates a <script> tag containing `src/client.js`
-	     and anything else it needs to hydrate the app and
-	     initialise the router -->
-	%sapper.scripts%
-
-	<!-- Sapper generates a <style> tag containing critical CSS
-	     for the current page. CSS for the rest of the app is
-	     lazily loaded when it precaches secondary pages -->
-	%sapper.styles%
-
-	<!-- This contains the contents of the <svelte:head> component, if
-	     the current page has one -->
-	%sapper.head%
-</head>
-<body>
-	<!-- The application will be rendered inside this element,
-	     because `src/client.js` references it -->
-	<div id="sapper">%sapper.html%</div>
-</body>
-</html>
--- a/Show More
+++ b/Show More