Add more data in ephemera blocks

Skip with serde ephemera config
Merge remote-tracking branch 'origin/develop' into feature/ephemera
2023-07-20 15:33:12 +03:00 · 2023-07-18 16:07:04 +03:00 · 2023-07-18 12:41:27 +03:00 · 2023-07-18 12:15:20 +03:00 · 2023-07-18 12:12:53 +03:00 · 2023-07-17 13:25:31 +03:00
684 changed files with 32836 additions and 6030 deletions
@@ -2,7 +2,7 @@
 name: 'Documentation'
 about: Suggest a fix or enhancement to the documentation or developer portal content
 title: "[DOCS]"
-labels: documentation
+labels: documentation, needs-triage
 assignees: mfahampshire
 ---
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an enhancement to the product
 title: "[Feature Request]"
-labels: enhancement
+labels: enhancement, needs-triage
 assignees: ''
 ---
@@ -2,7 +2,7 @@
 name: Report
 about: To help identify and reproduce issues
 title: "[Issue]"
-labels: bug, bug-needs-triage, qa
+labels: bug, bug-needs-triage, qa, needs-triage
 assignees: tommyv1987
 ---
@@ -38,7 +38,7 @@ jobs:
      - name: install npm
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Matrix - Node Install
        run: npm install
        working-directory: .github/workflows/support-files
@@ -109,6 +109,7 @@ jobs:
          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/nym_service_provider_directory.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/nym_name_service.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/nym_ephemera.wasm $OUTPUT_DIR
      - name: Deploy branch to CI www
        continue-on-error: true
@@ -16,7 +16,7 @@ jobs:
    - uses: rlespinasse/github-slug-action@v3.x
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
    - name: Setup yarn
      run: npm install -g yarn
    - name: Build
@@ -16,7 +16,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -16,7 +16,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -16,7 +16,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -16,7 +16,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -20,11 +20,17 @@ jobs:
    - uses: rlespinasse/github-slug-action@v3.x
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
    - name: Install Yarn
      run: npm install -g yarn
-    - run: yarn
+    
    - name: Install project dependencies
      run: cd ../.. && yarn --network-timeout 100000
    - name: Install app dependencies
      run: yarn
      continue-on-error: true
    - name: Set environment from the example
      run: cp .env.sample .env
    - run: yarn storybook:build
@@ -1,24 +0,0 @@
 name: Linting for Network Explorer (eslint/prettier)
 on:
  pull_request:
    paths:
      - 'explorer/**'
 defaults:
  run:
    working-directory: explorer
 jobs:
  build:
    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v3
        with:
          node-version: 16
      - name: Setup yarn
        run: npm install -g yarn
      - name: Run ESLint
        # GitHub should automatically annotate the PR
        run: yarn && yarn lint
@@ -21,7 +21,7 @@ jobs:
    - uses: rlespinasse/github-slug-action@v3.x
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
    - name: Setup yarn
      run: npm install -g yarn
      continue-on-error: true
@@ -152,7 +152,7 @@ jobs:
        uses: actions/setup-node@v3
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
-          node-version: 16
+          node-version: 18
      - name: Matrix - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
@@ -167,7 +167,7 @@ jobs:
        uses: actions/setup-node@v3
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
-          node-version: 16
+          node-version: 18
      - name: Matrix - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
@@ -167,7 +167,7 @@ jobs:
        uses: actions/setup-node@v3
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
-          node-version: 16
+          node-version: 18
      - name: Matrix - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
@@ -15,15 +15,22 @@ jobs:
      fail-fast: false
      matrix:
        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - uses: actions/checkout@v2
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -51,11 +58,15 @@ jobs:
          security list-keychain -d user -s $KEYCHAIN_PATH
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies and build it
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,7 +84,7 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect_1.0.0_x64.dmg
-          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg
+          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1*_x64.dmg
          retention-days: 30
      - name: Clean up keychain
@@ -81,10 +92,38 @@ jobs:
        run: |
          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-      - name: Upload to release based on tag name
