Added #[serde(default)] on fields we dont care about anymore

.github/CODEOWNERS

@@ -15,8 +15,8 @@
 * @futurechimp @mmsinclair
 
 # Rust rules:
-*.rs @durch @futurechimp @jstuczyn @neacsu @octol
-Cargo.* @durch @futurechimp @jstuczyn @neacsu @octol
+*.rs @durch @futurechimp @jstuczyn @neacsu
+Cargo.* @durch @futurechimp @jstuczyn @neacsu
 
 # JS rules:
 *.js @mmsinclair @fmtabbara @Aid19801

.github/workflows/build-ts-packages.yml

@@ -1,63 +0,0 @@
-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

.github/workflows/build.yml

@@ -9,14 +9,28 @@ on:
       - 'explorer/**'
 
 jobs:
+  matrix_prep:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from build_matrix_includes.json
+      - uses: actions/checkout@v2
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/build_matrix_includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
   build:
-    runs-on: [ self-hosted, custom-linux-exoscale ]
-    # Enable sccache via environment variable
-    env:
-      RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
+    needs: matrix_prep
+    strategy:
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.os == 'windows-latest' }}
     steps:
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
+        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
+        if: matrix.os == 'ubuntu-latest'
 
       - name: Check out repository code
         uses: actions/checkout@v2
@@ -25,7 +39,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ matrix.rust }}
           override: true
           components: rustfmt, clippy
 
@@ -33,13 +47,13 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --workspace
+          args: --all
 
       - name: Run all tests
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --all-features
+          args: --all
 
       - name: Check formatting
         uses: actions-rs/cargo@v1
@@ -49,30 +63,40 @@ jobs:
 
       - uses: actions-rs/clippy-check@v1
         name: Clippy checks
+#        if: matrix.os == 'ubuntu-latest' && matrix.rust == 'stable'
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all-features
 
       - name: Run clippy
         uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust != 'nightly' }}
         with:
           command: clippy
-          args: --workspace -- -D warnings
+          args: -- -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
 
       - name: Build all binaries with coconut enabled
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --workspace --features=coconut
+          args: --all --features=coconut
 
       - name: Run all tests with coconut enabled
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --features=coconut
+          args: --all --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: --features=coconut -- -D warnings

.github/workflows/build_matrix_includes.json

@@ -10,10 +10,41 @@
     "rust":"stable",
     "runOnEvent":"pull_request"
   },
-
   {
     "os":"macos-latest",
     "rust":"stable",
     "runOnEvent":"pull_request"
+  },
+
+  {
+    "os":"ubuntu-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"windows-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"macos-latest",
+    "rust":"beta",
+    "runOnEvent":"pull_request"
+  },
+
+  {
+    "os":"ubuntu-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"windows-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
+  },
+  {
+    "os":"macos-latest",
+    "rust":"nightly",
+    "runOnEvent":"pull_request"
   }
-]
+]

.github/workflows/contracts.yml

@@ -45,7 +45,7 @@ jobs:
           RUSTFLAGS: '-C link-arg=-s'
         with:
           command: build
-          args: --manifest-path contracts/Cargo.toml --workspace --target wasm32-unknown-unknown
+          args: --manifest-path contracts/Cargo.toml --all --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 --workspace -- -D warnings
+          args: --manifest-path contracts/Cargo.toml --all -- -D warnings

.github/workflows/network-explorer-lint.yml

@@ -16,9 +16,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
-      - name: Setup yarn
-        run: npm install -g yarn
+          node-version: '14'
+      - run: npm install
       - name: Run ESLint
         # GitHub should automatically annotate the PR
-        run: yarn && yarn lint
+        run: npm run lint

.github/workflows/network-explorer.yml

@@ -19,17 +19,14 @@ jobs:
     - uses: rlespinasse/github-slug-action@v3.x
     - uses: actions/setup-node@v2
       with:
-        node-version: '16'
-    - name: Setup yarn
-      run: npm install -g yarn
+        node-version: '14'
+    - run: npm install
       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: yarn test
-#      continue-on-error: true
-    - run: yarn && yarn build
+    - run: npm run test
+      continue-on-error: true
+    - run: npm run build
       continue-on-error: true
     - name: Deploy branch to CI www
       continue-on-error: true
@@ -44,10 +41,9 @@ jobs:
         EXCLUDE: "/dist/, /node_modules/"
     - name: Keybase - Node Install
       run: npm install
-      working-directory: .github/workflows/support-files
+      working-directory: .github/workflows/support-files/messages
     - name: Keybase - Send Notification
       env:
-        NYM_NOTIFICATION_KIND: network-explorer
         NYM_PROJECT_NAME: "Network Explorer"
         NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
         NYM_CI_WWW_LOCATION: "network-explorer-${{ env.GITHUB_REF_SLUG }}"
@@ -60,4 +56,4 @@ jobs:
         IS_SUCCESS: "${{ job.status == 'success' }}"
       uses: docker://keybaseio/client:stable-node
       with:
-        args: .github/workflows/support-files/notifications/entry_point.sh
+        args: .github/workflows/support-files/messages/entry_point_notifications.sh

.github/workflows/nightly_build.yml

@@ -1,125 +0,0 @@
-name: Nightly builds
-
-on:
-  schedule:
-    - cron: '14 4 * * *'
-jobs:
-  matrix_prep:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      # creates the matrix strategy from nightly_build_matrix_includes.json
-      - uses: actions/checkout@v2
-      - id: set-matrix
-        uses: JoshuaTheMiller/conditional-build-matrix@main
-        with:
-          inputFile: '.github/workflows/nightly_build_matrix_includes.json'
-          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
-  build:
-    needs: matrix_prep
-    strategy:
-      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable' }}
-    steps:
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
-
-      - name: Check out repository code
-        uses: actions/checkout@v2
-
-      - name: Install rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: rustfmt, clippy
-
-      - name: Build all binaries
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --workspace
-
-      - name: Run all tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          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:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
-
-      - name: Run clippy
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != 'nightly' }}
-        with:
-          command: clippy
-          args: --workspace --all-targets -- -D warnings
-
-
-      # COCONUT stuff
-      - name: Build all binaries with coconut enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --workspace --features=coconut
-
-      - name: Run all tests with coconut enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --features=coconut
-
-      - name: Run clippy with coconut enabled
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != 'nightly' }}
-        with:
-          command: clippy
-          args: --workspace --all-targets --features=coconut -- -D warnings
-  notification:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Collect jobs status
-        uses: technote-space/workflow-conclusion-action@v2
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Keybase - Node Install
-        if: env.WORKFLOW_CONCLUSION == 'failure'
-        run: npm install
-        working-directory: .github/workflows/support-files
-      - name: Keybase - Send Notification
-        if: env.WORKFLOW_CONCLUSION == 'failure'
-        env:
-          NYM_NOTIFICATION_KIND: nightly
-          NYM_PROJECT_NAME: "Nym nightly build"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          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-nightly"
-          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
-        uses: docker://keybaseio/client:stable-node
-        with:
-          args: .github/workflows/support-files/notifications/entry_point.sh

.github/workflows/nightly_build_matrix_includes.json

@@ -1,50 +0,0 @@
-[
-  {
-    "os":"ubuntu-latest",
-    "rust":"stable",
-    "runOnEvent":"schedule"
-  },
-
-  {
-    "os":"windows-latest",
-    "rust":"stable",
-    "runOnEvent":"schedule"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"stable",
-    "runOnEvent":"schedule"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"beta",
-    "runOnEvent":"schedule"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"beta",
-    "runOnEvent":"schedule"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"beta",
-    "runOnEvent":"schedule"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"nightly",
-    "runOnEvent":"schedule"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"nightly",
-    "runOnEvent":"schedule"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"nightly",
-    "runOnEvent":"schedule"
-  }
-]

.github/workflows/nym-wallet-publish-macos.yml

