Merge branch 'feature/mixnode-sandbox-cycles' of https://github.com/nymtech/nym into feature/mixnode-sandbox-cycles

warnings on ci
Update build-upload-binaries.yml
2023-12-20 17:04:20 +01:00 · 2023-12-20 16:56:12 +01:00 · 2023-12-20 16:40:02 +01:00 · 2023-12-20 16:38:54 +01:00 · 2023-12-20 15:20:56 +00:00 · 2023-12-20 16:16:45 +01:00
2966 changed files with 135207 additions and 219526 deletions
@@ -0,0 +1,9 @@
 # Description
 Closes: #XXXX
 <!-- If appropriate, insert relevant description here -->
 # Checklist:
 - [ ] added a changelog entry to `CHANGELOG.md`
@@ -14,20 +14,12 @@ inputs:
    description: 'The tag/release to process. Uses the release id when trigger from a release.'
    required: false
    default: ''
  repo:
    description: 'The repo to use. Defaults to "nym".'
    required: false
    default: 'nym'
  owner:
    description: 'The repo owner to use. Defaults to "nymtech".'
    required: false
    default: 'nymtech'
 outputs:
  hashes:
    description: 'A string containing JSON with the release asset hashes and signatures'
 runs:
-  using: 'node20'
+  using: 'node16'
-  main: 'dist/index.js'
+  main: 'index.js'
 branding:
  icon: 'hash'
  color: 'green'
@@ -11,14 +11,10 @@ function getBinInfo(path) {
        let mode = fs.statSync(path).mode
        fs.chmodSync(path, mode | 0o111)
-        const cmd = `${path} build-info --output=json`;
+        const raw = execSync(`${path} build-info --output=json`, { stdio: 'pipe', encoding: "utf8" });
        console.log(`🚚 Running ${cmd}... (for max of 3 seconds, then SIGTERM)`);
        const raw = execSync(cmd, { stdio: 'pipe', encoding: "utf8", timeout: 3000 });
        const parsed = JSON.parse(raw)
        console.log(`    ✅ ok`);
        return parsed
    } catch (_) {
        console.log(`    ❌ failed`);
        return undefined
    }
 }
@@ -28,11 +24,8 @@ async function run(assets, algorithm, filename, cache) {
        console.warn("cache is set to 'false', but we we no longer support it")
    }
    const directory = path.join(process.env.RUNNER_TEMP || '.tmp', process.env.GITHUB_RUN_ID || '');
    console.log('Temporary directory: ', directory);
    try {
-        fs.mkdirSync(directory, { recursive: true });
+        fs.mkdirSync('.tmp');
    } catch(e) {
        // ignore
    }
