@swapkit/wallet-hardware 4.11.0 → 5.0.0

package/src/ledger/index.ts

@@ -11,6 +11,7 @@ import {
   NetworkDerivationPath,
   SwapKitError,
   type UTXOChain,
+  UTXOScriptType,
   WalletOption,
 } from "@swapkit/helpers";
 import {
@@ -19,6 +20,7 @@ import {
   compileMemo,
   createHDWalletHelpers,
   getNetworkForChain,
+  getScriptTypeForAddress,
   getUTXOAccountIndexFromPath,
   getUTXOAccountPath,
   getUTXOAddressPath,
@@ -172,6 +174,7 @@ async function getWalletMethods({
       const signer = await getLedgerClient({ chain, derivationPath, transport });
 
       const address = providedAddress ?? (await getLedgerAddress({ chain, ledgerClient: signer }));
+      const scriptType = getScriptTypeForAddress(address, utxoChain);
 
       // V3 toolbox signer:
       //  - BTC uses the modern `ledger-bitcoin` AppClient with native PSBT signing.
@@ -181,13 +184,19 @@ async function getWalletMethods({
       //    policy APDUs and returns CLA_NOT_SUPPORTED.
       //  - ZEC stays on the bespoke `signPCZT` flow for now.
       let toolboxSigner:
-        | { getAddress: () => Promise<string>; signTransaction: (tx: Transaction) => Promise<Transaction> }
+        | {
+            getAddress: () => Promise<string>;
+            publicKey?: Uint8Array;
+            signTransaction: (tx: Transaction) => Promise<Transaction>;
+          }
         | undefined;
+      let publicKey: Uint8Array | undefined;
       let signAndBroadcastLegacyPsbtTransaction: ((tx: Transaction) => Promise<string>) | undefined;
       if (chain === Chain.Bitcoin) {
         const { BitcoinPsbtLedger } = await import("./clients/utxo-psbt");
         const psbtClient = BitcoinPsbtLedger(derivationPath, transport);
-        toolboxSigner = { getAddress: psbtClient.getAddress, signTransaction: psbtClient.signTransaction };
+        publicKey = scriptType === UTXOScriptType.P2SH_P2WPKH ? await psbtClient.getPublicKey() : undefined;
+        toolboxSigner = { getAddress: psbtClient.getAddress, publicKey, signTransaction: psbtClient.signTransaction };
       } else if (
         chain === Chain.BitcoinCash ||
         chain === Chain.Dogecoin ||
@@ -203,8 +212,8 @@ async function getWalletMethods({
       }
 
       const toolbox = toolboxSigner
-        ? await getUtxoToolbox(utxoChain, { signer: toolboxSigner })
-        : getUtxoToolbox(utxoChain);
+        ? await getUtxoToolbox(utxoChain, { scriptType, signer: toolboxSigner })
+        : getUtxoToolbox(utxoChain, { scriptType });
       const signAndBroadcastTransaction = signAndBroadcastLegacyPsbtTransaction ?? toolbox.signAndBroadcastTransaction;
 
       const transfer = async (params: UTXOBuildTxParams) => {
@@ -216,6 +225,7 @@ async function getWalletMethods({
           feeRate,
           fetchTxHex: true,
           memo,
+          publicKey: params.publicKey ?? publicKey,
           sender: address,
         });
 

package/src/trezor/index.ts

@@ -10,6 +10,7 @@ import {
   SKConfig,
   SwapKitError,
   type UTXOChain,
+  UTXOScriptType,
   WalletOption,
 } from "@swapkit/helpers";
 import {
@@ -208,11 +209,11 @@ function decodeOpReturnData(script: Uint8Array): string | null {
 function getScriptType(derivationPath: DerivationPathArray) {
   switch (derivationPath[0]) {
     case 84:
-      return { input: "SPENDWITNESS", output: "PAYTOWITNESS" } as const;
+      return { input: "SPENDWITNESS", output: "PAYTOWITNESS", utxo: UTXOScriptType.P2WPKH } as const;
     case 49:
-      return { input: "SPENDP2SHWITNESS", output: "PAYTOP2SHWITNESS" } as const;
+      return { input: "SPENDP2SHWITNESS", output: "PAYTOP2SHWITNESS", utxo: UTXOScriptType.P2SH_P2WPKH } as const;
     case 44:
-      return { input: "SPENDADDRESS", output: "PAYTOADDRESS" } as const;
+      return { input: "SPENDADDRESS", output: "PAYTOADDRESS", utxo: UTXOScriptType.P2PKH } as const;
     default:
       return null;
   }
@@ -690,6 +691,7 @@ async function getTrezorWallet<T extends Chain>({
       }
 
       const resolvedScriptType = scriptType;
+      const toolboxParams = { scriptType: scriptType.utxo };
       const coin = chain.toLowerCase();
 
       const getAddress = async (path: DerivationPathArray = derivationPath) => {
@@ -717,7 +719,7 @@ async function getTrezorWallet<T extends Chain>({
       };
 
       const address = providedAddress ?? (await getAddress());
-      const baseToolbox = getUtxoToolbox(chain);
+      const baseToolbox = getUtxoToolbox(chain, toolboxParams);
 
       const signTransaction = async (tx: Transaction, inputs: UTXOType[], memo = "") => {
         const TrezorConnect = (await import("@trezor/connect-web")).default;
@@ -998,7 +1000,7 @@ async function getTrezorWallet<T extends Chain>({
         feeRate?: number;
         feeOptionKey?: (typeof FeeOption)[keyof typeof FeeOption];
       }) => {
-        const toolbox = getUtxoToolbox(chain);
+        const toolbox = getUtxoToolbox(chain, toolboxParams);
         const txFeeRate = feeRate || (await toolbox.getFeeRates())[feeOptionKey || FeeOption.Fast];
 
         const { tx, inputs: selectedInputs } = await toolbox.createTransaction({
@@ -1038,7 +1040,7 @@ async function getTrezorWallet<T extends Chain>({
           });
         }
 
-        const toolbox = getUtxoToolbox(chain);
+        const toolbox = getUtxoToolbox(chain, toolboxParams);
 
         const feeRate = paramFeeRate || (await toolbox.getFeeRates())[feeOptionKey || FeeOption.Fast];
 
@@ -1061,6 +1063,7 @@ async function getTrezorWallet<T extends Chain>({
 
       const toolbox = shouldUseTrezorPsbtSigner(chain)
         ? await getUtxoToolbox(utxoChain, {
+            ...toolboxParams,
             signer: { getAddress: async () => address, signTransaction: signPsbtTransaction },
           })
         : baseToolbox;

package/dist/chunk-gwx23jdp.js

@@ -1,4 +0,0 @@
-import{c as C}from"./chunk-3yr76n9s.js";import{d as D}from"./chunk-n05bv2n5.js";import{base64 as m}from"@scure/base";import{HDKey as b}from"@scure/bip32";import{derivationPathToString as P,getWalletFormatFor as x,SwapKitError as X}from"@swapkit/helpers";function g(G){switch(G){case"bech32":return"wpkh(@0/**)";case"p2sh":return"sh(wpkh(@0/**))";case"legacy":return"pkh(@0/**)";default:return"wpkh(@0/**)"}}function u(G){return typeof G==="string"?G:P(G)}function k(G){return G.replace(/^m\//,"").replace(/^\/+/,"")}function l(G){return G.replace(/^m\//,"").split("/").filter(Boolean).map((Q)=>{let R=Q.endsWith("'"),V=Number.parseInt(R?Q.slice(0,-1):Q,10);return R?(V|2147483648)>>>0:V})}function s(G,Q){let R=G.getInput(Q);return Boolean(R.bip32Derivation?.length)}var F=({chain:G})=>{return(Q,R)=>{let V,z;async function _(){if(!V){let q=R??await C(),{AppClient:J}=await import("ledger-bitcoin");V=new J(q)}return V}async function S(){if(!z)z=await(await _()).getMasterFingerprint();return z}let $=k(Q?u(Q):"84'/0'/0'/0/0"),W=$.split("/").filter(Boolean),H=W.slice(0,3).join("/"),w=W.slice(3),E=Number(w[0]??0),K=Number(w[1]??0),L=x(`m/${$}`),T=g(L),j,N;async function O(){let q=await _(),J=await S();if(!j)j=await q.getExtendedPubkey(`m/${H}`);let{DefaultWalletPolicy:M}=await import("ledger-bitcoin"),U=new M(T,`[${J}/${H}]${j}`);return{app:q,fpr:J,policy:U,xpub:j}}async function I(){if(!N){let{xpub:q}=await O(),M=b.fromExtendedKey(q).derive(`m/${E}/${K}`);if(!M.publicKey)throw new X("wallet_ledger_get_address_error",{message:`Cannot derive leaf pubkey for ${G}`});N=M.publicKey}return N}return{connect:async()=>{await _()},getAddress:async()=>{let{app:q,policy:J}=await O(),M=await q.getWalletAddress(J,null,E,K,!1);if(!M)throw new X("wallet_ledger_get_address_error",{message:`Cannot get ${G} address from ledger derivation path: ${$}`});return M},getExtendedPublicKey:async(q=`m/${H}`)=>{return(await _()).getExtendedPubkey(`m/${k(q)}`)},signTransaction:async(q)=>{let{app:J,policy:M,fpr:U}=await O(),v=Number.parseInt(U,16)>>>0,A=l($),B=Array.from({length:q.inputsLength},(Y,Z)=>Z).filter((Y)=>!s(q,Y));if(B.length>0){let Y=await I();for(let Z of B)q.updateInput(Z,{bip32Derivation:[[Y,{fingerprint:v,path:A}]]})}let f=m.encode(q.toPSBT(0)),y=await J.signPsbt(f,M,null);for(let[Y,Z]of y)q.updateInput(Y,{partialSig:[[new Uint8Array(Z.pubkey),new Uint8Array(Z.signature)]]});return q}}}},n=F({chain:"bitcoin"}),p=F({chain:"litecoin"});export{p as LitecoinPsbtLedger,n as BitcoinPsbtLedger};
-
-//# debugId=ACED2AE00D3D0A0F64756E2164756E21
-//# sourceMappingURL=chunk-gwx23jdp.js.map