@notabene/verify-proof 1.8.0 → 1.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notabene/verify-proof",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Verify ownership proofs",
   "source": "src/index.ts",
   "type": "module",

package/src/bitcoin.ts

@@ -117,7 +117,6 @@ export async function verifyBTCSignature(
           status: ProofStatus.FAILED,
         };
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (error) {
     console.error("error verifying proof", error);
     return {
@@ -169,10 +168,16 @@ function verifyBIP322(address: string, proof: SignatureProof) {
 }
 
 function verifyBIP137(address: string, proof: SignatureProof, chainConfig: ChainConfig) {
-  const segwit = Boolean(chainConfig.bech32Prefix && [DerivationMode.SEGWIT, DerivationMode.NATIVE].includes(
-    getDerivationMode(address)
-  ));
-  const verified = verify(proof.attestation, address, proof.proof, segwit, chainConfig);
+  const derivationMode = getDerivationMode(address);
+  
+  // For legacy addresses (starting with "1"), never use SegWit encoding
+  // For P2SH addresses (starting with "3"), use SegWit encoding if they have bech32 support
+  // For native SegWit addresses (bc1, tb1, ltc1), always use SegWit encoding
+  const useSegwitEncoding = Boolean(chainConfig.bech32Prefix && 
+    (derivationMode === DerivationMode.NATIVE || 
+     (derivationMode === DerivationMode.SEGWIT && !address.startsWith("1"))));
+  
+  const verified = verify(proof.attestation, address, proof.proof, useSegwitEncoding, chainConfig);
 
   return {
     ...proof,
@@ -191,6 +196,10 @@ function getDerivationMode(address: string) {
     return DerivationMode.DOGECOIN;
   } else if (address.match("^(q).*")) {
     return DerivationMode.BCH;
+  } else if (address.match("^(t1|t3).*")) {
+    return DerivationMode.LEGACY; // Zcash addresses
+  } else if (address.match("^[X7].*")) {
+    return DerivationMode.LEGACY; // Dash addresses
   } else {
     throw new Error(
       "INVALID ADDRESS: "
@@ -271,7 +280,22 @@ function verify(
       }
     }
   } else {
-    if (checkSegwitAlways && chainConfig.bech32Prefix) {
+    // For addresses starting with "3" (P2SH), try both P2SH-P2WPKH and legacy P2SH encodings if segwitType is undefined
+    if (address.startsWith("3") && !segwitType) {
+      // P2SH-P2WPKH: script hash of the redeem script (OP_0 <pubkeyhash>)
+      const redeemScript = new Uint8Array(22);
+      redeemScript[0] = 0x00; // OP_0
+      redeemScript[1] = 0x14; // push 20 bytes
+      redeemScript.set(publicKeyHash, 2);
+      const redeemScriptHash = hash160(redeemScript);
+      const p2shP2wpkh = encodeBase58AddressFormat(chainConfig.scriptHashVersion, redeemScriptHash);
+      // Legacy P2SH: script hash of the public key
+      const legacyP2sh = encodeBase58AddressFormat(chainConfig.scriptHashVersion, publicKeyHash);
+      if (address === p2shP2wpkh || address === legacyP2sh) {
+        return true;
+      }
+      actual = legacyP2sh; // fallback for error reporting
+    } else if (checkSegwitAlways && chainConfig.bech32Prefix) {
       try {
         actual = encodeBech32Address(publicKeyHash, chainConfig.bech32Prefix);
         // if address is bech32 it is not p2sh

package/src/tests/bitcoin.test.ts

@@ -7,6 +7,26 @@ import {
   ProofTypes,
 } from "@notabene/javascript-sdk";
 
+const bitcoinP2WPKHProof: SignatureProof = {
+  type: ProofTypes.BIP137,
+  wallet_provider: "Manual Wallet Signature",
+  status: ProofStatus.PENDING,
+  address: "bip122:000000000019d6689c085ae165831e93:3Q9jfjfbMDuatto7wZ6Tz2aKaDCRHqWWys",
+  did: "did:pkh:bip122:000000000019d6689c085ae165831e93:3Q9jfjfbMDuatto7wZ6Tz2aKaDCRHqWWys",
+  attestation: "I certify that the blockchain address 3Q9jfjfbMDuatto7wZ6Tz2aKaDCRHqWWys belongs to did:pkh:bip122:000000000019d6689c085ae165831e93:3Q9jfjfbMDuatto7wZ6Tz2aKaDCRHqWWys on Wed, 09 Jul 2025 20:17:12 GMT",
+  proof: "HxPmbzvEnvgu0RYIPYl5bWySkFNXwOF/Jegq3NvzjFZ/Ik/koTdV9rh2A7osXefhzTlniUw8YbZNmCeXB9V9qC8=",
+}
+
+const bitcoinP2shProof: SignatureProof = {
+  type: ProofTypes.BIP137,
+  wallet_provider: "Manual Wallet Signature",
+  status: ProofStatus.PENDING,
+  address: "bip122:000000000019d6689c085ae165831e93:1ANiqVALaKwadxA9nvmCUHpBhaopVniuVS",
+  did: "did:pkh:bip122:000000000019d6689c085ae165831e93:1ANiqVALaKwadxA9nvmCUHpBhaopVniuVS",
+  attestation: "I certify that the blockchain address 1ANiqVALaKwadxA9nvmCUHpBhaopVniuVS belongs to did:pkh:bip122:000000000019d6689c085ae165831e93:1ANiqVALaKwadxA9nvmCUHpBhaopVniuVS on Wed, 02 Jul 2025 16:01:44 GMT",
+  proof: "IBo2Im6O5NyuXzBJ+coiTMqmUsqG9bv8NzM3+B5e+5XMB2Xp1n/sIsE/73Jy0EdSvcb334t49+3tdjE/X+sXjFw="
+}
+
 const bip322SegwitTestnetProof: SignatureProof = {
   type: ProofTypes.BIP137,
   address: "bip122:000000000019d6689c085ae165831e93:tb1q0apvgsh48f3rmw224na3ye5rrg37fd796cm0xf",
@@ -89,6 +109,16 @@ const zcashProof: SignatureProof = {
 };
 
 describe("verifyBTCSignature", () => {
+  it("handles bitcoin p2sh addresses", async () => {
+    const result = await verifyBTCSignature(bitcoinP2shProof);
+    expect(result).toEqual({ ...bitcoinP2shProof, status: ProofStatus.VERIFIED });
+  });
+
+  it("handles bitcoin p2wpkh addresses", async () => {
+    const result = await verifyBTCSignature(bitcoinP2WPKHProof);
+    expect(result).toEqual({ ...bitcoinP2WPKHProof, status: ProofStatus.VERIFIED });
+  });
+
   it("handles bip322 segwit testnet addresses", async () => {
     const result = await verifyBTCSignature(bip322SegwitTestnetProof);
     expect(result).toEqual({