Merge pull request #415 from reservoirprotocol/pedro/relay-6543-expos…

…e-instructions-in-svm-signandsendtransaction

Expose instructions in svm signandsendtransaction

.changeset/cyan-cougars-love.md

@@ -0,0 +1,6 @@
+---
+'@reservoir0x/relay-svm-wallet-adapter': patch
+'@reservoir0x/relay-sdk': patch
+---
+
+Expose instructions in signature function

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

@@ -2,22 +2,28 @@ import {
   AddressLookupTableAccount,
   Connection,
   PublicKey,
-  Transaction,
   TransactionInstruction,
   TransactionMessage,
   VersionedTransaction,
   type SendOptions,
   type TransactionSignature
 } from '@solana/web3.js'
-import { LogLevel, getClient, type AdaptedWallet } from '@reservoir0x/relay-sdk'
+import {
+  LogLevel,
+  getClient,
+  type AdaptedWallet,
+  type TransactionStepItem
+} from '@reservoir0x/relay-sdk'
 
 export const adaptSolanaWallet = (
   walletAddress: string,
   chainId: number,
   connection: Connection,
   signAndSendTransaction: (
-    transaction: Transaction | VersionedTransaction,
-    options?: SendOptions
+    transaction: VersionedTransaction,
+    options?: SendOptions,
+    instructions?: TransactionInstruction[],
+    rawInstructions?: TransactionStepItem['data']['instructions']
   ) => Promise<{
     signature: TransactionSignature
   }>
@@ -71,7 +77,12 @@ export const adaptSolanaWallet = (
       )
 
       const transaction = new VersionedTransaction(messageV0)
-      const signature = await signAndSendTransaction(transaction)
+      const signature = await signAndSendTransaction(
+        transaction,
+        undefined,
+        instructions,
+        stepItem.data.instructions
+      )
 
       client.log(
         ['Transaction Signature obtained', signature],

packages/sdk/src/actions/getQuote.ts

@@ -1,6 +1,6 @@
 import { type AxiosRequestConfig } from 'axios'
 import { axios } from '../utils/axios.js'
-import { zeroAddress, type Address, type WalletClient } from 'viem'
+import { zeroAddress, type WalletClient } from 'viem'
 import prepareCallTransaction from '../utils/prepareCallTransaction.js'
 import {
   isSimulateContractRequest,
@@ -33,7 +33,7 @@ export type GetQuoteParameters = {
   tradeType: QuoteBodyOptions['tradeType']
   wallet?: AdaptedWallet | WalletClient
   amount?: string
-  recipient?: Address
+  recipient?: string
   options?: Omit<QuoteBodyOptions, 'user' | 'source' | 'txs' | 'tradeType'>
   txs?: (NonNullable<QuoteBody['txs']>[0] | SimulateContractRequest)[]
 }