squash

.github/ISSUE_TEMPLATE/documentation.md

@@ -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
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/report.md

@@ -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
 
 ---

.github/actions/nym-hash-releases/.gitignore

@@ -1,2 +0,0 @@
-.tmp
-hashes.json

.github/actions/nym-hash-releases/action.yml

@@ -1,25 +0,0 @@
-name: 'Nym Hash Release'
-author: 'Nym Technologies SA'
-description: 'Generate hashes and signatures for assets in Nym releases'
-inputs:
-  hash-type:
-    description: 'Type of hash to generate (md5, sha1, sha256, sha512)'
-    required: false
-    default: 'sha256'
-  file-name:
-    description: 'File name to save as if desired'
-    required: false
-    default: 'hashes.json'
-  release-tag-or-name-or-id:
-    description: 'The tag/release to process. Uses the release id when trigger from a release.'
-    required: false
-    default: ''
-outputs:
-  hashes:
-    description: 'A string containing JSON with the release asset hashes and signatures'
-runs:
-  using: 'node16'
-  main: 'index.js'
-branding:
-  icon: 'hash'
-  color: 'green'

.github/actions/nym-hash-releases/create-hashes.mjs

@@ -1,259 +0,0 @@
-import hasha from "hasha";
-import fetch from "node-fetch";
-import { Octokit } from "@octokit/rest";
-import fs from "fs";
-import path from "path";
-
-async function run(assets, algorithm, filename, cache) {
-    try {
-        fs.mkdirSync('.tmp');
-    } catch(e) {
-        // ignore
-    }
-
-    const hashes = {};
-    let numAwaiting = 0;
-    for (const asset of assets) {
-        if (filename === "" || asset.name !== filename) { // don't hash the hash file (if the file has the same name)
-            numAwaiting++;
-
-            let buffer = null;
-            let sig = null;
-            if(cache) {
-                // cache in `${WORKING_DIR}/.tmp/`
-                const cacheFilename = path.resolve(`.tmp/${asset.name}`);
-                if(!fs.existsSync(cacheFilename)) {
-                    console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
-                    buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
-                    fs.writeFileSync(cacheFilename, buffer);
-                } else {
-                    console.log(`Loading from ${cacheFilename}`);
-                    buffer = Buffer.from(fs.readFileSync(cacheFilename));
-
-                    // console.log('Reading signature from content');
-                    // if(asset.name.endsWith('.sig')) {
-                    //     sig = fs.readFileSync(cacheFilename).toString();
-                    // }
-                }
-            } else {
-                // fetch always
-                buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
-            }
-            if(!hashes[asset.name]) {
-                hashes[asset.name] = {};
-            }
-
-            if(asset.name.endsWith('.sig')) {
-                sig = buffer.toString();
-            }
-
-            hashes[asset.name][algorithm] = hasha(new Uint8Array(buffer), {algorithm: algorithm});
-
-            let platform;
-            let kind;
-            if(asset.name.endsWith('.sig')) {
-                kind = 'signature';
-            }
-            if(asset.name.endsWith('.app.tar.gz')) {
-                platform = 'MacOS';
-                kind = 'auto-updater';
-            }
-            if(asset.name.endsWith('.app.tar.gz.sig')) {
-                platform = 'MacOS';
-                kind = 'auto-updater-signature';
-            }
-            if(asset.name.endsWith('.dmg')) {
-                platform = 'MacOS';
-                kind = 'installer';
-            }
-            if(asset.name.endsWith('.msi.zip')) {
-                platform = 'Windows';
-                kind = 'auto-updater';
-            }
-            if(asset.name.endsWith('.msi.zip.sig')) {
-                platform = 'Windows';
-                kind = 'auto-updater-signature';
-            }
-            if(asset.name.endsWith('.msi')) {
-                platform = 'Windows';
-                kind = 'installer';
-            }
-            if(asset.name.endsWith('.AppImage.tar.gz')) {
-                platform = 'Linux';
-                kind = 'auto-updater';
-            }
-            if(asset.name.endsWith('.AppImage.tar.gz.sig')) {
-                platform = 'Linux';
-                kind = 'auto-updater-signature';
-            }
-            if(asset.name.endsWith('.AppImage')) {
-                platform = 'Linux';
-                kind = 'installer';
-            }
-
-            hashes[asset.name].downloadUrl = asset.browser_download_url;
-
-            if(platform) {
-                hashes[asset.name].platform = platform;
-            }
-            if(kind) {
-                hashes[asset.name].kind = kind;
-            }
-
-            // process Tauri signature files
-            if(asset.name.endsWith('.sig')) {
-                const otherFilename = asset.name.replace('.sig', '');
-                if(!hashes[otherFilename]) {
-                    hashes[otherFilename] = {};
-                }
-                hashes[otherFilename].signature = sig;
-            }
-        }
-    }
-    return hashes;
-}
-
-export async function createHashes({ assets, algorithm, filename, cache }) {
-    const output = await run(assets, algorithm, filename, cache);
-    if(filename?.length) {
-        fs.writeFileSync(filename, JSON.stringify(output, null, 2));
-    }
-    return output;
-}
-
-export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algorithm = 'sha256', filename = 'hashes.json', cache = false, upload = true }) {
-    console.log("🚀🚀🚀 Getting releases");
-
-    let auth;
-    let authStrategy;
-    if(process.env.GITHUB_TOKEN) {
-        console.log('Using GITHUB_TOKEN for auth');
-        // authStrategy = createActionAuth();
-        // auth = await authStrategy();
-    }
-
-    const octokit = new Octokit({
-        auth: process.env.GITHUB_TOKEN,
-        request: { fetch }
-    });
-    const owner = "nymtech";
-    const repo = "nym";
-
-    let releases;
-    if(cache) {
-        const cacheFilename = path.resolve(`.tmp/releases.json`);
-        if(!fs.existsSync(cacheFilename)) {
-            releases = await octokit.paginate(
-                octokit.rest.repos.listReleases,
-                {
-                    owner,
-                    repo,
-                    per_page: 100,
-                },
-                (response) => response.data
-            );
-            fs.writeFileSync(cacheFilename, JSON.stringify(releases, null, 2));
-        } else {
-            console.log('Loading releases from cache...');
-            releases = JSON.parse(fs.readFileSync(cacheFilename));
-        }
-    } else {
-        releases = await octokit.paginate(
-            octokit.rest.repos.listReleases,
-            {
-                owner,
-                repo,
-                per_page: 100,
-            },
-            (response) => response.data
-        )
-    }
-
-    // process all releases by default
-    let releasesToProcess = releases;
-
-    // process a single release
-    if(releaseTagOrNameOrId) {
-        releasesToProcess = releases.filter(r => {
-            if (r.tag_name === releaseTagOrNameOrId) {
-                return true;
-            }
-            if (`${r.id}` === `${releaseTagOrNameOrId}`) {
-                return true;
-            }
-            if (r.name === releaseTagOrNameOrId) {
-                return true;
-            }
-
-            return false;
-        });
-    }
-
-    releasesToProcess.forEach(release => {
-        const {tag_name, name} = release;
-        const tagComponents = tag_name.split('-v');
-        const componentName = tagComponents[0];
-        const componentVersion = 'v' + tagComponents[1];
-
-        if(!tagComponents[1] || !name) {
-            return;
-        }
-
-        release.componentName = componentName;
-        release.componentVersion = componentVersion;
-    })
-
-    releasesToProcess = releasesToProcess.filter(release =>
-        !!release.name && !!release.componentVersion
-    );
-
-    console.log('Releases to process:');
-    console.table(releasesToProcess.map(r => {
-        const { id, name, tag_name, componentName, componentVersion, assets } = r;
-        return { id, name, tag_name, componentName, componentVersion, assetCount: assets.length };
-    }));
-
-   for(const release of releasesToProcess) {
-        const {id, name, tag_name, html_url, componentName, componentVersion} = release;
-
-        const hashes = await createHashes({ assets: release.assets, algorithm, filename, cache });
-
-        const output = {
-            id, name, tag_name, html_url,
-            componentName,
-            componentVersion,
-            assets: hashes,
-        };
-
-        if(upload) {
-            console.log(`🚚 Uploading ${filename} to release name="${release.name}" id=${release.id} (${release.upload_url})...`);
-
-            const exists = (await octokit.repos.listReleaseAssets({ owner, repo, release_id: release.id })).data.find(a => a.name === filename)
-            if (exists) {
-                console.log(`Deleting existing asset ${filename}...`);
-                await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: exists.id })
-                console.log('Deleted existing asset');
-            }
-
-            try {
-                const data = JSON.stringify(output, null, 2);
-                await octokit.rest.repos.uploadReleaseAsset({
-                    owner,
-                    repo,
-                    release_id: release.id,
-                    headers: {
-                        'X-GitHub-Api-Version': '2022-11-28'
-                    },
-                    name: filename,
-                    data,
-                });
-                console.log('✅ Upload to release is complete.');
-            } catch(e) {
-                console.log('❌ failed to upload:', e.message, e.status, e.response.data);
-                console.log(e);
-                process.exit(-1);
-            }
-        }
-   }
-}
-

.github/actions/nym-hash-releases/index.js

@@ -1,15 +0,0 @@
-import core from "@actions/core";
-import github from "@actions/github";
-import { createHashesFromReleaseTagOrNameOrId } from './create-hashes.mjs';
-
-const algorithm = core.getInput('hash-type');
-const filename = core.getInput("file-name");
-
-// use the release id from the payload if it is set
-const releaseTagOrNameOrId = core.getInput("release-tag-or-name-or-id") || github.context.payload.release?.id;
-
-try {
-    await createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algorithm, filename  })
-} catch (error) {
-    core.setFailed(error.message);
-}

.github/actions/nym-hash-releases/package-lock.json

@@ -1,536 +0,0 @@
-{
-  "name": "ghaction-generate-release-hashes",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "ghaction-generate-release-hashes",
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/core": "^1.10.0",
-        "@actions/github": "^5.1.1",
-        "@octokit/auth-action": "^4.0.0",
-        "@octokit/rest": "^20.0.1",
-        "hasha": "^5.2.0",
-        "node-fetch": "^3.2.10"
-      }
-    },
-    "node_modules/@actions/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
-    },
-    "node_modules/@actions/github": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "@octokit/core": "^3.6.0",
-        "@octokit/plugin-paginate-rest": "^2.17.0",
-        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
-      }
-    },
-    "node_modules/@actions/http-client": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
-      "integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
-      "dependencies": {
-        "tunnel": "^0.0.6"
-      }
-    },
-    "node_modules/@octokit/auth-action": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-action/-/auth-action-4.0.0.tgz",
-      "integrity": "sha512-sMm9lWZdiX6e89YFaLrgE9EFs94k58BwIkvjOtozNWUqyTmsrnWFr/M5LolaRzZ7Kmb5FbhF9hi7FEeE274SoQ==",
-      "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/types": "^11.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/auth-action/node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/auth-action/node_modules/@octokit/openapi-types": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
-    },
-    "node_modules/@octokit/auth-action/node_modules/@octokit/types": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
-      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
-      "dependencies": {
-        "@octokit/openapi-types": "^18.0.0"
-      }
-    },
-    "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-      "dependencies": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-      "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
-      "dependencies": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/openapi-types": {
-      "version": "12.11.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.21.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
-      "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
-      "dependencies": {
-        "@octokit/types": "^6.40.0"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=2"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.16.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
-      "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
-      "dependencies": {
-        "@octokit/types": "^6.39.0",
-        "deprecation": "^2.3.1"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=3"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@octokit/rest": {
-      "version": "20.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.0.1.tgz",
-      "integrity": "sha512-wROV21RwHQIMNb2Dgd4+pY+dVy1Dwmp85pBrgr6YRRDYRBu9Gb+D73f4Bl2EukZSj5hInq2Tui9o7gAQpc2k2Q==",
-      "dependencies": {
-        "@octokit/core": "^5.0.0",
-        "@octokit/plugin-paginate-rest": "^8.0.0",
-        "@octokit/plugin-request-log": "^4.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^9.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/core": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.0.tgz",
-      "integrity": "sha512-YbAtMWIrbZ9FCXbLwT9wWB8TyLjq9mxpKdgB3dUNxQcIVTf9hJ70gRPwAcqGZdY6WdJPZ0I7jLaaNDCiloGN2A==",
-      "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/graphql": "^7.0.0",
-        "@octokit/request": "^8.0.2",
-        "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.0.0",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/endpoint": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.0.tgz",
-      "integrity": "sha512-szrQhiqJ88gghWY2Htt8MqUDO6++E/EIXqJ2ZEp5ma3uGS46o7LZAzSLt49myB7rT+Hfw5Y6gO3LmOxGzHijAQ==",
-      "dependencies": {
-        "@octokit/types": "^11.0.0",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/graphql": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.1.tgz",
-      "integrity": "sha512-T5S3oZ1JOE58gom6MIcrgwZXzTaxRnxBso58xhozxHpOqSTgDS6YNeEUvZ/kRvXgPrRz/KHnZhtb7jUMRi9E6w==",
-      "dependencies": {
-        "@octokit/request": "^8.0.1",
-        "@octokit/types": "^11.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/openapi-types": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-8.0.0.tgz",
-      "integrity": "sha512-2xZ+baZWUg+qudVXnnvXz7qfrTmDeYPCzangBVq/1gXxii/OiS//4shJp9dnCCvj1x+JAm9ji1Egwm1BA47lPQ==",
-      "dependencies": {
-        "@octokit/types": "^11.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=5"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/plugin-request-log": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.0.tgz",
-      "integrity": "sha512-2uJI1COtYCq8Z4yNSnM231TgH50bRkheQ9+aH8TnZanB6QilOnx8RMD2qsnamSOXtDj0ilxvevf5fGsBhBBzKA==",
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=5"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-9.0.0.tgz",
-      "integrity": "sha512-KquMF/VB1IkKNiVnzJKspY5mFgGyLd7HzdJfVEGTJFzqu9BRFNWt+nwTCMuUiWc72gLQhRWYubTwOkQj+w/1PA==",
-      "dependencies": {
-        "@octokit/types": "^11.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=5"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/request": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.1.tgz",
-      "integrity": "sha512-8N+tdUz4aCqQmXl8FpHYfKG9GelDFd7XGVzyN8rc6WxVlYcfpHECnuRkgquzz+WzvHTK62co5di8gSXnzASZPQ==",
-      "dependencies": {
-        "@octokit/endpoint": "^9.0.0",
-        "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.1.0",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/request-error": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.0.0.tgz",
-      "integrity": "sha512-1ue0DH0Lif5iEqT52+Rf/hf0RmGO9NWFjrzmrkArpG9trFfDM/efx00BJHdLGuro4BR/gECxCU2Twf5OKrRFsQ==",
-      "dependencies": {
-        "@octokit/types": "^11.0.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest/node_modules/@octokit/types": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
-      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
-      "dependencies": {
-        "@octokit/openapi-types": "^18.0.0"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "6.41.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
-      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
-      "dependencies": {
-        "@octokit/openapi-types": "^12.11.0"
-      }
-    },
-    "node_modules/before-after-hook": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
-    },
-    "node_modules/data-uri-to-buffer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-    },
-    "node_modules/fetch-blob": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "dependencies": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
-      },
-      "engines": {
-        "node": "^12.20 || >= 14.13"
-      }
-    },
-    "node_modules/formdata-polyfill": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "dependencies": {
-        "fetch-blob": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=12.20.0"
-      }
-    },
-    "node_modules/hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dependencies": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-      "dependencies": {
-        "data-uri-to-buffer": "^4.0.0",
-        "fetch-blob": "^3.1.4",
-        "formdata-polyfill": "^4.0.10"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-fetch"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    }
-  }
-}

.github/actions/nym-hash-releases/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "nym-hash-release",
-  "version": "1.0.0",
-  "description": "Generate hashes and signatures for assets in Nym releases",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "local": "node run-local.mjs"
-  },
-  "dependencies": {
-    "@actions/core": "^1.10.0",
-    "@actions/github": "^5.1.1",
-    "@octokit/auth-action": "^4.0.0",
-    "@octokit/rest": "^20.0.1",
-    "hasha": "^5.2.0",
-    "node-fetch": "^3.2.10"
-  }
-}

.github/actions/nym-hash-releases/run-local.mjs

@@ -1,6 +0,0 @@
-import {createHashesFromReleaseTagOrNameOrId} from './create-hashes.mjs';
-
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 119065724, cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: '119065724', cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-connect-v1.1.19-snickers', cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'Nym Connect v1.1.19-snickers', cache: true, upload: false});

.github/workflows/audit.yml

@@ -38,7 +38,7 @@ jobs:
       - name: install npm
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
       - name: Matrix - Node Install
         run: npm install
         working-directory: .github/workflows/support-files

.github/workflows/build-and-upload-binaries-ci.yml

@@ -57,7 +57,7 @@ jobs:
           echo $OUTPUT_DIR
 
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
 
       - name: Install Rust stable
@@ -98,6 +98,7 @@ jobs:
           cp target/release/nym-network-requester $OUTPUT_DIR
           cp target/release/nym-network-statistics $OUTPUT_DIR
           cp target/release/nym-cli $OUTPUT_DIR
+          cp target/release/nym-credential-client $OUTPUT_DIR
           cp target/release/explorer-api $OUTPUT_DIR
           
           cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR
@@ -108,7 +109,6 @@ jobs:
           cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
           cp contracts/target/wasm32-unknown-unknown/release/nym_service_provider_directory.wasm $OUTPUT_DIR
           cp contracts/target/wasm32-unknown-unknown/release/nym_name_service.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_ephemera.wasm $OUTPUT_DIR
 
       - name: Deploy branch to CI www
         continue-on-error: true

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

@@ -16,7 +16,7 @@ jobs:
     - uses: rlespinasse/github-slug-action@v3.x
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 16
     - name: Setup yarn
       run: npm install -g yarn
     - name: Build

.github/workflows/build.yml

@@ -6,7 +6,6 @@ on:
       - 'clients/**'
       - 'common/**'
       - 'explorer-api/**'
-      - 'ephemera/**'
       - 'gateway/**'
       - 'integrations/**'
       - 'mixnode/**'
@@ -16,7 +15,6 @@ on:
       - 'nym-api/**'
       - 'nym-outfox/**'
       - 'tools/nym-cli/**'
-      - 'tools/nym-nr-query/**'
       - 'tools/ts-rs-cli/**'
       - 'Cargo.toml'
   pull_request:
@@ -24,7 +22,6 @@ on:
       - 'clients/**'
       - 'common/**'
       - 'explorer-api/**'
-      - 'ephemera/**'
       - 'gateway/**'
       - 'integrations/**'
       - 'mixnode/**'
@@ -34,7 +31,6 @@ on:
       - 'nym-api/**'
       - 'nym-outfox/**'
       - 'tools/nym-cli/**'
-      - 'tools/nym-nr-query/**'
       - 'tools/ts-rs-cli/**'
       - 'Cargo.toml'
 
@@ -46,7 +42,7 @@ jobs:
       RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
     steps:
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
 
       - name: Check out repository code

.github/workflows/cd-dev.yml

@@ -0,0 +1,76 @@
+name: CD dev-portal
+
+on:
+  push:
+    branches: master
+    paths:
+      - 'documentation/dev-portal/**'
+
+jobs:
+  build:
+    runs-on: custom-runner-linux
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install rsync
+        run: sudo apt-get install rsync
+      - uses: rlespinasse/github-slug-action@v3.x
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install mdbook
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4" mdbook)
+      - name: Install mdbook plugins
+        run: |
+          cargo install --vers "^0.2.0" mdbook-variables && cargo install \
+            --vers "^1.8.0" mdbook-admonish && cargo install --vers \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" \
+            mdbook-theme && cargo install --vers "^0.7.7" mdbook-linkcheck
+      - name: Clean website
+        run: cd documentation/dev-portal && mdbook clean
+      - name: Build website
+        run: cd documentation/dev-portal && mdbook build
+      - name: Deploy branch master to dev
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "documentation/dev-portal/book/html/"
+          REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_DEV }}
+          REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET_DEVP }}/
+          EXCLUDE: "/dist/, /node_modules/"
+      - name: Deploy branch master to prod
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "documentation/dev-portal/book/html/"
+          REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_PROD }}
+          REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET_DEVP }}/
+          EXCLUDE: "/dist/, /node_modules/"
+      - name: Matrix - Node Install
+        run: npm install
+        working-directory: .github/workflows/support-files
+      - name: Matrix - Send Notification
+        env:
+          NYM_NOTIFICATION_KIND: cd-dev
+          NYM_PROJECT_NAME: "Dev portal CD"
+          NYM_CI_WWW_BASE: "${{ secrets.NYM_CD_WWW_BASE }}"
+          NYM_CI_WWW_LOCATION: "${{ env.GITHUB_REF_SLUG }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+          GIT_BRANCH: "${GITHUB_REF##*/}"
+          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM_DEVP }}"
+          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+          IS_SUCCESS: "${{ job.status == 'success' }}"
+        uses: docker://keybaseio/client:stable-node
+        with:
+          args: .github/workflows/support-files/notifications/entry_point.sh

