@cardano-sdk/hardware-trezor 0.7.8 → 0.7.9

package/dist/cjs/TrezorKeyAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrezorKeyAgent.d.ts","sourceRoot":"","sources":["../../src/TrezorKeyAgent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAuB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAEL,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EAEpB,UAAU,EAEV,8BAA8B,EAC9B,cAAc,EACd,sBAAsB,EACtB,YAAY,EAGb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE,QAAA,MAAM,iBAAiB,sBAAiB,CAAC;AACzC,QAAA,MAAM,gBAAgB,sBAED,CAAC;AAQtB,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,8BAA8B,EAAE,YAAY,CAAC;IAC7F,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,oBAAY,yBAAyB,GAAG,OAAO,iBAAiB,GAAG,OAAO,gBAAgB,CAAC;AAuC3F,qBAAa,cAAe,SAAQ,YAAY;;IAC9C,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;gBAGnC,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,EAAE,EAAE,mBAAmB,EAAE,YAAY,EAAE,oBAAoB;WAQpG,yBAAyB,CAAC,EACrC,QAAQ,EACR,iBAAiB,EACjB,UAAkB,EAClB,QAAgB,EAChB,sBAA8B,EAC/B,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;WAuCrB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;WAarF,OAAO,CAAC,EACnB,YAAY,EACZ,iBAAiB,EACjB,OAAO,EACR,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC;WAkB5C,gBAAgB,CAC3B,EAAE,OAAO,EAAE,YAAgB,EAAE,YAAY,EAAE,OAA6B,EAAE,EAAE,yBAAyB,EACrG,YAAY,EAAE,oBAAoB;IA0BpC,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,oBAAoB;IA2B5G,eAAe,CACnB,MAAM,EAAE,aAAa,CAAC,eAAe,EACrC,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,sBAAsB,GAClE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;IA6DxB,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAInC,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAI3C,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC;CAGjE"}
+{"version":3,"file":"TrezorKeyAgent.d.ts","sourceRoot":"","sources":["../../src/TrezorKeyAgent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAuB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAEL,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EAEpB,UAAU,EAEV,8BAA8B,EAC9B,cAAc,EACd,sBAAsB,EACtB,YAAY,EAGb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE,QAAA,MAAM,iBAAiB,sBAAiB,CAAC;AACzC,QAAA,MAAM,gBAAgB,sBAED,CAAC;AAQtB,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,8BAA8B,EAAE,YAAY,CAAC;IAC7F,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,oBAAY,yBAAyB,GAAG,OAAO,iBAAiB,GAAG,OAAO,gBAAgB,CAAC;AAuC3F,qBAAa,cAAe,SAAQ,YAAY;;IAC9C,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;gBAGnC,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,EAAE,EAAE,mBAAmB,EAAE,YAAY,EAAE,oBAAoB;WAQpG,yBAAyB,CAAC,EACrC,QAAQ,EACR,iBAAiB,EACjB,UAAkB,EAClB,QAAgB,EAChB,sBAA8B,EAC/B,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;WAuCrB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;WAarF,OAAO,CAAC,EACnB,YAAY,EACZ,iBAAiB,EACjB,OAAO,EACR,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC;WAkB5C,gBAAgB,CAC3B,EAAE,OAAO,EAAE,YAAgB,EAAE,YAAY,EAAE,OAA6B,EAAE,EAAE,yBAAyB,EACrG,YAAY,EAAE,oBAAoB;IA0BpC,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,oBAAoB;IA2B5G,eAAe,CACnB,MAAM,EAAE,aAAa,CAAC,eAAe,EACrC,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,sBAAsB,GAClE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;IAyExB,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAInC,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAI3C,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC;CAGjE"}

package/dist/cjs/TrezorKeyAgent.js

@@ -185,13 +185,22 @@ class TrezorKeyAgent extends key_management_1.KeyAgentBase {
             await this.isTrezorInitialized;
             const body = txBody.toCore();
             const hash = txBody.hash();
+            const outputsFormat = txBody
+                .outputs()
+                .map((out) => out.isBabbageOutput()
+                ? Trezor.PROTO.CardanoTxOutputSerializationFormat.MAP_BABBAGE
+                : Trezor.PROTO.CardanoTxOutputSerializationFormat.ARRAY_LEGACY);
+            const collateralReturnFormat = txBody.collateralReturn()?.isBabbageOutput()
+                ? Trezor.PROTO.CardanoTxOutputSerializationFormat.MAP_BABBAGE
+                : Trezor.PROTO.CardanoTxOutputSerializationFormat.ARRAY_LEGACY;
             const trezorTxData = await (0, tx_1.txToTrezor)(body, {
                 accountIndex: this.accountIndex,
                 chainId: this.chainId,
+                collateralReturnFormat,
                 knownAddresses,
+                outputsFormat,
                 tagCborSets: txBody.hasTaggedSets(),
-                txInKeyPathMap,
-                useBabbageOutputs: txBody.hasBabbageOutput()
+                txInKeyPathMap
             });
             const signingMode = TrezorKeyAgent.matchSigningMode(trezorTxData);
             const trezorConnect = getTrezorConnect(__classPrivateFieldGet(this, _TrezorKeyAgent_communicationType, "f"));

package/dist/cjs/TrezorKeyAgent.js.map

@@ -1 +1 @@
-{"version":3,"file":"TrezorKeyAgent.js","sourceRoot":"","sources":["../../src/TrezorKeyAgent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TrezorKeyAgent.js","sourceRoot":"","sources":["../../src/TrezorKeyAgent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA8C;AAC9C,wDAA0C;AAE1C,4CAAgF;AAChF,gEAcqC;AAErC,4CAA2E;AAC3E,0CAA+C;AAC/C,sEAAoD;AAEpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;AACzC,MAAM,gBAAgB,GAAI,qBAAyB,CAAC,OAAO;IACzD,CAAC,CAAG,qBAAyB,CAAC,OAAoC;IAClE,CAAC,CAAC,qBAAiB,CAAC;AAEtB,MAAM,mBAAmB,GAAG,CAAC,KAAW,EAAE,EAAE,CAC1C,IAAI,uBAAM,CAAC,mBAAmB,CAC5B,yBAAyB,EACzB,IAAI,uBAAM,CAAC,cAAc,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAC5D,CAAC;AAqBJ,MAAM,gBAAgB,GAAG,CAAC,iBAAoC,EAA6B,EAAE,CAC3F,iBAAiB,KAAK,kCAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAEtF,MAAM,mBAAmB,GAAG,CAAC,eAAoD,EAAW,EAAE,CAC5F,eAAe,KAAK,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,kBAAkB;IAC1E,eAAe,KAAK,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,oBAAoB;IAC5E,eAAe,KAAK,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,gBAAgB,CAAC;AAE3E,MAAM,iCAAiC,GAAG,CAAC,EAAsD,EAAW,EAAE;IAC5G,IAAI,EAAE,CAAC,YAAY,EAAE;QACnB,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;YAClC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,OAAO,KAAK,CAAC;SACvE;KACF;IACD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAgB;IACxC,qBAAI,CAAC,mCAAmC,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAO,CAAC,QAAQ,EAAE,EAAE,2BAAU,CAAC,SAAS,CAAC;CACxG,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAsD,EAAW,EAAE;IACrF,MAAM,mBAAmB,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEnE,MAAM,oBAAoB,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC;IAEnF,OAAO,CACL,mBAAmB;QACnB,oBAAoB;QACpB,CAAC,EAAE,CAAC,gBAAgB;QACpB,CAAC,EAAE,CAAC,gBAAgB;QACpB,CAAC,EAAE,CAAC,eAAe;QACnB,CAAC,EAAE,CAAC,eAAe;QACnB,iCAAiC,CAAC,EAAE,CAAC,CACtC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAa,cAAe,SAAQ,6BAAY;IAI9C,YAAY,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,EAAuB,EAAE,YAAkC;QAC/G,KAAK,CAAC,EAAE,GAAG,gBAAgB,EAAE,UAAU,EAAE,6BAAY,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC;QAHhF,oDAA+C;QAI7C,IAAI,CAAC,mBAAmB,EAAE;YACxB,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;SACpG;QACD,uBAAA,IAAI,qCAAsB,gBAAgB,CAAC,YAAY,CAAC,iBAAiB,MAAA,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,EACrC,QAAQ,EACR,iBAAiB,EACjB,UAAU,GAAG,KAAK,EAClB,QAAQ,GAAG,KAAK,EAChB,sBAAsB,GAAG,KAAK,EACjB;QACb,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI;YACF,MAAM,aAAa,CAAC,IAAI,CAAC;gBAKvB,QAAQ,EAAE,iBAAiB,KAAK,kCAAiB,CAAC,IAAI,IAAI,QAAQ;gBAGlE,QAAQ;gBAER,KAAK,EAAE,iBAAiB,KAAK,kCAAiB,CAAC,IAAI,IAAI,CAAC,UAAU;aACnE,CAAC,CAAC;YAEH,IAAI,sBAAsB,EAAE;gBAC1B,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAE1C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC,kBAAkB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;wBACvE,aAAa,CAAC,UAAU,CAAC;4BACvB,OAAO,EAAE;gCACP,kBAAkB,EAAE,IAAI;gCACxB,IAAI,EAAE,IAAI;gCACV,KAAK,EAAE,EAAE;6BACV;4BACD,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,kBAAkB;yBACnC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;aACJ;YAED,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB;gBAAE,OAAO,IAAI,CAAC;YAC1D,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;SAClC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,iBAAoC;QACrE,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI;YACF,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;YACzD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;gBAC3B,MAAM,IAAI,uBAAM,CAAC,cAAc,CAAC,sBAAsB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;aACjF;YACD,OAAO,cAAc,CAAC,OAAO,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;SAClC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EACnB,YAAY,EACZ,iBAAiB,EACjB,OAAO,EACY;QACnB,IAAI;YACF,MAAM,cAAc,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;YAC9D,MAAM,cAAc,GAAG,KAAK,OAAO,KAAK,gCAAe,CAAC,SAAS,KAAK,YAAY,GAAG,CAAC;YACtF,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAC1D,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC;gBAChE,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE;gBAC9B,MAAM,IAAI,uBAAM,CAAC,cAAc,CAAC,8CAA8C,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;aAC5G;YACD,OAAO,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACtE;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;SAClC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,EAAE,OAAO,EAAE,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,OAAO,GAAG,2BAAU,CAAC,QAAQ,EAA6B,EACrG,YAAkC;QAElC,MAAM,mBAAmB,GAAG,MAAM,cAAc,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACzF,MAAM,wBAAwB,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;YAC5D,YAAY;YACZ,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;YACjD,OAAO;SACR,CAAC,CAAC;QACH,OAAO,IAAI,cAAc,CACvB;YACE,YAAY;YACZ,OAAO;YACP,wBAAwB;YACxB,mBAAmB;YACnB,OAAO;YACP,YAAY;SACb,EACD,YAAY,CACb,CAAC;IACJ,CAAC;IAOD,MAAM,CAAC,gBAAgB,CAAC,EAAsD;QAC5E,IAAI,EAAE,CAAC,YAAY,EAAE;YACnB,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;gBAElC,IACE,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,uBAAuB;oBACzE,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;oBAEjE,OAAO,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,0BAA0B,CAAC;aACvE;SACF;QAGD,IAAI,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC,eAAe,EAAE;YAC1F,OAAO,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,kBAAkB,CAAC;SAC7D;QAID,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;YAClB,OAAO,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,oBAAoB,CAAC;SAC/D;QAGD,OAAO,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,oBAAoB,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,MAAqC,EACrC,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAA0B;QAEnE,IAAI;YACF,MAAM,IAAI,CAAC,mBAAmB,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAwB,CAAC;YAEjD,MAAM,aAAa,GAAG,MAAM;iBACzB,OAAO,EAAE;iBACT,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,GAAG,CAAC,eAAe,EAAE;gBACnB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,WAAW;gBAC7D,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,YAAY,CACjE,CAAC;YACJ,MAAM,sBAAsB,GAAG,MAAM,CAAC,gBAAgB,EAAE,EAAE,eAAe,EAAE;gBACzE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,WAAW;gBAC7D,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,YAAY,CAAC;YAEjE,MAAM,YAAY,GAAG,MAAM,IAAA,eAAU,EAAC,IAAI,EAAE;gBAC1C,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,sBAAsB;gBACtB,cAAc;gBACd,aAAa;gBACb,WAAW,EAAE,MAAM,CAAC,aAAa,EAAE;gBACnC,cAAc;aACf,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,cAAc,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAElE,MAAM,aAAa,GAAG,gBAAgB,CAAC,uBAAA,IAAI,yCAAmB,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,sBAAsB,CAAC;gBACxD,GAAG,YAAY;gBACf,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,oBAAoB,IAAI;oBAC5E,yBAAyB,EAAE,oBAAoB;iBAChD,CAAC;gBACF,WAAW;aACZ,CAAC,CAAC;YAEH,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,qBAAI;iBACD,oBAAoB,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;iBAC9E,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CACjE,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,IAAI,uBAAM,CAAC,cAAc,CAAC,8CAA8C,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;aACjG;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;YAElC,IAAI,CAAC,IAAA,oCAA6B,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;gBACzD,MAAM,IAAI,uBAAM,CAAC,cAAc,CAAC,4CAA4C,CAAC,CAAC;aAC/E;YAED,OAAO,IAAI,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,SAAS;iBACjB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC5F,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACrB,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC7D,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAChE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAU,CAAC;YACzC,CAAC,CAAC,CACL,CACF,CAAC;SACH;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,yBAAyB,EAAE;gBACvD,MAAM,IAAI,uBAAM,CAAC,mBAAmB,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;aAC5E;YACD,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;SAClC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,0BAAmB,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,0BAAmB,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,MAAM,IAAI,0BAAmB,CAAC,0BAA0B,CAAC,CAAC;IAC5D,CAAC;CACF;AA1OD,wCA0OC"}

package/dist/cjs/transformers/tx.js

@@ -10,7 +10,7 @@ exports.trezorTxTransformer = {
     auxiliaryData: ({ auxiliaryDataHash }) => (auxiliaryDataHash ? (0, _1.mapAuxiliaryData)(auxiliaryDataHash) : undefined),
     certificates: ({ certificates }, context) => (certificates ? (0, _1.mapCerts)(certificates, context) : undefined),
     collateralInputs: ({ collaterals }, context) => (collaterals ? (0, _1.mapTxIns)(collaterals, context) : undefined),
-    collateralReturn: ({ collateralReturn }, context) => collateralReturn ? (0, _1.toTxOut)(collateralReturn, context) : undefined,
+    collateralReturn: ({ collateralReturn }, context) => collateralReturn ? (0, _1.toTxOut)({ index: 0, isCollateral: true, txOut: collateralReturn }, context) : undefined,
     fee: ({ fee }) => fee.toString(),
     inputs: ({ inputs }, context) => (0, _1.mapTxIns)(inputs, context),
     mint: ({ mint }) => (0, assets_1.mapTokenMap)(mint, true),

package/dist/cjs/transformers/tx.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../../src/transformers/tx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../../src/transformers/tx.ts"],"names":[],"mappings":";;;AAEA,4CAA8D;AAE9D,2EAA2E;AAC3E,yBAAkH;AAClH,qCAAuC;AAE1B,QAAA,mBAAmB,GAO5B;IACF,yBAAyB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,wDAA4B,EAAC,MAAM,EAAE,OAAQ,CAAC;IAClG,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAA,mBAAgB,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/G,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAA,WAAQ,EAAC,YAAY,EAAE,OAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1G,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,WAAQ,EAAC,WAAW,EAAE,OAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3G,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE,CAClD,gBAAgB,CAAC,CAAC,CAAC,IAAA,UAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,OAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;IAC7G,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE;IAChC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,WAAQ,EAAC,MAAM,EAAE,OAAQ,CAAC;IAC3D,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAA,oBAAW,EAAC,IAAI,EAAE,IAAI,CAAC;IAC3C,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAQ,CAAC,OAAO,CAAC,SAAS;IACrD,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,YAAS,EAAC,OAAO,EAAE,OAAQ,CAAC;IAC/D,aAAa,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAQ,CAAC,OAAO,CAAC,YAAY;IAC5D,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,EAAE,CAChD,eAAe,CAAC,CAAC,CAAC,IAAA,WAAQ,EAAC,eAAe,EAAE,OAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;IACnE,eAAe,EAAE,CAAC,EAAE,uBAAuB,EAAE,EAAE,OAAO,EAAE,EAAE,CACxD,uBAAuB,CAAC,CAAC,CAAC,IAAA,qBAAkB,EAAC,uBAAuB,EAAE,OAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;IAC7F,cAAc,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC,mBAAmB,EAAE,QAAQ,EAAE;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAQ,CAAC,WAAW;IACjD,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,EAAE,QAAQ,EAAE;IACrE,GAAG,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,QAAQ,EAAE;IAC7E,qBAAqB,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE;IAC5F,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,iBAAc,EAAC,WAAW,EAAE,OAAQ,CAAC;CACjF,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,IAAoB,EAAE,OAAmC,EAAE,EAAE,CACtF,IAAA,mBAAY,EAAC,IAAI,EAAE,2BAAmB,EAAE,OAAO,CAAC,CAAC;AADtC,QAAA,UAAU,cAC4B"}

package/dist/cjs/transformers/txOut.d.ts

@@ -2,6 +2,10 @@ import * as Trezor from '@trezor/connect';
 import { Cardano } from '@cardano-sdk/core';
 import { Transform } from '@cardano-sdk/util';
 import { TrezorTxTransformerContext } from '../types';
-export declare const toTxOut: Transform<Cardano.TxOut, Trezor.CardanoOutput, TrezorTxTransformerContext>;
+export declare const toTxOut: Transform<{
+    txOut: Cardano.TxOut;
+    index: number;
+    isCollateral: boolean;
+}, Trezor.CardanoOutput, TrezorTxTransformerContext>;
 export declare const mapTxOuts: (txOuts: Cardano.TxOut[], context: TrezorTxTransformerContext) => Trezor.CardanoOutput[];
 //# sourceMappingURL=txOut.d.ts.map

package/dist/cjs/transformers/txOut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txOut.d.ts","sourceRoot":"","sources":["../../../src/transformers/txOut.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAiB,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAiC,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAA6B,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAwCjF,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,0BAA0B,CAwB9F,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,QAAQ,KAAK,EAAE,WAAW,0BAA0B,KAAG,OAAO,aAAa,EAC7D,CAAC"}
+{"version":3,"file":"txOut.d.ts","sourceRoot":"","sources":["../../../src/transformers/txOut.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAiB,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAiC,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAA6B,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAwCjF,eAAO,MAAM,OAAO,EAAE,SAAS,CAC7B;IAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,EAC9D,MAAM,CAAC,aAAa,EACpB,0BAA0B,CAiB3B,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,QAAQ,KAAK,EAAE,WAAW,0BAA0B,KAAG,OAAO,aAAa,EACtB,CAAC"}

package/dist/cjs/transformers/txOut.js

@@ -56,31 +56,23 @@ const getScriptHex = (output) => {
     return scriptRef.toCbor();
 };
 const getInlineDatum = (datum) => core_1.Serialization.PlutusData.fromCore(datum).toCbor();
-const toTxOut = (txOut, context) => {
-    const destination = toDestination(txOut, context);
+const toTxOut = (elem, context) => {
+    const { txOut, index, isCollateral } = elem;
     const output = core_1.Serialization.TransactionOutput.fromCore(txOut);
     const scriptHex = getScriptHex(output);
-    return context?.useBabbageOutputs
-        ? {
-            ...destination,
-            amount: txOut.value.coins.toString(),
-            datumHash: txOut.datumHash?.toString(),
-            format: Trezor.PROTO.CardanoTxOutputSerializationFormat.MAP_BABBAGE,
-            inlineDatum: txOut.datum ? getInlineDatum(txOut.datum) : undefined,
-            referenceScript: scriptHex,
-            tokenBundle: (0, assets_1.mapTokenMap)(txOut.value.assets)
-        }
-        : {
-            ...destination,
-            amount: txOut.value.coins.toString(),
-            datumHash: txOut.datumHash?.toString(),
-            format: Trezor.PROTO.CardanoTxOutputSerializationFormat.ARRAY_LEGACY,
-            inlineDatum: undefined,
-            referenceScript: undefined,
-            tokenBundle: (0, assets_1.mapTokenMap)(txOut.value.assets)
-        };
+    const format = isCollateral ? context?.collateralReturnFormat : context?.outputsFormat[index];
+    const isBabbage = format === Trezor.PROTO.CardanoTxOutputSerializationFormat.MAP_BABBAGE;
+    return {
+        ...toDestination(txOut, context),
+        amount: txOut.value.coins.toString(),
+        datumHash: txOut.datumHash?.toString(),
+        format,
+        inlineDatum: isBabbage ? (txOut.datum ? getInlineDatum(txOut.datum) : undefined) : undefined,
+        referenceScript: isBabbage ? scriptHex : undefined,
+        tokenBundle: (0, assets_1.mapTokenMap)(txOut.value.assets)
+    };
 };
 exports.toTxOut = toTxOut;
-const mapTxOuts = (txOuts, context) => txOuts.map((txOut) => (0, exports.toTxOut)(txOut, context));
+const mapTxOuts = (txOuts, context) => txOuts.map((txOut, index) => (0, exports.toTxOut)({ index, isCollateral: false, txOut }, context));
 exports.mapTxOuts = mapTxOuts;
 //# sourceMappingURL=txOut.js.map

package/dist/cjs/transformers/txOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"txOut.js","sourceRoot":"","sources":["../../../src/transformers/txOut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,4CAA2D;AAC3D,gEAAmE;AACnE,4CAA6E;AAE7E,qCAAuC;AAEvC,MAAM,aAAa,GAAoF,CACrG,KAAK,EACL,OAAO,EACP,EAAE;IACF,MAAM,YAAY,GAAG,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC;IAClH,MAAM,eAAe,GAAG,cAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEpE,IAAI,CAAC,YAAY,IAAI,eAAe,EAAE;QACpC,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;KACH;IAED,MAAM,WAAW,GAAG,qBAAI,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,qBAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAAC;IAEtE,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,2BAAoB,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC;IAE3F,OAAO;QACL,iBAAiB,EAAE;YACjB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI;YACjD,IAAI,EAAE,WAAW;YACjB,WAAW;SACZ;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAAuC,EAAuB,EAAE;IACpF,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAErC,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,OAAO,SAAS,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAyB,EAAU,EAAE,CAAC,oBAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AAEzG,MAAM,OAAO,GAA+E,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACpH,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,oBAAa,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,OAAO,EAAE,iBAAiB;QAC/B,CAAC,CAAC;YACE,GAAG,WAAW;YACd,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE;YACtC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,WAAW;YACnE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,eAAe,EAAE,SAAS;YAC1B,WAAW,EAAE,IAAA,oBAAW,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;SAC7C;QACH,CAAC,CAAC;YACE,GAAG,WAAW;YACd,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE;YACtC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,YAAY;YACpE,WAAW,EAAE,SAAS;YACtB,eAAe,EAAE,SAAS;YAC1B,WAAW,EAAE,IAAA,oBAAW,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;SAC7C,CAAC;AACR,CAAC,CAAC;AAxBW,QAAA,OAAO,WAwBlB;AAEK,MAAM,SAAS,GAAG,CAAC,MAAuB,EAAE,OAAmC,EAA0B,EAAE,CAChH,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,eAAO,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AADpC,QAAA,SAAS,aAC2B"}
+{"version":3,"file":"txOut.js","sourceRoot":"","sources":["../../../src/transformers/txOut.ts"],"names":[],"mappings":"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"}