@@ -1,77 +0,0 @@
-name: Publish Nym Wallet (MacOS)
-on:
-  release:
-    types: [created]
-
-defaults:
-  run:
-    working-directory: nym-wallet
-
-jobs:
-  publish-tauri:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-latest]
-
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - 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: 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 the Apple developer certificate for code signing
-        env:
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$APPLE_CERTIFICATE" | base64 --decode --output $CERTIFICATE_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-      - name: Install app dependencies and build it
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-        run: yarn && yarn build
-
-      - name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        with:
-          files: nym-wallet/target/release/bundle/dmg/*.dmg
-
-      - name: Clean up keychain
-        if: ${{ always() }}
-        run: |
-          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db

.github/workflows/nym-wallet-publish-ubuntu.yml

@@ -1,46 +0,0 @@
-name: Publish Nym Wallet (Ubuntu)
-on:
-  release:
-    types: [created]
-
-defaults:
-  run:
-    working-directory: nym-wallet
-
-jobs:
-  publish-tauri:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest]
-
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Tauri dependencies
-        run: >
-          sudo apt-get update &&
-          sudo apt-get install -y webkit2gtk-4.0
-      - 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: 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 and build it
-        run: yarn && yarn build
-
-      - name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        with:
-          files: nym-wallet/target/release/bundle/appimage/*.AppImage

.github/workflows/nym-wallet-publish.yml

@@ -0,0 +1,12 @@
+name: Publish Nym Wallet
+on:
+  push:
+    tags:
+      - nym-wallet-*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run a one-line script
+        run: echo Hello, world!

.github/workflows/nym-wallet-types.yml

@@ -0,0 +1,29 @@
+name: Generate TS types
+
+on:
+  push:
+    paths-ignore:
+      - "explorer/**"
+  pull_request:
+    paths-ignore:
+      - "explorer/**"
+
+jobs:
+  nym-wallet-types:
+    runs-on: ubuntu-latest
+    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 }}

.github/workflows/support-files/.env.example

@@ -1,35 +0,0 @@
-KEYBASE_NYM_CHANNEL=
-KEYBASE_NYMBOT_USERNAME=
-KEYBASE_NYMBOT_PAPERKEY=
-
-NYM_NOTIFICATION_KIND=nightly
-NYM_PROJECT_NAME=Nightly Build
-
-#----------------------------------------------------------------
-# Custom GitHub Actions mock env vars
-IS_SUCCESS=true
-
-#----------------------------------------------------------------
-# GitHub Actions context mock env vars
-GITHUB_SHA=abcdef
-GITHUB_RUN_ID=123456
-GITHUB_REPOSITORY=nymtech/nym
-GITHUB_SERVER_URL=https://github.com
-GIT_BRANCH_NAME=feature/testing-support-files
-GIT_BRANCH=feature/testing-support-files
-GIT_COMMIT_MESSAGE=This is the commit message
-GITHUB_ACTOR=octocat
-
-# add a Personal Access Token (PAT) generated from GitHub here for use in testing
-GITHUB_TOKEN=
-
-#----------------------------------------------------------------
-# Network Explorer
-NYM_CI_WWW_LOCATION=some-branch
-NYM_CI_WWW_BASE=example.com
-
-#----------------------------------------------------------------
-# Nightly builds
-WORKFLOW_CONCLUSION=success
-
-SHOW_DEBUG=true

.github/workflows/support-files/.gitignore

@@ -1,5 +0,0 @@
-node_modules
-.idea
-
-# don't commit the lock file to avoid cross-platform issues
-package-lock.json

.github/workflows/support-files/.nvmrc

@@ -1 +0,0 @@
-16

.github/workflows/support-files/README.md

@@ -1,58 +0,0 @@
-# GitHub Actions Support Files
-
-This is a collection of scripts and files to support GitHub Actions.
-
-## Sending Notifications
-
-These scripts send CI notifications to Keybase by creating messages from templates and env vars passed from GitHub Actions.
-
-### Adding notifications to a GitHub Action
-
-```
-jobs:
-  build:
-    ...
-    - name: Notifications - Node Install
-      run: npm install
-      working-directory: .github/workflows/support-files/notifications
-    - name: Notifications - Send
-      env:
-        NYM_NOTIFICATION_KIND: "my-component"
-        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-network-explorer"
-        IS_SUCCESS: "${{ job.status == 'success' }}"
-      uses: docker://keybaseio/client:stable-node
-      with:
-        args: .github/workflows/support-files/notifications/entry_point.sh
-```
-
-Notifications are run by adding the snippet above to a GitHub Action, and:
-
-1. Installing node packages needed at run time
-2. Set the env vars as required:
-    - `NYM_NOTIFICATION_KIND` matches the directory in `.github/workflows/support-files/${NYM_NOTIFICATION_KIND}` to provide the templates and extra scripting in `index.js`
-    - Keybase credentials, channel and other env vars for the status of the build and repo
-3. Replacing the default entry point shell script on the `keybaseio/client:stable-node` docker image to run `.github/workflows/support-files/notifications/entry_point.sh` 
-
-### Running locally
-
-You will need:
-- Node 16 LTS
-- npm
-
-Copy `.github/workflows/support-files/.env.example` to `.github/workflows/support-files/.env` and valid Keybase credentials.
-
-Then run `npm install` to get dependencies.
-
-Start development mode for the notification type you want either by passing the value as an env var called `NYM_NOTIFICATION_KIND` or set the `.env` file values correctly.
-
-```bash
-cd .github/workflows/support-files
-npm install
-cp .env.example .env
-vi .env
-npm run dev
-```

.github/workflows/support-files/dev.js

@@ -1 +0,0 @@
-require('./notifications/send_message');

.github/workflows/support-files/messages/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.idea

.github/workflows/support-files/messages/package.json

@@ -4,14 +4,11 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "node dev.js",
-    "format": "prettier --write **/*.js"
+    "format": "prettier --write send_message.js"
   },
   "dependencies": {
-    "dotenv": "^16.0.0",
     "handlebars": "^4.7.7",
-    "keybase-bot": "^3.6.1",
-    "octokit": "^1.7.1"
+    "keybase-bot": "^3.6.1"
   },
   "devDependencies": {
     "prettier": "2.3.2"

.github/workflows/support-files/messages/send_message.js

@@ -0,0 +1,69 @@
+const Bot = require('keybase-bot');
+const Handlebars = require('handlebars');
+const fs = require('fs');
+
+async function main() {
+  const data = { env: process.env };
+  // const data = { ...PASTE TEST DATA HERE ... }; // -- DEV: uncomment to set test data
+
+  // validation of environment
+  if(!(process.env.NYM_PROJECT_NAME || data.env.NYM_PROJECT_NAME)) {
+    throw new Error('Please set env var NYM_PROJECT_NAME with the project name for displaying in notification messages');
+  }
+  const keybaseChannel = process.env.KEYBASE_NYM_CHANNEL || data.env.KEYBASE_NYM_CHANNEL;
+  if(!keybaseChannel) {
+    throw new Error('Please set env var KEYBASE_NYM_CHANNEL with the channel name for the notification message');
+  }
+
+  // extract the git branch name
+  const GIT_BRANCH_NAME = (process.env.GITHUB_REF || data.env.GITHUB_REF).split('/').slice(2).join('/');
+
+  data.env.GIT_BRANCH_NAME = GIT_BRANCH_NAME;
+  const source = fs
+    .readFileSync(process.env.IS_SUCCESS === 'true' ? 'success' : 'failure')
+    .toString();
+  const template = Handlebars.compile(source);
+  const result = template(data);
+
+  // -- DEV: uncomment to show what is available in the handlebars template / show the result
+  // console.dir({ data }, { depth: null });
+  // console.log(result);
+
+  const bot = new Bot();
+  try {
+    const username = process.env.KEYBASE_NYMBOT_USERNAME;
+    const paperkey = process.env.KEYBASE_NYMBOT_PAPERKEY;
+
+    if(!username) {
+      throw new Error('Username is not defined. Please set env var KEYBASE_NYMBOT_USERNAME');
+    }
+    if(!paperkey) {
+      throw new Error('Paperkey is not defined. Please set env var KEYBASE_NYMBOT_PAPERKEY');
+    }
+
+    console.log(`Initialising keybase with user "${username}" and key: "${'*'.repeat(paperkey.length)}"...`);
+    await bot.init(username, paperkey, { verbose: false });
+
+    const channel = {
+      name: 'nymtech_bot',
+      membersType: 'team',
+      topicName: keybaseChannel,
+      topic_type: 'CHAT',
+    };
+    const message = {
+      body: result,
+    };
+
+    console.log(`Sending to ${channel.name}#${channel.topicName}...`);
+    await bot.chat.send(channel, message);
+
+    console.log('Message sent!');
+  } catch (error) {
+    console.error(error);
+    process.exitCode = -1;
+  } finally {
+    await bot.deinit();
+  }
+}
+
+main();

.github/workflows/support-files/messages/success

@@ -5,7 +5,7 @@
 > `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 }}:
+Commit message:
 ```
 {{ env.GIT_COMMIT_MESSAGE }}
 ```

.github/workflows/support-files/network-explorer/index.js

@@ -1,29 +0,0 @@
-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,
-};

.github/workflows/support-files/nightly/index.js

@@ -1,162 +0,0 @@
-const Handlebars = require('handlebars');
-const fs = require('fs');
-const path = require('path');
-const { Octokit, App } = require('octokit');
-
-async function addToContextAndValidate(context) {
-  if (!context.env.WORKFLOW_CONCLUSION) {
-    throw new Error('Please ensure the env var WORKFLOW_CONCLUSION is set');
-  }
-  if (!context.env.GITHUB_TOKEN) {
-    throw new Error('Please ensure the env var GITHUB_TOKEN is set');
-  }
-  if (!context.env.GITHUB_RUN_ID) {
-    throw new Error('Please ensure the env var GITHUB_RUN_ID is set');
-  }
-  if (!context.env.GITHUB_REPOSITORY) {
-    throw new Error('Please ensure the env var GITHUB_REPOSITORY is set');
-  }
-}
-
-async function getMessageBody(context) {
-  const source = fs
-    .readFileSync(
-      context.env.WORKFLOW_CONCLUSION === 'success'
-        ? path.resolve(__dirname, 'templates', 'success')
-        : path.resolve(__dirname, 'templates', 'failure'),
-    )
-    .toString();
-  const template = Handlebars.compile(source);
-
-  // get job details from GitHub API
-  const octokit = new Octokit({ auth: context.env.GITHUB_TOKEN });
-  const [owner, repo] = context.env.GITHUB_REPOSITORY.split('/');
-  const {
-    data: { jobs },
-  } = await octokit.rest.actions.listJobsForWorkflowRun({
-    run_id: context.env.GITHUB_RUN_ID,
-    owner,
-    repo,
-  });
-
-  // uncomment this to see what is available for each job
-  if(process.env.SHOW_DEBUG) {
-    console.dir(jobs, { depth: null });
-  }
-
-  /*
-
-   a sample of the response is:
-
-    {
-      total_count: 10,
-      jobs: [
-        {
-          id: 5182940024,
-          run_id: 1840752095,
-          run_url: 'https://api.github.com/repos/nymtech/nym/actions/runs/1840752095',
-          run_attempt: 1,
-          node_id: 'CR_kwDODdjOis8AAAABNO1jeA',
-          head_sha: 'aa00eb70d57751bfa556bd3602df87c7473367fc',
-          url: 'https://api.github.com/repos/nymtech/nym/actions/jobs/5182940024',
-          html_url: 'https://github.com/nymtech/nym/runs/5182940024?check_suite_focus=true',
-          status: 'completed',
-          conclusion: 'success',
-          started_at: '2022-02-14T11:28:34Z',
-          completed_at: '2022-02-14T11:28:38Z',
-          name: 'matrix_prep',
-          steps: [
-            {
-              name: 'Set up job',
-              status: 'completed',
-              conclusion: 'success',
-              number: 1,
-              started_at: '2022-02-14T13:28:34.000+02:00',
-              completed_at: '2022-02-14T13:28:36.000+02:00'
-            },
-            {
-              name: 'Run actions/checkout@v2',
-              status: 'completed',
-              conclusion: 'success',
-              number: 2,
-              started_at: '2022-02-14T13:28:36.000+02:00',
-              completed_at: '2022-02-14T13:28:37.000+02:00'
-            },
-            ...
-          ],
-          check_run_url: 'https://api.github.com/repos/nymtech/nym/check-runs/5182940024',
-          labels: [ 'ubuntu-latest' ],
-          runner_id: 1,
-          runner_name: 'Hosted Agent',
-          runner_group_id: 2,
-          runner_group_name: 'GitHub Actions'
-        },
-        {
-          id: 5182943473,
-          run_id: 1840752095,
-          run_url: 'https://api.github.com/repos/nymtech/nym/actions/runs/1840752095',
-          run_attempt: 1,
-          node_id: 'CR_kwDODdjOis8AAAABNO1w8Q',
-          head_sha: 'aa00eb70d57751bfa556bd3602df87c7473367fc',
-          url: 'https://api.github.com/repos/nymtech/nym/actions/jobs/5182943473',
-          html_url: 'https://github.com/nymtech/nym/runs/5182943473?check_suite_focus=true',
-          status: 'completed',
-          conclusion: 'failure',
-          started_at: '2022-02-14T11:29:04Z',
-          completed_at: '2022-02-14T11:55:45Z',
-          name: 'build (macos-latest, stable, schedule)',
-          steps: [
-            {
-              name: 'Set up job',
-              status: 'completed',
-              conclusion: 'success',
-              number: 1,
-              started_at: '2022-02-14T13:29:04.000+02:00',
-              completed_at: '2022-02-14T13:29:26.000+02:00'
-            },
-            {
-              name: 'Install Dependencies (Linux)',
-              status: 'completed',
-              conclusion: 'skipped',
-              number: 2,
-              started_at: '2022-02-14T13:29:26.000+02:00',
-              completed_at: '2022-02-14T13:29:26.000+02:00'
-            },
-            {
-              name: 'Keybase - Send Notification',
-              status: 'completed',
-              conclusion: 'failure',
-              number: 15,
-              started_at: '2022-02-14T13:55:44.000+02:00',
-              completed_at: '2022-02-14T13:55:44.000+02:00'
-            },
-          ],
-          check_run_url: 'https://api.github.com/repos/nymtech/nym/check-runs/5182943473',
-          labels: [ 'macos-latest' ],
-          runner_id: 4,
-          runner_name: 'GitHub Actions 4',
-          runner_group_id: 2,
-          runner_group_name: 'GitHub Actions'
-        },
-        ...
-      ]
-    }
-   */
-
-  const jobResults = jobs
-    .map((job) => {
-      const icon = job.conclusion === 'success' ? '🟩' : '🟥';
-
-      // each job is converted into formatted markdown text
-      return `${icon} ${job.conclusion}: ${job.name} - ${job.html_url}`;
-    })
-    // and join with newlines for display in the template
-    .join('\n');
-
-  return template({ ...context, jobResults });
-}
-
-module.exports = {
-  addToContextAndValidate,
-  getMessageBody,
-};

.github/workflows/support-files/nightly/templates/failure

@@ -1,9 +0,0 @@
-🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
-> :rocket: {{ env.NYM_PROJECT_NAME }}
-> 🔴 **FAILURE** :cry:
-> `when` {{ timestamp }}
-> `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 }}
-
-{{ jobResults }}

.github/workflows/support-files/nightly/templates/success

@@ -1,9 +0,0 @@
-🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
-> :rocket: {{ env.NYM_PROJECT_NAME }}
-> ✅ **SUCCESS**
-> `when` {{ timestamp }}
-> `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 }}
-
-{{ jobResults }}

.github/workflows/support-files/notifications/send_message.js

@@ -1,153 +0,0 @@
-require('dotenv').config();
-
-const Bot = require('keybase-bot');
-
-let context = {
-  kinds: ['ts-packages', 'network-explorer', 'nightly'],
-};
-
-/**
- * Validate that all required env and context vars are available
- */
-function validateContext() {
-  if (!context.env.NYM_NOTIFICATION_KIND) {
-    throw new Error(
-      'Please set env var NYM_NOTIFICATION_KIND with the project kind that matches a directory in ".github/workflows/support-files"',
-    );
-  }
-  if (!context.kinds.includes(context.env.NYM_NOTIFICATION_KIND)) {
-    throw new Error(`Env var NYM_NOTIFICATION_KIND is not in ${context.kinds}`);
-  }
-  if (!context.env.NYM_PROJECT_NAME) {
-    throw new Error(
-      'Please set env var NYM_PROJECT_NAME with the project name for displaying in notification messages',
-    );
-  }
-  if (!context.env.KEYBASE_NYM_CHANNEL) {
-    throw new Error(
-      'Please set env var KEYBASE_NYM_CHANNEL with the channel name for the notification message',
-    );
-  }
-  if (!context.env.KEYBASE_NYMBOT_USERNAME) {
-    throw new Error(
-      'Username is not defined. Please set env var KEYBASE_NYMBOT_USERNAME',
-    );
-  }
-  if (!context.env.KEYBASE_NYMBOT_PAPERKEY) {
-    throw new Error(
-      'Paperkey is not defined. Please set env var KEYBASE_NYMBOT_PAPERKEY',
-    );
-  }
-}
-
-/**
- * Creates a context that will be available in the templates for rendering notifications
- */
-function createTemplateContext() {
-  const options = { dateStyle: 'full', timeStyle: 'long' };
-  context.timestamp = new Date().toLocaleString(undefined, options);
-
-  // add environment to template context and validate
-  context.env = process.env;
-  try {
-    validateContext();
-  } catch (e) {
-    if(process.env.SHOW_DEBUG) {
-      // recursively print the context for easy debugging and rethrow the error
-      console.dir({ context }, { depth: null });
-    }
-    throw e;
-  }
-
-  context.kind = context.env.NYM_NOTIFICATION_KIND;
-
-  context.keybase = {
-    channel: context.env.KEYBASE_NYM_CHANNEL,
-    username: context.env.KEYBASE_NYMBOT_USERNAME,
-    paperkey: context.env.KEYBASE_NYMBOT_PAPERKEY,
-  };
-
-  if (!context.env.GIT_BRANCH_NAME) {
-    context.env.GIT_BRANCH_NAME = context.env.GITHUB_REF.split('/')
-      .slice(2)
-      .join('/');
-  }
-
-  context.status = process.env.IS_SUCCESS === 'true' ? 'success' : 'failure';
-}
-
-async function sendKeybaseMessage(messageBody) {
-  const bot = new Bot();
-  try {
-    console.log(
-      `Initialising keybase with user "${
-        context.keybase.username
-      }" and key: "${'*'.repeat(context.keybase.paperkey.length)}"...`,
-    );
-    await bot.init(context.keybase.username, context.keybase.paperkey, {
-      verbose: false,
-    });
-
-    const channel = {
-      name: 'nymtech_bot',
-      membersType: 'team',
-      topicName: context.keybase.channel,
-      topic_type: 'CHAT',
-    };
-    const message = {
-      body: messageBody,
-    };
-
-    console.log(`Sending to ${channel.name}#${channel.topicName}...`);
-    await bot.chat.send(channel, message);
-
-    console.log('Message sent!');
-  } catch (error) {
-    console.error(error);
-    process.exitCode = -1;
-  } finally {
-    await bot.deinit();
-  }
-}
-
-/**
- * Uses the `kind` set in the context to process the context and generate a notification message
- * @returns {Promise<string>} A string notification message body
- */
-async function processKindScript() {
-  const script = require(`../${context.kind}`);
-  if (!script.addToContextAndValidate) {
-    throw new Error(
-      `"./${context.kind}/index.js" does not export a method called "async addToContextAndValidate(context)"`,
-    );
-  }
-  if (!script.getMessageBody) {
-    throw new Error(
-      `"./${context.kind}/index.js" does not export a method called "async getMessageBody(context)"`,
-    );
-  }
-
-  // call the script to modify and validate the context
-  await script.addToContextAndValidate(context);
-
-  // let the script create a message body and return the result as a string for sending
-  return await script.getMessageBody(context);
-}
-
-/**
- * The main function, as async so that await syntax is available
- */
-async function main() {
-  createTemplateContext();
-  console.log(`Sending notification for kind "${context.kind}"...`);
-  const messageBody = await processKindScript();
-  if(process.env.SHOW_DEBUG) {
-    console.log('-----------------------------------------');
-    console.log(messageBody);
-    console.log('-----------------------------------------');
-  }
-  await sendKeybaseMessage(messageBody);
-}
-
-// call main function and let NodeJS handle the promise
-main();

