Add extended packet sizes

Increase sampling time
Change benchmark name
2023-02-15 09:17:30 +00:00 · 2023-02-14 21:15:33 +00:00 · 2023-02-14 21:13:13 +00:00 · 2023-02-14 17:44:19 +00:00
325 changed files with 2845 additions and 3257 deletions
@@ -39,14 +39,18 @@ jobs:
        uses: actions/setup-node@v3
        with:
          node-version: 16
-      - name: Matrix - Node Install
+      - name: Keybase - Node Install
        run: npm install
        working-directory: .github/workflows/support-files
-      - name: Matrix - Send Notification
+      - name: Keybase - Send Notification
        env:
          NYM_NOTIFICATION_KIND: security
          NYM_PROJECT_NAME: "Daily security report"
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+          KEYBASE_NYM_CHANNEL: "security"
          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
@@ -43,10 +43,10 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ts-${{ env.GITHUB_REF_SLUG }}-example
        EXCLUDE: "/dist/, /node_modules/"
-    - name: Matrix - Node Install
+    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
-    - name: Matrix - Send Notification
+    - name: Keybase - Send Notification
      env:
        NYM_NOTIFICATION_KIND: ts-packages
        NYM_PROJECT_NAME: "ts-packages"
@@ -54,6 +54,10 @@ jobs:
        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-ts-packages"
        IS_SUCCESS: "${{ job.status == 'success' }}"
        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -1,61 +0,0 @@
-name: check-merge-conflicts
-
-# Check that the latest release branch merges into master and develop without
-# any conflicts that git is not able to resolve
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '5 6 * * *'
-
-jobs:
-  get_release:
-    runs-on: ubuntu-latest
-    outputs:
-      output1: ${{ steps.step2.outputs.latest_release }}
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set output variable to latest release branch
-        id: step2
-        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n 1)" >> $GITHUB_OUTPUT
-
-  check-merge-release-into-master:
-    name: Check that the release branch merges into master
-    needs: get_release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup git user
-        run: |
-          git config --global user.name "ci"
-          git config --global user.email "ci@localhost"
-      - name: Check merge release branch into master
-        run: |
-          ./.github/workflows/support-files/git-merge-check.sh origin/master $branch1
-        env:
-          branch1: ${{needs.get_release.outputs.output1}}
-
-  check-merge-release-into-develop:
-    name: Check that the release branch merges into develop
-    needs: get_release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup git user
-        run: |
-          git config --global user.name "ci"
-          git config --global user.email "ci@localhost"
-      - name: Check merge release branch into develop
-        run: |
-          ./.github/workflows/support-files/git-merge-check.sh origin/develop $branch1
-        env:
-          branch1: ${{needs.get_release.outputs.output1}}
@@ -57,10 +57,10 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ne-sb-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
-    - name: Matrix - Node Install
+    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
-    - name: Matrix - Send Notification
+    - name: Keybase - Send Notification
      env:
        NYM_NOTIFICATION_KIND: network-explorer
        NYM_PROJECT_NAME: "Network Explorer"
@@ -69,6 +69,10 @@ jobs:
        NYM_CI_WWW_LOCATION_STORYBOOK: "ne-sb-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-network-explorer"
        IS_SUCCESS: "${{ job.status == 'success' }}"
        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -153,11 +153,11 @@ jobs:
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 16
-      - name: Matrix - Node Install
+      - name: Keybase - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
        working-directory: .github/workflows/support-files
-      - name: Matrix - Send Notification
+      - name: Keybase - Send Notification
        if: env.WORKFLOW_CONCLUSION == 'failure'
        env:
          NYM_NOTIFICATION_KIND: nightly
@@ -165,6 +165,10 @@ jobs:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
          GIT_BRANCH: "${GITHUB_REF##*/}"
+          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+          KEYBASE_NYM_CHANNEL: "ci-nightly"
          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -28,7 +28,7 @@ jobs:
        run: git fetch --all
      - name: Set output variable to latest release branch
        id: step2
-        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n 1 | sed 's/  origin\///')" >> $GITHUB_OUTPUT
+        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | sed 's/  origin\///')" >> $GITHUB_OUTPUT
  build:
    needs: [get_release,matrix_prep]
    strategy:
@@ -168,11 +168,11 @@ jobs:
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 16
-      - name: Matrix - Node Install
+      - name: Keybase - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
        working-directory: .github/workflows/support-files
-      - name: Matrix - Send Notification
+      - name: Keybase - Send Notification
        if: env.WORKFLOW_CONCLUSION == 'failure'
        env:
          NYM_NOTIFICATION_KIND: nightly
@@ -180,6 +180,10 @@ jobs:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
          GIT_BRANCH_NAME: "${{needs.get_release.outputs.output1}}"
+          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+          KEYBASE_NYM_CHANNEL: "ci-nightly-release"
          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -28,7 +28,7 @@ jobs:
        run: git fetch --all
      - name: Set output variable to latest release branch
        id: step2
-        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n 2 | head -n 1 | sed 's/  origin\///')" >> $GITHUB_OUTPUT
+        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+' | tail -n 2 | head -n 1 | sed 's/  origin\///')" >> $GITHUB_OUTPUT
  build:
    needs: [get_release,matrix_prep]
    strategy:
@@ -168,11 +168,11 @@ jobs:
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 16
-      - name: Matrix - Node Install
+      - name: Keybase - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
        working-directory: .github/workflows/support-files
-      - name: Matrix - Send Notification
+      - name: Keybase - Send Notification
        if: env.WORKFLOW_CONCLUSION == 'failure'
        env:
          NYM_NOTIFICATION_KIND: nightly
@@ -180,6 +180,10 @@ jobs:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
          GIT_BRANCH_NAME: "${{needs.get_release.outputs.output1}}"
+          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+          KEYBASE_NYM_CHANNEL: "ci-nightly-release"
          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -10,7 +10,7 @@ env:

 jobs:
  publish-nym-cli:
