@cowprotocol/sdk-trading-solana 0.4.1 → 0.5.0

package/README.md

@@ -19,11 +19,13 @@ the `cowswap` repo for background.
 
 ## Usage
 
+Quoting needs no signer:
+
 ```ts
 import { SolanaTradingSdk } from '@cowprotocol/sdk-trading-solana'
 
-const sdk = new SolanaTradingSdk({ signAndSend })
-const { quoteResults, postSwapOrderFromQuote } = await sdk.getQuote({
+const sdk = new SolanaTradingSdk()
+const { quoteResults, solanaQuote, buildOrder, postSwapOrderFromQuote } = await sdk.getQuote({
   ownerAddress,
   receiverAddress,
   sellTokenAddress,
@@ -33,6 +35,26 @@ const { quoteResults, postSwapOrderFromQuote } = await sdk.getQuote({
   amount,
   kind,
 })
+```
+
+### Let the SDK submit the order
+
+`signAndSend` is passed at the point of signing:
+
+```ts
+const result = await postSwapOrderFromQuote(signAndSend)
+```
+
+### Bundle the order with your own instructions
+
+A Solana order is created by a single instruction, so it can share a transaction with, say, a wrap and a
+token delegation. `buildOrder` returns that instruction without sending it:
 
-const result = await postSwapOrderFromQuote()
+```ts
+const { instruction, orderId } = await buildOrder()
+
+await sendMyTransaction([...wrapInstructions, approveInstruction, instruction])
 ```
+
+Both paths apply `advancedSettings` identically — overriding `receiver` or `validTo` re-derives the order's
+`uid` and PDA so they still match the intent actually being created.

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { PublicKey, PublicKeyInitData, TransactionInstruction } from '@solana/web3.js';
-import { OrderKind } from '@cowprotocol/sdk-order-book';
+import { OrderKind, SigningScheme } from '@cowprotocol/sdk-order-book';
 import { CowEnv } from '@cowprotocol/sdk-config';
