Merge pull request #3425 from nymtech/fix-sdk-examples

Fix TS SDK examples and make them independent
Fix typo
2023-07-05 14:53:44 +01:00 · 2023-05-22 13:35:08 +02:00 · 2023-05-22 13:30:55 +02:00 · 2023-05-22 13:30:02 +02:00 · 2023-05-19 14:28:30 +02:00 · 2023-05-17 15:30:58 +02:00
392 changed files with 2597 additions and 9532 deletions
@@ -2,7 +2,7 @@
 name: 'Documentation'
 about: Suggest a fix or enhancement to the documentation or developer portal content
 title: "[DOCS]"
-labels: documentation, needs-triage
+labels: documentation
 assignees: mfahampshire

 ---
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an enhancement to the product
 title: "[Feature Request]"
-labels: enhancement, needs-triage
+labels: enhancement
 assignees: ''

 ---
@@ -2,7 +2,7 @@
 name: Report
 about: To help identify and reproduce issues
 title: "[Issue]"
-labels: bug, bug-needs-triage, qa, needs-triage
+labels: bug, bug-needs-triage, qa
 assignees: tommyv1987

 ---
@@ -19,6 +19,12 @@ jobs:
        node-version: 18
    - name: Setup yarn
      run: npm install -g yarn
+    - name: Install Rust stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
    - name: Build
      run: yarn && yarn build && yarn build:ci
    - name: Deploy branch to CI www (storybook)
@@ -23,19 +23,8 @@ jobs:
        node-version: 18
    - name: Install Yarn
      run: npm install -g yarn
-    - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - name: Install wasm-pack
-      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Install project dependencies
-      run: cd ../.. && yarn --network-timeout 100000
-      
-    - name: Install app dependencies
-      run: yarn
+    - run: yarn
      continue-on-error: true
-      
    - name: Set environment from the example
      run: cp .env.sample .env
    - run: yarn storybook:build
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -27,24 +27,14 @@ jobs:
    steps:
      - uses: actions/checkout@v2

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
-
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-          target: wasm32-unknown-unknown
-
-      - name: Install wasm-pack
-        run: |
-          export WASM_PACK_VERSION="v0.12.1" 
-          curl -LO https://github.com/rustwasm/wasm-pack/releases/download/${WASM_PACK_VERSION}/wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
-          tar xvzf wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz -C $HOME/.cargo/bin --strip-components=1
-          rm wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
-
      - name: Install the Apple developer certificate for code signing
        env:
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -68,15 +58,11 @@ jobs:
          security list-keychain -d user -s $KEYCHAIN_PATH

      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies and build it
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -88,15 +74,13 @@ jobs:
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
-          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
        run: yarn && yarn build

      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect_1.0.0_x64.dmg
-          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1*_x64.dmg
+          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg
          retention-days: 30

      - name: Clean up keychain
@@ -115,10 +99,9 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-connect-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_${version}_x64_en-US.msi" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_$version_x64.dmg" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/dmg/nym-connect_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -33,7 +33,7 @@ jobs:
          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
        continue-on-error: true

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -42,16 +42,10 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies
        run: yarn
-
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -61,14 +55,12 @@ jobs:
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
-          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}

      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect.AppImage.tar.gz
-          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1*_amd64.AppImage
+          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage
          retention-days: 30

      - id: create-release
@@ -82,11 +74,11 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-connect-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_${version}_amd64.AppImage" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/appimage/nym-connect_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"
+
  push-release-data:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/push-release-data.yml
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -46,7 +46,7 @@ jobs:
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -57,21 +57,15 @@ jobs:
          toolchain: stable

      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies
-        shell: bash
        run: yarn --network-timeout 100000

      - name: Build and sign it
-        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
@@ -79,15 +73,13 @@ jobs:
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
-          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
        run: yarn build

      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
          name: nym-connect_1.0.0_x64_en-US.msi
-          path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1*_x64_en-US.msi
+          path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi
          retention-days: 30

      - id: create-release