.github/workflows/cd-docs.yml

@@ -1,7 +1,6 @@
 name: CD docs
 
 on:
-  workflow_dispatch:
   push:
     branches: master
     paths:
@@ -17,7 +16,7 @@ jobs:
       - uses: rlespinasse/github-slug-action@v3.x
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: "16"
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -28,78 +27,39 @@ jobs:
           command: build
           args: --workspace --release --all
       - name: Install mdbook
-        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4" mdbook)
       - name: Install mdbook plugins
         run: |
-          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
+          cargo install --vers "^0.2.0" mdbook-variables && cargo install \
             --vers "^1.8.0" mdbook-admonish && cargo install --vers \
-            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" \
-            && cargo install --vers "^0.7.7" mdbook-linkcheck
+            mdbook-theme && cargo install --vers "^0.7.7" mdbook-linkcheck && \
-      - name: Build all projects in documentation/ & move to ~/dist/docs/
+            cargo install --vers "^0.5.0" mdbook-cmdrun
-        run: cd documentation && ./build_all_to_dist.sh
+      - name: Clean website
-        continue-on-error: false
+        run: cd documentation/docs && mdbook clean
-
+      - name: Build website
+        run: cd documentation/docs && mdbook build
       - name: Deploy branch master to dev
         continue-on-error: true
         uses: easingthemes/ssh-deploy@main
         env:
           SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
           ARGS: "-rltgoDzvO --delete"
-          SOURCE: "dist/docs/"
+          SOURCE: "documentation/docs/book/"
           REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_DEV }}
           REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
           TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
-          EXCLUDE: "/node_modules/"
+          EXCLUDE: "/dist/, /node_modules/"
-
       - name: Deploy branch master to prod
-        if: github.ref == 'refs/heads/master'
         uses: easingthemes/ssh-deploy@main
         env:
           SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
           ARGS: "-rltgoDzvO --delete"
-          SOURCE: "dist/docs/"
+          SOURCE: "documentation/docs/book/"
           REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_PROD }}
           REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
           TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
-          EXCLUDE: "/node_modules/"
+          EXCLUDE: "/dist/, /node_modules/"
-
-      - name: Post process
-        run: cd documentation && ./post_process.sh
-        continue-on-error: false
-
-      - name: Create Vercel project file
-        uses: mobiledevops/secret-to-file-action@v1
-        with:
-          base64-encoded-secret: ${{ secrets.VERCEL_PROJECT_JSON_BASE64 }}
-          filename: "project.json"
-          is-executable: true
-          working-directory: "./dist/docs/.vercel"
-
-      - name: Install Vercel CLI
-        run: npm install --global vercel@latest
-
-      - name: Pull Vercel Environment Information (preview)
-        if: github.ref != 'refs/heads/master'
-        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: dist/docs
-      - name: Pull Vercel Environment Information (production)
-        if: github.ref == 'refs/heads/master'
-        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: dist/docs
-
-      - name: Build Project Artifacts
-        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: dist/docs
-
-      - name: Deploy Project Artifacts to Vercel (preview)
-        if: github.ref != 'refs/heads/master'
-        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: dist/docs
-      - name: Deploy Project Artifacts to Vercel (master)
-        if: github.ref == 'refs/heads/master'
-        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: dist/docs
-
       - name: Matrix - Node Install
         run: npm install
         working-directory: .github/workflows/support-files

.github/workflows/check-contract-schema.yml

@@ -1,31 +0,0 @@
-name: Check Contract Schema
-
-on:
-  push:
-    paths:
-      - 'contracts/**'
-      - 'common/**'
-  pull_request:
-    paths:
-      - 'contracts/**'
-      - 'common/**'
-
-jobs:
-  check-schema:
-    name: Generate and check schema
-    runs-on: custom-runner-linux
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-
-      - name: Generate the schema
-        run: make contract-schema
-
-      - name: Check for diff
-        run: git diff --exit-code -- contracts/*/schema

.github/workflows/ci-dev.yml

@@ -0,0 +1,66 @@
+name: CI dev-portal
+
+on:
+  push:
+    branches-ignore: master
+    paths:
+      - 'documentation/dev-portal/**'
+
+jobs:
+  build:
+    runs-on: custom-runner-linux
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install rsync
+        run: sudo apt-get install rsync
+      - uses: rlespinasse/github-slug-action@v3.x
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install mdbook
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4" mdbook)
+      - name: Install mdbook plugins
+        run: |
+          cargo install --vers "^0.2.0" mdbook-variables && cargo install \
+            --vers "^1.8.0" mdbook-admonish && cargo install --vers \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
+            && cargo install --vers "^0.7.7" mdbook-linkcheck 
+      - name: Clean website
+        run: cd documentation/dev-portal && mdbook clean
+      - name: Build website
+        run: cd documentation/dev-portal && mdbook build
+      - name: Deploy branch to CI www
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "documentation/dev-portal/book/html/"
+          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/dev-portal-${{ env.GITHUB_REF_SLUG }}
+          EXCLUDE: "/dist/, /node_modules/"
+      - name: Matrix - Node Install
+        run: npm install
+        working-directory: .github/workflows/support-files
+      - name: Matrix - Send Notification
+        env:
+          NYM_NOTIFICATION_KIND: ci-dev
+          NYM_PROJECT_NAME: "Dev portal CI"
+          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+          NYM_CI_WWW_LOCATION: "dev-portal-${{ env.GITHUB_REF_SLUG }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+          GIT_BRANCH: "${GITHUB_REF##*/}"
+          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM_DEVP }}"
+          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+          IS_SUCCESS: "${{ job.status == 'success' }}"
+        uses: docker://keybaseio/client:stable-node
+        with:
+          args: .github/workflows/support-files/notifications/entry_point.sh

.github/workflows/ci-docs.yml

@@ -1,7 +1,6 @@
 name: CI docs
 
 on:
-  workflow_dispatch:
   push:
     branches-ignore: master
     paths:
@@ -17,7 +16,7 @@ jobs:
       - uses: rlespinasse/github-slug-action@v3.x
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: "16"
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -28,27 +27,29 @@ jobs:
           command: build
           args: --workspace --release --all
       - name: Install mdbook
-        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4" mdbook)
       - name: Install mdbook plugins
         run: |
-          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
+          cargo install --vers "^0.2.0" mdbook-variables && cargo install \
             --vers "^1.8.0" mdbook-admonish && cargo install --vers \
-            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
+            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" \
-            && cargo install --vers "^0.7.7" mdbook-linkcheck
+            mdbook-theme && cargo install --vers "^0.7.7" mdbook-linkcheck && \
-      - name: Build all projects in documentation/ & move to ~/dist/docs/
+            cargo install --vers "^0.5.0" mdbook-cmdrun
-        run: cd documentation && ./build_all_to_dist.sh
+      - name: Clean website
-        continue-on-error: false
+        run: cd documentation/docs && mdbook clean
+      - name: Build website
+        run: cd documentation/docs && mdbook build
       - name: Deploy branch to CI www
         continue-on-error: true
         uses: easingthemes/ssh-deploy@main
         env:
           SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
           ARGS: "-rltgoDzvO --delete"
-          SOURCE: "dist/docs/"
+          SOURCE: "documentation/docs/book/"
           REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
           REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
           TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/docs-${{ env.GITHUB_REF_SLUG }}
-          EXCLUDE: "/node_modules/"
+          EXCLUDE: "/dist/, /node_modules/"
       - name: Matrix - Node Install
         run: npm install
         working-directory: .github/workflows/support-files

.github/workflows/connect-desktop-ci.yml

@@ -20,22 +20,11 @@ jobs:
     - uses: rlespinasse/github-slug-action@v3.x
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 16
     - name: Install Yarn
       run: npm install -g yarn
-    - name: Install Rust stable
+    - run: yarn
-      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
       continue-on-error: true
-      
     - name: Set environment from the example
       run: cp .env.sample .env
     - run: yarn storybook:build

.github/workflows/connect-mobile.yml

@@ -0,0 +1,72 @@
+name: Nym Connect - mobile (Rust)
+
+on:
+  push:
+    paths:
+      - "nym-connect/mobile/src-tauri/**"
+      - "nym-connect/mobile/src-tauri/Cargo.toml"
+      - "!nym-connect/mobile/src-tauri/gen/**"
+      - "clients/client-core/**"
+      - "clients/socks5/**"
+      - "common/**"
+      - "gateway/gateway-requests/**"
+      - "contracts/vesting/**"
+      - "nym-api/nym-api-requests/**"
+  pull_request:
+    paths:
+      - "nym-connect/mobile/src-tauri/**"
+      - "nym-connect/mobile/src-tauri/Cargo.toml"
+      - "!nym-connect/mobile/src-tauri/gen/**"
+      - "clients/client-core/**"
+      - "clients/socks5/**"
+      - "common/**"
+      - "gateway/gateway-requests/**"
+      - "contracts/vesting/**"
+      - "nym-api/nym-api-requests/**"
+
+jobs:
+  build:
+    #runs-on: [self-hosted, custom-linux]
+    runs-on: ubuntu-22.04
+    #env:
+      #RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
+    #defaults:
+      #run:
+        #working-directory: nym-connect/mobile/src-tauri/
+    steps:
+      - name: Install Dependencies (Linux)
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install \
+          libwebkit2gtk-4.1-dev \
+          build-essential \
+          curl \
+          wget \
+          libssl-dev \
+          libgtk-3-dev \
+          squashfs-tools \
+          libayatana-appindicator3-dev \
+          librsvg2-dev \
+          libsoup-3.0-dev \
+          libjavascriptcoregtk-4.1-dev
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy, rustfmt
+
+      - name: Check formatting
+        run: cargo fmt --manifest-path nym-connect/mobile/src-tauri/Cargo.toml -- --check
+
+      - name: Build all binaries
+        run: cargo build --manifest-path nym-connect/mobile/src-tauri/Cargo.toml
+
+      - name: Run all tests
+        run: cargo test  --manifest-path nym-connect/mobile/src-tauri/Cargo.toml
+
+      - name: Clippy
+        run: cargo clippy --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all-targets -- -D warnings

.github/workflows/contracts-build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.69.0
+          toolchain: stable
           target: wasm32-unknown-unknown
           override: true
           components: rustfmt, clippy

.github/workflows/contracts.yml

