@cowprotocol/sdk-bridging 1.4.0 → 1.5.0

package/dist/index.d.mts

@@ -1272,6 +1272,7 @@ interface GetAttestationResponse {
 }
 declare class NearIntentsApi {
     private cachedTokens;
+    constructor(apiKey?: string);
     getTokens(): Promise<TokenResponse[]>;
     getQuote(request: QuoteRequest): Promise<QuoteResponse>;
     getStatus(depositAddress: string): Promise<GetExecutionStatusResponse>;
@@ -1291,6 +1292,7 @@ interface NearIntentsQuoteResult extends BridgeQuoteResult {
 }
 interface NearIntentsBridgeProviderOptions {
     cowShedOptions?: CowShedSdkOptions;
+    apiKey?: string;
 }
 declare class NearIntentsBridgeProvider implements ReceiverAccountBridgeProvider<NearIntentsQuoteResult> {
     type: "ReceiverAccountBridgeProvider";

package/dist/index.d.ts

@@ -1272,6 +1272,7 @@ interface GetAttestationResponse {
 }
 declare class NearIntentsApi {
     private cachedTokens;
+    constructor(apiKey?: string);
     getTokens(): Promise<TokenResponse[]>;
     getQuote(request: QuoteRequest): Promise<QuoteResponse>;
     getStatus(depositAddress: string): Promise<GetExecutionStatusResponse>;
@@ -1291,6 +1292,7 @@ interface NearIntentsQuoteResult extends BridgeQuoteResult {
 }
 interface NearIntentsBridgeProviderOptions {
     cowShedOptions?: CowShedSdkOptions;
+    apiKey?: string;
 }
 declare class NearIntentsBridgeProvider implements ReceiverAccountBridgeProvider<NearIntentsQuoteResult> {
     type: "ReceiverAccountBridgeProvider";

package/dist/index.js

@@ -383,7 +383,7 @@ function isCorrelatedToken(tokenAddress, correlatedTokens) {
 }
 
 // src/BridgingSdk/determineIntermediateToken.ts
-async function determineIntermediateToken(sourceChainId, sourceTokenAddress, intermediateTokens, getCorrelatedTokens) {
+async function determineIntermediateToken(sourceChainId, sourceTokenAddress, intermediateTokens, getCorrelatedTokens, allowIntermediateEqSellToken) {
   const firstToken = intermediateTokens[0];
   if (intermediateTokens.length === 0 || !firstToken) {
     throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens });
@@ -394,7 +394,8 @@ async function determineIntermediateToken(sourceChainId, sourceTokenAddress, int
   const correlatedTokens = await resolveCorrelatedTokens(sourceChainId, getCorrelatedTokens);
   const sellTokenLike = { chainId: sourceChainId, address: sourceTokenAddress };
   const isSellNativeOrWrapped = (0, import_sdk_common3.isNativeToken)(sellTokenLike) || (0, import_sdk_common3.isWrappedNativeToken)(sellTokenLike);
-  const tokensWithPriority = intermediateTokens.map((token) => {
+  const filteredTokens = allowIntermediateEqSellToken ? intermediateTokens : intermediateTokens.filter((token) => !(0, import_sdk_common3.areAddressesEqual)(token.address, sourceTokenAddress));
+  const tokensWithPriority = filteredTokens.map((token) => {
     const isNativeOrWrapped = (0, import_sdk_common3.isNativeToken)(token) || (0, import_sdk_common3.isWrappedNativeToken)(token);
     if ((0, import_sdk_common3.areAddressesEqual)(token.address, sourceTokenAddress)) {
       if (!(isSellNativeOrWrapped && isNativeOrWrapped)) {
@@ -416,11 +417,11 @@ async function determineIntermediateToken(sourceChainId, sourceTokenAddress, int
     if (a.priority !== b.priority) {
       return b.priority - a.priority;
     }
-    return intermediateTokens.indexOf(a.token) - intermediateTokens.indexOf(b.token);
+    return filteredTokens.indexOf(a.token) - filteredTokens.indexOf(b.token);
   });
   const result = tokensWithPriority[0]?.token;
   if (!result) {
-    throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens });
+    throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens: filteredTokens });
   }
   return result;
 }
@@ -445,7 +446,7 @@ async function getIntermediateSwapResult({
   params,
   getBridgeHook
 }) {
-  const { swapAndBridgeRequest, advancedSettings, tradingSdk } = params;
+  const { swapAndBridgeRequest, advancedSettings, tradingSdk, allowIntermediateEqSellToken } = params;
   const {
     kind,
     sellTokenChainId,
@@ -469,7 +470,8 @@ async function getIntermediateSwapResult({
     sellTokenChainId,
     sellTokenAddress,
     intermediateTokens,
-    params.advancedSettings?.getCorrelatedTokens
+    params.advancedSettings?.getCorrelatedTokens,
+    allowIntermediateEqSellToken
   );
   (0, import_sdk_common4.log)(`Using ${intermediateToken?.name ?? intermediateToken?.address} as intermediate tokens`);
   const bridgeRequestWithoutAmount = {
@@ -885,7 +887,8 @@ var SingleQuoteStrategy = class extends BaseSingleQuoteStrategy {
         swapAndBridgeRequest: quoteBridgeRequest,
         advancedSettings,
         tradingSdk,
-        quoteSigner: advancedSettings?.quoteSigner
+        quoteSigner: advancedSettings?.quoteSigner,
+        allowIntermediateEqSellToken: advancedSettings?.allowIntermediateEqSellToken
       };
       const request2 = this.intermediateTokensCache ? {
         ...baseParams,
@@ -1021,7 +1024,8 @@ async function fetchMultiQuote(context, tradingSdk, intermediateTokensCache) {
     swapAndBridgeRequest: quoteBridgeRequest,
     advancedSettings,
     tradingSdk,
-    quoteSigner: advancedSettings?.quoteSigner
+    quoteSigner: advancedSettings?.quoteSigner,
+    allowIntermediateEqSellToken: advancedSettings?.allowIntermediateEqSellToken
   };
   const request = intermediateTokensCache ? {
     ...baseParams,
@@ -4976,6 +4980,11 @@ var import_one_click_sdk_typescript2 = require("@defuse-protocol/one-click-sdk-t
 var import_one_click_sdk_typescript = require("@defuse-protocol/one-click-sdk-typescript");
 var NearIntentsApi = class {
   cachedTokens = [];
+  constructor(apiKey) {
+    if (apiKey) {
+      import_one_click_sdk_typescript.OpenAPI.TOKEN = apiKey;
+    }
+  }
   async getTokens() {
     if (this.cachedTokens.length === 0) {
       const response = await import_one_click_sdk_typescript.OneClickService.getTokens();
@@ -5005,11 +5014,15 @@ var NearIntentsApi = class {
     return await import_one_click_sdk_typescript.OneClickService.getExecutionStatus(depositAddress);
   }
   async getAttestation(request) {
+    const headers = {
+      "Content-Type": "application/json"
+    };
+    if (import_one_click_sdk_typescript.OpenAPI.TOKEN) {
+      headers["Authorization"] = `Bearer ${import_one_click_sdk_typescript.OpenAPI.TOKEN}`;
+    }
     const response = await fetch(`${import_one_click_sdk_typescript.OpenAPI.BASE}/v0/attestation`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
+      headers,
       body: JSON.stringify(request)
     });
     if (!response.ok) {
@@ -5168,7 +5181,7 @@ var NearIntentsBridgeProvider = class {
     if (adapter) {
       (0, import_sdk_common18.setGlobalAdapter)(adapter);
     }
-    this.api = new NearIntentsApi();
+    this.api = new NearIntentsApi(options?.apiKey);
     this.cowShedSdk = new import_sdk_cow_shed3.CowShedSdk(adapter, options?.cowShedOptions?.factoryOptions);
   }
   async getNetworks() {

package/dist/index.mjs

@@ -326,7 +326,7 @@ function isCorrelatedToken(tokenAddress, correlatedTokens) {
 }
 
 // src/BridgingSdk/determineIntermediateToken.ts
-async function determineIntermediateToken(sourceChainId, sourceTokenAddress, intermediateTokens, getCorrelatedTokens) {
+async function determineIntermediateToken(sourceChainId, sourceTokenAddress, intermediateTokens, getCorrelatedTokens, allowIntermediateEqSellToken) {
   const firstToken = intermediateTokens[0];
   if (intermediateTokens.length === 0 || !firstToken) {
     throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens });
@@ -337,7 +337,8 @@ async function determineIntermediateToken(sourceChainId, sourceTokenAddress, int
   const correlatedTokens = await resolveCorrelatedTokens(sourceChainId, getCorrelatedTokens);
   const sellTokenLike = { chainId: sourceChainId, address: sourceTokenAddress };
   const isSellNativeOrWrapped = isNativeToken(sellTokenLike) || isWrappedNativeToken(sellTokenLike);
-  const tokensWithPriority = intermediateTokens.map((token) => {
+  const filteredTokens = allowIntermediateEqSellToken ? intermediateTokens : intermediateTokens.filter((token) => !areAddressesEqual(token.address, sourceTokenAddress));
+  const tokensWithPriority = filteredTokens.map((token) => {
     const isNativeOrWrapped = isNativeToken(token) || isWrappedNativeToken(token);
     if (areAddressesEqual(token.address, sourceTokenAddress)) {
       if (!(isSellNativeOrWrapped && isNativeOrWrapped)) {
@@ -359,11 +360,11 @@ async function determineIntermediateToken(sourceChainId, sourceTokenAddress, int
     if (a.priority !== b.priority) {
       return b.priority - a.priority;
     }
-    return intermediateTokens.indexOf(a.token) - intermediateTokens.indexOf(b.token);
+    return filteredTokens.indexOf(a.token) - filteredTokens.indexOf(b.token);
   });
   const result = tokensWithPriority[0]?.token;
   if (!result) {
-    throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens });
+    throw new BridgeProviderQuoteError("NO_INTERMEDIATE_TOKENS" /* NO_INTERMEDIATE_TOKENS */, { intermediateTokens: filteredTokens });
   }
   return result;
 }
@@ -388,7 +389,7 @@ async function getIntermediateSwapResult({
   params,
   getBridgeHook
 }) {
-  const { swapAndBridgeRequest, advancedSettings, tradingSdk } = params;
+  const { swapAndBridgeRequest, advancedSettings, tradingSdk, allowIntermediateEqSellToken } = params;
   const {
     kind,
     sellTokenChainId,
@@ -412,7 +413,8 @@ async function getIntermediateSwapResult({
     sellTokenChainId,
     sellTokenAddress,
     intermediateTokens,
-    params.advancedSettings?.getCorrelatedTokens
+    params.advancedSettings?.getCorrelatedTokens,
+    allowIntermediateEqSellToken
   );
   log2(`Using ${intermediateToken?.name ?? intermediateToken?.address} as intermediate tokens`);
   const bridgeRequestWithoutAmount = {
@@ -828,7 +830,8 @@ var SingleQuoteStrategy = class extends BaseSingleQuoteStrategy {
         swapAndBridgeRequest: quoteBridgeRequest,
         advancedSettings,
         tradingSdk,
-        quoteSigner: advancedSettings?.quoteSigner
+        quoteSigner: advancedSettings?.quoteSigner,
+        allowIntermediateEqSellToken: advancedSettings?.allowIntermediateEqSellToken
       };
       const request2 = this.intermediateTokensCache ? {
         ...baseParams,
@@ -964,7 +967,8 @@ async function fetchMultiQuote(context, tradingSdk, intermediateTokensCache) {
     swapAndBridgeRequest: quoteBridgeRequest,
     advancedSettings,
     tradingSdk,
-    quoteSigner: advancedSettings?.quoteSigner
+    quoteSigner: advancedSettings?.quoteSigner,
+    allowIntermediateEqSellToken: advancedSettings?.allowIntermediateEqSellToken
   };
   const request = intermediateTokensCache ? {
     ...baseParams,
@@ -4934,6 +4938,11 @@ import { QuoteRequest } from "@defuse-protocol/one-click-sdk-typescript";
 import { ApiError, OneClickService, OpenAPI } from "@defuse-protocol/one-click-sdk-typescript";
 var NearIntentsApi = class {
   cachedTokens = [];
+  constructor(apiKey) {
+    if (apiKey) {
+      OpenAPI.TOKEN = apiKey;
+    }
+  }
   async getTokens() {
     if (this.cachedTokens.length === 0) {
       const response = await OneClickService.getTokens();
@@ -4963,11 +4972,15 @@ var NearIntentsApi = class {
     return await OneClickService.getExecutionStatus(depositAddress);
   }
   async getAttestation(request) {
+    const headers = {
+      "Content-Type": "application/json"
+    };
+    if (OpenAPI.TOKEN) {
+      headers["Authorization"] = `Bearer ${OpenAPI.TOKEN}`;
+    }
     const response = await fetch(`${OpenAPI.BASE}/v0/attestation`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
+      headers,
       body: JSON.stringify(request)
     });
     if (!response.ok) {
@@ -5126,7 +5139,7 @@ var NearIntentsBridgeProvider = class {
     if (adapter) {
       setGlobalAdapter4(adapter);
     }
-    this.api = new NearIntentsApi();
+    this.api = new NearIntentsApi(options?.apiKey);
     this.cowShedSdk = new CowShedSdk3(adapter, options?.cowShedOptions?.factoryOptions);
   }
   async getNetworks() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/sdk-bridging",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Bridging for CoW Protocol",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -16,14 +16,14 @@
   "dependencies": {
     "@defuse-protocol/one-click-sdk-typescript": "0.1.1-0.2",
     "json-stable-stringify": "^1.3.0",
-    "@cowprotocol/sdk-app-data": "4.5.1",
     "@cowprotocol/sdk-common": "0.5.0",
+    "@cowprotocol/sdk-app-data": "4.5.1",
     "@cowprotocol/sdk-config": "0.6.3",
-    "@cowprotocol/sdk-contracts-ts": "1.1.0",
+    "@cowprotocol/sdk-contracts-ts": "1.2.0",
     "@cowprotocol/sdk-order-book": "0.5.1",
-    "@cowprotocol/sdk-cow-shed": "0.2.10",
-    "@cowprotocol/sdk-weiroll": "0.1.12",
-    "@cowprotocol/sdk-trading": "0.8.1"
+    "@cowprotocol/sdk-cow-shed": "0.2.12",
+    "@cowprotocol/sdk-trading": "0.9.0",
+    "@cowprotocol/sdk-weiroll": "0.1.12"
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
@@ -40,7 +40,7 @@
     "viem": "^2.28.4",
     "@cow-sdk/typescript-config": "0.0.0-beta.0",
     "@cowprotocol/sdk-ethers-v5-adapter": "0.3.1",
-    "@cowprotocol/sdk-order-signing": "0.1.24",
+    "@cowprotocol/sdk-order-signing": "0.1.26",
     "@cowprotocol/sdk-viem-adapter": "0.3.1",
     "@cowprotocol/sdk-ethers-v6-adapter": "0.3.1"
   },