@odatano/core 0.3.16 → 0.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odatano/core",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "SAP CAP plugin for Cardano blockchain OData V4 integration",
   "imports": {
     "#cds-models/*": "./@cds-models/*/index.js"
@@ -14,9 +14,10 @@
     "@blockfrost/blockfrost-js": "^6.0.0",
     "@cardano-ogmios/client": "^6.14.0",
     "@emurgo/cardano-serialization-lib-nodejs": "^15.0.3",
-    "@harmoniclabs/buildooor": "^0.1.21",
+    "@harmoniclabs/buildooor": "^0.1.28",
     "@harmoniclabs/cardano-costmodels-ts": "^1.3.0",
-    "@sap/cds": "^9",
+    "@harmoniclabs/cardano-ledger-ts": "^0.4.6",
+    "@sap/cds": ">=9",
     "axios": "^1.13.2",
     "bech32": "^2.0.0"
   },

package/srv/utils/signing-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signing-helper.d.ts","sourceRoot":"","sources":["signing-helper.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;GAYG;AACH,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAyCtG;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBzD"}
+{"version":3,"file":"signing-helper.d.ts","sourceRoot":"","sources":["signing-helper.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAoEtG;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBzD"}

package/srv/utils/signing-helper.js

@@ -40,7 +40,7 @@ exports.combineTransactionWithWitnesses = combineTransactionWithWitnesses;
 exports.isWitnessSetCbor = isWitnessSetCbor;
 const cds_1 = __importDefault(require("@sap/cds"));
 const CSL = __importStar(require("@emurgo/cardano-serialization-lib-nodejs"));
-const cardano_ledger_ts_1 = require("@harmoniclabs/cardano-ledger-ts");
+const cbor_1 = require("@harmoniclabs/cbor");
 const uint8array_utils_1 = require("@harmoniclabs/uint8array-utils");
 const errors_1 = require("./errors");
 const logger = cds_1.default.log('SigningHelper');
@@ -53,39 +53,72 @@ const logger = cds_1.default.log('SigningHelper');
  *
  * Cardano transaction structure: [body, witness_set, is_valid, auxiliary_data]
  *
+ * IMPORTANT: This operates at the raw CBOR level using @harmoniclabs/cbor, NOT at the
+ * Cardano type level. This is critical for two reasons:
+ * 1. The npm 'cbor' library (v9.0.2) normalizes encoding during round-trip
+ *    (indefinite→definite length, non-minimal integers), changing redeemer bytes and
+ *    causing PPViewHashesDontMatch on Plutus transactions (BUG 10).
+ * 2. @harmoniclabs/cardano-ledger-ts has a key 7 loop bug in TxWitnessSet.fromCborObj
+ *    (processes keys 0-6 only), which would silently drop PlutusV3 scripts.
+ *
+ * The @harmoniclabs/cbor parser preserves encoding metadata (indefinite flag, addInfos)
+ * on each CborObj, so re-encoding produces identical bytes for unchanged elements.
+ * Both Buildooor and this code use the same CBOR library, ensuring consistent encoding.
+ *
  * @param unsignedTxCbor - The unsigned transaction CBOR (hex)
  * @param witnessSetCbor - The witness set CBOR from CIP-30 signTx() (hex)
  * @returns Complete signed transaction CBOR (hex)
  */
 function combineTransactionWithWitnesses(unsignedTxCbor, witnessSetCbor) {
     try {
-        // Parse unsigned transaction using harmoniclabs — preserves original CBOR encoding
-        // via SubCborRef. This is critical: the npm 'cbor' library normalizes encoding
-        // (indefinite→definite length, non-minimal integers) during round-trip, which
-        // changes redeemer bytes and causes PPViewHashesDontMatch on Plutus transactions.
-        // Harmoniclabs preserves body bytes via body.cborRef and individual witness element
-        // bytes via their own SubCborRef. See signature-verifier.ts for the same pattern.
-        const tx = cardano_ledger_ts_1.Tx.fromCbor((0, uint8array_utils_1.fromHex)(unsignedTxCbor));
-        // Parse wallet's witness set (CIP-30 signTx() returns only the witness set)
-        const walletWs = cardano_ledger_ts_1.TxWitnessSet.fromCbor((0, uint8array_utils_1.fromHex)(witnessSetCbor));
-        // Add each VKey witness from the wallet to the transaction.
-        // This follows the same pattern as harmoniclabs' own signWithCip30Wallet() (Tx.js:168).
-        // addVKeyWitness clears Tx.cborRef and TxWitnessSet.cborRef, but body.cborRef and
-        // individual redeemer/datum/script SubCborRefs are preserved. Re-serialization uses
-        // the same @harmoniclabs/cbor library as the builder, ensuring consistent encoding.
-        const vkeys = walletWs.vkeyWitnesses ?? [];
-        for (const vkeyWit of vkeys) {
-            tx.addVKeyWitness(vkeyWit);
+        // Parse at raw CBOR level — no Cardano type validation, preserves all encoding metadata
+        const txObj = cbor_1.Cbor.parse((0, uint8array_utils_1.fromHex)(unsignedTxCbor));
+        if (!(txObj instanceof cbor_1.CborArray) || txObj.array.length < 2) {
+            throw new Error('Invalid transaction CBOR structure');
+        }
+        const walletWsObj = cbor_1.Cbor.parse((0, uint8array_utils_1.fromHex)(witnessSetCbor));
+        // txObj.array[0] = body, [1] = witness_set, [2] = is_valid, [3] = auxiliary_data
+        const origWs = txObj.array[1];
+        let witnessCount = 0;
+        if (origWs instanceof cbor_1.CborMap && walletWsObj instanceof cbor_1.CborMap) {
+            // Find wallet's VKey witnesses (map key 0)
+            const walletVkeyEntry = walletWsObj.map.find(e => e.k instanceof cbor_1.CborUInt && Number(e.k.num) === 0);
+            if (walletVkeyEntry) {
+                // Merge: keep all original entries (redeemers, datums, scripts at keys 3-7),
+                // remove any existing key 0, then add wallet's key 0 (VKey witnesses)
+                const mergedEntries = origWs.map
+                    .filter(e => !(e.k instanceof cbor_1.CborUInt && Number(e.k.num) === 0))
+                    .concat([walletVkeyEntry]);
+                // Construct new witness set CborMap preserving the original's encoding style
+                txObj.array[1] = new cbor_1.CborMap(mergedEntries, {
+                    indefinite: origWs.indefinite,
+                });
+                // Count VKey witnesses — value may be CborArray or CborTag(258, CborArray) in Conway era
+                const vkeyValue = walletVkeyEntry.v;
+                if (vkeyValue instanceof cbor_1.CborArray) {
+                    witnessCount = vkeyValue.array.length;
+                }
+                else if (vkeyValue instanceof cbor_1.CborTag && vkeyValue.data instanceof cbor_1.CborArray) {
+                    witnessCount = vkeyValue.data.array.length;
+                }
+                else {
+                    witnessCount = 1;
+                }
+            }
+        }
+        else {
+            // Fallback for non-Map witness sets (simple transactions)
+            txObj.array[1] = walletWsObj;
         }
-        // Export the signed transaction — body bytes preserved, witness set re-serialized
-        // with wallet VKeys merged into the builder's script witnesses
-        const signedTxCbor = (0, uint8array_utils_1.toHex)(tx.toCborBytes());
+        // Re-encode the tx array, preserving encoding metadata on body and all witness values.
+        // Construct a new CborArray to avoid stale subCborRef pointing to the old bytes.
+        const signedTxCbor = (0, uint8array_utils_1.toHex)(cbor_1.Cbor.encode(new cbor_1.CborArray(txObj.array, { indefinite: txObj.indefinite })).toBuffer());
         logger.info({
             unsignedTxLength: unsignedTxCbor.length,
             witnessSetLength: witnessSetCbor.length,
             signedTxLength: signedTxCbor.length,
-            witnessCount: vkeys.length,
-        }, 'Combined transaction with witness set (harmoniclabs byte-preserving)');
+            witnessCount,
+        }, 'Combined transaction with witness set (harmoniclabs CBOR)');
         return signedTxCbor;
     }
     catch (error) {

package/srv/utils/signing-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"signing-helper.js","sourceRoot":"","sources":["signing-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,0EAyCC;AAWD,4CAkBC;AA3FD,mDAA2B;AAC3B,8EAAgE;AAChE,uEAAmE;AACnE,qEAAgE;AAChE,qCAAsD;AAEtD,MAAM,MAAM,GAAG,aAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAExC;;;;;;;;;;;;GAYG;AACH,SAAgB,+BAA+B,CAAC,cAAsB,EAAE,cAAsB;IAC5F,IAAI,CAAC;QACH,mFAAmF;QACnF,+EAA+E;QAC/E,8EAA8E;QAC9E,kFAAkF;QAClF,oFAAoF;QACpF,kFAAkF;QAClF,MAAM,EAAE,GAAG,sBAAE,CAAC,QAAQ,CAAC,IAAA,0BAAO,EAAC,cAAc,CAAC,CAAC,CAAC;QAEhD,4EAA4E;QAC5E,MAAM,QAAQ,GAAG,gCAAY,CAAC,QAAQ,CAAC,IAAA,0BAAO,EAAC,cAAc,CAAC,CAAC,CAAC;QAEhE,4DAA4D;QAC5D,wFAAwF;QACxF,kFAAkF;QAClF,oFAAoF;QACpF,oFAAoF;QACpF,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC;QAC3C,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;YAC5B,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QAED,kFAAkF;QAClF,+DAA+D;QAC/D,MAAM,YAAY,GAAG,IAAA,wBAAK,EAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAE7C,MAAM,CAAC,IAAI,CAAC;YACV,gBAAgB,EAAE,cAAc,CAAC,MAAM;YACvC,gBAAgB,EAAE,cAAc,CAAC,MAAM;YACvC,cAAc,EAAE,YAAY,CAAC,MAAM;YACnC,YAAY,EAAE,KAAK,CAAC,MAAM;SAC3B,EAAE,sEAAsE,CAAC,CAAC;QAE3E,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,8CAA8C,CAAC,CAAC;QACvF,MAAM,IAAI,mCAA0B,CAClC,iDAAiD,KAAK,CAAC,OAAO,EAAE,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1C,oCAAoC;QACpC,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC7C,wDAAwD;YACxD,EAAE,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,MAAM,CAAC;YACP,wCAAwC;YACxC,GAAG,CAAC,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"signing-helper.js","sourceRoot":"","sources":["signing-helper.ts"],"names":[],"mappings":"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"}