@cowprotocol/sdk-trading-solana 0.3.0 → 0.4.1

package/dist/index.d.mts

@@ -64,6 +64,12 @@ declare function encodeOrderIntent(intent: SolanaOrderIntent): Uint8Array;
  */
 declare function hashOrderIntent(encoded: Uint8Array): Promise<Uint8Array>;
 declare function toHex(bytes: Uint8Array): string;
+/**
+ * Formats a uid as an order id in the same "0x"-prefixed form the order-book API returns in
+ * `EnrichedOrder.uid` (matching EVM order uids). Code that looks an order up by the API's uid
+ * (reducer batch actions, notifications, etc.) needs this to match whatever id was stored locally.
+ */
+declare function toOrderId(uid: Uint8Array): string;
 
 interface SolanaQuoteParameters {
     ownerAddress: PublicKeyInitData;
@@ -104,18 +110,47 @@ type SolanaSignAndSend = (instruction: TransactionInstruction) => Promise<{
     signature: string;
 }>;
 
-/**
- * Version-embedded seed shared by every settlement-program PDA (`SETTLEMENT_SEED` in
- * cow-settlement-interface). Must be regenerated if `SOLANA_SETTLEMENT_PROGRAM_VERSION` changes.
- */
-declare const SETTLEMENT_SEED: Uint8Array<ArrayBufferLike>;
 /** Trailing seed identifying order PDAs (`ORDER_SEED` in cow-settlement-interface). */
 declare const ORDER_SEED: Uint8Array<ArrayBufferLike>;
 /**
  * Derives the canonical order PDA and bump for an order's `uid`, matching `find_order_pda` in
  * cow-settlement-interface.
+ *
+ * `env` selects the seed version and must describe the same deployment as `programId` — obtain the latter
+ * from `getSolanaSettlementProgramId(env)` rather than pairing them by hand.
+ */
+declare function findOrderPda(programId: PublicKey, uid: Uint8Array, env?: CowEnv): [PublicKey, number];
+
+/**
+ * Version-embedded seed shared by every settlement-program PDA of `env` (`SETTLEMENT_SEED` in
+ * cow-settlement-interface). Keyed by env because the version is a property of a deployment: each env's seed
+ * has to be derived from the version of the program id that env resolves to.
+ *
+ * Returns a copy: the cached seeds are mutable `Uint8Array`s, and a caller writing into one would silently
+ * corrupt every later derivation for that env.
+ */
+declare function getSettlementSeed(env?: CowEnv): Uint8Array;
+
+/** Settlement program id deployed for `env`. */
+declare function getSolanaSettlementProgramId(env?: CowEnv): PublicKey;
+/**
+ * Derives the canonical settlement state PDA and bump, matching `find_state_pda` in
+ * cow-settlement-interface. The env's settlement seed is its only seed, so the address moves with every
+ * major/minor bump of the settlement program.
+ *
+ * `env` selects the seed version and must describe the same deployment as `programId`. Prefer
+ * `getSolanaDelegateAuthority`, which derives both from one env and so cannot mismatch.
+ */
+declare function findSettlementStatePda(programId: PublicKey, env?: CowEnv): [PublicKey, number];
+/**
+ * The SPL delegate a sell-token account has to approve before the settlement program can move its
+ * funds — the Solana analogue of the EVM vault relayer spender.
+ *
+ * This is the settlement state PDA, not the program id: the program signs its token CPIs as that PDA,
+ * so approving anything else yields a delegate that cannot move the funds. Because the PDA seed carries
+ * the program's major/minor version, every delegation has to be renewed after a version bump.
  */
-declare function findOrderPda(programId: PublicKey, uid: Uint8Array): [PublicKey, number];
+declare function getSolanaDelegateAuthority(env?: CowEnv): PublicKey;
 
 interface CreateOrderInstructionParams {
     programId: PublicKey;
@@ -169,4 +204,4 @@ declare class SolanaTradingSdk {
     getQuote(params: SolanaQuoteParameters): Promise<QuoteAndPost>;
 }
 
-export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, SETTLEMENT_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteParameters, type SolanaSignAndSend, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, encodeOrderIntent, findOrderPda, getSolanaQuote, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex };
+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 };

package/dist/index.d.ts