+      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/dmg/*.dmg
            nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-connect_$version_x64.dmg" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/dmg/nym-connect_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-connect/desktop/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect.app.tar.gz
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect.app.tar.gz.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: NymConnect
      category: connect
      platform: MacOS
    secrets: inherit
@@ -15,8 +15,15 @@ jobs:
      fail-fast: false
      matrix:
        platform: [custom-runner-linux]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - uses: actions/checkout@v2
@@ -26,19 +33,25 @@ jobs:
          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
        continue-on-error: true
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        run: yarn
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -53,13 +66,41 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect.AppImage.tar.gz
-          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage
+          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1*_amd64.AppImage
          retention-days: 30
-      - name: Upload to release based on tag name
+      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-connect_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/appimage/nym-connect_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-connect/desktop/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect_${{ needs.publish-tauri.outputs.version }}_amd64.AppImage.tar.gz
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect_${{ needs.publish-tauri.outputs.version }}_amd64.AppImage.tar.gz.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: NymConnect
      category: connect
      platform: Ubuntu
    secrets: inherit
@@ -15,8 +15,15 @@ jobs:
      fail-fast: false
      matrix:
        platform: [windows10]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - name: Clean up first
        continue-on-error: true
@@ -39,10 +46,10 @@ jobs:
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -50,15 +57,21 @@ jobs:
          toolchain: stable
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        shell: bash
        run: yarn --network-timeout 100000
      - name: Build and sign it
        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
@@ -72,13 +85,41 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect_1.0.0_x64_en-US.msi
-          path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi
+          path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1*_x64_en-US.msi
          retention-days: 30
-      - name: Upload to release based on tag name
+      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/msi/*.msi
            nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-connect_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/msi/nym-connect_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-connect/desktop/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect_${{ needs.publish-tauri.outputs.version }}_x64_en-US.msi.zip
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-connect_${{ needs.publish-tauri.outputs.version }}_x64_en-US.msi.zip.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: NymConnect
      category: connect
      platform: Windows
    secrets: inherit
@@ -0,0 +1,104 @@
 name: Publish Nym Connect - desktop (MacOS)
 on:
  workflow_dispatch:
    inputs:
      release_tag:
        required: true
        description: Release tag (nym-connect-s-v*)
        type: string
        default: 'nym-connect-s-v1.0.0'
  push:
    tags:
      - nym-connect-s-v*
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      fail-fast: false
      matrix:
        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}
    steps:
      - uses: actions/checkout@v2
      - name: Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - 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: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Prepare for build
        env:
          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
        run: ./scripts/pre_medium_build.sh
      - 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 }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
          NYM_CONNECT_ENABLE_MEDIUM: 1
        run: yarn && yarn build
      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect-s_1.0.0_x64.dmg
          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect-s_1*_x64.dmg
          retention-days: 30
      - name: Clean up keychain
        if: ${{ always() }}
        run: |
          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/dmg/*.dmg
            nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
@@ -0,0 +1,85 @@
 name: Publish NymConnect S - desktop (Ubuntu)
 on:
  workflow_dispatch:
    inputs:
      release_tag:
        required: true
        description: Release tag (nym-connect-s-v*)
        type: string
        default: 'nym-connect-s-v1.0.0'
  push:
    tags:
      - nym-connect-s-v*
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      fail-fast: false
      matrix:
        platform: [custom-runner-linux]
    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 libayatana-appindicator3-dev
        continue-on-error: true
      - name: Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        run: yarn
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Prepare for build
        env:
          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
        run: ./scripts/pre_medium_build.sh
      - name: Build app
        run: yarn build
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
          NYM_CONNECT_ENABLE_MEDIUM: 1
      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect-s.AppImage.tar.gz
          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect-s_1*_amd64.AppImage
          retention-days: 30
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
@@ -0,0 +1,104 @@
 name: Publish Nym Connect - desktop (Windows 10)
 on:
  workflow_dispatch:
    inputs:
      release_tag:
        required: true
        description: Release tag (nym-connect-s-v*)
        type: string
        default: 'nym-connect-s-v1.0.0'
  push:
    tags:
      - nym-connect-s-v*
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-s-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      fail-fast: false
      matrix:
        platform: [windows10]
    runs-on: ${{ matrix.platform }}
    steps:
      - name: Clean up first
        continue-on-error: true
        working-directory: .
        run: |
          cd ..
          del /s /q /A:H nym
          rmdir /s /q nym
      - uses: actions/checkout@v3
      - name: Import signing certificate
        env:
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
        run: |
          New-Item -ItemType directory -Path certificate
          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
      - name: Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        shell: bash
        run: yarn --network-timeout 100000
      - name: Prepare for build
        env:
          RELEASE_TAG: ${{ github.ref_name || inputs.release_tag }}
        run: ./scripts/pre_medium_build.sh
      - name: Build and sign it
        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
          NYM_CONNECT_ENABLE_MEDIUM: 1
        run: yarn build
      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect-s_1.0.0_x64_en-US.msi
          path: nym-connect/desktop/target/release/bundle/msi/nym-connect-s_1*_x64_en-US.msi
          retention-days: 30
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/msi/*.msi
            nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
@@ -2,17 +2,17 @@ name: Publish Nym binaries
 on:
  workflow_dispatch:
-    inputs:  
+    inputs:
      add_tokio_unstable:
        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
        required: true
        default: false
-        type: boolean 
+        type: boolean
  release:
    types: [created]
-    
+
 env:
-  NETWORK: mainnet    
+  NETWORK: mainnet
 jobs:
  publish-nym:
@@ -21,15 +21,33 @@ jobs:
      fail-fast: false
      matrix:
        platform: [custom-runner-linux]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      client_hash: ${{ steps.binary-hashes.outputs.client_hash }}
      mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
      gateway_hash: ${{ steps.binary-hashes.outputs.gateway_hash }}
      socks5_hash: ${{ steps.binary-hashes.outputs.socks5_hash }}
      netreq_hash: ${{ steps.binary-hashes.outputs.netreq_hash }}
      cli_hash: ${{ steps.binary-hashes.outputs.cli_hash }}
      netstat_hash: ${{ steps.binary-hashes.outputs.netstat_hash }}
      client_version: ${{ steps.binary-versions.outputs.client_version }}
      mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
      gateway_version: ${{ steps.binary-versions.outputs.gateway_version }}
      socks5_version: ${{ steps.binary-versions.outputs.socks5_version }}
      netreq_version: ${{ steps.binary-versions.outputs.netreq_version }}
      cli_version: ${{ steps.binary-versions.outputs.cli_version }}
      netstat_version: ${{ steps.binary-versions.outputs.netstat_version }}
    steps:
      - uses: actions/checkout@v3
      - 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 libudev-dev squashfs-tools
+        run: sudo apt-get update && sudo apt-get -y install ripgrep libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
        continue-on-error: true
-            
+
      - name: Sets env vars for tokio if set in manual dispatch inputs
        run: |
          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
@@ -62,7 +80,8 @@ jobs:
            target/release/nym-cli
          retention-days: 30
-      - name: Upload to release based on tag name
+      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
@@ -76,3 +95,150 @@ jobs:
            target/release/nym-network-requester
            target/release/nym-network-statistics
            target/release/nym-cli
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-binaries-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
      - id: binary-hashes
        name: Generate binary hashes
        run: |
          echo "client_hash=${{ hashFiles('target/release/nym-client') }}" >> "$GITHUB_OUTPUT"
          echo "mixnode_hash=${{ hashFiles('target/release/nym-mixnode') }}" >> "$GITHUB_OUTPUT"
          echo "gateway_hash=${{ hashFiles('target/release/nym-gateway') }}" >> "$GITHUB_OUTPUT"
          echo "socks5_hash=${{ hashFiles('target/release/nym-socks5-client') }}" >> "$GITHUB_OUTPUT"
          echo "netreq_hash=${{ hashFiles('target/release/nym-network-requester') }}" >> "$GITHUB_OUTPUT"
          echo "cli_hash=${{ hashFiles('target/release/nym-cli') }}" >> "$GITHUB_OUTPUT"
          echo "netstat_hash=${{ hashFiles('target/release/nym-network-statistics') }}" >> "$GITHUB_OUTPUT"
      - id: binary-versions
        name: Get binary versions
        run: |
          v=$(rg '^version = "(.*)"' -or '$1' clients/native/Cargo.toml) && echo "client_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' mixnode/Cargo.toml) && echo "mixnode_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' gateway/Cargo.toml) && echo "gateway_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' clients/socks5/Cargo.toml) && echo "socks5_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' service-providers/network-requester/Cargo.toml) && echo "netreq_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' tools/nym-cli/Cargo.toml) && echo "cli_version=$v" >> "$GITHUB_OUTPUT"
          v=$(rg '^version = "(.*)"' -or '$1' service-providers/network-statistics/Cargo.toml) && echo "netstat_version=$v" >> "$GITHUB_OUTPUT"
  push-release-data-client:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.client_version }}
      filename: nym-client
      file_hash: ${{ needs.publish-nym.outputs.client_hash }}
      name: Client
      category: binaries
    secrets: inherit
  push-release-data-mixnode:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.mixnode_version }}
      filename: nym-mixnode
      file_hash: ${{ needs.publish-nym.outputs.mixnode_hash }}
      name: Mixnode
      category: binaries
    secrets: inherit
  push-release-data-gateway:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.gateway_version }}
      filename: nym-gateway
      file_hash: ${{ needs.publish-nym.outputs.gateway_hash }}
      name: Gateway
      category: binaries
    secrets: inherit
  push-release-data-socks5:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.socks5_version }}
      filename: nym-socks5-client
      file_hash: ${{ needs.publish-nym.outputs.socks5_hash }}
      name: Socks5 Client
      category: binaries
    secrets: inherit
  push-release-data-network-requester:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.netreq_version }}
      filename: nym-network-requester
      file_hash: ${{ needs.publish-nym.outputs.netreq_hash }}
      name: Network Requester
      category: binaries
    secrets: inherit
  push-release-data-cli:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.cli_version }}
      filename: nym-cli
      file_hash: ${{ needs.publish-nym.outputs.cli_hash }}
      name: Cli
      category: binaries
    secrets: inherit
  push-release-data-network-stat:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-nym
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-nym.outputs.release_id }}
      release_date: ${{ needs.publish-nym.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/CHANGELOG.md
      version: ${{ needs.publish-nym.outputs.netstat_version }}
      filename: nym-network-statistics
      file_hash: ${{ needs.publish-nym.outputs.netstat_hash }}
      name: Network Statistics
      category: binaries
    secrets: inherit
@@ -15,15 +15,22 @@ jobs:
      fail-fast: false
      matrix:
        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - uses: actions/checkout@v2
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -51,11 +58,15 @@ jobs:
          security list-keychain -d user -s $KEYCHAIN_PATH
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies and build it
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -80,11 +91,38 @@ jobs:
        if: ${{ always() }}
        run: |
          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-
+      - id: create-release
-      - name: Upload to release based on tag name
+        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-wallet/target/release/bundle/dmg/*.dmg
            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-wallet_$version_x64.dmg" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/dmg/nym-wallet_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-wallet/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet.app.tar.gz
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet.app.tar.gz.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: Wallet
      category: wallet
      platform: MacOS
    secrets: inherit
@@ -1,5 +1,6 @@
 name: Publish Nym Wallet (Ubuntu)
 on:
  workflow_dispatch:
  release:
    types: [created]
@@ -14,8 +15,15 @@ jobs:
      fail-fast: false
      matrix:
        platform: [custom-runner-linux]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - uses: actions/checkout@v2
@@ -25,19 +33,24 @@ jobs:
          sudo apt-get install -y webkit2gtk-4.0
        continue-on-error: true
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        run: yarn
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -47,9 +60,40 @@ jobs:
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-      - name: Upload to release based on tag name
+
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-wallet/target/release/bundle/appimage/*.AppImage
            nym-wallet/target/release/bundle/appimage/*.AppImage.tar.gz*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-wallet_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/appimage/nym-wallet_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-wallet/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet_${{ needs.publish-tauri.outputs.version }}_amd64.AppImage.tar.gz
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet_${{ needs.publish-tauri.outputs.version }}_amd64.AppImage.tar.gz.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: Wallet
      category: wallet
      platform: Ubuntu
    secrets: inherit
@@ -15,8 +15,15 @@ jobs:
      fail-fast: false
      matrix:
        platform: [windows10]
    runs-on: ${{ matrix.platform }}
    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
    steps:
      - name: Clean up first
        continue-on-error: true
@@ -39,10 +46,10 @@ jobs:
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -50,15 +57,21 @@ jobs:
          toolchain: stable
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
+        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        shell: bash
        run: yarn --network-timeout 100000
      - name: Build and sign it
        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
@@ -75,10 +88,38 @@ jobs:
          path: nym-wallet/target/release/bundle/msi/nym-wallet_1.*.msi
          retention-days: 30
-      - name: Upload to release based on tag name
+      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-wallet/target/release/bundle/msi/*.msi
            nym-wallet/target/release/bundle/msi/*.msi.zip*
      - id: release-info
        name: Prepare release info
        run: |
          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
          echo "version=$semver" >> "$GITHUB_OUTPUT"
          echo "filename=nym-wallet_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/msi/nym-wallet_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
    needs: publish-tauri
    with:
      release_tag: ${{ github.ref_name }}
      release_id: ${{ needs.publish-tauri.outputs.release_id }}
      release_date: ${{ needs.publish-tauri.outputs.release_date }}
      download_base_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}
      changelog_url: https://github.com/nymtech/nym/blob/${{ github.ref_name }}/nym-wallet/CHANGELOG.md
      archive_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet_${{ needs.publish-tauri.outputs.version }}_x64_en-US.msi.zip
      sig_url: https://github.com/nymtech/nym/releases/download/${{ github.ref_name }}/nym-wallet_${{ needs.publish-tauri.outputs.version }}_x64_en-US.msi.zip.sig
      version: ${{ needs.publish-tauri.outputs.version }}
      filename: ${{ needs.publish-tauri.outputs.filename }}
      file_hash: ${{ needs.publish-tauri.outputs.file_hash }}
      name: Wallet
      category: wallet
      platform: Windows
    secrets: inherit
@@ -16,9 +16,15 @@ jobs:
    - uses: rlespinasse/github-slug-action@v3.x
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
    - name: Setup yarn
      run: npm install -g yarn
    - name: Install Rust stable
      uses: actions-rs/toolchain@v1
      with:
        toolchain: stable
    - name: Install wasm-pack
      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh      
    - name: Build dependencies
      run: yarn && yarn build
    - name: Build storybook
@@ -34,10 +34,10 @@ jobs:
          profile: minimal
          toolchain: stable
-      - name: Node v16
+      - name: Node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version: 18
      - name: Install yarn for building application
        run: yarn install
@@ -68,8 +68,10 @@ jobs:
        working-directory: nym-connect/native/android
        env:
          ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
          SENTRY_AUTH_TOKEN: ${{ secrets.NYMS5_ANDROID_SENTRY_AUTH_TOKEN }}
        # build for arm64 and x86_64
        run: |
          echo "auth.token=$SENTRY_AUTH_TOKEN" | tee -a sentry.properties
          ./gradlew :app:assembleArch64Debug
          ./gradlew :app:assembleArch64Release
@@ -107,4 +109,3 @@ jobs:
          files: |
            apk/nyms5-arch64-debug.apk
            apk/nyms5-arch64-release.apk
@@ -0,0 +1,212 @@
 name: Push release data
 env:
  strapi_download_url: 'https://strapi.feat-nym-update-nym-web.websites.dev.nymte.ch/api/downloaders'
  strapi_updater_url: 'https://strapi.feat-nym-update-nym-web.websites.dev.nymte.ch/api/updaters'
 on:
  workflow_call:
    inputs:
      release_tag:
        required: true
        description: Release tag
        type: string
      release_id:
        required: true
        description: Release ID
        type: string
      release_date:
        required: true
        description: Release date
        type: string
      download_base_url:
        required: true
        description: Download base URL
        type: string
      changelog_url:
        required: true
        description: Changelog URL
        type: string
      archive_url:
        required: false
        description: Binary archive URL
        type: string
      sig_url:
        required: false
        description: Archive signature URL
        type: string
      version:
        required: true
        description: Release version (semver)
        type: string
      filename:
        required: true
        description: Binary file name
        type: string
      file_hash:
        required: true
        description: Binary hash (sha256)
        type: string
      name:
        required: true
        description: Name
        type: string
      category:
        required: true
        description: Category
        type: string
      platform:
        required: false
        description: Platform
        type: string
  workflow_dispatch:
    inputs:
      # ⚠ since inputs are limited to 10 max for workflow_dispatch
      # some properties were omitted
      version:
        required: true
        description: Release version (semver)
        type: string
        default: '1.0.0'
      release_id:
        required: true
        description: Release ID
        type: string
        default: '1234'
      release_date:
        required: true
        description: Release date
        type: string
        default: '2023-06-26T10:09:16Z'
      download_base_url:
        required: true
        description: Download base URL
        type: string
        default: 'https://github.com/nymtech/nym/releases/download/nym-wallet-v1.0.0'
      changelog_url:
        required: true
        description: Changelog URL
        type: string
        default: 'https://github.com/nymtech/nym/blob/nym-wallet-v1.0.0/nym-wallet/CHANGELOG.md'
      filename:
        required: true
        description: Binary file name
        type: string
        default: 'nym-wallet_1.0.0_amd64.AppImage'
      file_hash:
        required: true
        description: Binary hash (sha256)
        type: string
        default: 'xxx'
      name:
        required: true
        description: Name
        type: string
        default: 'Wallet'
      category:
        required: true
        description: Category
        default: 'wallet'
        type: choice
        options:
          - wallet
          - connect
          - binaries
      platform:
        required: false
        description: Platform
        default: 'Ubuntu'
        type: choice
        options:
          - Ubuntu
          - Windows
          - MacOS
 jobs:
  push-download-data:
    name: Push download data to Strapi
    runs-on: custom-runner-linux
    steps:
      - name: Release info
        run: |
          echo "version: ${{ inputs.version }}"
          echo "tag: ${{ inputs.release_tag }}"
      - id: get_sig
        name: Get sig
        if: ${{ inputs.sig_url != null }}
        run: |
          output=$(curl -LsSf ${{ inputs.sig_url }})
          echo "sig=$output" >> "$GITHUB_OUTPUT"
      - id: strapi-request
        name: Strapi request
        uses: fjogeleit/http-request-action@v1
        with:
          url: ${{ env.strapi_download_url }}
          method: 'POST'
          bearerToken: ${{ secrets.STRAPI_API_TOKEN_RELEASES }}
          customHeaders: '{"Content-Type": "application/json"}'
          data: |
            {
              "data": {
                "releaseId": "${{ inputs.release_id }}",
                "releaseDate": "${{ inputs.release_date }}",
                "downloadBaseUrl": "${{ inputs.download_base_url }}",
                "changelogUrl": "${{ inputs.changelog_url }}",
                "version": "${{ inputs.version }}",
                "filename": "${{ inputs.filename }}",
                "name": "${{ inputs.name }}",
                "category": "${{ inputs.category }}",
                "platform": "${{ inputs.platform }}",
                "sha256": "${{ inputs.file_hash }}",
                "sig": "${{ steps.get_sig.outputs.sig }}"
              }
            }
      - name: Strapi Response
        run: |
          echo ${{ steps.strapi-request.outputs.response }}
  push-update-data:
    name: Push update data to Strapi
    runs-on: custom-runner-linux
    # only push update data for tauri apps (desktop wallet and NC)
    if: ${{ inputs.category == 'wallet' || inputs.category == 'connect' }}
    steps:
      - name: Release info
        run: |
          echo "version: ${{ inputs.version }}"
          echo "tag: ${{ inputs.release_tag }}"
      - id: get_sig
        name: Get sig
        if: ${{ inputs.sig_url != null }}
        run: |
          output=$(curl -LsSf ${{ inputs.sig_url }})
          echo "sig=$output" >> "$GITHUB_OUTPUT"
      - id: strapi-request
        name: Strapi request
        uses: fjogeleit/http-request-action@v1
        with:
          url: ${{ env.strapi_updater_url }}
          method: 'POST'
          bearerToken: ${{ secrets.STRAPI_API_TOKEN_RELEASES }}
          customHeaders: '{"Content-Type": "application/json"}'
          data: |
            {
              "data": {
                "releaseId": "${{ inputs.release_id }}",
                "releaseDate": "${{ inputs.release_date }}",
                "downloadUrl": "${{ inputs.archive_url }}",
                "changelog": "See ${{ inputs.changelog_url }} for the changelog",
                "version": "${{ inputs.version }}",
                "filename": "${{ inputs.filename }}",
                "category": "${{ inputs.category }}",
                "platform": "${{ inputs.platform }}",
                "sha256": "${{ inputs.file_hash }}",
                "sig": "${{ steps.get_sig.outputs.sig }}"
              }
            }
      - name: Strapi Response
        run: |
          echo ${{ steps.strapi-request.outputs.response }}
@@ -0,0 +1,35 @@
 name: Publish SDK to NPM
 on:
  workflow_dispatch:
 jobs:
  publish:
    runs-on: [custom-runner-linux]
    steps:
      - uses: actions/checkout@v2
      - name: Install Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
          registry-url: 'https://registry.npmjs.org'
      - name: Setup yarn
        run: npm install -g yarn
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
      - name: Install dependencies
        run: yarn
      - name: Build and publish
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
        working-directory: ./sdk/typescript/packages/sdk
        run: scripts/publish.sh
@@ -1 +1 @@
-16
+18
@@ -10,7 +10,7 @@ async function addToContextAndValidate(context) {
 async function getMessageBody(context) {
  try {
    const source = fs
-    .readFileSync("deny.message").toString();
+    .readFileSync("./notifications/deny.message").toString();
    return source;
 } catch (error) {
    console.error(error);
@@ -3,62 +3,70 @@ name: CI for linting Typescript
 on:
  push:
    paths:
-      - 'ts-packages/**'
+      - "ts-packages/**"
-      - 'sdk/typescript/**'
+      - "sdk/typescript/**"
-      - 'nym-connect/desktop/src/**'
+      - "nym-connect/desktop/src/**"
-      - 'nym-connect/desktop/package.json'
+      - "nym-connect/desktop/package.json"
-      - 'nym-connect/mobile/src/**'
+      - "nym-connect/mobile/src/**"
-      - 'nym-connect/mobile/package.json'
+      - "nym-connect/mobile/package.json"
-      - 'nym-wallet/src/**'
+      - "nym-wallet/src/**"
-      - 'nym-wallet/package.json'
+      - "nym-wallet/package.json"
      - "explorer/**"
  pull_request:
    paths:
-      - 'ts-packages/**'
+      - "ts-packages/**"
-      - 'sdk/typescript/**'
+      - "sdk/typescript/**"
-      - 'nym-connect/desktop/src/**'
+      - "nym-connect/desktop/src/**"
-      - 'nym-connect/desktop/package.json'
+      - "nym-connect/desktop/package.json"
-      - 'nym-connect/mobile/src/**'
+      - "nym-connect/mobile/src/**"
-      - 'nym-connect/mobile/package.json'
+      - "nym-connect/mobile/package.json"
-      - 'nym-wallet/src/**'
+      - "nym-wallet/src/**"
-      - 'nym-wallet/package.json'
+      - "nym-wallet/package.json"
      - "explorer/**"
 jobs:
  build:
    runs-on: custom-runner-linux
    steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-    - name: Install rsync
+      - name: Install rsync
-      run: sudo apt-get install rsync
+        run: sudo apt-get install rsync
-      continue-on-error: true
+        continue-on-error: true
-    - uses: rlespinasse/github-slug-action@v3.x
+      - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
-      with:
+        with:
-        node-version: 16
+          node-version: 18
-    - name: Setup yarn
+      - name: Install Rust stable
-      run: npm install -g yarn
+        uses: actions-rs/toolchain@v1
-    - name: Install
+        with:
-      run: yarn
+          toolchain: stable
-    - name: Build packages
+      - name: Install wasm-pack
-      run: yarn build
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Lint
+      - name: Setup yarn
-      run: yarn lint && yarn tsc
+        run: npm install -g yarn
-    - name: Matrix - Node Install
+      - name: Install
-      run: npm install
+        run: yarn
-      working-directory: .github/workflows/support-files
+      - name: Build packages
-    - name: Matrix - Send Notification
+        run: yarn build
-      env:
+      - name: Lint
-        NYM_NOTIFICATION_KIND: ts-packages
+        run: yarn lint && yarn tsc
-        NYM_PROJECT_NAME: "ts-packages"
+      - name: Matrix - Node Install
-        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        run: npm install
-        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
+        working-directory: .github/workflows/support-files
-        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+      - name: Matrix - Send Notification
-        GIT_BRANCH: "${GITHUB_REF##*/}"
+        env:
-        IS_SUCCESS: "${{ job.status == 'success' }}"
+          NYM_NOTIFICATION_KIND: ts-packages
-        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+          NYM_PROJECT_NAME: "ts-packages"
-        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
+          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-        MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+          NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
-        MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-        MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+          GIT_BRANCH: "${GITHUB_REF##*/}"
-      uses: docker://keybaseio/client:stable-node
+          IS_SUCCESS: "${{ job.status == 'success' }}"
-      with:
+          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
-        args: .github/workflows/support-files/notifications/entry_point.sh
+          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
        uses: docker://keybaseio/client:stable-node
        with:
          args: .github/workflows/support-files/notifications/entry_point.sh