@@ -47,13 +40,13 @@ async function run(assets, algorithm, filename, cache) {
            let sig = null;
            // cache in `${WORKING_DIR}/.tmp/`
-            const cacheFilename = path.join(directory, `${asset.name}`);
+            const cacheFilename = path.resolve(`.tmp/${asset.name}`);
            if(!fs.existsSync(cacheFilename)) {
-                console.log(`⬇️ Downloading ${asset.browser_download_url}... to ${cacheFilename} [${numAwaiting} of ${assets.length}]`);
+                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}`);
+                console.log(`Loading from ${cacheFilename}`);
                buffer = Buffer.from(fs.readFileSync(cacheFilename));
                // console.log('Reading signature from content');
@@ -138,7 +131,6 @@ async function run(assets, algorithm, filename, cache) {
            }
        }
    }
    console.log(`Completed hashing ${assets.length} files`);
    return hashes;
 }
@@ -150,7 +142,7 @@ export async function createHashes({ assets, algorithm, filename, cache }) {
    return output;
 }
-export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algorithm = 'sha256', filename = 'hashes.json', cache = false, upload = true, owner = 'nymtech', repo = 'nym' }) {
+export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algorithm = 'sha256', filename = 'hashes.json', cache = false, upload = true }) {
    console.log("🚀🚀🚀 Getting releases");
    let auth;
@@ -165,6 +157,8 @@ export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrI
        auth: process.env.GITHUB_TOKEN,
        request: { fetch }
    });
    const owner = "nymtech";
    const repo = "nym";
    let releases;
    if(cache) {
@@ -218,14 +212,7 @@ export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrI
    releasesToProcess.forEach(release => {
        const {tag_name, name} = release;
-        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+(\.\S+)?)/);
+        const tagComponents = tag_name.split('-v');
        if(!matches || matches.length < 2) {
            console.warn('Could not match version structure in tag name = ', tag_name);
            return;
        }
        const tagComponents = matches.slice(1);
        const componentName = tagComponents[0];
        const componentVersion = 'v' + tagComponents[1];
@@ -1,450 +0,0 @@
 export const id = 37;
 export const ids = [37];
 export const modules = {
 /***/ 4037:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "toFormData": () => (/* binding */ toFormData)
 /* harmony export */ });
 /* harmony import */ var fetch_blob_from_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2777);
 /* harmony import */ var formdata_polyfill_esm_min_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8010);
 let s = 0;
 const S = {
 	START_BOUNDARY: s++,
 	HEADER_FIELD_START: s++,
 	HEADER_FIELD: s++,
 	HEADER_VALUE_START: s++,
 	HEADER_VALUE: s++,
 	HEADER_VALUE_ALMOST_DONE: s++,
 	HEADERS_ALMOST_DONE: s++,
 	PART_DATA_START: s++,
 	PART_DATA: s++,
 	END: s++
 };
 let f = 1;
 const F = {
 	PART_BOUNDARY: f,
 	LAST_BOUNDARY: f *= 2
 };
 const LF = 10;
 const CR = 13;
 const SPACE = 32;
 const HYPHEN = 45;
 const COLON = 58;
 const A = 97;
 const Z = 122;
 const lower = c => c | 0x20;
 const noop = () => {};
 class MultipartParser {
 	/**
 	 * @param {string} boundary
 	 */
 	constructor(boundary) {
 		this.index = 0;
 		this.flags = 0;
 		this.onHeaderEnd = noop;
 		this.onHeaderField = noop;
 		this.onHeadersEnd = noop;
 		this.onHeaderValue = noop;
 		this.onPartBegin = noop;
 		this.onPartData = noop;
 		this.onPartEnd = noop;
 		this.boundaryChars = {};
 		boundary = '\r\n--' + boundary;
 		const ui8a = new Uint8Array(boundary.length);
 		for (let i = 0; i < boundary.length; i++) {
 			ui8a[i] = boundary.charCodeAt(i);
 			this.boundaryChars[ui8a[i]] = true;
 		}
 		this.boundary = ui8a;
 		this.lookbehind = new Uint8Array(this.boundary.length + 8);
 		this.state = S.START_BOUNDARY;
 	}
 	/**
 	 * @param {Uint8Array} data
 	 */
 	write(data) {
 		let i = 0;
 		const length_ = data.length;
 		let previousIndex = this.index;
 		let {lookbehind, boundary, boundaryChars, index, state, flags} = this;
 		const boundaryLength = this.boundary.length;
 		const boundaryEnd = boundaryLength - 1;
 		const bufferLength = data.length;
 		let c;
 		let cl;
 		const mark = name => {
 			this[name + 'Mark'] = i;
 		};
 		const clear = name => {
 			delete this[name + 'Mark'];
 		};
 		const callback = (callbackSymbol, start, end, ui8a) => {
 			if (start === undefined || start !== end) {
 				this[callbackSymbol](ui8a && ui8a.subarray(start, end));
 			}
 		};
 		const dataCallback = (name, clear) => {
 			const markSymbol = name + 'Mark';
 			if (!(markSymbol in this)) {
 				return;
 			}
 			if (clear) {
 				callback(name, this[markSymbol], i, data);
 				delete this[markSymbol];
 			} else {
 				callback(name, this[markSymbol], data.length, data);
 				this[markSymbol] = 0;
 			}
 		};
 		for (i = 0; i < length_; i++) {
 			c = data[i];
 			switch (state) {
 				case S.START_BOUNDARY:
 					if (index === boundary.length - 2) {
 						if (c === HYPHEN) {
 							flags |= F.LAST_BOUNDARY;
 						} else if (c !== CR) {
 							return;
 						}
 						index++;
 						break;
 					} else if (index - 1 === boundary.length - 2) {
 						if (flags & F.LAST_BOUNDARY && c === HYPHEN) {
 							state = S.END;
 							flags = 0;
 						} else if (!(flags & F.LAST_BOUNDARY) && c === LF) {
 							index = 0;
 							callback('onPartBegin');
 							state = S.HEADER_FIELD_START;
 						} else {
 							return;
 						}
 						break;
 					}
 					if (c !== boundary[index + 2]) {
 						index = -2;
 					}
 					if (c === boundary[index + 2]) {
 						index++;
 					}
 					break;
 				case S.HEADER_FIELD_START:
 					state = S.HEADER_FIELD;
 					mark('onHeaderField');
 					index = 0;
 					// falls through
 				case S.HEADER_FIELD:
 					if (c === CR) {
 						clear('onHeaderField');
 						state = S.HEADERS_ALMOST_DONE;
 						break;
 					}
 					index++;
 					if (c === HYPHEN) {
 						break;
 					}
 					if (c === COLON) {
 						if (index === 1) {
 							// empty header field
 							return;
 						}
 						dataCallback('onHeaderField', true);
 						state = S.HEADER_VALUE_START;
 						break;
 					}
 					cl = lower(c);
 					if (cl < A || cl > Z) {
 						return;
 					}
 					break;
 				case S.HEADER_VALUE_START:
 					if (c === SPACE) {
 						break;
 					}
 					mark('onHeaderValue');
 					state = S.HEADER_VALUE;
 					// falls through
 				case S.HEADER_VALUE:
 					if (c === CR) {
 						dataCallback('onHeaderValue', true);
 						callback('onHeaderEnd');
 						state = S.HEADER_VALUE_ALMOST_DONE;
 					}
 					break;
 				case S.HEADER_VALUE_ALMOST_DONE:
 					if (c !== LF) {
 						return;
 					}
 					state = S.HEADER_FIELD_START;
 					break;
 				case S.HEADERS_ALMOST_DONE:
 					if (c !== LF) {
 						return;
 					}
 					callback('onHeadersEnd');
 					state = S.PART_DATA_START;
 					break;
 				case S.PART_DATA_START:
 					state = S.PART_DATA;
 					mark('onPartData');
 					// falls through
 				case S.PART_DATA:
 					previousIndex = index;
 					if (index === 0) {
 						// boyer-moore derrived algorithm to safely skip non-boundary data
 						i += boundaryEnd;
 						while (i < bufferLength && !(data[i] in boundaryChars)) {
 							i += boundaryLength;
 						}
 						i -= boundaryEnd;
 						c = data[i];
 					}
 					if (index < boundary.length) {
 						if (boundary[index] === c) {
 							if (index === 0) {
 								dataCallback('onPartData', true);
 							}
 							index++;
 						} else {
 							index = 0;
 						}
 					} else if (index === boundary.length) {
 						index++;
 						if (c === CR) {
 							// CR = part boundary
 							flags |= F.PART_BOUNDARY;
 						} else if (c === HYPHEN) {
 							// HYPHEN = end boundary
 							flags |= F.LAST_BOUNDARY;
 						} else {
 							index = 0;
 						}
 					} else if (index - 1 === boundary.length) {
 						if (flags & F.PART_BOUNDARY) {
 							index = 0;
 							if (c === LF) {
 								// unset the PART_BOUNDARY flag
 								flags &= ~F.PART_BOUNDARY;
 								callback('onPartEnd');
 								callback('onPartBegin');
 								state = S.HEADER_FIELD_START;
 								break;
 							}
 						} else if (flags & F.LAST_BOUNDARY) {
 							if (c === HYPHEN) {
 								callback('onPartEnd');
 								state = S.END;
 								flags = 0;
 							} else {
 								index = 0;
 							}
 						} else {
 							index = 0;
 						}
 					}
 					if (index > 0) {
 						// when matching a possible boundary, keep a lookbehind reference
 						// in case it turns out to be a false lead
 						lookbehind[index - 1] = c;
 					} else if (previousIndex > 0) {
 						// if our boundary turned out to be rubbish, the captured lookbehind
 						// belongs to partData
 						const _lookbehind = new Uint8Array(lookbehind.buffer, lookbehind.byteOffset, lookbehind.byteLength);
 						callback('onPartData', 0, previousIndex, _lookbehind);
 						previousIndex = 0;
 						mark('onPartData');
 						// reconsider the current character even so it interrupted the sequence
 						// it could be the beginning of a new sequence
 						i--;
 					}
 					break;
 				case S.END:
 					break;
 				default:
 					throw new Error(`Unexpected state entered: ${state}`);
 			}
 		}
 		dataCallback('onHeaderField');
 		dataCallback('onHeaderValue');
 		dataCallback('onPartData');
 		// Update properties for the next call
 		this.index = index;
 		this.state = state;
 		this.flags = flags;
 	}
 	end() {
 		if ((this.state === S.HEADER_FIELD_START && this.index === 0) ||
 			(this.state === S.PART_DATA && this.index === this.boundary.length)) {
 			this.onPartEnd();
 		} else if (this.state !== S.END) {
 			throw new Error('MultipartParser.end(): stream ended unexpectedly');
 		}
 	}
 }
 function _fileName(headerValue) {
 	// matches either a quoted-string or a token (RFC 2616 section 19.5.1)
 	const m = headerValue.match(/\bfilename=("(.*?)"|([^()<>@,;:\\"/[\]?={}\s\t]+))($|;\s)/i);
 	if (!m) {
 		return;
 	}
 	const match = m[2] || m[3] || '';
 	let filename = match.slice(match.lastIndexOf('\\') + 1);
 	filename = filename.replace(/%22/g, '"');
 	filename = filename.replace(/&#(\d{4});/g, (m, code) => {
 		return String.fromCharCode(code);
 	});
 	return filename;
 }
 async function toFormData(Body, ct) {
 	if (!/multipart/i.test(ct)) {
 		throw new TypeError('Failed to fetch');
 	}
 	const m = ct.match(/boundary=(?:"([^"]+)"|([^;]+))/i);
 	if (!m) {
 		throw new TypeError('no or bad content-type header, no multipart boundary');
 	}
 	const parser = new MultipartParser(m[1] || m[2]);
 	let headerField;
 	let headerValue;
 	let entryValue;
 	let entryName;
 	let contentType;
 	let filename;
 	const entryChunks = [];
 	const formData = new formdata_polyfill_esm_min_js__WEBPACK_IMPORTED_MODULE_1__/* .FormData */ .Ct();
 	const onPartData = ui8a => {
 		entryValue += decoder.decode(ui8a, {stream: true});
 	};
 	const appendToFile = ui8a => {
 		entryChunks.push(ui8a);
 	};
 	const appendFileToFormData = () => {
 		const file = new fetch_blob_from_js__WEBPACK_IMPORTED_MODULE_0__/* .File */ .$B(entryChunks, filename, {type: contentType});
 		formData.append(entryName, file);
 	};
 	const appendEntryToFormData = () => {
 		formData.append(entryName, entryValue);
 	};
 	const decoder = new TextDecoder('utf-8');
 	decoder.decode();
 	parser.onPartBegin = function () {
 		parser.onPartData = onPartData;
 		parser.onPartEnd = appendEntryToFormData;
 		headerField = '';
 		headerValue = '';
 		entryValue = '';
 		entryName = '';
 		contentType = '';
 		filename = null;
 		entryChunks.length = 0;
 	};
 	parser.onHeaderField = function (ui8a) {
 		headerField += decoder.decode(ui8a, {stream: true});
 	};
 	parser.onHeaderValue = function (ui8a) {
 		headerValue += decoder.decode(ui8a, {stream: true});
 	};
 	parser.onHeaderEnd = function () {
 		headerValue += decoder.decode();
 		headerField = headerField.toLowerCase();
 		if (headerField === 'content-disposition') {
 			// matches either a quoted-string or a token (RFC 2616 section 19.5.1)
 			const m = headerValue.match(/\bname=("([^"]*)"|([^()<>@,;:\\"/[\]?={}\s\t]+))/i);
 			if (m) {
 				entryName = m[2] || m[3] || '';
 			}
 			filename = _fileName(headerValue);
 			if (filename) {
 				parser.onPartData = appendToFile;
 				parser.onPartEnd = appendFileToFormData;
 			}
 		} else if (headerField === 'content-type') {
 			contentType = headerValue;
 		}
 		headerValue = '';
 		headerField = '';
 	};
 	for await (const chunk of Body) {
 		parser.write(chunk);
 	}
 	parser.end();
 	return formData;
 }
 /***/ })
 };
@@ -1,57 +0,0 @@
 'use strict';
 const fs = require('fs');
 const crypto = require('crypto');
 const {parentPort} = require('worker_threads');
 const handlers = {
 	hashFile: (algorithm, filePath) => new Promise((resolve, reject) => {
 		const hasher = crypto.createHash(algorithm);
 		fs.createReadStream(filePath)
 			// TODO: Use `Stream.pipeline` when targeting Node.js 12.
 			.on('error', reject)
 			.pipe(hasher)
 			.on('error', reject)
 			.on('finish', () => {
 				const {buffer} = new Uint8Array(hasher.read());
 				resolve({value: buffer, transferList: [buffer]});
 			});
 	}),
 	hash: async (algorithm, input) => {
 		const hasher = crypto.createHash(algorithm);
 		if (Array.isArray(input)) {
 			for (const part of input) {
 				hasher.update(part);
 			}
 		} else {
 			hasher.update(input);
 		}
 		const {buffer} = new Uint8Array(hasher.digest());
 		return {value: buffer, transferList: [buffer]};
 	}
 };
 parentPort.on('message', async message => {
 	try {
 		const {method, args} = message;
 		const handler = handlers[method];
 		if (handler === undefined) {
 			throw new Error(`Unknown method '${method}'`);
 		}
 		const {value, transferList} = await handler(...args);
 		parentPort.postMessage({id: message.id, value}, transferList);
 	} catch (error) {
 		const newError = {message: error.message, stack: error.stack};
 		for (const [key, value] of Object.entries(error)) {
 			if (typeof value !== 'object') {
 				newError[key] = value;
 			}
 		}
 		parentPort.postMessage({id: message.id, error: newError});
 	}
 });
@@ -0,0 +1,15 @@
 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);
 }
@@ -1,28 +1,26 @@
 {
-  "name": "nym-hash-release",
+  "name": "ghaction-generate-release-hashes",
  "version": "1.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
-      "name": "nym-hash-release",
+      "name": "ghaction-generate-release-hashes",
      "version": "1.0.0",
      "license": "MIT",
      "dependencies": {
-        "@actions/core": "^1.10.1",
+        "@actions/core": "^1.10.0",
        "@actions/github": "^5.1.1",
-        "@octokit/auth-action": "^4.0.1",
+        "@octokit/auth-action": "^4.0.0",
-        "@octokit/rest": "^20.0.2",
+        "@octokit/rest": "^20.0.1",
        "hasha": "^5.2.0",
        "node-fetch": "^3.2.10"
      },
      "devDependencies": {
        "@vercel/ncc": "^0.38.1"
      }
    },
    "node_modules/@actions/core": {
-      "version": "1.10.1",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
      "dependencies": {
        "@actions/http-client": "^2.0.1",
        "uuid": "^8.3.2"
@@ -48,12 +46,12 @@
      }
    },
    "node_modules/@octokit/auth-action": {
-      "version": "4.0.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-action/-/auth-action-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-action/-/auth-action-4.0.0.tgz",
-      "integrity": "sha512-mJLOcFFafIivLZ7BEkGDCTFoHPJv7BeL5Zwy7j5qMDU0b/DKshhi6GCU9tw3vmKhOxTNquYfvwqsEfPpemaaxg==",
+      "integrity": "sha512-sMm9lWZdiX6e89YFaLrgE9EFs94k58BwIkvjOtozNWUqyTmsrnWFr/M5LolaRzZ7Kmb5FbhF9hi7FEeE274SoQ==",
      "dependencies": {
        "@octokit/auth-token": "^4.0.0",
-        "@octokit/types": "^12.0.0"
+        "@octokit/types": "^11.0.0"
      },
      "engines": {
        "node": ">= 18"
@@ -68,16 +66,16 @@
      }
    },
    "node_modules/@octokit/auth-action/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
+      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
+      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
    },
    "node_modules/@octokit/auth-action/node_modules/@octokit/types": {
-      "version": "12.6.0",
+      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/openapi-types": "^18.0.0"
      }
    },
    "node_modules/@octokit/auth-token": {
@@ -193,14 +191,14 @@
      }
    },
    "node_modules/@octokit/rest": {
-      "version": "20.0.2",
+      "version": "20.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.0.1.tgz",
-      "integrity": "sha512-Ux8NDgEraQ/DMAU1PlAohyfBBXDwhnX2j33Z1nJNziqAfHi70PuxkFYIcIt8aIAxtRE7KVuKp8lSR8pA0J5iOQ==",
+      "integrity": "sha512-wROV21RwHQIMNb2Dgd4+pY+dVy1Dwmp85pBrgr6YRRDYRBu9Gb+D73f4Bl2EukZSj5hInq2Tui9o7gAQpc2k2Q==",
      "dependencies": {
        "@octokit/core": "^5.0.0",
-        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/plugin-paginate-rest": "^8.0.0",
        "@octokit/plugin-request-log": "^4.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^10.0.0"
+        "@octokit/plugin-rest-endpoint-methods": "^9.0.0"
      },
      "engines": {
        "node": ">= 18"
@@ -263,30 +261,17 @@
      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest": {
-      "version": "9.2.1",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-8.0.0.tgz",
-      "integrity": "sha512-wfGhE/TAkXZRLjksFXuDZdmGnJQHvtU/joFQdweXUgzo1XwvBCD4o4+75NtFfjfLK5IwLf9vHTfSiU3sLRYpRw==",
+      "integrity": "sha512-2xZ+baZWUg+qudVXnnvXz7qfrTmDeYPCzangBVq/1gXxii/OiS//4shJp9dnCCvj1x+JAm9ji1Egwm1BA47lPQ==",
      "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^11.0.0"
      },
      "engines": {
        "node": ">= 18"
      },
      "peerDependencies": {
-        "@octokit/core": "5"
+        "@octokit/core": ">=5"
      }
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
      "version": "20.0.0",
      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
      "version": "12.6.0",
      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
      "dependencies": {
        "@octokit/openapi-types": "^20.0.0"
      }
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-request-log": {
@@ -301,30 +286,17 @@
      }
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "10.4.1",
+      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-9.0.0.tgz",
-      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "integrity": "sha512-KquMF/VB1IkKNiVnzJKspY5mFgGyLd7HzdJfVEGTJFzqu9BRFNWt+nwTCMuUiWc72gLQhRWYubTwOkQj+w/1PA==",
      "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^11.0.0"
      },
      "engines": {
        "node": ">= 18"
      },
      "peerDependencies": {
-        "@octokit/core": "5"
+        "@octokit/core": ">=5"
      }
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
      "version": "20.0.0",
      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
      "version": "12.6.0",
      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
      "dependencies": {
        "@octokit/openapi-types": "^20.0.0"
      }
    },
    "node_modules/@octokit/rest/node_modules/@octokit/request": {
@@ -371,15 +343,6 @@
        "@octokit/openapi-types": "^12.11.0"
      }
    },
    "node_modules/@vercel/ncc": {
      "version": "0.38.1",
      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.38.1.tgz",
      "integrity": "sha512-IBBb+iI2NLu4VQn3Vwldyi2QwaXt5+hTyh58ggAMoCGE6DJmPvwL3KPBWcJl1m9LYPChBLE980Jw+CS4Wokqxw==",
      "dev": true,
      "bin": {
        "ncc": "dist/ncc/cli.js"
      }
    },
    "node_modules/before-after-hook": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
@@ -2,6 +2,17 @@
  "name": "nym-hash-release",
  "version": "1.0.0",
  "description": "Generate hashes and signatures for assets in Nym releases",
-  "main": "dist/index.js",
+  "main": "index.js",
-  "type": "module"
+  "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"
  }
 }
@@ -0,0 +1,6 @@
 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});
@@ -1,14 +0,0 @@
 # nym-hash-release
 This is the source code for the custom GitHub Action to calculate hashes.
 It is in a subdirectory to avoid issues with `package.json`.
 ## Build
 The following will bundle all code and dependencies into the `dist` folder, and copy it into place for GitHub Actions.
 ```
 npm run build
 npm run dist:copy
 ```
@@ -1,21 +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");
 const owner = core.getInput("owner");
 const repo = core.getInput("repo");
 async function main() {
 // 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, owner, repo})
    } catch (error) {
        core.setFailed(error.message);
    }
 }
 main().catch(error => core.setFailed(error.message));
@@ -1,23 +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",
    "build": "ncc build index.js -o dist",
    "dist:copy": "mkdir -p ../dist && cp dist/*.js ../dist"
  },
  "dependencies": {
    "@actions/core": "^1.10.1",
    "@actions/github": "^5.1.1",
    "@octokit/auth-action": "^4.0.1",
    "@octokit/rest": "^20.0.2",
    "hasha": "^5.2.0",
    "node-fetch": "^3.2.10"
  },
  "devDependencies": {
    "@vercel/ncc": "^0.38.1"
  }
 }
@@ -1,11 +0,0 @@
 import {createHashesFromReleaseTagOrNameOrId} from './create-hashes.mjs';
 const cache = true;
 await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-binaries-v2024.1-marabou', cache, upload: false});
 await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-vpn-desktop-v0.0.8', cache, upload: false, repo: 'nym-vpn-client'});
 // 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});
@@ -0,0 +1,64 @@
 name: ci-build-upload-binaries
 on:
  workflow_dispatch:
  pull_request:
    paths:
      - 'mixnode/**'
 jobs:
  publish-nym:
    strategy:
      fail-fast: false
      matrix:
        platform: [ubuntu-20.04]
    runs-on: ${{ matrix.platform }}
    env:
      CARGO_TERM_COLOR: always
      RUSTFLAGS: "--cfg tokio_unstable"
    steps:
      - uses: actions/checkout@v3
      - name: Prepare build output directory
        shell: bash
        env:
          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
        run: |
          rm -rf ci-builds || true
          mkdir -p $OUTPUT_DIR
          echo $OUTPUT_DIR
      - name: Install Dependencies (Linux)
        run: sudo apt update && sudo apt install libudev-dev
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Build mixnode binary
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: --release --features cpucycles --package nym-mixnode
      - name: Prepare build output
        shell: bash
        env:
          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
        run: |
          cp target/release/nym-mixnode $OUTPUT_DIR
      - 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: "-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/"
@@ -9,11 +9,7 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
      - name: Install pip3
        run: sudo apt install -y python3-pip  
      - name: Install Python3 modules
        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -34,24 +30,9 @@ jobs:
      - name: Remove existing Nym config directory (`~/.nym/`)
        run: cd documentation && ./remove_existing_config.sh
        continue-on-error: false
-# This is the original flow
+      - name: Build all projects in documentation/ & move to ~/dist/docs/
 #      - name: Build all projects in documentation/ & move to ~/dist/docs/
 #        run: cd documentation && ./build_all_to_dist.sh
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh
-
+        continue-on-error: false
      - name: Switch to current branch
        run: git checkout $echo "$(cat ~/current_branch)"
      - name: Build all projects in documentation/ & move to ~/dist/docs/ on current branch
        run: cd documentation && ./build_all_to_dist.sh && rm ~/current_branch
 # End of replacemet
      - name: Post process
        run: cd documentation && ./post_process.sh
@@ -2,42 +2,27 @@ name: ci-build-upload-binaries
 on:
  workflow_dispatch:
    inputs:
      add_tokio_unstable:
        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
        required: true
        default: false
        type: boolean
      enable_deb:
        description: "True to enable cargo-deb installation and .deb package building"
        required: false
        default: false
        type: boolean
  schedule:
    - cron: "14 0 * * *"
  pull_request:
    paths:
-      - "clients/**"
+      - 'clients/**'
-      - "common/**"
+      - 'common/**'
-      - "explorer-api/**"
+      - 'explorer-api/**'
-      - "gateway/**"
+      - 'gateway/**'
-      - "integrations/**"
+      - 'integrations/**'
-      - "mixnode/**"
+      - 'mixnode/**'
-      - "nym-api/**"
+      - 'sdk/rust/nym-sdk/**'
-      - "nym-node/**"
+      - 'service-providers/**'
-      - "nym-outfox/**"
+      - 'nym-api/**'
-      - "nym-validator-rewarder/**"
+      - 'nym-outfox/**'
-      - "sdk/rust/nym-sdk/**"
+      - 'tools/nym-cli/**'
-      - "service-providers/**"
+      - 'tools/ts-rs-cli/**'
      - "tools/**"
      - "nymvisor/**"
 jobs:
  publish-nym:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ ubuntu-20.04 ]
+        platform: [ubuntu-20.04]
    runs-on: ${{ matrix.platform }}
    env:
@@ -57,15 +42,6 @@ jobs:
      - name: Install Dependencies (Linux)
        run: sudo apt update && sudo apt install libudev-dev
      - name: Sets env vars for tokio if set in manual dispatch inputs
        run: |
          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true
      - name: Set CARGO_FEATURES
        run: |
          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -75,54 +51,22 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --workspace --release ${{ env.CARGO_FEATURES }}
+          args: --workspace --release
      - name: Install cargo-deb
        uses: actions-rs/cargo@v1
        with:
          command: install
          args: cargo-deb
        if: github.event_name == 'workflow_dispatch' && inputs.enable_deb == true
      - name: Build deb packages
        shell: bash
        run: make deb
        if: github.event_name == 'workflow_dispatch' && inputs.enable_deb == true
      - name: Upload Artifact
        if: github.event_name == 'workflow_dispatch'
        uses: actions/upload-artifact@v3
        with:
          name: nym-binaries-artifacts
          path: |
            target/release/nym-client
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
          retention-days: 30
      # If this was a pull_request or nightly, upload to build server
      - name: Prepare build output
        # if: github.event_name == 'schedule' || github.event_name == 'pull_request'
        shell: bash
        env:
          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
        run: |
          cp target/release/nym-client $OUTPUT_DIR
          cp target/release/nym-gateway $OUTPUT_DIR
          cp target/release/nym-mixnode $OUTPUT_DIR
          cp target/release/nym-socks5-client $OUTPUT_DIR
          cp target/release/nym-api $OUTPUT_DIR
          cp target/release/nym-network-requester $OUTPUT_DIR
-          cp target/release/nymvisor $OUTPUT_DIR
+          cp target/release/nym-network-statistics $OUTPUT_DIR
          cp target/release/nym-node $OUTPUT_DIR
          cp target/release/nym-cli $OUTPUT_DIR
          cp target/release/explorer-api $OUTPUT_DIR
          if [ ${{ github.event_name == 'workflow_dispatch' && inputs.enable_deb == true }} = true ]; then
            cp target/debian/*.deb $OUTPUT_DIR
          fi
      - name: Deploy branch to CI www
        continue-on-error: true
@@ -6,6 +6,7 @@ on:
      - 'clients/**'
      - 'common/**'
      - 'explorer-api/**'
      - 'ephemera/**'
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
@@ -23,6 +24,7 @@ on:
      - 'clients/**'
      - 'common/**'
      - 'explorer-api/**'
      - 'ephemera/**'
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
@@ -1,8 +1,5 @@
 name: ci-cargo-deny
-on:
+on: [workflow_dispatch]
  workflow_dispatch:
  pull_request:
 jobs:
  cargo-deny:
    runs-on: ubuntu-22.04
@@ -10,7 +7,10 @@ jobs:
      matrix:
        checks:
          # - advisories
-          - licenses bans sources
+          - licenses
          - bans sources
    continue-on-error: ${{ matrix.checks == 'licenses' }}
    steps:
    - uses: actions/checkout@v3
@@ -15,7 +15,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ ubuntu-20.04 ]
+        platform: [ubuntu-20.04]
    runs-on: ${{ matrix.platform }}
    env:
@@ -35,7 +35,7 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.77
+          toolchain: stable
          target: wasm32-unknown-unknown
          override: true
@@ -58,7 +58,9 @@ jobs:
          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_dkg.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
-          cp contracts/target/wasm32-unknown-unknown/release/nym_ecash.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
@@ -13,11 +13,7 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
      - name: Install pip3
        run: sudo apt install -y python3-pip  
      - name: Install Python3 modules
        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -38,25 +34,9 @@ jobs:
      - name: Remove existing Nym config directory (`~/.nym/`)
        run: cd documentation && ./remove_existing_config.sh
        continue-on-error: false
-
+      - name: Build all projects in documentation/ & move to ~/dist/docs/
 # This is the original flow
 #      - name: Build all projects in documentation/ & move to ~/dist/docs/
 #        run: cd documentation && ./build_all_to_dist.sh
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh
-
+        continue-on-error: false
      - name: Switch to current branch
        run: git checkout $echo "$(cat ~/current_branch)"
      - name: Build all projects in documentation/ & move to ~/dist/docs/ on current branch
        run: cd documentation && ./build_all_to_dist.sh && rm ~/current_branch
 # End of replacemet
      - name: Deploy branch to CI www
        continue-on-error: true
@@ -17,9 +17,6 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: install yarn in root
        run: cd ../.. && yarn install
      - name: Install npm
        run: npm install
@@ -0,0 +1,65 @@
 name: ci-nym-connect-desktop-rust
 on:
  pull_request:
    paths:
      - "nym-connect/desktop/src-tauri/**"
      - "nym-connect/desktop/src-tauri/Cargo.toml"
      - "clients/client-core/**"
      - "clients/socks5/**"
      - "common/**"
      - "gateway/gateway-requests/**"
      - "contracts/vesting/**"
      - "nym-api/nym-api-requests/**"
 jobs:
  build:
    runs-on: [self-hosted, custom-linux]
    env:
      CARGO_TERM_COLOR: always
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev
        continue-on-error: true
      - name: Check out repository code
        uses: actions/checkout@v2
      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
        with:
          profile: minimal
          toolchain: stable
          override: true
          components: rustfmt, clippy
      - name: Check formatting
        uses: actions-rs/cargo@v1
        with:
          command: fmt
          args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check
      - name: Build all binaries
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace
      - name: Run all tests
        uses: actions-rs/cargo@v1
        with:
          command: test
          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace
      - uses: actions-rs/clippy-check@v1
        name: Clippy checks
        continue-on-error: true
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features
      - name: Run clippy
        uses: actions-rs/cargo@v1
        with:
          command: clippy
          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features -- -D warnings
@@ -0,0 +1,72 @@
 name: ci-nym-connect-desktop
 on:
  pull_request:
    paths:
      - 'nym-connect/desktop/**'
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  build:
    runs-on: custom-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 Yarn
      run: npm install -g yarn
    - name: Install Rust stable
      uses: actions-rs/toolchain@v1
      with:
        toolchain: stable
    - name: Install wasm-pack
      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
    - name: Install project dependencies
      run: cd ../.. && yarn --network-timeout 100000
    - name: Install app dependencies
      run: yarn
      continue-on-error: true
    - name: Set environment from the example
      run: cp .env.sample .env
    - run: yarn storybook: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: "nym-connect/desktop/storybook-static/"
        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/nym-connect-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
    - name: Matrix - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
    - name: Matrix - Send Notification
      env:
        NYM_NOTIFICATION_KIND: nym-connect
        NYM_PROJECT_NAME: "nym-connect"
        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
        NYM_CI_WWW_LOCATION: "nym-connect-${{ 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
@@ -0,0 +1,40 @@
 name: ci-nym-vpn-ui-js
 on:
  workflow_dispatch:
  pull_request:
    paths:
      - 'nym-vpn/ui/src/**'
      - 'nym-vpn/ui/package.json'
      - 'nym-vpn/ui/index.html'
 jobs:
  check:
    runs-on: custom-linux
    steps:
      - name: Checkout
        uses: actions/checkout@v4
      - name: Install Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Yarn
        run: npm install -g yarn
      - name: Install dependencies
        working-directory: nym-vpn/ui
        run: yarn
      - name: Type-check
        working-directory: nym-vpn/ui
        run: yarn typecheck
      - name: Check lint
        working-directory: nym-vpn/ui
        run: yarn lint
      - name: Check formatting
        working-directory: nym-vpn/ui
        run: yarn fmt:check
 #      - name: Run tests
 #        working-directory: nym-vpn/ui
 #        run: yarn test
      - name: Check build
        working-directory: nym-vpn/ui
        run: yarn build
@@ -0,0 +1,63 @@
 name: ci-nym-vpn-ui-rust
 on:
  workflow_dispatch:
  pull_request:
    paths:
      - 'nym-vpn/ui/src-tauri/**'
 jobs:
  build:
    runs-on: custom-linux
    env:
      CARGO_TERM_COLOR: always
      CARGOTOML_PATH: ./nym-vpn/ui/src-tauri/Cargo.toml
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev
        continue-on-error: true
      - name: Checkout
        uses: actions/checkout@v4
      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
        with:
          profile: minimal
          toolchain: stable
          override: true
          components: rustfmt, clippy
      - name: Prepare build
        run: mkdir nym-vpn/ui/dist
      - name: Build
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: --manifest-path ${{ env.CARGOTOML_PATH }} --features custom-protocol
 #      - name: Run all tests
 #        uses: actions-rs/cargo@v1
 #        with:
 #          command: test
 #          args: --manifest-path ${{ env.CARGOTOML_PATH }}
      - name: Check formatting
        uses: actions-rs/cargo@v1
        with:
          command: fmt
          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all -- --check
      - name: Annotate with clippy checks
        uses: actions-rs/clippy-check@v1
        continue-on-error: true
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features
      - name: Clippy
        uses: actions-rs/cargo@v1
        with:
          command: clippy
          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features --all-targets -- -D warnings
@@ -17,7 +17,7 @@ jobs:
      - uses: rlespinasse/github-slug-action@v3.x
      - uses: actions/setup-node@v3
        with:
-          node-version: 18.17
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -0,0 +1,92 @@
 name: nightly-nym-connect-desktop-build
 on:
  workflow_dispatch:
  schedule:
    - cron: '14 1 * * *'
 jobs:
  build:
    strategy:
      fail-fast: false
      matrix:
        os: [ubuntu-20.04, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
      MANIFEST_PATH: --manifest-path nym-connect/desktop/Cargo.toml
    continue-on-error: true
    steps:
      - name: Check out repository code
        uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
        if: matrix.os == 'ubuntu-20.04'
      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
        with:
          profile: minimal
          toolchain: stable
          override: true
          components: rustfmt, clippy
      - name: Check formatting
        uses: actions-rs/cargo@v1
        with:
          command: fmt
          args: ${{ env.MANIFEST_PATH }} --all -- --check
      - name: Build
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: ${{ env.MANIFEST_PATH }} --release --workspace
      - name: Unit tests
        uses: actions-rs/cargo@v1
        with:
          command: test
          args: ${{ env.MANIFEST_PATH }} --workspace
      - name: Clippy
        uses: actions-rs/cargo@v1
        with:
          command: clippy
          args: ${{ env.MANIFEST_PATH }} --workspace --all-targets -- -D warnings
  notification:
    needs: build
    runs-on: custom-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
      - name: Check out repository code
        uses: actions/checkout@v3
      - name: install npm
        uses: actions/setup-node@v3
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 18
      - name: Matrix - Node Install
        if: env.WORKFLOW_CONCLUSION == 'failure'
        run: npm install
        working-directory: .github/workflows/support-files
      - name: Matrix - Send Notification
        if: env.WORKFLOW_CONCLUSION == 'failure'
        env:
          NYM_NOTIFICATION_KIND: nightly
          NYM_PROJECT_NAME: "nym-connect-desktop-nightly-build"
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
          GIT_BRANCH: "${GITHUB_REF##*/}"
          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM_NIGHTLY }}"
          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
@@ -1,27 +0,0 @@
 name: pr-validation
 on:
  pull_request:
    branches:
      - develop
      - 'release/**'
    types:
      - labeled
      - unlabeled
      - opened
      - reopened
      - synchronize
      - edited
      - milestoned
      - demilestoned
 env:
  LABELS: ${{ join( github.event.pull_request.labels.*.name, ' ' ) }}
 jobs:
  check-milestone:
    name: Check Milestone
    runs-on: ubuntu-latest
    steps:
      - if: github.event.pull_request.milestone == null && contains( env.LABELS, 'no-milestone' ) == false
        run: exit 1
@@ -1,4 +1,4 @@
-name: publish-nym-binaries
+name: Publish Nym binaries
 on:
  workflow_dispatch:
@@ -27,17 +27,19 @@ jobs:
      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 }}
-      nymvisor_hash: ${{ steps.binary-hashes.outputs.nymvisor_hash }}
+      mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
-      nymnode_hash: ${{ steps.binary-hashes.outputs.nymnode_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 }}
-      nymvisor_version: ${{ steps.binary-versions.outputs.nymvisor_version }}
+      mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
-      nymnode_version: ${{ steps.binary-versions.outputs.nymnode_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
@@ -51,10 +53,6 @@ jobs:
          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true
      - name: Set CARGO_FEATURES
        run: |
          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -64,8 +62,8 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --workspace --release ${{ env.CARGO_FEATURES }}
+          args: --workspace --release
-  
+
      - name: Upload Artifact
        uses: actions/upload-artifact@v3
        with:
@@ -73,12 +71,13 @@ jobs:
          path: |
            target/release/explorer-api
            target/release/nym-client
            target/release/nym-gateway
            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
          retention-days: 30
      - id: create-release
@@ -89,12 +88,13 @@ jobs:
          files: |
            target/release/explorer-api
            target/release/nym-client
            target/release/nym-gateway
            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
  push-release-data-client:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-binaries-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
@@ -0,0 +1,122 @@
 name: Publish Nym Connect - desktop (MacOS)
 on:
  workflow_dispatch:
  release:
    types: [created]
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      fail-fast: false
      matrix:
        platform: [macos-12-large]
    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
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
          target: wasm32-unknown-unknown
      - name: Install wasm-pack
        run: |
          export WASM_PACK_VERSION="v0.12.1" 
          curl -LO https://github.com/rustwasm/wasm-pack/releases/download/${WASM_PACK_VERSION}/wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
          tar xvzf wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz -C $HOME/.cargo/bin --strip-components=1
          rm wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
      - name: Install the Apple developer certificate for code signing
        env:
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
        run: |
          # create variables
          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
          # import certificate and provisioning profile from secrets
          echo -n "$APPLE_CERTIFICATE" | base64 --decode --output $CERTIFICATE_PATH
          # create temporary keychain
          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
          # import certificate to keychain
          security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
          security list-keychain -d user -s $KEYCHAIN_PATH
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies and build it
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
          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
          retention-days: 30
      - name: Clean up keychain
        if: ${{ always() }}
        run: |
          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/dmg/*.dmg
            nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
  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
@@ -0,0 +1,89 @@
 name: Publish Nym Connect - desktop (Ubuntu)
 on:
  workflow_dispatch:
  release:
    types: [created]
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      fail-fast: false
      matrix:
        platform: [custom-ubuntu-20.04]
    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: Tauri dependencies
        run: >
          sudo apt-get update &&
          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
        continue-on-error: true
      - name: Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        run: yarn
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Build app
        run: yarn build
        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
          retention-days: 30
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage
            nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
  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
@@ -0,0 +1,108 @@
 name: Publish Nym Connect - desktop (Windows 10)
 on:
  workflow_dispatch:
  release:
    types: [created]
 defaults:
  run:
    working-directory: nym-connect/desktop
 jobs:
  publish-tauri:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    strategy:
      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
        working-directory: .
        run: |
          cd ..
          del /s /q /A:H nym
          rmdir /s /q nym
      - uses: actions/checkout@v3
      - name: Import signing certificate
        env:
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
        run: |
          New-Item -ItemType directory -Path certificate
          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
          Remove-Item -path certificate -include tempCert.txt
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
      - name: Node
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
        with:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
      - name: Install app dependencies
        shell: bash
        run: yarn --network-timeout 100000
      - name: Build and sign it
        shell: bash
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
          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
          retention-days: 30
      - id: create-release
        name: Upload to release based on tag name
        uses: softprops/action-gh-release@v1
        if: github.event_name == 'release'
        with:
          files: |
            nym-connect/desktop/target/release/bundle/msi/*.msi
            nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
  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
@@ -1,4 +1,4 @@
-name: publish-nym-contracts
+name: Build release of Nym smart contracts
 on:
  workflow_dispatch:
  release:
@@ -1,4 +1,4 @@
-name: publish-nym-wallet-macos
+name: Publish Nym Wallet (MacOS)
 on:
  workflow_dispatch:
  release:
@@ -102,18 +102,6 @@ jobs:
            nym-wallet/target/release/bundle/dmg/*.dmg
            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
      - name: Deploy artifacts 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: "nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz"
          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/${{ github.ref_name }}/nym-wallet
          EXCLUDE: "/dist/, /node_modules/"            
  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
@@ -1,4 +1,4 @@
-name: publish-nym-wallet-ubuntu
+name: Publish Nym Wallet (Ubuntu)
 on:
  workflow_dispatch:
  release:
@@ -77,18 +77,6 @@ jobs:
            nym-wallet/target/release/bundle/appimage/*.AppImage
            nym-wallet/target/release/bundle/appimage/*.AppImage.tar.gz*
      - name: Deploy artifacts 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: "nym-wallet/target/release/bundle/appimage/nym-wallet*.AppImage.tar.gz"
          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/${{ github.ref_name }}/nym-wallet
          EXCLUDE: "/dist/, /node_modules/"               
  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
@@ -1,4 +1,4 @@
-name: publish-nym-wallet-win10
+name: Publish Nym Wallet (Windows 10)
 on:
  workflow_dispatch:
  release:
@@ -97,18 +97,6 @@ jobs:
            nym-wallet/target/release/bundle/msi/*.msi
            nym-wallet/target/release/bundle/msi/*.msi.zip*
      - name: Deploy artifacts 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: "nym-wallet/target/release/bundle/msi/nym-wallet_1.*.msi"
          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/${{ github.ref_name }}/nym-wallet
          EXCLUDE: "/dist/, /node_modules/"            
  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
@@ -1,4 +1,4 @@
-name: publish-sdk-npm
+name: Publish Typescript SDK
 on:
  workflow_dispatch:
@@ -1,4 +1,4 @@
-name: release-calculate-hash
+name: Releases - calculate file hashes
 on:
  workflow_call:
@@ -8,8 +8,8 @@ on:
        required: true
        type: string
  workflow_dispatch:
-    inputs:
+    release_tag:
-      release_tag:
+      tag:
        description: 'Release tag'
        required: true
        type: string
@@ -24,7 +24,10 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          node-version: 18
-      - uses: nymtech/nym/.github/actions/nym-hash-releases@develop
+      - 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:
@@ -0,0 +1,29 @@
 const Handlebars = require('handlebars');
 const fs = require('fs');
 const path = require('path');
 async function addToContextAndValidate(context) {
  if (!context.env.NYM_CI_WWW_LOCATION) {
    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
  }
  if (!context.env.NYM_CI_WWW_BASE) {
    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
  }
 }
 async function getMessageBody(context) {
  const source = fs
    .readFileSync(
      context.env.IS_SUCCESS === 'true'
        ? path.resolve(__dirname, 'templates', 'success')
        : path.resolve(__dirname, 'templates', 'failure'),
    )
    .toString();
  const template = Handlebars.compile(source);
  return template(context);
 }
 module.exports = {
  addToContextAndValidate,
  getMessageBody,
 };
@@ -0,0 +1,16 @@
 🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
 > :rocket: {{ env.NYM_PROJECT_NAME }}
 >
 > 🔴 **FAILURE** :cry:
 >
 > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
 >
 > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
 >
 > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
 >
 Commit message:
 ```
 {{ env.GIT_COMMIT_MESSAGE }}
 ```
@@ -0,0 +1,16 @@
 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
 > :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View storybook:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/
 >
 > ✅ **SUCCESS**
 >
 > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
 >
 > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
 >
 > `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
 >
 Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
 ```
 {{ env.GIT_COMMIT_MESSAGE }}
 ```
@@ -4,196 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 ## [Unreleased]
 ## [2024.9-topdeck] (2024-07-26)
 - chore: fix 1.80 lint issues ([#4731])
 - Handle clients with different versions in IPR ([#4723])
 - Add 1GB/day/user bandwidth cap ([#4717])
 - Feature/merge back ([#4710])
 - removed mixnode/gateway config migration code and disabled cli without explicit flag ([#4706])
 [#4731]: https://github.com/nymtech/nym/pull/4731
 [#4723]: https://github.com/nymtech/nym/pull/4723
 [#4717]: https://github.com/nymtech/nym/pull/4717
 [#4710]: https://github.com/nymtech/nym/pull/4710
 [#4706]: https://github.com/nymtech/nym/pull/4706
 ## [2024.8-wispa] (2024-07-10)
 - add event parsing to support cosmos_sdk > 0.50 ([#4697])
 - Fix NR config compatibility ([#4690])
 - Remove UserAgent constructor since it's weakly typed ([#4689])
 - [bugfix]: Node_api_check CLI looked over roles on blacklisted nodes ([#4687])
 - Add mixnodes to self describing api cache ([#4684])
 - Move and whole bump of crates to workspace and upgrade some ([#4680])
 - Remove code that refers to removed nym-network-statistics ([#4679])
 - Remove nym-network-statistics ([#4678])
 - Create UserAgent that can be passed from the binary to the nym api client ([#4677])
 - Add authenticator ([#4667])
 [#4697]: https://github.com/nymtech/nym/pull/4697
 [#4690]: https://github.com/nymtech/nym/pull/4690
 [#4689]: https://github.com/nymtech/nym/pull/4689
 [#4687]: https://github.com/nymtech/nym/pull/4687
 [#4684]: https://github.com/nymtech/nym/pull/4684
 [#4680]: https://github.com/nymtech/nym/pull/4680
 [#4679]: https://github.com/nymtech/nym/pull/4679
 [#4678]: https://github.com/nymtech/nym/pull/4678
 [#4677]: https://github.com/nymtech/nym/pull/4677
 [#4667]: https://github.com/nymtech/nym/pull/4667
 ## [2024.7-doubledecker] (2024-07-04)
 - Add an early return in `parse_raw_str_logs` for empty raw log strings. ([#4686])
 - Bump braces from 3.0.2 to 3.0.3 in /wasm/mix-fetch/internal-dev ([#4672])
 - add expiry returned on import ([#4670])
 - [bugfix] missing rustls feature ([#4666])
 - Bump ws from 8.13.0 to 8.17.1 in /wasm/client/internal-dev-node ([#4665])
 - Bump braces from 3.0.2 to 3.0.3 in /clients/native/examples/js-examples/websocket ([#4663])
 - Bump ws from 8.14.2 to 8.17.1 in /sdk/typescript/packages/nodejs-client ([#4662])
 - Update setup.md ([#4661])
 - New clippy lints ([#4660])
 - Bump braces from 3.0.2 to 3.0.3 in /nym-api/tests ([#4659])
 - Bump braces from 3.0.2 to 3.0.3 in /docker/typescript_client/upload_contract ([#4658])
 - Update vps-setup.md ([#4656])
 - Update configuration.md ([#4655])
 - Remove old PR template ([#4639])
 [#4686]: https://github.com/nymtech/nym/pull/4686
 [#4672]: https://github.com/nymtech/nym/pull/4672
 [#4670]: https://github.com/nymtech/nym/pull/4670
 [#4666]: https://github.com/nymtech/nym/pull/4666
 [#4665]: https://github.com/nymtech/nym/pull/4665
 [#4663]: https://github.com/nymtech/nym/pull/4663
 [#4662]: https://github.com/nymtech/nym/pull/4662
 [#4661]: https://github.com/nymtech/nym/pull/4661
 [#4660]: https://github.com/nymtech/nym/pull/4660
 [#4659]: https://github.com/nymtech/nym/pull/4659
 [#4658]: https://github.com/nymtech/nym/pull/4658
 [#4656]: https://github.com/nymtech/nym/pull/4656
 [#4655]: https://github.com/nymtech/nym/pull/4655
 [#4639]: https://github.com/nymtech/nym/pull/4639
 ## [2024.6-chomp] (2024-06-25)
 - Remove additional code as part of Ephemera Purge and SP and contracts ([#4650])
 - bugfix: make sure nym-api can handle non-cw2 (or without detailed build info) compliant contracts ([#4648])
 - introduced a flag to accept toc and exposed it via self-described API ([#4647])
 - bugfix: make sure to return an error on invalid public ip ([#4646])
 - Add ci check for PR having an assigned milestone ([#4644])
 - Removed ephemera code ([#4642])
 - Remove stale peers ([#4640])
 - Add generic wg private network routing ([#4636])
 - Feature/new node endpoints ([#4635])
 - standarised ContractBuildInformation and added it to all contracts ([#4631])
 - validate nym-node public ips on startup ([#4630])
 - Bump defguard wg ([#4625])
 - Fix cargo warnings ([#4624])
 - Update kernel peers on peer modification ([#4622])
 - Handle v6 and v7 requests in the IPR, but reply with v6 ([#4620])
 - fix typo ([#4619])
 - Update crypto and rand crates ([#4607])
 - Purge name service and service provider directory contracts ([#4603])
 [#4650]: https://github.com/nymtech/nym/pull/4650
 [#4648]: https://github.com/nymtech/nym/pull/4648
 [#4647]: https://github.com/nymtech/nym/pull/4647
 [#4646]: https://github.com/nymtech/nym/pull/4646
 [#4644]: https://github.com/nymtech/nym/pull/4644
 [#4642]: https://github.com/nymtech/nym/pull/4642
 [#4640]: https://github.com/nymtech/nym/pull/4640
 [#4636]: https://github.com/nymtech/nym/pull/4636
 [#4635]: https://github.com/nymtech/nym/pull/4635
 [#4631]: https://github.com/nymtech/nym/pull/4631
 [#4630]: https://github.com/nymtech/nym/pull/4630
 [#4625]: https://github.com/nymtech/nym/pull/4625
 [#4624]: https://github.com/nymtech/nym/pull/4624
 [#4622]: https://github.com/nymtech/nym/pull/4622
 [#4620]: https://github.com/nymtech/nym/pull/4620
 [#4619]: https://github.com/nymtech/nym/pull/4619
 [#4607]: https://github.com/nymtech/nym/pull/4607
 [#4603]: https://github.com/nymtech/nym/pull/4603
 ## [2024.5-ragusa] (2024-05-22)
 - Feature/nym node api location ([#4605])
 - Add optional signature to IPR request/response ([#4604])
 - Feature/unstable tested nodes endpoint ([#4601])
 - nym-api: make report/avg_uptime endpoints ignore blacklist ([#4599])
 - removed blocking for coconut in the final epoch state ([#4598])
 - allow using explicit admin address for issuing freepasses ([#4595])
 - Use rfc3339 for last_polled in described nym-api endpoint ([#4591])
 - Explicitly handle constraint unique violation when importing credential ([#4588])
 - [bugfix] noop flag for nym-api for nymvisor compatibility ([#4586])
 - Chore/additional helpers ([#4585])
 - Feature/wasm coconut ([#4584])
 - upgraded axum and related deps to the most recent version ([#4573])
 - Feature/nyxd scraper pruning ([#4564])
 - Run cargo autoinherit on the main workspace ([#4553])
 - Add rustls-tls to reqwest in validator-client ([#4552])
 - Feature/rewarder voucher issuance ([#4548])
 - make sure 'OffsetDateTimeJsonSchemaWrapper' is serialised with legacy format  ([#4613])
 [#4613]: https://github.com/nymtech/nym/pull/4613
 [#4605]: https://github.com/nymtech/nym/pull/4605
 [#4604]: https://github.com/nymtech/nym/pull/4604
 [#4601]: https://github.com/nymtech/nym/pull/4601
 [#4599]: https://github.com/nymtech/nym/pull/4599
 [#4598]: https://github.com/nymtech/nym/pull/4598
 [#4595]: https://github.com/nymtech/nym/pull/4595
 [#4591]: https://github.com/nymtech/nym/pull/4591
 [#4588]: https://github.com/nymtech/nym/pull/4588
 [#4586]: https://github.com/nymtech/nym/pull/4586
 [#4585]: https://github.com/nymtech/nym/pull/4585
 [#4584]: https://github.com/nymtech/nym/pull/4584
 [#4573]: https://github.com/nymtech/nym/pull/4573
 [#4564]: https://github.com/nymtech/nym/pull/4564
 [#4553]: https://github.com/nymtech/nym/pull/4553
 [#4552]: https://github.com/nymtech/nym/pull/4552
 [#4548]: https://github.com/nymtech/nym/pull/4548
 ## [2024.4-nutella] (2024-05-08)
 - [fix] apply disable_poisson_rate from internal NR/IPR cfgs ([#4579])
 - updating sign commands to include nym-node ([#4578])
 - changed nym-node redirects from 308 'Permanent Redirect' to 303: 'See Other' ([#4572])
 [#4579]: https://github.com/nymtech/nym/pull/4579
 [#4578]: https://github.com/nymtech/nym/pull/4578
 [#4572]: https://github.com/nymtech/nym/pull/4572
 ## [2024.3-eclipse] (2024-04-22)
 - Initial release of the first iteration of the Nym Node
 - Improvements to gateway functionality
 - IPR development
 - Removal of allow list in favour of implementing an exit policy
 - Explorer delegation: enables direct delegation to nodes via the Nym Explorer
 ## [2024.2-fast-and-furious] (2024-03-25)
 - Internal testing pre-release 
 ## [2024.1-marabou] (2024-02-15)
 **New Features:**
 - Introduced nymvisor support for nym-api, gateway, and mixnode binaries ([#4158])
 - Revamped nym-api execution with the addition of init and run commands ([#4225])
 **Enhancements:**
 - Implemented internal improvements for gateways to optimize internal packet routing
 - Improved routing score calculation
 **Bug Fixes:**
 - Resolved various bugs to enhance overall stability
 [#4158]: https://github.com/nymtech/nym/pull/4158
 [#4225]: https://github.com/nymtech/nym/pull/4225
 ## [2023.5-rolo] (2023-11-28)
 - Gateway won't open websocket listener until embedded Network Requester becomes available ([#4166])
@@ -551,6 +361,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#3187]: https://github.com/nymtech/nym/issues/3187
 [#3203]: https://github.com/nymtech/nym/pull/3203
 [#3199]: https://github.com/nymtech/nym/pull/3199
 >>>>>>> master
 ## [v1.1.13] (2023-03-15)
@@ -20,42 +20,34 @@ members = [
    "clients/native",
    "clients/native/websocket-requests",
    "clients/socks5",
    "common/authenticator-requests",
    "common/async-file-watcher",
    "common/bandwidth-controller",
    "common/bin-common",
    "common/client-core",
    "common/client-core/config-types",
    "common/client-core/surb-storage",
    "common/client-core/gateways-storage",
    "common/client-libs/gateway-client",
    "common/client-libs/mixnet-client",
    "common/client-libs/validator-client",
    "common/coconut-interface",
    "common/commands",
    "common/config",
    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
    "common/cosmwasm-smart-contracts/ecash-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",
    "common/cosmwasm-smart-contracts/name-service",
    "common/cosmwasm-smart-contracts/service-provider-directory",
    "common/cosmwasm-smart-contracts/vesting-contract",
    "common/country-group",
    "common/credential-storage",
    "common/credentials",
    "common/credential-utils",
    "common/credentials-interface",
    "common/crypto",
    "common/dkg",
    "common/ecash-double-spending",
    "common/ecash-time",
    "common/execute",
    "common/exit-policy",
    "common/gateway-requests",
    "common/gateway-storage",
    "common/http-api-client",
    "common/http-api-common",
    "common/inclusion-probability",
    "common/ip-packet-requests",
    "common/ledger",
@@ -64,9 +56,6 @@ members = [
    "common/node-tester-utils",
    "common/nonexhaustive-delayqueue",
    "common/nymcoconut",
    "common/nym_offline_compact_ecash",
    "common/nym-id",
    "common/nym-metrics",
    "common/nymsphinx",
    "common/nymsphinx/acknowledgements",
    "common/nymsphinx/addressing",
@@ -78,12 +67,11 @@ members = [
    "common/nymsphinx/params",
    "common/nymsphinx/routing",
    "common/nymsphinx/types",
    "common/nyxd-scraper",
    "common/pemstore",
    "common/serde-helpers",
    "common/socks5-client-core",
    "common/socks5/proxy-helpers",
    "common/socks5/requests",
    "common/statistics",
    "common/store-cipher",
    "common/task",
    "common/topology",
@@ -98,36 +86,31 @@ members = [
    "explorer-api/explorer-api-requests",
    "explorer-api/explorer-client",
    "gateway",
    "gateway/gateway-requests",
    "integrations/bity",
    "mixnode",
    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
    "service-providers/authenticator",
    "service-providers/common",
    "service-providers/ip-packet-router",
    "service-providers/network-requester",
    "service-providers/network-statistics",
    "nym-api",
    "nym-browser-extension/storage",
    "nym-api/nym-api-requests",
    "nym-node",
    "nym-node/nym-node-http-api",
    "nym-node/nym-node-requests",
    "nym-outfox",
    "nym-validator-rewarder",
    "tools/internal/ssl-inject",
-    # "tools/internal/sdk-version-bump",
+    "tools/internal/sdk-version-bump",
    "tools/nym-cli",
    "tools/nym-id-cli",
    "tools/nym-nr-query",
    "tools/nymvisor",
    "tools/ts-rs-cli",
    "wasm/client",
-    # "wasm/full-nym-wasm",  # If we uncomment this again, remember to also uncomment the profile settings below
+#    "wasm/full-nym-wasm",
    "wasm/mix-fetch",
    "wasm/node-tester",
    "wasm/zknym-lib",
    "tools/internal/testnet-manager",
    "tools/internal/testnet-manager/dkg-bypass-contract",
 ]
 default-members = [
@@ -135,22 +118,14 @@ default-members = [
    "clients/socks5",
    "gateway",
    "service-providers/network-requester",
    "service-providers/network-statistics",
    "mixnode",
    "nym-api",
    "tools/nymvisor",
    "explorer-api",
    "nym-validator-rewarder",
    "nym-node",
 ]
-exclude = [
+exclude = ["explorer", "contracts", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "nym-vpn/ui/src-tauri", "cpu-cycles"]
    "explorer",
    "contracts",
    "nym-wallet",
    "nym-vpn/ui/src-tauri",
    "cpu-cycles",
    "sdk/ffi/cpp",
 ]
 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -161,212 +136,83 @@ edition = "2021"
 license = "Apache-2.0"
 [workspace.dependencies]
 addr = "0.15.6"
 aes = "0.8.1"
 aes-gcm = "0.10.1"
 anyhow = "1.0.71"
 argon2 = "0.5.0"
 async-trait = "0.1.68"
-axum = "0.7.5"
+axum = "0.6.20"
 axum-extra = "0.9.3"
 base64 = "0.21.4"
 bincode = "1.3.3"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 # can we unify those?
 bit-vec = "0.7.0"
 bitvec = "1.0.0"
 blake3 = "1.3.1"
 bloomfilter = "1.0.14"
 bs58 = "0.5.1"
 bytecodec = "0.4.15"
 bytes = "1.5.0"
 cargo_metadata = "0.18.1"
 celes = "2.4.0"
 cfg-if = "1.0.0"
 chacha20 = "0.9.0"
 chacha20poly1305 = "0.10.1"
 chrono = "0.4.31"
 cipher = "0.4.3"
 clap = "4.4.7"
-clap_complete = "4.0"
+cfg-if = "1.0.0"
 clap_complete_fig = "4.0"
 colored = "2.0"
 comfy-table = "6.0.0"
 console-subscriber = "0.1.1"
 console_error_panic_hook = "0.1"
 const-str = "0.5.6"
 const_format = "0.2.32"
 criterion = "0.4"
 csv = "1.3.0"
 ctr = "0.9.1"
 cupid = "0.6.1"
 curve25519-dalek = "4.1"
 dashmap = "5.5.3"
 defguard_wireguard_rs = "0.4.2"
 digest = "0.10.7"
 dirs = "4.0"
 doc-comment = "0.3"
 dotenvy = "0.15.6"
 ecdsa = "0.16"
 ed25519-dalek = "2.1"
 etherparse = "0.13.0"
 eyre = "0.6.9"
 fastrand = "2.1.0"
 flate2 = "1.0.28"
 futures = "0.3.28"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
-getset = "0.1.1"
+hyper = "0.14.27"
 handlebars = "3.5.5"
 headers = "0.4.0"
 hex = "0.4.3"
 hex-literal = "0.3.3"
 hkdf = "0.12.3"
 hmac = "0.12.1"
 http = "1"
 httpcodec = "0.2.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
 hyper = "1.3.1"
 inquire = "0.6.2"
 ip_network = "0.4.1"
 ipnetwork = "0.16"
 isocountry = "0.3.2"
 itertools = "0.13.0"
 k256 = "0.13"
 lazy_static = "1.4.0"
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
 log = "0.4"
 maxminddb = "0.23.0"
 mime = "0.3.17"
 nix = "0.27.1"
 notify = "5.1.0"
 okapi = "0.7.0"
 once_cell = "1.7.2"
 opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
 parking_lot = "0.12.1"
 pem = "0.8"
 pin-project = "1.0"
 pretty_env_logger = "0.4.0"
 publicsuffix = "2.2.3"
 quote = "1"
 rand = "0.8.5"
-rand-07 = "0.7.3"
+reqwest = "0.11.22"
 rand_chacha = "0.3"
 rand_chacha_02 = "0.2"
 rand_core = "0.6.3"
 rand_distr = "0.4"
 rand_pcg = "0.3.1"
 rand_seeder = "0.2.3"
 rayon = "1.5.1"
 regex = "1.8.4"
 reqwest = { version = "0.12.4", default-features = false }
 rocket = "0.5.0"
 rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
 safer-ffi = "0.1.4"
 schemars = "0.8.1"
 semver = "1.0.23"
 serde = "1.0.152"
 serde_bytes = "0.11.6"
 serde_derive = "1.0"
 serde_json = "1.0.91"
 serde_repr = "0.1"
 serde_with = "3.4.0"
 serde_yaml = "0.9.25"
 sha2 = "0.10.8"
 si-scale = "0.2.2"
 sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
 strum = "0.25"
 subtle-encoding = "0.5"
 syn = "1"
 sysinfo = "0.30.12"
 tap = "1.0.1"
 tar = "0.4.40"
 tempfile = "3.5.0"
 thiserror = "1.0.48"
 time = "0.3.30"
-tokio = "1.39"
+thiserror = "1.0.48"
-tokio-stream = "0.1.15"
+tokio = "1.33.0"
-tokio-test = "0.4.4"
+tokio-util = "0.7.10"
-tokio-tungstenite = { version = "0.20.1" }
+tokio-tungstenite = "0.20.1"
 tokio-util = "0.7.11"
 toml = "0.8.14"
 tower = "0.4.13"
 tower-http = "0.5.2"
 tracing = "0.1.37"
 tracing-opentelemetry = "0.19.0"
 tracing-subscriber = "0.3.16"
 tracing-tree = "0.2.2"
 ts-rs = "7.0.0"
 tungstenite = { version = "0.20.1", default-features = false }
 ts-rs = "7.0.0"
 utoipa = "3.5.0"
 utoipa-swagger-ui = "3.1.5"
 url = "2.4"
 utoipa = "4.2.0"
 utoipa-swagger-ui = "6.0.0"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
 wasm-bindgen-test = "0.3.36"
 x25519-dalek = "2.0.0"
 zeroize = "1.6.0"
 prometheus = { version = "0.13.0" }
 # coconut/DKG related
 # unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork
 # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm
-# plus to make our live easier we need serde support from https://github.com/zkcrypto/bls12_381/pull/125
+bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", branch ="feature/gt-serialization-0.8.0" }
-bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", default-features = false, branch = "temp/experimental-serdect" }
+group = "0.13.0"
-group = { version = "0.13.0", default-features = false }
+ff = "0.13.0"
-ff = { version = "0.13.0", default-features = false }
+
 # cosmwasm-related
-cosmwasm-derive = "=1.4.3"
+cosmwasm-derive = "=1.3.0"
-cosmwasm-schema = "=1.4.3"
+cosmwasm-schema = "=1.3.0"
-cosmwasm-std = "=1.4.3"
+cosmwasm-std = "=1.3.0"
-# use 0.5.0 as that's the version used by cosmwasm-std 1.4.3
+# use 0.5.0 as that's the version used by cosmwasm-std 1.3.0
 # (and ideally we don't want to pull the same dependency twice)
 serde-json-wasm = "=0.5.0"
-cosmwasm-storage = "=1.4.3"
+cosmwasm-storage = "=1.3.0"
 # same version as used by cosmwasm
 cw-utils = "=1.0.1"
-cw-storage-plus = "=1.2.0"
+cw-storage-plus = "=1.1.0"
-cw2 = { version = "=1.1.2" }
+cw2 = { version = "=1.1.0" }
-cw3 = { version = "=1.1.2" }
+cw3 = { version = "=1.1.0" }
-cw4 = { version = "=1.1.2" }
+cw4 = { version = "=1.1.0" }
 cw-controllers = { version = "=1.1.0" }
 # cosmrs-related
-bip32 = { version = "0.5.1", default-features = false }
+bip32 = "0.5.1"
-
+cosmrs = "=0.15.0"
-# temporarily using a fork again (yay.) because we need staking and slashing support (which are already on main but not released)
+tendermint-rpc = "0.34" # same version as used by cosmrs
-# plus response message parsing (which is, as of the time of writing this message, waiting to get merged)
+tendermint = "0.34" # same version as used by cosmrs
-#cosmrs = { path = "../cosmos-rust-fork/cosmos-rust/cosmrs" }
+prost = "0.12"
 cosmrs = { git = "https://github.com/cosmos/cosmos-rust", rev = "4b1332e6d8258ac845cef71589c8d362a669675a" } # unfortuntely we need a fork by yours truly to get the staking support
 tendermint = "0.37.0"                                                                                        # same version as used by cosmrs
 tendermint-rpc = "0.37.0"                                                                                    # same version as used by cosmrs
 prost = { version = "0.12", default-features = false }
 # wasm-related dependencies
-gloo-utils = "0.2.0"
+gloo-utils = "0.1.7"
-gloo-net = "0.5.0"
+js-sys = "0.3.63"
-
+serde-wasm-bindgen = "0.5.0"
 # use a separate branch due to feature unification failures
 # this is blocked until the upstream removes outdates `wasm_bindgen` feature usage
 # indexed_db_futures = "0.4.1"
 indexed_db_futures = { git = "https://github.com/TiemenSch/rust-indexed-db", branch = "update-uuid" }
 js-sys = "0.3.69"
 serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
-wasm-bindgen = "0.2.92"
+wasm-bindgen = "0.2.86"
-wasm-bindgen-futures = "0.4.39"
+wasm-bindgen-futures = "0.4.37"
 wasmtimer = "0.2.0"
-web-sys = "0.3.69"
+web-sys = "0.3.63"
 # Profile settings for individual crates
@@ -382,12 +228,9 @@ opt-level = 'z'
 # lto = true
 opt-level = 'z'
-# Commented out since the crate is also commented out from the inclusion in the
+[profile.release.package.nym-wasm-sdk]
-# workspace above. We should uncomment this if we re-include it in the
+# lto = true
-# workspace
+opt-level = 'z'
 #[profile.release.package.nym-wasm-sdk]
 ## lto = true
 #opt-level = 'z'
 [profile.release.package.mix-fetch-wasm]
 # lto = true
@@ -12,7 +12,6 @@ help:
 	@echo "  clippy: run clippy for all workspaces"
 	@echo "  test: run clippy, unit tests, and formatting."
 	@echo "  test-all: like test, but also includes the expensive tests"
 	@echo "  deb: build debian packages
 # -----------------------------------------------------------------------------
 # Meta targets
@@ -92,6 +91,7 @@ endef
 $(eval $(call add_cargo_workspace,main,.))
 $(eval $(call add_cargo_workspace,contracts,contracts,--lib --target wasm32-unknown-unknown,RUSTFLAGS='-C link-arg=-s'))
 $(eval $(call add_cargo_workspace,wallet,nym-wallet))
 $(eval $(call add_cargo_workspace,connect,nym-connect/desktop))
 # -----------------------------------------------------------------------------
 # SDK
@@ -104,7 +104,6 @@ sdk-wasm-build:
 	$(MAKE) -C wasm/client
 	$(MAKE) -C wasm/node-tester
 	$(MAKE) -C wasm/mix-fetch
 	$(MAKE) -C wasm/zknym-lib
 	#$(MAKE) -C wasm/full-nym-wasm
 # run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
@@ -115,7 +114,7 @@ sdk-typescript-build:
 	yarn --cwd sdk/typescript/codegen/contract-clients build
 # NOTE: These targets are part of the main workspace (but not as wasm32-unknown-unknown)
-WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm zknym-lib
+WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm
 sdk-wasm-test:
 	#cargo test $(addprefix -p , $(WASM_CRATES)) --target wasm32-unknown-unknown -- -Dwarnings
@@ -133,7 +132,7 @@ clippy: sdk-wasm-lint
 # Build contracts ready for deploy
 # -----------------------------------------------------------------------------
-CONTRACTS=vesting_contract mixnet_contract nym_ecash
+CONTRACTS=vesting_contract mixnet_contract nym_service_provider_directory nym_name_service
 CONTRACTS_WASM=$(addsuffix .wasm, $(CONTRACTS))
 CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release
@@ -158,12 +157,6 @@ build-explorer-api:
 build-nym-cli:
 	cargo build -p nym-cli --release
 build-nym-gateway:
 	cargo build -p nym-gateway --release
 build-nym-mixnode:
 	cargo build -p nym-mixnode --release
 # -----------------------------------------------------------------------------
 # Misc
 # -----------------------------------------------------------------------------
@@ -176,13 +169,6 @@ run-api-tests:
 	cd nym-api/tests/functional_test && yarn test:qa
 # Build debian package, and update PPA
-deb-mixnode: build-nym-mixnode
+# Requires base64 encode GPG key to be set up in environment PPA_SIGNING_KEY
-	cargo deb -p nym-mixnode 
+deb:
-
+	scripts/ppa.sh
 deb-gateway: build-nym-gateway
 	cargo deb -p nym-gateway
 deb-cli: build-nym-cli
 	cargo deb -p nym-cli
 deb: deb-mixnode deb-gateway deb-cli
@@ -7,66 +7,86 @@ SPDX-License-Identifier: Apache-2.0
 The platform is composed of multiple Rust crates. Top-level executable binary crates include:
-* `nym-node` - a tool for running a node within the Nym network. Nym Nodes containing functionality such as `mixnode`, `entry-gateway` and `exit-gateway` are fundamental components of Nym Mixnet architecture. Nym Nodes are ran by decentralised node operators. Read more about `nym-node` in [Operators Guide documentation](https://nymtech.net/operators/nodes/nym-node.html). Network functionality of `nym-node` (labeled with `--mode` flag) can be:
+* nym-mixnode - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
-	- `mixnode` - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
+* nym-client - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
-	- `gateway` - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices. Gateways can be further categorized as `entry-gateway` and `exit-gateway`. The latter has an extra embedded IP packet router and Network requester to route data to the internet.
+* nym-socks5-client - a Socks5 proxy you can run on your machine and use with existing applications.
-* `nym-client` - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
+* 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-socks5-client` - a Socks5 proxy you can run on your machine and use with existing applications.
+* 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-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.
 <!-- coming soon
 * `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").
 -->
 ```ascii
                      ┌─►mix──┐  mix     mix
                      │       │
            Entry     │       │                   Exit
 client ───► Gateway ──┘  mix  │  mix  ┌─►mix ───► Gateway ───► internet
                              │       │
                              │       │
                         mix  └─►mix──┘  mix
 ```
 [![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)
 ### Building
-* Platform build instructions are available on Nym [Operators Guide documentation](https://nymtech.net/operators/binaries/building-nym.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/pre-built-binaries.html).
-* Wallet build instructions are available on Nym [Technical docs](https://nymtech.net/docs/wallet/desktop-wallet.html).
+Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).
 ### Developing
-There's a [`sandbox.env`](https://github.com/nymtech/nym/envs/sandbox.env) file provided which you can rename to `.env` if you want convenient testing environment. Read more about sandbox environment in our [Operators Guide page](https://nymtech.net/operators/sandbox.html).
+There's a `.env.sample-dev` file provided which you can rename to `.env` if you want convenient logging, backtrace, or other environment variables pre-set. The `.env` file is ignored so you don't need to worry about checking it in.
-References for developers:
+For Typescript components, please see [ts-packages](./ts-packages).
 * [Developers Portal](https://nymtech.net/developers)
 * [Typescript SDKs](https://sdk.nymtech.net/)
 * [Technical Documentation - Nym network overview](https://nymtech.net/docs/)
 * [Release Cycle - git flow](https://nymtech.net/operators/release-cycle.html)
 ### 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.
 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://nymtech.net/go/discord)
+* The various developer channels on [Discord](https://discord.gg/nym)
-### Tokenomics & Rewards
+### Rewards
-Nym network economic incentives, operator and validator rewards, and scalability of the network are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf).
+Node, node operator and delegator rewards are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf). Below is a TLDR of the variables and formulas involved in calculating the epoch rewards. Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
-Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+
 |Symbol|Definition|
 |---|---|
 |<img src="https://render.githubusercontent.com/render/math?math=R#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R#gh-dark-mode-only">|global share of rewards available, starts at 2% of the reward pool.
 |<img src="https://render.githubusercontent.com/render/math?math=R_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}#gh-dark-mode-only">|node reward for mixnode `i`.
 |<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma_{i}#gh-dark-mode-only">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
 |<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
 |<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
 |<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
 |<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|A Sybil attack resistance parameter - the higher this parameter is set, the stronger the reduction in competitiveness for a Sybil attacker.
 |<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10%.
 |<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
 |<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMs.
 Node reward for node `i` is determined as:
 <img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-dark-mode-only">
 where:
 <img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-dark-mode-only">
 and
 <img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-dark-mode-only">
 Operator of node `i` is credited with the following amount:
 <img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
 Delegate with stake `s` receives:
 <img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
 where `s'` is stake `s` scaled over total token circulating supply.
 ### Licensing and copyright information
 This is a monorepo and components that make up Nym as a system are licensed individually, so for accurate information, please check individual files.
 As a general approach, licensing is as follows this pattern:
 - applications and binaries are GPLv3
 - libraries and components are Apache 2.0 or MIT
 - documentation is Apache 2.0 or CC0-1.0
-Nym Node Operators and Validators Temrs and Conditions can be found [here](https://nymtech.net/terms-and-conditions/operators/v1.0.0).
+Again, for accurate information, please check individual files.
@@ -1,70 +0,0 @@
 <html>
 <head>
    <style>
        @media (prefers-color-scheme: dark) {
            body {
                background: #333;
                color: white;
            }
            a {
                color: skyblue;
            }
        }
        .container {
            font-family: sans-serif;
            max-width: 800px;
            margin: 0 auto;
        }
        .intro {
            text-align: center;
        }
        .licenses-list {
            list-style-type: none;
            margin: 0;
            padding: 0;
        }
        .license-used-by {
            margin-top: -10px;
        }
        .license-text {
            max-height: 200px;
            overflow-y: scroll;
            white-space: pre-wrap;
        }
    </style>
 </head>
 <body>
    <main class="container">
        <div class="intro">
            <h1>Third Party Licenses</h1>
            <p>This page lists the licenses of the projects used in cargo-about.</p>
        </div>
        <h2>Overview of licenses:</h2>
        <ul class="licenses-overview">
            {{#each overview}}
            <li><a href="#{{id}}">{{name}}</a> ({{count}})</li>
            {{/each}}
        </ul>
        <h2>All license text:</h2>
        <ul class="licenses-list">
            {{#each licenses}}
            <li class="license">
                <h3 id="{{id}}">{{name}}</h3>
                <h4>Used by:</h4>
                <ul class="license-used-by">
                    {{#each used_by}}
                    <li><a href="{{#if crate.repository}} {{crate.repository}} {{else}} https://crates.io/crates/{{crate.name}} {{/if}}">{{crate.name}} {{crate.version}}</a></li>
                    {{/each}}
                </ul>
                <pre class="license-text">{{text}}</pre>
            </li>
            {{/each}}
        </ul>
    </main>
 </body>
 </html>
@@ -1,19 +0,0 @@
 private = { ignore = true }
 accepted = [
    "0BSD",
    "Apache-2.0",
    "BSD-2-Clause",
    "BSD-3-Clause",
    "CC0-1.0",
    "ISC",
    "MIT",
    "MPL-2.0",
    "Unicode-DFS-2016",
    "OpenSSL",
 ]
 workarounds = [
    "ring",
    "rustls",
 ]
@@ -1,10 +1,10 @@
 [package]
 name = "nym-client"
-version = "1.1.39"
+version = "1.1.32"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.65"
 license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -21,52 +21,35 @@ futures = { workspace = true } # bunch of futures stuff, however, now that I thi
 # and the single instance of abortable we have should really be refactored anyway
 url = { workspace = true }
 bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
-dirs = { workspace = true }
+dirs = "4.0"
 lazy_static = "1.4.0"
 log = { workspace = true } # self explanatory
-rand = { workspace = true }
+pretty_env_logger = "0.4" # for formatting log messages
-serde = { workspace = true, features = [
+rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
-    "derive",
+serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 ] } # for config serialization/deserialization
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tap = { workspace = true }
+tap = "1.0.1"
-time = { workspace = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio = { workspace = true, features = [
    "rt-multi-thread",
    "net",
    "signal",
 ] } # async runtime
 tokio-tungstenite = { workspace = true }
 zeroize = { workspace = true }
 ## internal
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
-nym-bin-common = { path = "../../common/bin-common", features = [
+nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
-    "output_format",
+nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
-    "clap",
+nym-coconut-interface = { path = "../../common/coconut-interface" }
 ] }
 nym-client-core = { path = "../../common/client-core", features = [
    "fs-credentials-storage",
    "fs-surb-storage",
    "fs-gateways-storage",
    "cli",
 ] }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
 nym-crypto = { path = "../../common/crypto" }
-nym-gateway-requests = { path = "../../common/gateway-requests" }
+nym-gateway-requests = { path = "../../gateway/gateway-requests" }
 nym-network-defaults = { path = "../../common/network-defaults" }
 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 = [
+nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
    "http-client",
 ] }
 nym-client-websocket-requests = { path = "websocket-requests" }
 nym-id = { path = "../../common/nym-id" }
 [dev-dependencies]
@@ -4,7 +4,7 @@
 use crate::client::config::persistence::ClientPaths;
 use crate::client::config::template::CONFIG_TEMPLATE;
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::cli_helpers::CliClientConfig;
+use nym_client_core::cli_helpers::client_init::ClientConfig;
 use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
 use nym_config::{
@@ -19,12 +19,11 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 pub use nym_client_core::config::Config as BaseClientConfig;
-pub use nym_client_core::config::DebugConfig;
+pub use nym_client_core::config::{DebugConfig, GatewayEndpointConfig};
 pub mod old_config_v1_1_13;
 pub mod old_config_v1_1_20;
 pub mod old_config_v1_1_20_2;
 pub mod old_config_v1_1_33;
 mod persistence;
 mod template;
@@ -75,7 +74,7 @@ impl NymConfigTemplate for Config {
    }
 }
-impl CliClientConfig for Config {
+impl ClientConfig for Config {
    fn common_paths(&self) -> &CommonClientPaths {
        &self.storage_paths.common_paths
    }
@@ -5,8 +5,8 @@ use crate::client::config::old_config_v1_1_20_2::{
    ClientPathsV1_1_20_2, ConfigV1_1_20_2, SocketTypeV1_1_20_2, SocketV1_1_20_2,
 };
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::disk_persistence::old_v1_1_33::ClientKeysPathsV1_1_33;
 use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
 use nym_client_core::config::old_config_v1_1_20_2::{
    ClientV1_1_20_2, ConfigV1_1_20_2 as BaseConfigV1_1_20_2,
@@ -60,7 +60,7 @@ impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
            socket: value.socket.into(),
            storage_paths: ClientPathsV1_1_20_2 {
                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPathsV1_1_33 {
+                    keys: ClientKeysPaths {
                        private_identity_key_file: value.base.client.private_identity_key_file,
                        public_identity_key_file: value.base.client.public_identity_key_file,
                        private_encryption_key_file: value.base.client.private_encryption_key_file,
@@ -1,15 +1,18 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::client::config::old_config_v1_1_33::{
+use crate::{
-    ClientPathsV1_1_33, ConfigV1_1_33, SocketTypeV1_1_33, SocketV1_1_33,
+    client::config::{
        default_config_filepath, persistence::ClientPaths, Config, Socket, SocketType,
    },
    error::ClientError,
 };
-use crate::{client::config::default_config_filepath, error::ClientError};
+
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::old_config_v1_1_20_2::ConfigV1_1_20_2 as BaseConfigV1_1_20_2;
 use nym_client_core::config::old_config_v1_1_30::ConfigV1_1_30 as BaseConfigV1_1_30;
-use nym_client_core::config::old_config_v1_1_33::OldGatewayEndpointConfigV1_1_33;
+use nym_client_core::config::GatewayEndpointConfig;
 use nym_config::read_config_from_toml_file;
 use nym_network_defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
 use serde::{Deserialize, Serialize};
@@ -46,12 +49,12 @@ impl ConfigV1_1_20_2 {
    // in this upgrade, gateway endpoint configuration was moved out of the config file,
    // so its returned to be stored elsewhere.
-    pub fn upgrade(self) -> Result<(ConfigV1_1_33, OldGatewayEndpointConfigV1_1_33), ClientError> {
+    pub fn upgrade(self) -> Result<(Config, GatewayEndpointConfig), ClientError> {
        let gateway_details = self.base.client.gateway_endpoint.clone().into();
-        let config = ConfigV1_1_33 {
+        let config = Config {
            base: BaseConfigV1_1_30::from(self.base).into(),
            socket: self.socket.into(),
-            storage_paths: ClientPathsV1_1_33 {
+            storage_paths: ClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
            },
            logging: self.logging,
@@ -68,11 +71,11 @@ pub enum SocketTypeV1_1_20_2 {
    None,
 }
-impl From<SocketTypeV1_1_20_2> for SocketTypeV1_1_33 {
+impl From<SocketTypeV1_1_20_2> for SocketType {
    fn from(value: SocketTypeV1_1_20_2) -> Self {
        match value {
-            SocketTypeV1_1_20_2::WebSocket => SocketTypeV1_1_33::WebSocket,
+            SocketTypeV1_1_20_2::WebSocket => SocketType::WebSocket,
-            SocketTypeV1_1_20_2::None => SocketTypeV1_1_33::None,
+            SocketTypeV1_1_20_2::None => SocketType::None,
        }
    }
 }
@@ -85,9 +88,9 @@ pub struct SocketV1_1_20_2 {
    pub listening_port: u16,
 }
-impl From<SocketV1_1_20_2> for SocketV1_1_33 {
+impl From<SocketV1_1_20_2> for Socket {
    fn from(value: SocketV1_1_20_2) -> Self {
-        SocketV1_1_33 {
+        Socket {
            socket_type: value.socket_type.into(),
            host: value.host,
            listening_port: value.listening_port,
@@ -1,99 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::client::config::persistence::ClientPaths;
 use crate::client::config::{default_config_filepath, Config, Socket, SocketType};
 use crate::error::ClientError;
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_33::CommonClientPathsV1_1_33;
 use nym_client_core::config::old_config_v1_1_33::ConfigV1_1_33 as BaseConfigV1_1_33;
 use nym_config::read_config_from_toml_file;
 use nym_network_defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
 use serde::{Deserialize, Serialize};
 use std::io;
 use std::net::{IpAddr, Ipv4Addr};
 use std::path::Path;
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone)]
 pub struct ClientPathsV1_1_33 {
    #[serde(flatten)]
    pub common_paths: CommonClientPathsV1_1_33,
 }
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct ConfigV1_1_33 {
    #[serde(flatten)]
    pub base: BaseConfigV1_1_33,
    pub socket: SocketV1_1_33,
    // \/ CHANGED
    pub storage_paths: ClientPathsV1_1_33,
    // /\ CHANGED
    pub logging: LoggingSettings,
 }
 impl ConfigV1_1_33 {
    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
        read_config_from_toml_file(path)
    }
    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
        Self::read_from_toml_file(default_config_filepath(id))
    }
    pub fn try_upgrade(self) -> Result<Config, ClientError> {
        Ok(Config {
            base: self.base.into(),
            socket: self.socket.into(),
            storage_paths: ClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
            },
            logging: self.logging,
        })
    }
 }
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
 #[serde(deny_unknown_fields)]
 pub enum SocketTypeV1_1_33 {
    WebSocket,
    None,
 }
 impl From<SocketTypeV1_1_33> for SocketType {
    fn from(value: SocketTypeV1_1_33) -> Self {
        match value {
            SocketTypeV1_1_33::WebSocket => SocketType::WebSocket,
            SocketTypeV1_1_33::None => SocketType::None,
        }
    }
 }
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct SocketV1_1_33 {
    pub socket_type: SocketTypeV1_1_33,
    pub host: IpAddr,
    pub listening_port: u16,
 }
 impl From<SocketV1_1_33> for Socket {
    fn from(value: SocketV1_1_33) -> Self {
        Socket {
            socket_type: value.socket_type.into(),
            host: value.host,
            listening_port: value.listening_port,
        }
    }
 }
 impl Default for SocketV1_1_33 {
    fn default() -> Self {
        SocketV1_1_33 {
            socket_type: SocketTypeV1_1_33::WebSocket,
            host: IpAddr::V4(Ipv4Addr::LOCALHOST),
            listening_port: DEFAULT_WEBSOCKET_LISTENING_PORT,
        }
    }
 }
@@ -50,6 +50,10 @@ keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key
 # Path to file containing public encryption key.
 keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
 # Path to file containing key used for encrypting and decrypting the content of an
 # acknowledgement so that nobody besides the client knows which packet it refers to.
 keys.ack_key_file = '{{ storage_paths.keys.ack_key_file }}'
@@ -60,9 +64,9 @@ credentials_database = '{{ storage_paths.credentials_database }}'
 # Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
 reply_surb_database = '{{ storage_paths.reply_surb_database }}'
-# Path to the file containing information about gateways used by this client,
+# Path to the file containing information about gateway used by this client,
-# i.e. details such as their public keys, owner addresses or the network information.
+# i.e. details such as its public key, owner address or the network information.
-gateway_registrations = '{{ storage_paths.gateway_registrations }}'
+gateway_details = '{{ storage_paths.gateway_details }}'
 ##### socket config options #####
@@ -106,10 +106,8 @@ impl SocketClient {
        };
        let storage = self.initialise_storage().await?;
        let user_agent = nym_bin_common::bin_info!().into();
-        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client)
+        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client);
            .with_user_agent(user_agent);
        if let Some(custom_mixnet) = &self.custom_mixnet {
            base_client = base_client.with_stored_topology(custom_mixnet)?;
@@ -1,31 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_add_gateway::{add_gateway, CommonClientAddGatewayArgs};
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonClientAddGatewayArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonClientAddGatewayArgs> for Args {
    fn as_ref(&self) -> &CommonClientAddGatewayArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
    let res = add_gateway::<CliNativeClient, _>(args, Some(user_agent)).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -1,14 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_client_core::cli_helpers::client_import_credential::{
    import_credential, CommonClientImportCredentialArgs,
 };
 pub(crate) async fn execute(args: CommonClientImportCredentialArgs) -> Result<(), ClientError> {
    import_credential::<CliNativeClient, _>(args).await?;
    println!("successfully imported credential!");
    Ok(())
 }
@@ -4,7 +4,7 @@
 use crate::client::config::{
    default_config_directory, default_config_filepath, default_data_directory,
 };
-use crate::commands::CliNativeClient;
+use crate::commands::try_upgrade_config;
 use crate::{
    client::config::Config,
    commands::{override_config, OverrideConfig},
@@ -21,8 +21,17 @@ use std::fs;
 use std::net::IpAddr;
 use std::path::PathBuf;
-impl InitialisableClient for CliNativeClient {
+struct NativeClientInit;
 impl InitialisableClient for NativeClientInit {
    const NAME: &'static str = "native";
    type Error = ClientError;
    type InitArgs = Init;
    type Config = Config;
    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
        try_upgrade_config(id)
    }
    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
        fs::create_dir_all(default_data_directory(id))?;
@@ -42,7 +51,7 @@ impl InitialisableClient for CliNativeClient {
    }
 }
-#[derive(Args, Clone, Debug)]
+#[derive(Args, Clone)]
 pub(crate) struct Init {
    #[command(flatten)]
    common_args: CommonClientInitArgs,
@@ -114,9 +123,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), ClientError> {
    eprintln!("Initialising client...");
    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliNativeClient>(args, Some(user_agent)).await?;
+    let res = initialise_client::<NativeClientInit>(args).await?;
    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -1,32 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_list_gateways::{
    list_gateways, CommonClientListGatewaysArgs,
 };
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonClientListGatewaysArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonClientListGatewaysArgs> for Args {
    fn as_ref(&self) -> &CommonClientListGatewaysArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
    let output = args.output;
    let res = list_gateways::<CliNativeClient, _>(args).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -4,50 +4,35 @@
 use crate::client::config::old_config_v1_1_13::OldConfigV1_1_13;
 use crate::client::config::old_config_v1_1_20::ConfigV1_1_20;
 use crate::client::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
 use crate::client::config::old_config_v1_1_33::ConfigV1_1_33;
 use crate::client::config::{BaseClientConfig, Config};
 use crate::error::ClientError;
 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::completions::{fig_generate, ArgShell};
-use nym_client_core::cli_helpers::client_import_credential::CommonClientImportCredentialArgs;
+use nym_client_core::client::base_client::storage::gateway_details::{
-use nym_client_core::cli_helpers::CliClient;
+    OnDiskGatewayDetails, PersistedGatewayDetails,
-use nym_client_core::client::base_client::storage::migration_helpers::v1_1_33;
+};
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_client_core::config::GatewayEndpointConfig;
 use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
 use std::error::Error;
 use std::net::IpAddr;
 use std::sync::OnceLock;
 mod add_gateway;
 pub(crate) mod build_info;
 pub(crate) mod import_credential;
 pub(crate) mod init;
 mod list_gateways;
 pub(crate) mod run;
 mod show_ticketbooks;
 mod switch_gateway;
-pub(crate) struct CliNativeClient;
+lazy_static! {
-
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
 impl CliClient for CliNativeClient {
    const NAME: &'static str = "native";
    type Error = ClientError;
    type Config = Config;
    async fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
        try_upgrade_config(id).await
    }
    async fn try_load_current_config(id: &str) -> Result<Self::Config, Self::Error> {
        try_load_current_config(id).await
    }
 }
 // Helper for passing LONG_VERSION to clap
 fn pretty_build_info_static() -> &'static str {
-    static PRETTY_BUILD_INFORMATION: OnceLock<String> = OnceLock::new();
+    &PRETTY_BUILD_INFORMATION
    PRETTY_BUILD_INFORMATION.get_or_init(|| bin_info!().pretty_print())
 }
 #[derive(Parser)]
@@ -73,21 +58,6 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),
    /// Import a pre-generated credential
    ImportCredential(CommonClientImportCredentialArgs),
    /// List all registered with gateways
    ListGateways(list_gateways::Args),
    /// Add new gateway to this client
    AddGateway(add_gateway::Args),
    /// Change the currently active gateway. Note that you must have already registered with the new gateway!
    SwitchGateway(switch_gateway::Args),
    /// Display information associated with the imported ticketbooks,
    ShowTicketbooks(show_ticketbooks::Args),
    /// Show build information of this binary
    BuildInfo(build_info::BuildInfo),
@@ -116,11 +86,6 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
    match args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
        Commands::ImportCredential(m) => import_credential::execute(m).await?,
        Commands::ListGateways(args) => list_gateways::execute(args).await?,
        Commands::AddGateway(args) => add_gateway::execute(args).await?,
        Commands::SwitchGateway(args) => switch_gateway::execute(args).await?,
        Commands::ShowTicketbooks(args) => show_ticketbooks::execute(args).await?,
        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
@@ -156,7 +121,29 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
        )
 }
-async fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, ClientError> {
+fn persist_gateway_details(
    config: &Config,
    details: GatewayEndpointConfig,
 ) -> Result<(), ClientError> {
    let details_store =
        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
    let keys_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
    let shared_keys = keys_store.ephemeral_load_gateway_keys().map_err(|source| {
        ClientError::ClientCoreError(ClientCoreError::KeyStoreError {
            source: Box::new(source),
        })
    })?;
    let persisted_details = PersistedGatewayDetails::new(details.into(), Some(&shared_keys))?;
    details_store
        .store_to_disk(&persisted_details)
        .map_err(|source| {
            ClientError::ClientCoreError(ClientCoreError::GatewayDetailsStoreError {
                source: Box::new(source),
            })
        })
 }
 fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, ClientError> {
    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
    // explicitly load it as v1.1.13 (which is incompatible with the next step, i.e. 1.1.19)
@@ -170,22 +157,14 @@ async fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, ClientError> {
    let updated_step1: ConfigV1_1_20 = old_config.into();
    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
-    let (updated_step3, gateway_config) = updated_step2.upgrade()?;
+    let (updated, gateway_config) = updated_step2.upgrade()?;
-    let old_paths = updated_step3.storage_paths.clone();
+    persist_gateway_details(&updated, gateway_config)?;
    let updated = updated_step3.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, ClientError> {
+fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, ClientError> {
    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
    // explicitly load it as v1.1.20 (which is incompatible with the current one, i.e. +1.1.21)
@@ -198,21 +177,14 @@ async fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, ClientError> {
    info!("It is going to get updated to the current specification.");
    let updated_step1: ConfigV1_1_20_2 = old_config.into();
-    let (updated_step2, gateway_config) = updated_step1.upgrade()?;
+    let (updated, gateway_config) = updated_step1.upgrade()?;
-    let old_paths = updated_step2.storage_paths.clone();
+    persist_gateway_details(&updated, gateway_config)?;
    let updated = updated_step2.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, ClientError> {
+fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, ClientError> {
    // explicitly load it as v1.1.20_2 (which is incompatible with the current one, i.e. +1.1.21)
    let Ok(old_config) = ConfigV1_1_20_2::read_from_default_path(id) else {
        // if we failed to load it, there might have been nothing to upgrade
@@ -222,62 +194,28 @@ async fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, ClientError> {
    info!("It seems the client is using <= v1.1.20_2 config template.");
    info!("It is going to get updated to the current specification.");
-    let (updated_step1, gateway_config) = old_config.upgrade()?;
+    let (updated, gateway_config) = old_config.upgrade()?;
-    let old_paths = updated_step1.storage_paths.clone();
+    persist_gateway_details(&updated, gateway_config)?;
    let updated = updated_step1.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
 async fn try_upgrade_v1_1_33_config(id: &str) -> Result<bool, ClientError> {
    // explicitly load it as v1.1.33 (which is incompatible with the current one, i.e. +1.1.34)
    let Ok(old_config) = ConfigV1_1_33::read_from_default_path(id) else {
        // if we failed to load it, there might have been nothing to upgrade
        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
        return Ok(false);
    };
    info!("It seems the client is using <= v1.1.33 config template.");
    info!("It is going to get updated to the current specification.");
    let old_paths = old_config.storage_paths.clone();
    let updated = old_config.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        None,
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_config(id: &str) -> Result<(), ClientError> {
+fn try_upgrade_config(id: &str) -> Result<(), ClientError> {
-    if try_upgrade_v1_1_13_config(id).await? {
+    if try_upgrade_v1_1_13_config(id)? {
        return Ok(());
    }
-    if try_upgrade_v1_1_20_config(id).await? {
+    if try_upgrade_v1_1_20_config(id)? {
        return Ok(());
    }
-    if try_upgrade_v1_1_20_2_config(id).await? {
+    if try_upgrade_v1_1_20_2_config(id)? {
        return Ok(());
    }
    if try_upgrade_v1_1_33_config(id).await? {
        return Ok(());
    }
    Ok(())
 }
-async fn try_load_current_config(id: &str) -> Result<Config, ClientError> {
+fn try_load_current_config(id: &str) -> Result<Config, ClientError> {
    // try to load the config as is
    if let Ok(cfg) = Config::read_from_default_path(id) {
        return if !cfg.validate() {
@@ -288,7 +226,7 @@ async fn try_load_current_config(id: &str) -> Result<Config, ClientError> {
    }
    // we couldn't load it - try upgrading it from older revisions
-    try_upgrade_config(id).await?;
+    try_upgrade_config(id)?;
    let config = match Config::read_from_default_path(id) {
        Ok(cfg) => cfg,
@@ -308,6 +246,7 @@ async fn try_load_current_config(id: &str) -> Result<Config, ClientError> {
 #[cfg(test)]
 mod tests {
    use super::*;
    use clap::CommandFactory;
    #[test]
    fn verify_cli() {
@@ -69,7 +69,7 @@ fn version_check(cfg: &Config) -> bool {
 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn Error + Send + Sync>> {
    eprintln!("Starting client {}...", args.common_args.id);
-    let mut config = try_load_current_config(&args.common_args.id).await?;
+    let mut config = try_load_current_config(&args.common_args.id)?;
    config = override_config(config, OverrideConfig::from(args.clone()));
    if !version_check(&config) {
@@ -1,32 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_show_ticketbooks::{
    show_ticketbooks, CommonShowTicketbooksArgs,
 };
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonShowTicketbooksArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonShowTicketbooksArgs> for Args {
    fn as_ref(&self) -> &CommonShowTicketbooksArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
    let output = args.output;
    let res = show_ticketbooks::<CliNativeClient, _>(args).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -1,24 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_client_core::cli_helpers::client_switch_gateway::{
    switch_gateway, CommonClientSwitchGatewaysArgs,
 };
 #[derive(clap::Args, Clone, Debug)]
 pub struct Args {
    #[command(flatten)]
    common_args: CommonClientSwitchGatewaysArgs,
 }
 impl AsRef<CommonClientSwitchGatewaysArgs> for Args {
    fn as_ref(&self) -> &CommonClientSwitchGatewaysArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
    switch_gateway::<CliNativeClient, _>(args).await
 }
@@ -1,13 +1,11 @@
 use nym_client_core::error::ClientCoreError;
 use nym_id::NymIdError;
 #[derive(thiserror::Error, Debug)]
 pub enum ClientError {
    #[error("I/O error: {0}")]
    IoError(#[from] std::io::Error),
-    #[error(transparent)]
+    #[error("client-core error: {0}")]
    ClientCoreError(#[from] ClientCoreError),
    #[error("Failed to load config for: {0}")]
@@ -22,10 +20,4 @@ pub enum ClientError {
    #[error("Attempted to start the client in invalid socket mode")]
    InvalidSocketMode,
    #[error(transparent)]
    ConfigUpgradeFailure(#[from] nym_client_core::config::ConfigUpgradeFailure),
    #[error(transparent)]
    NymIdError(#[from] NymIdError),
 }
@@ -422,7 +422,7 @@ impl Handler {
    ) {
        // We don't want a crash in the connection handler to trigger a shutdown of the whole
        // process.
-        task_client.disarm();
+        task_client.mark_as_success();
        let ws_stream = match accept_async(socket).await {
            Ok(ws_stream) => ws_stream,
@@ -8,7 +8,7 @@ use crate::error::{self, ErrorKind};
 use crate::text::ClientRequestText;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
-
+use std::convert::{TryFrom, TryInto};
 use std::mem::size_of;
 #[repr(u8)]
@@ -9,7 +9,7 @@ use crate::text::ServerResponseText;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
 use nym_sphinx::receiver::ReconstructedMessage;
-
+use std::convert::TryInto;
 use std::mem::size_of;
 #[repr(u8)]
@@ -7,6 +7,7 @@ use crate::responses::ServerResponse;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
 // local text equivalent of `ClientRequest` for easier serialization + deserialization with serde
 // TODO: figure out if there's an easy way to avoid defining it
@@ -1,54 +1,40 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.39"
+version = "1.1.32"
 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"
-rust-version = "1.70"
+rust-version = "1.56"
 license.workspace = true
 [dependencies]
 bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
 lazy_static = "1.4.0"
 log = { workspace = true }
-serde = { workspace = true, features = [
+pretty_env_logger = "0.4"
-    "derive",
+serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 ] } # for config serialization/deserialization
 serde_json = { workspace = true }
-tap = { workspace = true }
+tap = "1.0.1"
 thiserror = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] }
+tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
-rand = { workspace = true }
+rand = "0.7.3"
 time = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
 # internal
-nym-bin-common = { path = "../../common/bin-common", features = [
+nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
-    "output_format",
+nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
-    "clap",
+nym-coconut-interface = { path = "../../common/coconut-interface" }
 ] }
 nym-client-core = { path = "../../common/client-core", features = [
    "fs-credentials-storage",
    "fs-surb-storage",
    "fs-gateways-storage",
    "cli",
 ] }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
 nym-crypto = { path = "../../common/crypto" }
-nym-gateway-requests = { path = "../../common/gateway-requests" }
+nym-gateway-requests = { path = "../../gateway/gateway-requests" }
-nym-id = { path = "../../common/nym-id" }
+nym-credential-storage = { path = "../../common/credential-storage" }
 nym-network-defaults = { path = "../../common/network-defaults" }
 nym-sphinx = { path = "../../common/nymsphinx" }
 nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 nym-pemstore = { path = "../../common/pemstore" }
 nym-socks5-client-core = { path = "../../common/socks5-client-core" }
 nym-sphinx = { path = "../../common/nymsphinx" }
 nym-topology = { path = "../../common/topology" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = [
+nym-socks5-client-core = { path = "../../common/socks5-client-core" }
    "http-client",
 ] }
 [features]
 default = []
@@ -1,31 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_add_gateway::{add_gateway, CommonClientAddGatewayArgs};
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonClientAddGatewayArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonClientAddGatewayArgs> for Args {
    fn as_ref(&self) -> &CommonClientAddGatewayArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
    let res = add_gateway::<CliSocks5Client, _>(args, Some(user_agent)).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -1,16 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_client_core::cli_helpers::client_import_credential::{
    import_credential, CommonClientImportCredentialArgs,
 };
 pub(crate) async fn execute(
    args: CommonClientImportCredentialArgs,
 ) -> Result<(), Socks5ClientError> {
    import_credential::<CliSocks5Client, _>(args).await?;
    println!("successfully imported credential!");
    Ok(())
 }
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::commands::CliSocks5Client;
+use crate::commands::try_upgrade_config;
 use crate::config::{
    default_config_directory, default_config_filepath, default_data_directory, Config,
 };
@@ -21,8 +21,17 @@ use std::fs;
 use std::net::{IpAddr, SocketAddr};
 use std::path::PathBuf;
-impl InitialisableClient for CliSocks5Client {
+struct Socks5ClientInit;
 impl InitialisableClient for Socks5ClientInit {
    const NAME: &'static str = "socks5";
    type Error = Socks5ClientError;
    type InitArgs = Init;
    type Config = Config;
    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
        try_upgrade_config(id)
    }
    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
        fs::create_dir_all(default_data_directory(id))?;
@@ -42,7 +51,7 @@ impl InitialisableClient for CliSocks5Client {
    }
 }
-#[derive(Args, Clone, Debug)]
+#[derive(Args, Clone)]
 pub(crate) struct Init {
    #[command(flatten)]
    common_args: CommonClientInitArgs,
@@ -109,7 +118,7 @@ impl InitResults {
        Self {
            client_address: res.init_results.address.to_string(),
            client_core: res.init_results,
-            socks5_listening_address: res.config.core.socks5.bind_address,
+            socks5_listening_address: res.config.core.socks5.bind_adddress,
        }
    }
 }
@@ -129,9 +138,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), Socks5ClientError> {
    eprintln!("Initialising client...");
    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliSocks5Client>(args, Some(user_agent)).await?;
+    let res = initialise_client::<Socks5ClientInit>(args).await?;
    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -1,32 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_list_gateways::{
    list_gateways, CommonClientListGatewaysArgs,
 };
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonClientListGatewaysArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonClientListGatewaysArgs> for Args {
    fn as_ref(&self) -> &CommonClientListGatewaysArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
    let output = args.output;
    let res = list_gateways::<CliSocks5Client, _>(args).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -5,53 +5,37 @@ use crate::config::old_config_v1_1_13::OldConfigV1_1_13;
 use crate::config::old_config_v1_1_20::ConfigV1_1_20;
 use crate::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
 use crate::config::old_config_v1_1_30::ConfigV1_1_30;
-use crate::config::old_config_v1_1_33::ConfigV1_1_33;
+use crate::config::{BaseClientConfig, Config, SocksClientPaths};
 use crate::config::{BaseClientConfig, Config};
 use crate::error::Socks5ClientError;
 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::completions::{fig_generate, ArgShell};
-use nym_client_core::cli_helpers::client_import_credential::CommonClientImportCredentialArgs;
+use nym_client_core::client::base_client::storage::gateway_details::{
-use nym_client_core::cli_helpers::CliClient;
+    OnDiskGatewayDetails, PersistedGatewayDetails,
-use nym_client_core::client::base_client::storage::migration_helpers::v1_1_33;
+};
 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::{GroupBy, TopologyStructure};
+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 std::error::Error;
 use std::net::IpAddr;
 use std::sync::OnceLock;
 mod add_gateway;
 pub(crate) mod build_info;
 mod import_credential;
 pub mod init;
 mod list_gateways;
 pub(crate) mod run;
 mod show_ticketbooks;
 mod switch_gateway;
-pub(crate) struct CliSocks5Client;
+lazy_static! {
-
+    pub static ref PRETTY_BUILD_INFORMATION: String = bin_info!().pretty_print();
 impl CliClient for CliSocks5Client {
    const NAME: &'static str = "socks5";
    type Error = Socks5ClientError;
    type Config = Config;
    async fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
        try_upgrade_config(id).await
    }
    async fn try_load_current_config(id: &str) -> Result<Self::Config, Self::Error> {
        try_load_current_config(id).await
    }
 }
 // Helper for passing LONG_VERSION to clap
 fn pretty_build_info_static() -> &'static str {
-    static PRETTY_BUILD_INFORMATION: OnceLock<String> = OnceLock::new();
+    &PRETTY_BUILD_INFORMATION
    PRETTY_BUILD_INFORMATION.get_or_init(|| bin_info!().pretty_print())
 }
 #[derive(Parser)]
@@ -77,21 +61,6 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),
    /// Import a pre-generated credential
    ImportCredential(CommonClientImportCredentialArgs),
    /// List all registered with gateways
    ListGateways(list_gateways::Args),
    /// Add new gateway to this client
    AddGateway(add_gateway::Args),
    /// Change the currently active gateway. Note that you must have already registered with the new gateway!
    SwitchGateway(switch_gateway::Args),
    /// Display information associated with the imported ticketbooks,
    ShowTicketbooks(show_ticketbooks::Args),
    /// Show build information of this binary
    BuildInfo(build_info::BuildInfo),
@@ -123,11 +92,6 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
    match args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
        Commands::ImportCredential(m) => import_credential::execute(m).await?,
        Commands::ListGateways(args) => list_gateways::execute(args).await?,
        Commands::AddGateway(args) => add_gateway::execute(args).await?,
        Commands::SwitchGateway(args) => switch_gateway::execute(args).await?,
        Commands::ShowTicketbooks(args) => show_ticketbooks::execute(args).await?,
        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
@@ -203,7 +167,28 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
        )
 }
-async fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, Socks5ClientError> {
+fn persist_gateway_details(
    storage_paths: &SocksClientPaths,
    details: GatewayEndpointConfig,
 ) -> Result<(), Socks5ClientError> {
    let details_store = OnDiskGatewayDetails::new(&storage_paths.common_paths.gateway_details);
    let keys_store = OnDiskKeys::new(storage_paths.common_paths.keys.clone());
    let shared_keys = keys_store.ephemeral_load_gateway_keys().map_err(|source| {
        Socks5ClientError::ClientCoreError(ClientCoreError::KeyStoreError {
            source: Box::new(source),
        })
    })?;
    let persisted_details = PersistedGatewayDetails::new(details.into(), Some(&shared_keys))?;
    details_store
        .store_to_disk(&persisted_details)
        .map_err(|source| {
            Socks5ClientError::ClientCoreError(ClientCoreError::GatewayDetailsStoreError {
                source: Box::new(source),
            })
        })
 }
 fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, Socks5ClientError> {
    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
    // explicitly load it as v1.1.13 (which is incompatible with the next step, i.e. 1.1.19)
@@ -218,23 +203,14 @@ async fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, Socks5ClientError>
    let updated_step1: ConfigV1_1_20 = old_config.into();
    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
    let (updated_step3, gateway_config) = updated_step2.upgrade()?;
-    let old_paths = updated_step3.storage_paths.clone();
+    persist_gateway_details(&updated_step3.storage_paths, gateway_config)?;
    let updated_step4: ConfigV1_1_33 = updated_step3.into();
    let updated = updated_step4.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    let updated: Config = updated_step3.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, Socks5ClientError> {
+fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, Socks5ClientError> {
    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
    // explicitly load it as v1.1.20 (which is incompatible with the current one, i.e. +1.1.21)
@@ -248,23 +224,14 @@ async fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, Socks5ClientError>
    let updated_step1: ConfigV1_1_20_2 = old_config.into();
    let (updated_step2, gateway_config) = updated_step1.upgrade()?;
-    let old_paths = updated_step2.storage_paths.clone();
+    persist_gateway_details(&updated_step2.storage_paths, gateway_config)?;
    let updated_step3: ConfigV1_1_33 = updated_step2.into();
    let updated = updated_step3.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    let updated: Config = updated_step2.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, Socks5ClientError> {
+fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, Socks5ClientError> {
    // explicitly load it as v1.1.20_2 (which is incompatible with the current one, i.e. +1.1.21)
    let Ok(old_config) = ConfigV1_1_20_2::read_from_default_path(id) else {
        // if we failed to load it, there might have been nothing to upgrade
@@ -275,23 +242,14 @@ async fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, Socks5ClientErro
    info!("It is going to get updated to the current specification.");
    let (updated_step1, gateway_config) = old_config.upgrade()?;
-    let old_paths = updated_step1.storage_paths.clone();
+    persist_gateway_details(&updated_step1.storage_paths, gateway_config)?;
    let updated_step2: ConfigV1_1_33 = updated_step1.into();
    let updated = updated_step2.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        Some(gateway_config),
    )
    .await?;
    let updated: Config = updated_step1.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_30_config(id: &str) -> Result<bool, Socks5ClientError> {
+fn try_upgrade_v1_1_30_config(id: &str) -> Result<bool, Socks5ClientError> {
    // explicitly load it as v1.1.30 (which is incompatible with the current one, i.e. +1.1.31)
    let Ok(old_config) = ConfigV1_1_30::read_from_default_path(id) else {
        // if we failed to load it, there might have been nothing to upgrade
@@ -301,68 +259,29 @@ async fn try_upgrade_v1_1_30_config(id: &str) -> Result<bool, Socks5ClientError>
    info!("It seems the client is using <= v1.1.30 config template.");
    info!("It is going to get updated to the current specification.");
-    let old_paths = old_config.storage_paths.clone();
+    let updated: Config = old_config.into();
    let updated_step1: ConfigV1_1_33 = old_config.into();
    let updated = updated_step1.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        None,
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
-async fn try_upgrade_v1_1_33_config(id: &str) -> Result<bool, Socks5ClientError> {
+fn try_upgrade_config(id: &str) -> Result<(), Socks5ClientError> {
-    // explicitly load it as v1.1.33 (which is incompatible with the current one, i.e. +1.1.34)
+    if try_upgrade_v1_1_13_config(id)? {
    let Ok(old_config) = ConfigV1_1_33::read_from_default_path(id) else {
        // if we failed to load it, there might have been nothing to upgrade
        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
        return Ok(false);
    };
    info!("It seems the client is using <= v1.1.33 config template.");
    info!("It is going to get updated to the current specification.");
    let old_paths = old_config.storage_paths.clone();
    let updated = old_config.try_upgrade()?;
    v1_1_33::migrate_gateway_details(
        &old_paths.common_paths,
        &updated.storage_paths.common_paths,
        None,
    )
    .await?;
    updated.save_to_default_location()?;
    Ok(true)
 }
 async fn try_upgrade_config(id: &str) -> Result<(), Socks5ClientError> {
    if try_upgrade_v1_1_13_config(id).await? {
        return Ok(());
    }
-    if try_upgrade_v1_1_20_config(id).await? {
+    if try_upgrade_v1_1_20_config(id)? {
        return Ok(());
    }
-    if try_upgrade_v1_1_20_2_config(id).await? {
+    if try_upgrade_v1_1_20_2_config(id)? {
        return Ok(());
    }
-    if try_upgrade_v1_1_30_config(id).await? {
+    if try_upgrade_v1_1_30_config(id)? {
        return Ok(());
    }
    if try_upgrade_v1_1_33_config(id).await? {
        return Ok(());
    }
    Ok(())
 }
-async fn try_load_current_config(id: &str) -> Result<Config, Socks5ClientError> {
+fn try_load_current_config(id: &str) -> Result<Config, Socks5ClientError> {
    // try to load the config as is
    if let Ok(cfg) = Config::read_from_default_path(id) {
        return if !cfg.validate() {
@@ -373,7 +292,7 @@ async fn try_load_current_config(id: &str) -> Result<Config, Socks5ClientError>
    }
    // we couldn't load it - try upgrading it from older revisions
-    try_upgrade_config(id).await?;
+    try_upgrade_config(id)?;
    let config = match Config::read_from_default_path(id) {
        Ok(cfg) => cfg,
@@ -393,6 +312,7 @@ async fn try_load_current_config(id: &str) -> Result<Config, Socks5ClientError>
 #[cfg(test)]
 mod tests {
    use super::*;
    use clap::CommandFactory;
    #[test]
    fn verify_cli() {
@@ -105,7 +105,7 @@ fn version_check(cfg: &Config) -> bool {
 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
    eprintln!("Starting client {}...", args.common_args.id);
-    let mut config = try_load_current_config(&args.common_args.id).await?;
+    let mut config = try_load_current_config(&args.common_args.id)?;
    config = override_config(config, OverrideConfig::from(args.clone()));
    if !version_check(&config) {
@@ -116,13 +116,7 @@ pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error +
    let storage =
        OnDiskPersistent::from_paths(config.storage_paths.common_paths, &config.core.base.debug)
            .await?;
-    let user_agent = nym_bin_common::bin_info!().into();
+    NymClient::new(config.core, storage, args.common_args.custom_mixnet)
-    NymClient::new(
+        .run_forever()
-        config.core,
+        .await
        storage,
        user_agent,
        args.common_args.custom_mixnet,
    )
    .run_forever()
    .await
 }
@@ -1,32 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_show_ticketbooks::{
    show_ticketbooks, CommonShowTicketbooksArgs,
 };
 #[derive(clap::Args)]
 pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonShowTicketbooksArgs,
    #[arg(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }
 impl AsRef<CommonShowTicketbooksArgs> for Args {
    fn as_ref(&self) -> &CommonShowTicketbooksArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
    let output = args.output;
    let res = show_ticketbooks::<CliSocks5Client, _>(args).await?;
    println!("{}", output.format(&res));
    Ok(())
 }
@@ -1,24 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_client_core::cli_helpers::client_switch_gateway::{
    switch_gateway, CommonClientSwitchGatewaysArgs,
 };
 #[derive(clap::Args, Clone, Debug)]
 pub struct Args {
    #[command(flatten)]
    common_args: CommonClientSwitchGatewaysArgs,
 }
 impl AsRef<CommonClientSwitchGatewaysArgs> for Args {
    fn as_ref(&self) -> &CommonClientSwitchGatewaysArgs {
        &self.common_args
    }
 }
 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
    switch_gateway::<CliSocks5Client, _>(args).await
 }
@@ -3,7 +3,7 @@
 use crate::config::template::CONFIG_TEMPLATE;
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::cli_helpers::CliClientConfig;
+use nym_client_core::cli_helpers::client_init::ClientConfig;
 use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::{
    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
@@ -24,7 +24,6 @@ pub mod old_config_v1_1_13;
 pub mod old_config_v1_1_20;
 pub mod old_config_v1_1_20_2;
 pub mod old_config_v1_1_30;
 pub mod old_config_v1_1_33;
 mod persistence;
 mod template;
@@ -72,7 +71,7 @@ impl NymConfigTemplate for Config {
    }
 }
-impl CliClientConfig for Config {
+impl ClientConfig for Config {
    fn common_paths(&self) -> &CommonClientPaths {
        &self.storage_paths.common_paths
    }
@@ -5,8 +5,8 @@ use crate::config::old_config_v1_1_20_2::{
    ConfigV1_1_20_2, CoreConfigV1_1_20_2, SocksClientPathsV1_1_20_2,
 };
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::keys_paths::ClientKeysPaths;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::disk_persistence::old_v1_1_33::ClientKeysPathsV1_1_33;
 use nym_client_core::config::old_config_v1_1_20::ConfigV1_1_20 as BaseConfigV1_1_20;
 use nym_client_core::config::old_config_v1_1_20_2::ClientV1_1_20_2;
 use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
@@ -50,7 +50,7 @@ impl From<ConfigV1_1_20> for ConfigV1_1_20_2 {
            },
            storage_paths: SocksClientPathsV1_1_20_2 {
                common_paths: CommonClientPathsV1_1_20_2 {
-                    keys: ClientKeysPathsV1_1_33 {
+                    keys: ClientKeysPaths {
                        private_identity_key_file: value.base.client.private_identity_key_file,
                        public_identity_key_file: value.base.client.public_identity_key_file,
                        private_encryption_key_file: value.base.client.private_encryption_key_file,
@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 use crate::config::old_config_v1_1_30::ConfigV1_1_30;
-use crate::config::old_config_v1_1_33::SocksClientPathsV1_1_33;
+use crate::{
-use crate::{config::default_config_filepath, error::Socks5ClientError};
+    config::{default_config_filepath, persistence::SocksClientPaths},
    error::Socks5ClientError,
 };
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
-use nym_client_core::config::old_config_v1_1_33::OldGatewayEndpointConfigV1_1_33;
+use nym_client_core::config::GatewayEndpointConfig;
 use nym_config::read_config_from_toml_file;
 use serde::{Deserialize, Serialize};
 use std::io;
@@ -41,13 +43,11 @@ impl ConfigV1_1_20_2 {
    // in this upgrade, gateway endpoint configuration was moved out of the config file,
    // so its returned to be stored elsewhere.
-    pub fn upgrade(
+    pub fn upgrade(self) -> Result<(ConfigV1_1_30, GatewayEndpointConfig), Socks5ClientError> {
        self,
    ) -> Result<(ConfigV1_1_30, OldGatewayEndpointConfigV1_1_33), Socks5ClientError> {
        let gateway_details = self.core.base.client.gateway_endpoint.clone().into();
        let config = ConfigV1_1_30 {
            core: self.core.into(),
-            storage_paths: SocksClientPathsV1_1_33 {
+            storage_paths: SocksClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
            },
            logging: self.logging,
@@ -1,8 +1,8 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use crate::config::default_config_filepath;
+use crate::config::persistence::SocksClientPaths;
-use crate::config::old_config_v1_1_33::{ConfigV1_1_33, SocksClientPathsV1_1_33};
+use crate::config::{default_config_filepath, Config};
 use nym_bin_common::logging::LoggingSettings;
 use nym_config::read_config_from_toml_file;
 use nym_socks5_client_core::config::old_config_v1_1_30::ConfigV1_1_30 as CoreConfigV1_1_30;
@@ -15,14 +15,17 @@ use std::path::Path;
 pub struct ConfigV1_1_30 {
    pub core: CoreConfigV1_1_30,
-    pub storage_paths: SocksClientPathsV1_1_33,
+    // I'm leaving a landmine here for when the paths actually do change the next time,
    // but propagating the change right now (in ALL clients) would be such a hassle...,
    // so sorry for the next person looking at it : )
    pub storage_paths: SocksClientPaths,
    pub logging: LoggingSettings,
 }
-impl From<ConfigV1_1_30> for ConfigV1_1_33 {
+impl From<ConfigV1_1_30> for Config {
    fn from(value: ConfigV1_1_30) -> Self {
-        ConfigV1_1_33 {
+        Config {
            core: value.core.into(),
            storage_paths: value.storage_paths,
            logging: LoggingSettings::default(),
@@ -1,49 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::config::{default_config_filepath, Config, SocksClientPaths};
 use crate::error::Socks5ClientError;
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_33::CommonClientPathsV1_1_33;
 use nym_config::read_config_from_toml_file;
 use nym_socks5_client_core::config::old_config_v1_1_33::ConfigV1_1_33 as CoreConfigV1_1_33;
 use serde::{Deserialize, Serialize};
 use std::io;
 use std::path::Path;
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct SocksClientPathsV1_1_33 {
    #[serde(flatten)]
    pub common_paths: CommonClientPathsV1_1_33,
 }
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct ConfigV1_1_33 {
    pub core: CoreConfigV1_1_33,
    // \/ CHANGED
    pub storage_paths: SocksClientPathsV1_1_33,
    // /\ CHANGED
    pub logging: LoggingSettings,
 }
 impl ConfigV1_1_33 {
    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
        read_config_from_toml_file(path)
    }
    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
        Self::read_from_toml_file(default_config_filepath(id))
    }
    pub fn try_upgrade(self) -> Result<Config, Socks5ClientError> {
        Ok(Config {
            core: self.core.into(),
            storage_paths: SocksClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
            },
            logging: self.logging,
        })
    }
 }
@@ -50,6 +50,10 @@ keys.private_encryption_key_file = '{{ storage_paths.keys.private_encryption_key
 # Path to file containing public encryption key.
 keys.public_encryption_key_file = '{{ storage_paths.keys.public_encryption_key_file }}'
 # A gateway specific, optional, base58 stringified shared key used for
 # communication with particular gateway.
 keys.gateway_shared_key_file = '{{ storage_paths.keys.gateway_shared_key_file }}'
 # Path to file containing key used for encrypting and decrypting the content of an
 # acknowledgement so that nobody besides the client knows which packet it refers to.
 keys.ack_key_file = '{{ storage_paths.keys.ack_key_file }}'
@@ -60,9 +64,9 @@ credentials_database = '{{ storage_paths.credentials_database }}'
 # Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
 reply_surb_database = '{{ storage_paths.reply_surb_database }}'
-# Path to the file containing information about gateways used by this client,
+# Path to the file containing information about gateway used by this client,
-# i.e. details such as their public keys, owner addresses or the network information.
+# i.e. details such as its public key, owner address or the network information.
-gateway_registrations = '{{ storage_paths.gateway_registrations }}'
+gateway_details = '{{ storage_paths.gateway_details }}'
 ##### socket config options #####
@@ -73,7 +77,7 @@ provider_mix_address = '{{ core.socks5.provider_mix_address }}'
 # The address on which the client will be listening for incoming requests
 # (default: 127.0.0.1:1080)
-bind_address = '{{ core.socks5.bind_address }}'
+bind_adddress = '{{ core.socks5.bind_adddress }}'
 # Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
 # While this is going to hide its actual address information, it will make the actual communication
@@ -1,7 +1,5 @@
 use nym_client_core::error::ClientCoreError;
 use nym_id::NymIdError;
 #[derive(thiserror::Error, Debug)]
 pub enum Socks5ClientError {
    #[error("I/O error: {0}")]
@@ -20,12 +18,6 @@ pub enum Socks5ClientError {
    #[error("Fail to bind address")]
    FailToBindAddress,
-    #[error(transparent)]
+    #[error("client-core error: {0}")]
    ClientCoreError(#[from] ClientCoreError),
    #[error(transparent)]
    ConfigUpgradeFailure(#[from] nym_client_core::config::ConfigUpgradeFailure),
    #[error(transparent)]
    NymIdError(#[from] NymIdError),
 }
@@ -1,79 +0,0 @@
 import { dir } from "console";
 import { readFileSync } from "fs";
 import { dirname } from "path";
 import { TLogLevelName } from "tslog";
 import YAML from "yaml";
 class ConfigHandler {
  private static instance: ConfigHandler;
  private validEnvironments = ["sandbox", "prod"];
  public commonConfig: { request_headers: object };
  private currentEnvironment: string;
  public environment: string;
  public environmentConfig: {
    log_level: TLogLevelName;
    time_zone: string;
    api_base_url: string;
    mix_id: number;
    identity_key: string;
    gateway_identity: string;
  };
  private constructor() {
    this.setCommonConfig();
    this.setEnvironmentConfig(process.env.TEST_ENV || "sandbox" || "prod");
  }
  public static getInstance(): ConfigHandler {
    if (!ConfigHandler.instance) {
      ConfigHandler.instance = new ConfigHandler();
    }
    return ConfigHandler.instance;
  }
  private setCommonConfig(): void {
    try {
      const baseWorkingDirectory = __dirname;
      this.commonConfig = YAML.parse(
        readFileSync(baseWorkingDirectory + "/config.yaml", "utf8"),
      ).common;
    } catch (error) {
      throw Error(`Error reading common config: (${error})`);
    }
  }
  private setEnvironmentConfig(environment: string): void {
    this.ensureEnvironmentIsValid(environment);
    try {
      const baseWorkingDirectory = __dirname;
      this.environmentConfig = YAML.parse(
        readFileSync(baseWorkingDirectory + "/config.yaml", "utf8"),
      )[environment];
    } catch (error) {
      console.log("fadsfasdfasdfsdfsa")
      throw Error(`Error reading environment config: (${error})`);
    }
  }
  public getEnvironmentConfig(environment: string): any {
    const baseWorkingDirectory = __dirname;
    return (
      this.environmentConfig ||
      YAML.parse(readFileSync(baseWorkingDirectory + "/config.yaml", "utf8"))[environment]
    );
  }
  private ensureEnvironmentIsValid(environment: string): void {
    if (this.validEnvironments.indexOf(environment) === -1) {
      throw Error(`Config environment is not valid: "${environment}"`);
    }
  }
 }
 export default ConfigHandler;
@@ -1,4 +0,0 @@
 module.exports = {
    ConfigHandler: require('./config/configHandler.ts'),
    RestClient: require('./restClient/RestClient.ts')
  };
@@ -1,13 +1,13 @@
 [package]
-name = "nym-async-file-watcher"
+name = "async-file-watcher"
 version = "0.1.0"
-edition.workspace = true
+edition = "2021"
 license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-futures = { workspace = true }
+log = "0.4"
 log = { workspace = true }
 notify = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
 futures = { workspace = true }
 notify = "5.1.0"
@@ -1,17 +0,0 @@
 [package]
 name = "nym-authenticator-requests"
 version = "0.1.0"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
 documentation.workspace = true
 edition.workspace = true
 license.workspace = true
 [dependencies]
 bincode = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 nym-sphinx = { path = "../nymsphinx" }
 nym-wireguard-types = { path = "../wireguard-types" }
@@ -1,13 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 pub mod v1;
 pub const CURRENT_VERSION: u8 = 1;
 fn make_bincode_serializer() -> impl bincode::Options {
    use bincode::Options;
    bincode::DefaultOptions::new()
        .with_big_endian()
        .with_varint_encoding()
 }
@@ -1,7 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 pub mod request;
 pub mod response;
 const VERSION: u8 = 1;
@@ -1,84 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use nym_sphinx::addressing::Recipient;
 use nym_wireguard_types::{GatewayClient, InitMessage, PeerPublicKey};
 use serde::{Deserialize, Serialize};
 use crate::make_bincode_serializer;
 use super::VERSION;
 fn generate_random() -> u64 {
    use rand::RngCore;
    let mut rng = rand::rngs::OsRng;
    rng.next_u64()
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthenticatorRequest {
    pub version: u8,
    pub data: AuthenticatorRequestData,
    pub reply_to: Recipient,
    pub request_id: u64,
 }
 impl AuthenticatorRequest {
    pub fn from_reconstructed_message(
        message: &nym_sphinx::receiver::ReconstructedMessage,
    ) -> Result<Self, bincode::Error> {
        use bincode::Options;
        make_bincode_serializer().deserialize(&message.message)
    }
    pub fn new_initial_request(init_message: InitMessage, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
                version: VERSION,
                data: AuthenticatorRequestData::Initial(init_message),
                reply_to,
                request_id,
            },
            request_id,
        )
    }
    pub fn new_final_request(gateway_client: GatewayClient, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
                version: VERSION,
                data: AuthenticatorRequestData::Final(gateway_client),
                reply_to,
                request_id,
            },
            request_id,
        )
    }
    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
        let request_id = generate_random();
        (
            Self {
                version: VERSION,
                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
                reply_to,
                request_id,
            },
            request_id,
        )
    }
    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
        use bincode::Options;
        make_bincode_serializer().serialize(self)
    }
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum AuthenticatorRequestData {
    Initial(InitMessage),
    Final(GatewayClient),
    QueryBandwidth(PeerPublicKey),
 }
@@ -1,119 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use nym_sphinx::addressing::Recipient;
 use nym_wireguard_types::registration::{RegistrationData, RegistredData, RemainingBandwidthData};
 use serde::{Deserialize, Serialize};
 use crate::make_bincode_serializer;
 use super::VERSION;
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AuthenticatorResponse {
    pub version: u8,
    pub data: AuthenticatorResponseData,
    pub reply_to: Recipient,
 }
 impl AuthenticatorResponse {
    pub fn new_pending_registration_success(
        registration_data: RegistrationData,
        request_id: u64,
        reply_to: Recipient,
    ) -> Self {
        Self {
            version: VERSION,
            data: AuthenticatorResponseData::PendingRegistration(PendingRegistrationResponse {
                reply: registration_data,
                reply_to,
                request_id,
            }),
            reply_to,
        }
    }
    pub fn new_registered(
        registred_data: RegistredData,
        reply_to: Recipient,
        request_id: u64,
    ) -> Self {
        Self {
            version: VERSION,
            data: AuthenticatorResponseData::Registered(RegisteredResponse {
                reply: registred_data,
                reply_to,
                request_id,
            }),
            reply_to,
        }
    }
    pub fn new_remaining_bandwidth(
        remaining_bandwidth_data: Option<RemainingBandwidthData>,
        reply_to: Recipient,
        request_id: u64,
    ) -> Self {
        Self {
            version: VERSION,
            data: AuthenticatorResponseData::RemainingBandwidth(RemainingBandwidthResponse {
                reply: remaining_bandwidth_data,
                reply_to,
                request_id,
            }),
            reply_to,
        }
    }
    pub fn recipient(&self) -> Recipient {
        self.reply_to
    }
    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
        use bincode::Options;
        make_bincode_serializer().serialize(self)
    }
    pub fn from_reconstructed_message(
        message: &nym_sphinx::receiver::ReconstructedMessage,
    ) -> Result<Self, bincode::Error> {
        use bincode::Options;
        make_bincode_serializer().deserialize(&message.message)
    }
    pub fn id(&self) -> Option<u64> {
        match &self.data {
            AuthenticatorResponseData::PendingRegistration(response) => Some(response.request_id),
            AuthenticatorResponseData::Registered(response) => Some(response.request_id),
            AuthenticatorResponseData::RemainingBandwidth(response) => Some(response.request_id),
        }
    }
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum AuthenticatorResponseData {
    PendingRegistration(PendingRegistrationResponse),
    Registered(RegisteredResponse),
    RemainingBandwidth(RemainingBandwidthResponse),
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct PendingRegistrationResponse {
    pub request_id: u64,
    pub reply_to: Recipient,
    pub reply: RegistrationData,
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RegisteredResponse {
    pub request_id: u64,
    pub reply_to: Recipient,
    pub reply: RegistredData,
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RemainingBandwidthResponse {
    pub request_id: u64,
    pub reply_to: Recipient,
    pub reply: Option<RemainingBandwidthData>,
 }
@@ -8,20 +8,17 @@ license.workspace = true
 [dependencies]
 bip39 = { workspace = true }
-log = { workspace = true }
+rand = "0.7.3"
 rand = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
-nym-ecash-time = { path = "../ecash-time" }
+nym-coconut-interface = { path = "../coconut-interface" }
 nym-credential-storage = { path = "../credential-storage" }
 nym-credentials = { path = "../credentials" }
 nym-credentials-interface = { path = "../credentials-interface" }
 nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 nym-network-defaults = { path = "../network-defaults" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }
 nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" }
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-validator-client]
 path = "../client-libs/validator-client"
@@ -1,86 +1,62 @@
-// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use crate::error::BandwidthControllerError;
-use crate::utils::{get_coin_index_signatures, get_expiration_date_signatures};
+use nym_coconut_interface::Base58;
 use log::info;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::ecash::bandwidth::IssuanceTicketBook;
+use nym_credentials::coconut::bandwidth::BandwidthVoucher;
-use nym_credentials::ecash::utils::obtain_aggregate_wallet;
+use nym_credentials::coconut::utils::obtain_aggregate_signature;
-use nym_credentials::IssuedTicketBook;
+use nym_crypto::asymmetric::{encryption, identity};
-use nym_credentials_interface::TicketType;
+use nym_network_defaults::VOUCHER_INFO;
-use nym_crypto::asymmetric::identity;
+use nym_validator_client::coconut::all_coconut_api_clients;
-use nym_ecash_time::{ecash_default_expiration_date, Date};
+use nym_validator_client::nyxd::contract_traits::CoconutBandwidthSigningClient;
-use nym_validator_client::coconut::all_ecash_api_clients;
+use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
-use nym_validator_client::nym_api::EpochId;
+use nym_validator_client::nyxd::Coin;
 use nym_validator_client::nyxd::contract_traits::EcashSigningClient;
 use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, EcashQueryClient};
 use nym_validator_client::nyxd::cosmwasm_client::ToSingletonContractData;
 use nym_validator_client::EcashApiClient;
 use rand::rngs::OsRng;
 use state::State;
-pub async fn make_deposit<C>(
+pub mod state;
-    client: &C,
+
-    client_id: &[u8],
+pub async fn deposit<C>(client: &C, amount: Coin) -> Result<State, BandwidthControllerError>
    expiration: Option<Date>,
    ticketbook_type: TicketType,
 ) -> Result<IssuanceTicketBook, BandwidthControllerError>
 where
-    C: EcashSigningClient + EcashQueryClient + Sync,
+    C: CoconutBandwidthSigningClient + Sync,
 {
    let mut rng = OsRng;
    let signing_key = identity::PrivateKey::new(&mut rng);
-    let expiration = expiration.unwrap_or_else(ecash_default_expiration_date);
+    let encryption_key = encryption::PrivateKey::new(&mut rng);
    let params = BandwidthVoucher::default_parameters();
    let voucher_value = amount.amount.to_string();
-    let deposit_amount = client.get_required_deposit_amount().await?;
+    let tx_hash = client
-    info!("we'll need to deposit {deposit_amount} to obtain the ticketbook");
+        .deposit(
-    let result = client
+            amount,
-        .make_ticketbook_deposit(
+            String::from(VOUCHER_INFO),
            signing_key.public_key().to_base58_string(),
-            deposit_amount.into(),
+            encryption_key.public_key().to_base58_string(),
            None,
        )
-        .await?;
+        .await?
        .transaction_hash;
-    let deposit_id = result.parse_singleton_u32_contract_data()?;
+    let voucher = BandwidthVoucher::new(
-
+        &params,
-    info!("our ticketbook deposit has been stored under id {deposit_id}");
+        voucher_value,
-
+        VOUCHER_INFO.to_string(),
-    Ok(IssuanceTicketBook::new_with_expiration(
+        tx_hash,
        deposit_id,
        client_id,
        signing_key,
-        ticketbook_type,
+        encryption_key,
-        expiration,
+    );
-    ))
+
    let state = State { voucher, params };
    Ok(state)
 }
-pub async fn query_and_persist_required_global_signatures<S>(
+pub async fn get_credential<C, St>(
-    storage: &S,
+    state: &State,
    epoch_id: EpochId,
    expiration_date: Date,
    apis: Vec<EcashApiClient>,
 ) -> Result<(), BandwidthControllerError>
 where
    S: Storage,
    <S as Storage>::StorageError: Send + Sync + 'static,
 {
    log::info!("Getting expiration date signatures");
    // this will also persist the signatures in the storage if they were not there already
    get_expiration_date_signatures(storage, epoch_id, expiration_date, apis.clone()).await?;
    log::info!("Getting coin indices signatures");
    // this will also persist the signatures in the storage if they were not there already
    get_coin_index_signatures(storage, epoch_id, apis).await?;
    Ok(())
 }
 pub async fn get_ticket_book<C, St>(
    issuance_data: &IssuanceTicketBook,
    client: &C,
    storage: &St,
-    apis: Option<Vec<EcashApiClient>>,
+) -> Result<(), BandwidthControllerError>
 ) -> Result<IssuedTicketBook, BandwidthControllerError>
 where
    C: DkgQueryClient + Send + Sync,
    St: Storage,
@@ -92,35 +68,24 @@ where
        .await?
        .ok_or(BandwidthControllerError::NoThreshold)?;
-    let apis = match apis {
+    let coconut_api_clients = all_coconut_api_clients(client, epoch_id).await?;
        Some(apis) => apis,
        None => all_ecash_api_clients(client, epoch_id).await?,
    };
-    log::info!("Querying wallet signatures");
+    let signature = obtain_aggregate_signature(
-    let wallet = obtain_aggregate_wallet(issuance_data, &apis, threshold).await?;
+        &state.params,
-    info!("managed to obtain sufficient number of partial signatures!");
+        &state.voucher,
-
+        &coconut_api_clients,
-    log::info!("Getting expiration date signatures");
+        threshold,
    // this will also persist the signatures in the storage if they were not there already
    get_expiration_date_signatures(
        storage,
        epoch_id,
        issuance_data.expiration_date(),
        apis.clone(),
    )
    .await?;
    log::info!("Getting coin indices signatures");
    // this will also persist the signatures in the storage if they were not there already
    get_coin_index_signatures(storage, epoch_id, apis).await?;
    let issued = issuance_data.to_issued_ticketbook(wallet, epoch_id);
    info!("persisting the ticketbook into the storage...");
    storage
-        .insert_issued_ticketbook(&issued)
+        .insert_coconut_credential(
            state.voucher.get_voucher_value(),
            VOUCHER_INFO.to_string(),
            state.voucher.get_private_attributes()[0].to_bs58(),
            state.voucher.get_private_attributes()[1].to_bs58(),
            signature.to_bs58(),
            epoch_id.to_string(),
        )
        .await
-        .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?;
+        .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
    Ok(issued)
 }
@@ -0,0 +1,19 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use nym_coconut_interface::Parameters;
 use nym_credentials::coconut::bandwidth::BandwidthVoucher;
 pub struct State {
    pub voucher: BandwidthVoucher,
    pub params: Parameters,
 }
 impl State {
    pub fn new(voucher: BandwidthVoucher) -> Self {
        State {
            voucher,
            params: BandwidthVoucher::default_parameters(),
        }
    }
 }
@@ -1,12 +1,12 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 use nym_coconut_interface::CoconutError;
 use nym_credential_storage::error::StorageError;
 use nym_credentials::error::Error as CredentialsError;
 use nym_credentials_interface::CompactEcashError;
 use nym_crypto::asymmetric::encryption::KeyRecoveryError;
 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
-use nym_validator_client::coconut::EcashApiError;
+use nym_validator_client::coconut::CoconutApiError;
 use nym_validator_client::error::ValidatorClientError;
 use thiserror::Error;
@@ -16,20 +16,17 @@ pub enum BandwidthControllerError {
    Nyxd(#[from] nym_validator_client::nyxd::error::NyxdError),
    #[error("coconut api query failure: {0}")]
-    CoconutApiError(#[from] EcashApiError),
+    CoconutApiError(#[from] CoconutApiError),
    #[error("There was a credential storage error - {0}")]
    CredentialStorageError(Box<dyn std::error::Error + Send + Sync>),
    #[error("the credential storage does not contain any usable credentials")]
    NoCredentialsAvailable,
    // this should really be fully incorporated into the above, but messing with coconut is the last thing I want to do now
    #[error(transparent)]
    StorageError(#[from] StorageError),
-    #[error("Ecash error - {0}")]
+    #[error("Coconut error - {0}")]
-    EcashError(#[from] CompactEcashError),
+    CoconutError(#[from] CoconutError),
    #[error("Validator client error - {0}")]
    ValidatorError(#[from] ValidatorClientError),
@@ -48,18 +45,4 @@ pub enum BandwidthControllerError {
    #[error("Threshold not set yet")]
    NoThreshold,
    #[error("can't handle recovering storage with revision {stored}. {expected} was expected")]
    UnsupportedCredentialStorageRevision { stored: u8, expected: u8 },
    #[error("did not receive a valid response for aggregated data ({typ}) from ANY nym-api")]
    ExhaustedApiQueries { typ: String },
 }
 impl BandwidthControllerError {
    pub fn credential_storage_error(
        source: impl std::error::Error + Send + Sync + 'static,
    ) -> Self {
        BandwidthControllerError::CredentialStorageError(Box::new(source))
    }
 }
@@ -1,13 +0,0 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 // See other comments for other TaskStatus message enumds about abusing the Error trait when we
 // should have a new trait for TaskStatus messages
 #[derive(Debug, thiserror::Error)]
 pub enum BandwidthStatusMessage {
    #[error("remaining bandwidth: {0}")]
    RemainingBandwidth(i64),
    #[error("no bandwidth left")]
    NoBandwidth,
 }
@@ -1,226 +1,99 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 #![warn(clippy::expect_used)]
 #![warn(clippy::unwrap_used)]
 #![warn(clippy::todo)]
 #![warn(clippy::dbg_macro)]
 use crate::error::BandwidthControllerError;
-use crate::utils::{
+use nym_credential_storage::error::StorageError;
    get_aggregate_verification_key, get_coin_index_signatures, get_expiration_date_signatures,
    ApiClientsWrapper,
 };
 use log::error;
 use nym_credential_storage::models::RetrievedTicketbook;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::ecash::bandwidth::CredentialSpendingData;
+use nym_validator_client::coconut::all_coconut_api_clients;
 use nym_credentials_interface::{
    AnnotatedCoinIndexSignature, AnnotatedExpirationDateSignature, NymPayInfo, VerificationKeyAuth,
 };
 use nym_ecash_time::Date;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
-
+use std::str::FromStr;
-pub use event::BandwidthStatusMessage;
+use zeroize::Zeroizing;
 use {
    nym_coconut_interface::Base58,
    nym_credentials::coconut::{
        bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
    },
 };
 pub mod acquire;
 pub mod error;
 mod event;
 mod utils;
 #[derive(Debug)]
 pub struct BandwidthController<C, St> {
    storage: St,
    client: C,
 }
 pub struct PreparedCredential {
    /// The cryptographic material required for spending the underlying credential.
    pub data: CredentialSpendingData,
    /// The (DKG) epoch id under which the credential has been issued so that the verifier
    /// could use correct verification key for validation.
    pub epoch_id: EpochId,
    /// Auxiliary metadata associated with the withdrawn credential
    pub metadata: PreparedCredentialMetadata,
 }
 #[derive(Copy, Clone)]
 pub struct PreparedCredentialMetadata {
    /// The database id of the stored credential.
    pub ticketbook_id: i64,
    /// The number of tickets withdrawn in this credential
    pub tickets_withdrawn: u32,
    /// The amount of tickets used INCLUDING those tickets that JUST got withdrawn
    pub used_tickets: u32,
 }
 impl<C, St: Storage> BandwidthController<C, St> {
    pub fn new(storage: St, client: C) -> Self {
        BandwidthController { storage, client }
    }
-    /// Tries to retrieve one of the stored, unused credentials that hasn't yet expired.
+    pub fn storage(&self) -> &St {
-    pub async fn get_next_usable_ticketbook(
+        &self.storage
    }
    pub async fn prepare_coconut_credential(
        &self,
-        tickets: u32,
+    ) -> Result<(nym_coconut_interface::Credential, i64), BandwidthControllerError>
    ) -> Result<RetrievedTicketbook, BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
-        let Some(ticketbook) = self
+        let bandwidth_credential = self
            .storage
-            .get_next_unspent_usable_ticketbook(tickets)
+            .get_next_coconut_credential()
            .await
-            .map_err(BandwidthControllerError::credential_storage_error)?
+            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))?;
-        else {
+        let voucher_value = u64::from_str(&bandwidth_credential.voucher_value)
-            return Err(BandwidthControllerError::NoCredentialsAvailable);
+            .map_err(|_| StorageError::InconsistentData)?;
-        };
+        let voucher_info = bandwidth_credential.voucher_info.clone();
        let serial_number = Zeroizing::new(nym_coconut_interface::Attribute::try_from_bs58(
            bandwidth_credential.serial_number,
        )?);
        let binding_number = Zeroizing::new(nym_coconut_interface::Attribute::try_from_bs58(
            bandwidth_credential.binding_number,
        )?);
        let signature =
            nym_coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?;
        let epoch_id = u64::from_str(&bandwidth_credential.epoch_id)
            .map_err(|_| StorageError::InconsistentData)?;
-        Ok(ticketbook)
+        let coconut_api_clients = all_coconut_api_clients(&self.client, epoch_id).await?;
    }
-    pub async fn attempt_revert_ticket_usage(
+        let verification_key = obtain_aggregate_verification_key(&coconut_api_clients).await?;
        &self,
        info: PreparedCredentialMetadata,
    ) -> Result<bool, BandwidthControllerError>
    where
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        self.storage
            .attempt_revert_ticketbook_withdrawal(
                info.ticketbook_id,
                info.used_tickets,
                info.tickets_withdrawn,
            )
            .await
            .map_err(BandwidthControllerError::credential_storage_error)
    }
-    async fn get_aggregate_verification_key(
+        // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-        &self,
+        Ok((
-        epoch_id: EpochId,
+            prepare_for_spending(
-        apis: &mut ApiClientsWrapper,
+                voucher_value,
-    ) -> Result<VerificationKeyAuth, BandwidthControllerError>
+                voucher_info,
-    where
+                &serial_number,
-        C: DkgQueryClient + Sync + Send,
+                &binding_number,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        let ecash_apis = apis.get_or_init(epoch_id, &self.client).await?;
        get_aggregate_verification_key(&self.storage, epoch_id, ecash_apis).await
    }
    async fn get_coin_index_signatures(
        &self,
        epoch_id: EpochId,
        apis: &mut ApiClientsWrapper,
    ) -> Result<Vec<AnnotatedCoinIndexSignature>, BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        let ecash_apis = apis.get_or_init(epoch_id, &self.client).await?;
        get_coin_index_signatures(&self.storage, epoch_id, ecash_apis).await
    }
    async fn get_expiration_date_signatures(
        &self,
        epoch_id: EpochId,
        expiration_date: Date,
        apis: &mut ApiClientsWrapper,
    ) -> Result<Vec<AnnotatedExpirationDateSignature>, BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        let ecash_apis = apis.get_or_init(epoch_id, &self.client).await?;
        get_expiration_date_signatures(&self.storage, epoch_id, expiration_date, ecash_apis).await
    }
    async fn prepare_ecash_ticket_inner(
        &self,
        provider_pk: [u8; 32],
        tickets_to_spend: u32,
        mut retrieved_ticketbook: RetrievedTicketbook,
    ) -> Result<CredentialSpendingData, BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        let epoch_id = retrieved_ticketbook.ticketbook.epoch_id();
        let expiration_date = retrieved_ticketbook.ticketbook.expiration_date();
        let mut api_clients = Default::default();
        let verification_key = self
            .get_aggregate_verification_key(epoch_id, &mut api_clients)
            .await?;
        let expiration_signatures = self
            .get_expiration_date_signatures(epoch_id, expiration_date, &mut api_clients)
            .await?;
        let coin_indices_signatures = self
            .get_coin_index_signatures(epoch_id, &mut api_clients)
            .await?;
        let pay_info = NymPayInfo::generate(provider_pk);
        let spend_request = retrieved_ticketbook.ticketbook.prepare_for_spending(
            &verification_key,
            pay_info.into(),
            &coin_indices_signatures,
            &expiration_signatures,
            tickets_to_spend as u64,
        )?;
        Ok(spend_request)
    }
    pub async fn prepare_ecash_ticket(
        &self,
        provider_pk: [u8; 32],
        tickets_to_spend: u32,
    ) -> Result<PreparedCredential, BandwidthControllerError>
    where
        C: DkgQueryClient + Sync + Send,
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        let retrieved_ticketbook = self.get_next_usable_ticketbook(tickets_to_spend).await?;
        let ticketbook_id = retrieved_ticketbook.ticketbook_id;
        let epoch_id = retrieved_ticketbook.ticketbook.epoch_id();
        let used_tickets =
            retrieved_ticketbook.ticketbook.spent_tickets() as u32 + tickets_to_spend;
        let metadata = PreparedCredentialMetadata {
            ticketbook_id,
            tickets_withdrawn: tickets_to_spend,
            used_tickets,
        };
        match self
            .prepare_ecash_ticket_inner(provider_pk, tickets_to_spend, retrieved_ticketbook)
            .await
        {
            Ok(data) => Ok(PreparedCredential {
                data,
                epoch_id,
-                metadata,
+                &signature,
-            }),
+                &verification_key,
-            Err(err) => {
+            )?,
-                error!("failed to prepare credential spending request. attempting to revert withdrawal...");
+            bandwidth_credential.id,
-                self.attempt_revert_ticket_usage(metadata).await?;
+        ))
-                Err(err)
+    }
-            }
+
-        }
+    pub async fn consume_credential(&self, id: i64) -> Result<(), BandwidthControllerError>
    where
        <St as Storage>::StorageError: Send + Sync + 'static,
    {
        // JS: shouldn't we send some contract/validator/gateway message here to actually, you know,
        // consume it?
        self.storage
            .consume_coconut_credential(id)
            .await
            .map_err(|err| BandwidthControllerError::CredentialStorageError(Box::new(err)))
    }
 }
 impl<C, St> Clone for BandwidthController<C, St>
 where
    C: Clone,
-    St: Clone,
+    St: Storage + Clone,
 {
    fn clone(&self) -> Self {
        BandwidthController {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tommy Verrall	fd516d4633	Merge branch 'feature/mixnode-sandbox-cycles' of https://github.com/nymtech/nym into feature/mixnode-sandbox-cycles	2023-12-20 17:04:20 +01:00
Tommy Verrall	a12ade1ecf	warnings on ci	2023-12-20 16:56:12 +01:00
Tommy Verrall	458a2c5e42	Update build-upload-binaries.yml remove noise	2023-12-20 16:40:02 +01:00
Tommy Verrall	ecaa970380	Update build-upload-binaries.yml update build binary for this branch	2023-12-20 16:38:54 +01:00
Tommy Verrall	42e3064cbb	Merge pull request #4266 from nymtech/mixnode-tokio-console Add tokio-console feature	2023-12-20 15:20:56 +00:00
durch	0d5f594a69	Fix feature name	2023-12-20 16:16:45 +01:00
durch	826db30d2b	Add tokio-console feature	2023-12-20 16:15:18 +01:00