@cowprotocol/sdk-bridging 4.1.1 → 4.1.3

package/dist/index.d.mts

@@ -1280,6 +1280,7 @@ interface GetAttestationResponse {
     version: number;
 }
 declare class NearIntentsApi {
+    private static readonly DEPRECATED_ASSET_IDS;
     private cachedTokens;
     constructor(apiKey?: string);
     getTokens(): Promise<TokenResponse[]>;

package/dist/index.d.ts

@@ -1280,6 +1280,7 @@ interface GetAttestationResponse {
     version: number;
 }
 declare class NearIntentsApi {
+    private static readonly DEPRECATED_ASSET_IDS;
     private cachedTokens;
     constructor(apiKey?: string);
     getTokens(): Promise<TokenResponse[]>;

package/dist/index.js

@@ -4999,7 +4999,17 @@ var import_one_click_sdk_typescript2 = require("@defuse-protocol/one-click-sdk-t
 
 // src/providers/near-intents/NearIntentsApi.ts
 var import_one_click_sdk_typescript = require("@defuse-protocol/one-click-sdk-typescript");
-var NearIntentsApi = class {
+var NearIntentsApi = class _NearIntentsApi {
+  // Upstream /v0/tokens still lists deprecated assets the attestation service
+  // no longer signs. They share `blockchain: 'btc'` with the live token and
+  // both resolve to BTC_CURRENCY_ADDRESS, so without this filter `tokens.find()`
+  // picks the deprecated entry (it appears first) and /v0/attestation fails
+  // with "Invalid quote hash".
+  static DEPRECATED_ASSET_IDS = /* @__PURE__ */ new Set([
+    // POA BTC bridge, replaced by `1cs_v1:btc:native:coin` (Omni migration).
+    // https://partners.near-intents.org/omni-migration
+    "nep141:btc.omft.near"
+  ]);
   cachedTokens = [];
   constructor(apiKey) {
     if (apiKey) {
@@ -5009,7 +5019,7 @@ var NearIntentsApi = class {
   async getTokens() {
     if (this.cachedTokens.length === 0) {
       const response = await import_one_click_sdk_typescript.OneClickService.getTokens();
-      this.cachedTokens = response;
+      this.cachedTokens = response.filter((t) => !_NearIntentsApi.DEPRECATED_ASSET_IDS.has(t.assetId));
     }
     return this.cachedTokens;
   }
@@ -5107,11 +5117,23 @@ var calculateDeadline = (seconds) => {
   const d = new Date(Date.now() + secs * 1e3);
   return d.toISOString().replace(/\.\d{3}Z$/, "Z");
 };
+var resolveTokenAddress = (chainId, contractAddress) => {
+  const isBtcNative = chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.btc && (!contractAddress || contractAddress === "coin");
+  if (isBtcNative)
+    return import_sdk_config10.BTC_CURRENCY_ADDRESS;
+  if (contractAddress)
+    return contractAddress;
+  if (chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.sol)
+    return import_sdk_config10.SOL_NATIVE_CURRENCY_ADDRESS;
+  if ((0, import_sdk_config10.isEvmChain)(chainId))
+    return import_sdk_config10.ETH_ADDRESS;
+  return null;
+};
 var adaptToken = (token) => {
   const chainId = NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS[token.blockchain];
   if (!chainId)
     return null;
-  const tokenAddress = token.contractAddress ?? (chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.btc ? import_sdk_config10.BTC_CURRENCY_ADDRESS : chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.sol ? import_sdk_config10.SOL_NATIVE_CURRENCY_ADDRESS : import_sdk_config10.ETH_ADDRESS);
+  const tokenAddress = resolveTokenAddress(chainId, token.contractAddress);
   if (!tokenAddress)
     return null;
   return {
@@ -5133,21 +5155,10 @@ var adaptTokens = (tokens) => tokens.reduce((acc, token) => {
 var getTokenByAddressAndChainId = (tokens, targetTokenAddress, targetTokenChainId) => {
   return tokens.find((token) => {
     const chainId = NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS[token.blockchain];
-    if (!chainId)
-      return false;
-    if (chainId !== targetTokenChainId)
+    if (!chainId || chainId !== targetTokenChainId)
       return false;
-    if (!(0, import_sdk_config10.isEvmChain)(targetTokenChainId)) {
-      if (!token.contractAddress) {
-        return (0, import_sdk_common19.areAddressesEqual)(targetTokenAddress, import_sdk_config10.BTC_CURRENCY_ADDRESS) || (0, import_sdk_common19.areAddressesEqual)(targetTokenAddress, import_sdk_config10.SOL_NATIVE_CURRENCY_ADDRESS);
-      }
-      return (0, import_sdk_common19.areAddressesEqual)(token.contractAddress, targetTokenAddress);
-    }
-    if ((0, import_sdk_common19.areAddressesEqual)(targetTokenAddress, import_sdk_config10.ETH_ADDRESS)) {
-      return !token.contractAddress;
-    }
-    const tokenAddress = token.contractAddress || import_sdk_config10.ETH_ADDRESS;
-    return (0, import_sdk_common19.areAddressesEqual)(tokenAddress, targetTokenAddress);
+    const tokenAddress = resolveTokenAddress(chainId, token.contractAddress);
+    return tokenAddress ? (0, import_sdk_common19.areAddressesEqual)(tokenAddress, targetTokenAddress) : false;
   });
 };
 var hashQuote = ({
@@ -5375,8 +5386,8 @@ var NearIntentsBridgeProvider = class {
         fillTxHash: status.swapDetails?.destinationChainTxHashes?.[0]?.hash
       },
       params: {
-        inputTokenAddress: inputToken.contractAddress ?? adaptedInput.address,
-        outputTokenAddress: outputToken.contractAddress ?? adaptedOutput.address,
+        inputTokenAddress: adaptedInput.address,
+        outputTokenAddress: adaptedOutput.address,
         inputAmount: BigInt(quote.amountIn),
         outputAmount: swapDetails.amountOut ? BigInt(swapDetails.amountOut) : BigInt(quote.amountOut),
         owner: order.owner,

package/dist/index.mjs

@@ -4958,7 +4958,17 @@ import { QuoteRequest } from "@defuse-protocol/one-click-sdk-typescript";
 
 // src/providers/near-intents/NearIntentsApi.ts
 import { ApiError, OneClickService, OpenAPI } from "@defuse-protocol/one-click-sdk-typescript";
-var NearIntentsApi = class {
+var NearIntentsApi = class _NearIntentsApi {
+  // Upstream /v0/tokens still lists deprecated assets the attestation service
+  // no longer signs. They share `blockchain: 'btc'` with the live token and
+  // both resolve to BTC_CURRENCY_ADDRESS, so without this filter `tokens.find()`
+  // picks the deprecated entry (it appears first) and /v0/attestation fails
+  // with "Invalid quote hash".
+  static DEPRECATED_ASSET_IDS = /* @__PURE__ */ new Set([
+    // POA BTC bridge, replaced by `1cs_v1:btc:native:coin` (Omni migration).
+    // https://partners.near-intents.org/omni-migration
+    "nep141:btc.omft.near"
+  ]);
   cachedTokens = [];
   constructor(apiKey) {
     if (apiKey) {
@@ -4968,7 +4978,7 @@ var NearIntentsApi = class {
   async getTokens() {
     if (this.cachedTokens.length === 0) {
       const response = await OneClickService.getTokens();
-      this.cachedTokens = response;
+      this.cachedTokens = response.filter((t) => !_NearIntentsApi.DEPRECATED_ASSET_IDS.has(t.assetId));
     }
     return this.cachedTokens;
   }
@@ -5083,11 +5093,23 @@ var calculateDeadline = (seconds) => {
   const d = new Date(Date.now() + secs * 1e3);
   return d.toISOString().replace(/\.\d{3}Z$/, "Z");
 };
+var resolveTokenAddress = (chainId, contractAddress) => {
+  const isBtcNative = chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.btc && (!contractAddress || contractAddress === "coin");
+  if (isBtcNative)
+    return BTC_CURRENCY_ADDRESS;
+  if (contractAddress)
+    return contractAddress;
+  if (chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.sol)
+    return SOL_NATIVE_CURRENCY_ADDRESS;
+  if (isEvmChain(chainId))
+    return ETH_ADDRESS2;
+  return null;
+};
 var adaptToken = (token) => {
   const chainId = NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS[token.blockchain];
   if (!chainId)
     return null;
-  const tokenAddress = token.contractAddress ?? (chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.btc ? BTC_CURRENCY_ADDRESS : chainId === NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS.sol ? SOL_NATIVE_CURRENCY_ADDRESS : ETH_ADDRESS2);
+  const tokenAddress = resolveTokenAddress(chainId, token.contractAddress);
   if (!tokenAddress)
     return null;
   return {
@@ -5109,21 +5131,10 @@ var adaptTokens = (tokens) => tokens.reduce((acc, token) => {
 var getTokenByAddressAndChainId = (tokens, targetTokenAddress, targetTokenChainId) => {
   return tokens.find((token) => {
     const chainId = NEAR_INTENTS_BLOCKCHAIN_CHAIN_IDS[token.blockchain];
-    if (!chainId)
-      return false;
-    if (chainId !== targetTokenChainId)
+    if (!chainId || chainId !== targetTokenChainId)
       return false;
-    if (!isEvmChain(targetTokenChainId)) {
-      if (!token.contractAddress) {
-        return areAddressesEqual4(targetTokenAddress, BTC_CURRENCY_ADDRESS) || areAddressesEqual4(targetTokenAddress, SOL_NATIVE_CURRENCY_ADDRESS);
-      }
-      return areAddressesEqual4(token.contractAddress, targetTokenAddress);
-    }
-    if (areAddressesEqual4(targetTokenAddress, ETH_ADDRESS2)) {
-      return !token.contractAddress;
-    }
-    const tokenAddress = token.contractAddress || ETH_ADDRESS2;
-    return areAddressesEqual4(tokenAddress, targetTokenAddress);
+    const tokenAddress = resolveTokenAddress(chainId, token.contractAddress);
+    return tokenAddress ? areAddressesEqual4(tokenAddress, targetTokenAddress) : false;
   });
 };
 var hashQuote = ({
@@ -5351,8 +5362,8 @@ var NearIntentsBridgeProvider = class {
         fillTxHash: status.swapDetails?.destinationChainTxHashes?.[0]?.hash
       },
       params: {
-        inputTokenAddress: inputToken.contractAddress ?? adaptedInput.address,
-        outputTokenAddress: outputToken.contractAddress ?? adaptedOutput.address,
+        inputTokenAddress: adaptedInput.address,
+        outputTokenAddress: adaptedOutput.address,
         inputAmount: BigInt(quote.amountIn),
         outputAmount: swapDetails.amountOut ? BigInt(swapDetails.amountOut) : BigInt(quote.amountOut),
         owner: order.owner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/sdk-bridging",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "Bridging for CoW Protocol",
   "repository": {
     "type": "git",
@@ -21,14 +21,14 @@
   "dependencies": {
     "@defuse-protocol/one-click-sdk-typescript": "0.1.1-0.2",
     "json-stable-stringify": "^1.3.0",
-    "@cowprotocol/sdk-config": "2.2.1",
-    "@cowprotocol/sdk-contracts-ts": "3.1.1",
-    "@cowprotocol/sdk-common": "0.11.1",
-    "@cowprotocol/sdk-cow-shed": "0.3.12",
-    "@cowprotocol/sdk-app-data": "5.1.4",
-    "@cowprotocol/sdk-order-book": "3.2.1",
-    "@cowprotocol/sdk-trading": "2.1.1",
-    "@cowprotocol/sdk-weiroll": "0.1.34"
+    "@cowprotocol/sdk-app-data": "5.2.0",
+    "@cowprotocol/sdk-common": "0.11.2",
+    "@cowprotocol/sdk-config": "2.3.0",
+    "@cowprotocol/sdk-contracts-ts": "3.1.2",
+    "@cowprotocol/sdk-order-book": "3.2.2",
+    "@cowprotocol/sdk-weiroll": "0.1.35",
+    "@cowprotocol/sdk-trading": "2.1.2",
+    "@cowprotocol/sdk-cow-shed": "0.3.13"
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
@@ -44,10 +44,10 @@
     "typescript": "^5.2.2",
     "viem": "^2.28.4",
     "@cow-sdk/typescript-config": "0.0.0-beta.0",
-    "@cowprotocol/sdk-ethers-v5-adapter": "0.4.8",
-    "@cowprotocol/sdk-ethers-v6-adapter": "0.4.8",
-    "@cowprotocol/sdk-order-signing": "1.0.5",
-    "@cowprotocol/sdk-viem-adapter": "0.3.22"
+    "@cowprotocol/sdk-ethers-v6-adapter": "0.4.9",
+    "@cowprotocol/sdk-order-signing": "1.0.6",
+    "@cowprotocol/sdk-ethers-v5-adapter": "0.4.9",
+    "@cowprotocol/sdk-viem-adapter": "0.3.23"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",