add new reclaim script for asigna

Author: hozzjss

src/comps/ConnectWallet.tsx

@@ -17,8 +17,11 @@ import { useAtomValue, useSetAtom } from "jotai";
 import { useNotifications } from "@/hooks/use-notifications";
 import { NotificationStatusType } from "./Notifications";
 import { useEffect, useState } from "react";
-import { getAddresses, getAddressesAsigna } from "@/util/wallet-utils/src/getAddress";
-import { useAsignaConnect } from '@asigna/btc-connect'
+import {
+  getAddresses,
+  getAddressesAsigna,
+} from "@/util/wallet-utils/src/getAddress";
+import { useAsignaConnect } from "@asigna/btc-connect";
 
 const WALLET_PROVIDERS = [
   {
@@ -73,8 +76,9 @@ const ConnectWallet = ({ onClose }: ConnectWalletProps) => {
           break;
         case WalletProvider.XVERSE:
           addresses = await getAddressesXverse();
+          break;
         case WalletProvider.ASIGNA:
-          addresses = await getAddressesAsigna(asignaConnect);
+          addresses = await getAddressesAsigna({ action: asignaConnect });
       }
       const isMainnetAddress =
         addresses.payment.address.startsWith("bc1") ||
@@ -165,13 +169,16 @@ const ConnectWallet = ({ onClose }: ConnectWalletProps) => {
                     alt={provider.name}
                   />
                   <p className="ml-4 text-black">
-                    {provider.walletProvider === WalletProvider.ASIGNA && !available
-                      ? 'Open as an embedded app in Asigna' 
-                      : <>
-                        {provider.name}{""}
+                    {provider.walletProvider === WalletProvider.ASIGNA &&
+                    !available ? (
+                      "Open as an embedded app in Asigna"
+                    ) : (
+                      <>
+                        {provider.name}
+                        {""}
                         {!available && " is not available click to install"}
                       </>
-                    }
+                    )}
                   </p>
                 </div>
                 {available ? (

src/comps/Deposit.tsx

@@ -281,14 +281,25 @@ const DepositFlowConfirm = ({
       // user cannot continue if they're not connected
       const paymentAddress = walletInfo.addresses.payment!;
 
-      const reclaimPublicKey = paymentAddress.publicKey;
+      let reclaimPublicKeys = [paymentAddress.publicKey];
+      let signatureThreshold = 1;
+
+      if (walletInfo.selectedWallet === WalletProvider.ASIGNA) {
+        const { threshold, users } = walletInfo.addresses.musig!;
+        signatureThreshold = threshold;
+        reclaimPublicKeys = users.map((user) => user.publicKey);
+      }
 
       // Parse lockTime from env variable
       const parsedLockTime = parseInt(lockTime || "144");
 
       // Create the reclaim script and convert to Buffer
       const reclaimScript = Buffer.from(
-        createReclaimScript(parsedLockTime, reclaimPublicKey),
+        createReclaimScript(
+          parsedLockTime,
+          reclaimPublicKeys,
+          signatureThreshold,
+        ),
       );
 
       const reclaimScriptHex = uint8ArrayToHexString(reclaimScript);
@@ -306,7 +317,8 @@ const DepositFlowConfirm = ({
         maxFee,
         parsedLockTime,
         getBitcoinNetwork(config.WALLET_NETWORK),
-        reclaimPublicKey,
+        reclaimPublicKeys,
+        signatureThreshold,
       );
 
       let txId = "";

src/util/atoms.ts

@@ -4,6 +4,7 @@ import { atom, createStore } from "jotai";
 import { NotificationEventType } from "@/comps/Notifications";
 import getSbtcBridgeConfig from "@/actions/get-sbtc-bridge-config";
 import { atomWithStorage } from "jotai/utils";
+import { AsignaUser } from "./wallet-utils/src/getAddress";
 
 export const store = createStore();
 
@@ -29,7 +30,7 @@ export const eventsAtom = atom<NotificationEventType[]>([]);
 export enum WalletProvider {
   LEATHER = "leather",
   XVERSE = "xverse",
-  ASIGNA = 'asigna',
+  ASIGNA = "asigna",
 }
 
 type Address = {
@@ -44,12 +45,17 @@ export const walletInfoAtom = atomWithStorage<{
     payment: Address | null;
     taproot: Address | null;
     stacks: Address | null;
+    musig: {
+      users: AsignaUser[];
+      threshold: number;
+    } | null;
   };
 }>("walletInfoV3", {
   selectedWallet: null,
   addresses: {
     payment: null,
     taproot: null,
     stacks: null,
+    musig: null,
   },
 });

src/util/depositRequest.ts

@@ -7,6 +7,8 @@ import { Taptree } from "bitcoinjs-lib/src/types";
 import * as bip341 from "bitcoinjs-lib/src/payments/bip341";
 
 import ecc from "@bitcoinerlab/secp256k1";
+import { toXOnly } from "bitcoinjs-lib/src/psbt/bip371";
+import { bytesToHex, hexToBytes } from "@stacks/common";
 
 bitcoin.initEccLib(ecc);
 
@@ -57,27 +59,45 @@ export const createDepositScript = (
   ]);
 };
 
+
 export const createReclaimScript = (
   lockTime: number,
-  userPublicKey: string,
-): Uint8Array => {
+  leafPubkeys: string[],
+  threshold: number = 1,
+) => {
   const { script, opcodes } = bitcoin;
 
-  // Convert the user public key to a Uint8Array
-  const pubkey = hexToUint8Array(userPublicKey);
-  // remove the 0x04 prefix
-  const schnorrPublicKey = pubkey.slice(1);
+  if (leafPubkeys.length < 1) {
+    throw new Error("Incorrect number of leaf public keys");
+  }
+
+  if (threshold > leafPubkeys.length || threshold <= 0) {
+    throw new Error("Incorrect threshold");
+  }
+
+  let leafScriptAsm = [
+    toXOnly(hexToBytes(leafPubkeys[0])),
+    opcodes.OP_CHECKSIG,
+  ];
+
+  if (leafPubkeys.length > 1) {
+    leafScriptAsm = [
+      ...leafScriptAsm,
+      ...leafPubkeys
+        .slice(1)
+        .flatMap((p) => [toXOnly(hexToBytes(p)), opcodes.OP_CHECKSIGADD]),
+      script.number.encode(threshold),
+      opcodes.OP_NUMEQUAL,
+    ];
+  }
 
-  // Encode lockTime
   const lockTimeEncoded = script.number.encode(lockTime);
 
-  // Return the combined Uint8Array
   const buildScript = script.compile([
     lockTimeEncoded,
     opcodes.OP_CHECKSEQUENCEVERIFY,
     opcodes.OP_DROP,
-    schnorrPublicKey,
-    opcodes.OP_CHECKSIG,
+    ...leafScriptAsm,
   ]);
 
   return buildScript;
@@ -89,13 +109,14 @@ export const createDepositAddress = (
   maxFee: number,
   lockTime: number,
   network: bitcoin.networks.Network,
-  reclaimPublicKey: string,
+  reclaimPublicKeys: string[],
+  threshold: number = 1,
 ): string => {
   const internalPubkey = hexToUint8Array(signerPubKey);
 
   // Create the reclaim script and convert to Buffer
   const reclaimScript = Buffer.from(
-    createReclaimScript(lockTime, reclaimPublicKey),
+    createReclaimScript(lockTime, reclaimPublicKeys, threshold),
   );
 
   // Create the deposit script and convert to Buffer

src/util/wallet-utils/src/getAddress.ts

@@ -20,20 +20,34 @@ type Results = {
     address: string;
     publicKey: string;
   };
+  musig: {
+    users: AsignaUser[];
+    threshold: number;
+  } | null;
+};
+
+export type AsignaUser = {
+  _id: string;
+  address: string;
+  __v: number;
+  publicKey: string;
+  walletClass: string;
+  walletType: string;
 };
 
 export type getAddresses = (params?: {
   message?: string;
   network?: DefaultNetworkConfigurations;
+  action?: () => Promise<any>;
 }) => Promise<Results>;
 
 const getAddressByPurpose = (
-  response: RpcSuccessResponse<"wallet_connect">["result"],
+  response: RpcSuccessResponse<"getAddresses">["result"],
   purpose: AddressPurpose,
 ) => response.addresses.find((item) => item.purpose === purpose);
 
 export function getWalletAddresses(
-  response: RpcSuccessResponse<"wallet_connect">["result"],
+  response: RpcSuccessResponse<"getAddresses">["result"],
 ) {
   const taproot = getAddressByPurpose(response, AddressPurpose.Ordinals);
   if (!taproot) {
@@ -61,6 +75,7 @@ export function getWalletAddresses(
       address: stacks.address,
       publicKey: stacks.publicKey,
     },
+    musig: null,
   };
 }
 
@@ -69,8 +84,12 @@ export function getWalletAddresses(
  * @description Get the address for the user
  */
 export const getAddressesXverse: getAddresses = async (params) => {
-  const response = await request("wallet_connect", {
-    message: params?.message,
+  const response = await request("getAddresses", {
+    purposes: [
+      AddressPurpose.Ordinals,
+      AddressPurpose.Payment,
+      AddressPurpose.Stacks,
+    ],
   });
 
   if (response.status === "error") {
@@ -81,23 +100,30 @@ export const getAddressesXverse: getAddresses = async (params) => {
   return getWalletAddresses(result);
 };
 
-export const getAddressesAsigna = async (action: () => Promise<any>) => {
-  const response = await action();
+export const getAddressesAsigna: getAddresses = async (params) => {
+  if (!params?.action) {
+    throw new Error("Action is required");
+  }
+  const response = await params.action();
   return {
     taproot: {
-      address: '',
-      publicKey: '',
+      address: "",
+      publicKey: "",
     },
     payment: {
       address: response.address,
       publicKey: response.publicKey,
     },
     stacks: {
-      address: '',
-      publicKey: '',
+      address: "",
+      publicKey: "",
+    },
+    musig: {
+      users: response.users,
+      threshold: response.threshold,
     },
   };
-}
+};
 
 const extractAddressByType = (
   addresses: Address[],
@@ -137,5 +163,6 @@ export const getAddressesLeather: getAddresses = async () => {
     payment,
     taproot,
     stacks,
+    musig: null,
   };
 };