-import { QuoteResults, SwapAdvancedSettings, SigningStepManager, OrderPostingResult, QuoteAndPost } from '@cowprotocol/sdk-trading';
+import { QuoteResults, SwapAdvancedSettings, SigningStepManager, OrderPostingResult } from '@cowprotocol/sdk-trading';
 
 interface JupiterOrderRequest {
     inputMint: string;
@@ -176,32 +176,68 @@ declare function getSolanaQuote(params: SolanaQuoteParameters, options?: {
     solanaQuote: SolanaQuote;
 }>;
 
-/**
- * Builds the real `CreateOrder` instruction for `quote` and has the caller sign and submit it. This is
- * the Solana analogue of `postSwapOrderFromQuote` in `postSwapOrder.ts` — but where the EVM version signs
- * order data and POSTs it to the CoW order-book, Solana orders are created entirely on-chain, so this
- * builds a transaction instruction instead of a signed order body. `createdBy` is always `quote.intent.owner`:
- * a single connected wallet both authenticates and funds the order's rent.
- */
-declare function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }: {
+interface SolanaSwapOrderQuote {
     quoteResults: QuoteResults;
     solanaQuote: SolanaQuote;
-}, signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
+}
+interface SolanaSwapOrder {
+    /** The `CreateOrder` instruction. Send it on its own, or bundle it with other instructions. */
+    instruction: TransactionInstruction;
+    /** `uid` as the order-book's `0x`-prefixed uid — see `toOrderId`. */
+    orderId: string;
+    uid: Uint8Array;
+    orderPda: PublicKey;
+    /** The intent actually encoded into `instruction` — `advancedSettings` may have overridden the quoted one. */
+    intent: SolanaOrderIntent;
+    signingScheme: SigningScheme;
+    orderToSign: QuoteResults['orderToSign'];
+}
+/**
+ * Builds everything needed to create `quote`'s order on-chain, without signing or sending it. Callers that
+ * want the SDK to submit it should use `postSolanaSwapOrderFromQuote`; callers bundling the order with
+ * other instructions (a wrap, a token delegation) take `instruction` from here and send it themselves.
+ *
+ * Solana orders are created entirely on-chain, so — unlike the EVM `postSwapOrderFromQuote` — there is no
+ * signed order body to POST, and `createdBy` is always `intent.owner`: a single connected wallet both
+ * authenticates the order and funds its PDA's rent.
+ */
+declare function buildSolanaSwapOrder({ quoteResults, solanaQuote }: SolanaSwapOrderQuote, advancedSettings?: SwapAdvancedSettings): Promise<SolanaSwapOrder>;
+
+/**
+ * Builds `quote`'s `CreateOrder` instruction and has `signAndSend` submit it as its own transaction. This
+ * is the Solana analogue of `postSwapOrderFromQuote` in `postSwapOrder.ts` — but where the EVM version
+ * signs order data and POSTs it to the CoW order-book, Solana orders are created entirely on-chain.
+ *
+ * To bundle the order with other instructions instead of sending it alone, use `buildSolanaSwapOrder`.
+ */
+declare function postSolanaSwapOrderFromQuote(quote: SolanaSwapOrderQuote, signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
 
 interface SolanaTradingSdkOptions {
-    signAndSend: SolanaSignAndSend;
     env?: CowEnv;
 }
 /**
- * Solana counterpart to `TradingSdk`. Unlike the EVM SDK, which gets its signer implicitly from a
- * global adapter set once at app startup, Solana has no such adapter — `signAndSend` is bound at
- * construction instead, so callers get the same `sdk.getQuote(...)` → `.postSwapOrderFromQuote()`
- * shape without threading a signer through every call.
+ * Solana counterpart to `QuoteAndPost`. It additionally exposes `solanaQuote` and `buildOrder`, because a
+ * Solana order is a plain instruction: callers may want to bundle it with a wrap or a token delegation and
+ * submit one transaction, rather than have the SDK send it alone.
+ */
+interface SolanaQuoteAndPost {
+    quoteResults: QuoteResults;
+    solanaQuote: SolanaQuote;
+    /** Build the `CreateOrder` instruction without sending it, to bundle with other instructions. */
+    buildOrder(advancedSettings?: SwapAdvancedSettings): Promise<SolanaSwapOrder>;
+    /** Build, sign and submit the order as its own transaction. */
+    postSwapOrderFromQuote(signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
+}
+/**
+ * Solana counterpart to `TradingSdk`. Unlike the EVM SDK, which gets its signer implicitly from a global
+ * adapter set once at app startup, Solana has no such adapter — so the signer is passed to
+ * `postSwapOrderFromQuote` at the point of signing. Quoting therefore needs no signer at all, which also
+ * lets a caller quote and then bundle the order instruction itself via `buildOrder`.
  */
 declare class SolanaTradingSdk {
     private readonly options;
-    constructor(options: SolanaTradingSdkOptions);
-    getQuote(params: SolanaQuoteParameters): Promise<QuoteAndPost>;
+    constructor(options?: SolanaTradingSdkOptions);
+    getQuote(params: SolanaQuoteParameters): Promise<SolanaQuoteAndPost>;
 }
 
-export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteParameters, type SolanaSignAndSend, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, encodeOrderIntent, findOrderPda, findSettlementStatePda, getSettlementSeed, getSolanaDelegateAuthority, getSolanaQuote, getSolanaSettlementProgramId, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex, toOrderId };
+export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteAndPost, type SolanaQuoteParameters, type SolanaSignAndSend, type SolanaSwapOrder, type SolanaSwapOrderQuote, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, buildSolanaSwapOrder, encodeOrderIntent, findOrderPda, findSettlementStatePda, getSettlementSeed, getSolanaDelegateAuthority, getSolanaQuote, getSolanaSettlementProgramId, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex, toOrderId };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey, PublicKeyInitData, TransactionInstruction } from '@solana/web3.js';
-import { OrderKind } from '@cowprotocol/sdk-order-book';
+import { OrderKind, SigningScheme } from '@cowprotocol/sdk-order-book';
 import { CowEnv } from '@cowprotocol/sdk-config';
