@cowprotocol/sdk-trading 0.4.0 → 0.4.2

package/dist/index.d.mts

@@ -1,10 +1,9 @@
 import { cowAppDataLatestScheme, AppDataParams, LatestAppDataDocVersion } from '@cowprotocol/sdk-app-data';
 import { OrderKind, OrderParameters, TokenAmount, SigningScheme, OrderQuoteRequest, QuoteAmountsAndCosts, OrderQuoteResponse, AppData, AppDataHash, Signature, OrderBookApi, EnrichedOrder } from '@cowprotocol/sdk-order-book';
-import { AccountAddress, SignerLike, AbstractSigner, Signer, AbstractProviderAdapter, EthFlowContract } from '@cowprotocol/sdk-common';
-import { UnsignedOrder } from '@cowprotocol/sdk-order-signing';
+import { AccountAddress, AbstractSigner, Provider, SignerLike, Signer, AbstractProviderAdapter, EthFlowContract } from '@cowprotocol/sdk-common';
+import { UnsignedOrder, ORDER_PRIMARY_TYPE } from '@cowprotocol/sdk-order-signing';
 import { CowEnv, SupportedChainId } from '@cowprotocol/sdk-config';
 
-declare const ORDER_PRIMARY_TYPE: "Order";
 /**
  * EIP-712 typed data domain.
  */
@@ -116,12 +115,7 @@ interface SigningStepManager {
     onBridgingSignError?(): void;
     onOrderSignError?(): void;
 }