@@ -64,6 +64,12 @@ declare function encodeOrderIntent(intent: SolanaOrderIntent): Uint8Array;
  */
 declare function hashOrderIntent(encoded: Uint8Array): Promise<Uint8Array>;
 declare function toHex(bytes: Uint8Array): string;
+/**
+ * Formats a uid as an order id in the same "0x"-prefixed form the order-book API returns in
+ * `EnrichedOrder.uid` (matching EVM order uids). Code that looks an order up by the API's uid
+ * (reducer batch actions, notifications, etc.) needs this to match whatever id was stored locally.
+ */
+declare function toOrderId(uid: Uint8Array): string;
 
 interface SolanaQuoteParameters {
     ownerAddress: PublicKeyInitData;
@@ -104,18 +110,47 @@ type SolanaSignAndSend = (instruction: TransactionInstruction) => Promise<{
     signature: string;
 }>;
 
-/**
- * Version-embedded seed shared by every settlement-program PDA (`SETTLEMENT_SEED` in
- * cow-settlement-interface). Must be regenerated if `SOLANA_SETTLEMENT_PROGRAM_VERSION` changes.
- */
-declare const SETTLEMENT_SEED: Uint8Array<ArrayBufferLike>;
 /** Trailing seed identifying order PDAs (`ORDER_SEED` in cow-settlement-interface). */
 declare const ORDER_SEED: Uint8Array<ArrayBufferLike>;
 /**
  * Derives the canonical order PDA and bump for an order's `uid`, matching `find_order_pda` in
  * cow-settlement-interface.
+ *
+ * `env` selects the seed version and must describe the same deployment as `programId` — obtain the latter
+ * from `getSolanaSettlementProgramId(env)` rather than pairing them by hand.
+ */
+declare function findOrderPda(programId: PublicKey, uid: Uint8Array, env?: CowEnv): [PublicKey, number];
+
+/**
+ * Version-embedded seed shared by every settlement-program PDA of `env` (`SETTLEMENT_SEED` in
+ * cow-settlement-interface). Keyed by env because the version is a property of a deployment: each env's seed
+ * has to be derived from the version of the program id that env resolves to.
+ *
+ * Returns a copy: the cached seeds are mutable `Uint8Array`s, and a caller writing into one would silently
+ * corrupt every later derivation for that env.
+ */
+declare function getSettlementSeed(env?: CowEnv): Uint8Array;
+
+/** Settlement program id deployed for `env`. */
+declare function getSolanaSettlementProgramId(env?: CowEnv): PublicKey;
+/**
+ * Derives the canonical settlement state PDA and bump, matching `find_state_pda` in
+ * cow-settlement-interface. The env's settlement seed is its only seed, so the address moves with every
+ * major/minor bump of the settlement program.
+ *
+ * `env` selects the seed version and must describe the same deployment as `programId`. Prefer
+ * `getSolanaDelegateAuthority`, which derives both from one env and so cannot mismatch.
+ */
+declare function findSettlementStatePda(programId: PublicKey, env?: CowEnv): [PublicKey, number];
+/**
+ * The SPL delegate a sell-token account has to approve before the settlement program can move its
+ * funds — the Solana analogue of the EVM vault relayer spender.
+ *
+ * This is the settlement state PDA, not the program id: the program signs its token CPIs as that PDA,
+ * so approving anything else yields a delegate that cannot move the funds. Because the PDA seed carries
+ * the program's major/minor version, every delegation has to be renewed after a version bump.
  */
-declare function findOrderPda(programId: PublicKey, uid: Uint8Array): [PublicKey, number];
+declare function getSolanaDelegateAuthority(env?: CowEnv): PublicKey;
 
 interface CreateOrderInstructionParams {
     programId: PublicKey;
@@ -169,4 +204,4 @@ declare class SolanaTradingSdk {
     getQuote(params: SolanaQuoteParameters): Promise<QuoteAndPost>;
 }
 
-export { type CreateOrderInstructionParams, ENCODED_ORDER_INTENT_SIZE, JupiterAPI, type JupiterOrderRequest, type JupiterOrderResponse, ORDER_SEED, SETTLEMENT_SEED, type SolanaOrderIntent, type SolanaQuote, type SolanaQuoteParameters, type SolanaSignAndSend, SolanaTradingSdk, type SolanaTradingSdkOptions, buildCreateOrderInstruction, encodeOrderIntent, findOrderPda, getSolanaQuote, hashOrderIntent, postSolanaSwapOrderFromQuote, toHex };
+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 };

package/dist/index.js

@@ -23,15 +23,19 @@ __export(src_exports, {
   ENCODED_ORDER_INTENT_SIZE: () => ENCODED_ORDER_INTENT_SIZE,
   JupiterAPI: () => JupiterAPI,
   ORDER_SEED: () => ORDER_SEED,
-  SETTLEMENT_SEED: () => SETTLEMENT_SEED,
   SolanaTradingSdk: () => SolanaTradingSdk,
   buildCreateOrderInstruction: () => buildCreateOrderInstruction,
   encodeOrderIntent: () => encodeOrderIntent,
   findOrderPda: () => findOrderPda,
+  findSettlementStatePda: () => findSettlementStatePda,
+  getSettlementSeed: () => getSettlementSeed,
+  getSolanaDelegateAuthority: () => getSolanaDelegateAuthority,
   getSolanaQuote: () => getSolanaQuote,
+  getSolanaSettlementProgramId: () => getSolanaSettlementProgramId,
   hashOrderIntent: () => hashOrderIntent,
   postSolanaSwapOrderFromQuote: () => postSolanaSwapOrderFromQuote,
-  toHex: () => toHex
+  toHex: () => toHex,
+  toOrderId: () => toOrderId
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -88,35 +92,67 @@ async function hashOrderIntent(encoded) {
 function toHex(bytes) {
   return Array.from(bytes).map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
+function toOrderId(uid) {
+  return `0x${toHex(uid)}`;
+}
 
 // src/orderPda.ts
 var import_web3 = require("@solana/web3.js");
+
+// src/settlementSeed.ts
 var import_sdk_config = require("@cowprotocol/sdk-config");
 var SETTLEMENT_SEED_PREFIX = "settlement v";
 var SETTLEMENT_SEED_VERSION_LEN = 7;
-var SETTLEMENT_SEED = new TextEncoder().encode(
-  SETTLEMENT_SEED_PREFIX + import_sdk_config.SOLANA_SETTLEMENT_PROGRAM_VERSION.padEnd(SETTLEMENT_SEED_VERSION_LEN, " ")
-);
+function buildSettlementSeed(version) {
+  if (version.length > SETTLEMENT_SEED_VERSION_LEN) {
+    throw new Error(
+      `Settlement program version "${version}" exceeds the ${SETTLEMENT_SEED_VERSION_LEN}-byte seed field`
+    );
+  }
+  return new TextEncoder().encode(SETTLEMENT_SEED_PREFIX + version.padEnd(SETTLEMENT_SEED_VERSION_LEN, " "));
+}
+var SETTLEMENT_SEEDS = {
+  prod: buildSettlementSeed(import_sdk_config.SOLANA_SETTLEMENT_PROGRAM_VERSION),
+  staging: buildSettlementSeed(import_sdk_config.SOLANA_SETTLEMENT_PROGRAM_VERSION_STAGING)
+};
+function getSettlementSeed(env = "prod") {
+  return SETTLEMENT_SEEDS[env].slice();
+}
+
+// src/orderPda.ts
 var ORDER_SEED = new TextEncoder().encode("order");
-function findOrderPda(programId, uid) {
-  return import_web3.PublicKey.findProgramAddressSync([SETTLEMENT_SEED, uid, ORDER_SEED], programId);
+function findOrderPda(programId, uid, env) {
+  return import_web3.PublicKey.findProgramAddressSync([getSettlementSeed(env), uid, ORDER_SEED], programId);
 }
 
-// src/createOrderInstruction.ts
+// src/statePda.ts
 var import_web32 = require("@solana/web3.js");
+var import_sdk_config2 = require("@cowprotocol/sdk-config");
+function getSolanaSettlementProgramId(env) {
+  return new import_web32.PublicKey(env === "staging" ? import_sdk_config2.SOLANA_SETTLEMENT_PROGRAM_ID_STAGING : import_sdk_config2.SOLANA_SETTLEMENT_PROGRAM_ID);
+}
+function findSettlementStatePda(programId, env) {
+  return import_web32.PublicKey.findProgramAddressSync([getSettlementSeed(env)], programId);
+}
+function getSolanaDelegateAuthority(env) {
+  return findSettlementStatePda(getSolanaSettlementProgramId(env), env)[0];
+}
+
+// src/createOrderInstruction.ts
+var import_web33 = require("@solana/web3.js");
 var CREATE_ORDER_DISCRIMINATOR = 2;
 function buildCreateOrderInstruction(params) {
   const intentBytes = encodeOrderIntent(params.intent);
   const data = Buffer.alloc(1 + intentBytes.length);
   data[0] = CREATE_ORDER_DISCRIMINATOR;
   data.set(intentBytes, 1);
-  return new import_web32.TransactionInstruction({
+  return new import_web33.TransactionInstruction({
     programId: params.programId,
     keys: [
       { pubkey: params.owner, isSigner: true, isWritable: false },
       { pubkey: params.createdBy, isSigner: true, isWritable: true },
       { pubkey: params.orderPda, isSigner: false, isWritable: true },
-      { pubkey: import_web32.SystemProgram.programId, isSigner: false, isWritable: false }
+      { pubkey: import_web33.SystemProgram.programId, isSigner: false, isWritable: false }
     ],
     data
   });
@@ -170,9 +206,8 @@ function isJupiterOrderResponse(body, request) {
 }
 
 // src/getSolanaQuote.ts
-var import_web33 = require("@solana/web3.js");
+var import_web34 = require("@solana/web3.js");
 var import_spl_token = require("@solana/spl-token");
-var import_sdk_config2 = require("@cowprotocol/sdk-config");
 var import_sdk_order_book2 = require("@cowprotocol/sdk-order-book");
 var DEFAULT_VALID_FOR_SECONDS = 30 * 60;
 var ZERO_APP_DATA = new Uint8Array(32);
@@ -193,12 +228,12 @@ 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_web33.PublicKey(ownerAddress);
-  const receiver = new import_web33.PublicKey(receiverAddress);
-  const sellMint = new import_web33.PublicKey(params.sellTokenAddress);
-  const buyMint = new import_web33.PublicKey(params.buyTokenAddress);
-  const sellTokenProgram = sellTokenProgramId ? new import_web33.PublicKey(sellTokenProgramId) : void 0;
-  const buyTokenProgram = buyTokenProgramId ? new import_web33.PublicKey(buyTokenProgramId) : void 0;
+  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 sellTokenAddress = sellMint.toBase58();
   const buyTokenAddress = buyMint.toBase58();
   const jupiterOrder = await jupiterApi.getOrder({
@@ -248,10 +283,8 @@ async function getSolanaQuote(params, options = {}) {
   };
   const intentBytes = encodeOrderIntent(intent);
   const uid = await hashOrderIntent(intentBytes);
-  const programId = new import_web33.PublicKey(
-    options.env === "staging" ? import_sdk_config2.SOLANA_SETTLEMENT_PROGRAM_ID_STAGING : import_sdk_config2.SOLANA_SETTLEMENT_PROGRAM_ID
-  );
-  const [orderPda] = findOrderPda(programId, uid);
+  const programId = getSolanaSettlementProgramId(options.env);
+  const [orderPda] = findOrderPda(programId, uid, options.env);
   const solanaQuote = {
     intent,
     intentBytes,
@@ -294,7 +327,7 @@ async function getSolanaQuote(params, options = {}) {
 // src/postSwapOrderFromQuote.ts
 var import_spl_token2 = require("@solana/spl-token");
 var import_sdk_order_book3 = require("@cowprotocol/sdk-order-book");
-var import_web34 = require("@solana/web3.js");
+var import_web35 = require("@solana/web3.js");
 async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signAndSend, advancedSettings, signingStepManager) {
   const intent = { ...solanaQuote.intent };
   let uid = solanaQuote.uid;
@@ -304,7 +337,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     if (receiver) {
       intent.buyTokenAccount = (0, import_spl_token2.getAssociatedTokenAddressSync)(
         intent.buyMint,
-        new import_web34.PublicKey(receiver),
+        new import_web35.PublicKey(receiver),
         false,
         solanaQuote.buyTokenProgramId
       );
@@ -329,7 +362,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
   await signingStepManager?.afterOrderSign?.();
   const orderToSign = quoteResults.orderToSign;
   return {
-    orderId: toHex(uid),
+    orderId: toOrderId(uid),
     txHash: signature,
     signature,
     signingScheme: import_sdk_order_book3.SigningScheme.PRESIGN,
@@ -355,13 +388,17 @@ var SolanaTradingSdk = class {
   ENCODED_ORDER_INTENT_SIZE,
   JupiterAPI,
   ORDER_SEED,
-  SETTLEMENT_SEED,
   SolanaTradingSdk,
   buildCreateOrderInstruction,
   encodeOrderIntent,
   findOrderPda,
+  findSettlementStatePda,
+  getSettlementSeed,
+  getSolanaDelegateAuthority,
   getSolanaQuote,
+  getSolanaSettlementProgramId,
   hashOrderIntent,
   postSolanaSwapOrderFromQuote,
-  toHex
+  toHex,
+  toOrderId
 });

package/dist/index.mjs

@@ -51,18 +51,53 @@ async function hashOrderIntent(encoded) {
 function toHex(bytes) {
   return Array.from(bytes).map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
+function toOrderId(uid) {
+  return `0x${toHex(uid)}`;
+}
 
 // src/orderPda.ts
 import { PublicKey } from "@solana/web3.js";
-import { SOLANA_SETTLEMENT_PROGRAM_VERSION } from "@cowprotocol/sdk-config";
+
+// src/settlementSeed.ts
+import {
+  SOLANA_SETTLEMENT_PROGRAM_VERSION,
+  SOLANA_SETTLEMENT_PROGRAM_VERSION_STAGING
+} from "@cowprotocol/sdk-config";
 var SETTLEMENT_SEED_PREFIX = "settlement v";
 var SETTLEMENT_SEED_VERSION_LEN = 7;
-var SETTLEMENT_SEED = new TextEncoder().encode(
-  SETTLEMENT_SEED_PREFIX + SOLANA_SETTLEMENT_PROGRAM_VERSION.padEnd(SETTLEMENT_SEED_VERSION_LEN, " ")
-);
+function buildSettlementSeed(version) {
+  if (version.length > SETTLEMENT_SEED_VERSION_LEN) {
+    throw new Error(
+      `Settlement program version "${version}" exceeds the ${SETTLEMENT_SEED_VERSION_LEN}-byte seed field`
+    );
+  }
+  return new TextEncoder().encode(SETTLEMENT_SEED_PREFIX + version.padEnd(SETTLEMENT_SEED_VERSION_LEN, " "));
+}
+var SETTLEMENT_SEEDS = {
+  prod: buildSettlementSeed(SOLANA_SETTLEMENT_PROGRAM_VERSION),
+  staging: buildSettlementSeed(SOLANA_SETTLEMENT_PROGRAM_VERSION_STAGING)
+};
+function getSettlementSeed(env = "prod") {
+  return SETTLEMENT_SEEDS[env].slice();
+}
+
+// src/orderPda.ts
 var ORDER_SEED = new TextEncoder().encode("order");
-function findOrderPda(programId, uid) {
-  return PublicKey.findProgramAddressSync([SETTLEMENT_SEED, uid, ORDER_SEED], programId);
+function findOrderPda(programId, uid, env) {
+  return PublicKey.findProgramAddressSync([getSettlementSeed(env), uid, ORDER_SEED], programId);
+}
+
+// src/statePda.ts
+import { PublicKey as PublicKey2 } from "@solana/web3.js";
+import { SOLANA_SETTLEMENT_PROGRAM_ID, SOLANA_SETTLEMENT_PROGRAM_ID_STAGING } from "@cowprotocol/sdk-config";
+function getSolanaSettlementProgramId(env) {
+  return new PublicKey2(env === "staging" ? SOLANA_SETTLEMENT_PROGRAM_ID_STAGING : SOLANA_SETTLEMENT_PROGRAM_ID);
+}
+function findSettlementStatePda(programId, env) {
+  return PublicKey2.findProgramAddressSync([getSettlementSeed(env)], programId);
+}
+function getSolanaDelegateAuthority(env) {
+  return findSettlementStatePda(getSolanaSettlementProgramId(env), env)[0];
 }
 
 // src/createOrderInstruction.ts
@@ -133,9 +168,8 @@ function isJupiterOrderResponse(body, request) {
 }
 
 // src/getSolanaQuote.ts
-import { PublicKey as PublicKey3 } from "@solana/web3.js";
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
 import { getAssociatedTokenAddressSync } from "@solana/spl-token";
-import { SOLANA_SETTLEMENT_PROGRAM_ID, SOLANA_SETTLEMENT_PROGRAM_ID_STAGING } from "@cowprotocol/sdk-config";
 import { getQuoteAmountsAndCosts, OrderKind as OrderKind2 } from "@cowprotocol/sdk-order-book";
 var DEFAULT_VALID_FOR_SECONDS = 30 * 60;
 var ZERO_APP_DATA = new Uint8Array(32);
@@ -156,12 +190,12 @@ 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 PublicKey3(ownerAddress);
-  const receiver = new PublicKey3(receiverAddress);
-  const sellMint = new PublicKey3(params.sellTokenAddress);
-  const buyMint = new PublicKey3(params.buyTokenAddress);
-  const sellTokenProgram = sellTokenProgramId ? new PublicKey3(sellTokenProgramId) : void 0;
-  const buyTokenProgram = buyTokenProgramId ? new PublicKey3(buyTokenProgramId) : void 0;
+  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 sellTokenAddress = sellMint.toBase58();
   const buyTokenAddress = buyMint.toBase58();
   const jupiterOrder = await jupiterApi.getOrder({
@@ -211,10 +245,8 @@ async function getSolanaQuote(params, options = {}) {
   };
   const intentBytes = encodeOrderIntent(intent);
   const uid = await hashOrderIntent(intentBytes);
-  const programId = new PublicKey3(
-    options.env === "staging" ? SOLANA_SETTLEMENT_PROGRAM_ID_STAGING : SOLANA_SETTLEMENT_PROGRAM_ID
-  );
-  const [orderPda] = findOrderPda(programId, uid);
+  const programId = getSolanaSettlementProgramId(options.env);
+  const [orderPda] = findOrderPda(programId, uid, options.env);
   const solanaQuote = {
     intent,
     intentBytes,
@@ -257,7 +289,7 @@ async function getSolanaQuote(params, options = {}) {
 // src/postSwapOrderFromQuote.ts
 import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2 } from "@solana/spl-token";
 import { SigningScheme } from "@cowprotocol/sdk-order-book";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signAndSend, advancedSettings, signingStepManager) {
   const intent = { ...solanaQuote.intent };
   let uid = solanaQuote.uid;
@@ -267,7 +299,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
     if (receiver) {
       intent.buyTokenAccount = getAssociatedTokenAddressSync2(
         intent.buyMint,
-        new PublicKey4(receiver),
+        new PublicKey5(receiver),
         false,
         solanaQuote.buyTokenProgramId
       );
@@ -292,7 +324,7 @@ async function postSolanaSwapOrderFromQuote({ quoteResults, solanaQuote }, signA
   await signingStepManager?.afterOrderSign?.();
   const orderToSign = quoteResults.orderToSign;
   return {
-    orderId: toHex(uid),
+    orderId: toOrderId(uid),
     txHash: signature,
     signature,
     signingScheme: SigningScheme.PRESIGN,
@@ -317,13 +349,17 @@ export {
   ENCODED_ORDER_INTENT_SIZE,
   JupiterAPI,
   ORDER_SEED,
-  SETTLEMENT_SEED,
   SolanaTradingSdk,
   buildCreateOrderInstruction,
   encodeOrderIntent,
   findOrderPda,
+  findSettlementStatePda,
+  getSettlementSeed,
+  getSolanaDelegateAuthority,
   getSolanaQuote,
+  getSolanaSettlementProgramId,
   hashOrderIntent,
   postSolanaSwapOrderFromQuote,
-  toHex
+  toHex,
+  toOrderId
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/sdk-trading-solana",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "CowProtocol Solana trading: Jupiter-sourced quotes and on-chain CreateOrder posting against the Solana settlement program",
   "repository": {
     "type": "git",
@@ -39,9 +39,9 @@
   "dependencies": {
     "@solana/spl-token": "0.4.14",
     "@solana/web3.js": "1.98.4",
-    "@cowprotocol/sdk-config": "2.5.0",
-    "@cowprotocol/sdk-order-book": "4.0.3",
-    "@cowprotocol/sdk-trading": "2.4.0"
+    "@cowprotocol/sdk-trading": "2.4.1",
+    "@cowprotocol/sdk-config": "2.6.0",
+    "@cowprotocol/sdk-order-book": "4.0.4"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",