@pioneer-platform/pioneer-caip 9.2.15 → 9.2.16

package/lib/data.d.ts

@@ -1,4 +1,3 @@
-declare const caipToNetworkId: (caip: string) => string;
 export declare const evmCaips: {
     ethereum: string;
     base: string;
@@ -121,11 +120,11 @@ export declare const shortListRangoNameToNetworkId: {
 };
 export declare const NetworkIdToRangoName: (networkId: string) => string | null;
 declare let tokenToCaip: (token: any) => any;
-declare let thorchainToCaip: (chain: string, symbol: string, ticker: any, type: string) => any;
+declare let thorchainToCaip: (identifier: string) => string;
 declare let caipToThorchain: (caip: string, ticker: string) => string | null;
 declare let caipToRango: (caip: string, ticker: string) => {
     blockchain: string;
     symbol: string;
-    address: any;
+    address: string | null;
 } | null;
-export { thorchainToCaip, tokenToCaip, caipToThorchain, caipToRango, caipToNetworkId };
+export { thorchainToCaip, tokenToCaip, caipToThorchain, caipToRango };

package/lib/data.js

@@ -1,10 +1,12 @@
 "use strict";
+/*
+       Caip tools
+
+         This file contains tools for working with CAIP-10 and CAIP-19 identifiers. and transactions layres
+
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.caipToNetworkId = exports.caipToRango = exports.caipToThorchain = exports.tokenToCaip = exports.thorchainToCaip = exports.NetworkIdToRangoName = exports.shortListRangoNameToNetworkId = exports.shortListNameToCaip = exports.shortListSymbolToCaip = exports.shortListSymbolToCoinGeckoPlatformId = exports.getChainEnumValue = exports.NetworkIdToChain = exports.ChainToNetworkId = exports.ChainToCaip = exports.Chain = exports.evmCaips = void 0;
-var caipToNetworkId = function (caip) {
-    return caip.split('/')[0];
-};
-exports.caipToNetworkId = caipToNetworkId;
+exports.caipToRango = exports.caipToThorchain = exports.tokenToCaip = exports.thorchainToCaip = exports.NetworkIdToRangoName = exports.shortListRangoNameToNetworkId = exports.shortListNameToCaip = exports.shortListSymbolToCaip = exports.shortListSymbolToCoinGeckoPlatformId = exports.getChainEnumValue = exports.NetworkIdToChain = exports.ChainToNetworkId = exports.ChainToCaip = exports.Chain = exports.evmCaips = void 0;
 exports.evmCaips = {
     ethereum: 'eip155:1/slip44:60',
     base: 'eip155:8453/slip44:60',
@@ -247,54 +249,57 @@ var NetworkIdToRangoName = function (networkId) {
 exports.NetworkIdToRangoName = NetworkIdToRangoName;
 var tokenToCaip = function (token) {
     try {
-        // Handle identifiers with an extra period
-        var parts = token.identifier.split('.');
-        var chain = void 0, symbol = void 0;
-        if (parts.length >= 2) {
-            chain = parts[0];
-            symbol = parts.slice(1).join('.'); // Re-join the remaining parts excluding the first
-        }
-        else {
-            // Fallback to the original method if there's only one or no period
-            chain = token.identifier.split('.')[0];
-            symbol = token.identifier.split('.')[1];
-        }
-        var type = void 0, ticker = void 0;
+        var caip = void 0;
+        console.log("token", token);
         if (token.address) {
-            ticker = symbol.split('-')[0];
-            type = 'token';
+            // For ERC20 tokens
+            var networkId = exports.ChainToNetworkId[token.chain];
+            if (!networkId)
+                throw new Error("Unsupported chain: ".concat(token.chain));
+            caip = "".concat(networkId, "/erc20:").concat(token.address);
+            token.type = 'token';
         }
         else {
-            type = 'native';
-            ticker = symbol;
+            // For native tokens, use the identifier as it is
+            caip = thorchainToCaip(token.identifier);
+            token.type = 'native';
         }
-        var caip = thorchainToCaip(chain, symbol, ticker, type);
-        token.networkId = exports.ChainToNetworkId[chain];
+        token.networkId = exports.ChainToNetworkId[token.chain];
         token.caip = caip;
-        token.symbol = symbol;
-        token.ticker = ticker;
-        token.type = type;
-        // Get pubkey for chain
+        token.symbol = token.identifier.split('.')[1]; // Assuming the symbol is the second part of the identifier
+        // Keeping the original ticker unchanged
+        // token.ticker = token.address ? token.identifier.split('.')[1].split('-')[0] : token.identifier.split('.')[1];
         return token;
     }
     catch (e) {
         console.error(e);
+        return null;
     }
 };
 exports.tokenToCaip = tokenToCaip;
-var thorchainToCaip = function (chain, symbol, ticker, type) {
+var thorchainToCaip = function (identifier) {
     try {
         var caip = void 0;
-        var key = chain + '.' + symbol; // Concatenate chain and symbol
-        console.log("key:", key);
-        switch (key) {
+        var parts = identifier.split('.');
+        var chain = parts[0];
+        var rest = parts.length > 1 ? parts.slice(1).join('.') : null;
+        var symbolAndContract = rest ? rest.split('-') : [null, null];
+        var symbol = symbolAndContract[0];
+        var contract = symbolAndContract[1];
+        if (contract) {
+            var networkId = exports.ChainToNetworkId[chain];
+            if (!networkId)
+                throw new Error("Unsupported chain: ".concat(chain));
+            caip = "".concat(networkId, "/erc20:").concat(contract);
+            return caip;
+        }
+        console.log("key:", identifier);
+        switch (identifier) {
             case "OSMO.ATOM":
-                // Specific case for OSMO.ATOM
                 caip = 'cosmos:osmosis-1/ibc:B011C1A0AD5E717F674BA59FD8E05B2F946E4FD41C9CB3311C95F7ED4B815620';
                 break;
             case "AVAX.WETH":
-                console.log("WETH detected");
-                caip = exports.ChainToCaip[chain];
+                caip = exports.ChainToCaip['AVAX'];
                 break;
             case "BSC.BNB":
                 caip = exports.shortListNameToCaip['bnbsmartchain'];
@@ -314,21 +319,10 @@ var thorchainToCaip = function (chain, symbol, ticker, type) {
                 caip = exports.shortListNameToCaip[chain.toLowerCase()];
                 break;
             default:
-                if (chain === symbol) {
-                    caip = exports.ChainToCaip[chain];
-                }
-                else {
-                    var networkId = exports.ChainToNetworkId[chain];
-                    console.log("networkId: ", networkId);
-                    if (symbol.indexOf(".") > -1) {
-                        var contract = symbol.split("-")[1];
-                        caip = "".concat(networkId, "/erc20:").concat(contract);
-                    }
-                    else {
-                        console.error({ chain: chain, symbol: symbol, ticker: ticker, type: type });
-                        throw Error("Unable to parse CAIP! TODO!");
-                    }
-                }
+                var networkId = exports.ChainToNetworkId[chain];
+                if (!networkId)
+                    throw new Error("Unsupported chain: ".concat(chain));
+                caip = exports.ChainToCaip[chain] || networkId; // Fallback to networkId if no direct mapping
                 break;
         }
         return caip;
@@ -369,7 +363,7 @@ var caipToThorchain = function (caip, ticker) {
                 return null;
             }
             // Use the ticker as is without converting to uppercase
-            return "".concat(chain, ".").concat(ticker, "-").concat(contractAddress.toUpperCase());
+            return "".concat(chain, ".").concat(ticker, "-").concat(contractAddress);
         }
         else {
             // Handling native tokens
@@ -385,15 +379,13 @@ exports.caipToThorchain = caipToThorchain;
 var caipToRango = function (caip, ticker) {
     try {
         var _a = caip.split('/'), networkId = _a[0], tokenInfo = _a[1];
-        var rangoName = (0, exports.NetworkIdToRangoName)(networkId); // Get the Rango name from the network ID
-        // Extracting the symbol and address
+        var rangoName = (0, exports.NetworkIdToRangoName)(networkId);
         var symbol = ticker;
-        var address = null;
+        var address = null; // Default to null
         // For ERC20 tokens, the contract address is included in the CAIP
         if (tokenInfo && tokenInfo.startsWith('erc20:')) {
             address = tokenInfo.split(':')[1];
         }
-        // Check if the Rango name is found
         if (!rangoName) {
             console.error('Rango name not found for networkId:', networkId);
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/pioneer-caip",
-  "version": "9.2.15",
+  "version": "9.2.16",
   "main": "./lib/index.js",
   "types": "./lib/main.d.ts",
   "_moduleAliases": {
@@ -9,7 +9,8 @@
   "scripts": {
     "npm": "npm i",
     "build": "tsc -p .",
-    "test": "npm run build && node __tests__/tests-common.js",
+    "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"
   },