-interface SwapAdvancedSettings {
-    quoteRequest?: Partial<Omit<OrderQuoteRequest, 'kind'> & {
-        validTo: number;
-    }>;
-    appData?: AppDataParams;
-    additionalParams?: PostTradeAdditionalParams;
+interface SwapAdvancedSettings extends LimitOrderAdvancedSettings {
     quoteSigner?: SignerLike;
     /**
      * An optional callback to use custom logic for slippage suggestion
@@ -129,6 +123,9 @@ interface SwapAdvancedSettings {
     getSlippageSuggestion?(request: SlippageToleranceRequest): Promise<SlippageToleranceResponse>;
 }
 interface LimitOrderAdvancedSettings {
+    quoteRequest?: Partial<Omit<OrderQuoteRequest, 'kind'> & {
+        validTo: number;
+    }>;
     appData?: AppDataParams;
     additionalParams?: PostTradeAdditionalParams;
 }
@@ -237,6 +234,7 @@ interface PostTradeAdditionalParams {
      * You might need other types of signing, for example PRESIGN when sign order via Smart Contract wallets.
      */
     signingScheme?: SigningScheme;
+    customEIP1271Signature?: (orderToSign: UnsignedOrder, signer: AbstractSigner<Provider>) => Promise<string>;
 }
 
 type QuoteResultsWithSigner = {
@@ -365,7 +363,7 @@ declare function getOrderToSign({ chainId, from, networkCostsAmount, isEthFlow }
 
 declare function postCoWProtocolTrade(orderBookApi: OrderBookApi, appData: TradingAppDataInfo, params: LimitTradeParameters, additionalParams?: PostTradeAdditionalParams, paramSigner?: SignerLike): Promise<OrderPostingResult>;
 
-declare function postLimitOrder(params: LimitOrderParameters, advancedSettings?: LimitOrderAdvancedSettings, _orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
+declare function postLimitOrder(_params: LimitOrderParameters, advancedSettings?: LimitOrderAdvancedSettings, _orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
 
 declare function postSwapOrder(params: SwapParameters, advancedSettings?: SwapAdvancedSettings, orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
 declare function postSwapOrderFromQuote({ orderBookApi, result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }, }: QuoteResultsWithSigner, advancedSettings?: SwapAdvancedSettings): Promise<OrderPostingResult>;
@@ -402,4 +400,4 @@ declare function getTradeParametersAfterQuote({ quoteParameters, sellToken, }: {
     sellToken: string;
 }): TradeParameters;
 
-export { type AppDataRootSchema, type BuildAppDataParams, type EthFlowOrderExistsCallback, type LimitOrderAdvancedSettings, type LimitOrderParameters, type LimitTradeParameters, type LimitTradeParametersFromQuote, ORDER_PRIMARY_TYPE, type OrderPostingResult, type OrderTraderParams, type OrderTypedData, type PostTradeAdditionalParams, type QuoteAndPost, type QuoteResults, type QuoteResultsSerialized, type QuoteResultsWithSigner, type QuoterParameters, type SigningStepManager, type SlippageToleranceRequest, type SlippageToleranceResponse, type SwapAdvancedSettings, type SwapParameters, type TradeBaseParameters, type TradeOptionalParameters, type TradeParameters, type TraderParameters, type TradingAppDataInfo, TradingSdk, type TradingSdkOptions, type TradingTransactionParams, type WithPartialTraderParams, buildAppData, calculateUniqueOrderId, generateAppDataFromDoc, getEthFlowContract, getEthFlowTransaction, getOrderToSign, getPartnerFeeBps, getPreSignTransaction, getQuote, getQuoteWithSigner, getTradeParametersAfterQuote, mapQuoteAmountsAndCosts, mergeAppDataDoc, postCoWProtocolTrade, postLimitOrder, postSellNativeCurrencyOrder, postSwapOrder, postSwapOrderFromQuote, suggestSlippageBps, swapParamsToLimitOrderParams };
+export { type AppDataRootSchema, type BuildAppDataParams, type EthFlowOrderExistsCallback, type LimitOrderAdvancedSettings, type LimitOrderParameters, type LimitTradeParameters, type LimitTradeParametersFromQuote, type OrderPostingResult, type OrderTraderParams, type OrderTypedData, type PostTradeAdditionalParams, type QuoteAndPost, type QuoteResults, type QuoteResultsSerialized, type QuoteResultsWithSigner, type QuoterParameters, type SigningStepManager, type SlippageToleranceRequest, type SlippageToleranceResponse, type SwapAdvancedSettings, type SwapParameters, type TradeBaseParameters, type TradeOptionalParameters, type TradeParameters, type TraderParameters, type TradingAppDataInfo, TradingSdk, type TradingSdkOptions, type TradingTransactionParams, type WithPartialTraderParams, buildAppData, calculateUniqueOrderId, generateAppDataFromDoc, getEthFlowContract, getEthFlowTransaction, getOrderToSign, getPartnerFeeBps, getPreSignTransaction, getQuote, getQuoteWithSigner, getTradeParametersAfterQuote, mapQuoteAmountsAndCosts, mergeAppDataDoc, postCoWProtocolTrade, postLimitOrder, postSellNativeCurrencyOrder, postSwapOrder, postSwapOrderFromQuote, suggestSlippageBps, swapParamsToLimitOrderParams };

package/dist/index.d.ts

@@ -1,10 +1,9 @@
 import { cowAppDataLatestScheme, AppDataParams, LatestAppDataDocVersion } from '@cowprotocol/sdk-app-data';
 import { OrderKind, OrderParameters, TokenAmount, SigningScheme, OrderQuoteRequest, QuoteAmountsAndCosts, OrderQuoteResponse, AppData, AppDataHash, Signature, OrderBookApi, EnrichedOrder } from '@cowprotocol/sdk-order-book';
-import { AccountAddress, SignerLike, AbstractSigner, Signer, AbstractProviderAdapter, EthFlowContract } from '@cowprotocol/sdk-common';
-import { UnsignedOrder } from '@cowprotocol/sdk-order-signing';
+import { AccountAddress, AbstractSigner, Provider, SignerLike, Signer, AbstractProviderAdapter, EthFlowContract } from '@cowprotocol/sdk-common';
+import { UnsignedOrder, ORDER_PRIMARY_TYPE } from '@cowprotocol/sdk-order-signing';
 import { CowEnv, SupportedChainId } from '@cowprotocol/sdk-config';
 
-declare const ORDER_PRIMARY_TYPE: "Order";
 /**
  * EIP-712 typed data domain.
  */
@@ -116,12 +115,7 @@ interface SigningStepManager {
     onBridgingSignError?(): void;
     onOrderSignError?(): void;
 }
-interface SwapAdvancedSettings {
-    quoteRequest?: Partial<Omit<OrderQuoteRequest, 'kind'> & {
-        validTo: number;
-    }>;
-    appData?: AppDataParams;
-    additionalParams?: PostTradeAdditionalParams;
+interface SwapAdvancedSettings extends LimitOrderAdvancedSettings {
     quoteSigner?: SignerLike;
     /**
      * An optional callback to use custom logic for slippage suggestion
@@ -129,6 +123,9 @@ interface SwapAdvancedSettings {
     getSlippageSuggestion?(request: SlippageToleranceRequest): Promise<SlippageToleranceResponse>;
 }
 interface LimitOrderAdvancedSettings {
+    quoteRequest?: Partial<Omit<OrderQuoteRequest, 'kind'> & {
+        validTo: number;
+    }>;
     appData?: AppDataParams;
     additionalParams?: PostTradeAdditionalParams;
 }
@@ -237,6 +234,7 @@ interface PostTradeAdditionalParams {
      * You might need other types of signing, for example PRESIGN when sign order via Smart Contract wallets.
      */
     signingScheme?: SigningScheme;
+    customEIP1271Signature?: (orderToSign: UnsignedOrder, signer: AbstractSigner<Provider>) => Promise<string>;
 }
 
 type QuoteResultsWithSigner = {
@@ -365,7 +363,7 @@ declare function getOrderToSign({ chainId, from, networkCostsAmount, isEthFlow }
 
 declare function postCoWProtocolTrade(orderBookApi: OrderBookApi, appData: TradingAppDataInfo, params: LimitTradeParameters, additionalParams?: PostTradeAdditionalParams, paramSigner?: SignerLike): Promise<OrderPostingResult>;
 
-declare function postLimitOrder(params: LimitOrderParameters, advancedSettings?: LimitOrderAdvancedSettings, _orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
+declare function postLimitOrder(_params: LimitOrderParameters, advancedSettings?: LimitOrderAdvancedSettings, _orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
 
 declare function postSwapOrder(params: SwapParameters, advancedSettings?: SwapAdvancedSettings, orderBookApi?: OrderBookApi): Promise<OrderPostingResult>;
 declare function postSwapOrderFromQuote({ orderBookApi, result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }, }: QuoteResultsWithSigner, advancedSettings?: SwapAdvancedSettings): Promise<OrderPostingResult>;
@@ -402,4 +400,4 @@ declare function getTradeParametersAfterQuote({ quoteParameters, sellToken, }: {
     sellToken: string;
 }): TradeParameters;
 
-export { type AppDataRootSchema, type BuildAppDataParams, type EthFlowOrderExistsCallback, type LimitOrderAdvancedSettings, type LimitOrderParameters, type LimitTradeParameters, type LimitTradeParametersFromQuote, ORDER_PRIMARY_TYPE, type OrderPostingResult, type OrderTraderParams, type OrderTypedData, type PostTradeAdditionalParams, type QuoteAndPost, type QuoteResults, type QuoteResultsSerialized, type QuoteResultsWithSigner, type QuoterParameters, type SigningStepManager, type SlippageToleranceRequest, type SlippageToleranceResponse, type SwapAdvancedSettings, type SwapParameters, type TradeBaseParameters, type TradeOptionalParameters, type TradeParameters, type TraderParameters, type TradingAppDataInfo, TradingSdk, type TradingSdkOptions, type TradingTransactionParams, type WithPartialTraderParams, buildAppData, calculateUniqueOrderId, generateAppDataFromDoc, getEthFlowContract, getEthFlowTransaction, getOrderToSign, getPartnerFeeBps, getPreSignTransaction, getQuote, getQuoteWithSigner, getTradeParametersAfterQuote, mapQuoteAmountsAndCosts, mergeAppDataDoc, postCoWProtocolTrade, postLimitOrder, postSellNativeCurrencyOrder, postSwapOrder, postSwapOrderFromQuote, suggestSlippageBps, swapParamsToLimitOrderParams };
+export { type AppDataRootSchema, type BuildAppDataParams, type EthFlowOrderExistsCallback, type LimitOrderAdvancedSettings, type LimitOrderParameters, type LimitTradeParameters, type LimitTradeParametersFromQuote, type OrderPostingResult, type OrderTraderParams, type OrderTypedData, type PostTradeAdditionalParams, type QuoteAndPost, type QuoteResults, type QuoteResultsSerialized, type QuoteResultsWithSigner, type QuoterParameters, type SigningStepManager, type SlippageToleranceRequest, type SlippageToleranceResponse, type SwapAdvancedSettings, type SwapParameters, type TradeBaseParameters, type TradeOptionalParameters, type TradeParameters, type TraderParameters, type TradingAppDataInfo, TradingSdk, type TradingSdkOptions, type TradingTransactionParams, type WithPartialTraderParams, buildAppData, calculateUniqueOrderId, generateAppDataFromDoc, getEthFlowContract, getEthFlowTransaction, getOrderToSign, getPartnerFeeBps, getPreSignTransaction, getQuote, getQuoteWithSigner, getTradeParametersAfterQuote, mapQuoteAmountsAndCosts, mergeAppDataDoc, postCoWProtocolTrade, postLimitOrder, postSellNativeCurrencyOrder, postSwapOrder, postSwapOrderFromQuote, suggestSlippageBps, swapParamsToLimitOrderParams };

package/dist/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  ORDER_PRIMARY_TYPE: () => ORDER_PRIMARY_TYPE,
   TradingSdk: () => TradingSdk,
   buildAppData: () => buildAppData,
   calculateUniqueOrderId: () => calculateUniqueOrderId,
@@ -69,56 +68,6 @@ var SIGN_SCHEME_MAP = {
   [import_sdk_order_book.EcdsaSigningScheme.ETHSIGN]: import_sdk_order_book.SigningScheme.ETHSIGN
 };
 var GAS_LIMIT_DEFAULT = BigInt(15e4);
-var ERC20_APPROVE_ABI = [
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "_spender",
-        type: "address"
-      },
-      {
-        name: "_value",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        name: "",
-        type: "bool"
-      }
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-var ERC20_ALLOWANCE_ABI = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "_owner",
-        type: "address"
-      },
-      {
-        name: "_spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        name: "",
-        type: "uint256"
-      }
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function"
-  }
-];
 
 // src/postCoWProtocolTrade.ts
 var import_sdk_order_signing2 = require("@cowprotocol/sdk-order-signing");
@@ -422,7 +371,11 @@ function resolveSigner(signer) {
 // src/postCoWProtocolTrade.ts
 async function postCoWProtocolTrade(orderBookApi, appData, params, additionalParams = {}, paramSigner) {
   const signer = resolveSigner(paramSigner);
-  const { networkCostsAmount = "0", signingScheme: _signingScheme = import_sdk_order_book4.SigningScheme.EIP712 } = additionalParams;
+  const {
+    networkCostsAmount = "0",
+    signingScheme: _signingScheme = import_sdk_order_book4.SigningScheme.EIP712,
+    customEIP1271Signature
+  } = additionalParams;
   const isEthFlow = getIsEthFlowOrder(params);
   if (isEthFlow) {
     const quoteId2 = params.quoteId;
@@ -442,7 +395,20 @@ async function postCoWProtocolTrade(orderBookApi, appData, params, additionalPar
     if (_signingScheme === import_sdk_order_book4.SigningScheme.PRESIGN) {
       return { signature: from, signingScheme: import_sdk_order_book4.SigningScheme.PRESIGN };
     } else {
+      const isEip1271 = _signingScheme === import_sdk_order_book4.SigningScheme.EIP1271;
+      if (isEip1271 && customEIP1271Signature) {
+        return {
+          signature: await customEIP1271Signature(orderToSign, signer),
+          signingScheme: _signingScheme
+        };
+      }
       const signingResult = await import_sdk_order_signing2.OrderSigningUtils.signOrder(orderToSign, chainId, signer);
+      if (isEip1271) {
+        return {
+          signature: import_sdk_order_signing2.OrderSigningUtils.getEip1271Signature(orderToSign, signingResult.signature),
+          signingScheme: _signingScheme
+        };
+      }
       return { signature: signingResult.signature, signingScheme: SIGN_SCHEME_MAP[signingResult.signingScheme] };
     }
   })();
@@ -512,12 +478,6 @@ async function mergeAppDataDoc(_doc, appDataOverride) {
   };
 }
 
-// src/getOrderTypedData.ts
-var import_sdk_contracts_ts = require("@cowprotocol/sdk-contracts-ts");
-
-// src/types.ts
-var ORDER_PRIMARY_TYPE = "Order";
-
 // src/getOrderTypedData.ts
 var import_sdk_order_signing3 = require("@cowprotocol/sdk-order-signing");
 var EIP712DomainTypes = [
@@ -530,9 +490,9 @@ async function getOrderTypedData(chainId, orderToSign) {
   const domain = await import_sdk_order_signing3.OrderSigningUtils.getDomain(chainId);
   return {
     domain,
-    primaryType: ORDER_PRIMARY_TYPE,
+    primaryType: import_sdk_order_signing3.ORDER_PRIMARY_TYPE,
     types: {
-      [ORDER_PRIMARY_TYPE]: import_sdk_contracts_ts.ORDER_TYPE_FIELDS,
+      ...import_sdk_order_signing3.COW_EIP712_TYPES,
       EIP712Domain: EIP712DomainTypes
     },
     message: orderToSign
@@ -709,7 +669,7 @@ async function getQuoteRaw(_tradeParameters, trader, advancedSettings, _orderBoo
     sellToken,
     buyToken,
     receiver,
-    ...validTo !== void 0 ? { validTo } : { validFor: effectiveValidFor },
+    ...typeof validTo === "number" ? { validTo } : { validFor: effectiveValidFor },
     appData: fullAppData,
     appDataHash: appDataKeccak256,
     priceQuality: import_sdk_order_book7.PriceQuality.OPTIMAL,
@@ -820,17 +780,10 @@ async function getQuoteWithSigner(swapParameters, advancedSettings, orderBookApi
   };
 }
 
-// src/postSwapOrder.ts
-async function postSwapOrder(params, advancedSettings, orderBookApi) {
-  return postSwapOrderFromQuote(await getQuoteWithSigner(params, advancedSettings, orderBookApi), advancedSettings);
-}
-async function postSwapOrderFromQuote({
-  orderBookApi,
-  result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }
-}, advancedSettings) {
-  const params = swapParamsToLimitOrderParams(tradeParameters, quoteResponse);
+// src/utils/applySettingsToLimitTradeParameters.ts
+function applySettingsToLimitTradeParameters(_params, advancedSettings) {
+  const params = { ..._params };
   const appDataOverride = advancedSettings?.appData;
-  const appDataInfo = appDataOverride ? await mergeAppDataDoc(_appDataInfo.doc, appDataOverride) : _appDataInfo;
   const appDataSlippageOverride = appDataOverride?.metadata?.quote?.slippageBips;
   const partnerFeeOverride = appDataOverride?.metadata?.partnerFee;
   if (typeof appDataSlippageOverride !== "undefined") {
@@ -840,7 +793,7 @@ async function postSwapOrderFromQuote({
     params.partnerFee = partnerFeeOverride;
   }
   if (advancedSettings?.quoteRequest) {
-    const { receiver, validTo, sellToken, buyToken } = advancedSettings.quoteRequest;
+    const { receiver, validTo, sellToken, buyToken, from } = advancedSettings.quoteRequest;
     if (receiver)
       params.receiver = receiver;
     if (validTo)
@@ -849,7 +802,29 @@ async function postSwapOrderFromQuote({
       params.sellToken = sellToken;
     if (buyToken)
       params.buyToken = buyToken;
+    if (from)
+      params.owner = from;
   }
+  if (!params.env) {
+    params.env = "prod";
+  }
+  return params;
+}
+
+// src/postSwapOrder.ts
+async function postSwapOrder(params, advancedSettings, orderBookApi) {
+  return postSwapOrderFromQuote(await getQuoteWithSigner(params, advancedSettings, orderBookApi), advancedSettings);
+}
+async function postSwapOrderFromQuote({
+  orderBookApi,
+  result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }
+}, advancedSettings) {
+  const appDataOverride = advancedSettings?.appData;
+  const appDataInfo = appDataOverride ? await mergeAppDataDoc(_appDataInfo.doc, appDataOverride) : _appDataInfo;
+  const params = applySettingsToLimitTradeParameters(
+    swapParamsToLimitOrderParams(tradeParameters, quoteResponse),
+    advancedSettings
+  );
   return postCoWProtocolTrade(
     orderBookApi,
     appDataInfo,
@@ -866,21 +841,11 @@ async function postSwapOrderFromQuote({
 // src/postLimitOrder.ts
 var import_sdk_order_book8 = require("@cowprotocol/sdk-order-book");
 var import_sdk_common12 = require("@cowprotocol/sdk-common");
-async function postLimitOrder(params, advancedSettings, _orderBookApi) {
-  const appDataSlippage = advancedSettings?.appData?.metadata?.quote?.slippageBips;
-  const partnerFeeOverride = advancedSettings?.appData?.metadata?.partnerFee;
-  if (typeof appDataSlippage !== "undefined") {
-    params.slippageBps = appDataSlippage;
-  }
-  if (partnerFeeOverride) {
-    params.partnerFee = partnerFeeOverride;
-  }
+async function postLimitOrder(_params, advancedSettings, _orderBookApi) {
+  const params = applySettingsToLimitTradeParameters(_params, advancedSettings);
   if (!params.slippageBps) {
     params.slippageBps = 0;
   }
-  if (!params.env) {
-    params.env = "prod";
-  }
   const { appCode, chainId, sellToken, buyToken, sellAmount, buyAmount, partnerFee } = params;
   (0, import_sdk_common12.log)(`Limit order ${sellAmount} ${sellToken} for ${buyAmount} ${buyToken} on chain ${chainId}`);
   const orderBookApi = _orderBookApi || new import_sdk_order_book8.OrderBookApi({ chainId, env: params.env });
@@ -1154,7 +1119,7 @@ var TradingSdk = class {
     const vaultRelayerAddress = import_sdk_config6.COW_PROTOCOL_VAULT_RELAYER_ADDRESS[chainId];
     return await adapter.readContract({
       address: params.tokenAddress,
-      abi: ERC20_ALLOWANCE_ABI,
+      abi: import_sdk_common14.ERC20_ALLOWANCE_ABI,
       functionName: "allowance",
       args: [params.owner, vaultRelayerAddress]
     });
@@ -1188,7 +1153,7 @@ var TradingSdk = class {
     const vaultRelayerAddress = import_sdk_config6.COW_PROTOCOL_VAULT_RELAYER_ADDRESS[chainId];
     const txParams = {
       to: params.tokenAddress,
-      data: adapter.utils.encodeFunction(ERC20_APPROVE_ABI, "approve", [
+      data: adapter.utils.encodeFunction(import_sdk_common14.ERC20_APPROVE_ABI, "approve", [
         vaultRelayerAddress,
         "0x" + params.amount.toString(16)
       ])
@@ -1239,7 +1204,6 @@ function isTraderParameters(params) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ORDER_PRIMARY_TYPE,
   TradingSdk,
   buildAppData,
   calculateUniqueOrderId,

package/dist/index.mjs

@@ -12,56 +12,6 @@ var SIGN_SCHEME_MAP = {
   [EcdsaSigningScheme.ETHSIGN]: SigningScheme.ETHSIGN
 };
 var GAS_LIMIT_DEFAULT = BigInt(15e4);
-var ERC20_APPROVE_ABI = [
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "_spender",
-        type: "address"
-      },
-      {
-        name: "_value",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        name: "",
-        type: "bool"
-      }
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-var ERC20_ALLOWANCE_ABI = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "_owner",
-        type: "address"
-      },
-      {
-        name: "_spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        name: "",
-        type: "uint256"
-      }
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function"
-  }
-];
 
 // src/postCoWProtocolTrade.ts
 import { OrderSigningUtils as OrderSigningUtils2 } from "@cowprotocol/sdk-order-signing";
@@ -377,7 +327,11 @@ function resolveSigner(signer) {
 // src/postCoWProtocolTrade.ts
 async function postCoWProtocolTrade(orderBookApi, appData, params, additionalParams = {}, paramSigner) {
   const signer = resolveSigner(paramSigner);
-  const { networkCostsAmount = "0", signingScheme: _signingScheme = SigningScheme3.EIP712 } = additionalParams;
+  const {
+    networkCostsAmount = "0",
+    signingScheme: _signingScheme = SigningScheme3.EIP712,
+    customEIP1271Signature
+  } = additionalParams;
   const isEthFlow = getIsEthFlowOrder(params);
   if (isEthFlow) {
     const quoteId2 = params.quoteId;
@@ -397,7 +351,20 @@ async function postCoWProtocolTrade(orderBookApi, appData, params, additionalPar
     if (_signingScheme === SigningScheme3.PRESIGN) {
       return { signature: from, signingScheme: SigningScheme3.PRESIGN };
     } else {
+      const isEip1271 = _signingScheme === SigningScheme3.EIP1271;
+      if (isEip1271 && customEIP1271Signature) {
+        return {
+          signature: await customEIP1271Signature(orderToSign, signer),
+          signingScheme: _signingScheme
+        };
+      }
       const signingResult = await OrderSigningUtils2.signOrder(orderToSign, chainId, signer);
+      if (isEip1271) {
+        return {
+          signature: OrderSigningUtils2.getEip1271Signature(orderToSign, signingResult.signature),
+          signingScheme: _signingScheme
+        };
+      }
       return { signature: signingResult.signature, signingScheme: SIGN_SCHEME_MAP[signingResult.signingScheme] };
     }
   })();
@@ -478,13 +445,7 @@ async function mergeAppDataDoc(_doc, appDataOverride) {
 }
 
 // src/getOrderTypedData.ts
-import { ORDER_TYPE_FIELDS } from "@cowprotocol/sdk-contracts-ts";
-
-// src/types.ts
-var ORDER_PRIMARY_TYPE = "Order";
-
-// src/getOrderTypedData.ts
-import { OrderSigningUtils as OrderSigningUtils3 } from "@cowprotocol/sdk-order-signing";
+import { COW_EIP712_TYPES, ORDER_PRIMARY_TYPE, OrderSigningUtils as OrderSigningUtils3 } from "@cowprotocol/sdk-order-signing";
 var EIP712DomainTypes = [
   { name: "name", type: "string" },
   { name: "version", type: "string" },
@@ -497,7 +458,7 @@ async function getOrderTypedData(chainId, orderToSign) {
     domain,
     primaryType: ORDER_PRIMARY_TYPE,
     types: {
-      [ORDER_PRIMARY_TYPE]: ORDER_TYPE_FIELDS,
+      ...COW_EIP712_TYPES,
       EIP712Domain: EIP712DomainTypes
     },
     message: orderToSign
@@ -674,7 +635,7 @@ async function getQuoteRaw(_tradeParameters, trader, advancedSettings, _orderBoo
     sellToken,
     buyToken,
     receiver,
-    ...validTo !== void 0 ? { validTo } : { validFor: effectiveValidFor },
+    ...typeof validTo === "number" ? { validTo } : { validFor: effectiveValidFor },
     appData: fullAppData,
     appDataHash: appDataKeccak256,
     priceQuality: PriceQuality2.OPTIMAL,
@@ -785,17 +746,10 @@ async function getQuoteWithSigner(swapParameters, advancedSettings, orderBookApi
   };
 }
 
-// src/postSwapOrder.ts
-async function postSwapOrder(params, advancedSettings, orderBookApi) {
-  return postSwapOrderFromQuote(await getQuoteWithSigner(params, advancedSettings, orderBookApi), advancedSettings);
-}
-async function postSwapOrderFromQuote({
-  orderBookApi,
-  result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }
-}, advancedSettings) {
-  const params = swapParamsToLimitOrderParams(tradeParameters, quoteResponse);
+// src/utils/applySettingsToLimitTradeParameters.ts
+function applySettingsToLimitTradeParameters(_params, advancedSettings) {
+  const params = { ..._params };
   const appDataOverride = advancedSettings?.appData;
-  const appDataInfo = appDataOverride ? await mergeAppDataDoc(_appDataInfo.doc, appDataOverride) : _appDataInfo;
   const appDataSlippageOverride = appDataOverride?.metadata?.quote?.slippageBips;
   const partnerFeeOverride = appDataOverride?.metadata?.partnerFee;
   if (typeof appDataSlippageOverride !== "undefined") {
@@ -805,7 +759,7 @@ async function postSwapOrderFromQuote({
     params.partnerFee = partnerFeeOverride;
   }
   if (advancedSettings?.quoteRequest) {
-    const { receiver, validTo, sellToken, buyToken } = advancedSettings.quoteRequest;
+    const { receiver, validTo, sellToken, buyToken, from } = advancedSettings.quoteRequest;
     if (receiver)
       params.receiver = receiver;
     if (validTo)
@@ -814,7 +768,29 @@ async function postSwapOrderFromQuote({
       params.sellToken = sellToken;
     if (buyToken)
       params.buyToken = buyToken;
+    if (from)
+      params.owner = from;
   }
+  if (!params.env) {
+    params.env = "prod";
+  }
+  return params;
+}
+
+// src/postSwapOrder.ts
+async function postSwapOrder(params, advancedSettings, orderBookApi) {
+  return postSwapOrderFromQuote(await getQuoteWithSigner(params, advancedSettings, orderBookApi), advancedSettings);
+}
+async function postSwapOrderFromQuote({
+  orderBookApi,
+  result: { signer, appDataInfo: _appDataInfo, quoteResponse, tradeParameters }
+}, advancedSettings) {
+  const appDataOverride = advancedSettings?.appData;
+  const appDataInfo = appDataOverride ? await mergeAppDataDoc(_appDataInfo.doc, appDataOverride) : _appDataInfo;
+  const params = applySettingsToLimitTradeParameters(
+    swapParamsToLimitOrderParams(tradeParameters, quoteResponse),
+    advancedSettings
+  );
   return postCoWProtocolTrade(
     orderBookApi,
     appDataInfo,
@@ -831,21 +807,11 @@ async function postSwapOrderFromQuote({
 // src/postLimitOrder.ts
 import { OrderBookApi as OrderBookApi4 } from "@cowprotocol/sdk-order-book";
 import { log as log5 } from "@cowprotocol/sdk-common";
-async function postLimitOrder(params, advancedSettings, _orderBookApi) {
-  const appDataSlippage = advancedSettings?.appData?.metadata?.quote?.slippageBips;
-  const partnerFeeOverride = advancedSettings?.appData?.metadata?.partnerFee;
-  if (typeof appDataSlippage !== "undefined") {
-    params.slippageBps = appDataSlippage;
-  }
-  if (partnerFeeOverride) {
-    params.partnerFee = partnerFeeOverride;
-  }
+async function postLimitOrder(_params, advancedSettings, _orderBookApi) {
+  const params = applySettingsToLimitTradeParameters(_params, advancedSettings);
   if (!params.slippageBps) {
     params.slippageBps = 0;
   }
-  if (!params.env) {
-    params.env = "prod";
-  }
   const { appCode, chainId, sellToken, buyToken, sellAmount, buyAmount, partnerFee } = params;
   log5(`Limit order ${sellAmount} ${sellToken} for ${buyAmount} ${buyToken} on chain ${chainId}`);
   const orderBookApi = _orderBookApi || new OrderBookApi4({ chainId, env: params.env });
@@ -883,7 +849,13 @@ async function getPreSignTransaction(signer, chainId, orderId) {
 }
 
 // src/tradingSdk.ts
-import { enableLogging, getGlobalAdapter as getGlobalAdapter6, setGlobalAdapter } from "@cowprotocol/sdk-common";
+import {
+  enableLogging,
+  ERC20_ALLOWANCE_ABI,
+  ERC20_APPROVE_ABI,
+  getGlobalAdapter as getGlobalAdapter6,
+  setGlobalAdapter
+} from "@cowprotocol/sdk-common";
 import { OrderSigningUtils as OrderSigningUtils4 } from "@cowprotocol/sdk-order-signing";
 
 // src/onChainCancellation.ts
@@ -1203,7 +1175,6 @@ function isTraderParameters(params) {
   return getMissingTraderParams(params).length === 0;
 }
 export {
-  ORDER_PRIMARY_TYPE,
   TradingSdk,
   buildAppData,
   calculateUniqueOrderId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/sdk-trading",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "CowProtocol trading",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -29,18 +29,18 @@
     "ts-jest": "^29.0.0",
     "tsx": "^4.19.4",
     "@cow-sdk/typescript-config": "0.0.0-beta.0",
-    "@cowprotocol/sdk-ethers-v5-adapter": "0.1.2",
-    "@cowprotocol/sdk-ethers-v6-adapter": "0.1.2",
-    "@cowprotocol/sdk-viem-adapter": "0.1.2"
+    "@cowprotocol/sdk-ethers-v5-adapter": "0.1.3",
+    "@cowprotocol/sdk-ethers-v6-adapter": "0.1.3",
+    "@cowprotocol/sdk-viem-adapter": "0.1.3"
   },
   "dependencies": {
     "deepmerge": "^4.3.1",
-    "@cowprotocol/sdk-common": "0.2.1",
-    "@cowprotocol/sdk-config": "0.1.0",
-    "@cowprotocol/sdk-order-signing": "0.1.6",
-    "@cowprotocol/sdk-order-book": "0.1.2",
-    "@cowprotocol/sdk-contracts-ts": "0.4.0",
-    "@cowprotocol/sdk-app-data": "4.1.2"
+    "@cowprotocol/sdk-common": "0.2.2",
+    "@cowprotocol/sdk-config": "0.2.0",
+    "@cowprotocol/sdk-app-data": "4.1.4",
+    "@cowprotocol/sdk-order-book": "0.1.3",
+    "@cowprotocol/sdk-contracts-ts": "0.4.1",
+    "@cowprotocol/sdk-order-signing": "0.1.7"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",