@meshconnect/uwc-bridge-parent 1.0.0 → 1.0.1

package/src/BridgeParent.ts

@@ -1,8 +1,8 @@
 import * as Comlink from 'comlink'
-import type { WalletAdapter } from '@solana/wallet-adapter-base'
 import type { Wallet } from '@wallet-standard/base'
 import { getWallets } from '@wallet-standard/app'
 import { isWalletAdapterCompatibleStandardWallet } from '@solana/wallet-adapter-base'
+import { Connection, Transaction, VersionedTransaction } from '@solana/web3.js'
 import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base'
 
 export interface EthereumProvider {
@@ -14,12 +14,30 @@ export interface EthereumProvider {
   removeListener?: (event: string, handler: (...args: any[]) => void) => void
 }
 
+interface ExtendedStandardWalletAdapter extends StandardWalletAdapter {
+  customFunctions: (
+    | 'sendSerializedTransaction'
+    | 'signSerializedTransaction'
+    | 'signAllSerializedTransactions'
+  )[]
+  sendSerializedTransaction: (
+    transaction: ArrayBufferLike,
+    rpcUrl: string
+  ) => Promise<string>
+  signSerializedTransaction: (
+    transaction: ArrayBufferLike
+  ) => Promise<Error | Transaction>
+  signAllSerializedTransactions: (
+    transactions: ArrayBufferLike[]
+  ) => Promise<Error | Transaction[]>
+}
+
 export interface WalletStandardInfo {
   uuid: string
   name: string
   chains: string[]
   features: string[]
-  adapter: WalletAdapter | undefined
+  adapter: ExtendedStandardWalletAdapter | undefined
 }
 
 export interface EIP6963ProviderInfo {
@@ -169,12 +187,177 @@ export class BridgeParent {
           name: wallet.name,
           chains: (wallet.chains || []) as string[],
           features: Object.keys(wallet.features),
+          // Expect a TS error, as not all adapter properties are implemented
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
           adapter: adapter
+            ? {
+                name: adapter.name,
+                url: adapter.url,
+                icon: adapter.icon,
+                readyState: adapter.readyState,
+                publicKey: Comlink.proxy({
+                  get value() {
+                    return adapter.publicKey
+                  },
+                  toBase58: async () => {
+                    return adapter.publicKey?.toBase58()
+                  },
+                  toJSON: async () => {
+                    return adapter.publicKey?.toJSON()
+                  },
+                  toBytes: async () => {
+                    return adapter.publicKey?.toBytes()
+                  },
+                  toBuffer: async () => {
+                    return adapter.publicKey?.toBuffer()
+                  },
+                  toString: async () => {
+                    return adapter.publicKey?.toString()
+                  }
+                }),
+                connecting: adapter.connecting,
+                connected: adapter.connected,
+                supportedTransactionVersions:
+                  adapter.supportedTransactionVersions,
+                wallet: adapter.wallet,
+                standard: adapter.standard,
+                destroy: async () => await adapter.destroy(),
+                autoConnect: async () => await adapter.autoConnect(),
+                connect: async () => await adapter.connect(),
+                disconnect: async () => await adapter.disconnect(),
+                sendTransaction: async (transaction, connection, options) =>
+                  await adapter.sendTransaction(
+                    transaction,
+                    connection,
+                    options
+                  ),
+                signTransaction: async transaction => {
+                  return adapter.signTransaction !== undefined
+                    ? await adapter.signTransaction(transaction)
+                    : new Error('Adapter does not support signTransaction')
+                },
+                signAllTransactions: async transactions => {
+                  return adapter.signAllTransactions !== undefined
+                    ? await adapter.signAllTransactions(transactions)
+                    : new Error('Adapter does not support signAllTransactions')
+                },
+                signMessage: async message => {
+                  return adapter.signMessage !== undefined
+                    ? await adapter.signMessage(message)
+                    : new Error('Adapter does not support signMessage')
+                },
+                signIn: async input => {
+                  return adapter.signIn !== undefined
+                    ? await adapter.signIn(input)
+                    : new Error('Adapter does not support signIn')
+                },
+                customFunctions: [
+                  'sendSerializedTransaction',
+                  'signAllSerializedTransactions',
+                  'signSerializedTransaction'
+                ],
+                sendSerializedTransaction: async (
+                  transaction: ArrayBufferLike,
+                  rpcUrl: string
+                ) => {
+                  const connection = new Connection(rpcUrl)
+                  const uint8Array = new Uint8Array(transaction)
+
+                  // Try to deserialize as VersionedTransaction first
+                  let deserializedTx: Transaction | VersionedTransaction
+                  try {
+                    deserializedTx =
+                      VersionedTransaction.deserialize(uint8Array)
+                  } catch {
+                    // If that fails, try as legacy Transaction
+                    try {
+                      deserializedTx = Transaction.from(uint8Array)
+                    } catch {
+                      throw new Error(
+                        'Failed to deserialize transaction as either versioned or legacy format'
+                      )
+                    }
+                  }
+
+                  return await adapter.sendTransaction(
+                    deserializedTx,
+                    connection
+                  )
+                },
+                signSerializedTransaction: async (
+                  transaction: ArrayBufferLike
+                ) => {
+                  if (adapter.signTransaction === undefined) {
+                    return new Error('Adapter does not support signTransaction')
+                  }
+
+                  const uint8Array = new Uint8Array(transaction)
+
+                  // Try to deserialize as VersionedTransaction first
+                  let deserializedTx: Transaction | VersionedTransaction
+                  try {
+                    deserializedTx =
+                      VersionedTransaction.deserialize(uint8Array)
+                  } catch {
+                    // If that fails, try as legacy Transaction
+                    try {
+                      deserializedTx = Transaction.from(uint8Array)
+                    } catch {
+                      return new Error(
+                        'Failed to deserialize transaction as either versioned or legacy format'
+                      )
+                    }
+                  }
+
+                  return await adapter.signTransaction(deserializedTx)
+                },
+                signAllSerializedTransactions: async (
+                  transactions: ArrayBufferLike[]
+                ) => {
+                  if (adapter.signAllTransactions === undefined) {
+                    return new Error(
+                      'Adapter does not support signAllTransactions'
+                    )
+                  }
+
+                  const deserializedTransactions: (
+                    | Transaction
+                    | VersionedTransaction
+                  )[] = []
+
+                  for (const transaction of transactions) {
+                    const uint8Array = new Uint8Array(transaction)
+
+                    // Try to deserialize as VersionedTransaction first
+                    let deserializedTx: Transaction | VersionedTransaction
+                    try {
+                      deserializedTx =
+                        VersionedTransaction.deserialize(uint8Array)
+                    } catch {
+                      // If that fails, try as legacy Transaction
+                      try {
+                        deserializedTx = Transaction.from(uint8Array)
+                      } catch {
+                        return new Error(
+                          'Failed to deserialize one or more transactions'
+                        )
+                      }
+                    }
+
+                    deserializedTransactions.push(deserializedTx)
+                  }
+
+                  return await adapter.signAllTransactions(
+                    deserializedTransactions
+                  )
+                }
+              }
+            : undefined
         })
         walletNames.add(wallet.name)
       }
     }
-    // Removed CBW integration see https://github.com/FrontFin/universal-wallet-connector/pull/19
     return solanaWallets
   }