@trezor/connect 9.7.0-beta.1 → 9.7.0-beta.2

package/lib/api/bitcoin/signtxLegacy.js

@@ -1,137 +1,187 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.signTxLegacy = void 0;
 const constants_1 = require("../../constants");
-const requestPrevTxInfo = ({ txRequest: { request_type, details }, refTxs, }) => {
-    const { tx_hash } = details;
-    if (!tx_hash) {
-        throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: unknown details.tx_hash');
+const requestPrevTxInfo = ({
+  txRequest: {
+    request_type,
+    details
+  },
+  refTxs
+}) => {
+  const {
+    tx_hash
+  } = details;
+  if (!tx_hash) {
+    throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: unknown details.tx_hash');
+  }
+  const tx = refTxs[tx_hash.toLowerCase()];
+  if (!tx) {
+    throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: Requested unknown tx: ${tx_hash}`);
+  }
+  if (!tx.bin_outputs) {
+    throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: bin_outputs not set tx: ${tx_hash}`);
+  }
+  if (request_type === 'TXINPUT') {
+    return {
+      inputs: [tx.inputs[details.request_index]]
+    };
+  }
+  if (request_type === 'TXOUTPUT') {
+    return {
+      bin_outputs: [tx.bin_outputs[details.request_index]]
+    };
+  }
+  if (request_type === 'TXEXTRADATA') {
+    if (typeof details.extra_data_len !== 'number') {
+      throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: Missing extra_data_len');
     }
-    const tx = refTxs[tx_hash.toLowerCase()];
-    if (!tx) {
-        throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: Requested unknown tx: ${tx_hash}`);
+    if (typeof details.extra_data_offset !== 'number') {
+      throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: Missing extra_data_offset');
     }
-    if (!tx.bin_outputs) {
-        throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: bin_outputs not set tx: ${tx_hash}`);
+    if (typeof tx.extra_data !== 'string') {
+      throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: No extra data for transaction ${tx.hash}`);
     }
-    if (request_type === 'TXINPUT') {
-        return { inputs: [tx.inputs[details.request_index]] };
+    const data = tx.extra_data;
+    const dataLen = details.extra_data_len;
+    const dataOffset = details.extra_data_offset;
+    const extra_data = data.substring(dataOffset * 2, (dataOffset + dataLen) * 2);
+    return {
+      extra_data
+    };
+  }
+  if (request_type === 'TXMETA') {
+    const data = tx.extra_data;
+    const meta = {
+      version: tx.version,
+      lock_time: tx.lock_time,
+      inputs_cnt: tx.inputs.length,
+      outputs_cnt: tx.bin_outputs.length,
+      timestamp: tx.timestamp,
+      version_group_id: tx.version_group_id,
+      expiry: tx.expiry,
+      branch_id: tx.branch_id
+    };
+    if (typeof data === 'string' && data.length !== 0) {
+      return {
+        ...meta,
+        extra_data_len: data.length / 2
+      };
     }
-    if (request_type === 'TXOUTPUT') {
-        return { bin_outputs: [tx.bin_outputs[details.request_index]] };
-    }
-    if (request_type === 'TXEXTRADATA') {
-        if (typeof details.extra_data_len !== 'number') {
-            throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: Missing extra_data_len');
-        }
-        if (typeof details.extra_data_offset !== 'number') {
-            throw constants_1.ERRORS.TypedError('Runtime', 'requestPrevTxInfo: Missing extra_data_offset');
-        }
-        if (typeof tx.extra_data !== 'string') {
-            throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: No extra data for transaction ${tx.hash}`);
-        }
-        const data = tx.extra_data;
-        const dataLen = details.extra_data_len;
-        const dataOffset = details.extra_data_offset;
-        const extra_data = data.substring(dataOffset * 2, (dataOffset + dataLen) * 2);
-        return { extra_data };
-    }
-    if (request_type === 'TXMETA') {
-        const data = tx.extra_data;
-        const meta = {
-            version: tx.version,
-            lock_time: tx.lock_time,
-            inputs_cnt: tx.inputs.length,
-            outputs_cnt: tx.bin_outputs.length,
-            timestamp: tx.timestamp,
-            version_group_id: tx.version_group_id,
-            expiry: tx.expiry,
-            branch_id: tx.branch_id,
-        };
-        if (typeof data === 'string' && data.length !== 0) {
-            return {
-                ...meta,
-                extra_data_len: data.length / 2,
-            };
-        }
-        return meta;
-    }
-    throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: Unknown request type: ${request_type}`);
+    return meta;
+  }
+  throw constants_1.ERRORS.TypedError('Runtime', `requestPrevTxInfo: Unknown request type: ${request_type}`);
 };
-const requestSignedTxInfo = ({ txRequest: { request_type, details }, inputs, outputs, }) => {
-    if (request_type === 'TXINPUT') {
-        return { inputs: [inputs[details.request_index]] };
-    }
-    if (request_type === 'TXOUTPUT') {
-        return { outputs: [outputs[details.request_index]] };
-    }
-    if (request_type === 'TXMETA') {
-        throw constants_1.ERRORS.TypedError('Runtime', 'requestSignedTxInfo: Cannot read TXMETA from signed transaction');
-    }
-    if (request_type === 'TXEXTRADATA') {
-        throw constants_1.ERRORS.TypedError('Runtime', 'requestSignedTxInfo: Cannot read TXEXTRADATA from signed transaction');
-    }
-    throw constants_1.ERRORS.TypedError('Runtime', `requestSignedTxInfo: Unknown request type: ${request_type}`);
+const requestSignedTxInfo = ({
+  txRequest: {
+    request_type,
+    details
+  },
+  inputs,
+  outputs
+}) => {
+  if (request_type === 'TXINPUT') {
+    return {
+      inputs: [inputs[details.request_index]]
+    };
+  }
+  if (request_type === 'TXOUTPUT') {
+    return {
+      outputs: [outputs[details.request_index]]
+    };
+  }
+  if (request_type === 'TXMETA') {
+    throw constants_1.ERRORS.TypedError('Runtime', 'requestSignedTxInfo: Cannot read TXMETA from signed transaction');
+  }
+  if (request_type === 'TXEXTRADATA') {
+    throw constants_1.ERRORS.TypedError('Runtime', 'requestSignedTxInfo: Cannot read TXEXTRADATA from signed transaction');
+  }
+  throw constants_1.ERRORS.TypedError('Runtime', `requestSignedTxInfo: Unknown request type: ${request_type}`);
 };
-const requestTxAck = (props) => {
-    const { tx_hash } = props.txRequest.details;
-    if (tx_hash) {
-        return requestPrevTxInfo(props);
-    }
-    return requestSignedTxInfo(props);
+const requestTxAck = props => {
+  const {
+    tx_hash
+  } = props.txRequest.details;
+  if (tx_hash) {
+    return requestPrevTxInfo(props);
+  }
+  return requestSignedTxInfo(props);
 };
 const saveTxSignatures = (txRequest, serializedTx, signatures) => {
-    if (!txRequest)
-        return;
-    const { signature_index, signature, serialized_tx } = txRequest;
-    if (serialized_tx) {
-        serializedTx.push(serialized_tx);
-    }
-    if (typeof signature_index === 'number') {
-        if (!signature) {
-            throw constants_1.ERRORS.TypedError('Runtime', 'saveTxSignatures: Unexpected null in trezor:TxRequestSerialized signature.');
-        }
-        signatures[signature_index] = signature;
+  if (!txRequest) return;
+  const {
+    signature_index,
+    signature,
+    serialized_tx
+  } = txRequest;
+  if (serialized_tx) {
+    serializedTx.push(serialized_tx);
+  }
+  if (typeof signature_index === 'number') {
+    if (!signature) {
+      throw constants_1.ERRORS.TypedError('Runtime', 'saveTxSignatures: Unexpected null in trezor:TxRequestSerialized signature.');
     }
+    signatures[signature_index] = signature;
+  }
 };
-const processTxRequest = async (props) => {
-    const { typedCall, txRequest, serializedTx, signatures } = props;
-    if (txRequest.serialized)
-        saveTxSignatures(txRequest.serialized, serializedTx, signatures);
-    if (txRequest.request_type === 'TXFINISHED') {
-        return Promise.resolve({
-            signatures,
-            serializedTx: serializedTx.join(''),
-        });
-    }
-    const txAck = requestTxAck(props);
-    const { message } = await typedCall('TxAck', 'TxRequest', { tx: txAck });
-    return processTxRequest({
-        ...props,
-        txRequest: message,
+const processTxRequest = async props => {
+  const {
+    typedCall,
+    txRequest,
+    serializedTx,
+    signatures
+  } = props;
+  if (txRequest.serialized) saveTxSignatures(txRequest.serialized, serializedTx, signatures);
+  if (txRequest.request_type === 'TXFINISHED') {
+    return Promise.resolve({
+      signatures,
+      serializedTx: serializedTx.join('')
     });
+  }
+  const txAck = requestTxAck(props);
+  const {
+    message
+  } = await typedCall('TxAck', 'TxRequest', {
+    tx: txAck
+  });
+  return processTxRequest({
+    ...props,
+    txRequest: message
+  });
 };
-const signTxLegacy = async ({ typedCall, inputs, outputs, refTxs, options, coinInfo, }) => {
-    const { message } = await typedCall('SignTx', 'TxRequest', {
-        ...options,
-        version: options.version === undefined && coinInfo.isBitcoin ? 1 : options.version,
-        inputs_count: inputs.length,
-        outputs_count: outputs.length,
-        coin_name: coinInfo.name,
-    });
-    return processTxRequest({
-        typedCall,
-        txRequest: message,
-        refTxs: refTxs.reduce((record, tx) => ({
-            ...record,
-            [tx.hash.toLowerCase()]: tx,
-        }), {}),
-        inputs,
-        outputs,
-        paymentRequests: [],
-        serializedTx: [],
-        signatures: [],
-    });
+const signTxLegacy = async ({
+  typedCall,
+  inputs,
+  outputs,
+  refTxs,
+  options,
+  coinInfo
+}) => {
+  const {
+    message
+  } = await typedCall('SignTx', 'TxRequest', {
+    ...options,
+    version: options.version === undefined && coinInfo.isBitcoin ? 1 : options.version,
+    inputs_count: inputs.length,
+    outputs_count: outputs.length,
+    coin_name: coinInfo.name
+  });
+  return processTxRequest({
+    typedCall,
+    txRequest: message,
+    refTxs: refTxs.reduce((record, tx) => ({
+      ...record,
+      [tx.hash.toLowerCase()]: tx
+    }), {}),
+    inputs,
+    outputs,
+    paymentRequests: [],
+    serializedTx: [],
+    signatures: []
+  });
 };
 exports.signTxLegacy = signTxLegacy;
 //# sourceMappingURL=signtxLegacy.js.map

package/lib/api/bitcoin/signtxVerify.js

@@ -1,82 +1,95 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.verifyTx = exports.deriveOutputScript = void 0;
 const utxo_lib_1 = require("@trezor/utxo-lib");
 const constants_1 = require("../../constants");
 const derivePubKeyHash = async (getHDNode, address_n, network) => {
-    if (address_n.length === 5) {
-        const response = await getHDNode(address_n.slice(0, 4));
-        const node = utxo_lib_1.bip32.fromBase58(response.xpub, network);
-        return node.derive(address_n[address_n.length - 1]);
-    }
-    const response = await getHDNode(address_n);
-    return utxo_lib_1.bip32.fromBase58(response.xpub, network);
+  if (address_n.length === 5) {
+    const response = await getHDNode(address_n.slice(0, 4));
+    const node = utxo_lib_1.bip32.fromBase58(response.xpub, network);
+    return node.derive(address_n[address_n.length - 1]);
+  }
+  const response = await getHDNode(address_n);
+  return utxo_lib_1.bip32.fromBase58(response.xpub, network);
 };
 const deriveOutputScript = async (getHDNode, output, network) => {
-    if ('multisig' in output)
-        return;
-    if ('op_return_data' in output) {
-        return utxo_lib_1.payments.embed({ data: [Buffer.from(output.op_return_data, 'hex')] })
-            .output;
-    }
-    if (output.address) {
-        return utxo_lib_1.address.toOutputScript(output.address, network);
-    }
-    if (!output.address_n) {
-        throw constants_1.ERRORS.TypedError('Runtime', 'deriveOutputScript: Neither address or address_n is set');
-    }
-    const node = await derivePubKeyHash(getHDNode, output.address_n, network);
-    const payment = { hash: node.identifier, network };
-    if (output.script_type === 'PAYTOADDRESS') {
-        return utxo_lib_1.payments.p2pkh(payment).output;
-    }
-    if (output.script_type === 'PAYTOSCRIPTHASH') {
-        return utxo_lib_1.payments.p2sh(payment).output;
-    }
-    if (output.script_type === 'PAYTOP2SHWITNESS') {
-        return utxo_lib_1.payments.p2sh({
-            redeem: utxo_lib_1.payments.p2wpkh(payment),
-        }).output;
-    }
-    if (output.script_type === 'PAYTOWITNESS') {
-        return utxo_lib_1.payments.p2wpkh(payment).output;
-    }
-    if (output.script_type === 'PAYTOTAPROOT') {
-        return utxo_lib_1.payments.p2tr({
-            pubkey: node.publicKey,
-            network,
-        }).output;
-    }
-    if (output.script_type === 'PAYTOMULTISIG') {
-        throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: script_type PAYTOMULTISIG not expected without multisig defined`);
-    }
-    throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: Unknown script type ${output.script_type}`);
+  if ('multisig' in output) return;
+  if ('op_return_data' in output) {
+    return utxo_lib_1.payments.embed({
+      data: [Buffer.from(output.op_return_data, 'hex')]
+    }).output;
+  }
+  if (output.address) {
+    return utxo_lib_1.address.toOutputScript(output.address, network);
+  }
+  if (!output.address_n) {
+    throw constants_1.ERRORS.TypedError('Runtime', 'deriveOutputScript: Neither address or address_n is set');
+  }
+  const node = await derivePubKeyHash(getHDNode, output.address_n, network);
+  const payment = {
+    hash: node.identifier,
+    network
+  };
+  if (output.script_type === 'PAYTOADDRESS') {
+    return utxo_lib_1.payments.p2pkh(payment).output;
+  }
+  if (output.script_type === 'PAYTOSCRIPTHASH') {
+    return utxo_lib_1.payments.p2sh(payment).output;
+  }
+  if (output.script_type === 'PAYTOP2SHWITNESS') {
+    return utxo_lib_1.payments.p2sh({
+      redeem: utxo_lib_1.payments.p2wpkh(payment)
+    }).output;
+  }
+  if (output.script_type === 'PAYTOWITNESS') {
+    return utxo_lib_1.payments.p2wpkh(payment).output;
+  }
+  if (output.script_type === 'PAYTOTAPROOT') {
+    return utxo_lib_1.payments.p2tr({
+      pubkey: node.publicKey,
+      network
+    }).output;
+  }
+  if (output.script_type === 'PAYTOMULTISIG') {
+    throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: script_type PAYTOMULTISIG not expected without multisig defined`);
+  }
+  throw constants_1.ERRORS.TypedError('Runtime', `deriveOutputScript: Unknown script type ${output.script_type}`);
 };
 exports.deriveOutputScript = deriveOutputScript;
 const verifyTx = (serializedTx, params) => {
-    const { inputs, outputs, outputScripts, network } = params;
-    const bitcoinTx = utxo_lib_1.Transaction.fromHex(serializedTx, { network });
-    if (inputs.length !== bitcoinTx.ins.length) {
-        throw constants_1.ERRORS.TypedError('Runtime', 'verifyTx: Signed transaction inputs invalid length');
-    }
-    if (outputs.length !== bitcoinTx.outs.length) {
-        throw constants_1.ERRORS.TypedError('Runtime', 'verifyTx: Signed transaction outputs invalid length');
+  const {
+    inputs,
+    outputs,
+    outputScripts,
+    network
+  } = params;
+  const bitcoinTx = utxo_lib_1.Transaction.fromHex(serializedTx, {
+    network
+  });
+  if (inputs.length !== bitcoinTx.ins.length) {
+    throw constants_1.ERRORS.TypedError('Runtime', 'verifyTx: Signed transaction inputs invalid length');
+  }
+  if (outputs.length !== bitcoinTx.outs.length) {
+    throw constants_1.ERRORS.TypedError('Runtime', 'verifyTx: Signed transaction outputs invalid length');
+  }
+  outputs.forEach((output, i) => {
+    if (output.amount) {
+      if (output.amount.toString() !== bitcoinTx.outs[i].value) {
+        throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Wrong output amount at output ${i}. Requested: ${output.amount}, signed: ${bitcoinTx.outs[i].value}`);
+      }
     }
-    outputs.forEach((output, i) => {
-        if (output.amount) {
-            if (output.amount.toString() !== bitcoinTx.outs[i].value) {
-                throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Wrong output amount at output ${i}. Requested: ${output.amount}, signed: ${bitcoinTx.outs[i].value}`);
-            }
-        }
-    });
-    for (let i = 0; i < outputs.length; i++) {
-        const scriptB = bitcoinTx.outs[i].script;
-        const scriptA = outputScripts[i];
-        if (scriptA && scriptA.compare(scriptB) !== 0) {
-            throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Output ${i} scripts differ`);
-        }
+  });
+  for (let i = 0; i < outputs.length; i++) {
+    const scriptB = bitcoinTx.outs[i].script;
+    const scriptA = outputScripts[i];
+    if (scriptA && scriptA.compare(scriptB) !== 0) {
+      throw constants_1.ERRORS.TypedError('Runtime', `verifyTx: Output ${i} scripts differ`);
     }
-    return bitcoinTx;
+  }
+  return bitcoinTx;
 };
 exports.verifyTx = verifyTx;
 //# sourceMappingURL=signtxVerify.js.map

package/lib/api/bitcoin/transactionBytes.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getTransactionVbytes = void 0;
 exports.mapOutputScriptToKey = mapOutputScriptToKey;
 const tslib_1 = require("tslib");
@@ -7,68 +10,67 @@ const baddress = tslib_1.__importStar(require("@trezor/utxo-lib/lib/address"));
 const txWeightCalculator_1 = require("@trezor/utxo-lib/lib/txWeightCalculator");
 const pathUtils_1 = require("../../utils/pathUtils");
 function mapOutputScriptToKey(script_type) {
-    switch (script_type) {
-        case 'PAYTOADDRESS':
-            return 'p2pkh';
-        case 'PAYTOSCRIPTHASH':
-            return 'p2sh';
-        case 'PAYTOWITNESS':
-            return 'p2wpkh';
-        case 'PAYTOP2SHWITNESS':
-            return 'p2sh';
-        case 'PAYTOTAPROOT':
-            return 'p2tr';
-        default:
-            return undefined;
-    }
+  switch (script_type) {
+    case 'PAYTOADDRESS':
+      return 'p2pkh';
+    case 'PAYTOSCRIPTHASH':
+      return 'p2sh';
+    case 'PAYTOWITNESS':
+      return 'p2wpkh';
+    case 'PAYTOP2SHWITNESS':
+      return 'p2sh';
+    case 'PAYTOTAPROOT':
+      return 'p2tr';
+    default:
+      return undefined;
+  }
 }
 const getTransactionVbytes = (inputs, outputs, coinInfo) => {
-    const calc = new txWeightCalculator_1.TxWeightCalculator();
-    let cannotProcess = false;
-    inputs.forEach(input => {
-        const script_type = input.script_type ?? (0, pathUtils_1.getScriptType)(input.address_n);
-        if (script_type && !input.witness) {
-            calc.addInput({
-                script_type,
-                multisig: input.multisig,
-                ownership_proof: input.ownership_proof,
-            });
-        }
-        else {
-            cannotProcess = true;
-        }
-    });
-    outputs.forEach(out => {
-        if (out.script_type === 'PAYTOOPRETURN') {
-            if (!out.op_return_data) {
-                cannotProcess = true;
-                return;
-            }
-            calc.addOutput({ length: 2 + out.op_return_data.length / 2 });
-            return;
-        }
-        else if (out.address) {
-            calc.addOutput({
-                length: baddress.toOutputScript(out.address, coinInfo.network).length,
-            });
-            return;
-        }
-        else if (out.address_n || out.script_type) {
-            const script_type = out.script_type ?? (0, pathUtils_1.getOutputScriptType)(out.address_n);
-            if (script_type) {
-                const script_key = mapOutputScriptToKey(script_type);
-                if (script_key) {
-                    calc.addOutputByKey(script_key);
-                    return;
-                }
-            }
-        }
+  const calc = new txWeightCalculator_1.TxWeightCalculator();
+  let cannotProcess = false;
+  inputs.forEach(input => {
+    const script_type = input.script_type ?? (0, pathUtils_1.getScriptType)(input.address_n);
+    if (script_type && !input.witness) {
+      calc.addInput({
+        script_type,
+        multisig: input.multisig,
+        ownership_proof: input.ownership_proof
+      });
+    } else {
+      cannotProcess = true;
+    }
+  });
+  outputs.forEach(out => {
+    if (out.script_type === 'PAYTOOPRETURN') {
+      if (!out.op_return_data) {
         cannotProcess = true;
-    });
-    if (cannotProcess) {
-        return undefined;
+        return;
+      }
+      calc.addOutput({
+        length: 2 + out.op_return_data.length / 2
+      });
+      return;
+    } else if (out.address) {
+      calc.addOutput({
+        length: baddress.toOutputScript(out.address, coinInfo.network).length
+      });
+      return;
+    } else if (out.address_n || out.script_type) {
+      const script_type = out.script_type ?? (0, pathUtils_1.getOutputScriptType)(out.address_n);
+      if (script_type) {
+        const script_key = mapOutputScriptToKey(script_type);
+        if (script_key) {
+          calc.addOutputByKey(script_key);
+          return;
+        }
+      }
     }
-    return calc.getVirtualBytes();
+    cannotProcess = true;
+  });
+  if (cannotProcess) {
+    return undefined;
+  }
+  return calc.getVirtualBytes();
 };
 exports.getTransactionVbytes = getTransactionVbytes;
 //# sourceMappingURL=transactionBytes.js.map