@@ -48,12 +48,12 @@ jobs:
           RUSTFLAGS: '-C link-arg=-s'
         with:
           command: build
-          args: --manifest-path contracts/Cargo.toml --workspace --lib --target wasm32-unknown-unknown
+          args: --manifest-path contracts/Cargo.toml --workspace --target wasm32-unknown-unknown
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --lib --manifest-path contracts/Cargo.toml
+          args: --manifest-path contracts/Cargo.toml
 
       - uses: actions-rs/cargo@v1
         with:
@@ -64,4 +64,4 @@ jobs:
         if: ${{ matrix.rust != 'nightly' }}
         with:
           command: clippy
-          args: --lib --manifest-path contracts/Cargo.toml --workspace --all-targets -- -D warnings
+          args: --manifest-path contracts/Cargo.toml --workspace --all-targets -- -D warnings

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

@@ -0,0 +1,24 @@
+name: Linting for Network Explorer (eslint/prettier)
+
+on:
+  pull_request:
+    paths:
+      - 'explorer/**'
+
+defaults:
+  run:
+    working-directory: explorer
+
+jobs:
+  build:
+    runs-on: custom-runner-linux
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Setup yarn
+        run: npm install -g yarn
+      - name: Run ESLint
+        # GitHub should automatically annotate the PR
+        run: yarn && yarn lint

.github/workflows/network-explorer.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: rlespinasse/github-slug-action@v3.x
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 16
     - name: Setup yarn
       run: npm install -g yarn
       continue-on-error: true

.github/workflows/nightly_build.yml

@@ -24,7 +24,7 @@ jobs:
     continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable' }}
     steps:
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
         if: matrix.os == 'ubuntu-20.04'
 
@@ -152,7 +152,7 @@ jobs:
         uses: actions/setup-node@v3
         if: env.WORKFLOW_CONCLUSION == 'failure'
         with:
-          node-version: 18
+          node-version: 16
       - name: Matrix - Node Install
         if: env.WORKFLOW_CONCLUSION == 'failure'
         run: npm install

.github/workflows/nightly_build_release.yml

@@ -37,7 +37,7 @@ jobs:
     continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable' }}
     steps:
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
         if: matrix.os == 'ubuntu-20.04'
 
@@ -167,7 +167,7 @@ jobs:
         uses: actions/setup-node@v3
         if: env.WORKFLOW_CONCLUSION == 'failure'
         with:
-          node-version: 18
+          node-version: 16
       - name: Matrix - Node Install
         if: env.WORKFLOW_CONCLUSION == 'failure'
         run: npm install

.github/workflows/nightly_build_release2.yml

@@ -167,7 +167,7 @@ jobs:
         uses: actions/setup-node@v3
         if: env.WORKFLOW_CONCLUSION == 'failure'
         with:
-          node-version: 18
+          node-version: 16
       - name: Matrix - Node Install
         if: env.WORKFLOW_CONCLUSION == 'failure'
         run: npm install

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

@@ -15,36 +15,19 @@ jobs:
       fail-fast: false
       matrix:
         platform: [macos-latest]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - uses: actions/checkout@v2
 
-      - name: Node
+      - name: Node v16
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
-
       - 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 +51,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 +67,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
@@ -104,19 +81,10 @@ jobs:
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
 
-      - id: create-release
+      - name: Upload to release based on tag name
-        name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
           files: |
             nym-connect/desktop/target/release/bundle/dmg/*.dmg
             nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -15,15 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         platform: [custom-runner-linux]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - uses: actions/checkout@v2
 
@@ -33,25 +26,19 @@ 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
+          node-version: 16
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
       - name: Install app dependencies
         run: yarn
-
       - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
         with:
           fileName: '.env'
           encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -61,29 +48,18 @@ 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
+      - name: Upload to release based on tag name
-        name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
           files: |
             nym-connect/desktop/target/release/bundle/appimage/*.AppImage
             nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

.github/workflows/nym-connect-publish-windows10.yml

@@ -15,15 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows10]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - name: Clean up first
         continue-on-error: true
@@ -46,10 +39,10 @@ jobs:
           Remove-Item -path certificate -include tempCert.txt
           Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
 
-      - name: Node
+      - name: Node v16
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
@@ -57,21 +50,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,30 +66,19 @@ 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
+      - name: Upload to release based on tag name
-        name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
           files: |
             nym-connect/desktop/target/release/bundle/msi/*.msi
             nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -2,17 +2,17 @@ name: Publish Nym binaries
 
 on:
   workflow_dispatch:
-    inputs:
+    inputs:  
       add_tokio_unstable:
         description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
         required: true
         default: false
-        type: boolean
+        type: boolean 
   release:
     types: [created]
-
+    
 env:
-  NETWORK: mainnet
+  NETWORK: mainnet    
 
 jobs:
   publish-nym:
@@ -21,33 +21,15 @@ jobs:
       fail-fast: false
       matrix:
         platform: [custom-runner-linux]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
-      client_hash: ${{ steps.binary-hashes.outputs.client_hash }}
-      mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
-      gateway_hash: ${{ steps.binary-hashes.outputs.gateway_hash }}
-      socks5_hash: ${{ steps.binary-hashes.outputs.socks5_hash }}
-      netreq_hash: ${{ steps.binary-hashes.outputs.netreq_hash }}
-      cli_hash: ${{ steps.binary-hashes.outputs.cli_hash }}
-      netstat_hash: ${{ steps.binary-hashes.outputs.netstat_hash }}
-      client_version: ${{ steps.binary-versions.outputs.client_version }}
-      mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
-      gateway_version: ${{ steps.binary-versions.outputs.gateway_version }}
-      socks5_version: ${{ steps.binary-versions.outputs.socks5_version }}
-      netreq_version: ${{ steps.binary-versions.outputs.netreq_version }}
-      cli_version: ${{ steps.binary-versions.outputs.cli_version }}
-      netstat_version: ${{ steps.binary-versions.outputs.netstat_version }}
-
     steps:
       - uses: actions/checkout@v3
 
       - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install ripgrep libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
-
+            
       - name: Sets env vars for tokio if set in manual dispatch inputs
         run: |
           echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
@@ -80,8 +62,7 @@ jobs:
             target/release/nym-cli
           retention-days: 30
 
-      - id: create-release
+      - name: Upload to release based on tag name
-        name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
@@ -95,11 +76,3 @@ jobs:
             target/release/nym-network-requester
             target/release/nym-network-statistics
             target/release/nym-cli
-
-  push-release-data-client:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-nym
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -15,22 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         platform: [macos-latest]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - uses: actions/checkout@v2
 
-      - name: Node
+      - name: Node v16
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -58,15 +51,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 }}
@@ -91,19 +80,11 @@ jobs:
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-      - id: create-release
+
-        name: Upload to release based on tag name
+      - name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
           files: |
             nym-wallet/target/release/bundle/dmg/*.dmg
             nym-wallet/target/release/bundle/macos/*.app.tar.gz*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -1,6 +1,5 @@
 name: Publish Nym Wallet (Ubuntu)
 on:
-  workflow_dispatch:
   release:
     types: [created]
 
@@ -15,15 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         platform: [custom-runner-linux]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - uses: actions/checkout@v2
 
@@ -33,24 +25,19 @@ 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
+          node-version: 16
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-
-      - name: Install project dependencies
-        shell: bash
-        run: cd .. && yarn --network-timeout 100000
-
       - name: Install app dependencies
         run: yarn
       - name: Create env file
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v1.1
         with:
           fileName: '.env'
           encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
@@ -60,27 +47,9 @@ jobs:
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
+      - name: Upload to release based on tag name
-      - 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*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -15,15 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows10]
+
     runs-on: ${{ matrix.platform }}
-
-    outputs:
-      release_id: ${{ steps.create-release.outputs.id }}
-      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
-      version: ${{ steps.release-info.outputs.version }}
-      filename: ${{ steps.release-info.outputs.filename }}
-      file_hash: ${{ steps.release-info.outputs.file_hash }}
-
     steps:
       - name: Clean up first
         continue-on-error: true
@@ -46,10 +39,10 @@ jobs:
           Remove-Item -path certificate -include tempCert.txt
           Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
 
-      - name: Node
+      - name: Node v16
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
@@ -57,21 +50,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 }}
@@ -88,19 +75,10 @@ jobs:
           path: nym-wallet/target/release/bundle/msi/nym-wallet_1.*.msi
           retention-days: 30
 
-      - id: create-release
+      - name: Upload to release based on tag name
-        name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
           files: |
             nym-wallet/target/release/bundle/msi/*.msi
             nym-wallet/target/release/bundle/msi/*.msi.zip*
-
-  push-release-data:
-    if: ${{ (startsWith(github.ref, 'refs/tags/nym-wallet-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    uses: ./.github/workflows/release-calculate-hash.yml
-    needs: publish-tauri
-    with:
-      release_tag: ${{ github.ref_name }}
-    secrets: inherit

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

@@ -16,15 +16,9 @@ jobs:
     - uses: rlespinasse/github-slug-action@v3.x
     - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 16
     - name: Setup yarn
       run: npm install -g yarn
-    - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - name: Install wasm-pack
-      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh      
     - name: Build dependencies
       run: yarn && yarn build
     - name: Build storybook

.github/workflows/nym_wallet.yml

@@ -34,10 +34,10 @@ jobs:
           profile: minimal
           toolchain: stable
 
-      - name: Node
+      - name: Node v16
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 16
 
       - name: Install yarn for building application
         run: yarn install

.github/workflows/nyms5-android-build.yml

@@ -68,10 +68,8 @@ jobs:
         working-directory: nym-connect/native/android
         env:
           ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.NYMS5_ANDROID_SENTRY_AUTH_TOKEN }}
         # build for arm64 and x86_64
         run: |
-          echo "auth.token=$SENTRY_AUTH_TOKEN" | tee -a sentry.properties
           ./gradlew :app:assembleArch64Debug
           ./gradlew :app:assembleArch64Release
 
@@ -109,3 +107,4 @@ jobs:
           files: |
             apk/nyms5-arch64-debug.apk
             apk/nyms5-arch64-release.apk
+

.github/workflows/release-calculate-hash.yml

@@ -1,39 +0,0 @@
-name: Releases - calculate file hashes
-
-on:
-  workflow_call:
-    inputs:
-      release_tag:
-        description: 'Release tag'
-        required: true
-        type: string
-  workflow_dispatch:
-    release_tag:
-      tag:
-        description: 'Release tag'
-        required: true
-        type: string
-
-jobs:
-  build:
-    name: Calculate hash for assets in release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install packages
-        run: cd ./.github/actions/nym-hash-releases && npm i
-
-      - uses: ./.github/actions/nym-hash-releases
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          release-tag-or-name-or-id: ${{ inputs.release_tag }}
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Asset Hashes
-          path: hashes.json

.github/workflows/run-api-tests.yml

@@ -32,5 +32,5 @@ jobs:
         run: yarn
 
       - name: Run tests
-        run: yarn test:sandbox
+        run: yarn test:qa
         working-directory: nym-api/tests

.github/workflows/sdk-docs-typescript.yml

@@ -1,50 +0,0 @@
-name: Typescript SDK docs
-
-on:
-  push:
-    paths:
-      - "sdk/typescript/**"
-  pull_request:
-    paths:
-      - "sdk/typescript/**"
-
-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: Setup yarn
-        run: npm install -g yarn
-      - name: Install
-        run: yarn
-      - 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

.github/workflows/sdk-publish.yml

@@ -1,35 +0,0 @@
-name: Publish SDK to NPM
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: [custom-runner-linux]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Build and publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-        working-directory: ./sdk/typescript/packages/sdk
-        run: scripts/publish.sh

.github/workflows/support-files/.nvmrc

@@ -1 +1 @@
-18
+16

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

@@ -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);

.github/workflows/typescript-lint.yml

@@ -3,66 +3,62 @@ name: CI for linting Typescript
 on:
   push:
     paths:
-      - "ts-packages/**"
+      - 'ts-packages/**'
-      - "sdk/typescript/**"
+      - 'sdk/typescript/**'
-      - "nym-connect/desktop/src/**"
+      - 'nym-connect/desktop/src/**'
-      - "nym-connect/desktop/package.json"
+      - 'nym-connect/desktop/package.json'
-      - "nym-wallet/src/**"
+      - 'nym-connect/mobile/src/**'
-      - "nym-wallet/package.json"
+      - 'nym-connect/mobile/package.json'
-      - "explorer/**"
+      - 'nym-wallet/src/**'
+      - 'nym-wallet/package.json'
   pull_request:
     paths:
-      - "ts-packages/**"
+      - 'ts-packages/**'
-      - "sdk/typescript/**"
+      - 'sdk/typescript/**'
-      - "nym-connect/desktop/src/**"
+      - 'nym-connect/desktop/src/**'
-      - "nym-connect/desktop/package.json"
+      - 'nym-connect/desktop/package.json'
-      - "nym-wallet/src/**"
+      - 'nym-connect/mobile/src/**'
-      - "nym-wallet/package.json"
+      - 'nym-connect/mobile/package.json'
-      - "explorer/**"
+      - 'nym-wallet/src/**'
+      - 'nym-wallet/package.json'
 
 jobs:
   build:
     runs-on: custom-runner-linux
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
-      - name: Install rsync
+    - name: Install rsync
-        run: sudo apt-get install rsync
+      run: sudo apt-get install rsync
-        continue-on-error: true
+      continue-on-error: true
-      - uses: rlespinasse/github-slug-action@v3.x
+    - uses: rlespinasse/github-slug-action@v3.x
-      - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
-        with:
+      with:
-          node-version: 18
+        node-version: 16
-      - name: Install Rust stable
+    - name: Setup yarn
-        uses: actions-rs/toolchain@v1
+      run: npm install -g yarn
-        with:
+    - name: Install
-          toolchain: stable
+      run: yarn
-      - name: Install wasm-pack
+    - name: Build packages
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+      run: yarn build
-      - name: Setup yarn
+    - name: Lint
-        run: npm install -g yarn
+      run: yarn lint && yarn tsc
-      - name: Install
+    - name: Matrix - Node Install
-        run: yarn
+      run: npm install
-      - name: Build packages
+      working-directory: .github/workflows/support-files
-        run: yarn build
+    - name: Matrix - Send Notification
-      - name: Lint
+      env:
-        run: yarn lint && yarn tsc
+        NYM_NOTIFICATION_KIND: ts-packages
-      - name: Matrix - Node Install
+        NYM_PROJECT_NAME: "ts-packages"
-        run: npm install
+        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-        working-directory: .github/workflows/support-files
+        NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
-      - name: Matrix - Send Notification
+        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-        env:
+        GIT_BRANCH: "${GITHUB_REF##*/}"
-          NYM_NOTIFICATION_KIND: ts-packages
+        IS_SUCCESS: "${{ job.status == 'success' }}"
-          NYM_PROJECT_NAME: "ts-packages"
+        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
-          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
-          NYM_CI_WWW_LOCATION: "ts-${{ env.GITHUB_REF_SLUG }}"
+        MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
-          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+        MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
+        MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
-          IS_SUCCESS: "${{ job.status == 'success' }}"
+      uses: docker://keybaseio/client:stable-node
-          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+      with:
-          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
+        args: .github/workflows/support-files/notifications/entry_point.sh
-          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

.github/workflows/upload-nyxd-ci.yml

