@lombard.finance/sdk-solana 2.0.1 → 2.0.2

package/dist/sendBridgeTransaction.cjs

@@ -1 +1 @@
-"use strict";var _=Object.defineProperty;var $=(e,t,s)=>t in e?_(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s;var r=(e,t,s)=>$(e,typeof t!="symbol"?t+"":t,s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./index2.cjs"),j=require("bignumber.js"),v=require("./quoteBridgeFee.cjs");function E(e){return{message:n.fromWeb3JsMessage(e.message),serializedMessage:e.message.serialize(),signatures:e.signatures}}function B(e){return new n.VersionedTransaction(n.toWeb3JsMessage(e.message),e.signatures)}class A extends n.UmiError{constructor(s,i){super(s,"plugin","Wallet Adapters",i);r(this,"name","WalletAdaptersError")}}class V extends A{constructor(){super('The current wallet adapter is not initialized. You likely have selected a wallet adapter but forgot to initialize it. You may do this by running the following asynchronous method: "wallet.connect();".');r(this,"name","UninitializedWalletAdapterError")}}class g extends A{constructor(s){const i=`The current wallet adapter does not support the following operation: [${s}]. Ensure your wallet is connected using a compatible wallet adapter.`;super(i);r(this,"name","OperationNotSupportedByWalletAdapterError")}}const Y=e=>({get publicKey(){if(!e.publicKey)throw new V;return n.fromWeb3JsPublicKey(e.publicKey)},async signMessage(t){if(e.signMessage===void 0)throw new g("signMessage");return e.signMessage(t)},async signTransaction(t){if(e.signTransaction===void 0)throw new g("signTransaction");return E(await e.signTransaction(B(t)))},async signAllTransactions(t){if(e.signAllTransactions===void 0)throw new g("signAllTransactions");const s=t.map(B);return(await e.signAllTransactions(s)).map(E)}}),G=8,H=4e5;async function Q({provider:e,env:t,destinationLzEndpointId:s,amount:i,recipientAddress:d,minAmountLd:k,options:M=new Uint8Array}){if(!e.publicKey)throw new Error("Wallet provider not connected.");if(!e.signTransaction)throw new Error("Wallet provider does not support signing transactions.");if(!s)throw new Error("Destination chain LayerZero Endpoint ID is required.");const a=n.envToNetwork[t],m=n.getRpcEndpoint(a),W=n.getMinimalUmiInstance(m),c=n.getConnection(a,m),f=n.getConfig(t),y=n.getLBTCAddress(a),K=new n.PublicKey(y),S=n.publicKey(f.lzOftAdapter),L=n.publicKey(f.lzEscrow),P=n.publicKey(y),U=n.getAssociatedTokenAddressSync(K,e.publicKey,!1),F=n.publicKey(U.toBase58()),w=new j(i).shiftedBy(G);n.validateBridgeAmount(w);const l=BigInt(w.toFixed(0)),I=k??l*999n/1000n,p=await v.quoteBridgeFee({env:t,provider:e,sendParams:{dstEid:s,to:d,amountLD:Number(l),minAmountLD:1,extraOptions:"",composeMsg:"",oftCmd:""}}),z=p.nativeFee,C=p.lzTokenFee;try{const o=Y({publicKey:e.publicKey,signMessage:async R=>{const{signature:Z}=await e.signMessage(R);return new Uint8Array(Z)},signTransaction:e.signTransaction,signAllTransactions:e.signAllTransactions}),O=n.getRecipientBytes32(d),q=await n.oft302_exports.send(W.rpc,{payer:o,tokenMint:P,tokenEscrow:L,tokenSource:F},{to:O,dstEid:s,amountLd:l,minAmountLd:I,options:M,composeMsg:void 0,nativeFee:BigInt(z),lzTokenFee:BigInt(C)},{oft:S}),x=n.ComputeBudgetProgram.setComputeUnitLimit({units:H}),N=n.toWeb3JsInstruction(q.instruction),{blockhash:T,lastValidBlockHeight:D}=await c.getLatestBlockhash(),u=new n.Transaction().add(x).add(N);u.recentBlockhash=T,u.feePayer=e.publicKey;const J=await e.signTransaction(u),b=await c.sendRawTransaction(J.serialize(),{skipPreflight:!1}),h=await c.confirmTransaction({signature:b,blockhash:T,lastValidBlockHeight:D},"confirmed");if(h.value.err)throw new Error(`Solana transaction failed to confirm: ${JSON.stringify(h.value.err)}`);return b}catch(o){throw o instanceof Error&&X(o),new Error("An unknown error occurred while sending the LayerZero bridge transaction.")}}const X=e=>{throw console.error("Error sending Solana LayerZero transaction:",e),e.message.includes("slippage")||e.message.includes("MinimumAmount")?new Error("Bridge failed due to slippage or minimum amount not met. Please try again or adjust parameters."):e.message.includes("insufficient funds")?new Error("Insufficient SOL balance to cover transaction and bridge fees."):e.message.includes("Readonly Signer")||e.message.includes("identity")?new Error("Wallet connection issue: Readonly signer detected or identity not set. Ensure wallet is fully connected."):new Error(`Failed to send LayerZero bridge transaction: ${e.message}`)};exports.sendBridgeTransaction=Q;
+"use strict";var _=Object.defineProperty;var $=(e,t,s)=>t in e?_(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s;var r=(e,t,s)=>$(e,typeof t!="symbol"?t+"":t,s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./index2.cjs"),j=require("bignumber.js"),V=require("./quoteBridgeFee.cjs");function E(e){return{message:n.fromWeb3JsMessage(e.message),serializedMessage:e.message.serialize(),signatures:e.signatures}}function B(e){return new n.VersionedTransaction(n.toWeb3JsMessage(e.message),e.signatures)}class A extends n.UmiError{constructor(s,i){super(s,"plugin","Wallet Adapters",i);r(this,"name","WalletAdaptersError")}}class Y extends A{constructor(){super('The current wallet adapter is not initialized. You likely have selected a wallet adapter but forgot to initialize it. You may do this by running the following asynchronous method: "wallet.connect();".');r(this,"name","UninitializedWalletAdapterError")}}class u extends A{constructor(s){const i=`The current wallet adapter does not support the following operation: [${s}]. Ensure your wallet is connected using a compatible wallet adapter.`;super(i);r(this,"name","OperationNotSupportedByWalletAdapterError")}}const G=e=>({get publicKey(){if(!e.publicKey)throw new Y;return n.fromWeb3JsPublicKey(e.publicKey)},async signMessage(t){if(e.signMessage===void 0)throw new u("signMessage");return e.signMessage(t)},async signTransaction(t){if(e.signTransaction===void 0)throw new u("signTransaction");return E(await e.signTransaction(B(t)))},async signAllTransactions(t){if(e.signAllTransactions===void 0)throw new u("signAllTransactions");const s=t.map(B);return(await e.signAllTransactions(s)).map(E)}}),H=8,v=4e5;async function Q({provider:e,env:t,destinationLzEndpointId:s,amount:i,recipientAddress:g,minAmountLd:k,options:M=new Uint8Array}){if(!e.publicKey)throw new Error("Wallet provider not connected.");if(!e.signTransaction)throw new Error("Wallet provider does not support signing transactions.");if(!s)throw new Error("Destination chain LayerZero Endpoint ID is required.");const d=n.envToNetwork[t],m=n.getRpcEndpoint(t),W=n.getMinimalUmiInstance(m),a=n.getConnection(d,m,t),f=n.getConfig(t),y=n.getLBTCAddress(d),K=new n.PublicKey(y),S=n.publicKey(f.lzOftAdapter),L=n.publicKey(f.lzEscrow),P=n.publicKey(y),U=n.getAssociatedTokenAddressSync(K,e.publicKey,!1),F=n.publicKey(U.toBase58()),w=new j(i).shiftedBy(H);n.validateBridgeAmount(w);const c=BigInt(w.toFixed(0)),I=k??c*999n/1000n,p=await V.quoteBridgeFee({env:t,provider:e,sendParams:{dstEid:s,to:g,amountLD:Number(c),minAmountLD:1,extraOptions:"",composeMsg:"",oftCmd:""}}),z=p.nativeFee,C=p.lzTokenFee;try{const o=G({publicKey:e.publicKey,signMessage:async R=>{const{signature:Z}=await e.signMessage(R);return new Uint8Array(Z)},signTransaction:e.signTransaction,signAllTransactions:e.signAllTransactions}),O=n.getRecipientBytes32(g),q=await n.oft302_exports.send(W.rpc,{payer:o,tokenMint:P,tokenEscrow:L,tokenSource:F},{to:O,dstEid:s,amountLd:c,minAmountLd:I,options:M,composeMsg:void 0,nativeFee:BigInt(z),lzTokenFee:BigInt(C)},{oft:S}),x=n.ComputeBudgetProgram.setComputeUnitLimit({units:v}),N=n.toWeb3JsInstruction(q.instruction),{blockhash:T,lastValidBlockHeight:D}=await a.getLatestBlockhash(),l=new n.Transaction().add(x).add(N);l.recentBlockhash=T,l.feePayer=e.publicKey;const J=await e.signTransaction(l),b=await a.sendRawTransaction(J.serialize(),{skipPreflight:!1}),h=await a.confirmTransaction({signature:b,blockhash:T,lastValidBlockHeight:D},"confirmed");if(h.value.err)throw new Error(`Solana transaction failed to confirm: ${JSON.stringify(h.value.err)}`);return b}catch(o){throw o instanceof Error&&X(o),new Error("An unknown error occurred while sending the LayerZero bridge transaction.")}}const X=e=>{throw console.error("Error sending Solana LayerZero transaction:",e),e.message.includes("slippage")||e.message.includes("MinimumAmount")?new Error("Bridge failed due to slippage or minimum amount not met. Please try again or adjust parameters."):e.message.includes("insufficient funds")?new Error("Insufficient SOL balance to cover transaction and bridge fees."):e.message.includes("Readonly Signer")||e.message.includes("identity")?new Error("Wallet connection issue: Readonly signer detected or identity not set. Ensure wallet is fully connected."):new Error(`Failed to send LayerZero bridge transaction: ${e.message}`)};exports.sendBridgeTransaction=Q;

package/dist/sendBridgeTransaction.js

@@ -1,12 +1,12 @@
 var q = Object.defineProperty;
 var V = (n, e, t) => e in n ? q(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
 var a = (n, e, t) => V(n, typeof e != "symbol" ? e + "" : e, t);
-import { V as $, t as j, f as v, U as Y, a as G, g as H, b as Q, c as X, d as nn, P as en, p as i, e as tn, v as sn, h as on, o as an, C as rn, i as cn, T as ln, j as un, k as gn } from "./index2.js";
+import { V as $, t as j, f as Y, U as G, a as H, g as v, b as Q, c as X, d as nn, P as en, p as i, e as tn, v as sn, h as on, o as an, C as rn, i as cn, T as ln, j as un, k as gn } from "./index2.js";
 import dn from "bignumber.js";
 import { quoteBridgeFee as mn } from "./quoteBridgeFee.js";
 function E(n) {
   return {
-    message: v(n.message),
+    message: Y(n.message),
     serializedMessage: n.message.serialize(),
     signatures: n.signatures
   };
@@ -14,7 +14,7 @@ function E(n) {
 function A(n) {
   return new $(j(n.message), n.signatures);
 }
-class B extends Y {
+class B extends G {
   constructor(t, s) {
     super(t, "plugin", "Wallet Adapters", s);
     a(this, "name", "WalletAdaptersError");
@@ -26,7 +26,7 @@ class fn extends B {
     a(this, "name", "UninitializedWalletAdapterError");
   }
 }
-class g extends B {
+class u extends B {
   constructor(t) {
     const s = `The current wallet adapter does not support the following operation: [${t}]. Ensure your wallet is connected using a compatible wallet adapter.`;
     super(s);
@@ -37,21 +37,21 @@ const pn = (n) => ({
   get publicKey() {
     if (!n.publicKey)
       throw new fn();
-    return G(n.publicKey);
+    return H(n.publicKey);
   },
   async signMessage(e) {
     if (n.signMessage === void 0)
-      throw new g("signMessage");
+      throw new u("signMessage");
     return n.signMessage(e);
   },
   async signTransaction(e) {
     if (n.signTransaction === void 0)
-      throw new g("signTransaction");
+      throw new u("signTransaction");
     return E(await n.signTransaction(A(e)));
   },
   async signAllTransactions(e) {
     if (n.signAllTransactions === void 0)
-      throw new g("signAllTransactions");
+      throw new u("signAllTransactions");
     const t = e.map(A);
     return (await n.signAllTransactions(t)).map(E);
   }
@@ -61,7 +61,7 @@ async function Bn({
   env: e,
   destinationLzEndpointId: t,
   amount: s,
-  recipientAddress: d,
+  recipientAddress: g,
   minAmountLd: k,
   options: M = new Uint8Array()
 }) {
@@ -71,19 +71,19 @@ async function Bn({
     throw new Error("Wallet provider does not support signing transactions.");
   if (!t)
     throw new Error("Destination chain LayerZero Endpoint ID is required.");
-  const r = un[e], m = H(r), W = Q(m), c = X(r, m), f = gn(e), p = nn(r), K = new en(p), U = i(f.lzOftAdapter), L = i(f.lzEscrow), P = i(p), S = tn(
+  const d = un[e], m = v(e), W = Q(m), r = X(d, m, e), f = gn(e), p = nn(d), K = new en(p), U = i(f.lzOftAdapter), L = i(f.lzEscrow), P = i(p), S = tn(
     K,
     n.publicKey,
     !1
   ), C = i(S.toBase58()), w = new dn(s).shiftedBy(wn);
   sn(w);
-  const l = BigInt(w.toFixed(0)), I = k ?? l * 999n / 1000n, y = await mn({
+  const c = BigInt(w.toFixed(0)), I = k ?? c * 999n / 1000n, y = await mn({
     env: e,
     provider: n,
     sendParams: {
       dstEid: t,
-      to: d,
-      amountLD: Number(l),
+      to: g,
+      amountLD: Number(c),
       minAmountLD: 1,
       extraOptions: "",
       composeMsg: "",
@@ -99,7 +99,7 @@ async function Bn({
       },
       signTransaction: n.signTransaction,
       signAllTransactions: n.signAllTransactions
-    }), x = on(d), N = await an.send(
+    }), x = on(g), N = await an.send(
       W.rpc,
       {
         payer: o,
@@ -110,7 +110,7 @@ async function Bn({
       {
         to: x,
         dstEid: t,
-        amountLd: l,
+        amountLd: c,
         minAmountLd: I,
         options: M,
         composeMsg: void 0,
@@ -124,12 +124,12 @@ async function Bn({
       units: yn
     }), D = cn(
       N.instruction
-    ), { blockhash: T, lastValidBlockHeight: J } = await c.getLatestBlockhash(), u = new ln().add(O).add(D);
-    u.recentBlockhash = T, u.feePayer = n.publicKey;
-    const R = await n.signTransaction(u), h = await c.sendRawTransaction(
+    ), { blockhash: T, lastValidBlockHeight: J } = await r.getLatestBlockhash(), l = new ln().add(O).add(D);
+    l.recentBlockhash = T, l.feePayer = n.publicKey;
+    const R = await n.signTransaction(l), h = await r.sendRawTransaction(
       R.serialize(),
       { skipPreflight: !1 }
-    ), b = await c.confirmTransaction(
+    ), b = await r.confirmTransaction(
       {
         signature: h,
         blockhash: T,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lombard.finance/sdk-solana",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Solana integration for the Lombard SDK - stake BTC and manage LBTC on Solana",
   "exports": {
     ".": {

package/src/bridge/sendBridgeTransaction.ts

@@ -77,9 +77,9 @@ export async function sendBridgeTransaction({
   }
 
   const network = envToNetwork[env];
-  const rpcUrl = getRpcEndpoint(network);
+  const rpcUrl = getRpcEndpoint(env);
   const umi = getMinimalUmiInstance(rpcUrl);
-  const connection = getConnection(network, rpcUrl);
+  const connection = getConnection(network, rpcUrl, env);
   const config = getConfig(env);
   const lbtcMintAddress = getLBTCAddress(network);
   const lbtcMintPublicKey = new Web3PublicKey(lbtcMintAddress);

package/src/const/__tests__/rpcUrls.test.ts

@@ -0,0 +1,73 @@
+import { Env } from '@lombard.finance/sdk-common';
+import { describe, expect, it } from 'vitest';
+
+import { SolanaNetwork } from '../../types/network';
+import { getRpcEndpoint } from '../getConfig';
+import { getRpcUrl, getWsUrl } from '../rpcUrls';
+
+const STAGE_HOST = 'bff.stage.lombard-fi.com';
+const PROD_HOST = 'bff.prod.lombard-fi.com';
+
+describe('Solana BFF env propagation', () => {
+  describe('getRpcUrl', () => {
+    it('uses stage host for non-prod env on mainnet', () => {
+      const url = getRpcUrl(SolanaNetwork.mainnet, Env.stage);
+      expect(url).toContain(STAGE_HOST);
+      expect(url).not.toContain(PROD_HOST);
+      expect(url).toContain('/solana');
+    });
+
+    it('uses prod host for prod env on mainnet', () => {
+      const url = getRpcUrl(SolanaNetwork.mainnet, Env.prod);
+      expect(url).toContain(PROD_HOST);
+      expect(url).toContain('/solana');
+    });
+
+    it('uses stage host for stage env on devnet', () => {
+      const url = getRpcUrl(SolanaNetwork.devnet, Env.stage);
+      expect(url).toContain(STAGE_HOST);
+      expect(url).toContain('/solana_devnet');
+    });
+  });
+
+  describe('getWsUrl', () => {
+    it('uses stage WS host for non-prod env', () => {
+      const url = getWsUrl(SolanaNetwork.mainnet, Env.stage);
+      expect(url.startsWith('wss://')).toBe(true);
+      expect(url).toContain(STAGE_HOST);
+      expect(url).toContain('chain=solana');
+    });
+
+    it('uses prod WS host for prod env', () => {
+      const url = getWsUrl(SolanaNetwork.mainnet, Env.prod);
+      expect(url).toContain(PROD_HOST);
+      expect(url).toContain('chain=solana');
+    });
+
+    it('builds correct devnet WS URL (regression: was using HTTP host)', () => {
+      const url = getWsUrl(SolanaNetwork.devnet, Env.stage);
+      expect(url.startsWith('wss://')).toBe(true);
+      expect(url).toContain('chain=solana_devnet');
+    });
+  });
+
+  describe('getRpcEndpoint(env)', () => {
+    it('routes stage env through stage BFF + devnet segment', () => {
+      const url = getRpcEndpoint(Env.stage);
+      expect(url).toContain(STAGE_HOST);
+      expect(url).not.toContain(PROD_HOST);
+      expect(url).toContain('/solana_devnet');
+    });
+
+    it('routes prod env through prod BFF + mainnet segment', () => {
+      const url = getRpcEndpoint(Env.prod);
+      expect(url).toContain(PROD_HOST);
+      expect(url).toContain('/solana');
+    });
+
+    it('routes dev/ibc env through stage BFF', () => {
+      expect(getRpcEndpoint(Env.dev)).toContain(STAGE_HOST);
+      expect(getRpcEndpoint(Env.ibc)).toContain(STAGE_HOST);
+    });
+  });
+});

package/src/const/errors.ts

@@ -75,4 +75,3 @@ export const CLAIM_REJECTED_ERROR = createSdkError({
   code: ErrorCode.CLAIM_REJECTED,
   message: 'LBTC claim operation was rejected.',
 });
-

package/src/const/getConfig.ts

@@ -1,7 +1,7 @@
 import { Env } from '@lombard.finance/sdk-common';
 
 import { SolanaNetwork } from '../types';
-import { RPC_URLS } from './rpcUrls';
+import { getRpcUrl, RPC_URLS } from './rpcUrls';
 
 /**
  * Default environment
@@ -157,9 +157,12 @@ const devnetConfig: IConfig = {
   ratioOracle: 'LomfreVHrrMrSpv54KCJ6AC1eKL8QbL1Ej28S3gwawa',
   bridge: 'Lom9Em2WzV7gvtttdub9LZSR8gLgtbzFDhFm1zMQRp6',
   lombardTokenPool: 'LomdWAg9hHyz3VrvK5wXTap7o348Ku2QJ2j2H8Etj3C',
-  ledgerChainId: '031f51c4e4cc1dae1c752d2f8fe2ae045da668a13f2e47a465964d630f5ed22e',
-  solanaRoutingChainId: '0259db5080fc2c6d3bcf7ca90712d3c2e5e6c28f27f0dfbb9953bdb0894c03ab',
-  bitcoinRoutingChainId: 'ff000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6',
+  ledgerChainId:
+    '031f51c4e4cc1dae1c752d2f8fe2ae045da668a13f2e47a465964d630f5ed22e',
+  solanaRoutingChainId:
+    '0259db5080fc2c6d3bcf7ca90712d3c2e5e6c28f27f0dfbb9953bdb0894c03ab',
+  bitcoinRoutingChainId:
+    'ff000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6',
 };
 
 const stageConfig: IConfig = {
@@ -209,9 +212,12 @@ const testnetConfig: IConfig = {
   ratioOracle: 'LomWze3gBt8Y7RN3sspuh2jupqAQPUi4tuaLWDnf6CZ',
   bridge: 'LombUtstgyrZUhjvi12hUnm7HG7CxhtanUv6hakuCm4',
   lombardTokenPool: 'Lomi5fKsXdGrrW2M3JRbJx5DnT3zgmSEfYWMUPeNaAB',
-  ledgerChainId: '033bc7baf196ce32b8b9200518df11c35bad882fc6e3b6f45b4a8885f4c1281b',
-  solanaRoutingChainId: '0259db5080fc2c6d3bcf7ca90712d3c2e5e6c28f27f0dfbb9953bdb0894c03ab',
-  bitcoinRoutingChainId: 'ff000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6',
+  ledgerChainId:
+    '033bc7baf196ce32b8b9200518df11c35bad882fc6e3b6f45b4a8885f4c1281b',
+  solanaRoutingChainId:
+    '0259db5080fc2c6d3bcf7ca90712d3c2e5e6c28f27f0dfbb9953bdb0894c03ab',
+  bitcoinRoutingChainId:
+    'ff000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6',
 };
 
 /**
@@ -235,9 +241,12 @@ const prodConfig: IConfig = {
   ratioOracle: 'LomyRmBeQiuqiwcPmr23RRA1SMLAuDEgj5tHHe7rsDn',
   bridge: 'Lomva5kTftuXE8992qRufkaeq3XrXV47qv3C1W9xW6Z',
   lombardTokenPool: 'Lomb8TTCwJKEhZrJ1J8UbsCRjNSf7NNQUEr4qo3dkSk',
-  ledgerChainId: '0387b25e8e61f2ce4838b04795b231f09ee73ffd391da018bef4bc5c4975897b',
-  solanaRoutingChainId: '02296998a6f8e2a784db5d9f95e18fc23f70441a1039446801089879b08c7ef0',
-  bitcoinRoutingChainId: 'ff0000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f',
+  ledgerChainId:
+    '0387b25e8e61f2ce4838b04795b231f09ee73ffd391da018bef4bc5c4975897b',
+  solanaRoutingChainId:
+    '02296998a6f8e2a784db5d9f95e18fc23f70441a1039446801089879b08c7ef0',
+  bitcoinRoutingChainId:
+    'ff0000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f',
 };
 
 /**
@@ -259,9 +268,11 @@ export function getConfig(env: Env = DEFAULT_ENV): IConfig {
 }
 
 /**
- * Get the RPC endpoint for a specific environment or network
- * @param envOrNetwork Environment or SolanaNetwork
- * @returns RPC endpoint
+ * Get the RPC endpoint for a specific environment or network.
+ *
+ * When called with an `Env`, both the BFF host (prod vs stage) and the
+ * Solana network segment are derived from the env, so a stage app never
+ * hits the prod BFF.
  */
 export function getRpcEndpoint(env: Env): string;
 export function getRpcEndpoint(network: SolanaNetwork): string;
@@ -273,8 +284,12 @@ export function getRpcEndpoint(envOrNetwork: Env | SolanaNetwork): string {
     envOrNetwork === 'dev' ||
     envOrNetwork === 'ibc';
 
-  const network = isEnv ? envToNetwork[envOrNetwork] : envOrNetwork;
-  return RPC_URLS[network];
+  if (isEnv) {
+    const env = envOrNetwork;
+    return getRpcUrl(envToNetwork[env], env);
+  }
+
+  return RPC_URLS[envOrNetwork];
 }
 
 /**

package/src/const/rpcUrls.ts

@@ -1,3 +1,4 @@
+import { Env } from '@lombard.finance/sdk-common';
 import { Commitment, Connection } from '@solana/web3.js';
 
 import { SolanaNetwork } from '../types/network';
@@ -11,26 +12,71 @@ export const BFF_WS_URL_PROD = 'wss://bff.prod.lombard-fi.com/multi-rpc/proxy';
 export const BFF_WS_URL_STAGE =
   'wss://bff.stage.lombard-fi.com/multi-rpc/proxy';
 
+const NETWORK_CHAIN_SEGMENT: Record<SolanaNetwork, string> = {
+  [SolanaNetwork.mainnet]: 'solana',
+  [SolanaNetwork.testnet]: 'solana_testnet',
+  [SolanaNetwork.devnet]: 'solana_devnet',
+};
+
+const isProdEnv = (env?: Env): boolean => env === 'prod';
+
+const getBffBaseUrl = (env?: Env): string =>
+  isProdEnv(env) ? BFF_BASE_URL_PROD : BFF_BASE_URL_STAGE;
+
+const getBffWsUrl = (env?: Env): string =>
+  isProdEnv(env) ? BFF_WS_URL_PROD : BFF_WS_URL_STAGE;
+
+/**
+ * Default RPC URL map. Kept for backwards compatibility (Storybook, etc.).
+ * For env-aware URL resolution use {@link getRpcUrl} or {@link getConnection}.
+ */
 export const RPC_URLS: Record<SolanaNetwork, string> = {
   [SolanaNetwork.mainnet]: `${BFF_BASE_URL_PROD}/solana`,
   [SolanaNetwork.testnet]: 'https://api.testnet.solana.com',
-  [SolanaNetwork.devnet]: `${BFF_BASE_URL_PROD}/solana_devnet`,
+  [SolanaNetwork.devnet]: `${BFF_BASE_URL_STAGE}/solana_devnet`,
 };
 
+/**
+ * Default WebSocket URL map. Kept for backwards compatibility.
+ * For env-aware URL resolution use {@link getWsUrl} or {@link getConnection}.
+ */
 export const WS_URLS: Record<SolanaNetwork, string> = {
   [SolanaNetwork.mainnet]: `${BFF_WS_URL_PROD}?chain=solana`,
   [SolanaNetwork.testnet]: 'wss://api.testnet.solana.com',
-  [SolanaNetwork.devnet]: `${BFF_BASE_URL_PROD}?chain=solana_devnet`,
+  [SolanaNetwork.devnet]: `${BFF_WS_URL_STAGE}?chain=solana_devnet`,
 };
 
-export const getRpcUrl = (network: SolanaNetwork) => {
-  return RPC_URLS[network];
+/**
+ * Returns the BFF-proxied RPC URL for a Solana network. When `env` is
+ * provided, the BFF host is selected accordingly (`prod` → bff.prod,
+ * any other env → bff.stage). Public endpoints (testnet) are returned as-is.
+ */
+export const getRpcUrl = (network: SolanaNetwork, env?: Env): string => {
+  if (network === SolanaNetwork.testnet) {
+    return RPC_URLS[network];
+  }
+  return `${getBffBaseUrl(env)}/${NETWORK_CHAIN_SEGMENT[network]}`;
+};
+
+/**
+ * Returns the BFF-proxied WebSocket URL for a Solana network. Same env
+ * selection rules as {@link getRpcUrl}.
+ */
+export const getWsUrl = (network: SolanaNetwork, env?: Env): string => {
+  if (network === SolanaNetwork.testnet) {
+    return WS_URLS[network];
+  }
+  return `${getBffWsUrl(env)}?chain=${NETWORK_CHAIN_SEGMENT[network]}`;
 };
 
-export const getConnection = (network: SolanaNetwork, rpcUrl?: string) => {
-  return new Connection(rpcUrl || RPC_URLS[network], {
+export const getConnection = (
+  network: SolanaNetwork,
+  rpcUrl?: string,
+  env?: Env,
+) => {
+  return new Connection(rpcUrl || getRpcUrl(network, env), {
     commitment: 'confirmed',
-    wsEndpoint: WS_URLS[network],
+    wsEndpoint: getWsUrl(network, env),
   });
 };