@@ -4,6 +4,18 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 ## [Unreleased]
 ## [v1.1.23] (2023-07-04)
 - nym-cli: add client identity key signing support ([#3576])
 - Feature/node tester package ([#3634])
 - Add medium toggle to socks5 client ([#3615])
 - Don't fully turn off background task when cover traffic is disabled ([#3596])
 [#3576]: https://github.com/nymtech/nym/issues/3576
 [#3634]: https://github.com/nymtech/nym/pull/3634
 [#3615]: https://github.com/nymtech/nym/pull/3615
 [#3596]: https://github.com/nymtech/nym/pull/3596
 ## [v1.1.22] (2023-06-20)
 - CLI tool for querying network-requesters ([#3539])
@@ -34,6 +34,7 @@ members = [
    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
    "common/cosmwasm-smart-contracts/coconut-dkg",
    "common/cosmwasm-smart-contracts/contracts-common",
    "common/cosmwasm-smart-contracts/ephemera",
    "common/cosmwasm-smart-contracts/group-contract",
    "common/cosmwasm-smart-contracts/mixnet-contract",
    "common/cosmwasm-smart-contracts/multisig-contract",
@@ -102,7 +103,7 @@ default-members = [
    "explorer-api",
 ]
-exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"]
+exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "nym-browser-extension/storage", "cpu-cycles"]
 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -117,19 +118,21 @@ anyhow = "1.0.71"
 async-trait = "0.1.64"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 cfg-if = "1.0.0"
-cosmwasm-derive = "=1.0.0"
+cosmwasm-derive = "=1.2.5"
-cosmwasm-schema = "=1.0.0"
+cosmwasm-schema = "=1.2.5"
-cosmwasm-std = "=1.0.0"
+cosmwasm-std = "=1.2.5"
-cosmwasm-storage = "=1.0.0"
+cosmwasm-storage = "=1.2.5"
-cw-controllers = "=0.13.4"
+cosmrs = "=0.8.0"
-cw-storage-plus = "=0.13.4"
+cw-utils = "=1.0.1"
-cw-utils = "=0.13.4"
+cw-storage-plus = "=1.0.1"
-cw2 = { version = "=0.13.4" }
+cw2 = { version = "=1.0.1" }
-cw3 = { version = "=0.13.4" }
+cw3 = { version = "=1.0.1" }
-cw3-fixed-multisig = { version = "=0.13.4" }
+cw3-fixed-multisig = { version = "=1.0.1" }
-cw4 = { version = "=0.13.4" }
+cw4 = { version = "=1.0.1" }
 cw-controllers = { version = "=1.0.1" }
 dotenvy = "0.15.6"
 generic-array = "0.14.7"
 k256 = "0.11"
 getrandom = "0.2.10"
 lazy_static = "1.4.0"
 log = "0.4"
@@ -13,7 +13,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 * nym-gateway - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices.
 * nym-network-monitor - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").
 * nym-explorer - a (projected) block explorer and (existing) mixnet viewer.
-* nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework. 
+* nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/nymtech/nym/build.yml?branch=develop&style=for-the-badge&logo=github-actions)](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)
@@ -21,7 +21,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 ### Building
-Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/build-nym.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/pre-built-binaries.html).
 Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).
 ### Developing
@@ -32,9 +32,9 @@ For Typescript components, please see [ts-packages](./ts-packages).
 ### Developer chat
-> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team. 
+> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team.
-You can chat to us in two places: 
+You can chat to us in two places:
 * The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
 * The various developer channels on [Discord](https://discord.gg/nym)
@@ -84,4 +84,3 @@ where `s'` is stake `s` scaled over total token circulating supply.
 ### Licensing and copyright information
 This program is available as open source under the terms of the Apache 2.0 license. However, some elements are being licensed under CC0-1.0 and MIT. For accurate information, please check individual files.
@@ -0,0 +1,53 @@
 <svg
  width="100%"
  height="100%"
  viewBox="0 0 80 80"
  fill="none"
  xmlns="http://www.w3.org/2000/svg"
 >
  <g clip-path="url(#clip0_421_13045)">
    <path
      d="M40 80C62.0914 80 80 62.0914 80 40C80 17.9086 62.0914 0 40 0C17.9086 0 0 17.9086 0 40C0 62.0914 17.9086 80 40 80Z"
      fill="black"
    />
    <path
      d="M40 77.2636C60.5801 77.2636 77.2636 60.5801 77.2636 40C77.2636 19.4199 60.5801 2.73645 40 2.73645C19.4199 2.73645 2.73645 19.4199 2.73645 40C2.73645 60.5801 19.4199 77.2636 40 77.2636Z"
      fill="white"
    />
    <path
      d="M24.0224 32.471H23.9776V32.5084V45.5775L18.4673 32.4934L18.4598 32.471H18.4299H15.3047H11.7981H11.7607V32.5084V47.4916V47.529H11.7981H15.3047H15.3421V47.4916V34.4L20.8748 47.5065L20.8822 47.529H20.9121H24.0224H27.5215H27.5589V47.4916V32.5084V32.471H27.5215H24.0224Z"
      fill="black"
    />
    <path
      fill-rule="evenodd"
      clip-rule="evenodd"
      d="M23.8965 32.39H27.64V47.6101H20.8238L20.7989 47.5352L15.4232 34.8006V47.6101H11.6797V32.39H18.5183L18.5432 32.4649L23.8965 45.1761V32.39ZM23.9776 45.5776L18.4673 32.4935L18.4598 32.471H11.7608V47.529H15.3421V34.4L20.8748 47.5065L20.8823 47.529H27.5589V32.471H23.9776V45.5776Z"
      fill="black"
    />
    <path
      d="M68.2019 32.471H61.5178H61.4804L61.4729 32.5009L58.0486 45.6374L54.6169 32.5009L54.6094 32.471H54.5795H47.8804H47.8355V32.5084V47.4916V47.529H47.8804H51.3795H51.4169V47.4916V34.5047L54.8038 47.499L54.8112 47.529H54.8486H61.2337H61.2636L61.2711 47.499L64.658 34.5047V47.4916V47.529H64.6954H68.2019H68.2393V47.4916V32.5084V32.471H68.2019Z"
      fill="black"
    />
    <path
      fill-rule="evenodd"
      clip-rule="evenodd"
      d="M61.4171 32.39H68.3204V47.6101H64.5769V35.1372L61.3497 47.5187L61.3495 47.5195L61.3269 47.6101H54.7479L54.7253 47.5195L54.7251 47.5187L51.4979 35.1372V47.6101H47.7545V32.39H54.6727L54.6953 32.4804L54.6955 32.4813L58.0485 45.3163L61.3943 32.4813L61.3945 32.4805L61.4171 32.39ZM58.0486 45.6374L54.6168 32.5009L54.6094 32.471H47.8355V47.529H51.4168V34.5047L54.8038 47.4991L54.8112 47.529H61.2636L61.2711 47.4991L64.658 34.5047V47.529H68.2393V32.471H61.4804L61.4729 32.5009L58.0486 45.6374Z"
      fill="black"
    />
    <path
      d="M42.0711 32.471H42.0486L42.0412 32.486L37.7869 39.8804L33.5103 32.486L33.5028 32.471H33.4804H29.4355H29.3608L29.3982 32.5308L35.9851 43.9402V47.4916V47.529H36.0225H39.529H39.5664V47.4916V43.9402L46.1533 32.5308L46.1907 32.471H46.1159H42.0711Z"
      fill="black"
    />
    <path
      fill-rule="evenodd"
      clip-rule="evenodd"
      d="M41.9985 32.39H46.337L46.2228 32.5726L39.6475 43.9619V47.6101H35.904V43.9619L29.3286 32.5726L29.2145 32.39H33.5529L33.5817 32.4475L37.7868 39.7181L41.9697 32.4476L41.9985 32.39ZM42.0411 32.486L37.7869 39.8804L33.5103 32.486L33.5028 32.471H29.3608L29.3981 32.5308L35.9851 43.9402V47.529H39.5664V43.9402L46.1533 32.5308L46.1907 32.471H42.0486L42.0411 32.486Z"
      fill="black"
    />
  </g>
  <defs>
    <clipPath id="clip0_421_13045">
      <rect width="80" height="80" fill="white" />
    </clipPath>
  </defs>
 </svg>
@@ -15,9 +15,9 @@ The credential binary is still experimental software. The infrastructure for usi
 From the project's root directory, run:
 ```
-cargo build -p credential
+cargo build -p nym-credential-client
 ```
-which generates the `credential` binary in `target/debug/credential`.
+which generates the `nym-credential-client` binary in `target/debug/nym-credential-client`.
 ### Running
@@ -25,7 +25,7 @@ which generates the `credential` binary in `target/debug/credential`.
 For example, you can get a credential worth 3 nym (3000000 unym) in a socks5 client that was already initialized like so:
 ```
-./target/debug/credential --config-env-file envs/sandbox.env --client-home-directory  ~/.nym/socks5-clients/cred_client  --nyxd-url  https://sandbox-validator1.nymtech.net --mnemonic $MNEMONIC  --recovery-dir /tmp/recovery --amount 3000000
+./target/debug/nym-credential-client --config-env-file envs/sandbox.env --client-home-directory  ~/.nym/socks5-clients/cred_client  --nyxd-url  https://sandbox-validator1.nymtech.net --mnemonic $MNEMONIC  --recovery-dir /tmp/recovery --amount 3000000
 ```
 More information regarding how to run the binary can be found by running it with the `--help` argument.
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.22"
+version = "1.1.23"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -24,7 +24,6 @@ use std::net::IpAddr;
 pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
 lazy_static! {
    pub static ref PRETTY_BUILD_INFORMATION: String =
@@ -51,10 +50,9 @@ pub(crate) struct Cli {
 pub(crate) enum Commands {
    /// Initialise a Nym client. Do this first!
    Init(init::Init),
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),
    /// Try to upgrade the client
    Upgrade(upgrade::Upgrade),
    /// Generate shell completions
    Completions(ArgShell),
@@ -81,7 +79,6 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
    match &args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
        Commands::Upgrade(m) => upgrade::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
    }
@@ -1,78 +0,0 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::client::config::Config;
 use crate::commands::try_load_current_config;
 use clap::Args;
 use nym_bin_common::version_checker::Version;
 use std::process;
 fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
    process::exit(1)
 }
 #[derive(Args, Clone)]
 pub(crate) struct Upgrade {
    /// Id of the nym-client we want to upgrade
    #[clap(long)]
    id: String,
 }
 fn parse_config_version(config: &Config) -> Version {
    let version = Version::parse(&config.base.client.version).unwrap_or_else(|err| {
        eprintln!("failed to parse client version! - {err}");
        process::exit(1)
    });
    if version.is_prerelease() || !version.build.is_empty() {
        eprintln!(
            "Trying to upgrade from a non-released version {version}. This is not supported!"
        );
        process::exit(1)
    }
    version
 }
 fn parse_package_version() -> Version {
    let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
    // technically this is not a correct way of checking it as a released version might contain valid build identifiers
    // however, we are not using them ourselves at the moment and hence it should be fine.
    // if we change our mind, we could easily tweak this code
    if version.is_prerelease() || !version.build.is_empty() {
        eprintln!("Trying to upgrade to a non-released version {version}. This is not supported!");
        process::exit(1)
    }
    version
 }
 fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
    let config_version = parse_config_version(&config);
    if &config_version == package_version {
        println!("You're using the most recent version!");
        return;
    }
    unimplemented_upgrade(package_version, &config_version)
 }
 pub(crate) fn execute(args: &Upgrade) {
    let package_version = parse_package_version();
    let id = &args.id;
    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {err}");
        process::exit(1)
    });
    if existing_config.base.client.version.is_empty() {
        eprintln!("the existing configuration file does not seem to contain version number.");
        process::exit(1);
    }
    do_upgrade(existing_config, args, &package_version)
 }
@@ -117,10 +117,11 @@ impl Handler {
        let Ok(base_length) = self
            .lane_queue_lengths
            .lock()
-            .map(|guard| guard.get(&conn_lane).unwrap_or_default()) else {
+            .map(|guard| guard.get(&conn_lane).unwrap_or_default())
        else {
            // I'd argue we should panic here as this error it not recoverable
            error!("The lane queue length lock is poisoned!!");
-            return None
+            return None;
        };
        // get the number of pending replies waiting for reply surbs
@@ -174,7 +175,7 @@ impl Handler {
        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-          return None
+            return None;
        };
        self.get_lane_queue_length(connection_id).await
@@ -206,7 +207,7 @@ impl Handler {
        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-          return None
+            return None;
        };
        self.get_lane_queue_length(connection_id).await
@@ -233,7 +234,7 @@ impl Handler {
        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-          return None
+            return None;
        };
        self.get_lane_queue_length(connection_id).await
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 // all variable size data is always prefixed with u64 length
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 // all variable size data is always prefixed with u64 length
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::error::ErrorKind;
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.22"
+version = "1.1.23"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -94,6 +94,7 @@ impl From<Init> for OverrideConfig {
            use_anonymous_replies: init_config.use_reply_surbs,
            fastmode: init_config.fastmode,
            no_cover: init_config.no_cover,
            medium_toggle: false,
            nyxd_urls: init_config.nyxd_urls,
            enabled_credentials_mode: init_config.enabled_credentials_mode,
            outfox: false,
@@ -19,12 +19,11 @@ use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_client_core::config::GatewayEndpointConfig;
 use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
-use nym_sphinx::params::PacketType;
+use nym_sphinx::params::{PacketSize, PacketType};
 use std::error::Error;
 pub mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
 lazy_static! {
    pub static ref PRETTY_BUILD_INFORMATION: String =
@@ -55,9 +54,6 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),
    /// Try to upgrade the client
    Upgrade(upgrade::Upgrade),
    /// Generate shell completions
    Completions(ArgShell),
@@ -72,6 +68,7 @@ pub(crate) struct OverrideConfig {
    use_anonymous_replies: Option<bool>,
    fastmode: bool,
    no_cover: bool,
    medium_toggle: bool,
    nyxd_urls: Option<Vec<url::Url>>,
    enabled_credentials_mode: Option<bool>,
    outfox: bool,
@@ -83,7 +80,6 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
    match &args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
        Commands::Upgrade(m) => upgrade::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
    }
@@ -91,6 +87,10 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
 }
 pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
    let disable_cover_traffic_with_keepalive = args.medium_toggle;
    let secondary_packet_size = args.medium_toggle.then_some(PacketSize::ExtendedPacket16);
    let no_per_hop_delays = args.medium_toggle;
    let packet_type = if args.outfox {
        PacketType::Outfox
    } else {
@@ -101,6 +101,17 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
            BaseClientConfig::with_high_default_traffic_volume,
            args.fastmode,
        )
        .with_base(
            // NOTE: This interacts with disabling cover traffic fully, so we want to this to be set before
            BaseClientConfig::with_disabled_cover_traffic_with_keepalive,
            disable_cover_traffic_with_keepalive,
        )
        .with_base(
            BaseClientConfig::with_secondary_packet_size,
            secondary_packet_size,
        )
        .with_base(BaseClientConfig::with_no_per_hop_delays, no_per_hop_delays)
        // NOTE: see comment above about the order of the other disble cover traffic config
        .with_base(BaseClientConfig::with_disabled_cover_traffic, args.no_cover)
        .with_base(BaseClientConfig::with_packet_type, packet_type)
        .with_optional(Config::with_anonymous_replies, args.use_anonymous_replies)
@@ -60,6 +60,11 @@ pub(crate) struct Run {
    #[clap(long, hide = true)]
    no_cover: bool,
    /// Enable medium mixnet traffic, for experiments only.
    /// This includes things like disabling cover traffic, no per hop delays, etc.
    #[clap(long, hide = true)]
    medium_toggle: bool,
    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
    /// with bandwidth credential requirement.
    #[clap(long, hide = true)]
@@ -77,6 +82,7 @@ impl From<Run> for OverrideConfig {
            use_anonymous_replies: run_config.use_anonymous_replies,
            fastmode: run_config.fastmode,
            no_cover: run_config.no_cover,
            medium_toggle: run_config.medium_toggle,
            nyxd_urls: run_config.nyxd_urls,
            enabled_credentials_mode: run_config.enabled_credentials_mode,
            outfox: run_config.outfox,
@@ -1,78 +0,0 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::try_load_current_config;
 use crate::config::Config;
 use clap::Args;
 use nym_bin_common::version_checker::Version;
 use std::process;
 fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
    process::exit(1)
 }
 #[derive(Args, Clone)]
 pub(crate) struct Upgrade {
    /// Id of the nym-client we want to upgrade
    #[clap(long)]
    id: String,
 }
 fn parse_config_version(config: &Config) -> Version {
    let version = Version::parse(&config.core.base.client.version).unwrap_or_else(|err| {
        eprintln!("failed to parse client version! - {err}");
        process::exit(1)
    });
    if version.is_prerelease() || !version.build.is_empty() {
        eprintln!(
            "Trying to upgrade from a non-released version {version}. This is not supported!"
        );
        process::exit(1)
    }
    version
 }
 fn parse_package_version() -> Version {
    let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
    // technically this is not a correct way of checking it as a released version might contain valid build identifiers
    // however, we are not using them ourselves at the moment and hence it should be fine.
    // if we change our mind, we could easily tweak this code
    if version.is_prerelease() || !version.build.is_empty() {
        eprintln!("Trying to upgrade to a non-released version {version}. This is not supported!");
        process::exit(1)
    }
    version
 }
 fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
    let config_version = parse_config_version(&config);
    if &config_version == package_version {
        println!("You're using the most recent version!");
        return;
    }
    unimplemented_upgrade(package_version, &config_version)
 }
 pub(crate) fn execute(args: &Upgrade) {
    let package_version = parse_package_version();
    let id = &args.id;
    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {err}");
        process::exit(1)
    });
    if existing_config.core.base.client.version.is_empty() {
        eprintln!("the existing configuration file does not seem to contain version number.");
        process::exit(1);
    }
    do_upgrade(existing_config, args, &package_version)
 }
@@ -1 +1 @@
-16
+18
@@ -3,11 +3,11 @@
  "version": "0.19.0",
  "description": "A TypeScript client for interacting with smart contracts in Nym validators",
  "repository": "https://github.com/nymtech/nym",
-  "main": "./dist/index.js",
+  "main": "dist/index.js",
-  "types": "./dist/index.d.ts",
+  "types": "dist/index.d.ts",
  "scripts": {
    "build": "rollup -c ./rollup.config.mjs",
-    "build:types": "rollup-type-bundler --dist ./dist/nym-validator-client",
+    "build:types": "rollup-type-bundler --dist ./dist",
    "build:prod": "sh ./scripts/build-prod.sh",
    "test": "ts-mocha -p ./tsconfig.test.json ./src/tests/**/*.test.ts",
    "testmock": "ts-mocha -p ./tsconfig.test.json ./src/tests/mock/*.test.ts",
@@ -29,16 +29,23 @@
  ],
  "license": "Apache-2.0",
  "devDependencies": {
    "@cosmjs/cosmwasm-stargate": "^0.29.5",
    "@cosmjs/crypto": "^0.29.5",
    "@cosmjs/math": "^0.29.5",
    "@cosmjs/proto-signing": "^0.29.5",
    "@cosmjs/stargate": "^0.29.5",
    "@cosmjs/tendermint-rpc": "^0.29.5",
    "@favware/rollup-type-bundler": "^2.0.0",
    "@nymproject/types": "^1.0.0",
    "@rollup/plugin-commonjs": "^24.0.1",
    "@rollup/plugin-json": "^6.0.0",
    "@rollup/plugin-typescript": "^11.0.0",
    "@rollup/plugin-node-resolve": "^15.0.1",
-    "rollup": "^3.17.2",
+    "@rollup/plugin-typescript": "^11.0.0",
    "rollup-plugin-dts": "^5.2.0",
    "@typescript-eslint/eslint-plugin": "^5.7.0",
    "@typescript-eslint/parser": "^5.7.0",
    "axios": "^1.3.3",
    "cosmjs-types": "^0.4.1",
    "dotenv": "^16.0.3",
    "eslint": "^7.18.0",
    "eslint-config-airbnb": "^19.0.2",
    "eslint-config-airbnb-typescript": "^16.1.0",
@@ -47,21 +54,15 @@
    "eslint-plugin-import": "^2.25.4",
    "eslint-plugin-mocha": "^10.0.3",
    "eslint-plugin-prettier": "^4.0.0",
    "expect": "^28.1.3",
    "mocha": "^10.0.0",
    "moq.ts": "^7.3.4",
    "prettier": "^2.8.7",
    "rollup": "^3.17.2",
    "rollup-plugin-dts": "^5.2.0",
    "rollup-plugin-node-polyfills": "^0.2.1",
    "ts-mocha": "^10.0.0",
    "typedoc": "^0.22.13",
-    "typescript": "^4.6.2",
+    "typescript": "^4.6.2"
    "cosmjs-types": "^0.4.1",
    "dotenv": "^16.0.3",
    "expect": "^28.1.3",
    "moq.ts": "^7.3.4",
    "@cosmjs/cosmwasm-stargate": "^0.29.5",
    "@cosmjs/crypto": "^0.29.5",
    "@cosmjs/math": "^0.29.5",
    "@cosmjs/proto-signing": "^0.29.5",
    "@cosmjs/stargate": "^0.29.5",
    "@cosmjs/tendermint-rpc": "^0.29.5",
    "axios": "^1.3.3"
  }
 }
@@ -1,15 +1,15 @@
 import typescript from '@rollup/plugin-typescript';
-import resolve from '@rollup/plugin-node-resolve';
+import nodePolyfills from 'rollup-plugin-node-polyfills';
 import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 export default [
  {
-    input: './src/index.ts',
+    input: 'src/index.ts',
    output: {
-      dir: 'dist/nym-validator-client',
+      dir: 'dist',
      format: 'cjs',
    },
-    plugins: [resolve(), typescript(), commonjs(), json()],
+    plugins: [nodePolyfills(), typescript(), commonjs(), json()],
  },
 ];
@@ -21,7 +21,7 @@ node ./scripts/buildPackageJson.mjs
 # Copy README
-cp README.md dist/nym-validator-client
+cp README.md dist/
 # move the output outside of the yarn/npm workspaces
@@ -17,4 +17,4 @@ const packageJson = {
  types,
 };
-fs.writeFileSync('./dist/nym-validator-client/package.json', JSON.stringify(packageJson, null, 2));
+fs.writeFileSync('./dist/package.json', JSON.stringify(packageJson, null, 2));
@@ -45,7 +45,6 @@ import {
 } from '@nymproject/types';
 import QueryClient from './query-client';
 import SigningClient, { ISigningClient } from './signing-client';
 // import { DelegationBlock } from './types/shared';
 export interface INymClient {
  readonly mixnetContract: string;
@@ -626,7 +625,17 @@ export default class ValidatorClient implements INymClient {
  // SIMULATE
-  public async simulateSend(signingAddress: string, from: string, to: string, amount: Coin[]) {
+  public async simulateSend({
-    return (this.client as SigningClient).simulateSend(signingAddress, from, to, amount);
+    signingAddress,
    from,
    to,
    amount,
  }: {
    signingAddress: string;
    from: string;
    to: string;
    amount: Coin[];
  }) {
    return (this.client as ISigningClient).simulateSend(signingAddress, from, to, amount);
  }
 }
@@ -22,9 +22,12 @@ describe('Simualtions', () => {
  });
  it('can simulate sending tokens', async () => {
-    const res = await client.simulateSend(client.address, client.address, client.address, [
+    const res = await client.simulateSend({
-      { amount: '400000', denom: 'unym' },
+      signingAddress: client.address,
-    ]);
+      from: client.address,
      to: client.address,
      amount: [{ amount: '400000', denom: 'unym' }],
    });
    expect(typeof res).toBe('number');
  }).timeout(10000);
@@ -1,6 +1,6 @@
 {
  "compilerOptions": {
-    "outDir": "./dist/nym-validator-client",
+    "outDir": "dist",
    "module": "ES2020",
    "target": "es2021",
    "allowJs": false,
@@ -237,18 +237,18 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "bip32"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f"
+checksum = "b30ed1d6f8437a487a266c8293aeb95b61a23261273e3e02912cdb8b68bf798b"
 dependencies = [
 "bs58",
- "hmac 0.11.0",
+ "hmac 0.12.1",
 "k256",
 "once_cell",
 "pbkdf2",
 "rand_core 0.6.4",
- "ripemd160",
+ "ripemd",
- "sha2 0.9.9",
+ "sha2 0.10.6",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -332,7 +332,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
 "block-padding",
 "generic-array 0.14.7",
 ]
@@ -345,12 +344,6 @@ dependencies = [
 "generic-array 0.14.7",
 ]
 [[package]]
 name = "block-padding"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 [[package]]
 name = "bls12_381"
 version = "0.5.0"
@@ -577,9 +570,9 @@ dependencies = [
 [[package]]
 name = "const-oid"
-version = "0.7.1"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
 [[package]]
 name = "constant_time_eq"
@@ -605,8 +598,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.12.3"
+version = "0.13.0"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bb61f3d2224c90ea78e1fa7444787761a549170c46b6b0ed09b93f9b7e4076a"
 dependencies = [
 "prost",
 "prost-types",
@@ -615,8 +609,9 @@ dependencies = [
 [[package]]
 name = "cosmrs"
-version = "0.7.1"
+version = "0.8.0"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20d5890dac07a62337e5841adb8f2074a66a962a098a48df9460f64d483beaf4"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
@@ -637,11 +632,11 @@ dependencies = [
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970d1d705862179b5d7a233ae36f02f21c4ec1b8075fe60c77fc5b43471331fa"
+checksum = "0d076a08ec01ed23c4396aca98ec73a38fa1fee5f310465add52b4108181c7a8"
 dependencies = [
- "digest 0.9.0",
+ "digest 0.10.6",
 "ed25519-zebra",
 "k256",
 "rand_core 0.6.4",
@@ -650,26 +645,53 @@ dependencies = [
 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
+checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773"
 dependencies = [
 "syn 1.0.109",
 ]
 [[package]]
-name = "cosmwasm-std"
+name = "cosmwasm-schema"
-version = "1.0.0"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
+checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
 dependencies = [
 "cosmwasm-schema-derive",
 "schemars",
 "serde",
 "serde_json",
 "thiserror",
 ]
 [[package]]
 name = "cosmwasm-schema-derive"
 version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn 1.0.109",
 ]
 [[package]]
 name = "cosmwasm-std"
 version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
 dependencies = [
 "base64 0.13.1",
 "cosmwasm-crypto",
 "cosmwasm-derive",
 "derivative",
 "forward_ref",
 "hex",
 "schemars",
 "serde",
- "serde-json-wasm",
+ "serde-json-wasm 0.5.1",
 "sha2 0.10.6",
 "thiserror",
 "uint",
 ]
@@ -783,9 +805,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 [[package]]
 name = "crypto-bigint"
-version = "0.3.2"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
 "generic-array 0.14.7",
 "rand_core 0.6.4",
@@ -867,10 +889,11 @@ dependencies = [
 [[package]]
 name = "cw-controllers"
-version = "0.13.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa"
+checksum = "91440ce8ec4f0642798bc8c8cb6b9b53c1926c6dadaf0eed267a5145cd529071"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
@@ -881,9 +904,9 @@ dependencies = [
 [[package]]
 name = "cw-storage-plus"
-version = "0.13.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
+checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -892,22 +915,26 @@ dependencies = [
 [[package]]
 name = "cw-utils"
-version = "0.13.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
+checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw2",
 "schemars",
 "semver 1.0.17",
 "serde",
 "thiserror",
 ]
 [[package]]
 name = "cw2"
-version = "0.13.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
+checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
@@ -915,11 +942,12 @@ dependencies = [
 ]
 [[package]]
-name = "cw3"
+name = "cw20"
-version = "0.13.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
+checksum = "011c45920f8200bd5d32d4fe52502506f64f2f75651ab408054d4cfc75ca3a9b"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-utils",
 "schemars",
@@ -927,11 +955,27 @@ dependencies = [
 ]
 [[package]]
-name = "cw4"
+name = "cw3"
-version = "0.13.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
+checksum = "2fe0b587008aa221cd2a2579a21990a28c4347dc53ad43167c68ad765f5b6efa"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-utils",
 "cw20",
 "schemars",
 "serde",
 "thiserror",
 ]
 [[package]]
 name = "cw4"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c236e0bae02ce97e89235a681dd0e07d099524b369f1ef908d704db3e6b049b"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
@@ -953,11 +997,23 @@ dependencies = [
 [[package]]
 name = "der"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 dependencies = [
 "const-oid",
 "zeroize",
 ]
 [[package]]
 name = "derivative"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn 1.0.109",
 ]
 [[package]]
@@ -1050,9 +1106,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
 [[package]]
 name = "ecdsa"
-version = "0.13.4"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
 "der",
 "elliptic-curve",
@@ -1108,16 +1164,18 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 [[package]]
 name = "elliptic-curve"
-version = "0.11.12"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
 "base16ct",
 "crypto-bigint",
 "der",
- "ff 0.11.1",
+ "digest 0.10.6",
 "ff 0.12.1",
 "generic-array 0.14.7",
- "group 0.11.0",
+ "group 0.12.1",
 "pkcs8",
 "rand_core 0.6.4",
 "sec1",
 "subtle 2.4.1",
@@ -1232,6 +1290,16 @@ dependencies = [
 "subtle 2.4.1",
 ]
 [[package]]
 name = "ff"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
 "rand_core 0.6.4",
 "subtle 2.4.1",
 ]
 [[package]]
 name = "flate2"
 version = "1.0.26"
@@ -1524,6 +1592,17 @@ dependencies = [
 "subtle 2.4.1",
 ]
 [[package]]
 name = "group"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
 "ff 0.12.1",
 "rand_core 0.6.4",
 "subtle 2.4.1",
 ]
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -1978,15 +2057,14 @@ dependencies = [
 [[package]]
 name = "k256"
-version = "0.10.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
 dependencies = [
 "cfg-if 1.0.0",
 "ecdsa",
 "elliptic-curve",
- "sec1",
+ "sha2 0.10.6",
 "sha2 0.9.9",
 "sha3",
 ]
@@ -2240,7 +2318,7 @@ dependencies = [
 [[package]]
 name = "nym-bin-common"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
 "atty",
 "clap",
@@ -2255,7 +2333,7 @@ dependencies = [
 [[package]]
 name = "nym-client-core"
-version = "1.1.14"
+version = "1.1.15"
 dependencies = [
 "async-trait",
 "base64 0.21.2",
@@ -2300,7 +2378,7 @@ dependencies = [
 [[package]]
 name = "nym-client-wasm"
-version = "1.1.0"
+version = "1.1.1"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -2484,6 +2562,17 @@ dependencies = [
 "zeroize",
 ]
 [[package]]
 name = "nym-ephemera-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-std",
 "cw-utils",
 "nym-contracts-common",
 "schemars",
 "serde",
 ]
 [[package]]
 name = "nym-gateway-client"
 version = "0.1.0"
@@ -2540,6 +2629,8 @@ dependencies = [
 name = "nym-group-contract-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-schema",
 "cw-controllers",
 "cw4",
 "schemars",
 "serde",
@@ -2556,7 +2647,7 @@ dependencies = [
 "nym-contracts-common",
 "schemars",
 "serde",
- "serde-json-wasm",
+ "serde-json-wasm 0.4.1",
 "serde_repr",
 "thiserror",
 "time",
@@ -2566,7 +2657,9 @@ dependencies = [
 name = "nym-multisig-contract-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
 "cw3",
 "cw4",
@@ -2580,8 +2673,12 @@ name = "nym-name-service-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-std",
 "cw-controllers",
 "cw-utils",
 "nym-contracts-common",
 "schemars",
 "serde",
 "thiserror",
 ]
 [[package]]
@@ -2697,6 +2794,7 @@ dependencies = [
 "nym-pemstore",
 "nym-sphinx-addressing",
 "nym-sphinx-params",
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
 "rand 0.7.3",
@@ -2723,6 +2821,7 @@ dependencies = [
 "nym-crypto",
 "nym-sphinx-addressing",
 "nym-sphinx-params",
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
 "rand 0.7.3",
@@ -2753,6 +2852,7 @@ dependencies = [
 "nym-sphinx-chunking",
 "nym-sphinx-forwarding",
 "nym-sphinx-params",
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
 "rand 0.7.3",
@@ -2876,6 +2976,7 @@ dependencies = [
 "nym-coconut-interface",
 "nym-config",
 "nym-contracts-common",
 "nym-ephemera-common",
 "nym-group-contract-common",
 "nym-mixnet-contract-common",
 "nym-multisig-contract-common",
@@ -2884,6 +2985,7 @@ dependencies = [
 "nym-service-provider-directory-common",
 "nym-vesting-contract",
 "nym-vesting-contract-common",
 "openssl",
 "prost",
 "reqwest",
 "serde",
@@ -2974,6 +3076,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 [[package]]
 name = "openssl-src"
 version = "111.26.0+1.1.1u"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37"
 dependencies = [
 "cc",
 ]
 [[package]]
 name = "openssl-sys"
 version = "0.9.87"
@@ -2982,6 +3093,7 @@ checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
 dependencies = [
 "cc",
 "libc",
 "openssl-src",
 "pkg-config",
 "vcpkg",
 ]
@@ -3067,11 +3179,11 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 [[package]]
 name = "pbkdf2"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
- "crypto-mac 0.11.1",
+ "digest 0.10.6",
 ]
 [[package]]
@@ -3196,13 +3308,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "pkcs8"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
 "der",
 "spki",
 "zeroize",
 ]
 [[package]]
@@ -3531,12 +3642,12 @@ dependencies = [
 [[package]]
 name = "rfc6979"
-version = "0.1.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
 "crypto-bigint",
- "hmac 0.11.0",
+ "hmac 0.12.1",
 "zeroize",
 ]
@@ -3555,6 +3666,15 @@ dependencies = [
 "winapi",
 ]
 [[package]]
 name = "ripemd"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
 "digest 0.10.6",
 ]
 [[package]]
 name = "ripemd160"
 version = "0.9.1"
@@ -3724,10 +3844,11 @@ dependencies = [
 [[package]]
 name = "sec1"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
 "base16ct",
 "der",
 "generic-array 0.14.7",
 "pkcs8",
@@ -3800,6 +3921,15 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde-json-wasm"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde-wasm-bindgen"
 version = "0.5.0"
@@ -3935,14 +4065,12 @@ dependencies = [
 [[package]]
 name = "sha3"
-version = "0.9.1"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "block-buffer 0.9.0",
+ "digest 0.10.6",
 "digest 0.9.0",
 "keccak",
 "opaque-debug 0.3.0",
 ]
 [[package]]
@@ -3956,11 +4084,11 @@ dependencies = [
 [[package]]
 name = "signature"
-version = "1.4.0"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "digest 0.9.0",
+ "digest 0.10.6",
 "rand_core 0.6.4",
 ]
@@ -4030,9 +4158,9 @@ dependencies = [
 [[package]]
 name = "spki"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
 "base64ct",
 "der",
@@ -4317,9 +4445,9 @@ dependencies = [
 [[package]]
 name = "tendermint"
-version = "0.23.7"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
+checksum = "a199518e0366ba0aeb0d0e0a59dbd99ea0bdc14280f414ecc758c9228a454ad8"
 dependencies = [
 "async-trait",
 "bytes",
@@ -4348,9 +4476,9 @@ dependencies = [
 [[package]]
 name = "tendermint-config"
-version = "0.23.7"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
+checksum = "c6d8f6a64ae3b59ea3c73efad727271ee085b544b817d7f46901817ca6bb1773"
 dependencies = [
 "flex-error",
 "serde",
@@ -4362,9 +4490,9 @@ dependencies = [
 [[package]]
 name = "tendermint-proto"
-version = "0.23.7"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
+checksum = "1b303d6387aaea38cea7ef924476d1f798573044e7b4f6ddd1166ac5184b2281"
 dependencies = [
 "bytes",
 "flex-error",
@@ -4380,9 +4508,9 @@ dependencies = [
 [[package]]
 name = "tendermint-rpc"
-version = "0.23.7"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
+checksum = "3036f0b65baa11e767dabd22a0663e842b595b0a1903f149b7b8b1e09b2b443d"
 dependencies = [
 "async-trait",
 "bytes",
@@ -3,3 +3,6 @@ clippy:
 test:
 	wasm-pack test --node
 wasm-build:
 	wasm-pack build
@@ -8,6 +8,7 @@
  },
  "scripts": {
    "build": "webpack --config webpack.config.js",
    "build:wasm": "cd ../ && make wasm-build",
    "start": "webpack-dev-server --port 8001"
  },
  "repository": {
@@ -36,4 +37,4 @@
  "dependencies": {
    "@nymproject/nym-client-wasm": "file:../pkg"
  }
-}
+}
@@ -12,333 +12,371 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
-importScripts('nym_client_wasm.js');
+importScripts("nym_client_wasm.js");
-console.log('Initializing worker');
+console.log("Initializing worker");
 // wasm_bindgen creates a global variable (with the exports attached) that is in scope after `importScripts`
 const {
-    NymNodeTester,
+  NymNodeTester,
-    WasmGateway,
+  WasmGateway,
-    WasmMixNode,
+  WasmMixNode,
-    WasmNymTopology,
+  WasmNymTopology,
-    default_debug,
+  default_debug,
-    NymClientBuilder,
+  NymClientBuilder,
-    NymClient,
+  NymClient,
-    set_panic_hook,
+  set_panic_hook,
-    Config,
+  Config,
-    GatewayEndpointConfig,
+  GatewayEndpointConfig,
-    ClientStorage,
+  ClientStorage,
-    current_network_topology,
+  current_network_topology,
-    make_key,
+  make_key,
-    make_key2
+  make_key2,
 } = wasm_bindgen;
 let client = null;
 let tester = null;
 const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
 function dummyTopology() {
-    const l1Mixnode = new WasmMixNode(
+  const l1Mixnode = new WasmMixNode(
-        1,
+    1,
-        'n1fzv4jc7fanl9s0qj02ge2ezk3kts545kjtek47',
+    "n1fzv4jc7fanl9s0qj02ge2ezk3kts545kjtek47",
-        '178.79.143.65',
+    "178.79.143.65",
-        1789,
+    1789,
-        '4Yr4qmEHd9sgsuQ83191FR2hD88RfsbMmB4tzhhZWriz',
+    "4Yr4qmEHd9sgsuQ83191FR2hD88RfsbMmB4tzhhZWriz",
-        '8ndjk5oZ6HxUZNScLJJ7hk39XtUqGexdKgW7hSX6kpWG',
+    "8ndjk5oZ6HxUZNScLJJ7hk39XtUqGexdKgW7hSX6kpWG",
-        1,
+    1,
-        '1.10.0',
+    "1.10.0"
-    );
+  );
-    const l2Mixnode = new WasmMixNode(
+  const l2Mixnode = new WasmMixNode(
-        2,
+    2,
-        'n1z93z44vf8ssvdhujjvxcj4rd5e3lz0l60wdk70',
+    "n1z93z44vf8ssvdhujjvxcj4rd5e3lz0l60wdk70",
-        '109.74.197.180',
+    "109.74.197.180",
-        1789,
+    1789,
-        '7sVjiMrPYZrDWRujku9QLxgE8noT7NTgBAqizCsu7AoK',
+    "7sVjiMrPYZrDWRujku9QLxgE8noT7NTgBAqizCsu7AoK",
-        'GepXwRnKZDd8x2nBWAajGGBVvF3mrpVMQBkgfrGuqRCN',
+    "GepXwRnKZDd8x2nBWAajGGBVvF3mrpVMQBkgfrGuqRCN",
-        2,
+    2,
-        '1.10.0',
+    "1.10.0"
-    );
+  );
-    const l3Mixnode = new WasmMixNode(
+  const l3Mixnode = new WasmMixNode(
-        3,
+    3,
-        'n1ptg680vnmef2cd8l0s9uyc4f0hgf3x8sed6w77',
+    "n1ptg680vnmef2cd8l0s9uyc4f0hgf3x8sed6w77",
-        '176.58.101.80',
+    "176.58.101.80",
-        1789,
+    1789,
-        'FoM5Mx9Pxk1g3zEqkS3APgtBeTtTo3M8k7Yu4bV6kK1R',
+    "FoM5Mx9Pxk1g3zEqkS3APgtBeTtTo3M8k7Yu4bV6kK1R",
-        'DeYjrDC2AcQRVFshiKnbUo6bRvPyZ33QGYR2DLeFJ9qD',
+    "DeYjrDC2AcQRVFshiKnbUo6bRvPyZ33QGYR2DLeFJ9qD",
-        3,
+    3,
-        '1.10.0',
+    "1.10.0"
-    );
+  );
-    const gateway = new WasmGateway(
+  const gateway = new WasmGateway(
-        'n16evnn8glr0sham3matj8rg2s24m6x56ayk87ts',
+    "n16evnn8glr0sham3matj8rg2s24m6x56ayk87ts",
-        '85.159.212.96',
+    "85.159.212.96",
-        1789,
+    1789,
-        9000,
+    9000,
-        '336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9',
+    "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9",
-        'BtYjoWihiuFihGKQypmpSspbhmWDPxzqeTVSd8ciCpWL',
+    "BtYjoWihiuFihGKQypmpSspbhmWDPxzqeTVSd8ciCpWL",
-        '1.10.1',
+    "1.10.1"
-    );
+  );
-    const mixnodes = new Map();
+  const mixnodes = new Map();
-    mixnodes.set(1, [l1Mixnode]);
+  mixnodes.set(1, [l1Mixnode]);
-    mixnodes.set(2, [l2Mixnode]);
+  mixnodes.set(2, [l2Mixnode]);
-    mixnodes.set(3, [l3Mixnode]);
+  mixnodes.set(3, [l3Mixnode]);
  const gateways = [gateway];
-    const gateways = [gateway];
+  return new WasmNymTopology(mixnodes, gateways);
    return new WasmNymTopology(mixnodes, gateways)
 }
 function printAndDisplayTestResult(result) {
-    result.log_details();
+  result.log_details();
-    self.postMessage({
+  self.postMessage({
-        kind: 'DisplayTesterResults',
+    kind: "DisplayTesterResults",
-        args: {
+    args: {
-            score: result.score(),
+      score: result.score(),
-            sentPackets: result.sent_packets,
+      sentPackets: result.sent_packets,
-            receivedPackets: result.received_packets,
+      receivedPackets: result.received_packets,
-            receivedAcks: result.received_acks,
+      receivedAcks: result.received_acks,
-            duplicatePackets: result.duplicate_packets,
+      duplicatePackets: result.duplicate_packets,
-            duplicateAcks: result.duplicate_acks,
+      duplicateAcks: result.duplicate_acks,
-        },
+    },
-    });
+  });
 }
 async function testWithTester() {
-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+  // A) construct with hardcoded topology
  const topology = dummyTopology();
  const nodeTester = await new NymNodeTester(topology, preferredGateway);
-    // A) construct with hardcoded topology
+  // B) first get topology directly from nym-api
-    const topology = dummyTopology()
+  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    const nodeTester = await new NymNodeTester(topology, preferredGateway);
+  // const topology = await current_network_topology(validator)
  // const nodeTester = await new NymNodeTester(topology, preferredGateway);
  //
  // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
  // const nodeTester = await NymNodeTester.new_with_api(validator, preferredGateway)
-    // B) first get topology directly from nym-api
+  // B) first get topology directly from nym-api
-    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    // const topology = await current_network_topology(validator)
+  // const topology = await current_network_topology(validator)
-    // const nodeTester = await new NymNodeTester(topology, preferredGateway);
+  // const nodeTester = await new NymNodeTester(topology, undefined, preferredGateway);
-    //
+  //
-    // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
+  // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
-    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    // const nodeTester = await NymNodeTester.new_with_api(validator, preferredGateway)
+  // const nodeTester = await NymNodeTester.new_with_api(validator, undefined, preferredGateway)
  // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
  // const topology = dummyTopology()
  // const nodeTester = await new NymNodeTester(topology);
-    // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
+  self.onmessage = async (event) => {
-    // const topology = dummyTopology()
+    if (event.data && event.data.kind) {
-    // const nodeTester = await new NymNodeTester(topology);
+      switch (event.data.kind) {
        case "TestPacket": {
          const { mixnodeIdentity } = event.data.args;
          console.log("starting node test...");
-    self.onmessage = async event => {
+          let result = await nodeTester.test_node(mixnodeIdentity);
-        if (event.data && event.data.kind) {
+          printAndDisplayTestResult(result);
            switch (event.data.kind) {
                case 'TestPacket': {
                    const {mixnodeIdentity} = event.data.args;
                    console.log("starting node test...");
                    let result = await nodeTester.test_node(mixnodeIdentity);
                    printAndDisplayTestResult(result)
                }
            }
        }
-    };
+      }
    }
  };
 }
 async function testerReconnection() {
  const validator = "https://qwerty-validator-api.qa.nymte.ch/api";
  const nodeTester = await NymNodeTester.new_with_api(validator);
  self.onmessage = async (event) => {
    if (event.data && event.data.kind) {
      switch (event.data.kind) {
        case "TestPacket": {
          const { mixnodeIdentity } = event.data.args;
          console.log("starting node test...");
          let result1 = await nodeTester.test_node(mixnodeIdentity);
          console.log("sleeping for 5s");
          await new Promise((r) => setTimeout(r, 5000));
          await nodeTester.disconnect_from_gateway();
          console.log("sleeping for 5s");
          await new Promise((r) => setTimeout(r, 5000));
          await nodeTester.reconnect_to_gateway();
          let result2 = await nodeTester.test_node(mixnodeIdentity);
          printAndDisplayTestResult(result1);
          printAndDisplayTestResult(result2);
        }
      }
    }
  };
 }
 async function testWithNymClient() {
-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+  const topology = dummyTopology();
    const topology = dummyTopology()
-    let received = 0
+  let received = 0;
-    const onMessageHandler = (message) => {
+  const onMessageHandler = (message) => {
-        received += 1;
+    received += 1;
        self.postMessage({
            kind: 'ReceiveMessage',
            args: {
                message,
                senderTag: undefined,
                isTestPacket: true,
            },
        });
        // it's really up to the user to create proper callback here...
        console.log(`received ${received} packets so far`)
    };
    console.log('Instantiating WASM client...');
    let clientBuilder = NymClientBuilder.new_tester(topology, onMessageHandler, preferredGateway)
    console.log('Web worker creating WASM client...');
    let local_client = await clientBuilder.start_client();
    console.log('WASM client running!');
    const selfAddress = local_client.self_address();
    // set the global (I guess we don't have to anymore?)
    client = local_client;
    console.log(`Client address is ${selfAddress}`);
    self.postMessage({
-        kind: 'Ready',
+      kind: "ReceiveMessage",
-        args: {
+      args: {
-            selfAddress,
+        message,
-        },
+        senderTag: undefined,
        isTestPacket: true,
      },
    });
-    // Set callback to handle messages passed to the worker.
+    // it's really up to the user to create proper callback here...
-    self.onmessage = async event => {
+    console.log(`received ${received} packets so far`);
-        console.log(event)
+  };
-        if (event.data && event.data.kind) {
+
-            switch (event.data.kind) {
+  console.log("Instantiating WASM client...");
-                case 'SendMessage': {
+
-                    const {message, recipient} = event.data.args;
+  let clientBuilder = NymClientBuilder.new_tester(
-                    let uint8Array = new TextEncoder().encode(message);
+    topology,
-                    await client.send_regular_message(uint8Array, recipient);
+    onMessageHandler,
-                    break;
+    preferredGateway
-                }
+  );
-                case 'TestPacket': {
+
-                    const {mixnodeIdentity} = event.data.args;
+  console.log("Web worker creating WASM client...");
-                    const req = await client.try_construct_test_packet_request(mixnodeIdentity);
+  let local_client = await clientBuilder.start_client();
-                    await client.change_hardcoded_topology(req.injectable_topology());
+  console.log("WASM client running!");
-                    await client.try_send_test_packets(req);
+
-                    break;
+  const selfAddress = local_client.self_address();
-                }
+
-            }
+  // set the global (I guess we don't have to anymore?)
  client = local_client;
  console.log(`Client address is ${selfAddress}`);
  self.postMessage({
    kind: "Ready",
    args: {
      selfAddress,
    },
  });
  // Set callback to handle messages passed to the worker.
  self.onmessage = async (event) => {
    console.log(event);
    if (event.data && event.data.kind) {
      switch (event.data.kind) {
        case "SendMessage": {
          const { message, recipient } = event.data.args;
          let uint8Array = new TextEncoder().encode(message);
          await client.send_regular_message(uint8Array, recipient);
          break;
        }
-    };
+        case "TestPacket": {
          const { mixnodeIdentity } = event.data.args;
          const req = await client.try_construct_test_packet_request(
            mixnodeIdentity
          );
          await client.change_hardcoded_topology(req.injectable_topology());
          await client.try_send_test_packets(req);
          break;
        }
      }
    }
  };
 }
 async function normalNymClientUsage() {
-    self.postMessage({kind: 'DisableMagicTestButton'});
+  self.postMessage({ kind: "DisableMagicTestButton" });
-    // only really useful if you want to adjust some settings like traffic rate
+  // only really useful if you want to adjust some settings like traffic rate
-    // (if not needed you can just pass a null)
+  // (if not needed you can just pass a null)
-    const debug = default_debug();
+  const debug = default_debug();
-    debug.disable_main_poisson_packet_distribution = true;
+  debug.disable_main_poisson_packet_distribution = true;
-    debug.disable_loop_cover_traffic_stream = true;
+  debug.disable_loop_cover_traffic_stream = true;
-    debug.use_extended_packet_size = false;
+  debug.use_extended_packet_size = false;
-    // debug.average_packet_delay_ms = BigInt(10);
+  // debug.average_packet_delay_ms = BigInt(10);
-    // debug.average_ack_delay_ms = BigInt(10);
+  // debug.average_ack_delay_ms = BigInt(10);
-    // debug.ack_wait_addition_ms = BigInt(3000);
+  // debug.ack_wait_addition_ms = BigInt(3000);
-    // debug.ack_wait_multiplier = 10;
+  // debug.ack_wait_multiplier = 10;
-    debug.topology_refresh_rate_ms = BigInt(60000)
+  debug.topology_refresh_rate_ms = BigInt(60000);
-    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+  const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
-    const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+  const validator = "https://qwerty-validator-api.qa.nymte.ch/api";
-    const config = new Config('my-awesome-wasm-client', validator, debug);
+  const config = new Config("my-awesome-wasm-client", validator, debug);
-    const onMessageHandler = (message) => {
+  const onMessageHandler = (message) => {
-        console.log(message);
+    console.log(message);
        self.postMessage({
            kind: 'ReceiveMessage',
            args: {
                message,
            },
        });
    };
    console.log('Instantiating WASM client...');
    let localClient = await new NymClient(config, onMessageHandler)
    console.log('WASM client running!');
    const selfAddress = localClient.self_address();
    // set the global (I guess we don't have to anymore?)
    client = localClient;
    console.log(`Client address is ${selfAddress}`);
    self.postMessage({
-        kind: 'Ready',
+      kind: "ReceiveMessage",
-        args: {
+      args: {
-            selfAddress,
+        message,
-        },
+      },
    });
  };
-    // Set callback to handle messages passed to the worker.
+  console.log("Instantiating WASM client...");
-    self.onmessage = async event => {
+
-        console.log(event)
+  let localClient = await new NymClient(config, onMessageHandler);
-        if (event.data && event.data.kind) {
+  console.log("WASM client running!");
-            switch (event.data.kind) {
+
-                case 'SendMessage': {
+  const selfAddress = localClient.self_address();
-                    const {message, recipient} = event.data.args;
+
-                    let uint8Array = new TextEncoder().encode(message);
+  // set the global (I guess we don't have to anymore?)
-                    await client.send_regular_message(uint8Array, recipient);
+  client = localClient;
-                    break;
+
-                }
+  console.log(`Client address is ${selfAddress}`);
-            }
+  self.postMessage({
    kind: "Ready",
    args: {
      selfAddress,
    },
  });
  // Set callback to handle messages passed to the worker.
  self.onmessage = async (event) => {
    console.log(event);
    if (event.data && event.data.kind) {
      switch (event.data.kind) {
        case "SendMessage": {
          const { message, recipient } = event.data.args;
          let uint8Array = new TextEncoder().encode(message);
          await client.send_regular_message(uint8Array, recipient);
          break;
        }
-    };
+      }
    }
  };
 }
 async function messWithStorage() {
-    self.onmessage = async event => {
+  self.onmessage = async (event) => {
-        if (event.data && event.data.kind) {
+    if (event.data && event.data.kind) {
-            switch (event.data.kind) {
+      switch (event.data.kind) {
-                case 'TestPacket': {
+        case "TestPacket": {
-                    const { mixnodeIdentity } = event.data.args;
+          const { mixnodeIdentity } = event.data.args;
-                    console.log("button clicked...", mixnodeIdentity);
+          console.log("button clicked...", mixnodeIdentity);
-                    let id1 = "one";
+          let id1 = "one";
-                    let id2 = "two";
+          let id2 = "two";
-                    console.log("making store1 NO-ENC");
+          console.log("making store1 NO-ENC");
-                    let _storage1 = await ClientStorage.new_unencrypted(id1);
+          let _storage1 = await ClientStorage.new_unencrypted(id1);
-                    console.log("making store2 ENC")
+          console.log("making store2 ENC");
-                    let _storage2 = await new ClientStorage(id2, "my-secret-password");
+          let _storage2 = await new ClientStorage(id2, "my-secret-password");
-                    //
+          //
-                    //
+          //
-                    //
+          //
-                    //     console.log("attempting to use store1 WITH PASSWORD")
+          //     console.log("attempting to use store1 WITH PASSWORD")
-                    //     let _storage1_alt = await new ClientStorage(id1, "password");
+          //     let _storage1_alt = await new ClientStorage(id1, "password");
-                    //
+          //
-                    //
+          //
-                    //
+          //
-                    //     console.log("attempting to use store2 WITHOUT PASSWORD")
+          //     console.log("attempting to use store2 WITHOUT PASSWORD")
-                    //     let _storage2_alt = await ClientStorage.new_unencrypted(id2);
+          //     let _storage2_alt = await ClientStorage.new_unencrypted(id2);
-                    //
+          //
-                    //
+          //
-                    //
+          //
-                    //     console.log("attempting to use store2 with WRONG PASSWORD")
+          //     console.log("attempting to use store2 with WRONG PASSWORD")
-                    //     let _storage2_bad = await new ClientStorage(id2, "bad-password")
+          //     let _storage2_bad = await new ClientStorage(id2, "bad-password")
-
+          //
-                    //
+          // console.log("read1: ", await storage1.read());
-                    // console.log("read1: ", await storage1.read());
+          // console.log("read2: ", await storage2.read());
-                    // console.log("read2: ", await storage2.read());
+          //
-                    //
+          // console.log("store1: ", await storage1.store("FOOMP"));
-                    // console.log("store1: ", await storage1.store("FOOMP"));
+          //
-                    //
+          // console.log("read1: ", await storage1.read());
-                    // console.log("read1: ", await storage1.read());
+          // console.log("read2: ", await storage2.read());
                    // console.log("read2: ", await storage2.read());
                }
            }
        }
-    };
+      }
-
+    }
-
+  };
 }
 async function main() {
-    // load WASM package
+  // load WASM package
-    await wasm_bindgen('nym_client_wasm_bg.wasm');
+  await wasm_bindgen("nym_client_wasm_bg.wasm");
-    console.log('Loaded WASM');
+  console.log("Loaded WASM");
-    // sets up better stack traces in case of in-rust panics
+  // sets up better stack traces in case of in-rust panics
-    set_panic_hook();
+  set_panic_hook();
-    // run test on simplified and dedicated tester:
+  // show reconnection capabilities
-    // await testWithTester()
+  // await testerReconnection()
-    // hook-up the whole client for testing
+  // run test on simplified and dedicated tester:
-    // await testWithNymClient()
+  await testWithTester();
-    // 'Normal' client setup (to send 'normal' messages)
+  // 'Normal' client setup (to send 'normal' messages)
-    await normalNymClientUsage()
+  // await normalNymClientUsage()
 }
 // Let's get started!
-main();
+main();
@@ -4,7 +4,7 @@
 // due to expansion of #[wasm_bindgen] macro on `Debug` Config struct
 #![allow(clippy::drop_non_drop)]
 // another issue due to #[wasm_bindgen] and `Copy` trait
-#![allow(clippy::drop_copy)]
+#![allow(dropping_copy_types)]
 use nym_client_core::config::{
    Acknowledgements as ConfigAcknowledgements, Config as BaseClientConfig,
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::storage::errors::ClientStorageError;
+use crate::storage::error::ClientStorageError;
 use crate::topology::WasmTopologyError;
 use js_sys::Promise;
 use nym_client_core::config::GatewayEndpointConfig;
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 use crate::client::config::Config;
-use crate::storage::errors::ClientStorageError;
+use crate::storage::error::ClientStorageError;
 use js_sys::Promise;
 use nym_client_core::client::base_client::storage::gateway_details::PersistedGatewayDetails;
 use nym_crypto::asymmetric::{encryption, identity};
@@ -15,7 +15,7 @@ use wasm_utils::storage::{IdbVersionChangeEvent, WasmStorage};
 use wasm_utils::PromisableResult;
 use zeroize::Zeroizing;
-pub(crate) mod errors;
+pub(crate) mod error;
 pub(crate) mod traits;
 const STORAGE_NAME_PREFIX: &str = "wasm-client-storage";
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::storage::errors::ClientStorageError;
+use crate::storage::error::ClientStorageError;
 use crate::storage::ClientStorage;
 use async_trait::async_trait;
 use nym_client_core::client::base_client::storage::gateway_details::{
@@ -4,6 +4,9 @@
 // due to expansion of #[wasm_bindgen] macro on NodeTestResult
 #![allow(clippy::drop_non_drop)]
 use crate::error::WasmClientError;
 use crate::tester::LockedGatewayClient;
 use js_sys::Promise;
 use nym_node_tester_utils::processor::Received;
 use nym_node_tester_utils::receiver::ReceivedReceiver;
 use serde::{Deserialize, Serialize};
@@ -12,6 +15,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use tokio::sync::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::future_to_promise;
 use wasm_utils::{console_log, console_warn};
 #[derive(Clone)]
@@ -107,3 +111,37 @@ impl Drop for TestMarker {
        self.value.store(false, Ordering::SeqCst)
    }
 }
 pub(crate) trait GatewayReconnection {
    fn disconnect_from_gateway(&self) -> Promise;
    fn reconnect_to_gateway(&self) -> Promise;
 }
 impl GatewayReconnection for LockedGatewayClient {
    fn disconnect_from_gateway(&self) -> Promise {
        let this = self.clone();
        future_to_promise(async move {
            let mut guard = this.lock().await;
            guard
                .disconnect()
                .await
                .map_err(|err| JsValue::from(WasmClientError::from(err)))?;
            Ok(JsValue::undefined())
        })
    }
    fn reconnect_to_gateway(&self) -> Promise {
        let this = self.clone();
        future_to_promise(async move {
            let mut guard = this.lock().await;
            guard
                .try_reconnect()
                .await
                .map_err(|err| JsValue::from(WasmClientError::from(err)))?;
            Ok(JsValue::undefined())
        })
    }
 }
@@ -7,7 +7,7 @@ use crate::helpers::{current_network_topology_async, setup_from_topology};
 use crate::storage::ClientStorage;
 use crate::tester::ephemeral_receiver::EphemeralTestReceiver;
 use crate::tester::helpers::{
-    NodeTestResult, ReceivedReceiverWrapper, TestMarker, WasmTestMessageExt,
+    GatewayReconnection, NodeTestResult, ReceivedReceiverWrapper, TestMarker, WasmTestMessageExt,
 };
 use crate::topology::WasmNymTopology;
 use futures::channel::mpsc;
@@ -73,6 +73,7 @@ pub struct NymNodeTester {
 #[wasm_bindgen]
 pub struct NymNodeTesterBuilder {
    gateway: Option<IdentityKey>,
    id: Option<String>,
    base_topology: NymTopology,
@@ -94,9 +95,11 @@ impl NymNodeTesterBuilder {
    #[wasm_bindgen(constructor)]
    pub fn new(
        base_topology: WasmNymTopology,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> NymNodeTesterBuilder {
        NymNodeTesterBuilder {
            id,
            gateway,
            base_topology: base_topology.into(),
            bandwidth_controller: None,
@@ -105,15 +108,20 @@ impl NymNodeTesterBuilder {
    async fn _new_with_api(
        api_url: String,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> Result<Self, WasmClientError> {
        let topology = current_network_topology_async(api_url).await?;
-        Ok(NymNodeTesterBuilder::new(topology, gateway))
+        Ok(NymNodeTesterBuilder::new(topology, id, gateway))
    }
-    pub fn new_with_api(gateway: Option<IdentityKey>, api_url: String) -> Promise {
+    pub fn new_with_api(
        api_url: String,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> Promise {
        future_to_promise(async move {
-            Self::_new_with_api(api_url, gateway)
+            Self::_new_with_api(api_url, id, gateway)
                .await
                .into_promise_result()
        })
@@ -133,7 +141,13 @@ impl NymNodeTesterBuilder {
    async fn _setup_client(mut self) -> Result<NymNodeTester, WasmClientError> {
        let task_manager = TaskManager::default();
-        let client_store = ClientStorage::new_async(NODE_TESTER_ID, None).await?;
+        let storage_id = if let Some(client_id) = &self.id {
            format!("{NODE_TESTER_ID}-{client_id}")
        } else {
            NODE_TESTER_ID.to_owned()
        };
        let client_store = ClientStorage::new_async(&storage_id, None).await?;
        let init_details = self.gateway_info(&client_store).await?;
        let gateway_endpoint = init_details.gateway_details;
@@ -234,29 +248,46 @@ async fn test_mixnode(
 impl NymNodeTester {
    #[wasm_bindgen(constructor)]
    #[allow(clippy::new_ret_no_self)]
-    pub fn new(topology: WasmNymTopology, gateway: Option<IdentityKey>) -> Promise {
+    pub fn new(
        topology: WasmNymTopology,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> Promise {
        console_log!("constructing node tester!");
-        NymNodeTesterBuilder::new(topology, gateway).setup_client()
+        NymNodeTesterBuilder::new(topology, id, gateway).setup_client()
    }
    async fn _new_with_api(
        api_url: String,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> Result<Self, WasmClientError> {
-        NymNodeTesterBuilder::_new_with_api(api_url, gateway)
+        NymNodeTesterBuilder::_new_with_api(api_url, id, gateway)
            .await?
            ._setup_client()
            .await
    }
-    pub fn new_with_api(api_url: String, gateway: Option<IdentityKey>) -> Promise {
+    pub fn new_with_api(
        api_url: String,
        id: Option<String>,
        gateway: Option<IdentityKey>,
    ) -> Promise {
        future_to_promise(async move {
-            Self::_new_with_api(api_url, gateway)
+            Self::_new_with_api(api_url, id, gateway)
                .await
                .into_promise_result()
        })
    }
    pub fn disconnect_from_gateway(&self) -> Promise {
        self.gateway_client.disconnect_from_gateway()
    }
    pub fn reconnect_to_gateway(&self) -> Promise {
        self.gateway_client.reconnect_to_gateway()
    }
    fn prepare_test_packets(
        &self,
        mixnode_identity: String,
@@ -101,7 +101,7 @@ impl AsyncFileWatcher {
        }
        let Some(filters) = &self.filters else {
-            return true
+            return true;
        };
        for filter in filters {
@@ -10,7 +10,7 @@ use log::*;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::cover::generate_loop_cover_packet;
-use nym_sphinx::params::PacketSize;
+use nym_sphinx::params::{PacketSize, PacketType};
 use nym_sphinx::utils::sample_poisson_duration;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::pin::Pin;
@@ -63,6 +63,8 @@ where
    /// Optional secondary predefined packet size used for the loop cover messages.
    secondary_packet_size: Option<PacketSize>,
    packet_type: PacketType,
 }
 impl<R> Stream for LoopCoverTrafficStream<R>
@@ -135,6 +137,7 @@ impl LoopCoverTrafficStream<OsRng> {
            topology_access,
            primary_packet_size: traffic_config.primary_packet_size,
            secondary_packet_size: traffic_config.secondary_packet_size,
            packet_type: traffic_config.packet_type,
        }
    }
@@ -150,7 +153,7 @@ impl LoopCoverTrafficStream<OsRng> {
    fn loop_cover_message_size(&mut self) -> PacketSize {
        let Some(secondary_packet_size) = self.secondary_packet_size else {
-            return self.primary_packet_size
+            return self.primary_packet_size;
        };
        let use_primary = self
@@ -194,7 +197,7 @@ impl LoopCoverTrafficStream<OsRng> {
            self.average_ack_delay,
            self.cover_traffic.loop_cover_traffic_average_delay,
            cover_traffic_packet_size,
-            nym_sphinx::params::PacketType::Mix,
+            self.packet_type,
        )
        .expect("Somehow failed to generate a loop cover message with a valid topology");
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::client::inbound_messages::{InputMessage, InputMessageReceiver};
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use super::{
@@ -224,7 +224,7 @@ where
        // if secondary packet was never set, then it's obvious we have to use the primary packet
        let Some(secondary_packet) = self.config.secondary_packet_size else {
            trace!("only primary packet size is available");
-            return self.config.primary_packet_size
+            return self.config.primary_packet_size;
        };
        let primary_count =
@@ -200,7 +200,7 @@ where
    fn loop_cover_message_size(&mut self) -> PacketSize {
        let Some(secondary_packet_size) = self.config.traffic.secondary_packet_size else {
-            return self.config.traffic.primary_packet_size
+            return self.config.traffic.primary_packet_size;
        };
        let use_primary = self
@@ -727,7 +727,11 @@ where
                continue;
            }
-            let Some(last_received) = self.full_reply_storage.surbs_storage_ref().surbs_last_received_at(pending_reply_target) else {
+            let Some(last_received) = self
                .full_reply_storage
                .surbs_storage_ref()
                .surbs_last_received_at(pending_reply_target)
            else {
                error!("we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!", vals.total_size());
                to_remove.push(*pending_reply_target);
                continue;
@@ -811,7 +815,8 @@ where
            // this should never ever happen (famous last words, eh?), but in case it DOES happen eventually
            // purge that malformed data
-            let Ok(sent_at) = OffsetDateTime::from_unix_timestamp(reply_key.sent_at_timestamp) else {
+            let Ok(sent_at) = OffsetDateTime::from_unix_timestamp(reply_key.sent_at_timestamp)
            else {
                error!("somehow our stored timestamp ({}) for one of our reply key is corrupted!. Going to remove all the entry", reply_key.sent_at_timestamp);
                to_remove_keys.push(*digest);
                continue;
@@ -180,7 +180,7 @@ impl<T> TransmissionBuffer<T> {
        while items.len() < n {
            let Some(next) = self.pop_next_message_at_random(rng) else {
-               break
+                break;
            };
            items.push(next)
        }
@@ -137,14 +137,46 @@ impl Config {
        self
    }
    pub fn set_no_cover_traffic(&mut self) {
        self.debug.cover_traffic.disable_loop_cover_traffic_stream = true;
        self.debug.traffic.disable_main_poisson_packet_distribution = true;
    }
    pub fn with_disabled_cover_traffic_with_keepalive(mut self, disabled: bool) -> Self {
        if disabled {
            self.set_no_cover_traffic_with_keepalive()
        }
        self
    }
    pub fn set_no_cover_traffic_with_keepalive(&mut self) {
        self.debug.traffic.disable_main_poisson_packet_distribution = true;
        self.debug.cover_traffic.loop_cover_traffic_average_delay = Duration::from_secs(5);
    }
    pub fn with_disabled_topology_refresh(mut self, disable_topology_refresh: bool) -> Self {
        self.debug.topology.disable_refreshing = disable_topology_refresh;
        self
    }
-    pub fn set_no_cover_traffic(&mut self) {
+    pub fn with_no_per_hop_delays(mut self, no_per_hop_delays: bool) -> Self {
-        self.debug.cover_traffic.disable_loop_cover_traffic_stream = true;
+        if no_per_hop_delays {
-        self.debug.traffic.disable_main_poisson_packet_distribution = true;
+            self.set_no_per_hop_delays()
        }
        self
    }
    pub fn set_no_per_hop_delays(&mut self) {
        self.debug.traffic.average_packet_delay = Duration::ZERO;
        self.debug.acknowledgements.average_ack_delay = Duration::ZERO;
    }
    pub fn with_secondary_packet_size(mut self, secondary_packet_size: Option<PacketSize>) -> Self {
        self.set_secondary_packet_size(secondary_packet_size);
        self
    }
    pub fn set_secondary_packet_size(&mut self, secondary_packet_size: Option<PacketSize>) {
        self.debug.traffic.secondary_packet_size = secondary_packet_size;
    }
    pub fn set_custom_version(&mut self, version: &str) {
@@ -282,7 +314,7 @@ impl Client {
 }
 #[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
+#[serde(default, deny_unknown_fields)]
 pub struct Traffic {
    /// The parameter of Poisson distribution determining how long, on average,
    /// sent packet is going to be delayed at any given mix node.
@@ -724,7 +724,7 @@ impl<C, St> GatewayClient<C, St> {
        Ok(())
    }
-    async fn try_reconnect(&mut self) -> Result<(), GatewayClientError> {
+    pub async fn try_reconnect(&mut self) -> Result<(), GatewayClientError> {
        if !self.connection.is_established() {
            self.establish_connection().await?;
        }
@@ -738,6 +738,12 @@ impl<C, St> GatewayClient<C, St> {
        Ok(())
    }
    pub async fn disconnect(&mut self) -> Result<(), GatewayClientError> {
        self.recover_socket_connection().await?;
        self.connection = SocketState::NotConnected;
        Ok(())
    }
    pub async fn authenticate_and_start(&mut self) -> Result<Arc<SharedKeys>, GatewayClientError>
    where
        C: DkgQueryClient + Send + Sync,
@@ -48,17 +48,21 @@ impl PacketRouter {
        // data he takes the SURB-ACK and first hop address.
        // currently SURB-ACKs are attached in EVERY packet, even cover, so this is always true
        let ack_overhead = PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN;
        let outfox_ack_overhead =
            PacketSize::OutfoxAckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN;
        for received_packet in unwrapped_packets {
            if received_packet.len() == PacketSize::AckPacket.plaintext_size()
-                || received_packet.len() == PacketSize::OutfoxAckPacket.plaintext_size()
+            // we don't know the real size of the payload, it could be anything <= 48 bytes
                || received_packet.len() <= PacketSize::OutfoxAckPacket.plaintext_size()
            {
                received_acks.push(received_packet);
            } else if received_packet.len()
                == PacketSize::RegularPacket.plaintext_size() - ack_overhead
                || received_packet.len()
-                    == PacketSize::OutfoxRegularPacket.plaintext_size() - ack_overhead
+                    == PacketSize::OutfoxRegularPacket.plaintext_size() - outfox_ack_overhead
-                || received_packet.len() == PacketSize::OutfoxRegularPacket.size() - 6
+                || received_packet.len()
                    == PacketSize::OutfoxRegularPacket.size() - outfox_ack_overhead
            {
                trace!("routing regular packet");
                received_messages.push(received_packet);
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::error::GatewayClientError;
@@ -13,6 +13,7 @@ colored = "2.0"
 nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
 nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
 nym-ephemera-common = { path = "../../cosmwasm-smart-contracts/ephemera" }
 nym-mixnet-contract-common = { path = "../../cosmwasm-smart-contracts/mixnet-contract" }
 nym-vesting-contract-common = { path = "../../cosmwasm-smart-contracts/vesting-contract" }
 nym-coconut-bandwidth-contract-common = { path = "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
@@ -41,7 +42,7 @@ nym-api-requests = { path = "../../../nym-api/nym-api-requests" }
 async-trait = { workspace = true, optional = true }
 bip39 = { workspace = true, features = ["rand"], optional = true }
 nym-config = { path = "../../config", optional = true }
-cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32", "cosmwasm"], optional = true }
+cosmrs = { workspace = true, features = ["rpc", "bip32", "cosmwasm"], optional = true }
 # note that this has the same version as used by cosmrs
 eyre = { version = "0.6", optional = true }
 cw3 = { workspace = true, optional = true }
@@ -55,7 +56,7 @@ cosmwasm-std = { workspace = true, optional = true }
 [dev-dependencies]
 bip39 = { workspace = true }
-cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32"] }
+cosmrs = { workspace = true, features = ["rpc", "bip32"] }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
 ts-rs = "6.1.2"
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::{nym_api, ValidatorClientError};
@@ -17,7 +17,7 @@ pub use nym_mixnet_contract_common::{
 use url::Url;
 #[cfg(feature = "nyxd-client")]
-use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient};
+use crate::nyxd::traits::{DkgQueryClient, EphemeraQueryClient, MixnetQueryClient};
 #[cfg(feature = "nyxd-client")]
 use crate::nyxd::{self, CosmWasmClient, NyxdClient, QueryNyxdClient, SigningNyxdClient};
 #[cfg(feature = "nyxd-client")]
@@ -29,6 +29,8 @@ use nym_coconut_dkg_common::{types::EpochId, verification_key::ContractVKShare};
 #[cfg(feature = "nyxd-client")]
 use nym_coconut_interface::Base58;
 #[cfg(feature = "nyxd-client")]
 use nym_ephemera_common::types::JsonPeerInfo;
 #[cfg(feature = "nyxd-client")]
 use nym_mixnet_contract_common::{
    families::{Family, FamilyHead},
    mixnode::MixNodeBond,
@@ -569,6 +571,26 @@ impl<C> Client<C> {
        Ok(events)
    }
    pub async fn get_all_ephemera_peers(&self) -> Result<Vec<JsonPeerInfo>, ValidatorClientError>
    where
        C: CosmWasmClient + Sync + Send,
    {
        let mut peers = Vec::new();
        let mut start_after = None;
        loop {
            let mut paged_response = self.get_peers_paged(start_after.take(), None).await?;
            peers.append(&mut paged_response.peers);
            if let Some(start_after_res) = paged_response.start_next_after {
                start_after = Some(start_after_res.to_string())
            } else {
                break;
            }
        }
        Ok(peers)
    }
 }
 // validator-api wrappers
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::nym_api::error::NymAPIError;
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 // TODO: There's a significant argument to pull those out of the package and make a PR on https://github.com/cosmos/cosmos-rust/
@@ -127,46 +127,13 @@ impl GasAdjustable for Gas {
 mod sealed {
    use cosmrs::tx::{self, Gas};
    use cosmrs::Coin as CosmosCoin;
-    use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
+    use cosmrs::{AccountId, Denom as CosmosDenom};
    use serde::{Deserialize, Deserializer, Serialize, Serializer};
    fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
        val.as_ref().to_string()
    }
    #[derive(Serialize, Deserialize)]
    #[serde(remote = "CosmosDenom")]
    struct Denom(#[serde(getter = "cosmos_denom_inner_getter")] String);
    impl From<Denom> for CosmosDenom {
        fn from(val: Denom) -> Self {
            val.0.parse().unwrap()
        }
    }
    fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
        // haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
        // note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
        val.to_string().parse().unwrap()
    }
    // at the time of writing it the current cosmrs' Decimal is extremely limited...
    #[derive(Serialize, Deserialize)]
    #[serde(remote = "CosmosDecimal")]
    struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
    impl From<Decimal> for CosmosDecimal {
        fn from(val: Decimal) -> Self {
            val.0.into()
        }
    }
    #[derive(Serialize, Deserialize, Clone)]
    struct Coin {
        #[serde(with = "Denom")]
        denom: CosmosDenom,
-        #[serde(with = "Decimal")]
+        amount: u128,
        amount: CosmosDecimal,
    }
    impl From<Coin> for CosmosCoin {
@@ -39,7 +39,7 @@ pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
 pub use cosmrs::tendermint::Time as TendermintTime;
 pub use cosmrs::tx::{self, Gas};
 pub use cosmrs::Coin as CosmosCoin;
-pub use cosmrs::{bip32, AccountId, Decimal, Denom};
+pub use cosmrs::{bip32, AccountId, Denom};
 use cosmwasm_std::Addr;
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
@@ -67,6 +67,7 @@ pub struct Config {
    pub(crate) group_contract_address: Option<AccountId>,
    pub(crate) multisig_contract_address: Option<AccountId>,
    pub(crate) coconut_dkg_contract_address: Option<AccountId>,
    pub(crate) ephemera_contract_address: Option<AccountId>,
    pub(crate) service_provider_contract_address: Option<AccountId>,
    pub(crate) name_service_contract_address: Option<AccountId>,
    // TODO: add this in later commits
@@ -133,6 +134,10 @@ impl Config {
                details.contracts.coconut_dkg_contract_address.as_ref(),
                prefix,
            )?,
            ephemera_contract_address: Self::parse_optional_account(
                details.contracts.ephemera_contract_address.as_ref(),
                prefix,
            )?,
            service_provider_contract_address: Self::parse_optional_account(
                details
                    .contracts
@@ -263,6 +268,10 @@ impl<C> NyxdClient<C> {
        self.config.service_provider_contract_address = Some(address);
    }
    pub fn set_ephemera_contract_address(&mut self, address: AccountId) {
        self.config.ephemera_contract_address = Some(address);
    }
    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
    // note: what unwrap is doing here is just moving a failure that would have normally
    // occurred in `connect` when attempting to parse an empty address,
@@ -321,6 +330,14 @@ impl<C> NyxdClient<C> {
        self.config.coconut_dkg_contract_address.as_ref().unwrap()
    }
    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
    // note: what unwrap is doing here is just moving a failure that would have normally
    // occurred in `connect` when attempting to parse an empty address,
    // so it's not introducing new source of failure (just moves it)
    pub fn ephemera_contract_address(&self) -> &AccountId {
        self.config.ephemera_contract_address.as_ref().unwrap()
    }
    // The service provider directory contract is optional, so we return an Option not a Result
    pub fn service_provider_contract_address(&self) -> Option<&AccountId> {
        self.config.service_provider_contract_address.as_ref()
@@ -0,0 +1,53 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{CosmWasmClient, NyxdClient};
 use async_trait::async_trait;
 use nym_ephemera_common::msg::QueryMsg as EphemeraQueryMsg;
 use nym_ephemera_common::peers::PagedPeerResponse;
 use serde::Deserialize;
 #[async_trait]
 pub trait EphemeraQueryClient {
    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
    where
        for<'a> T: Deserialize<'a>;
    async fn get_peers_paged(
        &self,
        start_after: Option<String>,
        limit: Option<u32>,
    ) -> Result<PagedPeerResponse, NyxdError> {
        let request = EphemeraQueryMsg::GetPeers { start_after, limit };
        self.query_ephemera_contract(request).await
    }
 }
 #[async_trait]
 impl<C> EphemeraQueryClient for NyxdClient<C>
 where
    C: CosmWasmClient + Send + Sync,
 {
    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
    where
        for<'a> T: Deserialize<'a>,
    {
        self.client
            .query_contract_smart(self.ephemera_contract_address(), &query)
            .await
    }
 }
 #[async_trait]
 impl<C> EphemeraQueryClient for crate::Client<C>
 where
    C: CosmWasmClient + Sync + Send,
 {
    async fn query_ephemera_contract<T>(&self, query: EphemeraQueryMsg) -> Result<T, NyxdError>
    where
        for<'a> T: Deserialize<'a>,
    {
        self.nyxd.query_ephemera_contract(query).await
    }
 }
@@ -0,0 +1,43 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::nyxd::cosmwasm_client::types::ExecuteResult;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
 use async_trait::async_trait;
 use nym_ephemera_common::msg::ExecuteMsg as EphemeraExecuteMsg;
 use nym_ephemera_common::types::JsonPeerInfo;
 #[async_trait]
 pub trait EphemeraSigningClient {
    async fn register_as_peer(
        &self,
        peer_info: JsonPeerInfo,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NyxdError>;
 }
 #[async_trait]
 impl<C> EphemeraSigningClient for NyxdClient<C>
 where
    C: SigningCosmWasmClient + Send + Sync,
 {
    async fn register_as_peer(
        &self,
        peer_info: JsonPeerInfo,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NyxdError> {
        let req = EphemeraExecuteMsg::RegisterPeer { peer_info };
        self.client
            .execute(
                self.address(),
                self.ephemera_contract_address(),
                &req,
                fee.unwrap_or_default(),
                format!("registering {} as an ephemera peer", self.address()),
                vec![],
            )
            .await
    }
 }
@@ -1,10 +1,12 @@
-// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 // TODO: expose query-related capabilities to wasm client...
 mod coconut_bandwidth_query_client;
 mod dkg_query_client;
 mod ephemera_query_client;
 mod ephemera_signing_client;
 mod group_query_client;
 mod mixnet_query_client;
 mod multisig_query_client;
@@ -24,6 +26,7 @@ mod name_service_signing_client;
 pub use coconut_bandwidth_query_client::CoconutBandwidthQueryClient;
 pub use dkg_query_client::DkgQueryClient;
 pub use ephemera_query_client::EphemeraQueryClient;
 pub use group_query_client::GroupQueryClient;
 pub use mixnet_query_client::MixnetQueryClient;
 pub use multisig_query_client::MultisigQueryClient;
@@ -33,6 +36,7 @@ pub use vesting_query_client::VestingQueryClient;
 pub use coconut_bandwidth_signing_client::CoconutBandwidthSigningClient;
 pub use dkg_signing_client::DkgSigningClient;
 pub use ephemera_signing_client::EphemeraSigningClient;
 pub use mixnet_signing_client::MixnetSigningClient;
 pub use multisig_signing_client::MultisigSigningClient;
 pub use name_service_signing_client::NameServiceSigningClient;
@@ -4,7 +4,7 @@ use nym_contracts_common::ContractBuildInformation;
 use nym_name_service_common::{
    msg::QueryMsg as NameQueryMsg,
    response::{ConfigResponse, NamesListResponse, PagedNamesListResponse},
-    Address, NameEntry, NameId,
+    Address, NameId, RegisteredName,
 };
 use serde::Deserialize;
@@ -21,7 +21,7 @@ pub trait NameServiceQueryClient {
            .await
    }
-    async fn get_name_entry(&self, name_id: NameId) -> Result<NameEntry, NyxdError> {
+    async fn get_name_entry(&self, name_id: NameId) -> Result<RegisteredName, NyxdError> {
        self.query_name_service_contract(NameQueryMsg::NameId { name_id })
            .await
    }
@@ -54,14 +54,14 @@ pub trait NameServiceQueryClient {
            .await
    }
-    async fn get_all_names(&self) -> Result<Vec<NameEntry>, NyxdError> {
+    async fn get_all_names(&self) -> Result<Vec<RegisteredName>, NyxdError> {
        let mut services = Vec::new();
        let mut start_after = None;
        loop {
            let mut paged_response = self.get_names_paged(start_after.take(), None).await?;
-            let last_id = paged_response.names.last().map(|serv| serv.name_id);
+            let last_id = paged_response.names.last().map(|serv| serv.id);
            services.append(&mut paged_response.names);
            if let Some(start_after_res) = last_id {
@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 use async_trait::async_trait;
-use nym_name_service_common::{msg::ExecuteMsg as NameExecuteMsg, Address, NameId, NymName};
+use nym_contracts_common::signing::MessageSignature;
 use nym_name_service_common::{msg::ExecuteMsg as NameExecuteMsg, NameDetails, NameId, NymName};
 use crate::nyxd::{
    coin::Coin, cosmwasm_client::types::ExecuteResult, error::NyxdError, Fee, NyxdClient,
@@ -20,14 +21,17 @@ pub trait NameServiceSigningClient {
    async fn register_name(
        &self,
-        name: NymName,
+        name: NameDetails,
-        address: Address,
+        owner_signature: MessageSignature,
        deposit: Coin,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NyxdError> {
        self.execute_name_service_contract(
            fee,
-            NameExecuteMsg::Register { name, address },
+            NameExecuteMsg::Register {
                name,
                owner_signature,
            },
            vec![deposit],
        )
        .await
@@ -14,7 +14,7 @@ clap = { version = "4.0", features = ["derive"] }
 cw-utils = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
-k256 = { version = "0.10", features = ["ecdsa", "sha256"] }
+k256 = { workspace = true, features = ["ecdsa", "sha256"] }
 log = { workspace = true }
 rand = {version = "0.6", features = ["std"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -25,7 +25,7 @@ toml = "0.5.6"
 url = "2.2"
 tap = "1"
-cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
+cosmrs = { workspace = true }
 cosmwasm-std = { workspace = true }
 nym-validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
@@ -41,3 +41,6 @@ nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-co
 nym-service-provider-directory-common = { path = "../cosmwasm-smart-contracts/service-provider-directory" }
 nym-name-service-common = { path = "../cosmwasm-smart-contracts/name-service" }
 nym-sphinx = { path = "../../common/nymsphinx" }
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }
 nym-types = { path = "../../common/types" }
@@ -56,6 +56,8 @@ pub async fn generate(args: Args) {
                .expect("threshold can't be converted to Decimal"),
        },
        max_voting_period: Duration::Time(args.max_voting_period),
        executor: None,
        proposal_deposit: None,
        coconut_bandwidth_contract_address: coconut_bandwidth_contract_address.to_string(),
        coconut_dkg_contract_address: coconut_dkg_contract_address.to_string(),
    };
@@ -0,0 +1,68 @@
 use clap::{Args, Parser, Subcommand};
 use nym_bin_common::output_format::OutputFormat;
 use nym_crypto::asymmetric::identity;
 use nym_types::helpers::ConsoleSigningOutput;
 use nym_validator_client::nyxd::error::NyxdError;
 use std::path::PathBuf;
 #[derive(Debug, Args)]
 #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
 pub struct MixnetOperatorsIdentityKey {
    #[clap(subcommand)]
    pub command: MixnetOperatorsIdentityKeyCommands,
 }
 #[derive(Debug, Subcommand)]
 pub enum MixnetOperatorsIdentityKeyCommands {
    /// Register a name alias for a nym address
    Sign(SignArgs),
 }
 #[derive(Debug, Parser)]
 pub struct SignArgs {
    /// Path to private identity key (example: private_identity_key.pem)
    #[clap(long)]
    private_key: PathBuf,
    /// Base58 encoded message to sign
    #[clap(long)]
    base58_msg: String,
    #[clap(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 pub async fn sign(args: SignArgs) -> Result<(), NyxdError> {
    eprintln!(">>> loading: {}", args.private_key.display());
    let private_identity_key: identity::PrivateKey =
        nym_pemstore::load_key(args.private_key).expect("failed to load key");
    print_signed_msg(&private_identity_key, &args.base58_msg, args.output);
    Ok(())
 }
 fn print_signed_msg(private_key: &identity::PrivateKey, raw_msg: &str, output: OutputFormat) {
    let trimmed = raw_msg.trim();
    eprintln!(">>> attempting to sign: {trimmed}");
    let Ok(decoded) = bs58::decode(trimmed).into_vec() else {
        println!("failed to base58 decode the message, did you copy it correctly?");
        return;
    };
    eprintln!(">>> decoding the message...");
    // we don't really care about what particular information is embedded inside of it,
    // we just want to know if user correctly copied the string, i.e. whether it's a valid bs58 encoded json
    if serde_json::from_slice::<serde_json::Value>(&decoded).is_err() {
        println!("failed to parse the message after decoding, did you copy it correctly?");
        return;
    };
    // if this is a valid json, it MUST be a valid string
    let decoded_string = String::from_utf8(decoded.clone()).unwrap();
    let signature = private_key.sign(&decoded).to_base58_string();
    let sign_output = ConsoleSigningOutput::new(decoded_string, signature);
    println!("{}", output.format(&sign_output));
 }
@@ -35,9 +35,14 @@ pub async fn create_family_join_permit_sign_payload(args: Args, client: QueryCli
    info!("Create family join permit sign payload");
    // get the address of our mixnode to recover the family head information
-    let Some(mixnode) = client.get_owned_mixnode(&args.address).await.unwrap().mixnode_details else {
+    let Some(mixnode) = client
        .get_owned_mixnode(&args.address)
        .await
        .unwrap()
        .mixnode_details
    else {
        eprintln!("{} does not seem to even own a mixnode!", args.address);
-        return
+        return;
    };
    // make sure this mixnode is actually a family head
@@ -4,6 +4,7 @@
 use clap::{Args, Subcommand};
 pub mod gateway;
 pub mod identity_key;
 pub mod mixnode;
 pub mod name;
 pub mod service;
@@ -26,4 +27,6 @@ pub enum MixnetOperatorsCommands {
    ServiceProvider(service::MixnetOperatorsService),
    /// Manage your registered name
    Name(name::MixnetOperatorsName),
    /// Sign messages using your private identity key
    IdentityKey(identity_key::MixnetOperatorsIdentityKey),
 }
@@ -1,6 +1,7 @@
 use clap::Parser;
 use log::{error, info};
-use nym_name_service_common::{Address, Coin, NymName};
+use nym_contracts_common::signing::MessageSignature;
 use nym_name_service_common::{Address, Coin, NameDetails, NymName};
 use nym_validator_client::nyxd::{error::NyxdError, traits::NameServiceSigningClient};
 use tap::TapFallible;
@@ -16,9 +17,15 @@ pub struct Args {
    #[clap(long)]
    pub nym_address: String,
    #[clap(long)]
    pub signature: MessageSignature,
    /// Deposit to be made to the service provider directory, in curent DENOMINATION (e.g. 'unym')
    #[clap(long)]
    pub deposit: u128,
    #[clap(long)]
    pub identity_key: String,
 }
 pub async fn register(args: Args, client: SigningClient) -> Result<(), NyxdError> {
@@ -29,12 +36,17 @@ pub async fn register(args: Args, client: SigningClient) -> Result<(), NyxdError
    let name = NymName::new(&args.name).expect("invalid name");
    let address = Address::new(&args.nym_address);
    let name = NameDetails {
        name,
        address,
        identity_key: args.identity_key,
    };
    let denom = client.current_chain_details().mix_denom.base.as_str();
    let deposit = Coin::new(args.deposit, denom);
    let res = client
-        .register_name(name, address, deposit.into(), None)
+        .register_name(name, args.signature, deposit.into(), None)
        .await
        .tap_err(|err| error!("Failed to register name: {err:#?}"))?;
--- a/Show More
+++ b/Show More