.github/workflows/support-files/ts-packages/index.js

@@ -1,29 +0,0 @@
-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,
-};

.github/workflows/support-files/ts-packages/templates/failure

@@ -1,11 +0,0 @@
-🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
-> :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 }}
-```

.github/workflows/support-files/ts-packages/templates/success

@@ -1,16 +0,0 @@
-🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
-> :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 }}
-```

.gitignore

@@ -35,6 +35,4 @@ contracts/mixnet/Justfile
 contracts/mixnet/Makefile
 validator-config
 *.patch
-validator-api-config.toml
-dist
-storybook-static
+validator-api-config.toml

.wellknown/wallet/validators.json

@@ -1,6 +0,0 @@
-{
-  "mainnet":[{
-    "nymd_url":"https://rpc.nyx.nodes.guru/",
-    "api_url":"https://api.nyx.nodes.guru/"
-  }]
-}

Cargo.toml

@@ -11,13 +11,12 @@ panic = "abort"
 
 [workspace]
 
-resolver = "2"
 members = [
     "clients/client-core",
     "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",
@@ -33,9 +32,6 @@ members = [
     "common/network-defaults",
     "common/nonexhaustive-delayqueue",
     "common/nymcoconut",
-    "common/nym_offline_compact_ecash",
-    "common/nym_offline_divisible_ecash",
-    "common/nym_online_divisible_ecash",
     "common/nymsphinx",
     "common/nymsphinx/acknowledgements",
     "common/nymsphinx/addressing",

Makefile

@@ -1,10 +1,8 @@
-test: build clippy-all cargo-test wasm fmt
-no-clippy: build cargo-test wasm fmt
-happy: fmt clippy-happy test
+all: clippy-all test fmt
+happy: clippy-happy test fmt
 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-contracts build-wallet build-main
+test: test-main test-contracts test-wallet
 fmt: fmt-main fmt-contracts fmt-wallet
 
 clippy-happy-main:
@@ -13,20 +11,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 --workspace --all-features -- -D warnings
+	cargo clippy --all-features -- -D warnings 
 
 clippy-all-contracts:
-	cargo clippy --workspace --manifest-path contracts/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings
+	cargo clippy --manifest-path contracts/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings
 
-clippy-all-wallet:
-	cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings
+clippy-all-wallet: 
+	cargo clippy --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings
 
 test-main:
-	cargo test --all-features --workspace
+	cargo test --all-features
 
 test-contracts:
 	cargo test --manifest-path contracts/Cargo.toml --all-features
@@ -34,15 +32,6 @@ test-contracts:
 test-wallet:
 	cargo test --manifest-path nym-wallet/Cargo.toml --all-features
 
-build-main:
-	cargo build --workspace
-
-build-contracts:
-	cargo build --manifest-path contracts/Cargo.toml --workspace
-
-build-wallet:
-	cargo build --manifest-path nym-wallet/Cargo.toml --workspace
-
 fmt-main:
 	cargo fmt --all
 

README.md

@@ -28,8 +28,6 @@ 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.

assets/README.md

@@ -1,12 +0,0 @@
-# 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.

assets/favicon/favicon.svg

@@ -1,10 +0,0 @@
-<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>

assets/fonts/fonts.css

@@ -1,6 +0,0 @@
-@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;
-}

assets/logo/logo-circle-small.svg

@@ -1,10 +0,0 @@
-<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>

assets/logo/logo-circle.svg

@@ -1,13 +0,0 @@
-<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>

assets/logo/logo-wordmark.svg

@@ -1,5 +0,0 @@
-<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>

assets/token/token-dark.svg

@@ -1,5 +0,0 @@
-<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>

assets/token/token-light.svg

@@ -1,5 +0,0 @@
-<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>

clients/client-core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "client-core"
 version = "0.12.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

clients/client-core/src/client/reply_key_storage.rs

@@ -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, SurbEncryptionKey, SurbEncryptionKeySize,
+    encryption_key::EncryptionKeyDigest, encryption_key::Unsigned, 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::USIZE {
+        if key_bytes_ref.len() != SurbEncryptionKeySize::to_usize() {
             error!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
             panic!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
         }

clients/client-core/src/config/mod.rs

@@ -121,16 +121,12 @@ impl<T: NymConfig> Config<T> {
         self.client.testnet_mode = testnet_mode;
     }
 
-    pub fn with_gateway_endpoint<S: Into<String>>(&mut self, id: S, owner: S, listener: S) {
-        self.client.gateway_endpoint = GatewayEndpoint {
-            gateway_id: id.into(),
-            gateway_owner: owner.into(),
-            gateway_listener: listener.into(),
-        };
+    pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
+        self.client.gateway_id = id.into();
     }
 
-    pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
-        self.client.gateway_endpoint.gateway_id = id.into();
+    pub fn with_gateway_listener<S: Into<String>>(&mut self, gateway_listener: S) {
+        self.client.gateway_listener = gateway_listener.into();
     }
 
     #[cfg(not(feature = "coconut"))]
@@ -202,15 +198,11 @@ impl<T: NymConfig> Config<T> {
     }
 
     pub fn get_gateway_id(&self) -> String {
-        self.client.gateway_endpoint.gateway_id.clone()
-    }
-
-    pub fn get_gateway_owner(&self) -> String {
-        self.client.gateway_endpoint.gateway_owner.clone()
+        self.client.gateway_id.clone()
     }
 
     pub fn get_gateway_listener(&self) -> String {
-        self.client.gateway_endpoint.gateway_listener.clone()
+        self.client.gateway_listener.clone()
     }
 
     #[cfg(not(feature = "coconut"))]
@@ -280,19 +272,6 @@ impl<T: NymConfig> Default for Config<T> {
     }
 }
 
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-struct GatewayEndpoint {
-    /// gateway_id specifies ID of the gateway to which the client should send messages.
-    /// If initially omitted, a random gateway will be chosen from the available topology.
-    gateway_id: String,
-
-    /// Address of the gateway owner to which the client should send messages.
-    gateway_owner: String,
-
-    /// Address of the gateway listener to which all client requests should be sent.
-    gateway_listener: String,
-}
-
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct Client<T> {
     /// Version of the client for which this configuration was created.
@@ -334,8 +313,12 @@ pub struct Client<T> {
     /// sent but not received back.
     reply_encryption_key_store_path: PathBuf,
 
-    /// Information regarding how the client should send data to gateway.
-    gateway_endpoint: GatewayEndpoint,
+    /// gateway_id specifies ID of the gateway to which the client should send messages.
+    /// If initially omitted, a random gateway will be chosen from the available topology.
+    gateway_id: String,
+
+    /// Address of the gateway listener to which all client requests should be sent.
+    gateway_listener: String,
 
     /// Path to directory containing public/private keys used for bandwidth token purchase.
     /// Those are saved in case of emergency, to be able to reclaim bandwidth tokens.
@@ -374,7 +357,8 @@ impl<T: NymConfig> Default for Client<T> {
             gateway_shared_key_file: Default::default(),
             ack_key_file: Default::default(),
             reply_encryption_key_store_path: Default::default(),
-            gateway_endpoint: Default::default(),
+            gateway_id: "".to_string(),
+            gateway_listener: "".to_string(),
             #[cfg(not(feature = "coconut"))]
             backup_bandwidth_token_keys_dir: Default::default(),
             #[cfg(not(feature = "coconut"))]

clients/native/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nym-client"
 version = "0.12.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
-edition = "2021"
+edition = "2018"
 rust-version = "1.56"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

clients/native/examples/js-examples/websocket/package-lock.json

@@ -2441,9 +2441,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true,
       "funding": [
         {
@@ -3806,9 +3806,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
       "dev": true,
       "peer": true,
       "bin": {
@@ -3943,9 +3943,9 @@
       }
     },
     "node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
+      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -6085,9 +6085,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -8853,9 +8853,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true
     },
     "for-in": {
@@ -9871,9 +9871,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
       "dev": true,
       "peer": true
     },
@@ -9984,9 +9984,9 @@
       }
     },
     "nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
+      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
       "requires": {
         "boolbase": "^1.0.0"
       }
@@ -11733,9 +11733,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",

clients/native/src/client/config/template.rs

@@ -59,6 +59,12 @@ eth_endpoint = '{{ client.eth_endpoint }}'
 
 ##### additional client config options #####
 
+# ID of the gateway from which the client should be fetching messages.
+gateway_id = '{{ client.gateway_id }}'
+
+# Address of the gateway listener to which all client requests should be sent.
+gateway_listener = '{{ client.gateway_listener }}'
+
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 gateway_shared_key_file = '{{ client.gateway_shared_key_file }}'
@@ -72,17 +78,6 @@ ack_key_file = '{{ client.ack_key_file }}'
 # Absolute path to the home Nym Clients directory.
 nym_root_directory = '{{ client.nym_root_directory }}'
 
-[client.gateway_endpoint]
-# ID of the gateway from which the client should be fetching messages.
-gateway_id = '{{ client.gateway_endpoint.gateway_id }}'
-
-# Address of the gateway owner to which the client should send messages.
-gateway_owner = '{{ client.gateway_endpoint.gateway_owner }}'
-
-# Address of the gateway listener to which all client requests should be sent.
-gateway_listener = '{{ client.gateway_endpoint.gateway_listener }}'
-
-
 
 ##### socket config options #####
 

clients/native/src/client/mod.rs

@@ -160,10 +160,6 @@ impl NymClient {
         if gateway_id.is_empty() {
             panic!("The identity of the gateway is unknown - did you run `nym-client` init?")
         }
-        let gateway_owner = self.config.get_base().get_gateway_owner();
-        if gateway_owner.is_empty() {
-            panic!("The owner of the gateway is unknown - did you run `nym-client` init?")
-        }
         let gateway_address = self.config.get_base().get_gateway_listener();
         if gateway_address.is_empty() {
             panic!("The address of the gateway is unknown - did you run `nym-client` init?")
@@ -189,7 +185,6 @@ impl NymClient {
             gateway_address,
             self.key_manager.identity_keypair(),
             gateway_identity,
-            gateway_owner,
             Some(self.key_manager.gateway_shared_key()),
             mixnet_message_sender,
             ack_sender,

clients/native/src/commands/init.rs

@@ -136,7 +136,6 @@ async fn register_with_gateway(
     let mut gateway_client = GatewayClient::new_init(
         gateway.clients_address(),
         gateway.identity_key,
-        gateway.owner.clone(),
         our_identity.clone(),
         timeout,
     );
@@ -256,14 +255,15 @@ pub async fn execute(matches: ArgMatches<'static>) {
             chosen_gateway_id,
         )
         .await;
+        config
+            .get_base_mut()
+            .with_gateway_id(gateway_details.identity_key.to_base58_string());
         let shared_keys =
             register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
 
-        config.get_base_mut().with_gateway_endpoint(
-            gateway_details.identity_key.to_base58_string(),
-            gateway_details.owner.clone(),
-            gateway_details.clients_address(),
-        );
+        config
+            .get_base_mut()
+            .with_gateway_listener(gateway_details.clients_address());
         key_manager.insert_gateway_shared_key(shared_keys);
 
         let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());

clients/native/src/commands/mod.rs

@@ -32,7 +32,7 @@ fn parse_validators(raw: &str) -> Vec<Url> {
         .collect()
 }
 
-pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {
+pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Config {
     if let Some(raw_validators) = matches.value_of("validators") {
         config
             .get_base_mut()
@@ -58,7 +58,7 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
     #[cfg(not(feature = "coconut"))]
     if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
         config.get_base_mut().with_eth_endpoint(eth_endpoint);
-    } else if !cfg!(feature = "eth") {
+    } else {
         config
             .get_base_mut()
             .with_eth_endpoint(DEFAULT_ETH_ENDPOINT);
@@ -66,7 +66,7 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
     #[cfg(not(feature = "coconut"))]
     if let Some(eth_private_key) = matches.value_of(ETH_PRIVATE_KEY_ARG_NAME) {
         config.get_base_mut().with_eth_private_key(eth_private_key);
-    } else if !cfg!(feature = "eth") {
+    } else {
         config
             .get_base_mut()
             .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);

clients/native/src/commands/upgrade.rs

@@ -95,7 +95,7 @@ fn parse_package_version() -> Version {
 
 fn minor_0_12_upgrade(
     mut config: Config,
-    _matches: &ArgMatches<'_>,
+    _matches: &ArgMatches,
     config_version: &Version,
     package_version: &Version,
 ) -> Config {
@@ -131,7 +131,7 @@ fn minor_0_12_upgrade(
     config
 }
 
-fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Version) {
+fn do_upgrade(mut config: Config, matches: &ArgMatches, package_version: Version) {
     loop {
         let config_version = parse_config_version(&config);
 
@@ -151,7 +151,7 @@ fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Ver
     }
 }
 
-pub fn execute(matches: &ArgMatches<'_>) {
+pub fn execute(matches: &ArgMatches) {
     let package_version = parse_package_version();
 
     let id = matches.value_of("id").unwrap();

clients/native/websocket-requests/Cargo.toml

@@ -2,7 +2,7 @@
 name = "websocket-requests"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

clients/socks5/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nym-socks5-client"
 version = "0.12.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
-edition = "2021"
+edition = "2018"
 rust-version = "1.56"
 
 [lib]

clients/socks5/src/client/config/template.rs

@@ -59,6 +59,12 @@ eth_endpoint = '{{ client.eth_endpoint }}'
 
 ##### additional client config options #####
 
+# ID of the gateway from which the client should be fetching messages.
+gateway_id = '{{ client.gateway_id }}'
+
+# Address of the gateway listener to which all client requests should be sent.
+gateway_listener = '{{ client.gateway_listener }}'
+
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 gateway_shared_key_file = '{{ client.gateway_shared_key_file }}'
@@ -66,22 +72,12 @@ gateway_shared_key_file = '{{ client.gateway_shared_key_file }}'
 # Path to file containing key used for encrypting and decrypting the content of an
 # acknowledgement so that nobody besides the client knows which packet it refers to.
 ack_key_file = '{{ client.ack_key_file }}'
-
+    
 ##### advanced configuration options #####
 
 # Absolute path to the home Nym Clients directory.
 nym_root_directory = '{{ client.nym_root_directory }}'
 
-[client.gateway_endpoint]
-# ID of the gateway from which the client should be fetching messages.
-gateway_id = '{{ client.gateway_endpoint.gateway_id }}'
-
-# Address of the gateway owner to which the client should send messages.
-gateway_owner = '{{ client.gateway_endpoint.gateway_owner }}'
-
-# Address of the gateway listener to which all client requests should be sent.
-gateway_listener = '{{ client.gateway_endpoint.gateway_listener }}'
-
 
 ##### socket config options #####
 

clients/socks5/src/client/mod.rs

@@ -148,10 +148,6 @@ impl NymClient {
         if gateway_id.is_empty() {
             panic!("The identity of the gateway is unknown - did you run `nym-client` init?")
         }
-        let gateway_owner = self.config.get_base().get_gateway_owner();
-        if gateway_owner.is_empty() {
-            panic!("The owner of the gateway is unknown - did you run `nym-client` init?")
-        }
         let gateway_address = self.config.get_base().get_gateway_listener();
         if gateway_address.is_empty() {
             panic!("The address of the gateway is unknown - did you run `nym-client` init?")
@@ -177,7 +173,6 @@ impl NymClient {
             gateway_address,
             self.key_manager.identity_keypair(),
             gateway_identity,
-            gateway_owner,
             Some(self.key_manager.gateway_shared_key()),
             mixnet_message_sender,
             ack_sender,

clients/socks5/src/commands/init.rs

@@ -136,7 +136,6 @@ async fn register_with_gateway(
     let mut gateway_client = GatewayClient::new_init(
         gateway.clients_address(),
         gateway.identity_key,
-        gateway.owner.clone(),
         our_identity.clone(),
         timeout,
     );
@@ -257,14 +256,15 @@ pub async fn execute(matches: ArgMatches<'static>) {
             chosen_gateway_id,
         )
         .await;
+        config
+            .get_base_mut()
+            .with_gateway_id(gateway_details.identity_key.to_base58_string());
         let shared_keys =
             register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
 
-        config.get_base_mut().with_gateway_endpoint(
-            gateway_details.identity_key.to_base58_string(),
-            gateway_details.owner.clone(),
-            gateway_details.clients_address(),
-        );
+        config
+            .get_base_mut()
+            .with_gateway_listener(gateway_details.clients_address());
         key_manager.insert_gateway_shared_key(shared_keys);
 
         let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());

clients/socks5/src/commands/mod.rs

@@ -32,7 +32,7 @@ fn parse_validators(raw: &str) -> Vec<Url> {
         .collect()
 }
 
-pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {
+pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Config {
     if let Some(raw_validators) = matches.value_of("validators") {
         config
             .get_base_mut()
@@ -54,7 +54,7 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
     #[cfg(not(feature = "coconut"))]
     if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
         config.get_base_mut().with_eth_endpoint(eth_endpoint);
-    } else if !cfg!(feature = "eth") {
+    } else {
         config
             .get_base_mut()
             .with_eth_endpoint(DEFAULT_ETH_ENDPOINT);
@@ -62,7 +62,7 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
     #[cfg(not(feature = "coconut"))]
     if let Some(eth_private_key) = matches.value_of(ETH_PRIVATE_KEY_ARG_NAME) {
         config.get_base_mut().with_eth_private_key(eth_private_key);
-    } else if !cfg!(feature = "eth") {
+    } else {
         config
             .get_base_mut()
             .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);

clients/socks5/src/commands/upgrade.rs

@@ -95,7 +95,7 @@ fn parse_package_version() -> Version {
 
 fn minor_0_12_upgrade(
     mut config: Config,
-    _matches: &ArgMatches<'_>,
+    _matches: &ArgMatches,
     config_version: &Version,
     package_version: &Version,
 ) -> Config {
@@ -131,7 +131,7 @@ fn minor_0_12_upgrade(
     config
 }
 
-fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Version) {
+fn do_upgrade(mut config: Config, matches: &ArgMatches, package_version: Version) {
     loop {
         let config_version = parse_config_version(&config);
 
@@ -151,7 +151,7 @@ fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Ver
     }
 }
 
-pub fn execute(matches: &ArgMatches<'_>) {
+pub fn execute(matches: &ArgMatches) {
     let package_version = parse_package_version();
 
     let id = matches.value_of("id").unwrap();

clients/tauri-client/package.json

@@ -26,7 +26,7 @@
     "@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-rc.5",
+    "@tauri-apps/cli": "^1.0.0-beta.5",
     "rollup": "^2.3.4",
     "rollup-plugin-svelte": "^7.0.0",
     "rollup-plugin-terser": "^7.0.0",

clients/tauri-client/src-tauri/Cargo.toml

@@ -6,25 +6,21 @@ authors = ["you"]
 license = ""
 repository = ""
 default-run = "app"
-edition = "2021"
+edition = "2018"
 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-rc.2" }
+tauri-build = { version = "1.0.0-beta.2" }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "=1.0.0-rc.2", features = [] }
+tauri = { version = "1.0.0-beta.4", features = [] }
 tokio = "1.4"
 url = "2.2"
 
-tauri-codegen = "=1.0.0-rc.1"
-tauri-macros = "=1.0.0-rc.1"
-core-graphics = "=0.22.2"
-
 coconut-interface = { path = "../../../common/coconut-interface" }
 credentials = { path = "../../../common/credentials" }
 validator-client = {path = "../../../common/client-libs/validator-client"}

clients/validator/src/index.ts

@@ -64,23 +64,15 @@ export default class ValidatorClient implements INymClient {
 
   readonly vestingContract: string;
 
-  readonly mainnetDenom = "unym";
-
-  readonly mainnetPrefix = "n";
-
   private constructor(
     client: SigningClient | QueryClient,
     prefix: string,
     mixnetContract: string,
-    vestingContract: string
+    vestingContract: string,
   ) {
     this.client = client;
     this.prefix = prefix;
-    if (prefix == this.mainnetPrefix) {
-      this.denom = this.mainnetDenom;
-    } else {
-      this.denom = `u${prefix}`;
-    }
+    this.denom = `u${prefix}`;
 
     this.mixnetContract = mixnetContract;
     this.vestingContract = vestingContract;

clients/validator/src/stargate-helper.ts

@@ -1,19 +1,8 @@
 import axios from 'axios';
 import { GasPrice } from '@cosmjs/stargate';
 
-const mainnetPrefix = 'n';
-const mainnetDenom = 'nym';
-
 export function nymGasPrice(prefix: string): GasPrice {
-  if (typeof prefix === 'string') {
-    if (prefix === mainnetPrefix) {
-      prefix = mainnetDenom;
-    }
-    return GasPrice.fromString(`0.025u${prefix}`); // TODO: ideally this ugly conversion shouldn't be hardcoded here.
-  }
-  else {
-    throw new Error(`${prefix} is not of type string`);
-  }
+  return GasPrice.fromString(`0.025u${prefix}`); // TODO: ideally this ugly conversion shouldn't be hardcoded here.
 }
 
 export const downloadWasm = async (url: string): Promise<Uint8Array> => {

clients/webassembly/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
 version = "0.12.0"
-edition = "2021"
+edition = "2018"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
 repository = "https://github.com/nymtech/nym"
@@ -20,7 +20,7 @@ coconut = ["coconut-interface", "credentials", "gateway-client/coconut"]
 [dependencies]
 futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = { version = "=0.2.78", features = ["serde-serialize"]  }
+wasm-bindgen = { version = "0.2", features = ["serde-serialize"]  }
 wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }

clients/webassembly/js-example/package-lock.json

@@ -22,10 +22,7 @@
         "webpack-dev-server": "^3.11.0"
       }
     },
-    "../pkg": {
-      "name": "@nymproject/nym-client-wasm",
-      "version": "0.0.1"
-    },
+    "../pkg": {},
     "node_modules/@nymproject/nym-client-wasm": {
       "resolved": "../pkg",
       "link": true
@@ -2354,9 +2351,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true,
       "funding": [
         {
@@ -5862,9 +5859,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
-      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -6503,9 +6500,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
       "dev": true,
       "dependencies": {
         "async-limiter": "~1.0.0"
@@ -8545,9 +8542,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
       "dev": true
     },
     "for-in": {
@@ -11402,9 +11399,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
-      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",

clients/webassembly/react-example/package.json

@@ -8,7 +8,7 @@
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "bootstrap": "^4.5.0",
-    "node-sass": "^7.0.0",
+    "node-sass": "^4.14.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "^4.0.0",

clients/webassembly/src/client/mod.rs

@@ -127,7 +127,6 @@ impl NymClient {
             gateway.clients_address(),
             Arc::clone(&client.identity),
             gateway.identity_key,
-            gateway.owner.clone(),
             None,
             mixnet_messages_sender,
             ack_sender,

common/bandwidth-claim-contract/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bandwidth-claim-contract"
 version = "0.1.0"
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/client-libs/gateway-client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "gateway-client"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,7 +23,6 @@ credentials = { path = "../../credentials" }
 crypto = { path = "../../crypto" }
 gateway-requests = { path = "../../../gateway/gateway-requests" }
 nymsphinx = { path = "../../nymsphinx" }
-pemstore = { path = "../../pemstore" }
 coconut-interface = { path = "../../coconut-interface", optional = true }
 network-defaults = { path = "../../network-defaults" }
 

common/client-libs/gateway-client/src/bandwidth.rs

@@ -16,27 +16,22 @@ use crypto::asymmetric::identity::PublicKey;
 use network_defaults::BANDWIDTH_VALUE;
 #[cfg(not(feature = "coconut"))]
 use network_defaults::{
-    eth_contract::ETH_ERC20_JSON_ABI, eth_contract::ETH_JSON_ABI, ETH_BURN_FUNCTION_NAME,
-    ETH_CONTRACT_ADDRESS, ETH_ERC20_APPROVE_FUNCTION_NAME, ETH_ERC20_CONTRACT_ADDRESS,
-    ETH_MIN_BLOCK_DEPTH, TOKENS_TO_BURN, UTOKENS_TO_BURN,
+    eth_contract::ETH_JSON_ABI, ETH_BURN_FUNCTION_NAME, ETH_CONTRACT_ADDRESS, ETH_MIN_BLOCK_DEPTH,
+    TOKENS_TO_BURN,
 };
 #[cfg(not(feature = "coconut"))]
-use pemstore::traits::PemStorableKeyPair;
-#[cfg(not(feature = "coconut"))]
 use rand::rngs::OsRng;
 #[cfg(not(feature = "coconut"))]
 use secp256k1::SecretKey;
 #[cfg(not(feature = "coconut"))]
-use std::io::{Read, Write};
+use std::io::Write;
 #[cfg(not(feature = "coconut"))]
 use std::str::FromStr;
 #[cfg(not(feature = "coconut"))]
 use web3::{
     contract::{Contract, Options},
-    ethabi::Token,
-    signing::{Key, SecretKeyRef},
     transports::Http,
-    types::{Address, U256, U64},
+    types::{Address, Bytes, U256, U64},
     Web3,
 };
 
@@ -55,19 +50,6 @@ pub fn eth_contract(web3: Web3<Http>) -> Contract<Http> {
     .expect("Invalid json abi")
 }
 
-#[cfg(not(feature = "coconut"))]
-pub fn eth_erc20_contract(web3: Web3<Http>) -> Contract<Http> {
-    Contract::from_json(
-        web3.eth(),
-        Address::from(ETH_ERC20_CONTRACT_ADDRESS),
-        json::parse(ETH_ERC20_JSON_ABI)
-            .expect("Invalid json abi")
-            .dump()
-            .as_bytes(),
-    )
-    .expect("Invalid json abi")
-}
-
 #[derive(Clone)]
 pub struct BandwidthController {
     #[cfg(feature = "coconut")]
@@ -77,8 +59,6 @@ pub struct BandwidthController {
     #[cfg(not(feature = "coconut"))]
     contract: Contract<Http>,
     #[cfg(not(feature = "coconut"))]
-    erc20_contract: Contract<Http>,
-    #[cfg(not(feature = "coconut"))]
     eth_private_key: SecretKey,
     #[cfg(not(feature = "coconut"))]
     backup_bandwidth_token_keys_dir: std::path::PathBuf,
@@ -104,14 +84,12 @@ impl BandwidthController {
             Http::new(&eth_endpoint).map_err(|_| GatewayClientError::InvalidURL(eth_endpoint))?;
         let web3 = web3::Web3::new(transport);
         // Fail early, on invalid abi
-        let contract = eth_contract(web3.clone());
-        let erc20_contract = eth_erc20_contract(web3);
+        let contract = eth_contract(web3);
         let eth_private_key = secp256k1::SecretKey::from_str(&eth_private_key)
             .map_err(|_| GatewayClientError::InvalidEthereumPrivateKey)?;
 
         Ok(BandwidthController {
             contract,
-            erc20_contract,
             eth_private_key,
             backup_bandwidth_token_keys_dir,
         })
@@ -129,45 +107,6 @@ impl BandwidthController {
         Ok(())
     }
 
-    #[cfg(not(feature = "coconut"))]
-    fn restore_keypair(&self) -> Result<identity::KeyPair, GatewayClientError> {
-        std::fs::create_dir_all(&self.backup_bandwidth_token_keys_dir)?;
-        let file = std::fs::read_dir(&self.backup_bandwidth_token_keys_dir)?
-            .find(|entry| {
-                entry
-                    .as_ref()
-                    .map(|entry| entry.path().is_file())
-                    .unwrap_or(false)
-            })
-            .unwrap_or_else(|| Err(std::io::Error::from(std::io::ErrorKind::NotFound)))?;
-        let file_path = file.path();
-        let pub_key = file_path
-            .file_name()
-            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?
-            .to_str()
-            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?;
-        let mut priv_key = vec![];
-        std::fs::File::open(file_path.clone())?.read_to_end(&mut priv_key)?;
-        Ok(identity::KeyPair::from_keys(
-            identity::PrivateKey::from_bytes(&priv_key).unwrap(),
-            identity::PublicKey::from_base58_string(pub_key).unwrap(),
-        ))
-    }
-
-    #[cfg(not(feature = "coconut"))]
-    fn mark_keypair_as_spent(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
-        let mut spent_dir = self.backup_bandwidth_token_keys_dir.clone();
-        spent_dir.push("spent");
-        std::fs::create_dir_all(&spent_dir)?;
-        let file_path_old = self
-            .backup_bandwidth_token_keys_dir
-            .join(keypair.public_key().to_base58_string());
-        let file_path_new = spent_dir.join(keypair.public_key().to_base58_string());
-        std::fs::rename(file_path_old, file_path_new)?;
-
-        Ok(())
-    }
-
     #[cfg(feature = "coconut")]
     pub async fn prepare_coconut_credential(
         &self,
@@ -206,25 +145,17 @@ impl BandwidthController {
     pub async fn prepare_token_credential(
         &self,
         gateway_identity: PublicKey,
-        gateway_owner: String,
     ) -> Result<TokenCredential, GatewayClientError> {
-        let kp = match self.restore_keypair() {
-            Ok(kp) => kp,
-            Err(_) => {
-                let mut rng = OsRng;
-                let kp = identity::KeyPair::new(&mut rng);
-                self.backup_keypair(&kp)?;
-                kp
-            }
-        };
+        let mut rng = OsRng;
+
+        let kp = identity::KeyPair::new(&mut rng);
+        self.backup_keypair(&kp)?;
 
         let verification_key = *kp.public_key();
         let signed_verification_key = kp.private_key().sign(&verification_key.to_bytes());
-        self.buy_token_credential(verification_key, signed_verification_key, gateway_owner)
+        self.buy_token_credential(verification_key, signed_verification_key)
             .await?;
 
-        self.mark_keypair_as_spent(&kp)?;
-
         let message: Vec<u8> = verification_key
             .to_bytes()
             .iter()
@@ -246,109 +177,28 @@ impl BandwidthController {
         &self,
         verification_key: PublicKey,
         signed_verification_key: identity::Signature,
-        gateway_owner: String,
     ) -> Result<(), GatewayClientError> {
+        // 0 means a transaction failure, 1 means success
         let confirmations = if cfg!(debug_assertions) {
             1
         } else {
             ETH_MIN_BLOCK_DEPTH
         };
-        // 15 seconds per confirmation block + 10 seconds of network overhead + 20 seconds of wait for kill
+        // 15 seconds per confirmation block + 10 seconds of network overhead
         log::info!(
             "Waiting for Ethereum transaction. This should take about {} seconds",
-            (confirmations + 1) * 15 + 30
+            confirmations * 15 + 10
         );
-        let mut options = Options::default();
-        let estimation = self
-            .erc20_contract
-            .estimate_gas(
-                ETH_ERC20_APPROVE_FUNCTION_NAME,
-                (
-                    Token::Address(Address::from(ETH_CONTRACT_ADDRESS)),
-                    Token::Uint(U256::from(UTOKENS_TO_BURN)),
-                ),
-                SecretKeyRef::from(&self.eth_private_key).address(),
-                options.clone(),
-            )
-            .await?;
-        options.gas = Some(estimation);
-        log::info!("Calling ERC20 approve in 10 seconds with an estimated gas of {}. Kill the process if you want to abort", estimation);
-        #[cfg(not(target_arch = "wasm32"))]
-        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
-        #[cfg(target_arch = "wasm32")]
-        if let Err(err) = fluvio_wasm_timer::Delay::new(std::time::Duration::from_secs(10)).await {
-            log::error!(
-                "the timer has gone away while waiting for possible kill! - {}",
-                err
-            );
-        }
-        let recipt = self
-            .erc20_contract
-            .signed_call_with_confirmations(
-                ETH_ERC20_APPROVE_FUNCTION_NAME,
-                (
-                    Token::Address(Address::from(ETH_CONTRACT_ADDRESS)),
-                    Token::Uint(U256::from(UTOKENS_TO_BURN)),
-                ),
-                options,
-                1, // One confirmation is enough, as we'll be consuming the approved token next anyway
-                &self.eth_private_key,
-            )
-            .await?;
-        if Some(U64::from(0u64)) == recipt.status {
-            return Err(GatewayClientError::BurnTokenError(
-                web3::Error::InvalidResponse(format!(
-                    "Approve transaction status is 0 (failure): {:?}",
-                    recipt.logs,
-                )),
-            ));
-        } else {
-            log::info!(
-                "Approved {} tokens for bandwidth use on Ethereum",
-                TOKENS_TO_BURN
-            );
-        }
-
-        let mut options = Options::default();
-        let estimation = self
-            .contract
-            .estimate_gas(
-                ETH_BURN_FUNCTION_NAME,
-                (
-                    Token::Uint(U256::from(UTOKENS_TO_BURN)),
-                    Token::Uint(U256::from(&verification_key.to_bytes())),
-                    Token::Bytes(signed_verification_key.to_bytes().to_vec()),
-                    Token::String(gateway_owner.clone()),
-                ),
-                SecretKeyRef::from(&self.eth_private_key).address(),
-                options.clone(),
-            )
-            .await?;
-        options.gas = Some(estimation);
-        log::info!("Generating bandwidth on ETH contract in 10 seconds with an estimated gas of {}. \
-         Kill the process if you want to abort. Keep in mind that if you abort now, you'll still have \
-         some tokens approved for bandwidth spending from the previous action. \
-         If you don't want that, you'll need to manually decreaseAllowance to revert the approval.", estimation);
-        #[cfg(not(target_arch = "wasm32"))]
-        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
-        #[cfg(target_arch = "wasm32")]
-        if let Err(err) = fluvio_wasm_timer::Delay::new(std::time::Duration::from_secs(10)).await {
-            log::error!(
-                "the timer has gone away while waiting for possible kill! - {}",
-                err
-            );
-        }
         let recipt = self
             .contract
             .signed_call_with_confirmations(
                 ETH_BURN_FUNCTION_NAME,
                 (
-                    Token::Uint(U256::from(UTOKENS_TO_BURN)),
-                    Token::Uint(U256::from(&verification_key.to_bytes())),
-                    Token::Bytes(signed_verification_key.to_bytes().to_vec()),
-                    Token::String(gateway_owner),
+                    U256::from(TOKENS_TO_BURN),
+                    U256::from(&verification_key.to_bytes()),
+                    Bytes(signed_verification_key.to_bytes().to_vec()),
                 ),
-                options,
+                Options::default(),
                 confirmations,
                 &self.eth_private_key,
             )
@@ -386,15 +236,6 @@ mod tests {
         eth_contract(web3);
     }
 
-    #[test]
-    fn parse_erc20_contract() {
-        let transport =
-            Http::new("https://rinkeby.infura.io/v3/00000000000000000000000000000000").unwrap();
-        let web3 = web3::Web3::new(transport);
-        // test no panic occurs
-        eth_erc20_contract(web3);
-    }
-
     #[test]
     fn check_event_name_constant_against_abi() {
         let transport =

common/client-libs/gateway-client/src/client.rs

@@ -20,7 +20,6 @@ use gateway_requests::iv::IV;
 use gateway_requests::registration::handshake::{client_handshake, SharedKeys};
 use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse};
 use log::*;
-use network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN};
 use nymsphinx::forwarding::packet::MixPacket;
 use rand::rngs::OsRng;
 use std::convert::TryFrom;
@@ -45,7 +44,6 @@ pub struct GatewayClient {
     bandwidth_remaining: i64,
     gateway_address: String,
     gateway_identity: identity::PublicKey,
-    gateway_owner: String,
     local_identity: Arc<identity::KeyPair>,
     shared_key: Option<Arc<SharedKeys>>,
     connection: SocketState,
@@ -70,7 +68,6 @@ impl GatewayClient {
         gateway_address: String,
         local_identity: Arc<identity::KeyPair>,
         gateway_identity: identity::PublicKey,
-        gateway_owner: String,
         shared_key: Option<Arc<SharedKeys>>,
         mixnet_message_sender: MixnetMessageSender,
         ack_sender: AcknowledgementSender,
@@ -83,7 +80,6 @@ impl GatewayClient {
             bandwidth_remaining: 0,
             gateway_address,
             gateway_identity,
-            gateway_owner,
             local_identity,
             shared_key,
             connection: SocketState::NotConnected,
@@ -116,7 +112,6 @@ impl GatewayClient {
     pub fn new_init(
         gateway_address: String,
         gateway_identity: identity::PublicKey,
-        gateway_owner: String,
         local_identity: Arc<identity::KeyPair>,
         response_timeout_duration: Duration,
     ) -> Self {
@@ -134,7 +129,6 @@ impl GatewayClient {
             bandwidth_remaining: 0,
             gateway_address,
             gateway_identity,
-            gateway_owner,
             local_identity,
             shared_key: None,
             connection: SocketState::NotConnected,
@@ -554,8 +548,6 @@ impl GatewayClient {
             return self.try_claim_testnet_bandwidth().await;
         }
 
-        let _gateway_owner = self.gateway_owner.clone();
-
         #[cfg(feature = "coconut")]
         let credential = self
             .bandwidth_controller
@@ -568,7 +560,7 @@ impl GatewayClient {
             .bandwidth_controller
             .as_ref()
             .unwrap()
-            .prepare_token_credential(self.gateway_identity, _gateway_owner)
+            .prepare_token_credential(self.gateway_identity)
             .await?;
 
         #[cfg(feature = "coconut")]
@@ -592,10 +584,15 @@ impl GatewayClient {
             return Err(GatewayClientError::NotAuthenticated);
         }
         if self.estimate_required_bandwidth(&packets) > self.bandwidth_remaining {
-            return Err(GatewayClientError::NotEnoughBandwidth(
-                self.estimate_required_bandwidth(&packets),
-                self.bandwidth_remaining,
-            ));
+            // Try to claim more bandwidth first, and return an error only if that is still not
+            // enough (the current granularity for bandwidth should be sufficient)
+            self.claim_bandwidth().await?;
+            if self.estimate_required_bandwidth(&packets) > self.bandwidth_remaining {
+                return Err(GatewayClientError::NotEnoughBandwidth(
+                    self.estimate_required_bandwidth(&packets),
+                    self.bandwidth_remaining,
+                ));
+            }
         }
         if !self.connection.is_established() {
             return Err(GatewayClientError::ConnectionNotEstablished);
@@ -662,10 +659,15 @@ impl GatewayClient {
             return Err(GatewayClientError::NotAuthenticated);
         }
         if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
-            return Err(GatewayClientError::NotEnoughBandwidth(
-                mix_packet.sphinx_packet().len() as i64,
-                self.bandwidth_remaining,
-            ));
+            // Try to claim more bandwidth first, and return an error only if that is still not
+            // enough
+            self.claim_bandwidth().await?;
+            if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
+                return Err(GatewayClientError::NotEnoughBandwidth(
+                    mix_packet.sphinx_packet().len() as i64,
+                    self.bandwidth_remaining,
+                ));
+            }
         }
         if !self.connection.is_established() {
             return Err(GatewayClientError::ConnectionNotEstablished);
@@ -735,12 +737,6 @@ impl GatewayClient {
         }
         let shared_key = self.perform_initial_authentication().await?;
 
-        if self.bandwidth_remaining < REMAINING_BANDWIDTH_THRESHOLD {
-            info!("Claiming more bandwidth for your tokens. This will use {} token(s) from your wallet. \
-            Stop the process now if you don't want that to happen.", TOKENS_TO_BURN);
-            self.claim_bandwidth().await?;
-        }
-
         // this call is NON-blocking
         self.start_listening_for_mixnet_messages()?;
 

common/client-libs/gateway-client/src/error.rs

@@ -8,7 +8,7 @@ use tungstenite::Error as WsError;
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::JsValue;
 #[cfg(not(feature = "coconut"))]
-use web3::{contract::Error as Web3ContractError, Error as Web3Error};
+use web3::Error as Web3Error;
 
 #[derive(Debug, Error)]
 pub enum GatewayClientError {
@@ -27,17 +27,13 @@ pub enum GatewayClientError {
     NetworkErrorWasm(JsValue),
 
     #[cfg(not(feature = "coconut"))]
-    #[error("Keypair IO error - {0}")]
+    #[error("Could not backup keypair - {0}")]
     IOError(#[from] std::io::Error),
 
     #[cfg(not(feature = "coconut"))]
     #[error("Could not burn ERC20 token in Ethereum smart contract - {0}")]
     BurnTokenError(#[from] Web3Error),
 
-    #[cfg(not(feature = "coconut"))]
-    #[error("Could not run web3 contract - {0}")]
-    Web3ContractError(#[from] Web3ContractError),
-
     #[cfg(not(feature = "coconut"))]
     #[error("Invalid Ethereum private key")]
     InvalidEthereumPrivateKey,

common/client-libs/mixnet-client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mixnet-client"
 version = "0.1.0"
 authors = ["Jedrzej Stuczynski <andrew@nymtech.net>"]
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/client-libs/mixnet-client/src/client.rs

@@ -41,17 +41,6 @@ impl Config {
     }
 }
 
-pub trait SendWithoutResponse {
-    // Without response in this context means we will not listen for anything we might get back (not
-    // that we should get anything), including any possible io errors
-    fn send_without_response(
-        &mut self,
-        address: NymNodeRoutingAddress,
-        packet: SphinxPacket,
-        packet_mode: PacketMode,
-    ) -> io::Result<()>;
-}
-
 pub struct Client {
     conn_new: HashMap<NymNodeRoutingAddress, ConnectionSender>,
     config: Config,
@@ -197,10 +186,10 @@ impl Client {
             .await
         });
     }
-}
 
-impl SendWithoutResponse for Client {
-    fn send_without_response(
+    // without response in this context means we will not listen for anything we might get back
+    // (not that we should get anything), including any possible io errors
+    pub fn send_without_response(
         &mut self,
         address: NymNodeRoutingAddress,
         packet: SphinxPacket,

common/client-libs/mixnet-client/src/forwarder.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::client::{Client, Config, SendWithoutResponse};
+use crate::client::{Client, Config};
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;

common/client-libs/mixnet-client/src/lib.rs

@@ -4,4 +4,4 @@
 pub mod client;
 pub mod forwarder;
 
-pub use client::{Client, Config, SendWithoutResponse};
+pub use client::{Client, Config};

common/client-libs/validator-client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "validator-client"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
-edition = "2021"
+edition = "2018"
 rust-version = "1.56"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,7 +10,6 @@ rust-version = "1.56"
 [dependencies]
 base64 = "0.13"
 mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
-vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
 vesting-contract = { path = "../../../contracts/vesting" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -39,9 +38,7 @@ flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
 cosmwasm-std = { version = "1.0.0-beta3", optional = true }
-
-[dev-dependencies]
-ts-rs = "6.1.2"
+ts-rs = { version = "5.1", optional = true }
 
 [features]
 nymd-client = [
@@ -55,3 +52,4 @@ nymd-client = [
     "itertools",
     "cosmwasm-std",
 ]
+typescript-types = ["ts-rs", "validator-api-requests/ts-rs"]

common/client-libs/validator-client/src/client.rs

@@ -1,16 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{validator_api, ValidatorClientError};
-use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
-use mixnet_contract_common::{GatewayBond, IdentityKeyRef, Interval, MixNodeBond};
-use network_defaults::DEFAULT_NETWORK;
-use url::Url;
-use validator_api_requests::models::{
-    CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
-    StakeSaturationResponse,
-};
-
 #[cfg(feature = "nymd-client")]
 use crate::nymd::{
     error::NymdError, CosmWasmClient, NymdClient, QueryNymdClient, SigningNymdClient,
@@ -18,26 +8,33 @@ use crate::nymd::{
 #[cfg(feature = "nymd-client")]
 use mixnet_contract_common::ContractStateParams;
 
+use crate::{validator_api, ValidatorClientError};
+use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 #[cfg(feature = "nymd-client")]
 use mixnet_contract_common::{
-    Delegation, IdentityKey, MixnetContractVersion, MixnodeRewardingStatusResponse,
-    RewardedSetNodeStatus, RewardedSetUpdateDetails,
+    Delegation, Interval, MixnetContractVersion, MixnodeRewardingStatusResponse,
 };
-#[cfg(feature = "nymd-client")]
+use mixnet_contract_common::{
+    GatewayBond, IdentityKey, IdentityKeyRef, MixNodeBond, RewardedSetNodeStatus,
+    RewardedSetUpdateDetails,
+};
+
 use std::collections::{HashMap, HashSet};
 #[cfg(feature = "nymd-client")]
 use std::str::FromStr;
+use url::Url;
+use validator_api_requests::models::{
+    CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
+    StakeSaturationResponse,
+};
 
 #[cfg(feature = "nymd-client")]
 #[must_use]
-#[derive(Debug)]
 pub struct Config {
-    network: network_defaults::all::Network,
     api_url: Url,
     nymd_url: Url,
     mixnet_contract_address: Option<cosmrs::AccountId>,
     vesting_contract_address: Option<cosmrs::AccountId>,
-    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
 
     mixnode_page_limit: Option<u32>,
     gateway_page_limit: Option<u32>,
@@ -48,19 +45,15 @@ pub struct Config {
 #[cfg(feature = "nymd-client")]
 impl Config {
     pub fn new(
-        network: network_defaults::all::Network,
         nymd_url: Url,
         api_url: Url,
         mixnet_contract_address: Option<cosmrs::AccountId>,
         vesting_contract_address: Option<cosmrs::AccountId>,
-        erc20_bridge_contract_address: Option<cosmrs::AccountId>,
     ) -> Self {
         Config {
-            network,
             nymd_url,
             mixnet_contract_address,
             vesting_contract_address,
-            erc20_bridge_contract_address,
             api_url,
             mixnode_page_limit: None,
             gateway_page_limit: None,
@@ -92,10 +85,8 @@ impl Config {
 
 #[cfg(feature = "nymd-client")]
 pub struct Client<C> {
-    pub network: network_defaults::all::Network,
     mixnet_contract_address: Option<cosmrs::AccountId>,
     vesting_contract_address: Option<cosmrs::AccountId>,
-    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
     mnemonic: Option<bip39::Mnemonic>,
 
     mixnode_page_limit: Option<u32>,
@@ -116,20 +107,16 @@ impl Client<SigningNymdClient> {
     ) -> Result<Client<SigningNymdClient>, ValidatorClientError> {
         let validator_api_client = validator_api::Client::new(config.api_url.clone());
         let nymd_client = NymdClient::connect_with_mnemonic(
-            config.network,
             config.nymd_url.as_str(),
             config.mixnet_contract_address.clone(),
             config.vesting_contract_address.clone(),
-            config.erc20_bridge_contract_address.clone(),
             mnemonic.clone(),
             None,
         )?;
 
         Ok(Client {
-            network: config.network,
             mixnet_contract_address: config.mixnet_contract_address,
             vesting_contract_address: config.vesting_contract_address,
-            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
             mnemonic: Some(mnemonic),
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
@@ -142,11 +129,9 @@ impl Client<SigningNymdClient> {
 
     pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
         self.nymd = NymdClient::connect_with_mnemonic(
-            self.network,
             new_endpoint.as_ref(),
             self.mixnet_contract_address.clone(),
             self.vesting_contract_address.clone(),
-            self.erc20_bridge_contract_address.clone(),
             self.mnemonic.clone().unwrap(),
             None,
         )?;
@@ -161,29 +146,18 @@ impl Client<QueryNymdClient> {
         let nymd_client = NymdClient::connect(
             config.nymd_url.as_str(),
             Some(config.mixnet_contract_address.clone().unwrap_or_else(|| {
-                cosmrs::AccountId::from_str(DEFAULT_NETWORK.mixnet_contract_address()).unwrap()
+                cosmrs::AccountId::from_str(network_defaults::DEFAULT_MIXNET_CONTRACT_ADDRESS)
+                    .unwrap()
             })),
             Some(config.vesting_contract_address.clone().unwrap_or_else(|| {
-                cosmrs::AccountId::from_str(DEFAULT_NETWORK.vesting_contract_address()).unwrap()
+                cosmrs::AccountId::from_str(network_defaults::DEFAULT_VESTING_CONTRACT_ADDRESS)
+                    .unwrap()
             })),
-            Some(
-                config
-                    .erc20_bridge_contract_address
-                    .clone()
-                    .unwrap_or_else(|| {
-                        cosmrs::AccountId::from_str(
-                            DEFAULT_NETWORK.bandwidth_claim_contract_address(),
-                        )
-                        .unwrap()
-                    }),
-            ),
         )?;
 
         Ok(Client {
-            network: config.network,
             mixnet_contract_address: config.mixnet_contract_address,
             vesting_contract_address: config.vesting_contract_address,
-            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
             mnemonic: None,
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
@@ -199,7 +173,6 @@ impl Client<QueryNymdClient> {
             new_endpoint.as_ref(),
             self.mixnet_contract_address.clone(),
             self.vesting_contract_address.clone(),
-            self.erc20_bridge_contract_address.clone(),
         )?;
         Ok(())
     }
@@ -248,40 +221,11 @@ impl<C> Client<C> {
         Ok(self.nymd.get_contract_settings().await?)
     }
 
-    pub async fn get_operator_rewards(&self, address: String) -> Result<u128, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_operator_rewards(address).await?.u128())
-    }
-
-    pub async fn get_delegator_rewards(
-        &self,
-        address: String,
-        mix_identity: IdentityKey,
-    ) -> Result<u128, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self
-            .nymd
-            .get_delegator_rewards(address, mix_identity)
-            .await?
-            .u128())
-    }
-
-    pub async fn get_current_epoch(&self) -> Result<Option<Interval>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_current_epoch().await?)
-    }
-
     pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
     where
         C: CosmWasmClient + Sync,
     {
-        self.nymd.get_mixnet_contract_version().await
+        Ok(self.nymd.get_mixnet_contract_version().await?)
     }
 
     pub async fn get_rewarding_status(
@@ -305,6 +249,13 @@ impl<C> Client<C> {
         Ok(self.nymd.get_reward_pool().await?.u128())
     }
 
+    pub async fn get_current_interval(&self) -> Result<Interval, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.nymd.get_current_interval().await?)
+    }
+
     pub async fn get_circulating_supply(&self) -> Result<u128, ValidatorClientError>
     where
         C: CosmWasmClient + Sync,
@@ -326,13 +277,6 @@ impl<C> Client<C> {
         Ok(self.nymd.get_active_set_work_factor().await?)
     }
 
-    pub async fn get_epochs_in_interval(&self) -> Result<u64, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_epochs_in_interval().await?)
-    }
-
     pub async fn get_interval_reward_percent(&self) -> Result<u8, ValidatorClientError>
     where
         C: CosmWasmClient + Sync,

common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::helpers::{create_pagination, next_page_key};
+use crate::nymd::cosmwasm_client::helpers::create_pagination;
 use crate::nymd::cosmwasm_client::types::{
     Account, Code, CodeDetails, Contract, ContractCodeHistoryEntry, ContractCodeId,
     SequenceResponse, SimulateResponse,
@@ -150,8 +150,8 @@ pub trait CosmWasmClient: rpc::Client {
                 .await?;
 
             raw_balances.append(&mut res.balances);
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
+            if let Some(pagination_info) = res.pagination {
+                pagination = Some(create_pagination(pagination_info.next_key))
             } else {
                 break;
             }
@@ -182,8 +182,8 @@ pub trait CosmWasmClient: rpc::Client {
                 .await?;
 
             supply.append(&mut res.supply);
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
+            if let Some(pagination_info) = res.pagination {
+                pagination = Some(create_pagination(pagination_info.next_key))
             } else {
                 break;
             }
@@ -274,8 +274,8 @@ pub trait CosmWasmClient: rpc::Client {
                 .await?;
 
             raw_codes.append(&mut res.code_infos);
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
+            if let Some(pagination_info) = res.pagination {
+                pagination = Some(create_pagination(pagination_info.next_key))
             } else {
                 break;
             }
@@ -319,8 +319,8 @@ pub trait CosmWasmClient: rpc::Client {
                 .await?;
 
             raw_contracts.append(&mut res.contracts);
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
+            if let Some(pagination_info) = res.pagination {
+                pagination = Some(create_pagination(pagination_info.next_key))
             } else {
                 break;
             }
@@ -375,8 +375,8 @@ pub trait CosmWasmClient: rpc::Client {
                 .await?;
 
             raw_entries.append(&mut res.entries);
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
+            if let Some(pagination_info) = res.pagination {
+                pagination = Some(create_pagination(pagination_info.next_key))
             } else {
                 break;
             }

common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::nymd::error::NymdError;
-use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
+use cosmrs::proto::cosmos::base::query::v1beta1::PageRequest;
 use cosmrs::rpc::endpoint::broadcast;
 use flate2::write::GzEncoder;
 use flate2::Compression;
@@ -53,15 +53,3 @@ pub(crate) fn create_pagination(key: Vec<u8>) -> PageRequest {
         count_total: false,
     }
 }
-
-pub(crate) fn next_page_key(pagination_info: Option<PageResponse>) -> Option<Vec<u8>> {
-    if let Some(next_page_info) = pagination_info {
-        // it turns out, even though `PageResponse` is always returned wrapped in an `Option`,
-        // the `next_key` can still be empty, so check whether we actually need to perform another call
-        if !next_page_info.next_key.is_empty() {
-            return Some(next_page_info.next_key);
-        }
-    }
-
-    None
-}

common/client-libs/validator-client/src/nymd/cosmwasm_client/mod.rs

@@ -21,10 +21,10 @@ where
 }
 
 // maybe the wallet could be made into a generic, but for now, let's just have this one implementation
-pub fn connect_with_signer<U: Clone>(
+pub fn connect_with_signer<U>(
     endpoint: U,
     signer: DirectSecp256k1HdWallet,
-    gas_price: GasPrice,
+    gas_price: Option<GasPrice>,
 ) -> Result<signing_client::Client, NymdError>
 where
     U: TryInto<HttpClientUrl, Error = TendermintRpcError>,

common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs

@@ -641,10 +641,10 @@ pub struct Client {
 }
 
 impl Client {
-    pub fn connect_with_signer<U: Clone>(
+    pub fn connect_with_signer<U>(
         endpoint: U,
         signer: DirectSecp256k1HdWallet,
-        gas_price: GasPrice,
+        gas_price: Option<GasPrice>,
     ) -> Result<Self, NymdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
@@ -653,7 +653,7 @@ impl Client {
         Ok(Client {
             rpc_client,
             signer,
-            gas_price,
+            gas_price: gas_price.unwrap_or_default(),
         })
     }
 }

common/client-libs/validator-client/src/nymd/fee/gas_price.rs

@@ -71,9 +71,11 @@ impl FromStr for GasPrice {
     }
 }
 
-impl GasPrice {
-    pub fn new_with_default_price(denom: &str) -> Result<Self, NymdError> {
-        format!("{}{}", defaults::GAS_PRICE_AMOUNT, denom).parse()
+impl Default for GasPrice {
+    fn default() -> Self {
+        format!("{}{}", defaults::GAS_PRICE_AMOUNT, defaults::DENOM)
+            .parse()
+            .unwrap()
     }
 }
 
@@ -83,8 +85,7 @@ mod tests {
 
     #[test]
     fn default_gas_price_is_valid() {
-        let denom = "unym";
-        GasPrice::new_with_default_price(denom).unwrap();
+        let _ = GasPrice::default();
     }
 
     #[test]

common/client-libs/validator-client/src/nymd/fee/helpers.rs

@@ -7,11 +7,7 @@ use cosmrs::Coin;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-#[cfg_attr(test, derive(ts_rs::TS))]
-#[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/operation.ts")
-)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
 #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
 pub enum Operation {
     Upload,
@@ -47,12 +43,8 @@ pub enum Operation {
     CreatePeriodicVestingAccount,
 
     AdvanceCurrentInterval,
-    AdvanceCurrentEpoch,
     WriteRewardedSet,
     ClearRewardedSet,
-    UpdateMixnetAddress,
-    CheckpointMixnodes,
-    ReconcileDelegations,
 }
 
 pub(crate) fn calculate_fee(gas_price: &GasPrice, gas_limit: Gas) -> Coin {
@@ -93,10 +85,6 @@ impl fmt::Display for Operation {
             Operation::AdvanceCurrentInterval => f.write_str("AdvanceCurrentInterval"),
             Operation::WriteRewardedSet => f.write_str("WriteRewardedSet"),
             Operation::ClearRewardedSet => f.write_str("ClearRewardedSet"),
-            Operation::UpdateMixnetAddress => f.write_str("UpdateMixnetAddress"),
-            Operation::CheckpointMixnodes => f.write_str("CheckpointMixnodes"),
-            Operation::ReconcileDelegations => f.write_str("ReconcileDelegations"),
-            Operation::AdvanceCurrentEpoch => f.write_str("AdvanceCurrentEpoch"),
         }
     }
 }
@@ -137,10 +125,6 @@ impl Operation {
             Operation::AdvanceCurrentInterval => 175_000u64.into(),
             Operation::WriteRewardedSet => 175_000u64.into(),
             Operation::ClearRewardedSet => 175_000u64.into(),
-            Operation::UpdateMixnetAddress => 80_000u64.into(),
-            Operation::CheckpointMixnodes => 175_000u64.into(),
-            Operation::ReconcileDelegations => 500_000u64.into(),
-            Operation::AdvanceCurrentEpoch => 175_000u64.into(),
         }
     }
 

common/client-libs/validator-client/src/nymd/mod.rs

@@ -9,8 +9,7 @@ use crate::nymd::cosmwasm_client::types::{
 use crate::nymd::error::NymdError;
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
 use cosmrs::rpc::endpoint::broadcast;
-use cosmrs::rpc::Error as TendermintRpcError;
-use cosmrs::rpc::HttpClientUrl;
+use cosmrs::rpc::{Error as TendermintRpcError, HttpClientUrl};
 use cosmwasm_std::{Coin, Uint128};
 pub use fee::gas_price::GasPrice;
 use fee::helpers::Operation;
@@ -53,7 +52,6 @@ pub struct NymdClient<C> {
     client: C,
     mixnet_contract_address: Option<AccountId>,
     vesting_contract_address: Option<AccountId>,
-    erc20_bridge_contract_address: Option<AccountId>,
     client_address: Option<Vec<AccountId>>,
     custom_gas_limits: HashMap<Operation, Gas>,
     simulated_gas_multiplier: f32,
@@ -64,7 +62,6 @@ impl NymdClient<QueryNymdClient> {
         endpoint: U,
         mixnet_contract_address: Option<AccountId>,
         vesting_contract_address: Option<AccountId>,
-        erc20_bridge_contract_address: Option<AccountId>,
     ) -> Result<NymdClient<QueryNymdClient>, NymdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
@@ -73,9 +70,8 @@ impl NymdClient<QueryNymdClient> {
             client: QueryNymdClient::new(endpoint)?,
             mixnet_contract_address,
             vesting_contract_address,
-            erc20_bridge_contract_address,
             client_address: None,
-            custom_gas_limits: HashMap::default(),
+            custom_gas_limits: Default::default(),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
         })
     }
@@ -83,66 +79,55 @@ impl NymdClient<QueryNymdClient> {
 
 impl NymdClient<SigningNymdClient> {
     // maybe the wallet could be made into a generic, but for now, let's just have this one implementation
-    pub fn connect_with_signer<U: Clone>(
-        network: config::defaults::all::Network,
+    pub fn connect_with_signer<U>(
         endpoint: U,
         mixnet_contract_address: Option<AccountId>,
         vesting_contract_address: Option<AccountId>,
-        erc20_bridge_contract_address: Option<AccountId>,
         signer: DirectSecp256k1HdWallet,
         gas_price: Option<GasPrice>,
     ) -> Result<NymdClient<SigningNymdClient>, NymdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        let denom = network.denom();
         let client_address = signer
             .try_derive_accounts()?
             .into_iter()
             .map(|account| account.address)
             .collect();
-        let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(denom)?);
 
         Ok(NymdClient {
             client: SigningNymdClient::connect_with_signer(endpoint, signer, gas_price)?,
             mixnet_contract_address,
             vesting_contract_address,
-            erc20_bridge_contract_address,
             client_address: Some(client_address),
-            custom_gas_limits: HashMap::default(),
+            custom_gas_limits: Default::default(),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
         })
     }
 
-    pub fn connect_with_mnemonic<U: Clone>(
-        network: config::defaults::all::Network,
+    pub fn connect_with_mnemonic<U>(
         endpoint: U,
         mixnet_contract_address: Option<AccountId>,
         vesting_contract_address: Option<AccountId>,
-        erc20_bridge_contract_address: Option<AccountId>,
         mnemonic: bip39::Mnemonic,
         gas_price: Option<GasPrice>,
     ) -> Result<NymdClient<SigningNymdClient>, NymdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        let prefix = network.bech32_prefix();
-        let denom = network.denom();
-        let wallet = DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic)?;
+        let wallet = DirectSecp256k1HdWallet::from_mnemonic(mnemonic)?;
         let client_address = wallet
             .try_derive_accounts()?
             .into_iter()
             .map(|account| account.address)
             .collect();
-        let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(denom)?);
 
         Ok(NymdClient {
             client: SigningNymdClient::connect_with_signer(endpoint, wallet, gas_price)?,
             mixnet_contract_address,
             vesting_contract_address,
-            erc20_bridge_contract_address,
             client_address: Some(client_address),
-            custom_gas_limits: HashMap::default(),
+            custom_gas_limits: Default::default(),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
         })
     }
@@ -161,10 +146,11 @@ impl<C> NymdClient<C> {
             .ok_or(NymdError::NoContractAddressAvailable)
     }
 
-    pub fn erc20_bridge_contract_address(&self) -> Result<&AccountId, NymdError> {
-        self.erc20_bridge_contract_address
-            .as_ref()
-            .ok_or(NymdError::NoContractAddressAvailable)
+    // now the question is as follows: will denom always be in the format of `u{prefix}`?
+    pub fn denom(&self) -> Result<Denom, NymdError> {
+        Ok(format!("u{}", self.mixnet_contract_address()?.prefix())
+            .parse()
+            .unwrap())
     }
 
     pub fn address(&self) -> &AccountId
@@ -273,6 +259,16 @@ impl<C> NymdClient<C> {
         self.client.get_balance(address, denom).await
     }
 
+    pub async fn get_mixnet_balance(
+        &self,
+        address: &AccountId,
+    ) -> Result<Option<CosmosCoin>, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.get_balance(address, self.denom()?).await
+    }
+
     pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -290,43 +286,6 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    pub async fn get_operator_rewards(&self, address: String) -> Result<Uint128, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::QueryOperatorReward { address };
-        self.client
-            .query_contract_smart(self.mixnet_contract_address()?, &request)
-            .await
-    }
-
-    pub async fn get_delegator_rewards(
-        &self,
-        address: String,
-        mix_identity: IdentityKey,
-    ) -> Result<Uint128, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::QueryDelegatorReward {
-            address,
-            mix_identity,
-        };
-        self.client
-            .query_contract_smart(self.mixnet_contract_address()?, &request)
-            .await
-    }
-
-    pub async fn get_current_epoch(&self) -> Result<Option<Interval>, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetCurrentEpoch {};
-        self.client
-            .query_contract_smart(self.mixnet_contract_address()?, &request)
-            .await
-    }
-
     pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -406,6 +365,16 @@ impl<C> NymdClient<C> {
             .await
     }
 
+    pub async fn get_current_interval(&self) -> Result<Interval, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let request = QueryMsg::GetCurrentInterval {};
+        self.client
+            .query_contract_smart(self.mixnet_contract_address()?, &request)
+            .await
+    }
+
     pub async fn get_reward_pool(&self) -> Result<Uint128, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -456,16 +425,6 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    pub async fn get_epochs_in_interval(&self) -> Result<u64, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetEpochsInInterval {};
-        self.client
-            .query_contract_smart(self.mixnet_contract_address()?, &request)
-            .await
-    }
-
     /// Checks whether there is a bonded mixnode associated with the provided client's address
     pub async fn owns_mixnode(&self, address: &AccountId) -> Result<Option<MixNodeBond>, NymdError>
     where
@@ -534,7 +493,7 @@ impl<C> NymdClient<C> {
     pub async fn get_mix_delegations_paged(
         &self,
         mix_identity: IdentityKey,
-        start_after: Option<(String, u64)>,
+        start_after: Option<String>,
         page_limit: Option<u32>,
     ) -> Result<PagedMixDelegationsResponse, NymdError>
     where
@@ -553,7 +512,7 @@ impl<C> NymdClient<C> {
     /// Gets list of all mixnode delegations on particular page.
     pub async fn get_all_network_delegations_paged(
         &self,
-        start_after: Option<(IdentityKey, Vec<u8>, u64)>,
+        start_after: Option<(IdentityKey, String)>,
         page_limit: Option<u32>,
     ) -> Result<PagedAllDelegationsResponse, NymdError>
     where
@@ -1213,58 +1172,20 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    pub async fn advance_current_epoch(&self) -> Result<ExecuteResult, NymdError>
+    pub async fn advance_current_interval(&self) -> Result<ExecuteResult, NymdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
-        let fee = self.operation_fee(Operation::AdvanceCurrentEpoch);
+        let fee = self.operation_fee(Operation::AdvanceCurrentInterval);
 
-        let req = ExecuteMsg::AdvanceCurrentEpoch {};
+        let req = ExecuteMsg::AdvanceCurrentInterval {};
         self.client
             .execute(
                 self.address(),
                 self.mixnet_contract_address()?,
                 &req,
                 fee,
-                "Advance current epoch",
-                Vec::new(),
-            )
-            .await
-    }
-
-    pub async fn reconcile_delegations(&self) -> Result<ExecuteResult, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = self.operation_fee(Operation::ReconcileDelegations);
-
-        let req = ExecuteMsg::ReconcileDelegations {};
-        self.client
-            .execute(
-                self.address(),
-                self.mixnet_contract_address()?,
-                &req,
-                fee,
-                "Reconciling delegation events",
-                Vec::new(),
-            )
-            .await
-    }
-
-    pub async fn checkpoint_mixnodes(&self) -> Result<ExecuteResult, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = self.operation_fee(Operation::CheckpointMixnodes);
-
-        let req = ExecuteMsg::CheckpointMixnodes {};
-        self.client
-            .execute(
-                self.address(),
-                self.mixnet_contract_address()?,
-                &req,
-                fee,
-                "Snapshotting mixnodes",
+                "Advancing current interval",
                 Vec::new(),
             )
             .await

common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs

@@ -6,10 +6,7 @@ use crate::nymd::error::NymdError;
 use crate::nymd::NymdClient;
 use async_trait::async_trait;
 use cosmwasm_std::{Coin, Timestamp};
-use vesting_contract::vesting::Account;
-use vesting_contract_common::{
-    messages::QueryMsg as VestingQueryMsg, OriginalVestingResponse, Period, PledgeData,
-};
+use vesting_contract::messages::QueryMsg as VestingQueryMsg;
 
 #[async_trait]
 pub trait VestingQueryClient {
@@ -45,10 +42,7 @@ pub trait VestingQueryClient {
     async fn vesting_end_time(&self, vesting_account_address: &str)
         -> Result<Timestamp, NymdError>;
 
-    async fn original_vesting(
-        &self,
-        vesting_account_address: &str,
-    ) -> Result<OriginalVestingResponse, NymdError>;
+    async fn original_vesting(&self, vesting_account_address: &str) -> Result<Coin, NymdError>;
 
     async fn delegated_free(
         &self,
@@ -61,14 +55,6 @@ pub trait VestingQueryClient {
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
     ) -> Result<Coin, NymdError>;
-
-    async fn get_account(&self, address: &str) -> Result<Account, NymdError>;
-    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError>;
-    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError>;
-    async fn get_current_vesting_period(
-        &self,
-        vesting_account_address: &str,
-    ) -> Result<Period, NymdError>;
 }
 
 #[async_trait]
@@ -151,10 +137,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .await
     }
 
-    async fn original_vesting(
-        &self,
-        vesting_account_address: &str,
-    ) -> Result<OriginalVestingResponse, NymdError> {
+    async fn original_vesting(&self, vesting_account_address: &str) -> Result<Coin, NymdError> {
         let request = VestingQueryMsg::GetOriginalVesting {
             vesting_account_address: vesting_account_address.to_string(),
         };
@@ -190,38 +173,4 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
-
-    async fn get_account(&self, address: &str) -> Result<Account, NymdError> {
-        let request = VestingQueryMsg::GetAccount {
-            address: address.to_string(),
-        };
-        self.client
-            .query_contract_smart(self.vesting_contract_address()?, &request)
-            .await
-    }
-    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
-        let request = VestingQueryMsg::GetMixnode {
-            address: address.to_string(),
-        };
-        self.client
-            .query_contract_smart(self.vesting_contract_address()?, &request)
-            .await
-    }
-    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
-        let request = VestingQueryMsg::GetGateway {
-            address: address.to_string(),
-        };
-        self.client
-            .query_contract_smart(self.vesting_contract_address()?, &request)
-            .await
-    }
-
-    async fn get_current_vesting_period(&self, address: &str) -> Result<Period, NymdError> {
-        let request = VestingQueryMsg::GetCurrentVestingPeriod {
-            address: address.to_string(),
-        };
-        self.client
-            .query_contract_smart(self.vesting_contract_address()?, &request)
-            .await
-    }
 }

common/client-libs/validator-client/src/nymd/traits/vesting_signing_client.rs

@@ -9,17 +9,10 @@ use crate::nymd::{cosmwasm_coin_to_cosmos_coin, NymdClient};
 use async_trait::async_trait;
 use cosmwasm_std::Coin;
 use mixnet_contract_common::{Gateway, IdentityKey, IdentityKeyRef, MixNode};
-use vesting_contract_common::messages::{ExecuteMsg as VestingExecuteMsg, VestingSpecification};
+use vesting_contract::messages::ExecuteMsg as VestingExecuteMsg;
 
 #[async_trait]
 pub trait VestingSigningClient {
-    async fn vesting_update_mixnode_config(
-        &self,
-        profix_margin_percent: u8,
-    ) -> Result<ExecuteResult, NymdError>;
-
-    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError>;
-
     async fn vesting_bond_gateway(
         &self,
         gateway: Gateway,
@@ -73,7 +66,7 @@ pub trait VestingSigningClient {
         &self,
         owner_address: &str,
         staking_address: Option<String>,
-        vesting_spec: Option<VestingSpecification>,
+        start_time: Option<u64>,
         amount: Coin,
     ) -> Result<ExecuteResult, NymdError>;
 }
@@ -90,7 +83,6 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         let req = VestingExecuteMsg::BondGateway {
             gateway,
             owner_signature: owner_signature.to_string(),
-            amount: pledge,
         };
         self.client
             .execute(
@@ -99,7 +91,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
                 &req,
                 fee,
                 "VestingContract::BondGateway",
-                vec![],
+                vec![cosmwasm_coin_to_cosmos_coin(pledge)],
             )
             .await
     }
@@ -151,7 +143,6 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         let req = VestingExecuteMsg::BondMixnode {
             mix_node,
             owner_signature: owner_signature.to_string(),
-            amount: pledge,
         };
         self.client
             .execute(
@@ -160,7 +151,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
                 &req,
                 fee,
                 "VestingContract::BondMixnode",
-                vec![],
+                vec![cosmwasm_coin_to_cosmos_coin(pledge)],
             )
             .await
     }
@@ -248,7 +239,6 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         let fee = self.operation_fee(Operation::DelegateToMixnode);
         let req = VestingExecuteMsg::DelegateToMixnode {
             mix_identity: mix_identity.into(),
-            amount: amount.clone(),
         };
         self.client
             .execute(
@@ -257,7 +247,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
                 &req,
                 fee,
                 "VestingContract::DeledateToMixnode",
-                vec![],
+                vec![cosmwasm_coin_to_cosmos_coin(amount.to_owned())],
             )
             .await
     }
@@ -284,14 +274,14 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         owner_address: &str,
         staking_address: Option<String>,
-        vesting_spec: Option<VestingSpecification>,
+        start_time: Option<u64>,
         amount: Coin,
     ) -> Result<ExecuteResult, NymdError> {
         let fee = self.operation_fee(Operation::CreatePeriodicVestingAccount);
         let req = VestingExecuteMsg::CreateAccount {
             owner_address: owner_address.to_string(),
             staking_address,
-            vesting_spec,
+            start_time,
         };
         self.client
             .execute(
@@ -304,41 +294,4 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             )
             .await
     }
-
-    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError> {
-        let fee = self.operation_fee(Operation::UpdateMixnetAddress);
-        let req = VestingExecuteMsg::UpdateMixnetAddress {
-            address: address.to_string(),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address()?,
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetAddress",
-                vec![],
-            )
-            .await
-    }
-
-    async fn vesting_update_mixnode_config(
-        &self,
-        profit_margin_percent: u8,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = self.operation_fee(Operation::UpdateMixnodeConfig);
-        let req = VestingExecuteMsg::UpdateMixnodeConfig {
-            profit_margin_percent,
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address()?,
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetConfig",
-                vec![],
-            )
-            .await
-    }
 }

common/client-libs/validator-client/src/nymd/wallet/mod.rs

@@ -57,18 +57,18 @@ pub struct DirectSecp256k1HdWallet {
 }
 
 impl DirectSecp256k1HdWallet {
-    pub fn builder(prefix: &str) -> DirectSecp256k1HdWalletBuilder {
-        DirectSecp256k1HdWalletBuilder::new(prefix)
+    pub fn builder() -> DirectSecp256k1HdWalletBuilder {
+        DirectSecp256k1HdWalletBuilder::default()
     }
 
     /// Restores a wallet from the given BIP39 mnemonic using default options.
-    pub fn from_mnemonic(prefix: &str, mnemonic: bip39::Mnemonic) -> Result<Self, NymdError> {
-        DirectSecp256k1HdWalletBuilder::new(prefix).build(mnemonic)
+    pub fn from_mnemonic(mnemonic: bip39::Mnemonic) -> Result<Self, NymdError> {
+        DirectSecp256k1HdWalletBuilder::new().build(mnemonic)
     }
 
-    pub fn generate(prefix: &str, word_count: usize) -> Result<Self, NymdError> {
+    pub fn generate(word_count: usize) -> Result<Self, NymdError> {
         let mneomonic = bip39::Mnemonic::generate(word_count)?;
-        Self::from_mnemonic(prefix, mneomonic)
+        Self::from_mnemonic(mneomonic)
     }
 
     fn derive_keypair(&self, hd_path: &DerivationPath) -> Result<Secp256k1Keypair, NymdError> {
@@ -145,14 +145,20 @@ pub struct DirectSecp256k1HdWalletBuilder {
     prefix: String,
 }
 
-impl DirectSecp256k1HdWalletBuilder {
-    pub fn new(prefix: &str) -> Self {
+impl Default for DirectSecp256k1HdWalletBuilder {
+    fn default() -> Self {
         DirectSecp256k1HdWalletBuilder {
             bip39_password: String::new(),
             hd_paths: vec![defaults::COSMOS_DERIVATION_PATH.parse().unwrap()],
-            prefix: prefix.into(),
+            prefix: defaults::BECH32_PREFIX.to_string(),
         }
     }
+}
+
+impl DirectSecp256k1HdWalletBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
 
     pub fn with_bip39_password<S: Into<String>>(mut self, password: S) -> Self {
         self.bip39_password = password.into();
@@ -197,11 +203,11 @@ impl DirectSecp256k1HdWalletBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use network_defaults::DEFAULT_NETWORK;
+    use network_defaults::BECH32_PREFIX;
 
     #[test]
     fn generating_account_addresses() {
-        let (addr1, addr2, addr3) = match DEFAULT_NETWORK.bech32_prefix() {
+        let (addr1, addr2, addr3) = match BECH32_PREFIX {
             "punk" => (
                 "punk1jw6mp7d5xqc7w6xm79lha27glmd0vdt32a3fj2",
                 "punk1h5hgn94nsq4kh99rjj794hr5h5q6yfm22mcqqn",
@@ -222,9 +228,7 @@ mod tests {
         ];
 
         for (mnemonic, address) in mnemonic_address.into_iter() {
-            let prefix = DEFAULT_NETWORK.bech32_prefix();
-            let wallet =
-                DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic.parse().unwrap()).unwrap();
+            let wallet = DirectSecp256k1HdWallet::from_mnemonic(mnemonic.parse().unwrap()).unwrap();
             assert_eq!(
                 wallet.try_derive_accounts().unwrap()[0].address,
                 address.parse().unwrap()

common/coconut-interface/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "coconut-interface"
 version = "0.1.0"
-edition = "2021"
+edition = "2018"
 description = "Crutch library until there is proper SerDe support for coconut structs"
 
 [dependencies]

common/coconut-interface/src/lib.rs

@@ -83,6 +83,8 @@ impl VerifyCredentialBody {
 pub struct BlindSignRequestBody {
     #[getset(get = "pub")]
     blind_sign_request: BlindSignRequest,
+    #[getset(get = "pub")]
+    public_key: nymcoconut::PublicKey,
     public_attributes: Vec<String>,
     #[getset(get = "pub")]
     total_params: u32,
@@ -91,11 +93,13 @@ pub struct BlindSignRequestBody {
 impl BlindSignRequestBody {
     pub fn new(
         blind_sign_request: &BlindSignRequest,
+        public_key: &nymcoconut::PublicKey,
         public_attributes: &[Attribute],
         total_params: u32,
     ) -> BlindSignRequestBody {
         BlindSignRequestBody {
             blind_sign_request: blind_sign_request.clone(),
+            public_key: public_key.clone(),
             public_attributes: public_attributes
                 .iter()
                 .map(|attr| attr.to_bs58())