-import { QuoteResults, SwapAdvancedSettings, SigningStepManager, OrderPostingResult, QuoteAndPost } from '@cowprotocol/sdk-trading';
+import { QuoteResults, SwapAdvancedSettings, SigningStepManager, OrderPostingResult } from '@cowprotocol/sdk-trading';
 
 interface JupiterOrderRequest {
     inputMint: string;
@@ -176,32 +176,68 @@ declare function getSolanaQuote(params: SolanaQuoteParameters, options?: {
     solanaQuote: SolanaQuote;
 }>;
 
-/**
- * Builds the real `CreateOrder` instruction for `quote` and has the caller sign and submit it. This is
- * the Solana analogue of `postSwapOrderFromQuote` in `postSwapOrder.ts` — but where the EVM version signs
- * order data and POSTs it to the CoW order-book, Solana orders are created entirely on-chain, so this
- * builds a transaction instruction instead of a signed order body. `createdBy` is always `quote.intent.owner`:
- * a single connected wallet both authenticates and funds the order's rent.
- */
-declare function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }: {
+interface SolanaSwapOrderQuote {
     quoteResults: QuoteResults;
     solanaQuote: SolanaQuote;
-}, signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
+}
+interface SolanaSwapOrder {
+    /** The `CreateOrder` instruction. Send it on its own, or bundle it with other instructions. */
+    instruction: TransactionInstruction;
+    /** `uid` as the order-book's `0x`-prefixed uid — see `toOrderId`. */
+    orderId: string;
+    uid: Uint8Array;
+    orderPda: PublicKey;
+    /** The intent actually encoded into `instruction` — `advancedSettings` may have overridden the quoted one. */
+    intent: SolanaOrderIntent;
+    signingScheme: SigningScheme;
+    orderToSign: QuoteResults['orderToSign'];
+}
+/**
+ * Builds everything needed to create `quote`'s order on-chain, without signing or sending it. Callers that
+ * want the SDK to submit it should use `postSolanaSwapOrderFromQuote`; callers bundling the order with
+ * other instructions (a wrap, a token delegation) take `instruction` from here and send it themselves.
+ *
+ * Solana orders are created entirely on-chain, so — unlike the EVM `postSwapOrderFromQuote` — there is no
+ * signed order body to POST, and `createdBy` is always `intent.owner`: a single connected wallet both
+ * authenticates the order and funds its PDA's rent.
+ */
+declare function buildSolanaSwapOrder({ quoteResults, solanaQuote }: SolanaSwapOrderQuote, advancedSettings?: SwapAdvancedSettings): Promise<SolanaSwapOrder>;
+
+/**
+ * Builds `quote`'s `CreateOrder` instruction and has `signAndSend` submit it as its own transaction. This
+ * is the Solana analogue of `postSwapOrderFromQuote` in `postSwapOrder.ts` — but where the EVM version
+ * signs order data and POSTs it to the CoW order-book, Solana orders are created entirely on-chain.
+ *
+ * To bundle the order with other instructions instead of sending it alone, use `buildSolanaSwapOrder`.
+ */
+declare function postSolanaSwapOrderFromQuote(quote: SolanaSwapOrderQuote, signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
 
 interface SolanaTradingSdkOptions {
-    signAndSend: SolanaSignAndSend;
     env?: CowEnv;
 }
 /**
- * Solana counterpart to `TradingSdk`. Unlike the EVM SDK, which gets its signer implicitly from a
- * global adapter set once at app startup, Solana has no such adapter — `signAndSend` is bound at
- * construction instead, so callers get the same `sdk.getQuote(...)` → `.postSwapOrderFromQuote()`
- * shape without threading a signer through every call.
+ * Solana counterpart to `QuoteAndPost`. It additionally exposes `solanaQuote` and `buildOrder`, because a
+ * Solana order is a plain instruction: callers may want to bundle it with a wrap or a token delegation and
+ * submit one transaction, rather than have the SDK send it alone.
+ */
+interface SolanaQuoteAndPost {
+    quoteResults: QuoteResults;
+    solanaQuote: SolanaQuote;
+    /** Build the `CreateOrder` instruction without sending it, to bundle with other instructions. */
+    buildOrder(advancedSettings?: SwapAdvancedSettings): Promise<SolanaSwapOrder>;
+    /** Build, sign and submit the order as its own transaction. */
+    postSwapOrderFromQuote(signAndSend: SolanaSignAndSend, advancedSettings?: SwapAdvancedSettings, signingStepManager?: SigningStepManager): Promise<OrderPostingResult>;
+}
+/**
+ * Solana counterpart to `TradingSdk`. Unlike the EVM SDK, which gets its signer implicitly from a global
+ * adapter set once at app startup, Solana has no such adapter — so the signer is passed to
+ * `postSwapOrderFromQuote` at the point of signing. Quoting therefore needs no signer at all, which also
+ * lets a caller quote and then bundle the order instruction itself via `buildOrder`.
  */
 declare class SolanaTradingSdk {
     private readonly options;
-    constructor(options: SolanaTradingSdkOptions);
-    getQuote(params: SolanaQuoteParameters): Promise<QuoteAndPost>;
+    constructor(options?: SolanaTradingSdkOptions);
+    getQuote(params: SolanaQuoteParameters): Promise<SolanaQuoteAndPost>;
 }
 
-export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteParameters, type SolanaSignAndSend, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, encodeOrderIntent, findOrderPda, findSettlementStatePda, getSettlementSeed, getSolanaDelegateAuthority, getSolanaQuote, getSolanaSettlementProgramId, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex, toOrderId };
+export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteAndPost, type SolanaQuoteParameters, type SolanaSignAndSend, type SolanaSwapOrder, type SolanaSwapOrderQuote, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, buildSolanaSwapOrder, encodeOrderIntent, findOrderPda, findSettlementStatePda, getSettlementSeed, getSolanaDelegateAuthority, getSolanaQuote, getSolanaSettlementProgramId, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex, toOrderId };