@@ -101,10 +93,9 @@ jobs:
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-connect-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-connect_${version}_x64_en-US.msi" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-connect-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-connect_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-connect/desktop/target/release/bundle/msi/nym-connect_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -27,7 +27,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -58,15 +58,11 @@ jobs:
          security list-keychain -d user -s $KEYCHAIN_PATH

      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies and build it
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -99,14 +95,12 @@ jobs:
          files: |
            nym-wallet/target/release/bundle/dmg/*.dmg
            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
-
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-wallet-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_${version}_x64.dmg" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_$version_x64.dmg" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/dmg/nym-wallet_*_x64.dmg') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -33,7 +33,7 @@ jobs:
          sudo apt-get install -y webkit2gtk-4.0
        continue-on-error: true

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -42,15 +42,10 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies
        run: yarn
      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -60,30 +55,19 @@ jobs:
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: nym-wallet_1.0.0_amd64.AppImage.tar.gz
-          path: nym-wallet/target/release/bundle/appimage/nym-wallet*.AppImage.tar.gz
-          retention-days: 30
-
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
        with:
          files: |
            nym-wallet/target/release/bundle/appimage/*.AppImage
            nym-wallet/target/release/bundle/appimage/*.AppImage.tar.gz*
-
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-wallet-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_${version}_amd64.AppImage" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_$version_amd64.AppImage" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/appimage/nym-wallet_*_amd64.AppImage') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -19,7 +19,7 @@ jobs:

    outputs:
      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      version: ${{ steps.release-info.outputs.version }}
      filename: ${{ steps.release-info.outputs.filename }}
      file_hash: ${{ steps.release-info.outputs.file_hash }}
@@ -46,7 +46,7 @@ jobs:
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -57,21 +57,15 @@ jobs:
          toolchain: stable

      - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
      - name: Install app dependencies
-        shell: bash
        run: yarn --network-timeout 100000

      - name: Build and sign it
-        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
@@ -96,14 +90,12 @@ jobs:
          files: |
            nym-wallet/target/release/bundle/msi/*.msi
            nym-wallet/target/release/bundle/msi/*.msi.zip*
-
      - id: release-info
        name: Prepare release info
        run: |
-          ref=${{ github.ref_name }}
-          semver="${ref##nym-wallet-}" && semver="${semver##v}"
-          echo "version=${semver}" >> "$GITHUB_OUTPUT"
-          echo "filename=nym-wallet_${version}_x64_en-US.msi" >> "$GITHUB_OUTPUT"
+          semver="${${{ github.ref_name }}##nym-wallet-}" && semver="${semver##v}"
+          echo "version=$semver" >> "$GITHUB_OUTPUT"
+          echo "filename=nym-wallet_$version_x64_en-US.msi" >> "$GITHUB_OUTPUT"
          echo "file_hash=${{ hashFiles('nym-wallet/target/release/bundle/msi/nym-wallet_*_x64_en-US.msi') }}" >> "$GITHUB_OUTPUT"

  push-release-data:
@@ -34,7 +34,7 @@ jobs:
          profile: minimal
          toolchain: stable

-      - name: Node
+      - name: Node v16
        uses: actions/setup-node@v3
        with:
          node-version: 18
@@ -132,7 +132,6 @@ jobs:
        run: |
          echo "version: ${{ inputs.version }}"
          echo "tag: ${{ inputs.release_tag }}"
-
      - id: get_sig
        name: Get sig
        if: ${{ inputs.sig_url != null }}
@@ -2,34 +2,18 @@ name: Publish SDK to NPM
 on:
  workflow_dispatch:

+defaults:
+  run:
+    working-directory: sdk/typescript/packages/sdk
+
 jobs:
  publish:
    runs-on: [custom-runner-linux]
-    steps:
-      - uses: actions/checkout@v2
-
+    steps:  
      - name: Install Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
-          registry-url: 'https://registry.npmjs.org'

      - name: Setup yarn
        run: npm install -g yarn
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Build and publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-        working-directory: ./sdk/typescript/packages/sdk
-        run: scripts/publish.sh
@@ -10,7 +10,7 @@ async function addToContextAndValidate(context) {
 async function getMessageBody(context) {
  try {
    const source = fs
-    .readFileSync("./notifications/deny.message").toString();
+    .readFileSync("deny.message").toString();
    return source;
 } catch (error) {
    console.error(error);
@@ -3,70 +3,70 @@ name: CI for linting Typescript
 on:
  push:
    paths:
-      - "ts-packages/**"
-      - "sdk/typescript/**"
-      - "nym-connect/desktop/src/**"
-      - "nym-connect/desktop/package.json"
-      - "nym-connect/mobile/src/**"
-      - "nym-connect/mobile/package.json"
-      - "nym-wallet/src/**"
-      - "nym-wallet/package.json"
-      - "explorer/**"
+      - 'ts-packages/**'
+      - 'sdk/typescript/**'
+      - 'nym-connect/desktop/src/**'
+      - 'nym-connect/desktop/package.json'
+      - 'nym-connect/mobile/src/**'
+      - 'nym-connect/mobile/package.json'
+      - 'nym-wallet/src/**'
+      - 'nym-wallet/package.json'
+      - 'explorer/**'
  pull_request:
    paths:
-      - "ts-packages/**"
-      - "sdk/typescript/**"
-      - "nym-connect/desktop/src/**"
-      - "nym-connect/desktop/package.json"
-      - "nym-connect/mobile/src/**"
-      - "nym-connect/mobile/package.json"
-      - "nym-wallet/src/**"
-      - "nym-wallet/package.json"
-      - "explorer/**"
+      - 'ts-packages/**'
+      - 'sdk/typescript/**'
+      - 'nym-connect/desktop/src/**'
+      - 'nym-connect/desktop/package.json'
+      - 'nym-connect/mobile/src/**'
+      - 'nym-connect/mobile/package.json'
+      - 'nym-wallet/src/**'
+      - 'nym-wallet/package.json'
+      - 'explorer/**'

 jobs:
  build:
    runs-on: custom-runner-linux
    steps:
-      - uses: actions/checkout@v2
-      - name: Install rsync
-        run: sudo apt-get install rsync
-        continue-on-error: true
-      - uses: rlespinasse/github-slug-action@v3.x
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-      - name: Setup yarn
-        run: npm install -g yarn
-      - name: Install
-        run: yarn
-      - name: Build packages
-        run: yarn build
-      - name: Lint
-        run: yarn lint && yarn tsc
-      - name: Matrix - Node Install
-        run: npm install
-        working-directory: .github/workflows/support-files
-      - name: Matrix - Send Notification
-        env:
-          NYM_NOTIFICATION_KIND: ts-packages
-          NYM_PROJECT_NAME: "ts-packages"
-          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-          NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
-          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
-          IS_SUCCESS: "${{ job.status == 'success' }}"
-          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 }}"
-        uses: docker://keybaseio/client:stable-node
-        with:
-          args: .github/workflows/support-files/notifications/entry_point.sh
+    - uses: actions/checkout@v2
+    - name: Install rsync
+      run: sudo apt-get install rsync
+      continue-on-error: true
+    - uses: rlespinasse/github-slug-action@v3.x
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
+    - name: Setup yarn
+      run: npm install -g yarn
+    - name: Install Rust stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+    - name: Install
+      run: yarn
+    - name: Build packages
+      run: yarn build
+    - name: Lint
+      run: yarn lint && yarn tsc
+    - name: Matrix - Node Install
+      run: npm install
+      working-directory: .github/workflows/support-files
+    - name: Matrix - Send Notification
+      env:
+        NYM_NOTIFICATION_KIND: ts-packages
+        NYM_PROJECT_NAME: "ts-packages"
+        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
+        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+        GIT_BRANCH: "${GITHUB_REF##*/}"
+        IS_SUCCESS: "${{ job.status == 'success' }}"
+        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 }}"
+      uses: docker://keybaseio/client:stable-node
+      with:
+        args: .github/workflows/support-files/notifications/entry_point.sh
@@ -4,16 +4,12 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [v1.1.23] (2023-07-04)
+## [1.1.23] (2023-06-27)

 - nym-cli: add client identity key signing support ([#3576])
- Feature/node tester package ([#3634])
- Add medium toggle to socks5 client ([#3615])
 - Don't fully turn off background task when cover traffic is disabled ([#3596])

 [#3576]: https://github.com/nymtech/nym/issues/3576
-[#3634]: https://github.com/nymtech/nym/pull/3634
-[#3615]: https://github.com/nymtech/nym/pull/3615
 [#3596]: https://github.com/nymtech/nym/pull/3596

 ## [v1.1.22] (2023-06-20)
@@ -400,18 +400,18 @@ dependencies = [

 [[package]]
 name = "bip32"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30ed1d6f8437a487a266c8293aeb95b61a23261273e3e02912cdb8b68bf798b"
+checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f"
 dependencies = [
 "bs58",
- "hmac 0.12.1",
+ "hmac 0.11.0",
 "k256",
 "once_cell",
 "pbkdf2",
 "rand_core 0.6.4",
- "ripemd",
- "sha2 0.10.6",
+ "ripemd160",
+ "sha2 0.9.9",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -495,6 +495,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
+ "block-padding",
 "generic-array 0.14.7",
 ]

@@ -507,6 +508,12 @@ dependencies = [
 "generic-array 0.14.7",
 ]

+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
 [[package]]
 name = "bls12_381"
 version = "0.5.0"
@@ -876,9 +883,9 @@ dependencies = [

 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"

 [[package]]
 name = "constant_time_eq"
@@ -922,9 +929,8 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61f3d2224c90ea78e1fa7444787761a549170c46b6b0ed09b93f9b7e4076a"
+version = "0.12.3"
+source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
 dependencies = [
 "prost 0.10.4",
 "prost-types 0.10.1",
@@ -933,9 +939,8 @@ dependencies = [

 [[package]]
 name = "cosmrs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d5890dac07a62337e5841adb8f2074a66a962a098a48df9460f64d483beaf4"
+version = "0.7.1"
+source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
@@ -956,11 +961,11 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.2.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340"
+checksum = "970d1d705862179b5d7a233ae36f02f21c4ec1b8075fe60c77fc5b43471331fa"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.9.0",
 "ed25519-zebra",
 "k256",
 "rand_core 0.6.4",
@@ -969,53 +974,26 @@ dependencies = [

 [[package]]
 name = "cosmwasm-derive"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773"
+checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
 dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "cosmwasm-schema"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
-dependencies = [
- "cosmwasm-schema-derive",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-schema-derive"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "cosmwasm-std"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
+checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
 dependencies = [
 "base64 0.13.1",
 "cosmwasm-crypto",
 "cosmwasm-derive",
- "derivative",
 "forward_ref",
- "hex",
 "schemars",
 "serde",
- "serde-json-wasm 0.5.1",
- "sha2 0.10.6",
+ "serde-json-wasm",
 "thiserror",
 "uint",
 ]
@@ -1198,9 +1176,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
 dependencies = [
 "generic-array 0.14.7",
 "rand_core 0.6.4",
@@ -1332,11 +1310,10 @@ dependencies = [

 [[package]]
 name = "cw-controllers"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91440ce8ec4f0642798bc8c8cb6b9b53c1926c6dadaf0eed267a5145cd529071"
+checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
@@ -1347,9 +1324,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa"
+checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -1358,67 +1335,46 @@ dependencies = [

 [[package]]
 name = "cw-utils"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
+checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw2",
 "schemars",
- "semver 1.0.17",
 "serde",
 "thiserror",
 ]

 [[package]]
 name = "cw2"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8"
+checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
 "serde",
 ]

-[[package]]
-name = "cw20"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91666da6c7b40c8dd5ff94df655a28114efc10c79b70b4d06f13c31e37d60609"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "cw3"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe0b587008aa221cd2a2579a21990a28c4347dc53ad43167c68ad765f5b6efa"
+checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-utils",
- "cw20",
 "schemars",
 "serde",
- "thiserror",
 ]

 [[package]]
 name = "cw4"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c236e0bae02ce97e89235a681dd0e07d099524b369f1ef908d704db3e6b049b"
+checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
@@ -1485,23 +1441,11 @@ dependencies = [

 [[package]]
 name = "der"
-version = "0.6.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
 dependencies = [
 "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]

 [[package]]
@@ -1633,9 +1577,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"

 [[package]]
 name = "ecdsa"
-version = "0.14.8"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
 dependencies = [
 "der",
 "elliptic-curve",
@@ -1691,18 +1635,16 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

 [[package]]
 name = "elliptic-curve"
-version = "0.12.3"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
 dependencies = [
 "base16ct",
 "crypto-bigint",
 "der",
- "digest 0.10.6",
- "ff 0.12.1",
+ "ff 0.11.1",
 "generic-array 0.14.7",
- "group 0.12.1",
- "pkcs8",
+ "group 0.11.0",
 "rand_core 0.6.4",
 "sec1",
 "subtle 2.4.1",
@@ -1890,16 +1832,6 @@ dependencies = [
 "subtle 2.4.1",
 ]

-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "figment"
 version = "0.10.8"
@@ -2284,17 +2216,6 @@ dependencies = [
 "subtle 2.4.1",
 ]

-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff 0.12.1",
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -2970,14 +2891,15 @@ dependencies = [

 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
 dependencies = [
 "cfg-if",
 "ecdsa",
 "elliptic-curve",
- "sha2 0.10.6",
+ "sec1",
+ "sha2 0.9.9",
 "sha3",
 ]

@@ -3981,8 +3903,6 @@ dependencies = [
 name = "nym-group-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
- "cw-controllers",
 "cw4",
 "schemars",
 "serde",
@@ -4021,7 +3941,7 @@ dependencies = [
 "rand_chacha 0.3.1",
 "schemars",
 "serde",
- "serde-json-wasm 0.4.1",
+ "serde-json-wasm",
 "serde_repr",
 "thiserror",
 "time 0.3.21",
@@ -4107,9 +4027,7 @@ dependencies = [
 name = "nym-multisig-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw-storage-plus",
 "cw-utils",
 "cw3",
 "cw4",
@@ -5084,11 +5002,11 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"

 [[package]]
 name = "pbkdf2"
-version = "0.11.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
 dependencies = [
- "digest 0.10.6",
+ "crypto-mac 0.11.1",
 ]

 [[package]]
@@ -5236,12 +5154,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkcs8"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
 dependencies = [
 "der",
 "spki",
+ "zeroize",
 ]

 [[package]]
@@ -5862,12 +5781,12 @@ dependencies = [

 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
 dependencies = [
 "crypto-bigint",
- "hmac 0.12.1",
+ "hmac 0.11.0",
 "zeroize",
 ]

@@ -5886,15 +5805,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "ripemd"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
-dependencies = [
- "digest 0.10.6",
-]
-
 [[package]]
 name = "ripemd160"
 version = "0.9.1"
@@ -6229,11 +6139,10 @@ dependencies = [

 [[package]]
 name = "sec1"
-version = "0.3.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
 dependencies = [
- "base16ct",
 "der",
 "generic-array 0.14.7",
 "pkcs8",
@@ -6321,15 +6230,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde-json-wasm"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde-wasm-bindgen"
 version = "0.5.0"
@@ -6476,12 +6376,14 @@ dependencies = [

 [[package]]
 name = "sha3"
-version = "0.10.8"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
 dependencies = [
- "digest 0.10.6",
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
 "keccak",
+ "opaque-debug 0.3.0",
 ]

 [[package]]
@@ -6525,11 +6427,11 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.9.0",
 "rand_core 0.6.4",
 ]

@@ -6632,9 +6534,9 @@ dependencies = [

 [[package]]
 name = "spki"
-version = "0.6.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
 dependencies = [
 "base64ct",
 "der",
@@ -7001,9 +6903,9 @@ dependencies = [

 [[package]]
 name = "tendermint"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a199518e0366ba0aeb0d0e0a59dbd99ea0bdc14280f414ecc758c9228a454ad8"
+checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
 dependencies = [
 "async-trait",
 "bytes",
@@ -7032,9 +6934,9 @@ dependencies = [

 [[package]]
 name = "tendermint-config"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d8f6a64ae3b59ea3c73efad727271ee085b544b817d7f46901817ca6bb1773"
+checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
 dependencies = [
 "flex-error",
 "serde",
@@ -7046,9 +6948,9 @@ dependencies = [

 [[package]]
 name = "tendermint-proto"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b303d6387aaea38cea7ef924476d1f798573044e7b4f6ddd1166ac5184b2281"
+checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
 dependencies = [
 "bytes",
 "flex-error",
@@ -7064,9 +6966,9 @@ dependencies = [

 [[package]]
 name = "tendermint-rpc"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3036f0b65baa11e767dabd22a0663e842b595b0a1903f149b7b8b1e09b2b443d"
+checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
 dependencies = [
 "async-trait",
 "bytes",
@@ -102,7 +102,7 @@ default-members = [
    "explorer-api",
 ]

-exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "nym-browser-extension/storage", "cpu-cycles"]
+exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"]

 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -117,21 +117,19 @@ anyhow = "1.0.71"
 async-trait = "0.1.64"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 cfg-if = "1.0.0"
-cosmwasm-derive = "=1.2.5"
-cosmwasm-schema = "=1.2.5"
-cosmwasm-std = "=1.2.5"
-cosmwasm-storage = "=1.2.5"
-cosmrs = "=0.8.0"
-cw-utils = "=1.0.1"
-cw-storage-plus = "=1.0.1"
-cw2 = { version = "=1.0.1" }
-cw3 = { version = "=1.0.1" }
-cw3-fixed-multisig = { version = "=1.0.1" }
-cw4 = { version = "=1.0.1" }
-cw-controllers = { version = "=1.0.1" }
+cosmwasm-derive = "=1.0.0"
+cosmwasm-schema = "=1.0.0"
+cosmwasm-std = "=1.0.0"
+cosmwasm-storage = "=1.0.0"
+cw-controllers = "=0.13.4"
+cw-storage-plus = "=0.13.4"
+cw-utils = "=0.13.4"
+cw2 = { version = "=0.13.4" }
+cw3 = { version = "=0.13.4" }
+cw3-fixed-multisig = { version = "=0.13.4" }
+cw4 = { version = "=0.13.4" }
 dotenvy = "0.15.6"
 generic-array = "0.14.7"
-k256 = "0.11"
 getrandom = "0.2.10"
 lazy_static = "1.4.0"
 log = "0.4"
@@ -13,7 +13,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 * nym-gateway - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices.
 * nym-network-monitor - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").
 * nym-explorer - a (projected) block explorer and (existing) mixnet viewer.
-* nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.
+* nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework. 

 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/nymtech/nym/build.yml?branch=develop&style=for-the-badge&logo=github-actions)](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)
@@ -21,7 +21,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr

 ### Building

-Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/pre-built-binaries.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/build-nym.html).
 Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).

 ### Developing
@@ -32,9 +32,9 @@ For Typescript components, please see [ts-packages](./ts-packages).

 ### Developer chat

-> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team.
+> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team. 

-You can chat to us in two places:
+You can chat to us in two places: 
 * The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
 * The various developer channels on [Discord](https://discord.gg/nym)

@@ -84,3 +84,4 @@ where `s'` is stake `s` scaled over total token circulating supply.
 ### Licensing and copyright information

 This program is available as open source under the terms of the Apache 2.0 license. However, some elements are being licensed under CC0-1.0 and MIT. For accurate information, please check individual files.
+
@@ -1,53 +0,0 @@
-<svg
-  width="100%"
-  height="100%"
-  viewBox="0 0 80 80"
-  fill="none"
-  xmlns="http://www.w3.org/2000/svg"
->
-  <g clip-path="url(#clip0_421_13045)">
-    <path
-      d="M40 80C62.0914 80 80 62.0914 80 40C80 17.9086 62.0914 0 40 0C17.9086 0 0 17.9086 0 40C0 62.0914 17.9086 80 40 80Z"
-      fill="black"
-    />
-    <path
-      d="M40 77.2636C60.5801 77.2636 77.2636 60.5801 77.2636 40C77.2636 19.4199 60.5801 2.73645 40 2.73645C19.4199 2.73645 2.73645 19.4199 2.73645 40C2.73645 60.5801 19.4199 77.2636 40 77.2636Z"
-      fill="white"
-    />
-    <path
-      d="M24.0224 32.471H23.9776V32.5084V45.5775L18.4673 32.4934L18.4598 32.471H18.4299H15.3047H11.7981H11.7607V32.5084V47.4916V47.529H11.7981H15.3047H15.3421V47.4916V34.4L20.8748 47.5065L20.8822 47.529H20.9121H24.0224H27.5215H27.5589V47.4916V32.5084V32.471H27.5215H24.0224Z"
-      fill="black"
-    />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M23.8965 32.39H27.64V47.6101H20.8238L20.7989 47.5352L15.4232 34.8006V47.6101H11.6797V32.39H18.5183L18.5432 32.4649L23.8965 45.1761V32.39ZM23.9776 45.5776L18.4673 32.4935L18.4598 32.471H11.7608V47.529H15.3421V34.4L20.8748 47.5065L20.8823 47.529H27.5589V32.471H23.9776V45.5776Z"
-      fill="black"
-    />
-    <path
-      d="M68.2019 32.471H61.5178H61.4804L61.4729 32.5009L58.0486 45.6374L54.6169 32.5009L54.6094 32.471H54.5795H47.8804H47.8355V32.5084V47.4916V47.529H47.8804H51.3795H51.4169V47.4916V34.5047L54.8038 47.499L54.8112 47.529H54.8486H61.2337H61.2636L61.2711 47.499L64.658 34.5047V47.4916V47.529H64.6954H68.2019H68.2393V47.4916V32.5084V32.471H68.2019Z"
-      fill="black"
-    />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M61.4171 32.39H68.3204V47.6101H64.5769V35.1372L61.3497 47.5187L61.3495 47.5195L61.3269 47.6101H54.7479L54.7253 47.5195L54.7251 47.5187L51.4979 35.1372V47.6101H47.7545V32.39H54.6727L54.6953 32.4804L54.6955 32.4813L58.0485 45.3163L61.3943 32.4813L61.3945 32.4805L61.4171 32.39ZM58.0486 45.6374L54.6168 32.5009L54.6094 32.471H47.8355V47.529H51.4168V34.5047L54.8038 47.4991L54.8112 47.529H61.2636L61.2711 47.4991L64.658 34.5047V47.529H68.2393V32.471H61.4804L61.4729 32.5009L58.0486 45.6374Z"
-      fill="black"
-    />
-    <path
-      d="M42.0711 32.471H42.0486L42.0412 32.486L37.7869 39.8804L33.5103 32.486L33.5028 32.471H33.4804H29.4355H29.3608L29.3982 32.5308L35.9851 43.9402V47.4916V47.529H36.0225H39.529H39.5664V47.4916V43.9402L46.1533 32.5308L46.1907 32.471H46.1159H42.0711Z"
-      fill="black"
-    />
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M41.9985 32.39H46.337L46.2228 32.5726L39.6475 43.9619V47.6101H35.904V43.9619L29.3286 32.5726L29.2145 32.39H33.5529L33.5817 32.4475L37.7868 39.7181L41.9697 32.4476L41.9985 32.39ZM42.0411 32.486L37.7869 39.8804L33.5103 32.486L33.5028 32.471H29.3608L29.3981 32.5308L35.9851 43.9402V47.529H39.5664V43.9402L46.1533 32.5308L46.1907 32.471H42.0486L42.0411 32.486Z"
-      fill="black"
-    />
-  </g>
-  <defs>
-    <clipPath id="clip0_421_13045">
-      <rect width="80" height="80" fill="white" />
-    </clipPath>
-  </defs>
-</svg>
@@ -117,11 +117,10 @@ impl Handler {
        let Ok(base_length) = self
            .lane_queue_lengths
            .lock()
-            .map(|guard| guard.get(&conn_lane).unwrap_or_default())
-        else {
+            .map(|guard| guard.get(&conn_lane).unwrap_or_default()) else {
            // I'd argue we should panic here as this error it not recoverable
            error!("The lane queue length lock is poisoned!!");
-            return None;
+            return None
        };

        // get the number of pending replies waiting for reply surbs
@@ -175,7 +174,7 @@ impl Handler {

        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-            return None;
+          return None
        };

        self.get_lane_queue_length(connection_id).await
@@ -207,7 +206,7 @@ impl Handler {

        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-            return None;
+          return None
        };

        self.get_lane_queue_length(connection_id).await
@@ -234,7 +233,7 @@ impl Handler {

        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
        let TransmissionLane::ConnectionId(connection_id) = lane else {
-            return None;
+          return None
        };

        self.get_lane_queue_length(connection_id).await
@@ -3,11 +3,11 @@
  "version": "0.19.0",
  "description": "A TypeScript client for interacting with smart contracts in Nym validators",
  "repository": "https://github.com/nymtech/nym",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
  "scripts": {
    "build": "rollup -c ./rollup.config.mjs",
-    "build:types": "rollup-type-bundler --dist ./dist",
+    "build:types": "rollup-type-bundler --dist ./dist/nym-validator-client",
    "build:prod": "sh ./scripts/build-prod.sh",
    "test": "ts-mocha -p ./tsconfig.test.json ./src/tests/**/*.test.ts",
    "testmock": "ts-mocha -p ./tsconfig.test.json ./src/tests/mock/*.test.ts",
@@ -29,23 +29,16 @@
  ],
  "license": "Apache-2.0",
  "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "^0.29.5",
-    "@cosmjs/crypto": "^0.29.5",
-    "@cosmjs/math": "^0.29.5",
-    "@cosmjs/proto-signing": "^0.29.5",
-    "@cosmjs/stargate": "^0.29.5",
-    "@cosmjs/tendermint-rpc": "^0.29.5",
    "@favware/rollup-type-bundler": "^2.0.0",
    "@nymproject/types": "^1.0.0",
    "@rollup/plugin-commonjs": "^24.0.1",
    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
    "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "rollup": "^3.17.2",
+    "rollup-plugin-dts": "^5.2.0",
    "@typescript-eslint/eslint-plugin": "^5.7.0",
    "@typescript-eslint/parser": "^5.7.0",
-    "axios": "^1.3.3",
-    "cosmjs-types": "^0.4.1",
-    "dotenv": "^16.0.3",
    "eslint": "^7.18.0",
    "eslint-config-airbnb": "^19.0.2",
    "eslint-config-airbnb-typescript": "^16.1.0",
@@ -54,15 +47,21 @@
    "eslint-plugin-import": "^2.25.4",
    "eslint-plugin-mocha": "^10.0.3",
    "eslint-plugin-prettier": "^4.0.0",
-    "expect": "^28.1.3",
    "mocha": "^10.0.0",
-    "moq.ts": "^7.3.4",
    "prettier": "^2.8.7",
-    "rollup": "^3.17.2",
-    "rollup-plugin-dts": "^5.2.0",
-    "rollup-plugin-node-polyfills": "^0.2.1",
    "ts-mocha": "^10.0.0",
    "typedoc": "^0.22.13",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.2",
+    "cosmjs-types": "^0.4.1",
+    "dotenv": "^16.0.3",
+    "expect": "^28.1.3",
+    "moq.ts": "^7.3.4",
+    "@cosmjs/cosmwasm-stargate": "^0.29.5",
+    "@cosmjs/crypto": "^0.29.5",
+    "@cosmjs/math": "^0.29.5",
+    "@cosmjs/proto-signing": "^0.29.5",
+    "@cosmjs/stargate": "^0.29.5",
+    "@cosmjs/tendermint-rpc": "^0.29.5",
+    "axios": "^1.3.3"
  }
 }
@@ -1,15 +1,15 @@
 import typescript from '@rollup/plugin-typescript';
-import nodePolyfills from 'rollup-plugin-node-polyfills';
+import resolve from '@rollup/plugin-node-resolve';
 import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';

 export default [
  {
-    input: 'src/index.ts',
+    input: './src/index.ts',
    output: {
-      dir: 'dist',
+      dir: 'dist/nym-validator-client',
      format: 'cjs',
    },
-    plugins: [nodePolyfills(), typescript(), commonjs(), json()],
+    plugins: [resolve(), typescript(), commonjs(), json()],
  },
 ];
@@ -21,7 +21,7 @@ node ./scripts/buildPackageJson.mjs

 # Copy README

-cp README.md dist/
+cp README.md dist/nym-validator-client

 # move the output outside of the yarn/npm workspaces

@@ -17,4 +17,4 @@ const packageJson = {
  types,
 };

-fs.writeFileSync('./dist/package.json', JSON.stringify(packageJson, null, 2));
+fs.writeFileSync('./dist/nym-validator-client/package.json', JSON.stringify(packageJson, null, 2));
@@ -45,6 +45,7 @@ import {
 } from '@nymproject/types';
 import QueryClient from './query-client';
 import SigningClient, { ISigningClient } from './signing-client';
+// import { DelegationBlock } from './types/shared';

 export interface INymClient {
  readonly mixnetContract: string;
@@ -625,17 +626,7 @@ export default class ValidatorClient implements INymClient {

  // SIMULATE

-  public async simulateSend({
-    signingAddress,
-    from,
-    to,
-    amount,
-  }: {
-    signingAddress: string;
-    from: string;
-    to: string;
-    amount: Coin[];
-  }) {
-    return (this.client as ISigningClient).simulateSend(signingAddress, from, to, amount);
+  public async simulateSend(signingAddress: string, from: string, to: string, amount: Coin[]) {
+    return (this.client as SigningClient).simulateSend(signingAddress, from, to, amount);
  }
 }
@@ -22,12 +22,9 @@ describe('Simualtions', () => {
  });

  it('can simulate sending tokens', async () => {
-    const res = await client.simulateSend({
-      signingAddress: client.address,
-      from: client.address,
-      to: client.address,
-      amount: [{ amount: '400000', denom: 'unym' }],
-    });
+    const res = await client.simulateSend(client.address, client.address, client.address, [
+      { amount: '400000', denom: 'unym' },
+    ]);

    expect(typeof res).toBe('number');
  }).timeout(10000);
@@ -1,6 +1,6 @@
 {
  "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "./dist/nym-validator-client",
    "module": "ES2020",
    "target": "es2021",
    "allowJs": false,
@@ -237,18 +237,18 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"

 [[package]]
 name = "bip32"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30ed1d6f8437a487a266c8293aeb95b61a23261273e3e02912cdb8b68bf798b"
+checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f"
 dependencies = [
 "bs58",
- "hmac 0.12.1",
+ "hmac 0.11.0",
 "k256",
 "once_cell",
 "pbkdf2",
 "rand_core 0.6.4",
- "ripemd",
- "sha2 0.10.6",
+ "ripemd160",
+ "sha2 0.9.9",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -332,6 +332,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
+ "block-padding",
 "generic-array 0.14.7",
 ]

@@ -344,6 +345,12 @@ dependencies = [
 "generic-array 0.14.7",
 ]

+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
 [[package]]
 name = "bls12_381"
 version = "0.5.0"
@@ -570,9 +577,9 @@ dependencies = [

 [[package]]
 name = "const-oid"
-version = "0.9.4"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"

 [[package]]
 name = "constant_time_eq"
@@ -598,9 +605,8 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61f3d2224c90ea78e1fa7444787761a549170c46b6b0ed09b93f9b7e4076a"
+version = "0.12.3"
+source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
 dependencies = [
 "prost",
 "prost-types",
@@ -609,9 +615,8 @@ dependencies = [

 [[package]]
 name = "cosmrs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d5890dac07a62337e5841adb8f2074a66a962a098a48df9460f64d483beaf4"
+version = "0.7.1"
+source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
@@ -632,11 +637,11 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.3.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d076a08ec01ed23c4396aca98ec73a38fa1fee5f310465add52b4108181c7a8"
+checksum = "970d1d705862179b5d7a233ae36f02f21c4ec1b8075fe60c77fc5b43471331fa"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.9.0",
 "ed25519-zebra",
 "k256",
 "rand_core 0.6.4",
@@ -645,53 +650,26 @@ dependencies = [

 [[package]]
 name = "cosmwasm-derive"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773"
+checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
 dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "cosmwasm-schema"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
-dependencies = [
- "cosmwasm-schema-derive",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-schema-derive"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "cosmwasm-std"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
+checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
 dependencies = [
 "base64 0.13.1",
 "cosmwasm-crypto",
 "cosmwasm-derive",
- "derivative",
 "forward_ref",
- "hex",
 "schemars",
 "serde",
- "serde-json-wasm 0.5.1",
- "sha2 0.10.6",
+ "serde-json-wasm",
 "thiserror",
 "uint",
 ]
@@ -805,9 +783,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
 dependencies = [
 "generic-array 0.14.7",
 "rand_core 0.6.4",
@@ -889,11 +867,10 @@ dependencies = [

 [[package]]
 name = "cw-controllers"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91440ce8ec4f0642798bc8c8cb6b9b53c1926c6dadaf0eed267a5145cd529071"
+checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
@@ -904,9 +881,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa"
+checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -915,67 +892,46 @@ dependencies = [

 [[package]]
 name = "cw-utils"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
+checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw2",
 "schemars",
- "semver 1.0.17",
 "serde",
 "thiserror",
 ]

 [[package]]
 name = "cw2"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8"
+checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
 "serde",
 ]

-[[package]]
-name = "cw20"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "011c45920f8200bd5d32d4fe52502506f64f2f75651ab408054d4cfc75ca3a9b"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "cw3"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe0b587008aa221cd2a2579a21990a28c4347dc53ad43167c68ad765f5b6efa"
+checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-utils",
- "cw20",
 "schemars",
 "serde",
- "thiserror",
 ]

 [[package]]
 name = "cw4"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c236e0bae02ce97e89235a681dd0e07d099524b369f1ef908d704db3e6b049b"
+checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
@@ -997,23 +953,11 @@ dependencies = [

 [[package]]
 name = "der"
-version = "0.6.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
 dependencies = [
 "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]

 [[package]]
@@ -1106,9 +1050,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"

 [[package]]
 name = "ecdsa"
-version = "0.14.8"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
 dependencies = [
 "der",
 "elliptic-curve",
@@ -1164,18 +1108,16 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

 [[package]]
 name = "elliptic-curve"
-version = "0.12.3"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
 dependencies = [
 "base16ct",
 "crypto-bigint",
 "der",
- "digest 0.10.6",
- "ff 0.12.1",
+ "ff 0.11.1",
 "generic-array 0.14.7",
- "group 0.12.1",
- "pkcs8",
+ "group 0.11.0",
 "rand_core 0.6.4",
 "sec1",
 "subtle 2.4.1",
@@ -1290,16 +1232,6 @@ dependencies = [
 "subtle 2.4.1",
 ]

-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.26"
@@ -1592,17 +1524,6 @@ dependencies = [
 "subtle 2.4.1",
 ]

-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff 0.12.1",
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -2057,14 +1978,15 @@ dependencies = [

 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
 dependencies = [
 "cfg-if 1.0.0",
 "ecdsa",
 "elliptic-curve",
- "sha2 0.10.6",
+ "sec1",
+ "sha2 0.9.9",
 "sha3",
 ]

@@ -2618,8 +2540,6 @@ dependencies = [
 name = "nym-group-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
- "cw-controllers",
 "cw4",
 "schemars",
 "serde",
@@ -2636,7 +2556,7 @@ dependencies = [
 "nym-contracts-common",
 "schemars",
 "serde",
- "serde-json-wasm 0.4.1",
+ "serde-json-wasm",
 "serde_repr",
 "thiserror",
 "time",
@@ -2646,9 +2566,7 @@ dependencies = [
 name = "nym-multisig-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw-storage-plus",
 "cw-utils",
 "cw3",
 "cw4",
@@ -3167,11 +3085,11 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"

 [[package]]
 name = "pbkdf2"
-version = "0.11.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
 dependencies = [
- "digest 0.10.6",
+ "crypto-mac 0.11.1",
 ]

 [[package]]
@@ -3296,12 +3214,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkcs8"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
 dependencies = [
 "der",
 "spki",
+ "zeroize",
 ]

 [[package]]
@@ -3630,12 +3549,12 @@ dependencies = [

 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
 dependencies = [
 "crypto-bigint",
- "hmac 0.12.1",
+ "hmac 0.11.0",
 "zeroize",
 ]

@@ -3654,15 +3573,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "ripemd"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
-dependencies = [
- "digest 0.10.6",
-]
-
 [[package]]
 name = "ripemd160"
 version = "0.9.1"
@@ -3832,11 +3742,10 @@ dependencies = [

 [[package]]
 name = "sec1"
-version = "0.3.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
 dependencies = [
- "base16ct",
 "der",
 "generic-array 0.14.7",
 "pkcs8",
@@ -3909,15 +3818,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde-json-wasm"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde-wasm-bindgen"
 version = "0.5.0"
@@ -4053,12 +3953,14 @@ dependencies = [

 [[package]]
 name = "sha3"
-version = "0.10.8"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
 dependencies = [
- "digest 0.10.6",
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
 "keccak",
+ "opaque-debug 0.3.0",
 ]

 [[package]]
@@ -4072,11 +3974,11 @@ dependencies = [

 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.9.0",
 "rand_core 0.6.4",
 ]

@@ -4146,9 +4048,9 @@ dependencies = [

 [[package]]
 name = "spki"
-version = "0.6.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
 dependencies = [
 "base64ct",
 "der",
@@ -4433,9 +4335,9 @@ dependencies = [

 [[package]]
 name = "tendermint"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a199518e0366ba0aeb0d0e0a59dbd99ea0bdc14280f414ecc758c9228a454ad8"
+checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
 dependencies = [
 "async-trait",
 "bytes",
@@ -4464,9 +4366,9 @@ dependencies = [

 [[package]]
 name = "tendermint-config"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d8f6a64ae3b59ea3c73efad727271ee085b544b817d7f46901817ca6bb1773"
+checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
 dependencies = [
 "flex-error",
 "serde",
@@ -4478,9 +4380,9 @@ dependencies = [

 [[package]]
 name = "tendermint-proto"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b303d6387aaea38cea7ef924476d1f798573044e7b4f6ddd1166ac5184b2281"
+checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
 dependencies = [
 "bytes",
 "flex-error",
@@ -4496,9 +4398,9 @@ dependencies = [

 [[package]]
 name = "tendermint-rpc"
-version = "0.23.8"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3036f0b65baa11e767dabd22a0663e842b595b0a1903f149b7b8b1e09b2b443d"
+checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
 dependencies = [
 "async-trait",
 "bytes",
@@ -4,7 +4,7 @@
 // due to expansion of #[wasm_bindgen] macro on `Debug` Config struct
 #![allow(clippy::drop_non_drop)]
 // another issue due to #[wasm_bindgen] and `Copy` trait
-#![allow(dropping_copy_types)]
+#![allow(clippy::drop_copy)]

 use nym_client_core::config::{
    Acknowledgements as ConfigAcknowledgements, Config as BaseClientConfig,
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::storage::error::ClientStorageError;
+use crate::storage::errors::ClientStorageError;
 use crate::topology::WasmTopologyError;
 use js_sys::Promise;
 use nym_client_core::config::GatewayEndpointConfig;
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::Config;
-use crate::storage::error::ClientStorageError;
+use crate::storage::errors::ClientStorageError;
 use js_sys::Promise;
 use nym_client_core::client::base_client::storage::gateway_details::PersistedGatewayDetails;
 use nym_crypto::asymmetric::{encryption, identity};
@@ -15,7 +15,7 @@ use wasm_utils::storage::{IdbVersionChangeEvent, WasmStorage};
 use wasm_utils::PromisableResult;
 use zeroize::Zeroizing;

-pub(crate) mod error;
+pub(crate) mod errors;
 pub(crate) mod traits;

 const STORAGE_NAME_PREFIX: &str = "wasm-client-storage";
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::storage::error::ClientStorageError;
+use crate::storage::errors::ClientStorageError;
 use crate::storage::ClientStorage;
 use async_trait::async_trait;
 use nym_client_core::client::base_client::storage::gateway_details::{
@@ -101,7 +101,7 @@ impl AsyncFileWatcher {
        }

        let Some(filters) = &self.filters else {
-            return true;
+            return true
        };

        for filter in filters {
@@ -153,7 +153,7 @@ impl LoopCoverTrafficStream<OsRng> {

    fn loop_cover_message_size(&mut self) -> PacketSize {
        let Some(secondary_packet_size) = self.secondary_packet_size else {
-            return self.primary_packet_size;
+            return self.primary_packet_size
        };

        let use_primary = self
@@ -224,7 +224,7 @@ where
        // if secondary packet was never set, then it's obvious we have to use the primary packet
        let Some(secondary_packet) = self.config.secondary_packet_size else {
            trace!("only primary packet size is available");
-            return self.config.primary_packet_size;
+            return self.config.primary_packet_size
        };

        let primary_count =
@@ -200,7 +200,7 @@ where

    fn loop_cover_message_size(&mut self) -> PacketSize {
        let Some(secondary_packet_size) = self.config.traffic.secondary_packet_size else {
-            return self.config.traffic.primary_packet_size;
+            return self.config.traffic.primary_packet_size
        };

        let use_primary = self
@@ -727,11 +727,7 @@ where
                continue;
            }

-            let Some(last_received) = self
-                .full_reply_storage
-                .surbs_storage_ref()
-                .surbs_last_received_at(pending_reply_target)
-            else {
+            let Some(last_received) = self.full_reply_storage.surbs_storage_ref().surbs_last_received_at(pending_reply_target) else {
                error!("we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!", vals.total_size());
                to_remove.push(*pending_reply_target);
                continue;
@@ -815,8 +811,7 @@ where

            // this should never ever happen (famous last words, eh?), but in case it DOES happen eventually
            // purge that malformed data
-            let Ok(sent_at) = OffsetDateTime::from_unix_timestamp(reply_key.sent_at_timestamp)
-            else {
+            let Ok(sent_at) = OffsetDateTime::from_unix_timestamp(reply_key.sent_at_timestamp) else {
                error!("somehow our stored timestamp ({}) for one of our reply key is corrupted!. Going to remove all the entry", reply_key.sent_at_timestamp);
                to_remove_keys.push(*digest);
                continue;
@@ -180,7 +180,7 @@ impl<T> TransmissionBuffer<T> {

        while items.len() < n {
            let Some(next) = self.pop_next_message_at_random(rng) else {
-                break;
+               break
            };
            items.push(next)
        }
@@ -41,7 +41,7 @@ nym-api-requests = { path = "../../../nym-api/nym-api-requests" }
 async-trait = { workspace = true, optional = true }
 bip39 = { workspace = true, features = ["rand"], optional = true }
 nym-config = { path = "../../config", optional = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32", "cosmwasm"], optional = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32", "cosmwasm"], optional = true }
 # note that this has the same version as used by cosmrs
 eyre = { version = "0.6", optional = true }
 cw3 = { workspace = true, optional = true }
@@ -55,7 +55,7 @@ cosmwasm-std = { workspace = true, optional = true }

 [dev-dependencies]
 bip39 = { workspace = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32"] }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32"] }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
 ts-rs = "6.1.2"

@@ -127,13 +127,46 @@ impl GasAdjustable for Gas {
 mod sealed {
    use cosmrs::tx::{self, Gas};
    use cosmrs::Coin as CosmosCoin;
-    use cosmrs::{AccountId, Denom as CosmosDenom};
+    use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
    use serde::{Deserialize, Deserializer, Serialize, Serializer};

+    fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
+        val.as_ref().to_string()
+    }
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(remote = "CosmosDenom")]
+    struct Denom(#[serde(getter = "cosmos_denom_inner_getter")] String);
+
+    impl From<Denom> for CosmosDenom {
+        fn from(val: Denom) -> Self {
+            val.0.parse().unwrap()
+        }
+    }
+
+    fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
+        // haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
+        // note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
+        val.to_string().parse().unwrap()
+    }
+
+    // at the time of writing it the current cosmrs' Decimal is extremely limited...
+    #[derive(Serialize, Deserialize)]
+    #[serde(remote = "CosmosDecimal")]
+    struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
+
+    impl From<Decimal> for CosmosDecimal {
+        fn from(val: Decimal) -> Self {
+            val.0.into()
+        }
+    }
+
    #[derive(Serialize, Deserialize, Clone)]
    struct Coin {
+        #[serde(with = "Denom")]
        denom: CosmosDenom,
-        amount: u128,
+        #[serde(with = "Decimal")]
+        amount: CosmosDecimal,
    }

    impl From<Coin> for CosmosCoin {
@@ -39,7 +39,7 @@ pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
 pub use cosmrs::tendermint::Time as TendermintTime;
 pub use cosmrs::tx::{self, Gas};
 pub use cosmrs::Coin as CosmosCoin;
-pub use cosmrs::{bip32, AccountId, Denom};
+pub use cosmrs::{bip32, AccountId, Decimal, Denom};
 use cosmwasm_std::Addr;
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
@@ -14,7 +14,7 @@ clap = { version = "4.0", features = ["derive"] }
 cw-utils = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
-k256 = { workspace = true, features = ["ecdsa", "sha256"] }
+k256 = { version = "0.10", features = ["ecdsa", "sha256"] }
 log = { workspace = true }
 rand = {version = "0.6", features = ["std"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -25,7 +25,7 @@ toml = "0.5.6"
 url = "2.2"
 tap = "1"

-cosmrs = { workspace = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 cosmwasm-std = { workspace = true }

 nym-validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
@@ -56,8 +56,6 @@ pub async fn generate(args: Args) {
                .expect("threshold can't be converted to Decimal"),
        },
        max_voting_period: Duration::Time(args.max_voting_period),
-        executor: None,
-        proposal_deposit: None,
        coconut_bandwidth_contract_address: coconut_bandwidth_contract_address.to_string(),
        coconut_dkg_contract_address: coconut_dkg_contract_address.to_string(),
    };
@@ -35,14 +35,9 @@ pub async fn create_family_join_permit_sign_payload(args: Args, client: QueryCli
    info!("Create family join permit sign payload");

    // get the address of our mixnode to recover the family head information
-    let Some(mixnode) = client
-        .get_owned_mixnode(&args.address)
-        .await
-        .unwrap()
-        .mixnode_details
-    else {
+    let Some(mixnode) = client.get_owned_mixnode(&args.address).await.unwrap().mixnode_details else {
        eprintln!("{} does not seem to even own a mixnode!", args.address);
-        return;
+        return
    };

    // make sure this mixnode is actually a family head
@@ -14,7 +14,7 @@ pub struct InstantiateMsg {
    pub mix_denom: String,
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    DepositFunds { data: DepositData },
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};

 use crate::msg::ExecuteMsg;

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct SpendCredentialData {
    funds: Coin,
    blinded_serial_number: String,
@@ -43,7 +43,7 @@ pub enum SpendCredentialStatus {
    Spent,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct SpendCredential {
    funds: Coin,
    blinded_serial_number: String,
@@ -74,7 +74,7 @@ impl SpendCredential {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedSpendCredentialResponse {
    pub spend_credentials: Vec<SpendCredential>,
    pub per_page: usize,
@@ -95,7 +95,7 @@ impl PagedSpendCredentialResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct SpendCredentialResponse {
    pub spend_credential: Option<SpendCredential>,
 }
@@ -15,7 +15,7 @@ pub type Nonce = u32;

 // define this type explicitly for [hopefully] better usability
 // (so you wouldn't need to worry about whether you should use bytes, bs58, etc.)
-#[derive(Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, PartialEq, JsonSchema)]
 pub struct MessageSignature(Vec<u8>);

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

 [dependencies]
-cosmwasm-schema = { workspace = true }
 cw4 = { workspace = true }
-cw-controllers = { workspace = true }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -1,7 +1,13 @@
-use cosmwasm_schema::{cw_serde, QueryResponses};
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 use cw4::Member;

-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub struct InstantiateMsg {
    /// The admin is the only account that can update the group state.
    /// Omit it to make the group immutable.
@@ -9,7 +15,8 @@ pub struct InstantiateMsg {
    pub members: Vec<Member>,
 }

-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    /// Change the admin
    UpdateAdmin { admin: Option<String> },
@@ -25,24 +32,23 @@ pub enum ExecuteMsg {
    RemoveHook { addr: String },
 }

-#[cw_serde]
-#[derive(QueryResponses)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    #[returns(cw_controllers::AdminResponse)]
+    /// Return AdminResponse
    Admin {},
-    #[returns(cw4::TotalWeightResponse)]
-    TotalWeight { at_height: Option<u64> },
-    #[returns(cw4::MemberListResponse)]
+    /// Return TotalWeightResponse
+    TotalWeight {},
+    /// Returns MembersListResponse
    ListMembers {
        start_after: Option<String>,
        limit: Option<u32>,
    },
-    #[returns(cw4::MemberResponse)]
+    /// Returns MemberResponse
    Member {
        addr: String,
        at_height: Option<u64>,
    },
-    /// Shows all registered hooks.
-    #[returns(cw_controllers::HooksResponse)]
+    /// Shows all registered hooks. Returns HooksResponse.
    Hooks {},
 }
@@ -37,7 +37,7 @@ pub fn generate_owner_storage_subkey(
    }
 }

-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
 pub struct Delegation {
    /// Address of the owner of this delegation.
    pub owner: Addr,
@@ -114,7 +114,7 @@ impl Delegation {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixNodeDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<OwnerProxySubKey>,
@@ -129,7 +129,7 @@ impl PagedMixNodeDelegationsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedDelegatorDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<(MixId, OwnerProxySubKey)>,
@@ -147,7 +147,7 @@ impl PagedDelegatorDelegationsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDelegationResponse {
    pub delegation: Option<Delegation>,
    pub mixnode_still_bonded: bool,
@@ -162,7 +162,7 @@ impl MixNodeDelegationResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedAllDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<StorageKey>,
@@ -23,7 +23,7 @@ pub struct Gateway {
    pub version: String,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayBond {
    pub pledge_amount: Coin,
    pub owner: Addr,
@@ -132,7 +132,7 @@ impl GatewayConfigUpdate {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedGatewayResponse {
    pub nodes: Vec<GatewayBond>,
    pub per_page: usize,
@@ -153,13 +153,13 @@ impl PagedGatewayResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayOwnershipResponse {
    pub address: Addr,
    pub gateway: Option<GatewayBond>,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayBondResponse {
    pub identity: IdentityKey,
    pub gateway: Option<GatewayBond>,
@@ -489,7 +489,7 @@ impl CurrentIntervalResponse {
    }
 }

-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct PendingEpochEventsResponse {
    pub seconds_until_executable: i64,
    pub events: Vec<PendingEpochEvent>,
@@ -510,7 +510,7 @@ impl PendingEpochEventsResponse {
    }
 }

-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct PendingIntervalEventsResponse {
    pub seconds_until_executable: i64,
    pub events: Vec<PendingIntervalEvent>,
@@ -33,7 +33,7 @@ impl RewardedSetNodeStatus {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDetails {
    pub bond_information: MixNodeBond,
    pub rewarding_details: MixNodeRewarding,
@@ -86,7 +86,7 @@ impl MixNodeDetails {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeRewarding {
    /// Information provided by the operator that influence the cost function.
    pub cost_params: MixNodeCostParams,
@@ -465,7 +465,7 @@ impl MixNodeRewarding {
 }

 // operator information + data assigned by the contract(s)
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
    /// Unique id assigned to the bonded mixnode.
    pub mix_id: MixId,
@@ -559,7 +559,7 @@ pub struct MixNode {
    pub version: String,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeCostParams {
    pub profit_margin_percent: Percent,

@@ -686,7 +686,7 @@ impl MixNodeConfigUpdate {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixnodeBondsResponse {
    pub nodes: Vec<MixNodeBond>,
    pub per_page: usize,
@@ -703,7 +703,7 @@ impl PagedMixnodeBondsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixnodesDetailsResponse {
    pub nodes: Vec<MixNodeDetails>,
    pub per_page: usize,
@@ -745,19 +745,19 @@ impl PagedUnbondedMixnodesResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixOwnershipResponse {
    pub address: Addr,
    pub mixnode_details: Option<MixNodeDetails>,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixnodeDetailsResponse {
    pub mix_id: MixId,
    pub mixnode_details: Option<MixNodeDetails>,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixnodeRewardingDetailsResponse {
    pub mix_id: MixId,
    pub rewarding_details: Option<MixNodeRewarding>,
@@ -7,19 +7,19 @@ use crate::{BlockHeight, EpochEventId, IntervalEventId, MixId};
 use cosmwasm_std::{Addr, Coin};
 use serde::{Deserialize, Serialize};

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingEpochEvent {
    pub id: EpochEventId,
    pub event: PendingEpochEventData,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingEpochEventData {
    pub created_at: BlockHeight,
    pub kind: PendingEpochEventKind,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum PendingEpochEventKind {
    // can't just pass the `Delegation` struct here as it's impossible to determine
    // `cumulative_reward_ratio` ahead of time
@@ -68,19 +68,19 @@ impl From<(EpochEventId, PendingEpochEventData)> for PendingEpochEvent {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingIntervalEvent {
    pub id: IntervalEventId,
    pub event: PendingIntervalEventData,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingIntervalEventData {
    pub created_at: BlockHeight,
    pub kind: PendingIntervalEventKind,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum PendingIntervalEventKind {
    ChangeMixCostParams {
        mix_id: MixId,
@@ -35,7 +35,7 @@ pub struct RewardDistribution {
    pub delegates: Decimal,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct PendingRewardResponse {
    pub amount_staked: Option<Coin>,
    pub amount_earned: Option<Coin>,
@@ -46,7 +46,7 @@ pub struct PendingRewardResponse {
    pub mixnode_still_fully_bonded: bool,
 }

-#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct EstimatedCurrentEpochRewardResponse {
    pub original_stake: Option<Coin>,

@@ -22,7 +22,7 @@ pub type EpochEventId = u32;
 pub type IntervalEventId = u32;

 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq)]
 pub struct LayerAssignment {
    mix_id: MixId,
    layer: Layer,
@@ -118,7 +118,7 @@ impl Index<Layer> for LayerDistribution {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ContractState {
    pub owner: Addr, // only the owner account can update state
    pub rewarding_validator_address: Addr,
@@ -130,7 +130,7 @@ pub struct ContractState {
    pub params: ContractStateParams,
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ContractStateParams {
    /// Minimum amount a delegator must stake in orders for his delegation to get accepted.
    pub minimum_mixnode_delegation: Option<Coin>,
@@ -9,8 +9,6 @@ edition = "2021"
 cw-utils = { workspace = true }
 cw3 = { workspace = true }
 cw4 = { workspace= true }
-cw-storage-plus = { workspace = true }
-cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use cosmwasm_std::StdError;
-use cw3::DepositError;
-use cw_utils::{PaymentError, ThresholdError};
+use cw_utils::ThresholdError;

 use thiserror::Error;

@@ -18,6 +17,9 @@ pub enum ContractError {
    #[error("Group contract invalid address '{addr}'")]
    InvalidGroup { addr: String },

+    #[error("Coconut bandwidth contract address not found")]
+    InvalidCoconutBandwidth {},
+
    #[error("Unauthorized")]
    Unauthorized {},

@@ -41,10 +43,4 @@ pub enum ContractError {

    #[error("Cannot close completed or passed proposals")]
    WrongCloseStatus {},
-
-    #[error("{0}")]
-    Payment(#[from] PaymentError),
-
-    #[error("{0}")]
-    Deposit(#[from] DepositError),
 }
@@ -1,3 +1,2 @@
 pub mod error;
 pub mod msg;
-pub mod state;
@@ -1,15 +1,15 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use cosmwasm_schema::{cw_serde, QueryResponses};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 use cosmwasm_std::{CosmosMsg, Empty};
-use cw3::{UncheckedDepositInfo, Vote};
+use cw3::Vote;
 use cw4::MemberChangedHookMsg;
 use cw_utils::{Duration, Expiration, Threshold};

-use crate::state::Executor;
-
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct InstantiateMsg {
    // this is the group contract that contains the member list
    pub group_addr: String,
@@ -17,15 +17,11 @@ pub struct InstantiateMsg {
    pub coconut_dkg_contract_address: String,
    pub threshold: Threshold,
    pub max_voting_period: Duration,
-    // who is able to execute passed proposals
-    // None means that anyone can execute
-    pub executor: Option<Executor>,
-    /// The cost of creating a proposal (if any).
-    pub proposal_deposit: Option<UncheckedDepositInfo>,
 }

 // TODO: add some T variants? Maybe good enough as fixed Empty for now
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    Propose {
        title: String,
@@ -49,44 +45,41 @@ pub enum ExecuteMsg {
 }

 // We can also add this as a cw3 extension
-#[cw_serde]
-#[derive(QueryResponses)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    #[returns(cw_utils::ThresholdResponse)]
+    /// Return ThresholdResponse
    Threshold {},
-    #[returns(cw3::ProposalResponse)]
+    /// Returns ProposalResponse
    Proposal { proposal_id: u64 },
-    #[returns(cw3::ProposalListResponse)]
+    /// Returns ProposalListResponse
    ListProposals {
        start_after: Option<u64>,
        limit: Option<u32>,
    },
-    #[returns(cw3::ProposalListResponse)]
+    /// Returns ProposalListResponse
    ReverseProposals {
        start_before: Option<u64>,
        limit: Option<u32>,
    },
-    #[returns(cw3::VoteResponse)]
+    /// Returns VoteResponse
    Vote { proposal_id: u64, voter: String },
-    #[returns(cw3::VoteListResponse)]
+    /// Returns VoteListResponse
    ListVotes {
        proposal_id: u64,
        start_after: Option<String>,
        limit: Option<u32>,
    },
-    #[returns(cw3::VoterResponse)]
+    /// Returns VoterInfo
    Voter { address: String },
-    #[returns(cw3::VoterListResponse)]
+    /// Returns VoterListResponse
    ListVoters {
        start_after: Option<String>,
        limit: Option<u32>,
    },
-    /// Gets the current configuration.
-    #[returns(crate::state::Config)]
-    Config {},
 }
-
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {
    pub coconut_bandwidth_address: String,
    pub coconut_dkg_address: String,
@@ -1,59 +0,0 @@
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, QuerierWrapper};
-use cw3::DepositInfo;
-use cw4::Cw4Contract;
-use cw_storage_plus::Item;
-use cw_utils::{Duration, Threshold};
-
-use crate::error::ContractError;
-
-/// Defines who is able to execute proposals once passed
-#[cw_serde]
-pub enum Executor {
-    /// Any member of the voting group, even with 0 points
-    Member,
-    /// Only the given address
-    Only(Addr),
-}
-
-#[cw_serde]
-pub struct Config {
-    pub threshold: Threshold,
-    pub max_voting_period: Duration,
-    // Total weight and voters are queried from this contract
-    pub group_addr: Cw4Contract,
-    pub coconut_bandwidth_addr: Addr,
-    pub coconut_dkg_addr: Addr,
-    // who is able to execute passed proposals
-    // None means that anyone can execute
-    pub executor: Option<Executor>,
-    /// The price, if any, of creating a new proposal.
-    pub proposal_deposit: Option<DepositInfo>,
-}
-
-impl Config {
-    // Executor can be set in 3 ways:
-    // - Member: any member of the voting group is authorized
-    // - Only: only passed address is authorized
-    // - None: Everyone are authorized
-    pub fn authorize(&self, querier: &QuerierWrapper, sender: &Addr) -> Result<(), ContractError> {
-        if let Some(executor) = &self.executor {
-            match executor {
-                Executor::Member => {
-                    self.group_addr
-                        .is_member(querier, sender, None)?
-                        .ok_or(ContractError::Unauthorized {})?;
-                }
-                Executor::Only(addr) => {
-                    if addr != sender {
-                        return Err(ContractError::Unauthorized {});
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-// unique items
-pub const CONFIG: Item<Config> = Item::new("config");
@@ -28,7 +28,7 @@ pub enum Period {
    After,
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct PledgeData {
    pub amount: Coin,
    pub block_time: Timestamp,
@@ -49,7 +49,7 @@ impl PledgeData {
 }

 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum PledgeCap {
    Percent(Percent),
    Absolute(Uint128), // This has to be in unym
@@ -77,7 +77,7 @@ impl Default for PledgeCap {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct OriginalVestingResponse {
    pub amount: Coin,
    pub number_of_periods: usize,
@@ -55,7 +55,7 @@ impl VestingSpecification {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    // Families
@@ -7,7 +7,7 @@ edition = "2021"

 [dependencies]
 bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
-cosmrs = { workspace = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 thiserror = "1.0"

 # I guess temporarily until we get serde support in coconut up and running
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-bip32 = "0.4.0"
-k256 = { workspace = true }
+bip32 = "0.3.0"
+k256 = "0.10.4"
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
 thiserror = "1"
@@ -154,7 +154,7 @@ where
        T: Serialize + Clone,
    {
        let Some(node) = self.base_topology.find_mix(mix_id) else {
-            return Err(NetworkTestingError::NonExistentMixnode { mix_id });
+            return Err(NetworkTestingError::NonExistentMixnode {mix_id})
        };

        self.mixnode_test_packets(&node.clone(), msg_ext, test_packets, custom_recipient)
@@ -170,13 +170,8 @@ where
    where
        T: Serialize + Clone,
    {
-        let Some(node) = self
-            .base_topology
-            .find_mix_by_identity(&encoded_mix_identity)
-        else {
-            return Err(NetworkTestingError::NonExistentMixnodeIdentity {
-                mix_identity: encoded_mix_identity,
-            });
+        let Some(node) = self.base_topology.find_mix_by_identity(&encoded_mix_identity) else {
+            return Err(NetworkTestingError::NonExistentMixnodeIdentity { mix_identity: encoded_mix_identity })
        };

        self.mixnode_test_packets(&node.clone(), msg_ext, test_packets, custom_recipient)
@@ -217,9 +212,7 @@ where
        T: Serialize + Clone,
    {
        let Some(node) = self.base_topology.find_gateway(&encoded_gateway_identity) else {
-            return Err(NetworkTestingError::NonExistentGateway {
-                gateway_identity: encoded_gateway_identity,
-            });
+            return Err(NetworkTestingError::NonExistentGateway { gateway_identity: encoded_gateway_identity })
        };

        self.gateway_test_packets(&node.clone(), msg_ext, test_packets, custom_recipient)
@@ -107,7 +107,7 @@ impl SocksRequest {
        // ATYP
        let Some(addr_type) = AddrType::from(packet[3] as usize) else {
            error!("No Addr");
-            return Err(ResponseCodeV5::AddrTypeNotSupported.into());
+            return Err(ResponseCodeV5::AddrTypeNotSupported.into())
        };

        // DST.ADDR
@@ -190,7 +190,7 @@ impl StoreCipher<Aes256Gcm> {
            exported.ciphertext_info.ciphertext(),
        ) else {
            key.zeroize();
-            return Err(Error::InvalidImportPassphrase);
+            return Err(Error::InvalidImportPassphrase)
        };

        // if we successfully decrypted aes256gcm ciphertext, it's almost certainly correct
@@ -20,7 +20,7 @@ url = "2.2"
 ts-rs = "6.1.2"

 cosmwasm-std = { workspace = true }
-cosmrs = { workspace = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }

 nym-validator-client = { path = "../../common/client-libs/validator-client", features = [
    "nyxd-client",
@@ -22,9 +22,6 @@ pub enum StorageError {
        message: String,
    },

-    #[error("FATAL ERROR: storage key is somehow present {count} times in the table!")]
-    DuplicateKey { count: u32 },
-
    #[error("encountered issue with our storage encryption layer: {source}")]
    CryptoStorageError {
        #[from]
@@ -4,7 +4,6 @@
 use crate::console_log;
 use crate::storage::cipher_export::StoredExportedStoreCipher;
 use crate::storage::error::StorageError;
-use futures::TryFutureExt;
 use indexed_db_futures::IdbDatabase;
 use nym_store_cipher::{
    Aes256Gcm, Algorithm, EncryptedData, KdfInfo, KeySizeUser, Params, StoreCipher, Unsigned,
@@ -88,23 +87,6 @@ impl WasmStorage {
        })
    }

-    pub async fn exists(db_name: &str) -> Result<bool, StorageError> {
-        let db_req: OpenDbRequest = IdbDatabase::open(db_name)?;
-        let db: IdbDatabase = db_req.into_future().await?;
-
-        // if the db was already created before, at the very least cipher info store should exist,
-        // thus the iterator should return at least one value
-        let some_stores_exist = db.object_store_names().next().is_some();
-
-        // that's super annoying - we have to do cleanup because opening db creates it
-        // (if it didn't exist before)
-        if !some_stores_exist {
-            db.delete()?.into_future().await?
-        }
-
-        Ok(some_stores_exist)
-    }
-
    pub fn serialize_value<T: Serialize>(&self, value: &T) -> Result<JsValue, StorageError> {
        if let Some(cipher) = &self.store_cipher {
            let encrypted = cipher.encrypt_json_value(value)?;
@@ -152,35 +134,6 @@ impl WasmStorage {
            .store_value_raw(store, key, &self.serialize_value(&value)?)
            .await
    }
-
-    pub async fn remove_value<K>(&self, store: &str, key: K) -> Result<(), StorageError>
-    where
-        K: wasm_bindgen::JsCast,
-    {
-        self.inner.remove_value_raw(store, key).await
-    }
-
-    pub async fn has_value<K>(&self, store: &str, key: K) -> Result<bool, StorageError>
-    where
-        K: wasm_bindgen::JsCast,
-    {
-        match self.key_count(store, key).await? {
-            n if n == 0 => Ok(false),
-            n if n == 1 => Ok(true),
-            n => Err(StorageError::DuplicateKey { count: n }),
-        }
-    }
-
-    pub async fn key_count<K>(&self, store: &str, key: K) -> Result<u32, StorageError>
-    where
-        K: wasm_bindgen::JsCast,
-    {
-        self.inner.get_key_count(store, key).await
-    }
-
-    pub async fn get_all_keys(&self, store: &str) -> Result<js_sys::Array, StorageError> {
-        self.inner.get_all_keys(store).await
-    }
 }

 struct IdbWrapper(IdbDatabase);
@@ -216,42 +169,6 @@ impl IdbWrapper {
            .map_err(Into::into)
    }

-    async fn remove_value_raw<K>(&self, store: &str, key: K) -> Result<(), StorageError>
-    where
-        K: wasm_bindgen::JsCast,
-    {
-        self.0
-            .transaction_on_one_with_mode(store, IdbTransactionMode::Readwrite)?
-            .object_store(store)?
-            .delete_owned(key)?
-            .into_future()
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn get_key_count<K>(&self, store: &str, key: K) -> Result<u32, StorageError>
-    where
-        K: wasm_bindgen::JsCast,
-    {
-        self.0
-            .transaction_on_one_with_mode(store, IdbTransactionMode::Readwrite)?
-            .object_store(store)?
-            .count_with_key_owned(key)?
-            .into_future()
-            .await
-            .map_err(Into::into)
-    }
-
-    async fn get_all_keys(&self, store: &str) -> Result<js_sys::Array, StorageError> {
-        self.0
-            .transaction_on_one_with_mode(store, IdbTransactionMode::Readonly)?
-            .object_store(store)?
-            .get_all_keys()?
-            .into_future()
-            .await
-            .map_err(Into::into)
-    }
-
    async fn read_exported_cipher_store(
        &self,
    ) -> Result<Option<StoredExportedStoreCipher>, StorageError> {
@@ -50,9 +50,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"

 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"

 [[package]]
 name = "autocfg"
@@ -104,9 +104,9 @@ dependencies = [

 [[package]]
 name = "blake3"
-version = "1.4.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
+checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef"
 dependencies = [
 "arrayref",
 "arrayvec",
@@ -260,23 +260,23 @@ dependencies = [

 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"

 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b"

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340"
+checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
 dependencies = [
- "digest 0.10.7",
+ "digest 0.9.0",
 "ed25519-zebra",
 "k256",
 "rand_core 0.6.4",
@@ -285,62 +285,45 @@ dependencies = [

 [[package]]
 name = "cosmwasm-derive"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773"
+checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
 dependencies = [
 "syn 1.0.109",
 ]

 [[package]]
 name = "cosmwasm-schema"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
+checksum = "772e80bbad231a47a2068812b723a1ff81dd4a0d56c9391ac748177bea3a61da"
 dependencies = [
- "cosmwasm-schema-derive",
 "schemars",
- "serde",
 "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-schema-derive"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]

 [[package]]
 name = "cosmwasm-std"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
+checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
 dependencies = [
 "base64 0.13.1",
 "cosmwasm-crypto",
 "cosmwasm-derive",
- "derivative",
 "forward_ref",
- "hex",
 "schemars",
 "serde",
- "serde-json-wasm 0.5.1",
- "sha2 0.10.6",
+ "serde-json-wasm",
 "thiserror",
 "uint",
 ]

 [[package]]
 name = "cosmwasm-storage"
-version = "1.2.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3737a3aac48f5ed883b5b73bfb731e77feebd8fc6b43419844ec2971072164d"
+checksum = "d18403b07304d15d304dad11040d45bbcaf78d603b4be3fb5e2685c16f9229b5"
 dependencies = [
 "cosmwasm-std",
 "serde",
@@ -378,9 +361,9 @@ dependencies = [

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
 dependencies = [
 "autocfg",
 "cfg-if",
@@ -391,9 +374,9 @@ dependencies = [

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
 dependencies = [
 "cfg-if",
 ]
@@ -406,9 +389,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
 dependencies = [
 "generic-array 0.14.6",
 "rand_core 0.6.4",
@@ -471,11 +454,10 @@ dependencies = [

 [[package]]
 name = "cw-controllers"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91440ce8ec4f0642798bc8c8cb6b9b53c1926c6dadaf0eed267a5145cd529071"
+checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
@@ -486,17 +468,17 @@ dependencies = [

 [[package]]
 name = "cw-multi-test"
-version = "0.16.4"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a18afd2e201221c6d72a57f0886ef2a22151bbc9e6db7af276fde8a91081042"
+checksum = "a3f9a8ab7c3c29ec93cb7a39ce4b14a05e053153b4a17ef7cf2246af1b7c087e"
 dependencies = [
 "anyhow",
 "cosmwasm-std",
+ "cosmwasm-storage",
 "cw-storage-plus",
 "cw-utils",
 "derivative",
 "itertools",
- "k256",
 "prost",
 "schemars",
 "serde",
@@ -505,9 +487,9 @@ dependencies = [

 [[package]]
 name = "cw-storage-plus"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa"
+checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
 dependencies = [
 "cosmwasm-std",
 "schemars",
@@ -516,85 +498,46 @@ dependencies = [

 [[package]]
 name = "cw-utils"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
+checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw2",
 "schemars",
- "semver",
 "serde",
 "thiserror",
 ]

 [[package]]
 name = "cw2"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8"
+checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
 "serde",
 ]

-[[package]]
-name = "cw20"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91666da6c7b40c8dd5ff94df655a28114efc10c79b70b4d06f13c31e37d60609"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw20-base"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcd279230b08ed8afd8be5828221622bd5b9ce25d0b01d58bad626c6ce0169c"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw20",
- "schemars",
- "semver",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "cw3"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe0b587008aa221cd2a2579a21990a28c4347dc53ad43167c68ad765f5b6efa"
+checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-utils",
- "cw20",
 "schemars",
 "serde",
- "thiserror",
 ]

 [[package]]
 name = "cw3-fixed-multisig"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e2415adb201e5e89dab34edf59d7dc166bc558526de009a49ae66276c9119a"
+checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "cw-utils",
@@ -607,15 +550,14 @@ dependencies = [

 [[package]]
 name = "cw3-flex-multisig"
-version = "1.0.0"
+version = "0.13.1"
 dependencies = [
+ "cosmwasm-schema",
 "cosmwasm-std",
 "cw-multi-test",
 "cw-storage-plus",
 "cw-utils",
 "cw2",
- "cw20",
- "cw20-base",
 "cw3",
 "cw3-fixed-multisig",
 "cw4",
@@ -623,15 +565,15 @@ dependencies = [
 "nym-group-contract-common",
 "nym-multisig-contract-common",
 "schemars",
+ "serde",
 ]

 [[package]]
 name = "cw4"
-version = "1.0.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c236e0bae02ce97e89235a681dd0e07d099524b369f1ef908d704db3e6b049b"
+checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
 "cw-storage-plus",
 "schemars",
@@ -640,7 +582,7 @@ dependencies = [

 [[package]]
 name = "cw4-group"
-version = "1.0.0"
+version = "0.13.4"
 dependencies = [
 "cosmwasm-schema",
 "cosmwasm-std",
@@ -657,12 +599,11 @@ dependencies = [

 [[package]]
 name = "der"
-version = "0.6.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
 dependencies = [
 "const-oid",
- "zeroize",
 ]

 [[package]]
@@ -713,9 +654,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"

 [[package]]
 name = "ecdsa"
-version = "0.14.8"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
 dependencies = [
 "der",
 "elliptic-curve",
@@ -742,7 +683,7 @@ dependencies = [
 "ed25519",
 "rand 0.7.3",
 "serde",
- "sha2 0.9.9",
+ "sha2",
 "zeroize",
 ]

@@ -757,7 +698,7 @@ dependencies = [
 "hex",
 "rand_core 0.6.4",
 "serde",
- "sha2 0.9.9",
+ "sha2",
 "zeroize",
 ]

@@ -769,18 +710,16 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

 [[package]]
 name = "elliptic-curve"
-version = "0.12.3"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
 dependencies = [
 "base16ct",
 "crypto-bigint",
 "der",
- "digest 0.10.7",
 "ff",
 "generic-array 0.14.6",
 "group",
- "pkcs8",
 "rand_core 0.6.4",
 "sec1",
 "subtle 2.4.1",
@@ -839,9 +778,9 @@ dependencies = [

 [[package]]
 name = "ff"
-version = "0.12.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
 dependencies = [
 "rand_core 0.6.4",
 "subtle 2.4.1",
@@ -1035,9 +974,9 @@ dependencies = [

 [[package]]
 name = "group"
-version = "0.12.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
 dependencies = [
 "ff",
 "rand_core 0.6.4",
@@ -1053,6 +992,15 @@ dependencies = [
 "ahash",
 ]

+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.1"
@@ -1072,7 +1020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
 dependencies = [
 "digest 0.9.0",
- "hmac 0.11.0",
+ "hmac",
 ]

 [[package]]
@@ -1085,15 +1033,6 @@ dependencies = [
 "digest 0.9.0",
 ]

-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.7",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -1144,7 +1083,7 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.1",
 "libc",
 "windows-sys 0.48.0",
 ]
@@ -1184,14 +1123,15 @@ dependencies = [

 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
 dependencies = [
 "cfg-if",
 "ecdsa",
 "elliptic-curve",
- "sha2 0.10.6",
+ "sec1",
+ "sha2",
 ]

 [[package]]
@@ -1277,9 +1217,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
 "autocfg",
 ]
@@ -1312,11 +1252,11 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
 "libc",
 ]

@@ -1407,8 +1347,6 @@ dependencies = [
 name = "nym-group-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
- "cw-controllers",
 "cw4",
 "schemars",
 "serde",
@@ -1449,7 +1387,7 @@ dependencies = [
 "nym-contracts-common",
 "schemars",
 "serde",
- "serde-json-wasm 0.4.1",
+ "serde-json-wasm",
 "serde_repr",
 "thiserror",
 "time",
@@ -1459,9 +1397,7 @@ dependencies = [
 name = "nym-multisig-contract-common"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema",
 "cosmwasm-std",
- "cw-storage-plus",
 "cw-utils",
 "cw3",
 "cw4",
@@ -1659,12 +1595,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkcs8"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
 dependencies = [
 "der",
 "spki",
+ "zeroize",
 ]

 [[package]]
@@ -1890,12 +1827,12 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"

 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
 dependencies = [
 "crypto-bigint",
- "hmac 0.12.1",
+ "hmac",
 "zeroize",
 ]

@@ -2004,11 +1941,10 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "sec1"
-version = "0.3.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
 dependencies = [
- "base16ct",
 "der",
 "generic-array 0.14.6",
 "pkcs8",
@@ -2040,15 +1976,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde-json-wasm"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.160"
@@ -2106,24 +2033,13 @@ dependencies = [
 "opaque-debug 0.3.0",
 ]

-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
 dependencies = [
- "digest 0.10.7",
+ "digest 0.9.0",
 "rand_core 0.6.4",
 ]

@@ -2151,20 +2067,20 @@ dependencies = [
 "curve25519-dalek",
 "digest 0.9.0",
 "hkdf",
- "hmac 0.11.0",
+ "hmac",
 "lioness",
 "log",
 "rand 0.7.3",
 "rand_distr",
- "sha2 0.9.9",
+ "sha2",
 "subtle 2.4.1",
 ]

 [[package]]
 name = "spki"
-version = "0.6.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
 dependencies = [
 "base64ct",
 "der",
@@ -32,17 +32,16 @@ incremental = false
 overflow-checks = true

 [workspace.dependencies]
-cosmwasm-crypto = "=1.2.5"
-cosmwasm-derive = "=1.2.5"
-cosmwasm-schema = "=1.2.5"
-cosmwasm-std = "=1.2.5"
-cosmwasm-storage = "=1.2.5"
-cw-controllers = "=1.0.1"
-cw-multi-test = "=0.16.4"
-cw-storage-plus = "=1.0.1"
-cw-utils = "=1.0.1"
-cw2 = "=1.0.1"
-cw3 = "=1.0.1"
-cw3-fixed-multisig = "=1.0.1"
-cw4 = "=1.0.1"
-cw20 = "=1.0.1"
+cosmwasm-crypto = "=1.0.0"
+cosmwasm-derive = "=1.0.0"
+cosmwasm-schema = "=1.0.0"
+cosmwasm-std = "=1.0.0"
+cosmwasm-storage = "=1.0.0"
+cw-controllers = "=0.13.4"
+cw-multi-test = "=0.13.4"
+cw-storage-plus = "=0.13.4"
+cw-utils = "=0.13.4"
+cw2 = "=0.13.4"
+cw3 = "=0.13.4"
+cw3-fixed-multisig = "=0.13.4"
+cw4 = "=0.13.4"
@@ -30,7 +30,7 @@ impl<'a> IndexList<ContractVKShare> for VkShareIndex<'a> {
 pub(crate) fn vk_shares<'a>() -> IndexedMap<'a, VKShareKey<'a>, ContractVKShare, VkShareIndex<'a>> {
    let indexes = VkShareIndex {
        epoch_id: MultiIndex::new(
-            |_pk, d| d.epoch_id,
+            |d| d.epoch_id,
            VK_SHARES_PK_NAMESPACE,
            VK_SHARES_EPOCH_ID_IDX_NAMESPACE,
        ),
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0

 use cosmwasm_std::{entry_point, Addr, Coin, DepsMut, Empty, Env, Response};
+use cw3_flex_multisig::state::CONFIG;
 use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper};
 use nym_multisig_contract_common::error::ContractError;
-use nym_multisig_contract_common::state::CONFIG;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

@@ -45,8 +45,6 @@ fn spend_credential_creates_proposal() {
        threshold: Threshold::AbsolutePercentage {
            percentage: Decimal::from_ratio(2u128, 3u128),
        },
-        executor: None,
-        proposal_deposit: None,
        max_voting_period: Duration::Height(1000),
        coconut_bandwidth_contract_address: TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS.to_string(),
        coconut_dkg_contract_address: TEST_COCONUT_DKG_CONTRACT_ADDRESS.to_string(),
@@ -52,8 +52,6 @@ fn dkg_proposal() {
        threshold: Threshold::AbsolutePercentage {
            percentage: Decimal::from_ratio(1u128, 1u128),
        },
-        executor: None,
-        proposal_deposit: None,
        max_voting_period: Duration::Time(1000),
        coconut_bandwidth_contract_address: TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS.to_string(),
        coconut_dkg_contract_address: TEST_COCONUT_DKG_CONTRACT_ADDRESS.to_string(),
@@ -520,7 +520,7 @@ mod tests {
                .delegations
                .iter()
                .filter(|d| d.proxy.is_some())
-                .all(|d| d.proxy.as_ref().unwrap() == vesting_contract));
+                .all(|d| d.proxy.as_ref().unwrap() == &vesting_contract));

            // now make sure that if we do it in paged manner, we'll get exactly the same result
            let per_page = Some(15);
@@ -27,12 +27,12 @@ impl<'a> IndexList<Delegation> for DelegationIndex<'a> {
 pub(crate) fn delegations<'a>() -> IndexedMap<'a, PrimaryKey, Delegation, DelegationIndex<'a>> {
    let indexes = DelegationIndex {
        owner: MultiIndex::new(
-            |_pk, d| d.owner.clone(),
+            |d| d.owner.clone(),
            DELEGATION_PK_NAMESPACE,
            DELEGATION_OWNER_IDX_NAMESPACE,
        ),
        mixnode: MultiIndex::new(
-            |_pk, d| d.mix_id,
+            |d| d.mix_id,
            DELEGATION_PK_NAMESPACE,
            DELEGATION_MIXNODE_IDX_NAMESPACE,
        ),
@@ -24,12 +24,8 @@ pub(crate) fn verify_family_join_permit(
    let Some(head_mixnode) = mixnodes_storage::mixnode_bonds()
        .idx
        .identity_key
-        .item(deps.storage, granter.identity().to_owned())?
-        .map(|record| record.1)
-    else {
-        return Err(MixnetContractError::FamilyDoesNotExist {
-            head: granter.identity().to_string(),
-        });
+        .item(deps.storage, granter.identity().to_owned())?.map(|record| record.1) else {
+        return Err(MixnetContractError::FamilyDoesNotExist { head: granter.identity().to_string() })
    };
    let nonce = signing_storage::get_signing_nonce(deps.storage, head_mixnode.owner)?;
    let msg = construct_family_join_permit(nonce, granter, proxy, member.to_owned());
@@ -39,12 +39,12 @@ pub(crate) fn unbonded_mixnodes<'a>(
 ) -> IndexedMap<'a, MixId, UnbondedMixnode, UnbondedMixnodeIndex<'a>> {
    let indexes = UnbondedMixnodeIndex {
        owner: MultiIndex::new(
-            |_pk, d| d.owner.clone(),
+            |d| d.owner.clone(),
            UNBONDED_MIXNODES_PK_NAMESPACE,
            UNBONDED_MIXNODES_OWNER_IDX_NAMESPACE,
        ),
        identity_key: MultiIndex::new(
-            |_pk, d| d.identity_key.clone(),
+            |d| d.identity_key.clone(),
            UNBONDED_MIXNODES_PK_NAMESPACE,
            UNBONDED_MIXNODES_IDENTITY_IDX_NAMESPACE,
        ),
@@ -185,7 +185,7 @@ pub(crate) fn _try_withdraw_operator_reward(
            // we can only attempt to send the message to the vesting contract if the proxy IS the vesting contract
            // otherwise, we don't care
            let vesting_contract = mixnet_params_storage::vesting_contract_address(deps.storage)?;
-            if proxy == vesting_contract {
+            if proxy == &vesting_contract {
                let msg = VestingContractExecuteMsg::TrackReward {
                    amount: reward.clone(),
                    address: owner.clone().into_string(),
@@ -271,7 +271,7 @@ pub(crate) fn _try_withdraw_delegator_reward(
            // we can only attempt to send the message to the vesting contract if the proxy IS the vesting contract
            // otherwise, we don't care
            let vesting_contract = mixnet_params_storage::vesting_contract_address(deps.storage)?;
-            if proxy == vesting_contract {
+            if proxy == &vesting_contract {
                let msg = VestingContractExecuteMsg::TrackReward {
                    amount: reward.clone(),
                    address: owner.clone().into_string(),
@@ -298,7 +298,7 @@ pub(crate) fn ensure_is_authorized(
    sender: &Addr,
    storage: &dyn Storage,
 ) -> Result<(), MixnetContractError> {
-    if sender != crate::mixnet_contract_settings::storage::rewarding_validator_address(storage)? {
+    if sender != &crate::mixnet_contract_settings::storage::rewarding_validator_address(storage)? {
        return Err(MixnetContractError::Unauthorized);
    }
    Ok(())
@@ -309,7 +309,7 @@ pub(crate) fn ensure_can_advance_epoch(
    storage: &dyn Storage,
 ) -> Result<EpochStatus, MixnetContractError> {
    let epoch_status = crate::interval::storage::current_epoch_status(storage)?;
-    if sender != epoch_status.being_advanced_by {
+    if sender != &epoch_status.being_advanced_by {
        // well, we know we're going to throw an error now,
        // but we might as well also check if we're even a validator
        // to return a possibly better error message
@@ -1,8 +1,8 @@
 [package]
 name = "cw3-flex-multisig"
-version = "1.0.0"
+version = "0.13.1"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2021"
+edition = "2018"
 description = "Implementing cw3 with multiple voting patterns and dynamic groups"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
@@ -13,7 +13,6 @@ documentation = "https://docs.cosmwasm.com"
 crate-type = ["cdylib", "rlib"]

 [features]
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []

@@ -23,15 +22,15 @@ cw2 = { workspace = true }
 cw3 = { workspace = true }
 cw3-fixed-multisig = { workspace = true, features = ["library"] }
 cw4 = { workspace = true }
-cw20 = { workspace = true }
 cw-storage-plus = { workspace = true }
 cosmwasm-std = { workspace = true }
 schemars = "0.8.1"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }

 nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" }
 nym-multisig-contract-common = { path= "../../../common/cosmwasm-smart-contracts/multisig-contract" }

 [dev-dependencies]
-cw4-group = { path = "../cw4-group", version = "1.0.0" }
+cosmwasm-schema = { version = "1.0.0" }
+cw4-group = { path = "../cw4-group", version = "0.13.4" }
 cw-multi-test = { workspace = true }
-cw20-base = "1.0.0"
@@ -1,25 +1,2 @@
-/*!
-This builds on [`cw3_fixed_multisig`] with a more
-powerful implementation of the [cw3 spec](https://github.com/CosmWasm/cw-plus/blob/main/packages/cw3/README.md).
-It is a multisig contract that is backed by a
-[cw4 (group)](https://github.com/CosmWasm/cw-plus/blob/main/packages/cw4/README.md) contract, which independently
-maintains the voter set.
-
-This provides 2 main advantages:
-
-* You can create two different multisigs with different voting thresholds
-  backed by the same group. Thus, you can have a 50% vote, and a 67% vote
-  that always use the same voter set, but can take other actions.
-* TODO: It allows dynamic multisig groups.
-
-
-In addition to the dynamic voting set, the main difference with the native
-Cosmos SDK multisig, is that it aggregates the signatures on chain, with
-visible proposals (like `x/gov` in the Cosmos SDK), rather than requiring
-signers to share signatures off chain.
-
-For more information on this contract, please check out the
-[README](https://github.com/CosmWasm/cw-plus/blob/main/contracts/cw3-flex-multisig/README.md).
- */
-
 pub mod contract;
+pub mod state;
@@ -0,0 +1,20 @@
+use cosmwasm_std::Addr;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use cw4::Cw4Contract;
+use cw_storage_plus::Item;
+use cw_utils::{Duration, Threshold};
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+pub struct Config {
+    pub threshold: Threshold,
+    pub max_voting_period: Duration,
+    // Total weight and voters are queried from this contract
+    pub group_addr: Cw4Contract,
+    pub coconut_bandwidth_addr: Addr,
+    pub coconut_dkg_addr: Addr,
+}
+
+// unique items
+pub const CONFIG: Item<Config> = Item::new("config");
@@ -1,5 +1,5 @@
 [alias]
-wasm = "build --release --lib --target wasm32-unknown-unknown"
-wasm-debug = "build --lib --target wasm32-unknown-unknown"
+wasm = "build --release --target wasm32-unknown-unknown"
+wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --bin schema"
+schema = "run --example schema"
@@ -1,8 +1,8 @@
 [package]
 name = "cw4-group"
-version = "1.0.0"
+version = "0.13.4"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2021"
+edition = "2018"
 description = "Simple cw4 implementation of group membership controlled by admin "
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
@@ -20,8 +20,6 @@ exclude = [
 crate-type = ["cdylib", "rlib"]

 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []

@@ -33,8 +31,10 @@ cw2 = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
 cw-storage-plus = { workspace = true }
-cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
+
+[dev-dependencies]
+cosmwasm-schema = { workspace = true }
@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
    attr, to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Order, Response, StdResult,
-    SubMsg, Uint64,
+    SubMsg,
 };
 use cw2::set_contract_version;
 use cw4::{
@@ -13,7 +13,6 @@ use cw_storage_plus::Bound;
 use cw_utils::maybe_addr;

 use crate::error::ContractError;
-use crate::helpers::validate_unique_members;
 use crate::state::{ADMIN, HOOKS, MEMBERS, TOTAL};
 use nym_group_contract_common::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};

@@ -40,25 +39,21 @@ pub fn instantiate(
 pub fn create(
    mut deps: DepsMut,
    admin: Option<String>,
-    mut members: Vec<Member>,
+    members: Vec<Member>,
    height: u64,
 ) -> Result<(), ContractError> {
-    validate_unique_members(&mut members)?;
-    let members = members; // let go of mutability
-
    let admin_addr = admin
        .map(|admin| deps.api.addr_validate(&admin))
        .transpose()?;
    ADMIN.set(deps.branch(), admin_addr)?;

-    let mut total = Uint64::zero();
+    let mut total = 0u64;
    for member in members.into_iter() {
-        let member_weight = Uint64::from(member.weight);
-        total = total.checked_add(member_weight)?;
+        total += member.weight;
        let member_addr = deps.api.addr_validate(&member.addr)?;
-        MEMBERS.save(deps.storage, &member_addr, &member_weight.u64(), height)?;
+        MEMBERS.save(deps.storage, &member_addr, &member.weight, height)?;
    }
-    TOTAL.save(deps.storage, &total.u64(), height)?;
+    TOTAL.save(deps.storage, &total)?;

    Ok(())
 }
@@ -120,23 +115,20 @@ pub fn update_members(
    deps: DepsMut,
    height: u64,
    sender: Addr,
-    mut to_add: Vec<Member>,
+    to_add: Vec<Member>,
    to_remove: Vec<String>,
 ) -> Result<MemberChangedHookMsg, ContractError> {
-    validate_unique_members(&mut to_add)?;
-    let to_add = to_add; // let go of mutability
-
    ADMIN.assert_admin(deps.as_ref(), &sender)?;

-    let mut total = Uint64::from(TOTAL.load(deps.storage)?);
+    let mut total = TOTAL.load(deps.storage)?;
    let mut diffs: Vec<MemberDiff> = vec![];

    // add all new members and update total
    for add in to_add.into_iter() {
        let add_addr = deps.api.addr_validate(&add.addr)?;
        MEMBERS.update(deps.storage, &add_addr, height, |old| -> StdResult<_> {
-            total = total.checked_sub(Uint64::from(old.unwrap_or_default()))?;
-            total = total.checked_add(Uint64::from(add.weight))?;
+            total -= old.unwrap_or_default();
+            total += add.weight;
            diffs.push(MemberDiff::new(add.addr, old, Some(add.weight)));
            Ok(add.weight)
        })?;
@@ -148,12 +140,12 @@ pub fn update_members(
        // Only process this if they were actually in the list before
        if let Some(weight) = old {
            diffs.push(MemberDiff::new(remove, Some(weight), None));
-            total = total.checked_sub(Uint64::from(weight))?;
+            total -= weight;
            MEMBERS.remove(deps.storage, &remove_addr, height)?;
        }
    }

-    TOTAL.save(deps.storage, &total.u64(), height)?;
+    TOTAL.save(deps.storage, &total)?;
    Ok(MemberChangedHookMsg { diffs })
 }

@@ -165,26 +157,20 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
            at_height: height,
        } => to_binary(&query_member(deps, addr, height)?),
        QueryMsg::ListMembers { start_after, limit } => {
-            to_binary(&query_list_members(deps, start_after, limit)?)
-        }
-        QueryMsg::TotalWeight { at_height: height } => {
-            to_binary(&query_total_weight(deps, height)?)
+            to_binary(&list_members(deps, start_after, limit)?)
        }
+        QueryMsg::TotalWeight {} => to_binary(&query_total_weight(deps)?),
        QueryMsg::Admin {} => to_binary(&ADMIN.query_admin(deps)?),
        QueryMsg::Hooks {} => to_binary(&HOOKS.query_hooks(deps)?),
    }
 }

-pub fn query_total_weight(deps: Deps, height: Option<u64>) -> StdResult<TotalWeightResponse> {
-    let weight = match height {
-        Some(h) => TOTAL.may_load_at_height(deps.storage, h),
-        None => TOTAL.may_load(deps.storage),
-    }?
-    .unwrap_or_default();
+fn query_total_weight(deps: Deps) -> StdResult<TotalWeightResponse> {
+    let weight = TOTAL.load(deps.storage)?;
    Ok(TotalWeightResponse { weight })
 }

-pub fn query_member(deps: Deps, addr: String, height: Option<u64>) -> StdResult<MemberResponse> {
+fn query_member(deps: Deps, addr: String, height: Option<u64>) -> StdResult<MemberResponse> {
    let addr = deps.api.addr_validate(&addr)?;
    let weight = match height {
        Some(h) => MEMBERS.may_load_at_height(deps.storage, &addr, h),
@@ -197,7 +183,7 @@ pub fn query_member(deps: Deps, addr: String, height: Option<u64>) -> StdResult<
 const MAX_LIMIT: u32 = 30;
 const DEFAULT_LIMIT: u32 = 10;

-pub fn query_list_members(
+fn list_members(
    deps: Deps,
    start_after: Option<String>,
    limit: Option<u32>,
@@ -219,3 +205,352 @@ pub fn query_list_members(

    Ok(MemberListResponse { members })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{from_slice, Api, OwnedDeps, Querier, Storage};
+    use cw4::{member_key, TOTAL_KEY};
+    use cw_controllers::{AdminError, HookError};
+
+    const INIT_ADMIN: &str = "juan";
+    const USER1: &str = "somebody";
+    const USER2: &str = "else";
+    const USER3: &str = "funny";
+
+    fn do_instantiate(deps: DepsMut) {
+        let msg = InstantiateMsg {
+            admin: Some(INIT_ADMIN.into()),
+            members: vec![
+                Member {
+                    addr: USER1.into(),
+                    weight: 11,
+                },
+                Member {
+                    addr: USER2.into(),
+                    weight: 6,
+                },
+            ],
+        };
+        let info = mock_info("creator", &[]);
+        instantiate(deps, mock_env(), info, msg).unwrap();
+    }
+
+    #[test]
+    fn proper_instantiation() {
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        // it worked, let's query the state
+        let res = ADMIN.query_admin(deps.as_ref()).unwrap();
+        assert_eq!(Some(INIT_ADMIN.into()), res.admin);
+
+        let res = query_total_weight(deps.as_ref()).unwrap();
+        assert_eq!(17, res.weight);
+    }
+
+    #[test]
+    fn try_member_queries() {
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        let member1 = query_member(deps.as_ref(), USER1.into(), None).unwrap();
+        assert_eq!(member1.weight, Some(11));
+
+        let member2 = query_member(deps.as_ref(), USER2.into(), None).unwrap();
+        assert_eq!(member2.weight, Some(6));
+
+        let member3 = query_member(deps.as_ref(), USER3.into(), None).unwrap();
+        assert_eq!(member3.weight, None);
+
+        let members = list_members(deps.as_ref(), None, None).unwrap();
+        assert_eq!(members.members.len(), 2);
+        // TODO: assert the set is proper
+    }
+
+    fn assert_users<S: Storage, A: Api, Q: Querier>(
+        deps: &OwnedDeps<S, A, Q>,
+        user1_weight: Option<u64>,
+        user2_weight: Option<u64>,
+        user3_weight: Option<u64>,
+        height: Option<u64>,
+    ) {
+        let member1 = query_member(deps.as_ref(), USER1.into(), height).unwrap();
+        assert_eq!(member1.weight, user1_weight);
+
+        let member2 = query_member(deps.as_ref(), USER2.into(), height).unwrap();
+        assert_eq!(member2.weight, user2_weight);
+
+        let member3 = query_member(deps.as_ref(), USER3.into(), height).unwrap();
+        assert_eq!(member3.weight, user3_weight);
+
+        // this is only valid if we are not doing a historical query
+        if height.is_none() {
+            // compute expected metrics
+            let weights = vec![user1_weight, user2_weight, user3_weight];
+            let sum: u64 = weights.iter().map(|x| x.unwrap_or_default()).sum();
+            let count = weights.iter().filter(|x| x.is_some()).count();
+
+            // TODO: more detailed compare?
+            let members = list_members(deps.as_ref(), None, None).unwrap();
+            assert_eq!(count, members.members.len());
+
+            let total = query_total_weight(deps.as_ref()).unwrap();
+            assert_eq!(sum, total.weight); // 17 - 11 + 15 = 21
+        }
+    }
+
+    #[test]
+    fn add_new_remove_old_member() {
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        // add a new one and remove existing one
+        let add = vec![Member {
+            addr: USER3.into(),
+            weight: 15,
+        }];
+        let remove = vec![USER1.into()];
+
+        // non-admin cannot update
+        let height = mock_env().block.height;
+        let err = update_members(
+            deps.as_mut(),
+            height + 5,
+            Addr::unchecked(USER1),
+            add.clone(),
+            remove.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(err, AdminError::NotAdmin {}.into());
+
+        // Test the values from instantiate
+        assert_users(&deps, Some(11), Some(6), None, None);
+        // Note all values were set at height, the beginning of that block was all None
+        assert_users(&deps, None, None, None, Some(height));
+        // This will get us the values at the start of the block after instantiate (expected initial values)
+        assert_users(&deps, Some(11), Some(6), None, Some(height + 1));
+
+        // admin updates properly
+        update_members(
+            deps.as_mut(),
+            height + 10,
+            Addr::unchecked(INIT_ADMIN),
+            add,
+            remove,
+        )
+        .unwrap();
+
+        // updated properly
+        assert_users(&deps, None, Some(6), Some(15), None);
+
+        // snapshot still shows old value
+        assert_users(&deps, Some(11), Some(6), None, Some(height + 1));
+    }
+
+    #[test]
+    fn add_old_remove_new_member() {
+        // add will over-write and remove have no effect
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        // add a new one and remove existing one
+        let add = vec![Member {
+            addr: USER1.into(),
+            weight: 4,
+        }];
+        let remove = vec![USER3.into()];
+
+        // admin updates properly
+        let height = mock_env().block.height;
+        update_members(
+            deps.as_mut(),
+            height,
+            Addr::unchecked(INIT_ADMIN),
+            add,
+            remove,
+        )
+        .unwrap();
+        assert_users(&deps, Some(4), Some(6), None, None);
+    }
+
+    #[test]
+    fn add_and_remove_same_member() {
+        // add will over-write and remove have no effect
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        // USER1 is updated and remove in the same call, we should remove this an add member3
+        let add = vec![
+            Member {
+                addr: USER1.into(),
+                weight: 20,
+            },
+            Member {
+                addr: USER3.into(),
+                weight: 5,
+            },
+        ];
+        let remove = vec![USER1.into()];
+
+        // admin updates properly
+        let height = mock_env().block.height;
+        update_members(
+            deps.as_mut(),
+            height,
+            Addr::unchecked(INIT_ADMIN),
+            add,
+            remove,
+        )
+        .unwrap();
+        assert_users(&deps, None, Some(6), Some(5), None);
+    }
+
+    #[test]
+    fn add_remove_hooks() {
+        // add will over-write and remove have no effect
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
+        assert!(hooks.hooks.is_empty());
+
+        let contract1 = String::from("hook1");
+        let contract2 = String::from("hook2");
+
+        let add_msg = ExecuteMsg::AddHook {
+            addr: contract1.clone(),
+        };
+
+        // non-admin cannot add hook
+        let user_info = mock_info(USER1, &[]);
+        let err = execute(
+            deps.as_mut(),
+            mock_env(),
+            user_info.clone(),
+            add_msg.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(err, HookError::Admin(AdminError::NotAdmin {}).into());
+
+        // admin can add it, and it appears in the query
+        let admin_info = mock_info(INIT_ADMIN, &[]);
+        let _ = execute(
+            deps.as_mut(),
+            mock_env(),
+            admin_info.clone(),
+            add_msg.clone(),
+        )
+        .unwrap();
+        let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
+        assert_eq!(hooks.hooks, vec![contract1.clone()]);
+
+        // cannot remove a non-registered contract
+        let remove_msg = ExecuteMsg::RemoveHook {
+            addr: contract2.clone(),
+        };
+        let err = execute(deps.as_mut(), mock_env(), admin_info.clone(), remove_msg).unwrap_err();
+        assert_eq!(err, HookError::HookNotRegistered {}.into());
+
+        // add second contract
+        let add_msg2 = ExecuteMsg::AddHook {
+            addr: contract2.clone(),
+        };
+        let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), add_msg2).unwrap();
+        let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
+        assert_eq!(hooks.hooks, vec![contract1.clone(), contract2.clone()]);
+
+        // cannot re-add an existing contract
+        let err = execute(deps.as_mut(), mock_env(), admin_info.clone(), add_msg).unwrap_err();
+        assert_eq!(err, HookError::HookAlreadyRegistered {}.into());
+
+        // non-admin cannot remove
+        let remove_msg = ExecuteMsg::RemoveHook { addr: contract1 };
+        let err = execute(deps.as_mut(), mock_env(), user_info, remove_msg.clone()).unwrap_err();
+        assert_eq!(err, HookError::Admin(AdminError::NotAdmin {}).into());
+
+        // remove the original
+        let _ = execute(deps.as_mut(), mock_env(), admin_info, remove_msg).unwrap();
+        let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
+        assert_eq!(hooks.hooks, vec![contract2]);
+    }
+
+    #[test]
+    fn hooks_fire() {
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
+        assert!(hooks.hooks.is_empty());
+
+        let contract1 = String::from("hook1");
+        let contract2 = String::from("hook2");
+
+        // register 2 hooks
+        let admin_info = mock_info(INIT_ADMIN, &[]);
+        let add_msg = ExecuteMsg::AddHook {
+            addr: contract1.clone(),
+        };
+        let add_msg2 = ExecuteMsg::AddHook {
+            addr: contract2.clone(),
+        };
+        for msg in vec![add_msg, add_msg2] {
+            let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), msg).unwrap();
+        }
+
+        // make some changes - add 3, remove 2, and update 1
+        // USER1 is updated and remove in the same call, we should remove this an add member3
+        let add = vec![
+            Member {
+                addr: USER1.into(),
+                weight: 20,
+            },
+            Member {
+                addr: USER3.into(),
+                weight: 5,
+            },
+        ];
+        let remove = vec![USER2.into()];
+        let msg = ExecuteMsg::UpdateMembers { remove, add };
+
+        // admin updates properly
+        assert_users(&deps, Some(11), Some(6), None, None);
+        let res = execute(deps.as_mut(), mock_env(), admin_info, msg).unwrap();
+        assert_users(&deps, Some(20), None, Some(5), None);
+
+        // ensure 2 messages for the 2 hooks
+        assert_eq!(res.messages.len(), 2);
+        // same order as in the message (adds first, then remove)
+        let diffs = vec![
+            MemberDiff::new(USER1, Some(11), Some(20)),
+            MemberDiff::new(USER3, None, Some(5)),
+            MemberDiff::new(USER2, Some(6), None),
+        ];
+        let hook_msg = MemberChangedHookMsg { diffs };
+        let msg1 = SubMsg::new(hook_msg.clone().into_cosmos_msg(contract1).unwrap());
+        let msg2 = SubMsg::new(hook_msg.into_cosmos_msg(contract2).unwrap());
+        assert_eq!(res.messages, vec![msg1, msg2]);
+    }
+
+    #[test]
+    fn raw_queries_work() {
+        // add will over-write and remove have no effect
+        let mut deps = mock_dependencies();
+        do_instantiate(deps.as_mut());
+
+        // get total from raw key
+        let total_raw = deps.storage.get(TOTAL_KEY.as_bytes()).unwrap();
+        let total: u64 = from_slice(&total_raw).unwrap();
+        assert_eq!(17, total);
+
+        // get member votes from raw key
+        let member2_raw = deps.storage.get(&member_key(USER2)).unwrap();
+        let member2: u64 = from_slice(&member2_raw).unwrap();
+        assert_eq!(6, member2);
+
+        // and execute misses
+        let member3_raw = deps.storage.get(&member_key(USER3));
+        assert_eq!(None, member3_raw);
+    }
+}
@@ -1,25 +1,19 @@
-use cosmwasm_std::{OverflowError, StdError};
+use cosmwasm_std::StdError;
 use thiserror::Error;

 use cw_controllers::{AdminError, HookError};

 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error(transparent)]
    Std(#[from] StdError),

-    #[error("{0}")]
+    #[error(transparent)]
    Hook(#[from] HookError),

-    #[error("{0}")]
+    #[error(transparent)]
    Admin(#[from] AdminError),

-    #[error("{0}")]
-    Overflow(#[from] OverflowError),
-
    #[error("Unauthorized")]
    Unauthorized {},
-
-    #[error("Message contained duplicate member: {member}")]
-    DuplicateMember { member: String },
 }
@@ -1,17 +1,17 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use std::ops::Deref;

-use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{to_binary, Addr, CosmosMsg, StdResult, WasmMsg};
 use cw4::{Cw4Contract, Member};

-use crate::ContractError;
 use nym_group_contract_common::msg::ExecuteMsg;

 /// Cw4GroupContract is a wrapper around Cw4Contract that provides a lot of helpers
 /// for working with cw4-group contracts.
 ///
 /// It extends Cw4Contract to add the extra calls from cw4-group.
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct Cw4GroupContract(pub Cw4Contract);

 impl Deref for Cw4GroupContract {
@@ -41,17 +41,3 @@ impl Cw4GroupContract {
        self.encode_msg(msg)
    }
 }
-
-/// Sorts the slice and verifies all member addresses are unique.
-pub fn validate_unique_members(members: &mut [Member]) -> Result<(), ContractError> {
-    members.sort_by(|a, b| a.addr.cmp(&b.addr));
-    for (a, b) in members.iter().zip(members.iter().skip(1)) {
-        if a.addr == b.addr {
-            return Err(ContractError::DuplicateMember {
-                member: a.addr.clone(),
-            });
-        }
-    }
-
-    Ok(())
-}
@@ -1,25 +1,6 @@
-/*!
-This is a basic implementation of the [cw4 spec](https://github.com/CosmWasm/cw-plus/blob/main/packages/cw4/README.md).
-It fulfills all elements of the spec, including the raw query lookups,
-and it designed to be used as a backing storage for
-[cw3 compliant contracts](https://github.com/CosmWasm/cw-plus/blob/main/packages/cw3/README.md).
-
-It stores a set of members along with an admin, and allows the admin to
-update the state. Raw queries (intended for cross-contract queries)
-can check a given member address and the total weight. Smart queries (designed
-for client API) can do the same, and also query the admin address as well as
-paginate over all members.
-
-For more information on this contract, please check out the
-[README](https://github.com/CosmWasm/cw-plus/blob/main/contracts/cw4-group/README.md).
- */
-
 pub mod contract;
 pub mod error;
 pub mod helpers;
 pub mod state;

 pub use crate::error::ContractError;
-
-#[cfg(test)]
-mod tests;
@@ -1,24 +1,16 @@
 use cosmwasm_std::Addr;
-use cw4::{
-    MEMBERS_CHANGELOG, MEMBERS_CHECKPOINTS, MEMBERS_KEY, TOTAL_KEY, TOTAL_KEY_CHANGELOG,
-    TOTAL_KEY_CHECKPOINTS,
-};
+use cw4::TOTAL_KEY;
 use cw_controllers::{Admin, Hooks};
-use cw_storage_plus::{SnapshotItem, SnapshotMap, Strategy};
+use cw_storage_plus::{Item, SnapshotMap, Strategy};

 pub const ADMIN: Admin = Admin::new("admin");
 pub const HOOKS: Hooks = Hooks::new("cw4-hooks");

-pub const TOTAL: SnapshotItem<u64> = SnapshotItem::new(
-    TOTAL_KEY,
-    TOTAL_KEY_CHECKPOINTS,
-    TOTAL_KEY_CHANGELOG,
-    Strategy::EveryBlock,
-);
+pub const TOTAL: Item<u64> = Item::new(TOTAL_KEY);

 pub const MEMBERS: SnapshotMap<&Addr, u64> = SnapshotMap::new(
-    MEMBERS_KEY,
-    MEMBERS_CHECKPOINTS,
-    MEMBERS_CHANGELOG,
+    cw4::MEMBERS_KEY,
+    cw4::MEMBERS_CHECKPOINTS,
+    cw4::MEMBERS_CHANGELOG,
    Strategy::EveryBlock,
 );
@@ -1,439 +0,0 @@
-use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
-use cosmwasm_std::{from_slice, Addr, Api, DepsMut, OwnedDeps, Querier, Storage, SubMsg};
-use cw4::{member_key, Member, MemberChangedHookMsg, MemberDiff, TOTAL_KEY};
-use cw_controllers::{AdminError, HookError};
-
-use crate::contract::{
-    execute, instantiate, query_list_members, query_member, query_total_weight, update_members,
-};
-use crate::state::{ADMIN, HOOKS};
-use crate::ContractError;
-use nym_group_contract_common::msg::{ExecuteMsg, InstantiateMsg};
-
-const INIT_ADMIN: &str = "juan";
-const USER1: &str = "somebody";
-const USER2: &str = "else";
-const USER3: &str = "funny";
-
-fn set_up(deps: DepsMut) {
-    let msg = InstantiateMsg {
-        admin: Some(INIT_ADMIN.into()),
-        members: vec![
-            Member {
-                addr: USER1.into(),
-                weight: 11,
-            },
-            Member {
-                addr: USER2.into(),
-                weight: 6,
-            },
-        ],
-    };
-    let info = mock_info("creator", &[]);
-    instantiate(deps, mock_env(), info, msg).unwrap();
-}
-
-#[test]
-fn proper_instantiation() {
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    // it worked, let's query the state
-    let res = ADMIN.query_admin(deps.as_ref()).unwrap();
-    assert_eq!(Some(INIT_ADMIN.into()), res.admin);
-
-    let res = query_total_weight(deps.as_ref(), None).unwrap();
-    assert_eq!(17, res.weight);
-}
-
-#[test]
-fn try_member_queries() {
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    let member1 = query_member(deps.as_ref(), USER1.into(), None).unwrap();
-    assert_eq!(member1.weight, Some(11));
-
-    let member2 = query_member(deps.as_ref(), USER2.into(), None).unwrap();
-    assert_eq!(member2.weight, Some(6));
-
-    let member3 = query_member(deps.as_ref(), USER3.into(), None).unwrap();
-    assert_eq!(member3.weight, None);
-
-    let members = query_list_members(deps.as_ref(), None, None).unwrap();
-    assert_eq!(members.members.len(), 2);
-    // TODO: assert the set is proper
-}
-
-#[test]
-fn duplicate_members_instantiation() {
-    let mut deps = mock_dependencies();
-
-    let msg = InstantiateMsg {
-        admin: Some(INIT_ADMIN.into()),
-        members: vec![
-            Member {
-                addr: USER1.into(),
-                weight: 5,
-            },
-            Member {
-                addr: USER2.into(),
-                weight: 6,
-            },
-            Member {
-                addr: USER1.into(),
-                weight: 6,
-            },
-        ],
-    };
-    let info = mock_info("creator", &[]);
-    let err = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap_err();
-    assert_eq!(
-        err,
-        ContractError::DuplicateMember {
-            member: USER1.to_string()
-        }
-    );
-}
-
-#[test]
-fn duplicate_members_execution() {
-    let mut deps = mock_dependencies();
-
-    set_up(deps.as_mut());
-
-    let add = vec![
-        Member {
-            addr: USER3.into(),
-            weight: 15,
-        },
-        Member {
-            addr: USER3.into(),
-            weight: 11,
-        },
-    ];
-
-    let height = mock_env().block.height;
-    let err = update_members(
-        deps.as_mut(),
-        height + 5,
-        Addr::unchecked(INIT_ADMIN),
-        add,
-        vec![],
-    )
-    .unwrap_err();
-
-    assert_eq!(
-        err,
-        ContractError::DuplicateMember {
-            member: USER3.to_string()
-        }
-    );
-}
-
-fn assert_users<S: Storage, A: Api, Q: Querier>(
-    deps: &OwnedDeps<S, A, Q>,
-    user1_weight: Option<u64>,
-    user2_weight: Option<u64>,
-    user3_weight: Option<u64>,
-    height: Option<u64>,
-) {
-    let member1 = query_member(deps.as_ref(), USER1.into(), height).unwrap();
-    assert_eq!(member1.weight, user1_weight);
-
-    let member2 = query_member(deps.as_ref(), USER2.into(), height).unwrap();
-    assert_eq!(member2.weight, user2_weight);
-
-    let member3 = query_member(deps.as_ref(), USER3.into(), height).unwrap();
-    assert_eq!(member3.weight, user3_weight);
-
-    // this is only valid if we are not doing a historical query
-    if height.is_none() {
-        // compute expected metrics
-        let weights = [user1_weight, user2_weight, user3_weight];
-        let sum: u64 = weights.iter().map(|x| x.unwrap_or_default()).sum();
-        let count = weights.iter().filter(|x| x.is_some()).count();
-
-        // TODO: more detailed compare?
-        let members = query_list_members(deps.as_ref(), None, None).unwrap();
-        assert_eq!(count, members.members.len());
-
-        let total = query_total_weight(deps.as_ref(), None).unwrap();
-        assert_eq!(sum, total.weight); // 17 - 11 + 15 = 21
-    }
-}
-
-#[test]
-fn add_new_remove_old_member() {
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    // add a new one and remove existing one
-    let add = vec![Member {
-        addr: USER3.into(),
-        weight: 15,
-    }];
-    let remove = vec![USER1.into()];
-
-    // non-admin cannot update
-    let height = mock_env().block.height;
-    let err = update_members(
-        deps.as_mut(),
-        height + 5,
-        Addr::unchecked(USER1),
-        add.clone(),
-        remove.clone(),
-    )
-    .unwrap_err();
-    assert_eq!(err, AdminError::NotAdmin {}.into());
-
-    // Test the values from instantiate
-    assert_users(&deps, Some(11), Some(6), None, None);
-    // Note all values were set at height, the beginning of that block was all None
-    assert_users(&deps, None, None, None, Some(height));
-    // This will get us the values at the start of the block after instantiate (expected initial values)
-    assert_users(&deps, Some(11), Some(6), None, Some(height + 1));
-
-    // admin updates properly
-    update_members(
-        deps.as_mut(),
-        height + 10,
-        Addr::unchecked(INIT_ADMIN),
-        add,
-        remove,
-    )
-    .unwrap();
-
-    // updated properly
-    assert_users(&deps, None, Some(6), Some(15), None);
-
-    // snapshot still shows old value
-    assert_users(&deps, Some(11), Some(6), None, Some(height + 1));
-}
-
-#[test]
-fn add_old_remove_new_member() {
-    // add will over-write and remove have no effect
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    // add a new one and remove existing one
-    let add = vec![Member {
-        addr: USER1.into(),
-        weight: 4,
-    }];
-    let remove = vec![USER3.into()];
-
-    // admin updates properly
-    let height = mock_env().block.height;
-    update_members(
-        deps.as_mut(),
-        height,
-        Addr::unchecked(INIT_ADMIN),
-        add,
-        remove,
-    )
-    .unwrap();
-    assert_users(&deps, Some(4), Some(6), None, None);
-}
-
-#[test]
-fn add_and_remove_same_member() {
-    // add will over-write and remove have no effect
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    // USER1 is updated and remove in the same call, we should remove this an add member3
-    let add = vec![
-        Member {
-            addr: USER1.into(),
-            weight: 20,
-        },
-        Member {
-            addr: USER3.into(),
-            weight: 5,
-        },
-    ];
-    let remove = vec![USER1.into()];
-
-    // admin updates properly
-    let height = mock_env().block.height;
-    update_members(
-        deps.as_mut(),
-        height,
-        Addr::unchecked(INIT_ADMIN),
-        add,
-        remove,
-    )
-    .unwrap();
-    assert_users(&deps, None, Some(6), Some(5), None);
-}
-
-#[test]
-fn add_remove_hooks() {
-    // add will over-write and remove have no effect
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
-    assert!(hooks.hooks.is_empty());
-
-    let contract1 = String::from("hook1");
-    let contract2 = String::from("hook2");
-
-    let add_msg = ExecuteMsg::AddHook {
-        addr: contract1.clone(),
-    };
-
-    // non-admin cannot add hook
-    let user_info = mock_info(USER1, &[]);
-    let err = execute(
-        deps.as_mut(),
-        mock_env(),
-        user_info.clone(),
-        add_msg.clone(),
-    )
-    .unwrap_err();
-    assert_eq!(err, HookError::Admin(AdminError::NotAdmin {}).into());
-
-    // admin can add it, and it appears in the query
-    let admin_info = mock_info(INIT_ADMIN, &[]);
-    let _ = execute(
-        deps.as_mut(),
-        mock_env(),
-        admin_info.clone(),
-        add_msg.clone(),
-    )
-    .unwrap();
-    let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
-    assert_eq!(hooks.hooks, vec![contract1.clone()]);
-
-    // cannot remove a non-registered contract
-    let remove_msg = ExecuteMsg::RemoveHook {
-        addr: contract2.clone(),
-    };
-    let err = execute(deps.as_mut(), mock_env(), admin_info.clone(), remove_msg).unwrap_err();
-    assert_eq!(err, HookError::HookNotRegistered {}.into());
-
-    // add second contract
-    let add_msg2 = ExecuteMsg::AddHook {
-        addr: contract2.clone(),
-    };
-    let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), add_msg2).unwrap();
-    let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
-    assert_eq!(hooks.hooks, vec![contract1.clone(), contract2.clone()]);
-
-    // cannot re-add an existing contract
-    let err = execute(deps.as_mut(), mock_env(), admin_info.clone(), add_msg).unwrap_err();
-    assert_eq!(err, HookError::HookAlreadyRegistered {}.into());
-
-    // non-admin cannot remove
-    let remove_msg = ExecuteMsg::RemoveHook { addr: contract1 };
-    let err = execute(deps.as_mut(), mock_env(), user_info, remove_msg.clone()).unwrap_err();
-    assert_eq!(err, HookError::Admin(AdminError::NotAdmin {}).into());
-
-    // remove the original
-    let _ = execute(deps.as_mut(), mock_env(), admin_info, remove_msg).unwrap();
-    let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
-    assert_eq!(hooks.hooks, vec![contract2]);
-}
-
-#[test]
-fn hooks_fire() {
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    let hooks = HOOKS.query_hooks(deps.as_ref()).unwrap();
-    assert!(hooks.hooks.is_empty());
-
-    let contract1 = String::from("hook1");
-    let contract2 = String::from("hook2");
-
-    // register 2 hooks
-    let admin_info = mock_info(INIT_ADMIN, &[]);
-    let add_msg = ExecuteMsg::AddHook {
-        addr: contract1.clone(),
-    };
-    let add_msg2 = ExecuteMsg::AddHook {
-        addr: contract2.clone(),
-    };
-    for msg in [add_msg, add_msg2] {
-        let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), msg).unwrap();
-    }
-
-    // make some changes - add 3, remove 2, and update 1
-    // USER1 is updated and remove in the same call, we should remove this an add member3
-    let add = vec![
-        Member {
-            addr: USER1.into(),
-            weight: 20,
-        },
-        Member {
-            addr: USER3.into(),
-            weight: 5,
-        },
-    ];
-    let remove = vec![USER2.into()];
-    let msg = ExecuteMsg::UpdateMembers { remove, add };
-
-    // admin updates properly
-    assert_users(&deps, Some(11), Some(6), None, None);
-    let res = execute(deps.as_mut(), mock_env(), admin_info, msg).unwrap();
-    assert_users(&deps, Some(20), None, Some(5), None);
-
-    // ensure 2 messages for the 2 hooks
-    assert_eq!(res.messages.len(), 2);
-    // same order as in the message (adds first, then remove)
-    // order of added users is not guaranteed to be preserved
-    let diffs = vec![
-        MemberDiff::new(USER3, None, Some(5)),
-        MemberDiff::new(USER1, Some(11), Some(20)),
-        MemberDiff::new(USER2, Some(6), None),
-    ];
-    let hook_msg = MemberChangedHookMsg { diffs };
-    let msg1 = SubMsg::new(hook_msg.clone().into_cosmos_msg(contract1).unwrap());
-    let msg2 = SubMsg::new(hook_msg.into_cosmos_msg(contract2).unwrap());
-    dbg!(&res.messages);
-    dbg!(&msg1);
-    dbg!(&msg2);
-    assert_eq!(res.messages, vec![msg1, msg2]);
-}
-
-#[test]
-fn raw_queries_work() {
-    // add will over-write and remove have no effect
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    // get total from raw key
-    let total_raw = deps.storage.get(TOTAL_KEY.as_bytes()).unwrap();
-    let total: u64 = from_slice(&total_raw).unwrap();
-    assert_eq!(17, total);
-
-    // get member votes from raw key
-    let member2_raw = deps.storage.get(&member_key(USER2)).unwrap();
-    let member2: u64 = from_slice(&member2_raw).unwrap();
-    assert_eq!(6, member2);
-
-    // and execute misses
-    let member3_raw = deps.storage.get(&member_key(USER3));
-    assert_eq!(None, member3_raw);
-}
-
-#[test]
-fn total_at_height() {
-    let mut deps = mock_dependencies();
-    set_up(deps.as_mut());
-
-    let height = mock_env().block.height;
-
-    // Test the values from instantiate
-    let total = query_total_weight(deps.as_ref(), None).unwrap();
-    assert_eq!(17, total.weight);
-    // Note all values were set at height, the beginning of that block was all None
-    let total = query_total_weight(deps.as_ref(), Some(height)).unwrap();
-    assert_eq!(0, total.weight);
-    // This will get us the values at the start of the block after instantiate (expected initial values)
-    let total = query_total_weight(deps.as_ref(), Some(height + 1)).unwrap();
-    assert_eq!(17, total.weight);
-}
@@ -30,12 +30,12 @@ fn names<'a>() -> IndexedMap<'a, NameId, RegisteredName, NameIndex<'a>> {
    let indexes = NameIndex {
        name: UniqueIndex::new(|d| d.name.name.to_string(), NAMES_NAME_IDX_NAMESPACE),
        address: MultiIndex::new(
-            |_pk, d| d.name.address.to_string(),
+            |d| d.name.address.to_string(),
            NAMES_PK_NAMESPACE,
            NAMES_ADDRESS_IDX_NAMESPACE,
        ),
        owner: MultiIndex::new(
-            |_pk, d| d.owner.clone(),
+            |d| d.owner.clone(),
            NAMES_PK_NAMESPACE,
            NAMES_OWNER_IDX_NAMESPACE,
        ),
@@ -26,12 +26,12 @@ impl<'a> IndexList<Service> for ServiceIndex<'a> {
 fn services<'a>() -> IndexedMap<'a, ServiceId, Service, ServiceIndex<'a>> {
    let indexes = ServiceIndex {
        nym_address: MultiIndex::new(
-            |_pk, d| d.service.nym_address.to_string(),
+            |d| d.service.nym_address.to_string(),
            SERVICES_PK_NAMESPACE,
            SERVICES_NYM_ADDRESS_IDX_NAMESPACE,
        ),
        announcer: MultiIndex::new(
-            |_pk, d| d.announcer.clone(),
+            |d| d.announcer.clone(),
            SERVICES_PK_NAMESPACE,
            SERVICES_ANNOUNCER_IDX_NAMESPACE,
        ),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Sinclair	dfee78e6c0	Merge pull request #3425 from nymtech/fix-sdk-examples Fix TS SDK examples and make them independent	2023-07-05 14:53:44 +01:00
Nadim Kobeissi	3515e4e1c3	Fix typo	2023-05-22 13:35:08 +02:00
Nadim Kobeissi	5ec20e5599	Firefox Extension example for Nym TypeScript SDK	2023-05-22 13:30:55 +02:00
Nadim Kobeissi	9f408d4c79	Do not inline WASM for ESM TypeScript SDK This change is necessary for us to be able to use the TypeScript Nym SDK in the context of Firefox extensions. See: https://bugzilla.mozilla.org/show_bug.cgi?id=1294996	2023-05-22 13:30:02 +02:00
Nadim Kobeissi	31233b3b68	New TypeScript SDK example: Google Chrome Example of a simple manifest v3 extension to load a Nym client within a popup view.	2023-05-19 14:28:30 +02:00
Nadim Kobeissi	c4ea887319	Fix favicon path	2023-05-17 15:30:58 +02:00
Nadim Kobeissi	6a69449e43	Update build instructions	2023-05-17 15:30:32 +02:00
Nadim Kobeissi	7aac01cca1	Fix TS SDK examples and make them independent The Nym TypeScript SDK comes with two main examples: - `plain-html` - `react-webpack-with-theme-example` As of time of testing on the latest `develop` branch over at @nymtech/nym, `react-webpack-with-theme-example` was broken because the example was expected to load some of its packages from its own `package.json` and the rest from the repository's root `package.json`, which caused the problems outlined here: https://stackoverflow.com/q/72413194 While addressing this issue, I noticed that the examples were not truly independent from the rest of the repo. While I know that this is a monorepo with mulitple workspaces and understand how that's supposed to work, I think that specifically in the case of example folders, we need to ensure the ability for these folders to work fully independently from the rest of the repository, because example folders are overwhelmingly likely to be copied out of the repo to be expected by curious third parties to work while fully self-contained. Furthermore, this makes resolving the above-mentioned original issue easier. Therefore, in this commit, I did the following for both `plain-html` and `react-webpack-with-theme-example`: - Ensure that their `package.json`s are fully self-sufficient and that no packages would need to be loaded from the repository's root `package.json`. - Ensure that their `tsconfig.json` are equally self-sufficient and do not reference the repository's root `tsconfig.json`. - Ensure that the webpack configuration is present in each example, instead of being snuck into a hidden `.webpack` folder in the `sdk/typescript/examples` folder (this struck me as an ugly hack anyhow). - Ensure that `react-webpack-with-theme-example` has direct access to a small SVG graphic of the Nym logo within its own folder. I think these changes will both render the examples less likely to break as the rest of the monorepo evolves. Freezing dependencies in time is not appropriate for the monorepo, but it is totally appropriate for examples since we don't really care about migrating them to the latest best practices/security fixes for their dependencies as much. Also, these changes will make the example folders more friendly for third-party engineers, since they can just copy out the example folder from the repo and have everything they need to understand how things work within the example folder itself, instead of needing to hunt down other files in the sprawling monorepo.	2023-05-16 15:35:13 +02:00