@vultisig/core-chain 1.2.2 → 1.3.1

package/dist/tx/broadcast/resolvers/cardano.js

@@ -1,74 +1,22 @@
 import { getCardanoTxHash } from '@vultisig/core-chain/tx/hash/resolvers/cardano';
-import { rootApiUrl } from '@vultisig/core-config';
-import { extractErrorMsg } from '@vultisig/lib-utils/error/extractErrorMsg';
 import { isInError } from '@vultisig/lib-utils/error/isInError';
+import { submitCardanoCbor } from '../../../chains/cardano/submit/submitCardanoCbor.js';
 import { selectEncodedBytes } from './utxo.js';
-const cardanoBroadcastUrl = `${rootApiUrl}/ada/`;
-const normalizeHash = (hash) => hash.replace(/^0x/i, '');
-const parseJson = (raw) => {
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        return null;
-    }
-};
-const extractTxHash = (response) => {
-    if (!response) {
-        return null;
-    }
-    if (typeof response === 'string') {
-        const trimmed = response.trim();
-        return trimmed ? normalizeHash(trimmed) : null;
-    }
-    const txId = response.result?.transaction?.id;
-    if (typeof txId === 'string' && txId.trim()) {
-        return normalizeHash(txId.trim());
-    }
-    return null;
-};
-const extractError = (response, raw) => {
-    if (!response) {
-        return extractErrorMsg(raw);
-    }
-    if (typeof response === 'string') {
-        return extractErrorMsg(response);
-    }
-    return extractErrorMsg(response.error ?? raw);
-};
+/**
+ * Ogmios code for "transaction already known / in ledger". When the node
+ * reports this, we hash the tx locally to return the deterministic id.
+ */
+const alreadyCommittedCode = 3117;
 export const broadcastCardanoTx = async ({ chain, tx }) => {
     const encodedBytes = selectEncodedBytes(chain, tx);
     const cborHex = Buffer.from(encodedBytes).toString('hex');
-    // @tony: sticking with the direct fetch here. Our 'queryUrl' auto-runs assertFetchResponse, which throws before we can inspect the raw body or status.
-    const response = await fetch(cardanoBroadcastUrl, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            jsonrpc: '2.0',
-            method: 'submitTransaction',
-            params: {
-                transaction: {
-                    cbor: cborHex,
-                },
-            },
-            id: 1,
-        }),
-    });
-    const responseText = await response.text();
-    const parsed = parseJson(responseText);
-    const rpcErrorCode = parsed && typeof parsed === 'object' && !Array.isArray(parsed)
-        ? parsed.error?.code
-        : undefined;
-    if (rpcErrorCode === 3117) {
-        return normalizeHash(await getCardanoTxHash(tx));
-    }
-    const txHash = extractTxHash(parsed) ?? extractTxHash(responseText);
-    if (txHash) {
+    const { txHash, errorMessage, rpcErrorCode } = await submitCardanoCbor(cborHex);
+    if (txHash)
         return txHash;
+    if (rpcErrorCode === alreadyCommittedCode) {
+        return (await getCardanoTxHash(tx)).replace(/^0x/i, '');
     }
-    const error = extractError(parsed, responseText);
+    const error = errorMessage ?? 'unknown broadcast failure';
     if (isInError(error, 'BadInputsUTxO', 'timed out', 'txn-mempool-conflict', 'already known')) {
         return null;
     }

package/dist/tx/broadcast/resolvers/cardano.js.map

@@ -1 +1 @@
-{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../../../../../packages/core/chain/tx/broadcast/resolvers/cardano.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAA;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,mBAAmB,GAAG,GAAG,UAAU,OAAO,CAAA;AAUhD,MAAM,aAAa,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAExE,MAAM,SAAS,GAAG,CAAC,GAAW,EAAyB,EAAE;IACvD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,QAA+B,EAAiB,EAAE;IACvE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;QAC/B,OAAO,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAChD,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,CAAA;IAE7C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAC5C,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,QAA+B,EAAE,GAAW,EAAU,EAAE;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,eAAe,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,IAAI,GAAG,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAE3B,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE;IAC1B,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEzD,uJAAuJ;IACvJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,mBAAmB,EAAE;QAChD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE;oBACX,IAAI,EAAE,OAAO;iBACd;aACF;YACD,EAAE,EAAE,CAAC;SACN,CAAC;KACH,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAEtC,MAAM,YAAY,GAChB,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAC5D,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI;QACpB,CAAC,CAAC,SAAS,CAAA;IAEf,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC1B,OAAO,aAAa,CAAC,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,YAAY,CAAC,CAAA;IAEnE,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAEhD,IACE,SAAS,CACP,KAAK,EACL,eAAe,EACf,WAAW,EACX,sBAAsB,EACtB,eAAe,CAChB,EACD,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC,CAAA"}
+{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../../../../../packages/core/chain/tx/broadcast/resolvers/cardano.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAA;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kDAAkD,CAAA;AAGpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAE3C;;;GAGG;AACH,MAAM,oBAAoB,GAAG,IAAI,CAAA;AAEjC,MAAM,CAAC,MAAM,kBAAkB,GAE3B,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE;IAC1B,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEzD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAA;IAE/E,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,IAAI,YAAY,KAAK,oBAAoB,EAAE,CAAC;QAC1C,OAAO,CAAC,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,KAAK,GAAG,YAAY,IAAI,2BAA2B,CAAA;IAEzD,IACE,SAAS,CACP,KAAK,EACL,eAAe,EACf,WAAW,EACX,sBAAsB,EACtB,eAAe,CAChB,EACD,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vultisig/core-chain",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Blockchain chain logic shared across Vultisig clients",
   "license": "MIT",
   "repository": {
@@ -79,6 +79,66 @@
       "import": "./dist/chains/cardano/asset/cardanoAssetId.js",
       "default": "./dist/chains/cardano/asset/cardanoAssetId.js"
     },
+    "./chains/cardano/cip30/buildCardanoValue": {
+      "types": "./dist/chains/cardano/cip30/buildCardanoValue.d.ts",
+      "import": "./dist/chains/cardano/cip30/buildCardanoValue.js",
+      "default": "./dist/chains/cardano/cip30/buildCardanoValue.js"
+    },
+    "./chains/cardano/cip30/buildCardanoWitnessSet": {
+      "types": "./dist/chains/cardano/cip30/buildCardanoWitnessSet.d.ts",
+      "import": "./dist/chains/cardano/cip30/buildCardanoWitnessSet.js",
+      "default": "./dist/chains/cardano/cip30/buildCardanoWitnessSet.js"
+    },
+    "./chains/cardano/cip30/buildCoseStructures": {
+      "types": "./dist/chains/cardano/cip30/buildCoseStructures.d.ts",
+      "import": "./dist/chains/cardano/cip30/buildCoseStructures.js",
+      "default": "./dist/chains/cardano/cip30/buildCoseStructures.js"
+    },
+    "./chains/cardano/cip30/cardanoAddressBytes": {
+      "types": "./dist/chains/cardano/cip30/cardanoAddressBytes.d.ts",
+      "import": "./dist/chains/cardano/cip30/cardanoAddressBytes.js",
+      "default": "./dist/chains/cardano/cip30/cardanoAddressBytes.js"
+    },
+    "./chains/cardano/cip30/cardanoCborPrimitives": {
+      "types": "./dist/chains/cardano/cip30/cardanoCborPrimitives.d.ts",
+      "import": "./dist/chains/cardano/cip30/cardanoCborPrimitives.js",
+      "default": "./dist/chains/cardano/cip30/cardanoCborPrimitives.js"
+    },
+    "./chains/cardano/cip30/cardanoTxBodyHash": {
+      "types": "./dist/chains/cardano/cip30/cardanoTxBodyHash.d.ts",
+      "import": "./dist/chains/cardano/cip30/cardanoTxBodyHash.js",
+      "default": "./dist/chains/cardano/cip30/cardanoTxBodyHash.js"
+    },
+    "./chains/cardano/cip30/cborEncoder": {
+      "types": "./dist/chains/cardano/cip30/cborEncoder.d.ts",
+      "import": "./dist/chains/cardano/cip30/cborEncoder.js",
+      "default": "./dist/chains/cardano/cip30/cborEncoder.js"
+    },
+    "./chains/cardano/cip30/cborSkip": {
+      "types": "./dist/chains/cardano/cip30/cborSkip.d.ts",
+      "import": "./dist/chains/cardano/cip30/cborSkip.js",
+      "default": "./dist/chains/cardano/cip30/cborSkip.js"
+    },
+    "./chains/cardano/cip30/decodeCardanoAmountValue": {
+      "types": "./dist/chains/cardano/cip30/decodeCardanoAmountValue.d.ts",
+      "import": "./dist/chains/cardano/cip30/decodeCardanoAmountValue.js",
+      "default": "./dist/chains/cardano/cip30/decodeCardanoAmountValue.js"
+    },
+    "./chains/cardano/cip30/encodeCardanoUnspentOutput": {
+      "types": "./dist/chains/cardano/cip30/encodeCardanoUnspentOutput.d.ts",
+      "import": "./dist/chains/cardano/cip30/encodeCardanoUnspentOutput.js",
+      "default": "./dist/chains/cardano/cip30/encodeCardanoUnspentOutput.js"
+    },
+    "./chains/cardano/cip30/encodeCardanoValue": {
+      "types": "./dist/chains/cardano/cip30/encodeCardanoValue.d.ts",
+      "import": "./dist/chains/cardano/cip30/encodeCardanoValue.js",
+      "default": "./dist/chains/cardano/cip30/encodeCardanoValue.js"
+    },
+    "./chains/cardano/cip30/selectCardanoUtxosByLovelace": {
+      "types": "./dist/chains/cardano/cip30/selectCardanoUtxosByLovelace.d.ts",
+      "import": "./dist/chains/cardano/cip30/selectCardanoUtxosByLovelace.js",
+      "default": "./dist/chains/cardano/cip30/selectCardanoUtxosByLovelace.js"
+    },
     "./chains/cardano/client/config": {
       "types": "./dist/chains/cardano/client/config.d.ts",
       "import": "./dist/chains/cardano/client/config.js",
@@ -104,6 +164,11 @@
       "import": "./dist/chains/cardano/config.js",
       "default": "./dist/chains/cardano/config.js"
     },
+    "./chains/cardano/submit/submitCardanoCbor": {
+      "types": "./dist/chains/cardano/submit/submitCardanoCbor.d.ts",
+      "import": "./dist/chains/cardano/submit/submitCardanoCbor.js",
+      "default": "./dist/chains/cardano/submit/submitCardanoCbor.js"
+    },
     "./chains/cardano/utxo/getCardanoExtendedUtxos": {
       "types": "./dist/chains/cardano/utxo/getCardanoExtendedUtxos.d.ts",
       "import": "./dist/chains/cardano/utxo/getCardanoExtendedUtxos.js",
@@ -1560,7 +1625,7 @@
     "@solana/web3.js": "^1.98.4",
     "@trustwallet/wallet-core": "^4.6.0",
     "@vultisig/core-config": "0.9.1",
-    "@vultisig/lib-utils": "0.9.2",
+    "@vultisig/lib-utils": "0.9.3",
     "bip32": "^5.0.1",
     "bitcoinjs-lib": "^7.0.1",
     "bs58": "^6.0.0",