package/dist/index.js

@@ -25,6 +25,7 @@ __export(src_exports, {
   ORDER_SEED: () => ORDER_SEED,
   SolanaTradingSdk: () => SolanaTradingSdk,
   buildCreateOrderInstruction: () => buildCreateOrderInstruction,
+  buildSolanaSwapOrder: () => buildSolanaSwapOrder,
   encodeOrderIntent: () => encodeOrderIntent,
   findOrderPda: () => findOrderPda,
   findSettlementStatePda: () => findSettlementStatePda,
@@ -206,9 +207,20 @@ function isJupiterOrderResponse(body, request) {
 }
 
 // src/getSolanaQuote.ts
-var import_web34 = require("@solana/web3.js");
+var import_web35 = require("@solana/web3.js");
 var import_spl_token = require("@solana/spl-token");
 var import_sdk_order_book2 = require("@cowprotocol/sdk-order-book");
+
+// src/splMint.ts
+var import_web34 = require("@solana/web3.js");
+var import_sdk_config3 = require("@cowprotocol/sdk-config");
+var NATIVE_SOL_MINT = new import_web34.PublicKey(import_sdk_config3.SOL_NATIVE_CURRENCY_ADDRESS);
+var WSOL_MINT = new import_web34.PublicKey(import_sdk_config3.WRAPPED_NATIVE_CURRENCIES[import_sdk_config3.SupportedChainId.SOLANA].address);
+function toSplMint(mint) {
+  return mint.equals(NATIVE_SOL_MINT) ? WSOL_MINT : mint;
+}
+
+// src/getSolanaQuote.ts
 var DEFAULT_VALID_FOR_SECONDS = 30 * 60;
 var ZERO_APP_DATA = new Uint8Array(32);
 var jupiterApi = new JupiterAPI();
@@ -228,12 +240,13 @@ async function getSolanaQuote(params, options = {}) {
   if (!Number.isFinite(validForSeconds) || validForSeconds <= 0) {
     throw new Error("validForSeconds must be a finite number greater than zero");
   }
-  const owner = new import_web34.PublicKey(ownerAddress);
-  const receiver = new import_web34.PublicKey(receiverAddress);
-  const sellMint = new import_web34.PublicKey(params.sellTokenAddress);
-  const buyMint = new import_web34.PublicKey(params.buyTokenAddress);
-  const sellTokenProgram = sellTokenProgramId ? new import_web34.PublicKey(sellTokenProgramId) : void 0;
-  const buyTokenProgram = buyTokenProgramId ? new import_web34.PublicKey(buyTokenProgramId) : void 0;
+  const owner = new import_web35.PublicKey(ownerAddress);
+  const receiver = new import_web35.PublicKey(receiverAddress);
+  const requestedSellMint = new import_web35.PublicKey(params.sellTokenAddress);
+  const sellMint = toSplMint(requestedSellMint);
+  const buyMint = new import_web35.PublicKey(params.buyTokenAddress);
+  const sellTokenProgram = sellTokenProgramId ? new import_web35.PublicKey(sellTokenProgramId) : void 0;
+  const buyTokenProgram = buyTokenProgramId ? new import_web35.PublicKey(buyTokenProgramId) : void 0;
   const sellTokenAddress = sellMint.toBase58();
   const buyTokenAddress = buyMint.toBase58();
   const jupiterOrder = await jupiterApi.getOrder({
@@ -303,7 +316,10 @@ async function getSolanaQuote(params, options = {}) {
   const tradeParameters = {
     kind,
     owner: owner.toBase58(),
-    sellToken: sellTokenAddress,
+    // The mint the caller asked for, not the substituted one: callers compare the returned parameters
+    // against the ones they passed to decide whether a quote is still current, and reporting WSOL for a
+    // native-SOL request would read as a changed sell token and requote forever.
+    sellToken: requestedSellMint.toBase58(),
     sellTokenDecimals,
     buyToken: buyTokenAddress,
     buyTokenDecimals,
@@ -324,11 +340,11 @@ async function getSolanaQuote(params, options = {}) {
   return { quoteResults, solanaQuote };
 }
 
-// src/postSwapOrderFromQuote.ts
-var import_spl_token2 = require("@solana/spl-token");
+// src/buildSwapOrder.ts
 var import_sdk_order_book3 = require("@cowprotocol/sdk-order-book");
-var import_web35 = require("@solana/web3.js");
-async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signAndSend, advancedSettings, signingStepManager) {
+var import_spl_token2 = require("@solana/spl-token");
+var import_web36 = require("@solana/web3.js");
+async function buildSolanaSwapOrder({ quoteResults, solanaQuote }, advancedSettings) {
   const intent = { ...solanaQuote.intent };
   let uid = solanaQuote.uid;
   let orderPda = solanaQuote.orderPda;
@@ -337,7 +353,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     if (receiver) {
       intent.buyTokenAccount = (0, import_spl_token2.getAssociatedTokenAddressSync)(
         intent.buyMint,
-        new import_web35.PublicKey(receiver),
+        new import_web36.PublicKey(receiver),
         false,
         solanaQuote.buyTokenProgramId
       );
@@ -357,29 +373,44 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     orderPda,
     intent
   });
+  return {
+    instruction,
+    orderId: toOrderId(uid),
+    uid,
+    orderPda,
+    intent,
+    signingScheme: import_sdk_order_book3.SigningScheme.PRESIGN,
+    orderToSign: quoteResults.orderToSign
+  };
+}
+
+// src/postSwapOrderFromQuote.ts
+async function postSolanaSwapOrderFromQuote(quote, signAndSend, advancedSettings, signingStepManager) {
+  const { instruction, orderId, signingScheme, orderToSign } = await buildSolanaSwapOrder(quote, advancedSettings);
   await signingStepManager?.beforeOrderSign?.();
   const { signature } = await signAndSend(instruction);
   await signingStepManager?.afterOrderSign?.();
-  const orderToSign = quoteResults.orderToSign;
   return {
-    orderId: toOrderId(uid),
+    orderId,
     txHash: signature,
     signature,
-    signingScheme: import_sdk_order_book3.SigningScheme.PRESIGN,
+    signingScheme,
     orderToSign
   };
 }
 
 // src/solanaTradingSdk.ts
 var SolanaTradingSdk = class {
-  constructor(options) {
+  constructor(options = {}) {
     this.options = options;
   }
   async getQuote(params) {
     const quote = await getSolanaQuote(params, { env: this.options.env });
     return {
       quoteResults: quote.quoteResults,
-      postSwapOrderFromQuote: (advancedSettings, signingStepManager) => postSolanaSwapOrderFromQuote(quote, this.options.signAndSend, advancedSettings, signingStepManager)
+      solanaQuote: quote.solanaQuote,
+      buildOrder: (advancedSettings) => buildSolanaSwapOrder(quote, advancedSettings),
+      postSwapOrderFromQuote: (signAndSend, advancedSettings, signingStepManager) => postSolanaSwapOrderFromQuote(quote, signAndSend, advancedSettings, signingStepManager)
     };
   }
 };
@@ -390,6 +421,7 @@ var SolanaTradingSdk = class {
   ORDER_SEED,
   SolanaTradingSdk,
   buildCreateOrderInstruction,
+  buildSolanaSwapOrder,
   encodeOrderIntent,
   findOrderPda,
   findSettlementStatePda,

package/dist/index.mjs

@@ -168,9 +168,20 @@ function isJupiterOrderResponse(body, request) {
 }
 
 // src/getSolanaQuote.ts
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 import { getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { getQuoteAmountsAndCosts, OrderKind as OrderKind2 } from "@cowprotocol/sdk-order-book";
+
+// src/splMint.ts
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { SOL_NATIVE_CURRENCY_ADDRESS, SupportedChainId, WRAPPED_NATIVE_CURRENCIES } from "@cowprotocol/sdk-config";
+var NATIVE_SOL_MINT = new PublicKey4(SOL_NATIVE_CURRENCY_ADDRESS);
+var WSOL_MINT = new PublicKey4(WRAPPED_NATIVE_CURRENCIES[SupportedChainId.SOLANA].address);
+function toSplMint(mint) {
+  return mint.equals(NATIVE_SOL_MINT) ? WSOL_MINT : mint;
+}
+
+// src/getSolanaQuote.ts
 var DEFAULT_VALID_FOR_SECONDS = 30 * 60;
 var ZERO_APP_DATA = new Uint8Array(32);
 var jupiterApi = new JupiterAPI();
@@ -190,12 +201,13 @@ async function getSolanaQuote(params, options = {}) {
   if (!Number.isFinite(validForSeconds) || validForSeconds <= 0) {
     throw new Error("validForSeconds must be a finite number greater than zero");
   }
-  const owner = new PublicKey4(ownerAddress);
-  const receiver = new PublicKey4(receiverAddress);
-  const sellMint = new PublicKey4(params.sellTokenAddress);
-  const buyMint = new PublicKey4(params.buyTokenAddress);
-  const sellTokenProgram = sellTokenProgramId ? new PublicKey4(sellTokenProgramId) : void 0;
-  const buyTokenProgram = buyTokenProgramId ? new PublicKey4(buyTokenProgramId) : void 0;
+  const owner = new PublicKey5(ownerAddress);
+  const receiver = new PublicKey5(receiverAddress);
+  const requestedSellMint = new PublicKey5(params.sellTokenAddress);
+  const sellMint = toSplMint(requestedSellMint);
+  const buyMint = new PublicKey5(params.buyTokenAddress);
+  const sellTokenProgram = sellTokenProgramId ? new PublicKey5(sellTokenProgramId) : void 0;
+  const buyTokenProgram = buyTokenProgramId ? new PublicKey5(buyTokenProgramId) : void 0;
   const sellTokenAddress = sellMint.toBase58();
   const buyTokenAddress = buyMint.toBase58();
   const jupiterOrder = await jupiterApi.getOrder({
@@ -265,7 +277,10 @@ async function getSolanaQuote(params, options = {}) {
   const tradeParameters = {
     kind,
     owner: owner.toBase58(),
-    sellToken: sellTokenAddress,
+    // The mint the caller asked for, not the substituted one: callers compare the returned parameters
+    // against the ones they passed to decide whether a quote is still current, and reporting WSOL for a
+    // native-SOL request would read as a changed sell token and requote forever.
+    sellToken: requestedSellMint.toBase58(),
     sellTokenDecimals,
     buyToken: buyTokenAddress,
     buyTokenDecimals,
@@ -286,11 +301,11 @@ async function getSolanaQuote(params, options = {}) {
   return { quoteResults, solanaQuote };
 }
 
-// src/postSwapOrderFromQuote.ts
-import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2 } from "@solana/spl-token";
+// src/buildSwapOrder.ts
 import { SigningScheme } from "@cowprotocol/sdk-order-book";
-import { PublicKey as PublicKey5 } from "@solana/web3.js";
-async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signAndSend, advancedSettings, signingStepManager) {
+import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2 } from "@solana/spl-token";
+import { PublicKey as PublicKey6 } from "@solana/web3.js";
+async function buildSolanaSwapOrder({ quoteResults, solanaQuote }, advancedSettings) {
   const intent = { ...solanaQuote.intent };
   let uid = solanaQuote.uid;
   let orderPda = solanaQuote.orderPda;
@@ -299,7 +314,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     if (receiver) {
       intent.buyTokenAccount = getAssociatedTokenAddressSync2(
         intent.buyMint,
-        new PublicKey5(receiver),
+        new PublicKey6(receiver),
         false,
         solanaQuote.buyTokenProgramId
       );
@@ -319,29 +334,44 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     orderPda,
     intent
   });
+  return {
+    instruction,
+    orderId: toOrderId(uid),
+    uid,
+    orderPda,
+    intent,
+    signingScheme: SigningScheme.PRESIGN,
+    orderToSign: quoteResults.orderToSign
+  };
+}
+
+// src/postSwapOrderFromQuote.ts
+async function postSolanaSwapOrderFromQuote(quote, signAndSend, advancedSettings, signingStepManager) {
+  const { instruction, orderId, signingScheme, orderToSign } = await buildSolanaSwapOrder(quote, advancedSettings);
   await signingStepManager?.beforeOrderSign?.();
   const { signature } = await signAndSend(instruction);
   await signingStepManager?.afterOrderSign?.();
-  const orderToSign = quoteResults.orderToSign;
   return {
-    orderId: toOrderId(uid),
+    orderId,
     txHash: signature,
     signature,
-    signingScheme: SigningScheme.PRESIGN,
+    signingScheme,
     orderToSign
   };
 }
 
 // src/solanaTradingSdk.ts
 var SolanaTradingSdk = class {
-  constructor(options) {
+  constructor(options = {}) {
     this.options = options;
   }
   async getQuote(params) {
     const quote = await getSolanaQuote(params, { env: this.options.env });
     return {
       quoteResults: quote.quoteResults,
-      postSwapOrderFromQuote: (advancedSettings, signingStepManager) => postSolanaSwapOrderFromQuote(quote, this.options.signAndSend, advancedSettings, signingStepManager)
+      solanaQuote: quote.solanaQuote,
+      buildOrder: (advancedSettings) => buildSolanaSwapOrder(quote, advancedSettings),
+      postSwapOrderFromQuote: (signAndSend, advancedSettings, signingStepManager) => postSolanaSwapOrderFromQuote(quote, signAndSend, advancedSettings, signingStepManager)
     };
   }
 };
@@ -351,6 +381,7 @@ export {
   ORDER_SEED,
   SolanaTradingSdk,
   buildCreateOrderInstruction,
+  buildSolanaSwapOrder,
   encodeOrderIntent,
   findOrderPda,
   findSettlementStatePda,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/sdk-trading-solana",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "CowProtocol Solana trading: Jupiter-sourced quotes and on-chain CreateOrder posting against the Solana settlement program",
   "repository": {
     "type": "git",
@@ -27,21 +27,21 @@
     "access": "public"
   },
   "devDependencies": {
+    "@cow-sdk/typescript-config": "0.0.0-beta.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.17.31",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "jest": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
-    "ts-jest": "^29.0.0",
-    "@cow-sdk/typescript-config": "0.0.0-beta.0"
+    "ts-jest": "^29.0.0"
   },
   "dependencies": {
-    "@solana/spl-token": "0.4.14",
-    "@solana/web3.js": "1.98.4",
-    "@cowprotocol/sdk-trading": "2.4.1",
     "@cowprotocol/sdk-config": "2.6.0",
-    "@cowprotocol/sdk-order-book": "4.0.4"
+    "@cowprotocol/sdk-order-book": "4.0.4",
+    "@cowprotocol/sdk-trading": "2.4.1",
+    "@solana/spl-token": "0.4.14",
+    "@solana/web3.js": "1.98.4"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",