Merge pull request #814 from relayprotocol/pedro/fe-7788-implement-sending-public-key-for-bitcoin-quotes

Implement sending public key for bitcoin quotes

Author: pedromcunha

.changeset/fast-cups-notice.md

@@ -0,0 +1,7 @@
+---
+'@relayprotocol/relay-bitcoin-wallet-adapter': patch
+'@relayprotocol/relay-sdk': patch
+'@relayprotocol/relay-kit-ui': patch
+---
+
+Add bitcoin public key to quote params

demo/pages/ui/swap.tsx

@@ -109,6 +109,10 @@ const SwapWidgetPage: NextPage = () => {
             adaptedWallet = adaptViemWallet(walletClient)
           } else if (isBitcoinWallet(primaryWallet)) {
             const wallet = convertToLinkedWallet(primaryWallet)
+            const publicKey = primaryWallet.additionalAddresses.find(
+              ({ address, type }) =>
+                address === wallet.address && type === 'payment'
+            )?.publicKey
             adaptedWallet = adaptBitcoinWallet(
               wallet.address,
               async (_address, _psbt, dynamicParams) => {
@@ -123,7 +127,8 @@ const SwapWidgetPage: NextPage = () => {
                 } catch (e) {
                   throw e
                 }
-              }
+              },
+              publicKey
             )
           } else if (
             isSolanaWallet(primaryWallet) ||

packages/relay-bitcoin-wallet-adapter/src/adapter.ts

@@ -21,7 +21,8 @@ export const adaptBitcoinWallet = (
     address: string,
     psbt: bitcoin.Psbt,
     dynamicParams: DynamicSignPsbtParams
-  ) => Promise<string>
+  ) => Promise<string>,
+  publicKey?: string
 ): AdaptedWallet => {
   return {
     vmType: 'bvm',
@@ -76,6 +77,9 @@ export const adaptBitcoinWallet = (
     //@ts-ignore
     switchChain: (chainId: number) => {
       throw 'Not yet implemented'
+    },
+    metadata: {
+      publicKey
     }
   }
 }

packages/sdk/src/types/AdaptedWallet.ts

@@ -14,8 +14,13 @@ export type SuiReceipt = {
   digest: string
 }
 
+export type BitcoinWalletMetadata = {
+  publicKey?: string
+}
+
 export type AdaptedWallet = {
   vmType: ChainVM
+  metadata?: BitcoinWalletMetadata
   getChainId: () => Promise<number>
   handleSignMessageStep: (
     item: SignatureStepItem,
@@ -52,5 +57,7 @@ export type AdaptedWallet = {
     items: TransactionStepItem[]
   ) => Promise<string | undefined>
   // detect if wallet is an EOA (externally owned account)
-  isEOA?: (chainId: number) => Promise<{ isEOA: boolean; isEIP7702Delegated: boolean }>
+  isEOA?: (
+    chainId: number
+  ) => Promise<{ isEOA: boolean; isEIP7702Delegated: boolean }>
 }

packages/ui/src/components/widgets/SwapWidgetRenderer.tsx

@@ -611,6 +611,13 @@ const SwapWidgetRenderer: FC<SwapWidgetRendererProps> = ({
           refundTo: fromToken?.chainId === 1337 ? address : undefined,
           slippageTolerance: slippageTolerance,
           topupGas: gasTopUpEnabled && gasTopUpRequired,
+          ...(linkedWallet?.vmType === 'bvm' && wallet?.metadata?.publicKey
+            ? {
+                additionalData: {
+                  userPublicKey: wallet?.metadata?.publicKey
+                }
+              }
+            : {}),
           protocolVersion: quoteProtocol,
           ...(quoteProtocol === 'preferV2' &&
             explicitDeposit !== undefined && {