@dynamic-labs-wallet/btc-utils 1.0.118 → 1.0.120

package/index.cjs

@@ -290,6 +290,66 @@ var convertObjectToBuffer = function(actualPubkey) {
     return addressType;
 };
 
+/**
+ * Infers the Bitcoin address type from a bech32/bech32m account address.
+ *
+ * The character immediately after the '1' separator encodes the witness
+ * version: 'q' => v0 (P2WPKH, native segwit), 'p' => v1 (P2TR, taproot). The
+ * type is intrinsic to the address, so this works regardless of wallet
+ * metadata and for every network prefix (`bc1…`, `tb1…`, `bcrt1…`). Legacy
+ * (`1…`/`3…`) addresses are not supported and return undefined.
+ *
+ * @param address - The Bitcoin account address
+ * @returns The inferred BitcoinAddressType, or undefined if it cannot be determined
+ */ var getAddressTypeFromAddress = function(address) {
+    var normalizedAddress = address.toLowerCase();
+    // The bech32 data charset excludes '1', so the separator is always the last '1'.
+    var separatorIndex = normalizedAddress.lastIndexOf('1');
+    var witnessVersionIndex = separatorIndex + 1;
+    if (separatorIndex === -1 || witnessVersionIndex >= normalizedAddress.length) {
+        return undefined;
+    }
+    switch(normalizedAddress[witnessVersionIndex]){
+        case 'q':
+            return core.BitcoinAddressType.NATIVE_SEGWIT;
+        case 'p':
+            return core.BitcoinAddressType.TAPROOT;
+        default:
+            return undefined;
+    }
+};
+/**
+ * Resolves the address type a BTC signing operation must use.
+ *
+ * Imported wallets are non-HD: the MPC server derives them with an empty path
+ * and persists `"[]"`, so a derivation path cannot be relied on to carry the
+ * address type. The account address always can — the witness version is part
+ * of the address — so it backs the path up rather than the other way around.
+ *
+ * @param addressType - Address type already recorded against the wallet, if any
+ * @param derivationPath - Serialized derivation path, `"[]"` for imported wallets
+ * @param accountAddress - The wallet's account address
+ * @returns The resolved BitcoinAddressType
+ * @throws If none of the three inputs can determine the address type
+ */ var resolveBitcoinAddressType = function(param) {
+    var addressType = param.addressType, derivationPath = param.derivationPath, accountAddress = param.accountAddress;
+    if (addressType) {
+        return addressType;
+    }
+    if (derivationPath) {
+        try {
+            return getAddressTypeFromDerivationPath(derivationPath);
+        } catch (e) {
+        // Empty or unrecognised path — fall through to the address.
+        }
+    }
+    var fromAddress = accountAddress ? getAddressTypeFromAddress(accountAddress) : undefined;
+    if (fromAddress) {
+        return fromAddress;
+    }
+    throw new Error('Unable to determine Bitcoin address type');
+};
+
 /**
  * Calculates the hash to be signed for a BIP-322 message verification
  *
@@ -1719,6 +1779,7 @@ exports.encodeBip322Signature = encodeBip322Signature;
 exports.extractPsbtSighashes = extractPsbtSighashes;
 exports.extractPublicKeyHex = extractPublicKeyHex;
 exports.filterInputsBySigningIndexes = filterInputsBySigningIndexes;
+exports.getAddressTypeFromAddress = getAddressTypeFromAddress;
 exports.getAddressTypeFromDerivationPath = getAddressTypeFromDerivationPath;
 exports.getBitcoinNetwork = getBitcoinNetwork;
 exports.getDefaultRpcUrl = getDefaultRpcUrl;
@@ -1734,6 +1795,7 @@ exports.normalizeForTaproot = normalizeForTaproot;
 exports.normalizePublicKey = normalizePublicKey;
 exports.privateKeyToWIF = privateKeyToWIF;
 exports.publicKeyToBitcoinAddress = publicKeyToBitcoinAddress;
+exports.resolveBitcoinAddressType = resolveBitcoinAddressType;
 exports.selectUTXOs = selectUTXOs;
 exports.toBitcoinNetwork = toBitcoinNetwork;
 exports.toBuffer = toBuffer;

package/index.esm.js

@@ -270,6 +270,66 @@ var convertObjectToBuffer = function(actualPubkey) {
     return addressType;
 };
 
+/**
+ * Infers the Bitcoin address type from a bech32/bech32m account address.
+ *
+ * The character immediately after the '1' separator encodes the witness
+ * version: 'q' => v0 (P2WPKH, native segwit), 'p' => v1 (P2TR, taproot). The
+ * type is intrinsic to the address, so this works regardless of wallet
+ * metadata and for every network prefix (`bc1…`, `tb1…`, `bcrt1…`). Legacy
+ * (`1…`/`3…`) addresses are not supported and return undefined.
+ *
+ * @param address - The Bitcoin account address
+ * @returns The inferred BitcoinAddressType, or undefined if it cannot be determined
+ */ var getAddressTypeFromAddress = function(address) {
+    var normalizedAddress = address.toLowerCase();
+    // The bech32 data charset excludes '1', so the separator is always the last '1'.
+    var separatorIndex = normalizedAddress.lastIndexOf('1');
+    var witnessVersionIndex = separatorIndex + 1;
+    if (separatorIndex === -1 || witnessVersionIndex >= normalizedAddress.length) {
+        return undefined;
+    }
+    switch(normalizedAddress[witnessVersionIndex]){
+        case 'q':
+            return BitcoinAddressType.NATIVE_SEGWIT;
+        case 'p':
+            return BitcoinAddressType.TAPROOT;
+        default:
+            return undefined;
+    }
+};
+/**
+ * Resolves the address type a BTC signing operation must use.
+ *
+ * Imported wallets are non-HD: the MPC server derives them with an empty path
+ * and persists `"[]"`, so a derivation path cannot be relied on to carry the
+ * address type. The account address always can — the witness version is part
+ * of the address — so it backs the path up rather than the other way around.
+ *
+ * @param addressType - Address type already recorded against the wallet, if any
+ * @param derivationPath - Serialized derivation path, `"[]"` for imported wallets
+ * @param accountAddress - The wallet's account address
+ * @returns The resolved BitcoinAddressType
+ * @throws If none of the three inputs can determine the address type
+ */ var resolveBitcoinAddressType = function(param) {
+    var addressType = param.addressType, derivationPath = param.derivationPath, accountAddress = param.accountAddress;
+    if (addressType) {
+        return addressType;
+    }
+    if (derivationPath) {
+        try {
+            return getAddressTypeFromDerivationPath(derivationPath);
+        } catch (e) {
+        // Empty or unrecognised path — fall through to the address.
+        }
+    }
+    var fromAddress = accountAddress ? getAddressTypeFromAddress(accountAddress) : undefined;
+    if (fromAddress) {
+        return fromAddress;
+    }
+    throw new Error('Unable to determine Bitcoin address type');
+};
+
 /**
  * Calculates the hash to be signed for a BIP-322 message verification
  *
@@ -1683,4 +1743,4 @@ function _type_of(obj) {
     return Buffer.from(formattedMessage).toString('hex');
 };
 
-export { assertSighashAllowed, calculateBip322Hash, calculateTaprootTweak, collectPSBTInputData, computeBip322HashHex, convertSignatureToDER, convertSignatureToTaprootBuffer, createLegacyAddress, createNativeSegWitAddress, createSegWitAddress, createTaprootAddress, doesInputBelongToAddress, encodeBip322Signature, extractPsbtSighashes, extractPublicKeyHex, filterInputsBySigningIndexes, getAddressTypeFromDerivationPath, getBitcoinNetwork, getDefaultRpcUrl, getFeeRates, getPublicKeyFromPrivateKey, getSegwitV0ScriptCode, getSigHashType, getUTXOs, initEccLib, isP2wshOutputScript, normalizeForCompressed, normalizeForTaproot, normalizePublicKey, privateKeyToWIF, publicKeyToBitcoinAddress, selectUTXOs, toBitcoinNetwork, toBuffer, wifToPrivateKey };
+export { assertSighashAllowed, calculateBip322Hash, calculateTaprootTweak, collectPSBTInputData, computeBip322HashHex, convertSignatureToDER, convertSignatureToTaprootBuffer, createLegacyAddress, createNativeSegWitAddress, createSegWitAddress, createTaprootAddress, doesInputBelongToAddress, encodeBip322Signature, extractPsbtSighashes, extractPublicKeyHex, filterInputsBySigningIndexes, getAddressTypeFromAddress, getAddressTypeFromDerivationPath, getBitcoinNetwork, getDefaultRpcUrl, getFeeRates, getPublicKeyFromPrivateKey, getSegwitV0ScriptCode, getSigHashType, getUTXOs, initEccLib, isP2wshOutputScript, normalizeForCompressed, normalizeForTaproot, normalizePublicKey, privateKeyToWIF, publicKeyToBitcoinAddress, resolveBitcoinAddressType, selectUTXOs, toBitcoinNetwork, toBuffer, wifToPrivateKey };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dynamic-labs-wallet/btc-utils",
-  "version": "1.0.118",
+  "version": "1.0.120",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dynamic-labs-wallet/core": "1.0.118",
+    "@dynamic-labs-wallet/core": "1.0.120",
     "bitcoinjs-lib": "^7.0.0",
     "bip322-js": "^3.0.0",
     "@noble/hashes": "1.7.1",

package/src/index.d.ts

@@ -1,6 +1,7 @@
 export { publicKeyToBitcoinAddress } from './publicKeyToBitcoinAddress/index.js';
 export { normalizePublicKey } from './normalizePublicKey/index.js';
 export { getAddressTypeFromDerivationPath } from './getAddressTypeFromDerivationPath/index.js';
+export { getAddressTypeFromAddress, resolveBitcoinAddressType } from './resolveBitcoinAddressType/index.js';
 export { calculateBip322Hash } from './calculateBip322Hash/index.js';
 export { encodeBip322Signature } from './encodeBip322Signature/index.js';
 export { privateKeyToWIF } from './privateKeyToWIF/index.js';

package/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,YAAY,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,YAAY,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC"}

package/src/resolveBitcoinAddressType/index.d.ts

@@ -0,0 +1,2 @@
+export { getAddressTypeFromAddress, resolveBitcoinAddressType } from './resolveBitcoinAddressType.js';
+//# sourceMappingURL=index.d.ts.map

package/src/resolveBitcoinAddressType/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resolveBitcoinAddressType/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC"}

package/src/resolveBitcoinAddressType/resolveBitcoinAddressType.d.ts

@@ -0,0 +1,34 @@
+import { BitcoinAddressType } from '@dynamic-labs-wallet/core';
+/**
+ * Infers the Bitcoin address type from a bech32/bech32m account address.
+ *
+ * The character immediately after the '1' separator encodes the witness
+ * version: 'q' => v0 (P2WPKH, native segwit), 'p' => v1 (P2TR, taproot). The
+ * type is intrinsic to the address, so this works regardless of wallet
+ * metadata and for every network prefix (`bc1…`, `tb1…`, `bcrt1…`). Legacy
+ * (`1…`/`3…`) addresses are not supported and return undefined.
+ *
+ * @param address - The Bitcoin account address
+ * @returns The inferred BitcoinAddressType, or undefined if it cannot be determined
+ */
+export declare const getAddressTypeFromAddress: (address: string) => BitcoinAddressType | undefined;
+/**
+ * Resolves the address type a BTC signing operation must use.
+ *
+ * Imported wallets are non-HD: the MPC server derives them with an empty path
+ * and persists `"[]"`, so a derivation path cannot be relied on to carry the
+ * address type. The account address always can — the witness version is part
+ * of the address — so it backs the path up rather than the other way around.
+ *
+ * @param addressType - Address type already recorded against the wallet, if any
+ * @param derivationPath - Serialized derivation path, `"[]"` for imported wallets
+ * @param accountAddress - The wallet's account address
+ * @returns The resolved BitcoinAddressType
+ * @throws If none of the three inputs can determine the address type
+ */
+export declare const resolveBitcoinAddressType: ({ addressType, derivationPath, accountAddress, }: {
+    accountAddress?: string;
+    addressType?: BitcoinAddressType;
+    derivationPath?: string | null;
+}) => BitcoinAddressType;
+//# sourceMappingURL=resolveBitcoinAddressType.d.ts.map

package/src/resolveBitcoinAddressType/resolveBitcoinAddressType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveBitcoinAddressType.d.ts","sourceRoot":"","sources":["../../src/resolveBitcoinAddressType/resolveBitcoinAddressType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAI/D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,YAAa,MAAM,KAAG,kBAAkB,GAAG,SAkBhF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yBAAyB,qDAInC;IACD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,KAAG,kBAmBH,CAAC"}