@pioneer-platform/pioneer-coins 9.2.26 → 9.3.0

package/lib/paths.js

@@ -72,7 +72,7 @@ function getPaths(blockchains, isTestnet) {
         else {
             //legacy  bip44
             output.push({
-                note: "Bitcoin legacy account 0",
+                note: "Bitcoin account 0",
                 networks: ['bip122:000000000019d6689c085ae165831e93'],
                 script_type: "p2pkh",
                 available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
@@ -82,6 +82,7 @@ function getPaths(blockchains, isTestnet) {
                 curve: 'secp256k1',
                 showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
             });
+            //TODO non-native segwit wraped p2sh
             output.push({
                 note: "Bitcoin account 0 Segwit (p2sh-p2wpkh) (ypub) (bip49)",
                 networks: ['bip122:000000000019d6689c085ae165831e93'],
@@ -105,84 +106,12 @@ function getPaths(blockchains, isTestnet) {
                 curve: 'secp256k1',
                 showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
             });
-            //account 1
-            output.push({
-                note: "Bitcoin legacy account 1",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2pkh",
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "xpub",
-                addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1],
-                addressNListMaster: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            output.push({
-                note: "Bitcoin account 1 Segwit (p2sh-p2wpkh) (ypub) (bip49)",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2sh-p2wpkh",
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "ypub",
-                addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 1],
-                addressNListMaster: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 1, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            //bech32 bip84
-            output.push({
-                note: "Bitcoin account 1Native Segwit (Bech32)",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2wpkh", //bech32
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "zpub",
-                addressNList: [0x80000000 + 84, 0x80000000 + 0, 0x80000000 + 1],
-                addressNListMaster: [0x80000000 + 84, 0x80000000 + 0, 0x80000000 + 1, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            //account 2
-            output.push({
-                note: "Bitcoin legacy account 2",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2pkh",
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "xpub",
-                addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 2],
-                addressNListMaster: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 2, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            output.push({
-                note: "Bitcoin account 1 Segwit (p2sh-p2wpkh) (ypub) (bip49)",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2sh-p2wpkh",
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "ypub",
-                addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 2],
-                addressNListMaster: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 2, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            //bech32 bip84
-            output.push({
-                note: "Bitcoin account 1Native Segwit (Bech32)",
-                networks: ['bip122:000000000019d6689c085ae165831e93'],
-                script_type: "p2wpkh", //bech32
-                available_scripts_types: ['p2pkh', 'p2sh', 'p2wpkh', 'p2sh-p2wpkh'],
-                type: "zpub",
-                addressNList: [0x80000000 + 84, 0x80000000 + 0, 0x80000000 + 2],
-                addressNListMaster: [0x80000000 + 84, 0x80000000 + 0, 0x80000000 + 2, 0, 0],
-                curve: 'secp256k1',
-                showDisplay: false // Not supported by TrezorConnect or Ledger, but KeepKey should do it
-            });
-            //account 0-2 parity with ShapeShift legacy
         }
     }
     if (blockchains.some(function (blockchain) { return blockchain.includes('eip155:'); })) {
         var entry = {
             note: " ETH primary (default)",
             networks: ['eip155:1', 'eip155:*'],
-            script_type: "ethereum",
             type: "address",
             addressNList: [0x80000000 + 44, 0x80000000 + 60, 0x80000000 + 0],
             addressNListMaster: [0x80000000 + 44, 0x80000000 + 60, 0x80000000 + 0, 0, 0],

package/lib/thorchain.d.ts

@@ -3,6 +3,7 @@ interface BaseTx {
     asset: string;
     destAddr: string;
 }
+export declare function normalizeSwapMemo(memo: string): string;
 export declare function createMemo(tx: BaseTx): string;
 export declare function parseMemo(memo: string): BaseTx;
 export {};

package/lib/thorchain.js

@@ -4,6 +4,7 @@
     ----------------------
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeSwapMemo = normalizeSwapMemo;
 exports.createMemo = createMemo;
 exports.parseMemo = parseMemo;
 var assetShortCodeMap = {
@@ -35,28 +36,24 @@ var assetShortCodeMap = {
 function interpretAssetShortCode(shortCode) {
     return assetShortCodeMap[shortCode] || shortCode;
 }
-// Utility function to interpret other shortened parts (e.g., scientific notation)
+// Utility function to interpret shortened parts (parsing only, no sci notation)
 function interpretShortenedPart(part) {
-    if (part.includes('e')) {
-        var _a = part.split('e').map(Number), base = _a[0], exponent = _a[1];
-        return base * Math.pow(10, exponent);
-    }
+    // No scientific notation in THORChain memos - keep as is
     return part;
 }
 // Function to build an Aggregate Swap transaction memo
 function buildAggregateSwapMemo(tx) {
-    var _a;
-    var limIntervalQuantity = "".concat(tx.lim || '', "/").concat(tx.interval || '', "/").concat(tx.quantity || '');
+    var limInterval = "".concat(tx.lim || '', "/").concat(tx.interval || '');
     var parts = [
         'SWAP',
         tx.asset,
         tx.destAddr,
-        limIntervalQuantity,
+        limInterval,
         tx.affiliate || '',
-        ((_a = tx.fee) === null || _a === void 0 ? void 0 : _a.toString()) || '',
+        tx.fee || '',
         tx.dexAggregatorAddr,
         tx.finalAssetAddr,
-        tx.minAmountOut.toString()
+        tx.minAmountOut || ''
     ];
     return truncateMemo(parts.join(':'));
 }
@@ -70,43 +67,29 @@ function truncateMemo(memo, limit) {
     }
     return memo;
 }
-// Utility function for converting numbers to scientific notation if needed
-function toScientificNotation(number) {
-    if (number > 1000000) { // Adjust the threshold as needed
-        var exponent = Math.floor(Math.log10(number));
-        var base = number / Math.pow(10, exponent);
-        return "".concat(base.toFixed(1), "e").concat(exponent);
-    }
-    return number.toString();
-}
+// Removed toScientificNotation - THORChain requires plain integers
 // Function to build a Swap transaction memo
 function buildSwapMemo(tx) {
-    var assetShort = Object.keys(assetShortCodeMap).find(function (key) { return assetShortCodeMap[key] === tx.asset; }) || tx.asset;
-    var parts = [
-        '=', // Shorthand for SWAP
-        assetShort,
-        tx.destAddr
-    ];
-    // Handle lim, interval, and quantity
-    if (tx.lim || tx.interval || tx.quantity) {
-        var lim = tx.lim ? toScientificNotation(tx.lim) : '';
-        var interval = tx.interval ? toScientificNotation(tx.interval) : '';
-        var quantity = tx.quantity ? toScientificNotation(tx.quantity) : '';
-        parts.push("".concat(lim, "/").concat(interval, "/").concat(quantity));
+    // Always emit fully-qualified CHAIN.SYMBOL - never shorthand
+    var assetFQ = tx.asset; // e.g. 'BTC.BTC', 'ETH.ETH'
+    var parts = ['=', assetFQ, tx.destAddr];
+    // Handle lim and interval (no quantity in standard swap)
+    if (tx.lim !== undefined || tx.interval !== undefined) {
+        // Integers only, no sci-notation
+        var lim = tx.lim !== undefined ? String(tx.lim) : '';
+        var interval = tx.interval !== undefined ? String(tx.interval) : '';
+        parts.push("".concat(lim).concat(interval ? '/' + interval : ''));
     }
     else {
-        parts.push(''); // Add an empty string to represent missing lim/interval/quantity
+        parts.push(''); // Add empty string for missing lim/interval
     }
-    // Append other parts, handling empty fields appropriately
-    parts.push(tx.affiliate || '');
-    parts.push(tx.fee ? toScientificNotation(tx.fee) : '');
-    parts.push(tx.dexAggregatorAddr || '');
-    parts.push(tx.finalAssetAddr || '');
-    parts.push(tx.minAmountOut ? toScientificNotation(tx.minAmountOut) : '');
-    // Join parts with ':' and correctly handle empty fields
+    // Base swap supports optional affiliate tag + bp (basis points 0..1000)
+    if (tx.affiliate !== undefined)
+        parts.push(tx.affiliate);
+    if (tx.fee !== undefined)
+        parts.push(String(tx.fee)); // basis points
     var memo = parts.join(':');
-    memo = memo.replace(/:{2,}/g, '::'); // Replace multiple colons with double colons
-    memo = memo.replace(/:+$/, ''); // Remove trailing colons
+    memo = memo.replace(/:{2,}/g, '::').replace(/:+$/, '');
     return truncateMemo(memo);
 }
 // Function to build a Deposit transaction memo
@@ -216,6 +199,32 @@ function buildNoOpMemo(tx) {
     return truncateMemo(parts.filter(function (part) { return part; }).join(':'));
 }
 // Main function to create a memo from any transaction type
+// Normalize and validate swap memo
+function normalizeSwapMemo(memo) {
+    // Ensure "=:" prefix and fully qualified asset
+    if (!memo.startsWith('=:')) {
+        if (memo.startsWith('='))
+            memo = memo.replace(/^=/, '=:');
+        else if (memo.startsWith('SWAP:'))
+            memo = memo.replace(/^SWAP:/, '=:');
+    }
+    var parts = memo.slice(2).split(':');
+    if (parts.length < 2)
+        throw new Error('Memo missing asset/destination');
+    // Expand single-letter shorthand if present (parse-time convenience only)
+    var cs = parts[0];
+    var fix = assetShortCodeMap[cs] || assetShortCodeMap[cs.toUpperCase()];
+    if (fix)
+        parts[0] = fix;
+    // Enforce UPPERCASE CHAIN.SYMBOL
+    var _a = parts[0].split('.'), chain = _a[0], symbol = _a[1];
+    if (!chain || !symbol)
+        throw new Error('Asset must be CHAIN.SYMBOL');
+    parts[0] = "".concat(chain.toUpperCase(), ".").concat(symbol.toUpperCase());
+    var normalized = "=:" + parts.join(':');
+    // guard length
+    return truncateMemo(normalized, 250);
+}
 function createMemo(tx) {
     switch (tx.type) {
         case 'SWAP':
@@ -264,19 +273,15 @@ function parseMemo(memo) {
         case 'SWAP': {
             var asset_1 = parts[1];
             var destAddr_1 = parts[2];
-            var _a = parts[3].split('/'), lim = _a[0], interval = _a[1], quantity = _a[2];
+            var _a = (parts[3] || '').split('/'), lim = _a[0], interval = _a[1];
             return {
-                type: 'SWAP', // Type of the transaction
-                asset: asset_1, // Asset being swapped
-                destAddr: destAddr_1, // Destination address
-                lim: lim ? parseInt(lim) : null, // Limit (optional, null if not provided)
-                interval: interval ? parseInt(interval) : null, // Interval (optional)
-                quantity: quantity ? parseInt(quantity) : null, // Quantity (optional)
-                affiliate: parts[4] || null, // Affiliate (optional)
-                fee: parts[5] ? parseFloat(parts[5]) : null, // Fee (optional)
-                dexAggregatorAddr: parts[6] || null, // DEX aggregator address (optional)
-                finalAssetAddr: parts[7] || null, // Final asset address (optional)
-                minAmountOut: parts[8] ? parseInt(parts[8]) : null, // Minimum amount out (optional)
+                type: 'SWAP',
+                asset: asset_1,
+                destAddr: destAddr_1,
+                lim: lim || undefined, // keep as string
+                interval: interval || undefined, // keep as string
+                affiliate: parts[4] || undefined,
+                fee: parts[5] || undefined, // keep as string (bp)
             };
         }
         case 'DEPOSIT':
@@ -355,58 +360,21 @@ function parseMemo(memo) {
                 noVault: parts[1] === 'NOVAULT',
             };
         case 'AGGREGATE_SWAP': {
-            var _b = parts[3].split('/'), lim = _b[0], interval = _b[1], quantity = _b[2];
-            return {
-                type: 'SWAP', // Using 'SWAP' as the type for consistency
-                asset: asset,
-                destAddr: destAddr,
-                lim: lim ? parseInt(lim) : null,
-                interval: interval ? parseInt(interval) : null,
-                quantity: quantity ? parseInt(quantity) : null,
-                affiliate: parts[4] || null,
-                fee: parts[5] ? parseFloat(parts[5]) : null,
-                dexAggregatorAddr: parts[6],
-                finalAssetAddr: parts[7],
-                minAmountOut: parts[8] ? parseInt(parts[8]) : null,
-            };
-        }
-        case 'LOAN+': {
-            var minOut = parts[3] ? parseInt(parts[3]) : null;
+            var _b = (parts[3] || '').split('/'), lim = _b[0], interval = _b[1];
             return {
-                type: type,
+                type: 'AGGREGATE_SWAP',
                 asset: asset,
                 destAddr: destAddr,
-                minOut: minOut,
-                affiliate: parts[4] || null,
-                fee: parts[5] ? parseFloat(parts[5]) : null,
-            };
-        }
-        case 'LOAN-': {
-            var minOut = parts[3] ? parseInt(parts[3]) : null;
-            return {
-                type: type,
-                asset: asset,
-                destAddr: destAddr,
-                minOut: minOut,
-            };
-        }
-        case 'ADD': {
-            return {
-                type: type,
-                asset: asset,
-                pairedAddr: parts[3] || null,
-                affiliate: parts[4] || null,
-                fee: parts[5] ? parseFloat(parts[5]) : null,
-            };
-        }
-        case 'WD': {
-            return {
-                type: type,
-                asset: asset,
-                basisPoints: parseInt(parts[3]),
-                singleAsset: parts[4] || null,
+                lim: lim || undefined,
+                interval: interval || undefined,
+                affiliate: parts[4] || undefined,
+                fee: parts[5] || undefined,
+                dexAggregatorAddr: parts[6] || '',
+                finalAssetAddr: parts[7] || '',
+                minAmountOut: parts[8] || undefined,
             };
         }
+        // Removed duplicate cases - already handled above
         default:
             throw new Error("Unsupported memo type: ".concat(type));
     }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@pioneer-platform/pioneer-coins",
-  "version": "9.2.26",
+  "version": "9.3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "_moduleAliases": {
     "@coins": "lib/coins"
   },
   "scripts": {
-    "npm": "npm i",
+    "npm": "pnpm i",
     "build": "tsc -p .",
-    "test": "npm run build && node __tests__/test-module.js",
-    "test-suite": "npm run build && node __tests__/tests-common.js",
-    "build:watch": "npm run build && onchange 'src/**/*.ts' -- npm run build",
-    "prepublish": "npm run build"
+    "test": "pnpm run build && node __tests__/test-module.js",
+    "test-suite": "pnpm run build && node __tests__/tests-common.js",
+    "build:watch": "pnpm run build && onchange 'src/**/*.ts' -- pnpm run build",
+    "prepublish": "pnpm run build"
   },
   "dependencies": {
     "@pioneer-platform/loggerdog": "^8.3.1",
@@ -21,9 +21,9 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.6",
-    "@types/node": "18.19.71",
+    "@types/node": "^18.16.0",
     "nodemon": "^2.0.3",
-    "typescript": "^5.0.2"
+    "typescript": "^5.0.4"
   },
   "gitHead": "a76012f6693a12181c4744e53e977a9eaeef0ed3"
-}
+}