feat(sdk): integrate bip322-js to sign & verify non-legacy address me…

…ssages (#91)

* chore: install bip322-js lib

* feat: use bip322 to sign non-legacy addr message

also, use the same lib to verify non-legacy addr message

* feat: allow non-legacy addresses to sign message

* fix: pass missing WIF & network to msg signer

also, remove compressed flag

* refactor: restore fallback verification

also, replace ternary expression w/ if block

packages/sdk/package.json

@@ -25,6 +25,7 @@
   "dependencies": {
     "@bitcoinerlab/secp256k1": "1.0.2",
     "bip32": "4.0.0",
+    "bip322-js": "^1.1.0",
     "bip39": "3.1.0",
     "bitcoinjs-lib": "6.1.3",
     "bitcoinjs-message": "2.2.0",

packages/sdk/src/browser-wallets/metamask/signatures.ts

@@ -1,3 +1,4 @@
+import { Address, Signer } from "bip322-js"
 import { Psbt } from "bitcoinjs-lib"
 import { sign } from "bitcoinjs-message"
 import { ethers } from "ethers"
@@ -86,7 +87,9 @@ export async function signMessage(options: SignMetaMaskMessageOptions) {
   const node = await getDerivedNodeFromMetaMaskSignature(signature, "", options.network)
   const { address: addressBtc } = createTransaction(node.parent.publicKey, "p2pkh", options.network)
 
-  const signedMessage = sign(options.message, node.parent.privateKey!)
+  const signedMessage = Address.isP2PKH(address)
+    ? sign(options.message, node.parent.privateKey!)
+    : Signer.sign(node.parent.privateKey!.toString(), address, options.message)
 
   return {
     hex: signedMessage.toString("hex"),

packages/sdk/src/signatures/message.ts

@@ -1,3 +1,4 @@
+import { Address, Signer, Verifier } from "bip322-js"
 import { sign, verify } from "bitcoinjs-message"
 
 import { Network } from "../config/types"
@@ -20,7 +21,9 @@ export async function signMessage(options: SignMessageOptions) {
     //   const keyPair = EcPair.fromWIF(wif);
     const { address } = createTransaction(parent.publicKey, "p2pkh", network)
 
-    const signature = sign(options.message, parent.privateKey!)
+    const signature = Address.isP2PKH(address!)
+      ? sign(options.message, parent.privateKey!)
+      : Signer.sign(parent.privateKey!.toString(), address!, options.message)
 
     return {
       hex: signature.toString("hex"),
@@ -34,15 +37,13 @@ export async function signMessage(options: SignMessageOptions) {
 
 export function verifyMessage(options: VerifyMessageOptions) {
   try {
-    let isValid = verify(options.message, options.address, options.signature)
-
-    if (!isValid) {
-      isValid = fallbackVerification(options)
+    if (Address.isP2PKH(options.address)) {
+      return !verify(options.message, options.address, options.signature) ? fallbackVerification(options) : true
     }
 
-    return isValid
-  } catch (error) {
-    return fallbackVerification(options)
+    return Verifier.verifySignature(options.address, options.message, options.signature)
+  } catch (_) {
+    return false
   }
 }
 

packages/sdk/src/wallet/Ordit.ts

@@ -1,6 +1,7 @@
 import * as ecc from "@bitcoinerlab/secp256k1"
 import BIP32Factory, { BIP32Interface } from "bip32"
 import { mnemonicToSeedSync } from "bip39"
+import { Address as BIP22Address, Signer } from "bip322-js"
 import * as bitcoin from "bitcoinjs-lib"
 import { isTaprootInput } from "bitcoinjs-lib/src/psbt/bip371"
 import { sign } from "bitcoinjs-message"
@@ -231,8 +232,10 @@ export class Ordit {
   }
 
   signMessage(message: string) {
-    const legacyWallet = this.allAddresses.find((wallet) => wallet.format === "legacy") as Account
-    const signature = sign(message, legacyWallet.child.privateKey!, false)
+    const node = this.allAddresses.find((wallet) => wallet.format === this.selectedAddressType) as Account
+    const signature = BIP22Address.isP2PKH(node.address!)
+      ? sign(message, node.child.privateKey!)
+      : Signer.sign(node.child.toWIF(), node.address!, message, getNetwork(this.#network))
 
     return signature.toString("base64")
   }