@@ -0,0 +1,79 @@
+name: Upload nyxd to CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  publish-nyxd:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-20.04]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare build output directory
+        shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/nyxd
+        run: |
+          rm -rf ci-builds || true
+          mkdir -p $OUTPUT_DIR
+          echo $OUTPUT_DIR
+
+      - name: Install Dependencies (Linux)
+        run: sudo apt-get update && sudo apt-get -y install build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools git
+        continue-on-error: true
+      
+      - name: Update env variables to include go
+        run: | 
+          sudo rm -rf /usr/local/go
+          curl https://dl.google.com/go/go1.19.2.linux-amd64.tar.gz | sudo tar -C/usr/local -zxvf -
+          cat <<'EOF' >>$HOME/.profile
+          export GOROOT=/usr/local/go
+          export GOPATH=$HOME/go
+          export GO111MODULE=on
+          export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
+          EOF
+          source $HOME/.profile
+
+      - name: Verify Go is installed
+        run: go version
+
+      - name: Clone nyxd repo
+        run: | 
+          git clone https://github.com/tommyv1987/nyxd
+          cd nyxd
+          git checkout release/v0.30.2
+
+      - name: Run nyxd
+        run: |
+          pwd
+          cd nyxd && make build
+          sleep 10
+          ls /home/runner/work/nym/nym/nyxd/build
+
+      - name: Prepare build output
+        shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/nyxd
+        run: |
+          cp /home/runner/work/nym/nym/nyxd/build/nyxd $OUTPUT_DIR
+          WASMVM_SO=$(ldd /home/runner/work/nym/nym/nyxd/build/nyxd | grep "libwasm*" | awk '{ print $3 }')
+          ls $WASMVM_SO
+          sleep 3
+          cp $(echo $WASMVM_SO) $OUTPUT_DIR
+
+      - name: Deploy nyxd to CI www
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-avzr"
+          SOURCE: "ci-builds/"
+          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/
+          EXCLUDE: "/dist/, /node_modules/"

.github/workflows/wallet.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.71.0
+          toolchain: stable
           override: true
           components: rustfmt, clippy
 

CHANGELOG.md