-    if: ${{ startsWith(github.ref, 'refs/tags/nym-cli-') && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/nym-cli-') && (github.event_name == 'release' || github.event_name = 'workflow_dispatch') }}
    strategy:
      fail-fast: false
      matrix:
@@ -10,7 +10,7 @@ defaults:

 jobs:
  publish-tauri:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    if: ${{ startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release' }}
    strategy:
      fail-fast: false
      matrix:
@@ -56,7 +56,7 @@ jobs:
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

      - name: Install app dependencies
-        run: yarn --network-timeout 100000
+        run: yarn

      - name: Build and sign it
        env:
@@ -72,7 +72,7 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect_1.0.0_x64_en-US.msi
-          path: nym-connect/target/release/bundle/msi/nym-connect_1.*.msi
+          path: nym-connect/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi
          retention-days: 30

      - name: Upload to release based on tag name
@@ -39,10 +39,10 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/nym-connect-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
-    - name: Matrix - Node Install
+    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
-    - name: Matrix - Send Notification
+    - name: Keybase - Send Notification
      env:
        NYM_NOTIFICATION_KIND: nym-connect
        NYM_PROJECT_NAME: "nym-connect"
@@ -50,6 +50,10 @@ jobs:
        NYM_CI_WWW_LOCATION: "nym-connect-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-nym-connect"
        IS_SUCCESS: "${{ job.status == 'success' }}"
        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -1,6 +1,5 @@
 name: Publish Nym Wallet (Windows 10)
 on:
-  workflow_dispatch:
  release:
    types: [created]

@@ -10,7 +9,7 @@ defaults:

 jobs:
  publish-tauri:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    if: ${{ startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release' }}
    strategy:
      fail-fast: false
      matrix:
@@ -56,7 +55,7 @@ jobs:
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

      - name: Install app dependencies
-        run: yarn --network-timeout 100000
+        run: yarn

      - name: Build and sign it
        env:
@@ -68,16 +67,8 @@ jobs:
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: yarn build

-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-wallet_1.0.0_x64_en-US.msi
-          path: nym-wallet/target/release/bundle/msi/nym-wallet_1.*.msi
-          retention-days: 30
-
      - 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
@@ -35,10 +35,10 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
-    - name: Matrix - Node Install
+    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
-    - name: Matrix - Send Notification
+    - name: Keybase - Send Notification
      env:
        NYM_NOTIFICATION_KIND: nym-wallet
        NYM_PROJECT_NAME: "nym-wallet"
@@ -46,6 +46,10 @@ jobs:
        NYM_CI_WWW_LOCATION: "wallet-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-nym-wallet"
        IS_SUCCESS: "${{ job.status == 'success' }}"
        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -1,3 +1,7 @@
+KEYBASE_NYM_CHANNEL=
+KEYBASE_NYMBOT_USERNAME=
+KEYBASE_NYMBOT_PAPERKEY=
+
 MATRIX_SERVER=
 MATRIX_ROOM=
 MATRIX_ROOM_OF_SHAME=
@@ -35,4 +39,4 @@ NYM_CI_WWW_BASE=example.com
 # Nightly builds
 WORKFLOW_CONCLUSION=success

-SHOW_DEBUG=true
+SHOW_DEBUG=true
@@ -4,7 +4,7 @@ This is a collection of scripts and files to support GitHub Actions.

 ## Sending Notifications

-These scripts send CI notifications to Matrix by creating messages from templates and env vars passed from GitHub Actions.
+These scripts send CI notifications to Keybase by creating messages from templates and env vars passed from GitHub Actions.

 ### Adding notifications to a GitHub Action

@@ -19,11 +19,10 @@ jobs:
      env:
        NYM_NOTIFICATION_KIND: "my-component"
        GIT_BRANCH: "${GITHUB_REF##*/}"
-        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
-        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
-        MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
-        MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
-        MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-network-explorer"
        IS_SUCCESS: "${{ job.status == 'success' }}"
      uses: docker://keybaseio/client:stable-node
      with:
@@ -35,8 +34,8 @@ Notifications are run by adding the snippet above to a GitHub Action, and:
 1. Installing node packages needed at run time
 2. Set the env vars as required:
    - `NYM_NOTIFICATION_KIND` matches the directory in `.github/workflows/support-files/${NYM_NOTIFICATION_KIND}` to provide the templates and extra scripting in `index.js`
-    - Matrix credentials, room and other env vars for the status of the build and repo
-3. Replacing the default entry point shell script on the `keybaseio/client:stable-node` docker image to run `.github/workflows/support-files/notifications/entry_point.sh`
+    - Keybase credentials, channel and other env vars for the status of the build and repo
+3. Replacing the default entry point shell script on the `keybaseio/client:stable-node` docker image to run `.github/workflows/support-files/notifications/entry_point.sh` 

 ### Running locally

@@ -44,7 +43,7 @@ You will need:
 - Node 16 LTS
 - npm

-Copy `.github/workflows/support-files/.env.example` to `.github/workflows/support-files/.env` and valid Matrix credentials.
+Copy `.github/workflows/support-files/.env.example` to `.github/workflows/support-files/.env` and valid Keybase credentials.

 Then run `npm install` to get dependencies.

@@ -56,4 +55,4 @@ npm install
 cp .env.example .env
 vi .env
 npm run dev
-```
+```
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Basic usage:
-#   ./git-merge-check origin/develop origin/release/v1.1.9
-#
-
-set -x
-
-set -o nounset
-set -o pipefail
-
-# Start from branch ...
-branch1=$1
-
-# ... and try to merge in
-branch2=$2
-
-echo "Checking if $branch2 merges without conflicts into $branch1..."
-
-git checkout -q $branch1 || exit 1
-
-# There are two options here as far as I see on what we should check for. Either
-#
-#  (A) check for CONFLICT in any file except whitelist (such as .lock files)
-#  (B) check for "Automatic merge failed"
-#
-# Both of these options have drawbacks.
-#
-# The first (A) has the problem in that maybe we don't want to fail if the
-# changes can be automatically merged (duh), but at least we are not pestered
-# about constant lock file changes.
-# The second (B) has the problem that it's difficult to filter out automatic
-# merge fails for files we don't care about (.lock files).
-#
-# The ideal solution would be to check for automatic merge fails for files
-# except those on a whitelist (e.g. lock files).
-
-# For now I choose to use (B) here, because I hope it might be less noisy
-
-# Alternative A
-#output=$(git merge --no-commit --no-ff $branch2 | grep -v .lock)
-#merge_failed=$(echo $output | grep -v "CONFLICT")
-#return_code=$?
-
-# Alternative B
-output=$(git merge --no-commit --no-ff $branch2)
-merge_failed=$(echo $output | grep -v "Automatic merge failed")
-return_code=$?
-
-# Restore
-
-git merge --abort
-git checkout -q -
-
-if [ $return_code -eq 0 ]; then
-    echo "Merge check success"
-else
-    echo "Merge check failed"
-fi
-
-exit $return_code
@@ -1,5 +1,6 @@
 require('dotenv').config();

+const Bot = require('keybase-bot');
 const { sendMatrixMessage } = require('./send_message_to_matrix');

 let context = {
@@ -23,6 +24,21 @@ function validateContext() {
      'Please set env var NYM_PROJECT_NAME with the project name for displaying in notification messages',
    );
  }
+  if (!context.env.KEYBASE_NYM_CHANNEL) {
+    throw new Error(
+      'Please set env var KEYBASE_NYM_CHANNEL with the channel name for the notification message',
+    );
+  }
+  if (!context.env.KEYBASE_NYMBOT_USERNAME) {
+    throw new Error(
+      'Username is not defined. Please set env var KEYBASE_NYMBOT_USERNAME',
+    );
+  }
+  if (!context.env.KEYBASE_NYMBOT_PAPERKEY) {
+    throw new Error(
+      'Paperkey is not defined. Please set env var KEYBASE_NYMBOT_PAPERKEY',
+    );
+  }
  if (context.env.MATRIX_ROOM) {
    if (!context.env.MATRIX_SERVER) {
      throw new Error(
@@ -68,6 +84,12 @@ function createTemplateContext() {

  context.kind = context.env.NYM_NOTIFICATION_KIND;

+  context.keybase = {
+    channel: context.env.KEYBASE_NYM_CHANNEL,
+    username: context.env.KEYBASE_NYMBOT_USERNAME,
+    paperkey: context.env.KEYBASE_NYMBOT_PAPERKEY,
+  };
+
  if (!context.env.GIT_BRANCH_NAME) {
    context.env.GIT_BRANCH_NAME = context.env.GITHUB_REF.split('/')
      .slice(2)
@@ -77,6 +99,40 @@ function createTemplateContext() {
  context.status = process.env.IS_SUCCESS === 'true' ? 'success' : 'failure';
 }

+async function sendKeybaseMessage(messageBody) {
+  const bot = new Bot();
+  try {
+    console.log(
+      `Initialising keybase with user "${
+        context.keybase.username
+      }" and key: "${'*'.repeat(context.keybase.paperkey.length)}"...`,
+    );
+    await bot.init(context.keybase.username, context.keybase.paperkey, {
+      verbose: false,
+    });
+
+    const channel = {
+      name: context.env.KEYBASE_NYMBOT_TEAM || 'nymtech_bot',
+      membersType: 'team',
+      topicName: context.keybase.channel,
+      topic_type: 'CHAT',
+    };
+    const message = {
+      body: messageBody,
+    };
+
+    console.log(`Sending to ${channel.name}#${channel.topicName}...`);
+    await bot.chat.send(channel, message);
+
+    console.log('Message sent!');
+  } catch (error) {
+    console.error(error);
+    process.exitCode = -1;
+  } finally {
+    await bot.deinit();
+  }
+}
+
 /**
 * Uses the `kind` set in the context to process the context and generate a notification message
 * @returns {Promise<string>} A string notification message body
@@ -113,6 +169,7 @@ async function main() {
    console.log(messageBody);
    console.log('-----------------------------------------');
  }
+  await sendKeybaseMessage(messageBody);
  if(context.env.MATRIX_ROOM) {
    await sendMatrixMessage(context, messageBody, context.env.MATRIX_ROOM)
  }
@@ -1,6 +1,6 @@
 {
-  "name": "send-matrix-message",
-  "description": "Sends a notification message with the matrix sdk",
+  "name": "send-keybase-message",
+  "description": "Sends a notification message with the keybase package that fails when piped into the keybase CLI",
  "version": "1.0.0",
  "private": true,
  "scripts": {
@@ -10,6 +10,7 @@
  "dependencies": {
    "dotenv": "^16.0.0",
    "handlebars": "^4.7.7",
+    "keybase-bot": "^3.6.1",
    "matrix-js-sdk": "^9.3.0",
    "node-localstorage": "^2.1.6",
    "octokit": "^1.7.1",
@@ -24,11 +24,11 @@ jobs:
    - name: Setup yarn
      run: npm install -g yarn
    - name: Lint
-      run: yarn && yarn build && yarn lint && yarn tsc
-    - name: Matrix - Node Install
+      run: yarn && yarn lint && yarn tsc
+    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
-    - name: Matrix - Send Notification
+    - name: Keybase - Send Notification
      env:
        NYM_NOTIFICATION_KIND: ts-packages
        NYM_PROJECT_NAME: "ts-packages"
@@ -36,6 +36,10 @@ jobs:
        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
+        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
+        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
+        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+        KEYBASE_NYM_CHANNEL: "ci-ts-packages"
        IS_SUCCESS: "${{ job.status == 'success' }}"
        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
@@ -2,52 +2,33 @@

 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [Unreleased]
-
-## [v1.1.10] (2023-02-21)
-
- Verloc listener causing mixnode unexpected shutdown ([#3038])
- rust-sdk - update API following implementation experience with the network-requester ([#3001])
- Prevent coconut deposits in incompatible states ([#2991])
- Support unavailable signer within threshold ([#2987])
- Implement DKG re-sharing ([#2935])
- contracts: add nym prefix to mixnet and vesting contract packages ([#2855])
- Introduce common interface for all service providers to allow obtaining information such as whether they're online, what binary version they're running, etc. ([#2758])
- Add client functionality to nym-network-requester ([#1900])
- nym-api: uptime rework ([#3053])
- ci: update typescript-lint.yml ([#3035])
- contracts: add nym prefix to mixnet and vesting contract packages ([#2855])
-
-[#3038]: https://github.com/nymtech/nym/issues/3038
-[#3001]: https://github.com/nymtech/nym/issues/3001
-[#2991]: https://github.com/nymtech/nym/issues/2991
-[#2987]: https://github.com/nymtech/nym/issues/2987
-[#2935]: https://github.com/nymtech/nym/issues/2935
-[#2855]: https://github.com/nymtech/nym/pull/2855
-[#2758]: https://github.com/nymtech/nym/issues/2758
-[#1900]: https://github.com/nymtech/nym/issues/1900
-[#3053]: https://github.com/nymtech/nym/pull/3053
-[#3035]: https://github.com/nymtech/nym/pull/3035
-[#2855]: https://github.com/nymtech/nym/pull/2855
-
-## [v1.1.9] (2023-02-07)
+# [Unreleased]
+
+### Added
+
+- dkg resharing mode ([#2936])
+
+[#2936]: https://github.com/nymtech/nym/pull/2936
+
+
+# [v1.1.9] (2023-02-07)

 ### Added

- Remove Coconut feature flag ([#2793])
 - Separate `nym-api` endpoints with values of "total-supply" and "circulating-supply" in `nym` ([#2964])
+- Add `host` option to client init ([#2912])
+- Remove Coconut feature flag ([#2793])
+- Don't drop in mixnet connection handler ([#2963])

 ### Changed
-
- native-client: is now capable of listening for requests on sockets different than `127.0.0.1` ([#2912]). This can be specified via `--host` flag during `init` or `run`. Alternatively a custom `host` can be set in `config.toml` file under `socket` section.
+- native-client: is now capable of listening for requests on sockets different than `127.0.0.1` ([#2939]). This can be specified via `--host` flag during `init` or `run`. Alternatively a custom `host` can be set in `config.toml` file under `socket` section.
 - mixnode, gateway: fix unexpected shutdown on corrupted connection ([#2963])

-[#2793]: https://github.com/nymtech/nym/issues/2793
-[#2912]: https://github.com/nymtech/nym/issues/2912
-[#2964]: https://github.com/nymtech/nym/issues/2964
-[#2963]: https://github.com/nymtech/nym/issues/3017
+[#2939]: https://github.com/nymtech/nym/pull/2939
+[#2963]: https://github.com/nymtech/nym/pull/2963

-## [v1.1.8] (2023-01-31)
+
+# [v1.1.8] (2023-01-31)

 ### Added

@@ -67,7 +48,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#2873]: https://github.com/nymtech/nym/issues/2873


-## [v1.1.7] (2023-01-24)
+# [v1.1.7] (2023-01-24)

 ### Added

@@ -123,6 +104,12 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ### Added

+### Changed
+
+## [v1.1.5] (2023-01-10)
+
+### Added
+
 - socks5: send status message for service ready, and network-requester error response in https://github.com/nymtech/nym/pull/2715

 ### Changed
@@ -693,11 +693,12 @@ dependencies = [

 [[package]]
 name = "client-core"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "async-trait",
 "client-connections",
 "config",
+ "crypto",
 "dashmap 5.4.0",
 "dirs",
 "futures",
@@ -707,9 +708,8 @@ dependencies = [
 "humantime-serde",
 "log",
 "nonexhaustive-delayqueue",
- "nym-crypto",
- "nym-pemstore",
 "nymsphinx",
+ "pemstore",
 "rand 0.7.3",
 "serde",
 "serde_json",
@@ -753,10 +753,10 @@ dependencies = [
 name = "coconut-dkg-common"
 version = "0.1.0"
 dependencies = [
+ "contracts-common",
 "cosmwasm-std",
 "cw-utils",
 "multisig-contract-common",
- "nym-contracts-common",
 "schemars",
 "serde",
 ]
@@ -875,6 +875,19 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"

+[[package]]
+name = "contracts-common"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "cosmwasm-std",
+ "dkg",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -1039,11 +1052,11 @@ dependencies = [
 "config",
 "credential-storage",
 "credentials",
+ "crypto",
 "log",
 "logging",
 "network-defaults",
- "nym-crypto",
- "nym-pemstore",
+ "pemstore",
 "rand 0.7.3",
 "serde",
 "thiserror",
@@ -1070,8 +1083,8 @@ dependencies = [
 "bls12_381 0.5.0",
 "coconut-interface",
 "cosmrs",
+ "crypto",
 "nym-api-requests",
- "nym-crypto",
 "rand 0.7.3",
 "thiserror",
 "validator-client",
@@ -1233,6 +1246,31 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

+[[package]]
+name = "crypto"
+version = "0.1.0"
+dependencies = [
+ "aes 0.8.2",
+ "blake3",
+ "bs58",
+ "cipher 0.4.3",
+ "ctr 0.9.2",
+ "digest 0.10.6",
+ "ed25519-dalek",
+ "generic-array 0.14.6",
+ "hkdf 0.12.3",
+ "hmac 0.12.1",
+ "nymsphinx-types",
+ "pemstore",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "thiserror",
+ "x25519-dalek",
+]
+
 [[package]]
 name = "crypto-bigint"
 version = "0.3.2"
@@ -1628,7 +1666,7 @@ dependencies = [
 "ff 0.11.1",
 "group 0.11.0",
 "lazy_static",
- "nym-pemstore",
+ "pemstore",
 "rand 0.8.5",
 "rand_chacha 0.3.1",
 "rand_core 0.6.4",
@@ -1847,10 +1885,11 @@ dependencies = [

 [[package]]
 name = "explorer-api"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "chrono",
 "clap 4.1.4",
+ "contracts-common",
 "dotenv",
 "humantime-serde",
 "isocountry",
@@ -1858,9 +1897,8 @@ dependencies = [
 "log",
 "logging",
 "maxminddb",
+ "mixnet-contract-common",
 "network-defaults",
- "nym-contracts-common",
- "nym-mixnet-contract-common",
 "okapi",
 "pretty_env_logger",
 "rand 0.8.5",
@@ -2120,15 +2158,15 @@ dependencies = [
 "coconut-interface",
 "credential-storage",
 "credentials",
+ "crypto",
 "futures",
 "gateway-requests",
 "getrandom 0.2.8",
 "log",
 "mobile-storage",
 "network-defaults",
- "nym-crypto",
- "nym-pemstore",
 "nymsphinx",
+ "pemstore",
 "rand 0.7.3",
 "serde",
 "task",
@@ -2152,11 +2190,11 @@ dependencies = [
 "bs58",
 "coconut-interface",
 "credentials",
+ "crypto",
 "futures",
 "log",
- "nym-crypto",
- "nym-pemstore",
 "nymsphinx",
+ "pemstore",
 "rand 0.7.3",
 "serde",
 "serde_json",
@@ -3178,16 +3216,35 @@ dependencies = [
 "tokio-util",
 ]

+[[package]]
+name = "mixnet-contract-common"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "contracts-common",
+ "cosmwasm-std",
+ "humantime-serde",
+ "log",
+ "rand_chacha 0.3.1",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "thiserror",
+ "time 0.3.17",
+ "ts-rs",
+]
+
 [[package]]
 name = "mixnode-common"
 version = "0.1.0"
 dependencies = [
 "bytes",
+ "crypto",
 "futures",
 "humantime-serde",
 "log",
 "network-defaults",
- "nym-crypto",
 "nymsphinx-acknowledgements",
 "nymsphinx-addressing",
 "nymsphinx-forwarding",
@@ -3308,9 +3365,9 @@ dependencies = [

 [[package]]
 name = "ntapi"
-version = "0.4.0"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
 "winapi",
 ]
@@ -3368,7 +3425,7 @@ dependencies = [

 [[package]]
 name = "nym-api"
-version = "1.1.10"
+version = "1.1.9"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -3382,9 +3439,11 @@ dependencies = [
 "coconut-interface",
 "config",
 "console-subscriber",
+ "contracts-common",
 "cosmwasm-std",
 "credential-storage",
 "credentials",
+ "crypto",
 "cw-utils",
 "cw3",
 "cw4",
@@ -3399,16 +3458,13 @@ dependencies = [
 "lazy_static",
 "log",
 "logging",
+ "mixnet-contract-common",
 "multisig-contract-common",
 "nym-api-requests",
- "nym-contracts-common",
- "nym-crypto",
- "nym-mixnet-contract-common",
- "nym-pemstore",
- "nym-vesting-contract-common",
 "nymcoconut",
 "nymsphinx",
 "okapi",
+ "pemstore",
 "pin-project",
 "pretty_env_logger",
 "rand 0.7.3",
@@ -3432,6 +3488,7 @@ dependencies = [
 "url",
 "validator-client",
 "version-checker",
+ "vesting-contract-common",
 ]

 [[package]]
@@ -3443,7 +3500,7 @@ dependencies = [
 "cosmrs",
 "cosmwasm-std",
 "getset",
- "nym-mixnet-contract-common",
+ "mixnet-contract-common",
 "schemars",
 "serde",
 "ts-rs",
@@ -3466,7 +3523,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "anyhow",
 "base64 0.13.1",
@@ -3507,10 +3564,9 @@ dependencies = [
 "humantime-serde",
 "k256",
 "log",
+ "mixnet-contract-common",
 "multisig-contract-common",
 "network-defaults",
- "nym-mixnet-contract-common",
- "nym-vesting-contract-common",
 "rand 0.6.5",
 "serde",
 "serde_json",
@@ -3520,11 +3576,12 @@ dependencies = [
 "toml",
 "url",
 "validator-client",
+ "vesting-contract-common",
 ]

 [[package]]
 name = "nym-client"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "build-information",
 "clap 4.1.4",
@@ -3535,6 +3592,7 @@ dependencies = [
 "config",
 "credential-storage",
 "credentials",
+ "crypto",
 "dirs",
 "futures",
 "gateway-client",
@@ -3543,9 +3601,8 @@ dependencies = [
 "log",
 "logging",
 "network-defaults",
- "nym-crypto",
- "nym-pemstore",
 "nymsphinx",
+ "pemstore",
 "pretty_env_logger",
 "rand 0.7.3",
 "serde",
@@ -3562,47 +3619,9 @@ dependencies = [
 "websocket-requests",
 ]

-[[package]]
-name = "nym-contracts-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "dkg",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "nym-crypto"
-version = "0.1.0"
-dependencies = [
- "aes 0.8.2",
- "blake3",
- "bs58",
- "cipher 0.4.3",
- "ctr 0.9.2",
- "digest 0.10.6",
- "ed25519-dalek",
- "generic-array 0.14.6",
- "hkdf 0.12.3",
- "hmac 0.12.1",
- "nym-pemstore",
- "nymsphinx-types",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
- "serde",
- "serde_bytes",
- "subtle-encoding",
- "thiserror",
- "x25519-dalek",
-]
-
 [[package]]
 name = "nym-gateway"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -3616,6 +3635,7 @@ dependencies = [
 "completions",
 "config",
 "credentials",
+ "crypto",
 "dashmap 4.0.2",
 "dirs",
 "dotenv",
@@ -3629,11 +3649,10 @@ dependencies = [
 "mixnode-common",
 "network-defaults",
 "nym-api-requests",
- "nym-crypto",
- "nym-pemstore",
 "nym-types",
 "nymsphinx",
 "once_cell",
+ "pemstore",
 "pretty_env_logger",
 "rand 0.7.3",
 "serde",
@@ -3652,28 +3671,9 @@ dependencies = [
 "version-checker",
 ]

-[[package]]
-name = "nym-mixnet-contract-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "humantime-serde",
- "log",
- "nym-contracts-common",
- "rand_chacha 0.3.1",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time 0.3.17",
- "ts-rs",
-]
-
 [[package]]
 name = "nym-mixnode"
-version = "1.1.10"
+version = "1.1.9"
 dependencies = [
 "anyhow",
 "atty",
@@ -3683,6 +3683,7 @@ dependencies = [
 "colored",
 "completions",
 "config",
+ "crypto",
 "cupid",
 "dirs",
 "dotenv",
@@ -3694,12 +3695,11 @@ dependencies = [
 "mixnet-client",
 "mixnode-common",
 "nonexhaustive-delayqueue",
- "nym-crypto",
- "nym-pemstore",
 "nym-types",
 "nymsphinx",
 "nymsphinx-params",
 "nymsphinx-types",
+ "pemstore",
 "pretty_env_logger",
 "rand 0.7.3",
 "rocket",
@@ -3718,24 +3718,19 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "async-trait",
 "build-information",
 "clap 4.1.4",
 "client-connections",
- "client-core",
 "completions",
- "config",
 "dirs",
 "futures",
 "ipnetwork 0.20.0",
- "lazy_static",
 "log",
 "logging",
 "network-defaults",
- "nym-crypto",
- "nym-sdk",
 "nymsphinx",
 "ordered-buffer",
 "pretty_env_logger",
@@ -3748,19 +3743,16 @@ dependencies = [
 "socks5-requests",
 "sqlx 0.6.2",
 "statistics-common",
- "tap",
 "task",
 "thiserror",
 "tokio",
 "tokio-tungstenite 0.17.2",
- "url",
- "version-checker",
 "websocket-requests",
 ]

 [[package]]
 name = "nym-network-statistics"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "dirs",
 "log",
@@ -3790,26 +3782,19 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "nym-pemstore"
-version = "0.1.0"
-dependencies = [
- "pem",
-]
-
 [[package]]
 name = "nym-sdk"
 version = "0.1.0"
 dependencies = [
 "client-connections",
 "client-core",
+ "crypto",
 "futures",
 "gateway-client",
 "gateway-requests",
 "log",
 "logging",
 "network-defaults",
- "nym-crypto",
 "nymsphinx",
 "pretty_env_logger",
 "rand 0.7.3",
@@ -3824,7 +3809,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.9"
+version = "1.1.8"
 dependencies = [
 "build-information",
 "clap 4.1.4",
@@ -3835,6 +3820,7 @@ dependencies = [
 "config",
 "credential-storage",
 "credentials",
+ "crypto",
 "dirs",
 "futures",
 "gateway-client",
@@ -3844,10 +3830,9 @@ dependencies = [
 "logging",
 "mobile-storage",
 "network-defaults",
- "nym-crypto",
- "nym-pemstore",
 "nymsphinx",
 "ordered-buffer",
+ "pemstore",
 "pin-project",
 "pretty_env_logger",
 "proxy-helpers",
@@ -3877,9 +3862,7 @@ dependencies = [
 "eyre",
 "itertools",
 "log",
- "nym-mixnet-contract-common",
- "nym-vesting-contract",
- "nym-vesting-contract-common",
+ "mixnet-contract-common",
 "reqwest",
 "schemars",
 "serde",
@@ -3890,33 +3873,8 @@ dependencies = [
 "ts-rs",
 "url",
 "validator-client",
-]
-
-[[package]]
-name = "nym-vesting-contract"
-version = "1.1.3"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "nym-contracts-common",
- "nym-mixnet-contract-common",
- "nym-vesting-contract-common",
- "schemars",
- "serde",
- "thiserror",
- "vergen 5.1.17",
-]
-
-[[package]]
-name = "nym-vesting-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "nym-contracts-common",
- "nym-mixnet-contract-common",
- "schemars",
- "serde",
- "ts-rs",
+ "vesting-contract",
+ "vesting-contract-common",
 ]

 [[package]]
@@ -3927,16 +3885,16 @@ dependencies = [
 "cosmrs",
 "cosmwasm-std",
 "hex-literal",
+ "mixnet-contract-common",
 "network-defaults",
- "nym-mixnet-contract-common",
 "nym-types",
- "nym-vesting-contract",
- "nym-vesting-contract-common",
 "serde",
 "serde_json",
 "strum 0.23.0",
 "ts-rs",
 "validator-client",
+ "vesting-contract",
+ "vesting-contract-common",
 ]

 [[package]]
@@ -3953,7 +3911,7 @@ dependencies = [
 "getrandom 0.2.8",
 "group 0.11.0",
 "itertools",
- "nym-pemstore",
+ "pemstore",
 "rand 0.8.5",
 "rand_chacha 0.3.1",
 "serde",
@@ -3966,8 +3924,9 @@ dependencies = [
 name = "nymsphinx"
 version = "0.1.0"
 dependencies = [
- "nym-crypto",
- "nym-mixnet-contract-common",
+ "criterion 0.3.6",
+ "crypto",
+ "mixnet-contract-common",
 "nymsphinx-acknowledgements",
 "nymsphinx-addressing",
 "nymsphinx-anonymous-replies",
@@ -3988,11 +3947,11 @@ dependencies = [
 name = "nymsphinx-acknowledgements"
 version = "0.1.0"
 dependencies = [
- "nym-crypto",
- "nym-pemstore",
+ "crypto",
 "nymsphinx-addressing",
 "nymsphinx-params",
 "nymsphinx-types",
+ "pemstore",
 "rand 0.7.3",
 "thiserror",
 "topology",
@@ -4002,7 +3961,7 @@ dependencies = [
 name = "nymsphinx-addressing"
 version = "0.1.0"
 dependencies = [
- "nym-crypto",
+ "crypto",
 "nymsphinx-types",
 "rand 0.7.3",
 "serde",
@@ -4014,7 +3973,7 @@ name = "nymsphinx-anonymous-replies"
 version = "0.1.0"
 dependencies = [
 "bs58",
- "nym-crypto",
+ "crypto",
 "nymsphinx-addressing",
 "nymsphinx-params",
 "nymsphinx-types",
@@ -4041,7 +4000,7 @@ dependencies = [
 name = "nymsphinx-cover"
 version = "0.1.0"
 dependencies = [
- "nym-crypto",
+ "crypto",
 "nymsphinx-acknowledgements",
 "nymsphinx-addressing",
 "nymsphinx-chunking",
@@ -4077,7 +4036,7 @@ dependencies = [
 name = "nymsphinx-params"
 version = "0.1.0"
 dependencies = [
- "nym-crypto",
+ "crypto",
 "nymsphinx-types",
 "thiserror",
 ]
@@ -4332,6 +4291,13 @@ dependencies = [
 "regex",
 ]

+[[package]]
+name = "pemstore"
+version = "0.1.0"
+dependencies = [
+ "pem",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -6110,9 +6076,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.27.7"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e"
+checksum = "54cb4ebf3d49308b99e6e9dc95e989e2fdbdc210e4f67c39db0bb89ba927001c"
 dependencies = [
 "cfg-if",
 "core-foundation-sys",
@@ -6538,9 +6504,9 @@ name = "topology"
 version = "0.1.0"
 dependencies = [
 "bs58",
+ "crypto",
 "log",
- "nym-crypto",
- "nym-mixnet-contract-common",
+ "mixnet-contract-common",
 "nymsphinx-addressing",
 "nymsphinx-types",
 "rand 0.7.3",
@@ -6693,13 +6659,13 @@ name = "ts-rs-cli"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "mixnet-contract-common",
 "nym-api-requests",
- "nym-mixnet-contract-common",
 "nym-types",
- "nym-vesting-contract-common",
 "nym-wallet-types",
 "ts-rs",
 "validator-client",
+ "vesting-contract-common",
 "walkdir",
 ]

@@ -6914,6 +6880,7 @@ dependencies = [
 "coconut-interface",
 "colored",
 "config",
+ "contracts-common",
 "cosmrs",
 "cosmwasm-std",
 "cw3",
@@ -6924,13 +6891,10 @@ dependencies = [
 "group-contract-common",
 "itertools",
 "log",
+ "mixnet-contract-common",
 "multisig-contract-common",
 "network-defaults",
 "nym-api-requests",
- "nym-contracts-common",
- "nym-mixnet-contract-common",
- "nym-vesting-contract",
- "nym-vesting-contract-common",
 "prost 0.10.4",
 "reqwest",
 "serde",
@@ -6940,6 +6904,8 @@ dependencies = [
 "tokio",
 "ts-rs",
 "url",
+ "vesting-contract",
+ "vesting-contract-common",
 ]

 [[package]]
@@ -7001,6 +6967,33 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

+[[package]]
+name = "vesting-contract"
+version = "1.1.3"
+dependencies = [
+ "contracts-common",
+ "cosmwasm-std",
+ "cw-storage-plus",
+ "mixnet-contract-common",
+ "schemars",
+ "serde",
+ "thiserror",
+ "vergen 5.1.17",
+ "vesting-contract-common",
+]
+
+[[package]]
+name = "vesting-contract-common"
+version = "0.1.0"
+dependencies = [
+ "contracts-common",
+ "cosmwasm-std",
+ "mixnet-contract-common",
+ "schemars",
+ "serde",
+ "ts-rs",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.1.10"
+version = "1.1.8"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.66"
@@ -26,13 +26,13 @@ time = "0.3.17"
 # internal
 config = { path = "../../common/config" }
 client-connections = { path = "../../common/client-connections" }
-nym-crypto = { path = "../../common/crypto" }
+crypto = { path = "../../common/crypto" }
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 #gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm", "coconut"] }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 nonexhaustive-delayqueue = { path = "../../common/nonexhaustive-delayqueue" }
 nymsphinx = { path = "../../common/nymsphinx" }
-nym-pemstore = { path = "../../common/pemstore" }
+pemstore = { path = "../../common/pemstore" }
 topology = { path = "../../common/topology" }
 validator-client = { path = "../../common/client-libs/validator-client", default-features = false }
 task = { path = "../../common/task" }
@@ -22,6 +22,7 @@ use crate::config::{Config, DebugConfig, GatewayEndpointConfig};
 use crate::error::ClientCoreError;
 use crate::spawn_future;
 use client_connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
+use crypto::asymmetric::{encryption, identity};
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 #[cfg(target_arch = "wasm32")]
@@ -31,7 +32,6 @@ use gateway_client::{
    MixnetMessageSender,
 };
 use log::{debug, info};
-use nym_crypto::asymmetric::{encryption, identity};
 use nymsphinx::acknowledgements::AckKey;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::config::persistence::key_pathfinder::ClientKeyPathfinder;
+use crypto::asymmetric::{encryption, identity};
 use gateway_requests::registration::handshake::SharedKeys;
 use log::*;
-use nym_crypto::asymmetric::{encryption, identity};
 use nymsphinx::acknowledgements::AckKey;
 use rand::{CryptoRng, RngCore};
 use std::io;
@@ -72,17 +72,17 @@ impl KeyManager {
    /// Loads previously stored client keys from the disk.
    fn load_client_keys(client_pathfinder: &ClientKeyPathfinder) -> io::Result<Self> {
        let identity_keypair: identity::KeyPair =
-            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
                client_pathfinder.private_identity_key().to_owned(),
                client_pathfinder.public_identity_key().to_owned(),
            ))?;
        let encryption_keypair: encryption::KeyPair =
-            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
                client_pathfinder.private_encryption_key().to_owned(),
                client_pathfinder.public_encryption_key().to_owned(),
            ))?;

-        let ack_key: AckKey = nym_pemstore::load_key(client_pathfinder.ack_key())?;
+        let ack_key: AckKey = pemstore::load_key(client_pathfinder.ack_key())?;

        Ok(KeyManager {
            identity_keypair: Arc::new(identity_keypair),
@@ -98,7 +98,7 @@ impl KeyManager {
        let mut key_manager = Self::load_client_keys(client_pathfinder)?;

        let gateway_shared_key: SharedKeys =
-            nym_pemstore::load_key(client_pathfinder.gateway_shared_key())?;
+            pemstore::load_key(client_pathfinder.gateway_shared_key())?;

        key_manager.gateway_shared_key = Some(Arc::new(gateway_shared_key));

@@ -113,7 +113,7 @@ impl KeyManager {
        let mut key_manager = Self::load_client_keys(client_pathfinder)?;

        let gateway_shared_key: Result<SharedKeys, io::Error> =
-            nym_pemstore::load_key(client_pathfinder.gateway_shared_key());
+            pemstore::load_key(client_pathfinder.gateway_shared_key());

        // It's ok if the gateway key was not found
        let gateway_shared_key = match gateway_shared_key {
@@ -132,27 +132,27 @@ impl KeyManager {
    // it is done so for the consistency sake so that you wouldn't require an rng instance
    // during `load_keys` to generate the said key.
    pub fn store_keys(&self, client_pathfinder: &ClientKeyPathfinder) -> io::Result<()> {
-        nym_pemstore::store_keypair(
+        pemstore::store_keypair(
            self.identity_keypair.as_ref(),
-            &nym_pemstore::KeyPairPath::new(
+            &pemstore::KeyPairPath::new(
                client_pathfinder.private_identity_key().to_owned(),
                client_pathfinder.public_identity_key().to_owned(),
            ),
        )?;
-        nym_pemstore::store_keypair(
+        pemstore::store_keypair(
            self.encryption_keypair.as_ref(),
-            &nym_pemstore::KeyPairPath::new(
+            &pemstore::KeyPairPath::new(
                client_pathfinder.private_encryption_key().to_owned(),
                client_pathfinder.public_encryption_key().to_owned(),
            ),
        )?;

-        nym_pemstore::store_key(self.ack_key.as_ref(), client_pathfinder.ack_key())?;
+        pemstore::store_key(self.ack_key.as_ref(), client_pathfinder.ack_key())?;

        match self.gateway_shared_key.as_ref() {
            None => debug!("No gateway shared key available to store!"),
            Some(gate_key) => {
-                nym_pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
+                pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
            }
        }

@@ -168,7 +168,7 @@ impl KeyManager {
                ))
            }
            Some(gate_key) => {
-                nym_pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
+                pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
            }
        }

@@ -342,6 +342,7 @@ where
        if let Poll::Ready(Some(id)) = Pin::new(&mut self.client_connection_rx).poll_next(cx) {
            match id {
                ConnectionCommand::Close(id) => self.on_close_connection(id),
+                ConnectionCommand::ActiveConnections(_) => panic!(),
            }
        }

@@ -420,6 +421,7 @@ where
        if let Poll::Ready(Some(id)) = Pin::new(&mut self.client_connection_rx).poll_next(cx) {
            match id {
                ConnectionCommand::Close(id) => self.on_close_connection(id),
+                ConnectionCommand::ActiveConnections(_) => panic!(),
            }
        }

@@ -4,13 +4,13 @@
 use crate::client::replies::reply_controller::ReplyControllerSender;
 use crate::client::replies::reply_storage::SentReplyKeys;
 use crate::spawn_future;
+use crypto::asymmetric::encryption;
+use crypto::Digest;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 use futures::StreamExt;
 use gateway_client::MixnetMessageReceiver;
 use log::*;
-use nym_crypto::asymmetric::encryption;
-use nym_crypto::Digest;
 use nymsphinx::anonymous_replies::requests::{
    RepliableMessage, RepliableMessageContent, ReplyMessage, ReplyMessageContent,
 };
@@ -3,8 +3,8 @@

 use crate::client::replies::reply_storage::backend::fs_backend::error::StorageError;
 use crate::client::replies::reply_storage::key_storage::UsedReplyKey;
-use nym_crypto::generic_array::typenum::Unsigned;
-use nym_crypto::Digest;
+use crypto::generic_array::typenum::Unsigned;
+use crypto::Digest;
 use nymsphinx::addressing::clients::{Recipient, RecipientBytes};
 use nymsphinx::anonymous_replies::encryption_key::EncryptionKeyDigest;
 use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
@@ -1,8 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crypto::asymmetric::identity::Ed25519RecoveryError;
 use gateway_client::error::GatewayClientError;
-use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use topology::NymTopologyError;
 use validator_client::ValidatorClientError;

@@ -7,11 +7,11 @@ use crate::{
    error::ClientCoreError,
 };
 use config::NymConfig;
+use crypto::asymmetric::identity;
 #[cfg(target_arch = "wasm32")]
 use gateway_client::wasm_mockups::SigningNyxdClient;
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
-use nym_crypto::asymmetric::identity;
 use rand::{seq::SliceRandom, thread_rng};
 use std::{sync::Arc, time::Duration};
 use tap::TapFallible;
@@ -11,7 +11,7 @@ use serde::Serialize;
 use tap::TapFallible;

 use config::NymConfig;
-use nym_crypto::asymmetric::{encryption, identity};
+use crypto::asymmetric::{encryption, identity};
 use url::Url;

 use crate::client::key_manager::KeyManager;
@@ -188,7 +188,7 @@ where
        pathfinder: &ClientKeyPathfinder,
    ) -> Result<identity::KeyPair, ClientCoreError> {
        let identity_keypair: identity::KeyPair =
-            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
                pathfinder.private_identity_key().to_owned(),
                pathfinder.public_identity_key().to_owned(),
            ))
@@ -200,7 +200,7 @@ where
        pathfinder: &ClientKeyPathfinder,
    ) -> Result<encryption::KeyPair, ClientCoreError> {
        let sphinx_keypair: encryption::KeyPair =
-            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
                pathfinder.private_encryption_key().to_owned(),
                pathfinder.public_encryption_key().to_owned(),
            ))
@@ -20,9 +20,9 @@ config = { path = "../../common/config" }
 completions = { path = "../../common/completions" }
 credentials = { path = "../../common/credentials" }
 credential-storage = { path = "../../common/credential-storage" }
-nym-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
+crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 logging = { path = "../../common/logging"}
 network-defaults = { path = "../../common/network-defaults" }
-nym-pemstore = { path = "../../common/pemstore" }
+pemstore = { path = "../../common/pemstore" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }

@@ -12,8 +12,8 @@ use credential_storage::storage::Storage;
 use credential_storage::PersistentStorage;
 use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
 use credentials::coconut::utils::obtain_aggregate_signature;
+use crypto::asymmetric::{encryption, identity};
 use network_defaults::VOUCHER_INFO;
-use nym_crypto::asymmetric::{encryption, identity};
 use validator_client::nyxd::traits::DkgQueryClient;
 use validator_client::nyxd::tx::Hash;
 use validator_client::nyxd::CosmWasmClient;
@@ -6,8 +6,8 @@ use thiserror::Error;

 use credential_storage::error::StorageError;
 use credentials::error::Error as CredentialError;
-use nym_crypto::asymmetric::encryption::KeyRecoveryError;
-use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
+use crypto::asymmetric::encryption::KeyRecoveryError;
+use crypto::asymmetric::identity::Ed25519RecoveryError;
 use validator_client::nyxd::error::NyxdError;
 use validator_client::ValidatorClientError;

@@ -4,7 +4,7 @@
 use coconut_interface::Parameters;
 use credentials::coconut::bandwidth::BandwidthVoucher;

-use nym_crypto::asymmetric::{encryption, identity};
+use crypto::asymmetric::{encryption, identity};

 pub(crate) struct KeyPair {
    pub public_key: String,
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.10"
+version = "1.1.8"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -42,13 +42,13 @@ config = { path = "../../common/config" }
 completions = { path = "../../common/completions" }
 credential-storage = { path = "../../common/credential-storage" }
 credentials = { path = "../../common/credentials" }
-nym-crypto = { path = "../../common/crypto" }
+crypto = { path = "../../common/crypto" }
 logging = { path = "../../common/logging"}
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 network-defaults = { path = "../../common/network-defaults" }
 nymsphinx = { path = "../../common/nymsphinx" }
-nym-pemstore = { path = "../../common/pemstore" }
+pemstore = { path = "../../common/pemstore" }
 task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
@@ -8,7 +8,7 @@ use crate::{
 };
 use clap::Args;
 use config::NymConfig;
-use nym_crypto::asymmetric::identity;
+use crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;
@@ -31,7 +31,7 @@ pub(crate) struct Init {
    force_register_gateway: bool,

    /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',', hide = true)]
    nyxd_urls: Option<Vec<url::Url>>,

    /// Comma separated list of rest endpoints of the API validators
@@ -12,8 +12,8 @@ use crate::{

 use clap::Args;
 use config::NymConfig;
+use crypto::asymmetric::identity;
 use log::*;
-use nym_crypto::asymmetric::identity;
 use version_checker::is_minor_version_compatible;

 #[derive(Args, Clone)]
@@ -23,7 +23,7 @@ pub(crate) struct Run {
    id: String,

    /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',', hide = true)]
    nyxd_urls: Option<Vec<url::Url>>,

    /// Comma separated list of rest endpoints of the API validators
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.10"
+version = "1.1.8"
 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"
@@ -36,14 +36,14 @@ completions = { path = "../../common/completions" }
 credential-storage = { path = "../../common/credential-storage", optional = true }
 mobile-storage = { path = "../../common/mobile-storage", optional = true }
 credentials = { path = "../../common/credentials" }
-nym-crypto = { path = "../../common/crypto" }
+crypto = { path = "../../common/crypto" }
 logging = { path = "../../common/logging"}
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 network-defaults = { path = "../../common/network-defaults" }
 nymsphinx = { path = "../../common/nymsphinx" }
 ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
-nym-pemstore = { path = "../../common/pemstore" }
+pemstore = { path = "../../common/pemstore" }
 proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
 service-providers-common = { path = "../../service-providers/common" }
 socks5-requests = { path = "../../common/socks5/requests" }
@@ -8,7 +8,7 @@ use crate::{
 };
 use clap::Args;
 use config::NymConfig;
-use nym_crypto::asymmetric::identity;
+use crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;
@@ -43,7 +43,7 @@ pub(crate) struct Init {
    force_register_gateway: bool,

    /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',', hide = true)]
    nyxd_urls: Option<Vec<url::Url>>,

    /// Comma separated list of rest endpoints of the API validators
@@ -9,8 +9,8 @@ use crate::{

 use clap::Args;
 use config::NymConfig;
+use crypto::asymmetric::identity;
 use log::*;
-use nym_crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use version_checker::is_minor_version_compatible;

@@ -43,7 +43,7 @@ pub(crate) struct Run {
    gateway: Option<identity::PublicKey>,

    /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',', hide = true)]
    nyxd_urls: Option<Vec<url::Url>>,

    /// Comma separated list of rest endpoints of the Nym APIs
@@ -10,7 +10,7 @@ use client_core::client::{
 };
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
-use proxy_helpers::connection_controller::Controller;
+use proxy_helpers::connection_controller::{BroadcastActiveConnections, Controller};
 use std::net::SocketAddr;
 use tap::TapFallible;
 use task::TaskClient;
@@ -69,7 +69,7 @@ impl SphinxSocksServer {
        // controller for managing all active connections
        let (mut active_streams_controller, controller_sender) = Controller::new(
            client_connection_tx,
-            //BroadcastActiveConnections::Off,
+            BroadcastActiveConnections::Off,
            self.shutdown.clone(),
        );
        tokio::spawn(async move {
@@ -34,7 +34,7 @@ client-core = { path = "../client-core", default-features = false, features = ["
 client-connections = { path = "../../common/client-connections" }
 coconut-interface = { path = "../../common/coconut-interface" }
 credentials = { path = "../../common/credentials" }
-nym-crypto = { path = "../../common/crypto" }
+crypto = { path = "../../common/crypto" }
 nymsphinx = { path = "../../common/nymsphinx" }
 topology = { path = "../../common/topology" }
 gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm"] }
@@ -25,6 +25,12 @@ pub enum ConnectionCommand {
    // Announce that at a connection was closed. E.g the `OutQueueControl` uses this to discard
    // transmission lanes.
    Close(ConnectionId),
+
+    // In the network requester for example, we usually want to broadcast active connections
+    // regularly, so we know what connections we need to request lane queue lengths for from the
+    // client.
+    // In the socks5-client, this is not needed since have direct access to the lane queue lengths.
+    ActiveConnections(Vec<ConnectionId>),
 }

 // The `OutQueueControl` publishes the backlog per lane, primarily so that upstream can slow down
@@ -20,11 +20,11 @@ tokio = { version = "1.24.1", features = ["macros"] }
 # internal
 coconut-interface = { path = "../../coconut-interface" }
 credentials = { path = "../../credentials" }
-nym-crypto = { path = "../../crypto" }
+crypto = { path = "../../crypto" }
 gateway-requests = { path = "../../../gateway/gateway-requests" }
 network-defaults = { path = "../../network-defaults" }
 nymsphinx = { path = "../../nymsphinx" }
-nym-pemstore = { path = "../../pemstore" }
+pemstore = { path = "../../pemstore" }
 validator-client = { path = "../validator-client" }
 task = { path = "../../task" }
 serde = { version = "1.0", features = ["derive"]}
@@ -10,6 +10,7 @@ pub use crate::packet_router::{
 use crate::socket_state::{PartiallyDelegated, SocketState};
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use coconut_interface::Credential;
+use crypto::asymmetric::identity;
 use futures::{SinkExt, StreamExt};
 use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use gateway_requests::iv::IV;
@@ -17,7 +18,6 @@ use gateway_requests::registration::handshake::{client_handshake, SharedKeys};
 use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse, PROTOCOL_VERSION};
 use log::*;
 use network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN};
-use nym_crypto::asymmetric::identity;
 use nymsphinx::forwarding::packet::MixPacket;
 use rand::rngs::OsRng;
 use std::convert::TryFrom;
@@ -12,13 +12,13 @@ base64 = "0.13"
 colored = "2.0"

 coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
-nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
-nym-mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
-nym-vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
+contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
+mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
+vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
 coconut-bandwidth-contract-common = { path= "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
 group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
-nym-vesting-contract = { path = "../../../contracts/vesting" }
+vesting-contract = { path = "../../../contracts/vesting" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 reqwest = { version = "0.11", features = ["json"] }
@@ -4,6 +4,9 @@
 use crate::{nym_api, ValidatorClientError};
 use coconut_dkg_common::types::NodeIndex;
 use coconut_interface::VerificationKey;
+use mixnet_contract_common::mixnode::MixNodeDetails;
+use mixnet_contract_common::MixId;
+use mixnet_contract_common::{GatewayBond, IdentityKeyRef};
 use nym_api_requests::coconut::{
    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
@@ -11,9 +14,6 @@ use nym_api_requests::models::{
    GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
    RewardEstimationResponse, StakeSaturationResponse,
 };
-use nym_mixnet_contract_common::mixnode::MixNodeDetails;
-use nym_mixnet_contract_common::MixId;
-use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef};

 #[cfg(feature = "nyxd-client")]
 use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient, MultisigQueryClient};
@@ -30,17 +30,17 @@ use coconut_interface::Base58;
 #[cfg(feature = "nyxd-client")]
 use cw3::ProposalResponse;
 #[cfg(feature = "nyxd-client")]
-use network_defaults::NymNetworkDetails;
-#[cfg(feature = "nyxd-client")]
-use nym_api_requests::models::MixNodeBondAnnotated;
-#[cfg(feature = "nyxd-client")]
-use nym_mixnet_contract_common::{
+use mixnet_contract_common::{
    families::{Family, FamilyHead},
    mixnode::MixNodeBond,
    pending_events::{PendingEpochEvent, PendingIntervalEvent},
    Delegation, IdentityKey, RewardedSetNodeStatus, UnbondedMixnode,
 };
 #[cfg(feature = "nyxd-client")]
+use network_defaults::NymNetworkDetails;
+#[cfg(feature = "nyxd-client")]
+use nym_api_requests::models::MixNodeBondAnnotated;
+#[cfg(feature = "nyxd-client")]
 use std::str::FromStr;
 use url::Url;

@@ -3,6 +3,8 @@

 use crate::nym_api::error::NymAPIError;
 use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
+use mixnet_contract_common::mixnode::MixNodeDetails;
+use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use nym_api_requests::coconut::{
    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
@@ -13,8 +15,6 @@ use nym_api_requests::models::{
    MixnodeUptimeHistoryResponse, RequestError, RewardEstimationResponse, StakeSaturationResponse,
    UptimeResponse,
 };
-use nym_mixnet_contract_common::mixnode::MixNodeDetails;
-use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use reqwest::Response;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -17,13 +17,13 @@ use cosmrs::rpc::HttpClientUrl;
 use cosmrs::tx::Msg;
 use execute::execute;
 use log::debug;
+use mixnet_contract_common::MixId;
 use network_defaults::{ChainDetails, NymNetworkDetails};
-use nym_mixnet_contract_common::MixId;
-use nym_vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
-use nym_vesting_contract_common::PledgeCap;
 use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::time::SystemTime;
+use vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
+use vesting_contract_common::PledgeCap;

 pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
 pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
@@ -8,7 +8,7 @@ use async_trait::async_trait;
 use coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg;
 use coconut_dkg_common::types::EncodedBTEPublicKeyWithProof;
 use coconut_dkg_common::verification_key::VerificationKeyShare;
-use nym_contracts_common::dealings::ContractSafeBytes;
+use contracts_common::dealings::ContractSafeBytes;

 #[async_trait]
 pub trait DkgSigningClient {
@@ -6,17 +6,17 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use nym_mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
-use nym_mixnet_contract_common::families::Family;
-use nym_mixnet_contract_common::mixnode::{
+use mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
+use mixnet_contract_common::families::Family;
+use mixnet_contract_common::mixnode::{
    MixNodeDetails, MixnodeRewardingDetailsResponse, PagedMixnodesDetailsResponse,
    PagedUnbondedMixnodesResponse, StakeSaturationResponse, UnbondedMixnodeResponse,
 };
-use nym_mixnet_contract_common::reward_params::{Performance, RewardingParams};
-use nym_mixnet_contract_common::rewarding::{
+use mixnet_contract_common::reward_params::{Performance, RewardingParams};
+use mixnet_contract_common::rewarding::{
    EstimatedCurrentEpochRewardResponse, PendingRewardResponse,
 };
-use nym_mixnet_contract_common::{
+use mixnet_contract_common::{
    delegation, ContractBuildInformation, ContractState, ContractStateParams,
    CurrentIntervalResponse, EpochEventId, GatewayBondResponse, GatewayOwnershipResponse,
    IdentityKey, IntervalEventId, LayerDistribution, MixId, MixOwnershipResponse,
@@ -8,9 +8,9 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use nym_mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
-use nym_mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
-use nym_mixnet_contract_common::{
+use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
+use mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
+use mixnet_contract_common::{
    ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, LayerAssignment, MixId, MixNode,
 };

@@ -6,16 +6,16 @@ pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
+use contracts_common::ContractBuildInformation;
 use cosmwasm_std::{Coin as CosmWasmCoin, Timestamp};
-use nym_contracts_common::ContractBuildInformation;
-use nym_mixnet_contract_common::MixId;
-use nym_vesting_contract_common::{
+use mixnet_contract_common::MixId;
+use serde::Deserialize;
+use vesting_contract::vesting::Account;
+use vesting_contract_common::{
    messages::QueryMsg as VestingQueryMsg, AccountVestingCoins, AccountsResponse,
    AllDelegationsResponse, BaseVestingAccountInfo, DelegationTimesResponse,
    OriginalVestingResponse, Period, PledgeData, VestingCoinsResponse, VestingDelegation,
 };
-use serde::Deserialize;
-use vesting_contract::vesting::Account;

 #[async_trait]
 pub trait VestingQueryClient {
@@ -134,68 +134,28 @@ pub trait VestingQueryClient {
        .await
    }

-    async fn get_historical_vesting_staking_reward(
+    async fn delegated_free(
        &self,
        vesting_account_address: &str,
+        block_time: Option<Timestamp>,
    ) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(
-            VestingQueryMsg::GetHistoricalVestingStakingReward {
-                vesting_account_address: vesting_account_address.to_string(),
-            },
-        )
+        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetDelegatedFree {
+            vesting_account_address: vesting_account_address.to_string(),
+            block_time,
+        })
        .await
        .map(Into::into)
    }

-    async fn get_spendable_vested_coins(
+    /// Returns the total amount of delegated tokens that have vested
+    async fn delegated_vesting(
        &self,
        vesting_account_address: &str,
+        block_time: Option<Timestamp>,
    ) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetSpendableVestedCoins {
-            vesting_account_address: vesting_account_address.to_string(),
-        })
-        .await
-        .map(Into::into)
-    }
-
-    async fn get_spendable_reward_coins(
-        &self,
-        vesting_account_address: &str,
-    ) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetSpendableRewardCoins {
-            vesting_account_address: vesting_account_address.to_string(),
-        })
-        .await
-        .map(Into::into)
-    }
-
-    async fn get_delegated_coins(&self, vesting_account_address: &str) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetDelegatedCoins {
-            vesting_account_address: vesting_account_address.to_string(),
-        })
-        .await
-        .map(Into::into)
-    }
-
-    async fn get_pledged_coins(&self, vesting_account_address: &str) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetPledgedCoins {
-            vesting_account_address: vesting_account_address.to_string(),
-        })
-        .await
-        .map(Into::into)
-    }
-
-    async fn get_staked_coins(&self, vesting_account_address: &str) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetStakedCoins {
-            vesting_account_address: vesting_account_address.to_string(),
-        })
-        .await
-        .map(Into::into)
-    }
-
-    async fn get_withdrawn_coins(&self, vesting_account_address: &str) -> Result<Coin, NyxdError> {
-        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetWithdrawnCoins {
+        self.query_vesting_contract::<CosmWasmCoin>(VestingQueryMsg::GetDelegatedVesting {
            vesting_account_address: vesting_account_address.to_string(),
+            block_time,
        })
        .await
        .map(Into::into)
@@ -6,12 +6,10 @@ use crate::nyxd::cosmwasm_client::types::ExecuteResult;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Coin, Fee, NyxdClient};
 use async_trait::async_trait;
-use nym_mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
-use nym_mixnet_contract_common::{Gateway, MixId, MixNode};
-use nym_vesting_contract_common::messages::{
-    ExecuteMsg as VestingExecuteMsg, VestingSpecification,
-};
-use nym_vesting_contract_common::PledgeCap;
+use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
+use mixnet_contract_common::{Gateway, MixId, MixNode};
+use vesting_contract_common::messages::{ExecuteMsg as VestingExecuteMsg, VestingSpecification};
+use vesting_contract_common::PledgeCap;

 #[async_trait]
 pub trait VestingSigningClient {
@@ -30,8 +30,8 @@ cosmwasm-std = { version = "1.0.0" }

 validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
 network-defaults = { path = "../network-defaults" }
-nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
-nym-vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" }
+mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" }
 coconut-bandwidth-contract-common = { path = "../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" }
 multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" }
@@ -5,7 +5,7 @@ use clap::Parser;
 use log::{debug, info};

 use cosmwasm_std::Decimal;
-use nym_mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
+use mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
 use std::str::FromStr;
 use std::time::Duration;
 use validator_client::nyxd::AccountId;
@@ -6,8 +6,8 @@ use std::str::FromStr;
 use clap::Parser;
 use log::{debug, info};

-use nym_vesting_contract_common::InitMsg;
 use validator_client::nyxd::AccountId;
+use vesting_contract_common::InitMsg;

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::{Coin, MixId};
+use mixnet_contract_common::{Coin, MixId};
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};

 #[derive(Debug, Parser)]
@@ -9,7 +9,7 @@ use crate::utils::{pretty_cosmwasm_coin, show_error_passthrough};

 use comfy_table::Table;
 use cosmwasm_std::Addr;
-use nym_mixnet_contract_common::{Delegation, PendingEpochEvent, PendingEpochEventKind};
+use mixnet_contract_common::{Delegation, PendingEpochEvent, PendingEpochEventKind};

 #[derive(Debug, Parser)]
 pub struct Args {}
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixId;
+use mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};

 #[derive(Debug, Parser)]
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixId;
+use mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};

 #[derive(Debug, Parser)]
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixId;
+use mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};

 #[derive(Debug, Parser)]
@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::info;

-use nym_mixnet_contract_common::{Coin, MixId};
+use mixnet_contract_common::{Coin, MixId};
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;

@@ -3,7 +3,7 @@

 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixId;
+use mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;

@@ -4,8 +4,8 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::{info, warn};
+use mixnet_contract_common::Coin;
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
-use nym_mixnet_contract_common::Coin;
 use validator_client::nyxd::traits::MixnetSigningClient;

 #[derive(Debug, Parser)]
@@ -55,7 +55,7 @@ pub async fn bond_gateway(args: Args, client: SigningClient) {
        return;
    }

-    let gateway = nym_mixnet_contract_common::Gateway {
+    let gateway = mixnet_contract_common::Gateway {
        host: args.host,
        mix_port: args.mix_port.unwrap_or(DEFAULT_MIX_LISTENING_PORT),
        clients_port: args.clients_port.unwrap_or(DEFAULT_CLIENT_LISTENING_PORT),
@@ -4,8 +4,8 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::{info, warn};
+use mixnet_contract_common::{Coin, Gateway};
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
-use nym_mixnet_contract_common::{Coin, Gateway};
 use validator_client::nyxd::VestingSigningClient;

 #[derive(Debug, Parser)]
@@ -5,10 +5,10 @@ use clap::Parser;
 use cosmwasm_std::Uint128;
 use log::{info, warn};

+use mixnet_contract_common::{Coin, MixNodeCostParams, Percent};
 use network_defaults::{
    DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
-use nym_mixnet_contract_common::{Coin, MixNodeCostParams, Percent};
 use validator_client::nyxd::traits::MixnetSigningClient;
 use validator_client::nyxd::CosmWasmCoin;

@@ -70,7 +70,7 @@ pub async fn bond_mixnode(args: Args, client: SigningClient) {
        return;
    }

-    let mixnode = nym_mixnet_contract_common::MixNode {
+    let mixnode = mixnet_contract_common::MixNode {
        host: args.host,
        mix_port: args.mix_port.unwrap_or(DEFAULT_MIX_LISTENING_PORT),
        verloc_port: args.verloc_port.unwrap_or(DEFAULT_VERLOC_LISTENING_PORT),
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixNodeConfigUpdate;
+use mixnet_contract_common::MixNodeConfigUpdate;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};

 #[derive(Debug, Parser)]
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use nym_mixnet_contract_common::MixNodeConfigUpdate;
+use mixnet_contract_common::MixNodeConfigUpdate;
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;

@@ -5,11 +5,11 @@ use crate::context::SigningClient;
 use clap::Parser;
 use cosmwasm_std::Uint128;
 use log::{info, warn};
+use mixnet_contract_common::{Coin, MixNodeCostParams};
+use mixnet_contract_common::{MixNode, Percent};
 use network_defaults::{
    DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
-use nym_mixnet_contract_common::{Coin, MixNodeCostParams};
-use nym_mixnet_contract_common::{MixNode, Percent};
 use validator_client::nyxd::{CosmWasmCoin, VestingSigningClient};

 #[derive(Debug, Parser)]
@@ -6,13 +6,13 @@ use std::str::FromStr;
 use clap::Parser;
 use log::info;

+use mixnet_contract_common::Coin;
 use network_defaults::NymNetworkDetails;
-use nym_mixnet_contract_common::Coin;
-use nym_vesting_contract_common::messages::VestingSpecification;
-use nym_vesting_contract_common::PledgeCap;
 use validator_client::nyxd::AccountId;
 use validator_client::nyxd::VestingSigningClient;
 use validator_client::nyxd::{CosmosCoin, Denom};
+use vesting_contract_common::messages::VestingSpecification;
+use vesting_contract_common::PledgeCap;

 use crate::context::SigningClient;

@@ -53,10 +53,8 @@ pub async fn query(args: Args, client: QueryClient, address_from_mnemonic: Optio

    // TODO: get better copy text for what these are
    let vesting_coins = client.vesting_coins(&vesting_address, None).await;
-    let delegated = client.get_delegated_coins(&vesting_address).await;
-    let pledged = client.get_pledged_coins(&vesting_address).await;
-    let withdrawn = client.get_withdrawn_coins(&vesting_address).await;
-    let staked = client.get_staked_coins(&vesting_address).await;
+    let delegated_vesting = client.delegated_vesting(&vesting_address, None).await;
+    let delegated_free = client.delegated_free(&vesting_address, None).await;

    original_vesting.as_ref().map_or_else(show_error, |res| {
        println!(
@@ -141,17 +139,11 @@ pub async fn query(args: Args, client: QueryClient, address_from_mnemonic: Optio
    vesting_coins.map_or_else(show_error, |res| {
        println!("Vesting coins:     {}   ({})", pretty_coin(&res), res);
    });
-    withdrawn.map_or_else(show_error, |res| {
-        println!("Withdrawn:         {}   ({})", pretty_coin(&res), res);
+    delegated_vesting.map_or_else(show_error, |res| {
+        println!("Delegated vesting: {}   ({})", pretty_coin(&res), res);
    });
-    delegated.map_or_else(show_error, |res| {
-        println!("Delegated:         {}   ({})", pretty_coin(&res), res);
-    });
-    pledged.map_or_else(show_error, |res| {
-        println!("Pledged:           {}   ({})", pretty_coin(&res), res);
-    });
-    staked.map_or_else(show_error, |res| {
-        println!("Staked:            {}   ({})", pretty_coin(&res), res);
+    delegated_free.map_or_else(show_error, |res| {
+        println!("Delegation free:   {}   ({})", pretty_coin(&res), res);
    });

    println!();
@@ -11,5 +11,5 @@ cw-utils = "0.13.4"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

-contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
-multisig-contract-common = { path = "../multisig-contract" }
+contracts-common = { path = "../contracts-common" }
+multisig-contract-common = { path = "../multisig-contract" }
@@ -1,5 +1,5 @@
 [package]
-name = "nym-contracts-common"
+name = "contracts-common"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
@@ -15,4 +15,4 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "1"

 [dev-dependencies]
-serde_json = "1.0.0"
+serde_json = "1.0.0"
@@ -1,5 +1,5 @@
 [package]
-name = "nym-mixnet-contract-common"
+name = "mixnet-contract-common"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
@@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
 thiserror = "1.0"
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
+contracts-common = { path = "../contracts-common" }
 serde_json = "1.0.0"
 humantime-serde = "1.1.1"

@@ -1,12 +1,12 @@
 [package]
-name = "nym-vesting-contract-common"
+name = "vesting-contract-common"
 version = "0.1.0"
 edition = "2021"

 [dependencies]
 cosmwasm-std = "1.0.0"
-mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common" }
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
+mixnet-contract-common = { path = "../mixnet-contract" }
+contracts-common = { path = "../contracts-common" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 ts-rs = {version = "6.1.2", optional = true}
@@ -221,25 +221,12 @@ pub enum QueryMsg {
    GetOriginalVesting {
        vesting_account_address: String,
    },
-    GetHistoricalVestingStakingReward {
+    GetDelegatedFree {
+        block_time: Option<Timestamp>,
        vesting_account_address: String,
    },
-    GetSpendableVestedCoins {
-        vesting_account_address: String,
-    },
-    GetSpendableRewardCoins {
-        vesting_account_address: String,
-    },
-    GetDelegatedCoins {
-        vesting_account_address: String,
-    },
-    GetPledgedCoins {
-        vesting_account_address: String,
-    },
-    GetStakedCoins {
-        vesting_account_address: String,
-    },
-    GetWithdrawnCoins {
+    GetDelegatedVesting {
+        block_time: Option<Timestamp>,
        vesting_account_address: String,
    },
    GetAccount {
@@ -12,7 +12,7 @@ thiserror = "1.0"

 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
-nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
+crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
 nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 validator-client = { path = "../client-libs/validator-client" }

@@ -10,7 +10,7 @@ use coconut_interface::{
    hash_to_scalar, prepare_blind_sign, Attribute, BlindSignRequest, Credential, Parameters,
    PrivateAttribute, PublicAttribute, Signature, VerificationKey,
 };
-use nym_crypto::asymmetric::{encryption, identity};
+use crypto::asymmetric::{encryption, identity};

 use cosmrs::tx::Hash;

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

-use nym_crypto::aes::Aes128;
-use nym_crypto::blake3;
-use nym_crypto::ctr;
+use crypto::aes::Aes128;
+use crypto::blake3;
+use crypto::ctr;

 type Aes128Ctr = ctr::Ctr64LE<Aes128>;

@@ -5,10 +5,10 @@ use coconut_interface::{
    aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
    BlindedSignature, Credential, Parameters, Signature, SignatureShare, VerificationKey,
 };
+use crypto::asymmetric::encryption::PublicKey;
+use crypto::shared_key::recompute_shared_key;
+use crypto::symmetric::stream_cipher;
 use nym_api_requests::coconut::BlindSignRequestBody;
-use nym_crypto::asymmetric::encryption::PublicKey;
-use nym_crypto::shared_key::recompute_shared_key;
-use nym_crypto::symmetric::stream_cipher;
 use validator_client::client::CoconutApiClient;

 use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use coconut_interface::CoconutError;
-use nym_crypto::asymmetric::encryption::KeyRecoveryError;
+use crypto::asymmetric::encryption::KeyRecoveryError;
 use validator_client::ValidatorClientError;

 use thiserror::Error;
@@ -1,5 +1,5 @@
 [package]
-name = "nym-crypto"
+name = "crypto"
 version = "0.1.0"
 authors = ["Jedrzej Stuczynski <andrew@nymtech.net"]
 edition = "2021"
@@ -26,7 +26,7 @@ thiserror = "1.0.37"

 # internal
 nymsphinx-types = { path = "../nymsphinx/types" }
-nym-pemstore = { path = "../../common/pemstore" }
+pemstore = { path = "../../common/pemstore" }

 [dev-dependencies]
 rand_chacha = "0.2"
@@ -25,7 +25,7 @@ serde_derive = "1.0"
 thiserror = "1.0"
 zeroize = { version = "1.4", features = ["zeroize_derive"] }

-nym-pemstore = { path = "../../pemstore" }
+pemstore = { path = "../../pemstore" }

 [dependencies.group]
 version = "0.11"
@@ -8,7 +8,7 @@ use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar};
 use bls12_381::{G1Projective, G2Projective, Scalar};
 use ff::Field;
 use group::GroupEncoding;
-use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use rand_core::RngCore;
 use zeroize::Zeroize;

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

-use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
 use thiserror::Error;

@@ -4,8 +4,8 @@
 pub use ed25519_dalek::ed25519::signature::Signature as SignatureTrait;
 pub use ed25519_dalek::SignatureError;
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
-use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use nymsphinx_types::{DestinationAddressBytes, DESTINATION_ADDRESS_LENGTH};
+use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use thiserror::Error;
@@ -18,7 +18,7 @@ tokio-util = { version = "0.7.4", features = ["codec"] }
 url = "2.2"
 thiserror = "1.0.37"

-nym-crypto =  { path = "../crypto" }
+crypto =  { path = "../crypto" }
 network-defaults = { path = "../network-defaults" }
 nymsphinx-acknowledgements = { path = "../nymsphinx/acknowledgements" }
 nymsphinx-addressing = { path = "../nymsphinx/addressing" }
@@ -4,9 +4,9 @@
 use crate::verloc::error::RttError;
 use crate::verloc::packet::{EchoPacket, ReplyPacket};
 use bytes::{BufMut, BytesMut};
+use crypto::asymmetric::identity;
 use futures::StreamExt;
 use log::*;
-use nym_crypto::asymmetric::identity;
 use std::fmt::{Display, Formatter};
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -56,8 +56,7 @@ impl PacketListener {
        while !shutdown_listener.is_shutdown() {
            // cloning the arc as each accepted socket is handled in separate task
            let connection_handler = Arc::clone(&self.connection_handler);
-            let mut handler_shutdown_listener = self.shutdown.clone();
-            handler_shutdown_listener.mark_as_success();
+            let handler_shutdown_listener = self.shutdown.clone();

            tokio::select! {
                socket = listener.accept() => {
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use nym_crypto::asymmetric::identity;
+use crypto::asymmetric::identity;
 use serde::{Serialize, Serializer};
 use std::cmp::Ordering;
 use std::fmt::{self, Display, Formatter};
@@ -3,11 +3,11 @@

 use crate::verloc::listener::PacketListener;
 use crate::verloc::sender::{PacketSender, TestedNode};
+use crypto::asymmetric::identity;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use log::*;
 use network_defaults::mainnet::NYM_API;
-use nym_crypto::asymmetric::identity;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 use std::net::SocketAddr;
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::verloc::error::RttError;
-use nym_crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH};
+use crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH};
 use std::convert::TryInto;

 pub(crate) struct EchoPacket {
@@ -4,8 +4,8 @@
 use crate::verloc::error::RttError;
 use crate::verloc::measurement::Measurement;
 use crate::verloc::packet::{EchoPacket, ReplyPacket};
+use crypto::asymmetric::identity;
 use log::*;
-use nym_crypto::asymmetric::identity;
 use rand::{thread_rng, Rng};
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -18,7 +18,7 @@ bs58 = "0.4.0"
 sha2 = "0.9"

 dkg = { path = "../crypto/dkg" }
-nym-pemstore = { path = "../pemstore" }
+pemstore = { path = "../pemstore" }

 [dependencies.ff]
 version = "0.11"
@@ -9,7 +9,7 @@ use std::convert::TryInto;

 use bls12_381::{G1Projective, G2Projective, Scalar};
 use group::Curve;
-use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use serde_derive::{Deserialize, Serialize};

 use crate::error::{CoconutError, Result};
@@ -22,11 +22,16 @@ nymsphinx-types = { path = "types" }

 # those dependencies are due to intriducing preparer and receiver. Perpaphs that indicates they should be moved
 # to separate crate?
-nym-crypto = { path = "../crypto" }
+crypto = { path = "../crypto" }
 topology = { path = "../topology" }

 [dev-dependencies]
-nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+criterion = "0.3"
+
+[[bench]]
+name = "benchmarks"
+harness = false

 # do not include this when compiling into wasm as it somehow when combined together with reqwest, it will require
 # net2 via tokio-util -> tokio -> mio -> net2
@@ -10,11 +10,11 @@ edition = "2021"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 thiserror = "1.0.37"

-nym-crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
+crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-types = { path = "../types" }
-nym-pemstore = { path = "../../pemstore" }
+pemstore = { path = "../../pemstore" }
 topology = { path = "../../topology" }


@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::AckKey;
-use nym_crypto::symmetric::stream_cipher::{self, encrypt, iv_from_slice, random_iv, IvSizeUser};
+use crypto::symmetric::stream_cipher::{self, encrypt, iv_from_slice, random_iv, IvSizeUser};
 use nymsphinx_params::{
    packet_sizes::PacketSize, AckEncryptionAlgorithm, SerializedFragmentIdentifier, FRAG_ID_LEN,
 };
@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use nym_crypto::symmetric::stream_cipher::{generate_key, CipherKey, KeySizeUser};
-use nym_pemstore::traits::PemStorableKey;
+use crypto::symmetric::stream_cipher::{generate_key, CipherKey, KeySizeUser};
 use nymsphinx_params::AckEncryptionAlgorithm;
+use pemstore::traits::PemStorableKey;
 use rand::{CryptoRng, RngCore};
 use std::fmt::{self, Display, Formatter};

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-nym-crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
+crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
 nymsphinx-types = { path = "../types" } # we need to be able to refer to some types defined inside sphinx crate
 serde = "1.0" # implementing serialization/deserialization for some types, like `Recipient`
 thiserror = "1.0.37"
@@ -5,7 +5,7 @@
 // it's already destructed).

 use crate::nodes::{NodeIdentity, NODE_IDENTITY_SIZE};
-use nym_crypto::asymmetric::{encryption, identity};
+use crypto::asymmetric::{encryption, identity};
 use nymsphinx_types::Destination;
 use serde::de::{Error as SerdeError, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aniampio	5f758f47ba	Add extended packet sizes	2023-02-15 09:17:30 +00:00
aniampio	e0274bb394	Increase sampling time	2023-02-14 21:15:33 +00:00
aniampio	607d4dc743	Change benchmark name	2023-02-14 21:13:13 +00:00
aniampio	25f7b7a083	Add benchmarks	2023-02-14 17:44:19 +00:00