@@ -4,101 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
-## [v1.1.30-twix] (2023-09-05)
-
-- geo_aware_provider: fix too much filtering of gateways ([#3826])
-- network-requester: add description to config ([#3799])
-- Speedy mode - selects gateway based on latency  in medium / speedy mode ([#3770])
-- Chore/enable versioning ([#3768])
-- Create explorer-client and use in geo aware provider ([#3824])
-
-[#3826]: https://github.com/nymtech/nym/pull/3826
-[#3799]: https://github.com/nymtech/nym/pull/3799
-[#3770]: https://github.com/nymtech/nym/issues/3770
-[#3768]: https://github.com/nymtech/nym/pull/3768
-[#3824]: https://github.com/nymtech/nym/pull/3824
-
-## [v1.1.29-snickers] (2023-08-29)
-
-- Add EXPLORER_API configurable url ([#3810])
-- Bugfix/use correct tendermint dialect ([#3802])
-- Explorer - look up gateways based on geo-location ([#3776])
-- Speedy mode - select the mixnodes based on the location of the NR ([#3775])
-- NR - reduce response time by removing poisson delay ([#3774])
-- [demo] libp2p example with nym-sdk ([#3763])
-- introduced /network/details endpoint to nym-api to return used network information ([#3758])
-- Feature/issue credentials ([#3691])
-
-[#3810]: https://github.com/nymtech/nym/pull/3810
-[#3802]: https://github.com/nymtech/nym/pull/3802
-[#3776]: https://github.com/nymtech/nym/issues/3776
-[#3775]: https://github.com/nymtech/nym/issues/3775
-[#3774]: https://github.com/nymtech/nym/issues/3774
-[#3763]: https://github.com/nymtech/nym/pull/3763
-[#3758]: https://github.com/nymtech/nym/pull/3758
-[#3691]: https://github.com/nymtech/nym/pull/3691
-
-## [v1.1.28] (2023-08-22)
-
-- [final step3]: add [rust] support to nyxd client in wasm ([#3743])
-- Feature/ephemera upgrade ([#3791])
-- [rust-sdk] feat: make it more convenient to send and receive messages in different tasks ([#3756])
-- feat: validator client refactoring + wasm compatible nyxd client ([#3726])
-- feat: retain connection between client init and run ([#3767])
-
-[#3743]: https://github.com/nymtech/nym/issues/3743
-[#3791]: https://github.com/nymtech/nym/pull/3791
-[#3756]: https://github.com/nymtech/nym/pull/3756
-[#3726]: https://github.com/nymtech/nym/pull/3726
-[#3767]: https://github.com/nymtech/nym/pull/3767
-
-
-## [v1.1.27] (2023-08-16)
-
-- fix serialisation of contract types ([#3752])
-- Investigate spending credentials from the main API (coconut enabled to a gateway) from feature/ephemera branch ([#3741])
-- NymConnect UI stuck in showing "Gateway has issues" ([#3594])
-- [UPDATE] Update MiniBolt community-applications-and-guides dev docs ([#3754])
-
-[#3752]: https://github.com/nymtech/nym/issues/3752
-[#3741]: https://github.com/nymtech/nym/issues/3741
-[#3594]: https://github.com/nymtech/nym/issues/3594
-[#3754]: https://github.com/nymtech/nym/pull/3754
-
-## [v1.1.24] (2023-08-08)
-
-- Latency based gateway selection is serial and slow ([#3710])
-- Network-requester: strip comments from allow lists ([#3625])
-- Remove (or start maintaining) `upgrade` commands from all binaries ([#3600])
-- Set sphinx as default packet type ([#3748])
-- Apply fix from feature/ephemera to develop too (#3698) ([#3742])
-- Feature/coco demos ([#3732])
-- Add updates to community list projects ([#3722])
-- Add geo-aware mixnet topology provider ([#3713])
-- Add updates to community list projects ([#3711])
-
-[#3710]: https://github.com/nymtech/nym/issues/3710
-[#3625]: https://github.com/nymtech/nym/issues/3625
-[#3600]: https://github.com/nymtech/nym/issues/3600
-[#3748]: https://github.com/nymtech/nym/pull/3748
-[#3742]: https://github.com/nymtech/nym/pull/3742
-[#3732]: https://github.com/nymtech/nym/pull/3732
-[#3722]: https://github.com/nymtech/nym/pull/3722
-[#3713]: https://github.com/nymtech/nym/pull/3713
-[#3711]: https://github.com/nymtech/nym/pull/3711
-
-## [v1.1.23] (2023-07-04)
-
-- nym-cli: add client identity key signing support ([#3576])
-- Feature/node tester package ([#3634])
-- Add medium toggle to socks5 client ([#3615])
-- Don't fully turn off background task when cover traffic is disabled ([#3596])
-
-[#3576]: https://github.com/nymtech/nym/issues/3576
-[#3634]: https://github.com/nymtech/nym/pull/3634
-[#3615]: https://github.com/nymtech/nym/pull/3615
-[#3596]: https://github.com/nymtech/nym/pull/3596
-
 ## [v1.1.22] (2023-06-20)
 
 - CLI tool for querying network-requesters ([#3539])

Cargo.toml

@@ -17,6 +17,7 @@ opt-level = 3
 
 resolver = "2"
 members = [
+    "clients/credential",
     "clients/native",
     "clients/native/websocket-requests",
     "clients/socks5",
@@ -33,7 +34,6 @@ members = [
     "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
     "common/cosmwasm-smart-contracts/coconut-dkg",
     "common/cosmwasm-smart-contracts/contracts-common",
-    "common/cosmwasm-smart-contracts/ephemera",
     "common/cosmwasm-smart-contracts/group-contract",
     "common/cosmwasm-smart-contracts/mixnet-contract",
     "common/cosmwasm-smart-contracts/multisig-contract",
@@ -42,7 +42,6 @@ members = [
     "common/cosmwasm-smart-contracts/vesting-contract",
     "common/credential-storage",
     "common/credentials",
-    "common/credential-utils",
     "common/crypto",
     "common/dkg",
     "common/execute",
@@ -75,8 +74,6 @@ members = [
     "common/types",
     "common/wasm-utils",
     "explorer-api",
-    "explorer-api/explorer-api-requests",
-    "explorer-api/explorer-client",
     "gateway",
     "gateway/gateway-requests",
     "integrations/bity",
@@ -105,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"]
@@ -120,40 +117,28 @@ anyhow = "1.0.71"
 async-trait = "0.1.64"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 cfg-if = "1.0.0"
-cosmwasm-derive = "=1.3.0"
+cosmwasm-derive = "=1.0.0"
-cosmwasm-schema = "=1.3.0"
+cosmwasm-schema = "=1.0.0"
-cosmwasm-std = "=1.3.0"
+cosmwasm-std = "=1.0.0"
-# use 0.5.0 as that's the version used by cosmwasm-std 1.3.0
+cosmwasm-storage = "=1.0.0"
-# (and ideally we don't want to pull the same dependency twice)
+cw-controllers = "=0.13.4"
-serde-json-wasm = "=0.5.0"
+cw-storage-plus = "=0.13.4"
-cosmwasm-storage = "=1.3.0"
+cw-utils = "=0.13.4"
-cosmrs = "=0.14.0"
+cw2 = { version = "=0.13.4" }
-# same version as used by cosmrs
+cw3 = { version = "=0.13.4" }
-cw-utils = "=1.0.1"
+cw3-fixed-multisig = { version = "=0.13.4" }
-cw-storage-plus = "=1.1.0"
+cw4 = { version = "=0.13.4" }
-cw2 = { version = "=1.1.0" }
-cw3 = { version = "=1.1.0" }
-cw4 = { version = "=1.1.0" }
-cw-controllers = { version = "=1.1.0" }
 dotenvy = "0.15.6"
-futures = "0.3.28"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
-k256 = "0.13"
 lazy_static = "1.4.0"
 log = "0.4"
 once_cell = "1.7.2"
 rand = "0.8.5"
-reqwest = "0.11.18"
 serde = "1.0.152"
 serde_json = "1.0.91"
 tap = "1.0.1"
-tendermint-rpc = "0.32" # same version as used by cosmrs
 thiserror = "1.0.38"
 tokio = "1.24.1"
-ts-rs = "7.0.0"
+url = "2.2"
-url = "2.4"
 zeroize = "1.6.0"
-
-# wasm-related dependencies
-wasmtimer = "0.2.0"

Makefile

@@ -73,10 +73,13 @@ endef
 # Generate targets for the various cargo workspaces
 
 $(eval $(call add_cargo_workspace,main,.))
-$(eval $(call add_cargo_workspace,contracts,contracts,--lib --target wasm32-unknown-unknown))
+$(eval $(call add_cargo_workspace,contracts,contracts,--target wasm32-unknown-unknown))
 $(eval $(call add_cargo_workspace,wasm-client,clients/webassembly,--target wasm32-unknown-unknown))
 $(eval $(call add_cargo_workspace,wallet,nym-wallet,))
 $(eval $(call add_cargo_workspace,connect,nym-connect/desktop))
+ifdef NYM_MOBILE
+$(eval $(call add_cargo_workspace,connect-mobile,nym-connect/mobile/src-tauri))
+endif
 
 # -----------------------------------------------------------------------------
 # Convenience targets for crates that are already part of the main workspace
@@ -101,7 +104,7 @@ NAME_SERVICE_CONTRACT=$(CONTRACTS_OUT_DIR)/nym_name_service.wasm
 wasm: wasm-build wasm-opt
 
 wasm-build:
-	RUSTFLAGS='-C link-arg=-s' cargo build --lib --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
+	RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
 
 wasm-opt:
 	wasm-opt --disable-sign-ext -Os $(VESTING_CONTRACT) -o $(VESTING_CONTRACT)
@@ -109,9 +112,6 @@ wasm-opt:
 	wasm-opt --disable-sign-ext -Os $(SERVICE_PROVIDER_DIRECTORY_CONTRACT) -o $(SERVICE_PROVIDER_DIRECTORY_CONTRACT)
 	wasm-opt --disable-sign-ext -Os $(NAME_SERVICE_CONTRACT) -o $(NAME_SERVICE_CONTRACT)
 
-contract-schema:
-	$(MAKE) -C contracts schema
-
 # -----------------------------------------------------------------------------
 # Misc
 # -----------------------------------------------------------------------------

README.md

@@ -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.
+

assets/logo/logo-bw.svg

@@ -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>

clients/credential/Cargo.toml

@@ -1,18 +1,25 @@
 [package]
-name = "nym-credential-utils"
+name = "nym-credential-client"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-log = { workspace = true }
+clap = { version = "4.0", features = ["cargo", "derive"] }
-thiserror = { workspace = true }
+log = "0.4"
-tokio = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror = "1.0"
+tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime
+
 
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
+nym-client-core = { path = "../../common/client-core" }
+nym-config = { path = "../../common/config" }
 nym-credentials = { path = "../../common/credentials" }
 nym-credential-storage = { path = "../../common/credential-storage" }
-nym-validator-client = { path = "../../common/client-libs/validator-client" }
+nym-bin-common = { path = "../../common/bin-common"}
-nym-config = { path = "../../common/config" }
+nym-network-defaults = { path = "../../common/network-defaults" }
-nym-client-core = { path = "../../common/client-core" }
+nym-pemstore = { path = "../../common/pemstore" }
+nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
+

clients/credential/README.md

@@ -0,0 +1,32 @@
+<!--
+Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+## Credential binary
+
+The credential binary is used to acquire coconut bandwidth credentials in exchange for nym tokens. Those credentials are stored in the client's `data` directory, so that they can be used as the client sees fit.
+
+### Warning
+
+The credential binary is still experimental software. The infrastructure for using it is not yet deployed to mainnet and it's still in the process of being deployed to sandbox.
+
+### Building
+
+From the project's root directory, run:
+```
+cargo build -p credential
+```
+which generates the `credential` binary in `target/debug/credential`.
+
+
+### Running
+
+For example, you can get a credential worth 3 nym (3000000 unym) in a socks5 client that was already initialized like so:
+
+```
+./target/debug/credential --config-env-file envs/sandbox.env --client-home-directory  ~/.nym/socks5-clients/cred_client  --nyxd-url  https://sandbox-validator1.nymtech.net --mnemonic $MNEMONIC  --recovery-dir /tmp/recovery --amount 3000000
+```
+
+More information regarding how to run the binary can be found by running it with the `--help` argument.
+

clients/credential/src/client.rs

@@ -0,0 +1,55 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::error::Result;
+use bip39::Mnemonic;
+use nym_network_defaults::{NymNetworkDetails, VOUCHER_INFO};
+use nym_validator_client::nyxd;
+use nym_validator_client::nyxd::traits::CoconutBandwidthSigningClient;
+use nym_validator_client::nyxd::{Coin, DirectSigningNyxdClient, Fee, NyxdClient};
+use std::str::FromStr;
+use url::Url;
+
+pub(crate) struct Client {
+    nyxd_client: NyxdClient<DirectSigningNyxdClient>,
+    mix_denom_base: String,
+}
+
+impl Client {
+    pub fn new(nyxd_url: &str, mnemonic: &str) -> Self {
+        let nyxd_url = Url::from_str(nyxd_url).unwrap();
+        let mnemonic = Mnemonic::from_str(mnemonic).unwrap();
+        let network_details = NymNetworkDetails::new_from_env();
+        let config = nyxd::Config::try_from_nym_network_details(&network_details)
+            .expect("failed to construct valid validator client config with the provided network");
+        let nyxd_client =
+            NyxdClient::connect_with_mnemonic(config, nyxd_url.as_ref(), mnemonic, None).unwrap();
+
+        Client {
+            nyxd_client,
+            mix_denom_base: network_details.chain_details.mix_denom.base,
+        }
+    }
+
+    pub async fn deposit(
+        &self,
+        amount: u64,
+        verification_key: String,
+        encryption_key: String,
+        fee: Option<Fee>,
+    ) -> Result<String> {
+        let amount = Coin::new(amount as u128, self.mix_denom_base.clone());
+        Ok(self
+            .nyxd_client
+            .deposit(
+                amount,
+                String::from(VOUCHER_INFO),
+                verification_key,
+                encryption_key,
+                fee,
+            )
+            .await?
+            .transaction_hash
+            .to_string())
+    }
+}

clients/credential/src/commands.rs

@@ -0,0 +1,82 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::{ArgGroup, Args, Subcommand};
+use log::*;
+use nym_bandwidth_controller::acquire::state::State;
+use nym_bin_common::completions::ArgShell;
+use nym_credential_storage::persistent_storage::PersistentStorage;
+use nym_validator_client::nyxd::traits::DkgQueryClient;
+
+use crate::error::Result;
+use crate::recovery_storage::RecoveryStorage;
+
+#[derive(Subcommand)]
+pub(crate) enum Command {
+    /// Run the binary to obtain a credential
+    Run(Run),
+
+    /// Generate shell completions
+    Completions(ArgShell),
+
+    /// Generate Fig specification
+    GenerateFigSpec,
+}
+
+#[derive(Args)]
+#[clap(group(
+ArgGroup::new("recov")
+.required(true)
+.args(&["amount", "recovery_mode"]),
+))]
+pub(crate) struct Run {
+    /// Home directory of the client that is supposed to use the credential.
+    #[clap(long)]
+    pub(crate) client_home_directory: std::path::PathBuf,
+
+    /// A mnemonic for the account that buys the credential
+    #[clap(long)]
+    pub(crate) mnemonic: String,
+
+    /// The amount of utokens the credential will hold. If recovery mode is enabled, this value
+    /// is not needed
+    #[clap(long, default_value = "0")]
+    pub(crate) amount: u64,
+
+    /// Path to a directory used to store recovery files for unconsumed deposits
+    #[clap(long)]
+    pub(crate) recovery_dir: std::path::PathBuf,
+
+    /// Recovery mode, when enabled, tries to recover any deposit data dumped in recovery_dir
+    #[clap(long)]
+    pub(crate) recovery_mode: bool,
+}
+
+pub(crate) async fn recover_credentials<C: DkgQueryClient + Send + Sync>(
+    client: &C,
+    recovery_storage: &RecoveryStorage,
+    shared_storage: &PersistentStorage,
+) -> Result<()> {
+    for voucher in recovery_storage.unconsumed_vouchers()? {
+        let state = State::new(voucher);
+        if let Err(e) =
+            nym_bandwidth_controller::acquire::get_credential(&state, client, shared_storage).await
+        {
+            error!(
+                "Could not recover deposit {} due to {:?}, try again later",
+                state.voucher.tx_hash(),
+                e
+            )
+        } else {
+            info!(
+                "Converted deposit {} to a credential, removing recovery data for it",
+                state.voucher.tx_hash()
+            );
+            if let Err(e) = recovery_storage.remove_voucher(state.voucher.tx_hash().to_string()) {
+                warn!("Could not remove recovery data - {:?}", e);
+            }
+        }
+    }
+
+    Ok(())
+}

clients/credential/src/error.rs

@@ -0,0 +1,36 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use std::time::SystemTimeError;
+use thiserror::Error;
+
+use nym_credential_storage::error::StorageError;
+use nym_credentials::error::Error as CredentialError;
+use nym_validator_client::nyxd::error::NyxdError;
+use nym_validator_client::ValidatorClientError;
+
+pub type Result<T> = std::result::Result<T, CredentialClientError>;
+
+#[derive(Error, Debug)]
+pub enum CredentialClientError {
+    #[error("IO error: {0}")]
+    IOError(#[from] std::io::Error),
+
+    #[error("Bandwidth controller error: {0}")]
+    BandwidthControllerError(#[from] nym_bandwidth_controller::error::BandwidthControllerError),
+
+    #[error("Nyxd error: {0}")]
+    Nyxd(#[from] NyxdError),
+
+    #[error("Validator client error: {0}")]
+    ValidatorClientError(#[from] ValidatorClientError),
+
+    #[error("Credential error: {0}")]
+    Credential(#[from] CredentialError),
+
+    #[error("Could not use shared storage")]
+    SharedStorageError(#[from] StorageError),
+
+    #[error("Could not get system time")]
+    SysTimeError(#[from] SystemTimeError),
+}

clients/credential/src/main.rs

@@ -0,0 +1,128 @@
+// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+mod commands;
+mod error;
+mod recovery_storage;
+
+use commands::*;
+use error::Result;
+use log::*;
+use nym_bin_common::completions::fig_generate;
+use nym_config::DEFAULT_DATA_DIR;
+use nym_network_defaults::{setup_env, NymNetworkDetails};
+use std::process::exit;
+use std::time::{Duration, SystemTime};
+
+use clap::{CommandFactory, Parser};
+use nym_bin_common::logging::setup_logging;
+use nym_client_core::config::disk_persistence::CommonClientPaths;
+use nym_validator_client::nyxd::traits::DkgQueryClient;
+use nym_validator_client::nyxd::{Coin, CosmWasmClient};
+use nym_validator_client::Config;
+
+const SAFETY_BUFFER_SECS: u64 = 60; // 1 minute
+
+#[derive(Parser)]
+#[clap(author = "Nymtech", version, about)]
+struct Cli {
+    /// Path pointing to an env file that configures the client.
+    #[clap(short, long)]
+    pub(crate) config_env_file: Option<std::path::PathBuf>,
+
+    #[clap(subcommand)]
+    pub(crate) command: Command,
+}
+
+async fn block_until_coconut_is_available<C: CosmWasmClient + Send + Sync>(
+    client: &nym_validator_client::Client<C>,
+) -> Result<()> {
+    loop {
+        let epoch = client.nyxd.get_current_epoch().await?;
+        let current_timestamp_secs = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)?
+            .as_secs();
+        if epoch.state.is_final() {
+            if current_timestamp_secs + SAFETY_BUFFER_SECS >= epoch.finish_timestamp.seconds() {
+                info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
+                exit(0);
+            }
+
+            break;
+        } else {
+            // Use 1 additional second to not start the next iteration immediately and spam get_current_epoch queries
+            let secs_until_final = epoch
+                .final_timestamp_secs()
+                .saturating_sub(current_timestamp_secs)
+                + 1;
+            info!("Approximately {} seconds until coconut is available. Sleeping until then. You can safely kill the process at any moment.", secs_until_final);
+            std::thread::sleep(Duration::from_secs(secs_until_final));
+        }
+    }
+
+    Ok(())
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let args = Cli::parse();
+    setup_logging();
+    setup_env(args.config_env_file.as_ref());
+    let bin_name = "nym-credential-client";
+
+    match args.command {
+        Command::Run(r) => {
+            // we assume the structure of <home-dir>/data
+            let data_dir = r.client_home_directory.join(DEFAULT_DATA_DIR);
+            let paths = CommonClientPaths::new_default(data_dir);
+            let db_path = paths.credentials_database;
+
+            let shared_storage =
+                nym_credential_storage::initialise_persistent_storage(db_path).await;
+            let recovery_storage = recovery_storage::RecoveryStorage::new(r.recovery_dir)?;
+
+            let network_details = NymNetworkDetails::new_from_env();
+            let config = Config::try_from_nym_network_details(&network_details).expect(
+                "failed to construct valid validator client config with the provided network",
+            );
+            let amount = Coin::new(
+                r.amount as u128,
+                network_details.chain_details.mix_denom.base,
+            );
+            let client =
+                nym_validator_client::Client::new_signing(config, r.mnemonic.parse().unwrap())?;
+
+            block_until_coconut_is_available(&client).await?;
+            info!("Starting depositing funds, don't kill the process");
+
+            if !r.recovery_mode {
+                let state =
+                    nym_bandwidth_controller::acquire::deposit(&client.nyxd, amount).await?;
+                if nym_bandwidth_controller::acquire::get_credential(
+                    &state,
+                    &client,
+                    &shared_storage,
+                )
+                .await
+                .is_err()
+                {
+                    warn!("Failed to obtain credential. Dumping recovery data.",);
+                    match recovery_storage.insert_voucher(&state.voucher) {
+                        Ok(file_path) => {
+                            warn!("Dumped recovery data to {:?}. Try using recovery mode to convert it to a credential", file_path);
+                        }
+                        Err(e) => {
+                            error!("Could not dump recovery data to file system due to {:?}, the deposit will be lost!", e)
+                        }
+                    }
+                }
+            } else {
+                recover_credentials(&client.nyxd, &recovery_storage, &shared_storage).await?;
+            }
+        }
+        Command::Completions(c) => c.generate(&mut Cli::command(), bin_name),
+        Command::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
+    }
+
+    Ok(())
+}

clients/credential/src/recovery_storage.rs

@@ -0,0 +1,56 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use nym_credentials::coconut::bandwidth::BandwidthVoucher;
+use std::fs::{create_dir_all, read_dir, File};
+use std::io::{Read, Write};
+use std::path::PathBuf;
+
+pub struct RecoveryStorage {
+    recovery_dir: PathBuf,
+}
+
+impl RecoveryStorage {
+    pub fn new(recovery_dir: PathBuf) -> std::io::Result<Self> {
+        create_dir_all(&recovery_dir)?;
+        Ok(Self { recovery_dir })
+    }
+
+    pub fn unconsumed_vouchers(&self) -> std::io::Result<impl Iterator<Item = BandwidthVoucher>> {
+        Ok(read_dir(&self.recovery_dir)?
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| {
+                let path = entry.path();
+                if path.is_file() {
+                    Some(path)
+                } else {
+                    None
+                }
+            })
+            .filter_map(|path| File::open(path).ok())
+            .filter_map(|mut f| {
+                let mut buff = Vec::new();
+                if f.read_to_end(&mut buff).is_ok() {
+                    Some(buff)
+                } else {
+                    None
+                }
+            })
+            .filter_map(|buff| BandwidthVoucher::try_from_bytes(&buff).ok()))
+    }
+
+    pub fn insert_voucher(&self, voucher: &BandwidthVoucher) -> std::io::Result<PathBuf> {
+        let file_name = voucher.tx_hash().to_string();
+        let file_path = self.recovery_dir.join(file_name);
+        let mut file = File::create(&file_path)?;
+        let buff = voucher.to_bytes();
+        file.write_all(&buff)?;
+
+        Ok(file_path)
+    }
+
+    pub fn remove_voucher(&self, file_name: String) -> std::io::Result<()> {
+        let file_path = self.recovery_dir.join(file_name);
+        std::fs::remove_file(file_path)
+    }
+}

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.28"
+version = "1.1.22"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -14,11 +14,11 @@ path = "src/lib.rs"
 
 [dependencies]
 # dependencies to review:
-futures = { workspace = true } # bunch of futures stuff, however, now that I think about it, it could perhaps be completely removed
+futures = "0.3" # bunch of futures stuff, however, now that I think about it, it could perhaps be completely removed
 # the AsyncRead, AsyncWrite, Stream, Sink, etc. traits could be used from tokio
 # channels should really be replaced with crossbeam due to that implementation being more efficient
 # and the single instance of abortable we have should really be refactored anyway
-url = { workspace = true }
+url = "2.2"
 
 clap = { version = "4.0", features = ["cargo", "derive"] }
 dirs = "4.0"
@@ -28,7 +28,7 @@ pretty_env_logger = "0.4" # for formatting log messages
 rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
-thiserror = { workspace = true }
+thiserror = "1.0.34"
 tap = "1.0.1"
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = "0.14" # websocket
@@ -48,7 +48,7 @@ nym-sphinx = { path = "../../common/nymsphinx" }
 nym-pemstore = { path = "../../common/pemstore" }
 nym-task = { path = "../../common/task" }
 nym-topology = { path = "../../common/topology" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
+nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 nym-client-websocket-requests = { path = "websocket-requests" }
 
 [dev-dependencies]

clients/native/src/client/mod.rs

@@ -19,7 +19,8 @@ use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskManager;
-use nym_validator_client::QueryHttpRpcNyxdClient;
+use nym_validator_client::nyxd::QueryNyxdClient;
+use nym_validator_client::Client;
 use std::error::Error;
 use tokio::sync::watch::error::SendError;
 
@@ -28,7 +29,7 @@ pub use nym_sphinx::receiver::ReconstructedMessage;
 
 pub mod config;
 
-type NativeClientBuilder<'a> = BaseClientBuilder<'a, QueryHttpRpcNyxdClient, OnDiskPersistent>;
+type NativeClientBuilder<'a> = BaseClientBuilder<'a, Client<QueryNyxdClient>, OnDiskPersistent>;
 
 pub struct SocketClient {
     /// Client configuration options, including, among other things, packet sending rates,

clients/native/src/commands/build_info.rs

@@ -1,16 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use clap::Args;
-use nym_bin_common::bin_info_owned;
-use nym_bin_common::output_format::OutputFormat;
-
-#[derive(Args)]
-pub(crate) struct BuildInfo {
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-pub(crate) fn execute(args: BuildInfo) {
-    println!("{}", args.output.format(&bin_info_owned!()))
-}

clients/native/src/commands/init.rs

@@ -174,15 +174,14 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
     let details_store =
         OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
     let init_details = nym_client_core::init::setup_gateway(
-        gateway_setup,
+        &gateway_setup,
         &key_store,
         &details_store,
         register_gateway,
         Some(&config.base.client.nym_api_urls),
     )
     .await
-    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?
+    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
-    .details;
 
     let config_save_location = config.default_location();
     config.save_to_default_location().tap_err(|_| {

clients/native/src/commands/mod.rs

@@ -10,7 +10,7 @@ use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
 use log::{error, info};
-use nym_bin_common::bin_info;
+use nym_bin_common::build_information::BinaryBuildInformation;
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_client_core::client::base_client::storage::gateway_details::{
     OnDiskGatewayDetails, PersistedGatewayDetails,
@@ -22,12 +22,13 @@ use nym_config::OptionalSet;
 use std::error::Error;
 use std::net::IpAddr;
 
-pub(crate) mod build_info;
 pub(crate) mod init;
 pub(crate) mod run;
+pub(crate) mod upgrade;
 
 lazy_static! {
-    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
 }
 
 // Helper for passing LONG_VERSION to clap
@@ -42,10 +43,6 @@ pub(crate) struct Cli {
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
-    /// Flag used for disabling the printed banner in tty.
-    #[clap(long)]
-    pub(crate) no_banner: bool,
-
     #[clap(subcommand)]
     command: Commands,
 }
@@ -54,12 +51,10 @@ pub(crate) struct Cli {
 pub(crate) enum Commands {
     /// Initialise a Nym client. Do this first!
     Init(init::Init),
-
     /// Run the Nym client with provided configuration client optionally overriding set parameters
     Run(run::Run),
-
+    /// Try to upgrade the client
-    /// Show build information of this binary
+    Upgrade(upgrade::Upgrade),
-    BuildInfo(build_info::BuildInfo),
 
     /// Generate shell completions
     Completions(ArgShell),
@@ -80,13 +75,13 @@ pub(crate) struct OverrideConfig {
     enabled_credentials_mode: Option<bool>,
 }
 
-pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
+pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
     let bin_name = "nym-native-client";
 
-    match args.command {
+    match &args.command {
-        Commands::Init(m) => init::execute(&m).await?,
+        Commands::Init(m) => init::execute(m).await?,
-        Commands::Run(m) => run::execute(&m).await?,
+        Commands::Run(m) => run::execute(m).await?,
-        Commands::BuildInfo(m) => build_info::execute(m),
+        Commands::Upgrade(m) => upgrade::execute(m),
         Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
         Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
     }

clients/native/src/commands/upgrade.rs

@@ -0,0 +1,78 @@
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::config::Config;
+use crate::commands::try_load_current_config;
+use clap::Args;
+use nym_bin_common::version_checker::Version;
+use std::process;
+
+fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
+    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
+    process::exit(1)
+}
+
+#[derive(Args, Clone)]
+pub(crate) struct Upgrade {
+    /// Id of the nym-client we want to upgrade
+    #[clap(long)]
+    id: String,
+}
+
+fn parse_config_version(config: &Config) -> Version {
+    let version = Version::parse(&config.base.client.version).unwrap_or_else(|err| {
+        eprintln!("failed to parse client version! - {err}");
+        process::exit(1)
+    });
+
+    if version.is_prerelease() || !version.build.is_empty() {
+        eprintln!(
+            "Trying to upgrade from a non-released version {version}. This is not supported!"
+        );
+        process::exit(1)
+    }
+
+    version
+}
+
+fn parse_package_version() -> Version {
+    let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+
+    // technically this is not a correct way of checking it as a released version might contain valid build identifiers
+    // however, we are not using them ourselves at the moment and hence it should be fine.
+    // if we change our mind, we could easily tweak this code
+    if version.is_prerelease() || !version.build.is_empty() {
+        eprintln!("Trying to upgrade to a non-released version {version}. This is not supported!");
+        process::exit(1)
+    }
+
+    version
+}
+
+fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
+    let config_version = parse_config_version(&config);
+    if &config_version == package_version {
+        println!("You're using the most recent version!");
+        return;
+    }
+
+    unimplemented_upgrade(package_version, &config_version)
+}
+
+pub(crate) fn execute(args: &Upgrade) {
+    let package_version = parse_package_version();
+
+    let id = &args.id;
+
+    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
+        eprintln!("failed to load existing config file! - {err}");
+        process::exit(1)
+    });
+
+    if existing_config.base.client.version.is_empty() {
+        eprintln!("the existing configuration file does not seem to contain version number.");
+        process::exit(1);
+    }
+
+    do_upgrade(existing_config, args, &package_version)
+}

clients/native/src/main.rs

@@ -14,13 +14,10 @@ pub mod websocket;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    setup_logging();
+    maybe_print_banner(crate_name!(), crate_version!());
+
     let args = commands::Cli::parse();
     setup_env(args.config_env_file.as_ref());
-
+    commands::execute(&args).await
-    if !args.no_banner {
-        maybe_print_banner(crate_name!(), crate_version!());
-    }
-    setup_logging();
-
-    commands::execute(args).await
 }

clients/native/src/websocket/handler.rs

@@ -117,11 +117,10 @@ impl Handler {
         let Ok(base_length) = self
             .lane_queue_lengths
             .lock()
-            .map(|guard| guard.get(&conn_lane).unwrap_or_default())
+            .map(|guard| guard.get(&conn_lane).unwrap_or_default()) else {
-        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

clients/native/websocket-requests/src/requests.rs

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 // all variable size data is always prefixed with u64 length
@@ -105,10 +105,10 @@ impl ClientRequest {
         let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
 
         std::iter::once(ClientRequestTag::Send as u8)
-            .chain(recipient.to_bytes()) // will not be length prefixed because the length is constant
+            .chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
-            .chain(conn_id_bytes)
+            .chain(conn_id_bytes.into_iter())
-            .chain(data_len_bytes)
+            .chain(data_len_bytes.into_iter())
-            .chain(data)
+            .chain(data.into_iter())
             .collect()
     }
 
@@ -180,11 +180,11 @@ impl ClientRequest {
         let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
 
         std::iter::once(ClientRequestTag::SendAnonymous as u8)
-            .chain(reply_surbs.to_be_bytes())
+            .chain(reply_surbs.to_be_bytes().into_iter())
-            .chain(recipient.to_bytes()) // will not be length prefixed because the length is constant
+            .chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
-            .chain(conn_id_bytes)
+            .chain(conn_id_bytes.into_iter())
-            .chain(data_len_bytes)
+            .chain(data_len_bytes.into_iter())
-            .chain(data)
+            .chain(data.into_iter())
             .collect()
     }
 
@@ -258,10 +258,10 @@ impl ClientRequest {
         let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
 
         std::iter::once(ClientRequestTag::Reply as u8)
-            .chain(sender_tag.to_bytes())
+            .chain(sender_tag.to_bytes().into_iter())
-            .chain(conn_id_bytes)
+            .chain(conn_id_bytes.into_iter())
-            .chain(message_len_bytes)
+            .chain(message_len_bytes.into_iter())
-            .chain(message)
+            .chain(message.into_iter())
             .collect()
     }
 
@@ -332,7 +332,7 @@ impl ClientRequest {
     fn serialize_closed_connection(connection_id: u64) -> Vec<u8> {
         let conn_id_bytes = connection_id.to_be_bytes();
         std::iter::once(ClientRequestTag::ClosedConnection as u8)
-            .chain(conn_id_bytes)
+            .chain(conn_id_bytes.into_iter())
             .collect()
     }
 
@@ -359,7 +359,7 @@ impl ClientRequest {
     fn serialize_get_lane_queue_lengths(connection_id: u64) -> Vec<u8> {
         let conn_id_bytes = connection_id.to_be_bytes();
         std::iter::once(ClientRequestTag::GetLaneQueueLength as u8)
-            .chain(conn_id_bytes)
+            .chain(conn_id_bytes.into_iter())
             .collect()
     }
 

clients/native/websocket-requests/src/responses.rs

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 // all variable size data is always prefixed with u64 length
@@ -67,15 +67,15 @@ impl ServerResponse {
         if let Some(sender_tag) = reconstructed_message.sender_tag {
             std::iter::once(ServerResponseTag::Received as u8)
                 .chain(std::iter::once(true as u8))
-                .chain(sender_tag.to_bytes())
+                .chain(sender_tag.to_bytes().into_iter())
                 .chain(message_len_bytes.iter().cloned())
-                .chain(reconstructed_message.message)
+                .chain(reconstructed_message.message.into_iter())
                 .collect()
         } else {
             std::iter::once(ServerResponseTag::Received as u8)
                 .chain(std::iter::once(false as u8))
                 .chain(message_len_bytes.iter().cloned())
-                .chain(reconstructed_message.message)
+                .chain(reconstructed_message.message.into_iter())
                 .collect()
         }
     }
@@ -149,7 +149,7 @@ impl ServerResponse {
     // SELF_ADDRESS_RESPONSE_TAG || self_address
     fn serialize_self_address(address: Recipient) -> Vec<u8> {
         std::iter::once(ServerResponseTag::SelfAddress as u8)
-            .chain(address.to_bytes())
+            .chain(address.to_bytes().into_iter())
             .collect()
     }
 
@@ -211,8 +211,8 @@ impl ServerResponse {
         let message_len_bytes = (error.message.len() as u64).to_be_bytes();
         std::iter::once(ServerResponseTag::Error as u8)
             .chain(std::iter::once(error.kind as u8))
-            .chain(message_len_bytes)
+            .chain(message_len_bytes.into_iter())
-            .chain(error.message.into_bytes())
+            .chain(error.message.into_bytes().into_iter())
             .collect()
     }
 

clients/native/websocket-requests/src/text.rs

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::ErrorKind;

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.28"
+version = "1.1.22"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -14,9 +14,9 @@ pretty_env_logger = "0.4"
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
 tap = "1.0.1"
-thiserror = { workspace = true }
+thiserror = "1.0.34"
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
-url = { workspace = true }
+url = "2.2"
 
 # internal
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }

clients/socks5/src/commands/build_info.rs

@@ -1,16 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use clap::Args;
-use nym_bin_common::bin_info_owned;
-use nym_bin_common::output_format::OutputFormat;
-
-#[derive(Args)]
-pub(crate) struct BuildInfo {
-    #[clap(short, long, default_value_t = OutputFormat::default())]
-    output: OutputFormat,
-}
-
-pub(crate) fn execute(args: BuildInfo) {
-    println!("{}", args.output.format(&bin_info_owned!()))
-}

clients/socks5/src/commands/init.rs

@@ -94,8 +94,6 @@ impl From<Init> for OverrideConfig {
             use_anonymous_replies: init_config.use_reply_surbs,
             fastmode: init_config.fastmode,
             no_cover: init_config.no_cover,
-            geo_routing: None,
-            medium_toggle: false,
             nyxd_urls: init_config.nyxd_urls,
             enabled_credentials_mode: init_config.enabled_credentials_mode,
             outfox: false,
@@ -186,15 +184,14 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
     let details_store =
         OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
     let init_details = nym_client_core::init::setup_gateway(
-        gateway_setup,
+        &gateway_setup,
         &key_store,
         &details_store,
         register_gateway,
         Some(&config.core.base.client.nym_api_urls),
     )
     .await
-    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?
+    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
-    .details;
 
     // TODO: ask the service provider we specified for its interface version and set it in the config
 

clients/socks5/src/commands/mod.rs

@@ -10,25 +10,25 @@ use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use lazy_static::lazy_static;
 use log::{error, info};
-use nym_bin_common::bin_info;
+use nym_bin_common::build_information::BinaryBuildInformation;
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_client_core::client::base_client::storage::gateway_details::{
     OnDiskGatewayDetails, PersistedGatewayDetails,
 };
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
-use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
+use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::config::{GatewayEndpointConfig, GroupBy, TopologyStructure};
 use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
-use nym_sphinx::params::{PacketSize, PacketType};
+use nym_sphinx::params::PacketType;
 use std::error::Error;
 
-pub(crate) mod build_info;
 pub mod init;
 pub(crate) mod run;
+pub(crate) mod upgrade;
 
 lazy_static! {
-    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
 }
 
 // Helper for passing LONG_VERSION to clap
@@ -43,10 +43,6 @@ pub(crate) struct Cli {
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
-    /// Flag used for disabling the printed banner in tty.
-    #[clap(long)]
-    pub(crate) no_banner: bool,
-
     #[clap(subcommand)]
     command: Commands,
 }
@@ -59,8 +55,8 @@ pub(crate) enum Commands {
     /// Run the Nym client with provided configuration client optionally overriding set parameters
     Run(run::Run),
 
-    /// Show build information of this binary
+    /// Try to upgrade the client
-    BuildInfo(build_info::BuildInfo),
+    Upgrade(upgrade::Upgrade),
 
     /// Generate shell completions
     Completions(ArgShell),
@@ -76,20 +72,18 @@ pub(crate) struct OverrideConfig {
     use_anonymous_replies: Option<bool>,
     fastmode: bool,
     no_cover: bool,
-    geo_routing: Option<CountryGroup>,
-    medium_toggle: bool,
     nyxd_urls: Option<Vec<url::Url>>,
     enabled_credentials_mode: Option<bool>,
     outfox: bool,
 }
 
-pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
+pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
     let bin_name = "nym-socks5-client";
 
-    match args.command {
+    match &args.command {
-        Commands::Init(m) => init::execute(&m).await?,
+        Commands::Init(m) => init::execute(m).await?,
-        Commands::Run(m) => run::execute(&m).await?,
+        Commands::Run(m) => run::execute(m).await?,
-        Commands::BuildInfo(m) => build_info::execute(m),
+        Commands::Upgrade(m) => upgrade::execute(m),
         Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
         Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
     }
@@ -97,25 +91,6 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
 }
 
 pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
-    let disable_cover_traffic_with_keepalive = args.medium_toggle;
-    let secondary_packet_size = args.medium_toggle.then_some(PacketSize::ExtendedPacket16);
-    let no_per_hop_delays = args.medium_toggle;
-
-    let topology_structure = if args.medium_toggle {
-        // Use the location of the network-requester
-        let address = config
-            .core
-            .socks5
-            .provider_mix_address
-            .parse()
-            .expect("failed to parse provider mix address");
-        TopologyStructure::GeoAware(GroupBy::NymAddress(address))
-    } else if let Some(code) = args.geo_routing {
-        TopologyStructure::GeoAware(GroupBy::CountryGroup(code))
-    } else {
-        TopologyStructure::default()
-    };
-
     let packet_type = if args.outfox {
         PacketType::Outfox
     } else {
@@ -126,23 +101,8 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
             BaseClientConfig::with_high_default_traffic_volume,
             args.fastmode,
         )
-        .with_base(
-            // NOTE: This interacts with disabling cover traffic fully, so we want to this to be set before
-            BaseClientConfig::with_disabled_cover_traffic_with_keepalive,
-            disable_cover_traffic_with_keepalive,
-        )
-        .with_base(
-            BaseClientConfig::with_secondary_packet_size,
-            secondary_packet_size,
-        )
-        .with_base(BaseClientConfig::with_no_per_hop_delays, no_per_hop_delays)
-        // NOTE: see comment above about the order of the other disble cover traffic config
         .with_base(BaseClientConfig::with_disabled_cover_traffic, args.no_cover)
         .with_base(BaseClientConfig::with_packet_type, packet_type)
-        .with_base(
-            BaseClientConfig::with_topology_structure,
-            topology_structure,
-        )
         .with_optional(Config::with_anonymous_replies, args.use_anonymous_replies)
         .with_optional(Config::with_port, args.port)
         .with_optional_base_custom_env(

clients/socks5/src/commands/run.rs

@@ -11,7 +11,6 @@ use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
 use nym_client_core::client::base_client::storage::OnDiskPersistent;
-use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
 use nym_crypto::asymmetric::identity;
 use nym_socks5_client_core::NymClient;
 use nym_sphinx::addressing::clients::Recipient;
@@ -61,15 +60,6 @@ pub(crate) struct Run {
     #[clap(long, hide = true)]
     no_cover: bool,
 
-    /// Set geo-aware mixnode selection when sending mixnet traffic, for experiments only.
-    #[clap(long, hide = true, value_parser = validate_country_group)]
-    geo_routing: Option<CountryGroup>,
-
-    /// Enable medium mixnet traffic, for experiments only.
-    /// This includes things like disabling cover traffic, no per hop delays, etc.
-    #[clap(long, hide = true)]
-    medium_toggle: bool,
-
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
     #[clap(long, hide = true)]
@@ -87,8 +77,6 @@ impl From<Run> for OverrideConfig {
             use_anonymous_replies: run_config.use_anonymous_replies,
             fastmode: run_config.fastmode,
             no_cover: run_config.no_cover,
-            geo_routing: run_config.geo_routing,
-            medium_toggle: run_config.medium_toggle,
             nyxd_urls: run_config.nyxd_urls,
             enabled_credentials_mode: run_config.enabled_credentials_mode,
             outfox: run_config.outfox,
@@ -96,13 +84,6 @@ impl From<Run> for OverrideConfig {
     }
 }
 
-fn validate_country_group(s: &str) -> Result<CountryGroup, String> {
-    match s.parse() {
-        Ok(cg) => Ok(cg),
-        Err(_) => Err(format!("failed to parse country group: {}", s)),
-    }
-}
-
 // this only checks compatibility between config the binary. It does not take into consideration
 // network version. It might do so in the future.
 fn version_check(cfg: &Config) -> bool {

clients/socks5/src/commands/upgrade.rs

@@ -0,0 +1,78 @@
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::commands::try_load_current_config;
+use crate::config::Config;
+use clap::Args;
+use nym_bin_common::version_checker::Version;
+use std::process;
+
+fn unimplemented_upgrade(current_version: &Version, config_version: &Version) -> ! {
+    eprintln!("Cannot perform upgrade from {config_version} to {current_version} as it hasn't been implemented yet");
+    process::exit(1)
+}
+
+#[derive(Args, Clone)]
+pub(crate) struct Upgrade {
+    /// Id of the nym-client we want to upgrade
+    #[clap(long)]
+    id: String,
+}
+
+fn parse_config_version(config: &Config) -> Version {
+    let version = Version::parse(&config.core.base.client.version).unwrap_or_else(|err| {
+        eprintln!("failed to parse client version! - {err}");
+        process::exit(1)
+    });
+
+    if version.is_prerelease() || !version.build.is_empty() {
+        eprintln!(
+            "Trying to upgrade from a non-released version {version}. This is not supported!"
+        );
+        process::exit(1)
+    }
+
+    version
+}
+
+fn parse_package_version() -> Version {
+    let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+
+    // technically this is not a correct way of checking it as a released version might contain valid build identifiers
+    // however, we are not using them ourselves at the moment and hence it should be fine.
+    // if we change our mind, we could easily tweak this code
+    if version.is_prerelease() || !version.build.is_empty() {
+        eprintln!("Trying to upgrade to a non-released version {version}. This is not supported!");
+        process::exit(1)
+    }
+
+    version
+}
+
+fn do_upgrade(config: Config, _args: &Upgrade, package_version: &Version) {
+    let config_version = parse_config_version(&config);
+    if &config_version == package_version {
+        println!("You're using the most recent version!");
+        return;
+    }
+
+    unimplemented_upgrade(package_version, &config_version)
+}
+
+pub(crate) fn execute(args: &Upgrade) {
+    let package_version = parse_package_version();
+
+    let id = &args.id;
+
+    let existing_config = try_load_current_config(id).unwrap_or_else(|err| {
+        eprintln!("failed to load existing config file! - {err}");
+        process::exit(1)
+    });
+
+    if existing_config.core.base.client.version.is_empty() {
+        eprintln!("the existing configuration file does not seem to contain version number.");
+        process::exit(1);
+    }
+
+    do_upgrade(existing_config, args, &package_version)
+}

clients/socks5/src/main.rs

@@ -13,13 +13,10 @@ pub mod error;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    setup_logging();
+    maybe_print_banner(crate_name!(), crate_version!());
+
     let args = commands::Cli::parse();
     setup_env(args.config_env_file.as_ref());
-
+    commands::execute(&args).await
-    if !args.no_banner {
-        maybe_print_banner(crate_name!(), crate_version!());
-    }
-    setup_logging();
-
-    commands::execute(args).await
 }

clients/validator/.nvmrc

@@ -1 +1 @@
-18
+16

clients/validator/package.json

@@ -3,11 +3,11 @@
   "version": "0.19.0",
   "description": "A TypeScript client for interacting with smart contracts in Nym validators",
   "repository": "https://github.com/nymtech/nym",
-  "main": "dist/index.js",
+  "main": "./dist/index.js",
-  "types": "dist/index.d.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "build": "rollup -c ./rollup.config.mjs",
-    "build:types": "rollup-type-bundler --dist ./dist",
+    "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"
   }
 }

clients/validator/rollup.config.mjs

@@ -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()],
   },
 ];

clients/validator/scripts/build-prod.sh

@@ -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
 

clients/validator/scripts/buildPackageJson.mjs

@@ -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));

clients/validator/src/index.ts

@@ -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({
+  public async simulateSend(signingAddress: string, from: string, to: string, amount: Coin[]) {
-    signingAddress,
+    return (this.client as SigningClient).simulateSend(signingAddress, from, to, amount);
-    from,
-    to,
-    amount,
-  }: {
-    signingAddress: string;
-    from: string;
-    to: string;
-    amount: Coin[];
-  }) {
-    return (this.client as ISigningClient).simulateSend(signingAddress, from, to, amount);
   }
 }

clients/validator/src/tests/simulate/simulateTx.test.ts

@@ -22,12 +22,9 @@ describe('Simualtions', () => {
   });
 
   it('can simulate sending tokens', async () => {
-    const res = await client.simulateSend({
+    const res = await client.simulateSend(client.address, client.address, client.address, [
-      signingAddress: client.address,
+      { amount: '400000', denom: 'unym' },
-      from: client.address,
+    ]);
-      to: client.address,
-      amount: [{ amount: '400000', denom: 'unym' }],
-    });
 
     expect(typeof res).toBe('number');
   }).timeout(10000);

clients/validator/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "./dist/nym-validator-client",
     "module": "ES2020",
     "target": "es2021",
     "allowJs": false,

clients/webassembly/Cargo.toml

@@ -3,7 +3,7 @@ name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
 version = "1.1.1"
 edition = "2021"
-keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy"]
+keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
 repository = "https://github.com/nymtech/nym"
 description = "A webassembly client which can be used to interact with the the Nym privacy platform. Wasm is used for Sphinx packet generation."
@@ -33,7 +33,7 @@ wasm-bindgen-futures = "0.4"
 thiserror = "1.0.40"
 zeroize = "1.6.0"
 
-wasmtimer = { version = "0.2.0", features = ["tokio"] }
+wasm-timer = { git = "https://github.com/mmsinclair/wasm-timer", rev = "b9d1a54ad514c2f230a026afe0dde341e98cd7b6"}
 
 # internal
 nym-node-tester-utils = { path = "../../common/node-tester-utils" }

clients/webassembly/Makefile

@@ -3,6 +3,3 @@ clippy:
 
 test:
 	wasm-pack test --node
-
-wasm-build:
-	wasm-pack build

clients/webassembly/internal-dev/package.json

@@ -8,7 +8,6 @@
   },
   "scripts": {
     "build": "webpack --config webpack.config.js",
-    "build:wasm": "cd ../ && make wasm-build",
     "start": "webpack-dev-server --port 8001"
   },
   "repository": {
@@ -37,4 +36,4 @@
   "dependencies": {
     "@nymproject/nym-client-wasm": "file:../pkg"
   }
-}
+}

clients/webassembly/internal-dev/worker.js

@@ -12,371 +12,333 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-importScripts("nym_client_wasm.js");
+importScripts('nym_client_wasm.js');
 
-console.log("Initializing worker");
+console.log('Initializing worker');
 
 // wasm_bindgen creates a global variable (with the exports attached) that is in scope after `importScripts`
 const {
-  NymNodeTester,
+    NymNodeTester,
-  WasmGateway,
+    WasmGateway,
-  WasmMixNode,
+    WasmMixNode,
-  WasmNymTopology,
+    WasmNymTopology,
-  default_debug,
+    default_debug,
-  NymClientBuilder,
+    NymClientBuilder,
-  NymClient,
+    NymClient,
-  set_panic_hook,
+    set_panic_hook,
-  Config,
+    Config,
-  GatewayEndpointConfig,
+    GatewayEndpointConfig,
-  ClientStorage,
+    ClientStorage,
-  current_network_topology,
+    current_network_topology,
-  make_key,
+    make_key,
-  make_key2,
+    make_key2
 } = wasm_bindgen;
 
 let client = null;
 let tester = null;
 
-const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
-
 function dummyTopology() {
-  const l1Mixnode = new WasmMixNode(
+    const l1Mixnode = new WasmMixNode(
-    1,
+        1,
-    "n1fzv4jc7fanl9s0qj02ge2ezk3kts545kjtek47",
+        'n1fzv4jc7fanl9s0qj02ge2ezk3kts545kjtek47',
-    "178.79.143.65",
+        '178.79.143.65',
-    1789,
+        1789,
-    "4Yr4qmEHd9sgsuQ83191FR2hD88RfsbMmB4tzhhZWriz",
+        '4Yr4qmEHd9sgsuQ83191FR2hD88RfsbMmB4tzhhZWriz',
-    "8ndjk5oZ6HxUZNScLJJ7hk39XtUqGexdKgW7hSX6kpWG",
+        '8ndjk5oZ6HxUZNScLJJ7hk39XtUqGexdKgW7hSX6kpWG',
-    1,
+        1,
-    "1.10.0"
+        '1.10.0',
-  );
+    );
-  const l2Mixnode = new WasmMixNode(
+    const l2Mixnode = new WasmMixNode(
-    2,
+        2,
-    "n1z93z44vf8ssvdhujjvxcj4rd5e3lz0l60wdk70",
+        'n1z93z44vf8ssvdhujjvxcj4rd5e3lz0l60wdk70',
-    "109.74.197.180",
+        '109.74.197.180',
-    1789,
+        1789,
-    "7sVjiMrPYZrDWRujku9QLxgE8noT7NTgBAqizCsu7AoK",
+        '7sVjiMrPYZrDWRujku9QLxgE8noT7NTgBAqizCsu7AoK',
-    "GepXwRnKZDd8x2nBWAajGGBVvF3mrpVMQBkgfrGuqRCN",
+        'GepXwRnKZDd8x2nBWAajGGBVvF3mrpVMQBkgfrGuqRCN',
-    2,
+        2,
-    "1.10.0"
+        '1.10.0',
-  );
+    );
-  const l3Mixnode = new WasmMixNode(
+    const l3Mixnode = new WasmMixNode(
-    3,
+        3,
-    "n1ptg680vnmef2cd8l0s9uyc4f0hgf3x8sed6w77",
+        'n1ptg680vnmef2cd8l0s9uyc4f0hgf3x8sed6w77',
-    "176.58.101.80",
+        '176.58.101.80',
-    1789,
+        1789,
-    "FoM5Mx9Pxk1g3zEqkS3APgtBeTtTo3M8k7Yu4bV6kK1R",
+        'FoM5Mx9Pxk1g3zEqkS3APgtBeTtTo3M8k7Yu4bV6kK1R',
-    "DeYjrDC2AcQRVFshiKnbUo6bRvPyZ33QGYR2DLeFJ9qD",
+        'DeYjrDC2AcQRVFshiKnbUo6bRvPyZ33QGYR2DLeFJ9qD',
-    3,
+        3,
-    "1.10.0"
+        '1.10.0',
-  );
+    );
 
-  const gateway = new WasmGateway(
+    const gateway = new WasmGateway(
-    "n16evnn8glr0sham3matj8rg2s24m6x56ayk87ts",
+        'n16evnn8glr0sham3matj8rg2s24m6x56ayk87ts',
-    "85.159.212.96",
+        '85.159.212.96',
-    1789,
+        1789,
-    9000,
+        9000,
-    "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9",
+        '336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9',
-    "BtYjoWihiuFihGKQypmpSspbhmWDPxzqeTVSd8ciCpWL",
+        'BtYjoWihiuFihGKQypmpSspbhmWDPxzqeTVSd8ciCpWL',
-    "1.10.1"
+        '1.10.1',
-  );
+    );
 
-  const mixnodes = new Map();
+    const mixnodes = new Map();
-  mixnodes.set(1, [l1Mixnode]);
+    mixnodes.set(1, [l1Mixnode]);
-  mixnodes.set(2, [l2Mixnode]);
+    mixnodes.set(2, [l2Mixnode]);
-  mixnodes.set(3, [l3Mixnode]);
+    mixnodes.set(3, [l3Mixnode]);
 
-  const gateways = [gateway];
 
-  return new WasmNymTopology(mixnodes, gateways);
+    const gateways = [gateway];
+
+    return new WasmNymTopology(mixnodes, gateways)
 }
 
 function printAndDisplayTestResult(result) {
-  result.log_details();
+    result.log_details();
 
-  self.postMessage({
+    self.postMessage({
-    kind: "DisplayTesterResults",
+        kind: 'DisplayTesterResults',
-    args: {
+        args: {
-      score: result.score(),
+            score: result.score(),
-      sentPackets: result.sent_packets,
+            sentPackets: result.sent_packets,
-      receivedPackets: result.received_packets,
+            receivedPackets: result.received_packets,
-      receivedAcks: result.received_acks,
+            receivedAcks: result.received_acks,
-      duplicatePackets: result.duplicate_packets,
+            duplicatePackets: result.duplicate_packets,
-      duplicateAcks: result.duplicate_acks,
+            duplicateAcks: result.duplicate_acks,
-    },
+        },
-  });
+    });
 }
 
 async function testWithTester() {
-  // A) construct with hardcoded topology
+    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
-  const topology = dummyTopology();
-  const nodeTester = await new NymNodeTester(topology, preferredGateway);
 
-  // B) first get topology directly from nym-api
+    // A) construct with hardcoded topology
-  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+    const topology = dummyTopology()
-  // const topology = await current_network_topology(validator)
+    const nodeTester = await new NymNodeTester(topology, preferredGateway);
-  // const nodeTester = await new NymNodeTester(topology, preferredGateway);
-  //
-  // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
-  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-  // const nodeTester = await NymNodeTester.new_with_api(validator, preferredGateway)
 
-  // B) first get topology directly from nym-api
+    // B) first get topology directly from nym-api
-  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-  // const topology = await current_network_topology(validator)
+    // const topology = await current_network_topology(validator)
-  // const nodeTester = await new NymNodeTester(topology, undefined, preferredGateway);
+    // const nodeTester = await new NymNodeTester(topology, preferredGateway);
-  //
+    //
-  // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
+    // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
-  // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+    // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-  // const nodeTester = await NymNodeTester.new_with_api(validator, undefined, preferredGateway)
+    // const nodeTester = await NymNodeTester.new_with_api(validator, preferredGateway)
-  // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
-  // const topology = dummyTopology()
-  // const nodeTester = await new NymNodeTester(topology);
 
-  self.onmessage = async (event) => {
+    // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
-    if (event.data && event.data.kind) {
+    // const topology = dummyTopology()
-      switch (event.data.kind) {
+    // const nodeTester = await new NymNodeTester(topology);
-        case "TestPacket": {
-          const { mixnodeIdentity } = event.data.args;
-          console.log("starting node test...");
 
-          let result = await nodeTester.test_node(mixnodeIdentity);
+    self.onmessage = async event => {
-          printAndDisplayTestResult(result);
+        if (event.data && event.data.kind) {
+            switch (event.data.kind) {
+                case 'TestPacket': {
+                    const {mixnodeIdentity} = event.data.args;
+                    console.log("starting node test...");
+
+                    let result = await nodeTester.test_node(mixnodeIdentity);
+                    printAndDisplayTestResult(result)
+                }
+            }
         }
-      }
+    };
-    }
-  };
-}
-
-async function testerReconnection() {
-  const validator = "https://qwerty-validator-api.qa.nymte.ch/api";
-  const nodeTester = await NymNodeTester.new_with_api(validator);
-
-  self.onmessage = async (event) => {
-    if (event.data && event.data.kind) {
-      switch (event.data.kind) {
-        case "TestPacket": {
-          const { mixnodeIdentity } = event.data.args;
-          console.log("starting node test...");
-
-          let result1 = await nodeTester.test_node(mixnodeIdentity);
-          console.log("sleeping for 5s");
-          await new Promise((r) => setTimeout(r, 5000));
-          await nodeTester.disconnect_from_gateway();
-
-          console.log("sleeping for 5s");
-          await new Promise((r) => setTimeout(r, 5000));
-
-          await nodeTester.reconnect_to_gateway();
-          let result2 = await nodeTester.test_node(mixnodeIdentity);
-
-          printAndDisplayTestResult(result1);
-          printAndDisplayTestResult(result2);
-        }
-      }
-    }
-  };
 }
 
 async function testWithNymClient() {
-  const topology = dummyTopology();
+    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const topology = dummyTopology()
 
-  let received = 0;
+    let received = 0
 
-  const onMessageHandler = (message) => {
+    const onMessageHandler = (message) => {
-    received += 1;
+        received += 1;
+        self.postMessage({
+            kind: 'ReceiveMessage',
+            args: {
+                message,
+                senderTag: undefined,
+                isTestPacket: true,
+            },
+        });
+
+        // it's really up to the user to create proper callback here...
+        console.log(`received ${received} packets so far`)
+    };
+
+    console.log('Instantiating WASM client...');
+
+    let clientBuilder = NymClientBuilder.new_tester(topology, onMessageHandler, preferredGateway)
+    console.log('Web worker creating WASM client...');
+    let local_client = await clientBuilder.start_client();
+    console.log('WASM client running!');
+
+    const selfAddress = local_client.self_address();
+
+    // set the global (I guess we don't have to anymore?)
+    client = local_client;
+
+    console.log(`Client address is ${selfAddress}`);
     self.postMessage({
-      kind: "ReceiveMessage",
+        kind: 'Ready',
-      args: {
+        args: {
-        message,
+            selfAddress,
-        senderTag: undefined,
+        },
-        isTestPacket: true,
-      },
     });
 
-    // it's really up to the user to create proper callback here...
+    // Set callback to handle messages passed to the worker.
-    console.log(`received ${received} packets so far`);
+    self.onmessage = async event => {
-  };
+        console.log(event)
-
+        if (event.data && event.data.kind) {
-  console.log("Instantiating WASM client...");
+            switch (event.data.kind) {
-
+                case 'SendMessage': {
-  let clientBuilder = NymClientBuilder.new_tester(
+                    const {message, recipient} = event.data.args;
-    topology,
+                    let uint8Array = new TextEncoder().encode(message);
-    onMessageHandler,
+                    await client.send_regular_message(uint8Array, recipient);
-    preferredGateway
+                    break;
-  );
+                }
-
+                case 'TestPacket': {
-  console.log("Web worker creating WASM client...");
+                    const {mixnodeIdentity} = event.data.args;
-  let local_client = await clientBuilder.start_client();
+                    const req = await client.try_construct_test_packet_request(mixnodeIdentity);
-  console.log("WASM client running!");
+                    await client.change_hardcoded_topology(req.injectable_topology());
-
+                    await client.try_send_test_packets(req);
-  const selfAddress = local_client.self_address();
+                    break;
-
+                }
-  // set the global (I guess we don't have to anymore?)
+            }
-  client = local_client;
-
-  console.log(`Client address is ${selfAddress}`);
-  self.postMessage({
-    kind: "Ready",
-    args: {
-      selfAddress,
-    },
-  });
-
-  // Set callback to handle messages passed to the worker.
-  self.onmessage = async (event) => {
-    console.log(event);
-    if (event.data && event.data.kind) {
-      switch (event.data.kind) {
-        case "SendMessage": {
-          const { message, recipient } = event.data.args;
-          let uint8Array = new TextEncoder().encode(message);
-          await client.send_regular_message(uint8Array, recipient);
-          break;
         }
-        case "TestPacket": {
+    };
-          const { mixnodeIdentity } = event.data.args;
-          const req = await client.try_construct_test_packet_request(
-            mixnodeIdentity
-          );
-          await client.change_hardcoded_topology(req.injectable_topology());
-          await client.try_send_test_packets(req);
-          break;
-        }
-      }
-    }
-  };
 }
 
 async function normalNymClientUsage() {
-  self.postMessage({ kind: "DisableMagicTestButton" });
+    self.postMessage({kind: 'DisableMagicTestButton'});
 
-  // only really useful if you want to adjust some settings like traffic rate
+    // only really useful if you want to adjust some settings like traffic rate
-  // (if not needed you can just pass a null)
+    // (if not needed you can just pass a null)
-  const debug = default_debug();
+    const debug = default_debug();
 
-  debug.disable_main_poisson_packet_distribution = true;
+    debug.disable_main_poisson_packet_distribution = true;
-  debug.disable_loop_cover_traffic_stream = true;
+    debug.disable_loop_cover_traffic_stream = true;
-  debug.use_extended_packet_size = false;
+    debug.use_extended_packet_size = false;
-  // debug.average_packet_delay_ms = BigInt(10);
+    // debug.average_packet_delay_ms = BigInt(10);
-  // debug.average_ack_delay_ms = BigInt(10);
+    // debug.average_ack_delay_ms = BigInt(10);
-  // debug.ack_wait_addition_ms = BigInt(3000);
+    // debug.ack_wait_addition_ms = BigInt(3000);
-  // debug.ack_wait_multiplier = 10;
+    // debug.ack_wait_multiplier = 10;
 
-  debug.topology_refresh_rate_ms = BigInt(60000);
+    debug.topology_refresh_rate_ms = BigInt(60000)
 
-  const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const preferredGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
-  const validator = "https://qwerty-validator-api.qa.nymte.ch/api";
+    const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
 
-  const config = new Config("my-awesome-wasm-client", validator, debug);
+    const config = new Config('my-awesome-wasm-client', validator, debug);
 
-  const onMessageHandler = (message) => {
+    const onMessageHandler = (message) => {
-    console.log(message);
+        console.log(message);
+        self.postMessage({
+            kind: 'ReceiveMessage',
+            args: {
+                message,
+            },
+        });
+    };
+
+    console.log('Instantiating WASM client...');
+
+    let localClient = await new NymClient(config, onMessageHandler)
+    console.log('WASM client running!');
+
+    const selfAddress = localClient.self_address();
+
+    // set the global (I guess we don't have to anymore?)
+    client = localClient;
+
+    console.log(`Client address is ${selfAddress}`);
     self.postMessage({
-      kind: "ReceiveMessage",
+        kind: 'Ready',
-      args: {
+        args: {
-        message,
+            selfAddress,
-      },
+        },
     });
-  };
 
-  console.log("Instantiating WASM client...");
+    // Set callback to handle messages passed to the worker.
-
+    self.onmessage = async event => {
-  let localClient = await new NymClient(config, onMessageHandler);
+        console.log(event)
-  console.log("WASM client running!");
+        if (event.data && event.data.kind) {
-
+            switch (event.data.kind) {
-  const selfAddress = localClient.self_address();
+                case 'SendMessage': {
-
+                    const {message, recipient} = event.data.args;
-  // set the global (I guess we don't have to anymore?)
+                    let uint8Array = new TextEncoder().encode(message);
-  client = localClient;
+                    await client.send_regular_message(uint8Array, recipient);
-
+                    break;
-  console.log(`Client address is ${selfAddress}`);
+                }
-  self.postMessage({
+            }
-    kind: "Ready",
-    args: {
-      selfAddress,
-    },
-  });
-
-  // Set callback to handle messages passed to the worker.
-  self.onmessage = async (event) => {
-    console.log(event);
-    if (event.data && event.data.kind) {
-      switch (event.data.kind) {
-        case "SendMessage": {
-          const { message, recipient } = event.data.args;
-          let uint8Array = new TextEncoder().encode(message);
-          await client.send_regular_message(uint8Array, recipient);
-          break;
         }
-      }
+    };
-    }
-  };
 }
 
 async function messWithStorage() {
-  self.onmessage = async (event) => {
+    self.onmessage = async event => {
-    if (event.data && event.data.kind) {
+        if (event.data && event.data.kind) {
-      switch (event.data.kind) {
+            switch (event.data.kind) {
-        case "TestPacket": {
+                case 'TestPacket': {
-          const { mixnodeIdentity } = event.data.args;
+                    const { mixnodeIdentity } = event.data.args;
-          console.log("button clicked...", mixnodeIdentity);
+                    console.log("button clicked...", mixnodeIdentity);
 
-          let id1 = "one";
+                    let id1 = "one";
-          let id2 = "two";
+                    let id2 = "two";
 
-          console.log("making store1 NO-ENC");
+                    console.log("making store1 NO-ENC");
-          let _storage1 = await ClientStorage.new_unencrypted(id1);
+                    let _storage1 = await ClientStorage.new_unencrypted(id1);
 
-          console.log("making store2 ENC");
+                    console.log("making store2 ENC")
-          let _storage2 = await new ClientStorage(id2, "my-secret-password");
+                    let _storage2 = await new ClientStorage(id2, "my-secret-password");
-          //
+                    //
-          //
+                    //
-          //
+                    //
-          //     console.log("attempting to use store1 WITH PASSWORD")
+                    //     console.log("attempting to use store1 WITH PASSWORD")
-          //     let _storage1_alt = await new ClientStorage(id1, "password");
+                    //     let _storage1_alt = await new ClientStorage(id1, "password");
-          //
+                    //
-          //
+                    //
-          //
+                    //
-          //     console.log("attempting to use store2 WITHOUT PASSWORD")
+                    //     console.log("attempting to use store2 WITHOUT PASSWORD")
-          //     let _storage2_alt = await ClientStorage.new_unencrypted(id2);
+                    //     let _storage2_alt = await ClientStorage.new_unencrypted(id2);
-          //
+                    //
-          //
+                    //
-          //
+                    //
-          //     console.log("attempting to use store2 with WRONG PASSWORD")
+                    //     console.log("attempting to use store2 with WRONG PASSWORD")
-          //     let _storage2_bad = await new ClientStorage(id2, "bad-password")
+                    //     let _storage2_bad = await new ClientStorage(id2, "bad-password")
 
-          //
+
-          // console.log("read1: ", await storage1.read());
+                    //
-          // console.log("read2: ", await storage2.read());
+                    // console.log("read1: ", await storage1.read());
-          //
+                    // console.log("read2: ", await storage2.read());
-          // console.log("store1: ", await storage1.store("FOOMP"));
+                    //
-          //
+                    // console.log("store1: ", await storage1.store("FOOMP"));
-          // console.log("read1: ", await storage1.read());
+                    //
-          // console.log("read2: ", await storage2.read());
+                    // console.log("read1: ", await storage1.read());
+                    // console.log("read2: ", await storage2.read());
+                }
+            }
         }
-      }
+    };
-    }
+
-  };
+
+
+
 }
 
 async function main() {
-  // load WASM package
+    // load WASM package
-  await wasm_bindgen("nym_client_wasm_bg.wasm");
+    await wasm_bindgen('nym_client_wasm_bg.wasm');
-  console.log("Loaded WASM");
+    console.log('Loaded WASM');
 
-  // sets up better stack traces in case of in-rust panics
+    // sets up better stack traces in case of in-rust panics
-  set_panic_hook();
+    set_panic_hook();
 
-  // show reconnection capabilities
+    // run test on simplified and dedicated tester:
-  // await testerReconnection()
+    // await testWithTester()
 
-  // run test on simplified and dedicated tester:
+    // hook-up the whole client for testing
-  await testWithTester();
+    // await testWithNymClient()
 
-  // 'Normal' client setup (to send 'normal' messages)
+    // 'Normal' client setup (to send 'normal' messages)
-  // await normalNymClientUsage()
+    await normalNymClientUsage()
 }
 
 // Let's get started!
-main();
+main();

clients/webassembly/src/client/config.rs

@@ -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,
@@ -246,7 +246,6 @@ impl From<TopologyWasm> for ConfigTopology {
                 topology.topology_resolution_timeout_ms,
             ),
             disable_refreshing: topology.disable_refreshing,
-            topology_structure: Default::default(),
         }
     }
 }

clients/webassembly/src/client/helpers.rs

@@ -114,7 +114,7 @@ impl WasmTopologyExt for Arc<ClientState> {
         let this = Arc::clone(self);
         future_to_promise(async move {
             let Some(current_topology) = this.topology_accessor.current_topology().await else {
-                return Err(WasmClientError::UnavailableNetworkTopology.into());
+                return Err(WasmClientError::UnavailableNetworkTopology.into())
             };
 
             match current_topology.find_mix_by_identity(&mixnode_identity) {
@@ -135,7 +135,7 @@ impl WasmTopologyExt for Arc<ClientState> {
         let this = Arc::clone(self);
         future_to_promise(async move {
             let Some(current_topology) = this.topology_accessor.current_topology().await else {
-                return Err(WasmClientError::UnavailableNetworkTopology.into());
+                return Err(WasmClientError::UnavailableNetworkTopology.into())
             };
 
             let Some(mix) = current_topology.find_mix_by_identity(&mixnode_identity) else {

clients/webassembly/src/client/mod.rs

@@ -14,6 +14,7 @@ use crate::storage::traits::FullWasmClientStorage;
 use crate::storage::ClientStorage;
 use crate::topology::WasmNymTopology;
 use js_sys::Promise;
+use nym_bandwidth_controller::wasm_mockups::{Client as FakeClient, DirectSigningNyxdClient};
 use nym_client_core::client::base_client::{
     BaseClientBuilder, ClientInput, ClientOutput, ClientState,
 };
@@ -25,7 +26,6 @@ use nym_task::TaskManager;
 use nym_topology::provider_trait::{HardcodedTopologyProvider, TopologyProvider};
 use nym_topology::NymTopology;
 use nym_validator_client::client::IdentityKey;
-use nym_validator_client::QueryReqwestRpcNyxdClient;
 use rand::rngs::OsRng;
 use rand::RngCore;
 use std::sync::Arc;
@@ -152,7 +152,7 @@ impl NymClientBuilder {
         let maybe_topology_provider = self.topology_provider();
 
         let mut base_builder: BaseClientBuilder<_, FullWasmClientStorage> =
-            BaseClientBuilder::<QueryReqwestRpcNyxdClient, _>::new(
+            BaseClientBuilder::<FakeClient<DirectSigningNyxdClient>, _>::new(
                 &self.config.base,
                 storage,
                 None,

clients/webassembly/src/encoded_payload_helper.rs

@@ -52,7 +52,7 @@ pub fn encode_payload_with_headers(
         Ok(metadata) => {
             let metadata = metadata.as_bytes().to_vec();
             let size = (metadata.len() as u64).to_be_bytes().to_vec();
-            Ok([size, metadata, payload].concat())
+            Ok(vec![size, metadata, payload].concat())
         }
         Err(e) => Err(JsValue::from(JsError::new(
             format!("Could not encode message: {}", e).as_str(),

clients/webassembly/src/error.rs

@@ -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;

clients/webassembly/src/helpers.rs

@@ -8,7 +8,7 @@ use js_sys::Promise;
 use nym_client_core::client::replies::reply_storage::browser_backend;
 use nym_client_core::config;
 use nym_client_core::init::helpers::current_gateways;
-use nym_client_core::init::{setup_gateway_from, GatewaySetup, InitialisationResult};
+use nym_client_core::init::{setup_gateway_from, GatewaySetup, InitialisationDetails};
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_topology::{gateway, NymTopology};
@@ -82,14 +82,14 @@ async fn setup_gateway(
     client_store: &ClientStorage,
     chosen_gateway: Option<IdentityKey>,
     gateways: &[gateway::Node],
-) -> Result<InitialisationResult, WasmClientError> {
+) -> Result<InitialisationDetails, WasmClientError> {
     let setup = if client_store.has_full_gateway_info().await? {
         GatewaySetup::MustLoad
     } else {
         GatewaySetup::new_fresh(chosen_gateway.clone(), None)
     };
 
-    setup_gateway_from(setup, client_store, client_store, false, Some(gateways))
+    setup_gateway_from(&setup, client_store, client_store, false, Some(gateways))
         .await
         .map_err(Into::into)
 }
@@ -98,7 +98,7 @@ pub(crate) async fn setup_gateway_from_api(
     client_store: &ClientStorage,
     chosen_gateway: Option<IdentityKey>,
     nym_apis: &[Url],
-) -> Result<InitialisationResult, WasmClientError> {
+) -> Result<InitialisationDetails, WasmClientError> {
     let mut rng = thread_rng();
     let gateways = current_gateways(&mut rng, nym_apis).await?;
     setup_gateway(client_store, chosen_gateway, &gateways).await
@@ -108,7 +108,7 @@ pub(crate) async fn setup_from_topology(
     explicit_gateway: Option<IdentityKey>,
     topology: &NymTopology,
     client_store: &ClientStorage,
-) -> Result<InitialisationResult, WasmClientError> {
+) -> Result<InitialisationDetails, WasmClientError> {
     let gateways = topology.gateways();
     setup_gateway(client_store, explicit_gateway, gateways).await
 }

clients/webassembly/src/lib.rs

@@ -1,10 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-// After reading https://github.com/rust-lang/rust-clippy/issues/11382
-// I suspect we *maybe* have hit a false positive, but I'm not sure.
-#![allow(clippy::arc_with_non_send_sync)]
-
 use wasm_bindgen::prelude::*;
 
 #[cfg(target_arch = "wasm32")]

clients/webassembly/src/storage/mod.rs

@@ -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";