@kayibal/fynd-client 0.98.0 → 0.99.1

package/dist/client-fee.d.ts

@@ -1,13 +1,33 @@
 import type { Address, ClientFeeParams, EncodingOptions, Hex } from './types.js';
+/** Swap-specific inputs the router binds the client fee signature to. */
+export interface ClientFeeSwapContext {
+    /** Exact input amount from the order. */
+    amountIn: bigint;
+    /** Input token address. */
+    tokenIn: Address;
+    /** Output token address. */
+    tokenOut: Address;
+    /** Quoted output amount — the `amountOut` of the unsigned quote. */
+    expectedAmountOut: bigint;
+    /** Minimum output after fees — `feeBreakdown.minAmountReceived`. */
+    minAmountOut: bigint;
+    /** Address receiving the swap output. */
+    receiver: Address;
+    /** keccak256 of the encoded swaps bytes — `feeBreakdown.swapsHash`. */
+    swapsHash: Hex;
+}
 /**
  * Computes the EIP-712 signing hash for client fee params.
  *
  * Pass the returned hash to the fee receiver's signer, then set the
  * 65-byte signature on the `ClientFeeParams` before passing to `withClientFee`.
  *
+ * The hash covers all 11 `ClientFee` fields: the fee params plus the swap they are bound to,
+ * which come from a prior unsigned quote request.
+ *
  * `routerAddress` is the TychoRouter contract address.
  */
-export declare function clientFeeSigningHash(params: ClientFeeParams, chainId: number, routerAddress: Address): Hex;
+export declare function clientFeeSigningHash(params: ClientFeeParams, chainId: number, routerAddress: Address, swap: ClientFeeSwapContext): Hex;
 /**
  * Attach client fee configuration to encoding options.
  * Validates that signature is present and exactly 65 bytes (130 hex chars + '0x' prefix).

package/dist/client-fee.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-fee.d.ts","sourceRoot":"","sources":["../src/client-fee.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAWjF;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,GACrB,GAAG,CAiBL;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,eAAe,GACtB,eAAe,CAUjB"}
+{"version":3,"file":"client-fee.d.ts","sourceRoot":"","sources":["../src/client-fee.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AA2BjF,yEAAyE;AACzE,MAAM,WAAW,oBAAoB;IACnC,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,4BAA4B;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oEAAoE;IACpE,YAAY,EAAE,MAAM,CAAC;IACrB,yCAAyC;IACzC,QAAQ,EAAE,OAAO,CAAC;IAClB,uEAAuE;IACvE,SAAS,EAAE,GAAG,CAAC;CAChB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,oBAAoB,GACzB,GAAG,CAsDL;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,eAAe,GACtB,eAAe,CAUjB"}

package/dist/client-fee.js

@@ -1,38 +1,72 @@
-import { hashTypedData } from 'viem';
+import { concatHex, encodeAbiParameters, keccak256, stringToHex } from 'viem';
 import { FyndError } from './error.js';
-const CLIENT_FEE_TYPE = {
-    ClientFee: [
-        { name: 'clientFeeBps', type: 'uint16' },
-        { name: 'clientFeeReceiver', type: 'address' },
-        { name: 'maxClientContribution', type: 'uint256' },
-        { name: 'deadline', type: 'uint256' },
-    ],
-};
+/**
+ * Fee units per basis point in the router's `ClientFeeParams.clientFeeBps`.
+ *
+ * Fynd's API takes the client fee in basis points, while the router takes it in the
+ * FeeCalculator's fee units (`MAX_BPS` = 100,000,000 = 100%). The signature must cover the
+ * scaled value that ends up in the calldata.
+ */
+const CLIENT_FEE_UNITS_PER_BPS = 10000n;
+/** Must match `CLIENT_FEE_TYPEHASH` in `TychoRouter.sol`. */
+const CLIENT_FEE_TYPEHASH = keccak256(stringToHex('ClientFee(uint32 clientFeeBps,address clientFeeReceiver,' +
+    'uint256 maxClientContribution,uint256 deadline,' +
+    'uint256 amountIn,address tokenIn,address tokenOut,' +
+    'uint256 expectedAmountOut,uint256 minAmountOut,address receiver,bytes swaps)'));
+const EIP712_DOMAIN_TYPEHASH = keccak256(stringToHex('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'));
 /**
  * Computes the EIP-712 signing hash for client fee params.
  *
  * Pass the returned hash to the fee receiver's signer, then set the
  * 65-byte signature on the `ClientFeeParams` before passing to `withClientFee`.
  *
+ * The hash covers all 11 `ClientFee` fields: the fee params plus the swap they are bound to,
+ * which come from a prior unsigned quote request.
+ *
  * `routerAddress` is the TychoRouter contract address.
  */
-export function clientFeeSigningHash(params, chainId, routerAddress) {
-    return hashTypedData({
-        domain: {
-            name: 'TychoRouter',
-            version: '1',
-            chainId,
-            verifyingContract: routerAddress,
-        },
-        types: CLIENT_FEE_TYPE,
-        primaryType: 'ClientFee',
-        message: {
-            clientFeeBps: params.bps,
-            clientFeeReceiver: params.receiver,
-            maxClientContribution: params.maxContribution,
-            deadline: BigInt(params.deadline),
-        },
-    });
+export function clientFeeSigningHash(params, chainId, routerAddress, swap) {
+    const domainSeparator = keccak256(encodeAbiParameters([
+        { type: 'bytes32' },
+        { type: 'bytes32' },
+        { type: 'bytes32' },
+        { type: 'uint256' },
+        { type: 'address' },
+    ], [
+        EIP712_DOMAIN_TYPEHASH,
+        keccak256(stringToHex('TychoRouter')),
+        keccak256(stringToHex('1')),
+        BigInt(chainId),
+        routerAddress,
+    ]));
+    const structHash = keccak256(encodeAbiParameters([
+        { type: 'bytes32' },
+        { type: 'uint256' },
+        { type: 'address' },
+        { type: 'uint256' },
+        { type: 'uint256' },
+        { type: 'uint256' },
+        { type: 'address' },
+        { type: 'address' },
+        { type: 'uint256' },
+        { type: 'uint256' },
+        { type: 'address' },
+        { type: 'bytes32' },
+    ], [
+        CLIENT_FEE_TYPEHASH,
+        BigInt(params.bps) * CLIENT_FEE_UNITS_PER_BPS,
+        params.receiver,
+        params.maxContribution,
+        BigInt(params.deadline),
+        swap.amountIn,
+        swap.tokenIn,
+        swap.tokenOut,
+        swap.expectedAmountOut,
+        swap.minAmountOut,
+        swap.receiver,
+        swap.swapsHash,
+    ]));
+    return keccak256(concatHex(['0x1901', domainSeparator, structHash]));
 }
 /**
  * Attach client fee configuration to encoding options.

package/dist/client-fee.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-fee.js","sourceRoot":"","sources":["../src/client-fee.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,eAAe,GAAG;IACtB,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9C,EAAE,IAAI,EAAE,uBAAuB,EAAE,IAAI,EAAE,SAAS,EAAE;QAClD,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;CACO,CAAC;AAEX;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAuB,EACvB,OAAe,EACf,aAAsB;IAEtB,OAAO,aAAa,CAAC;QACnB,MAAM,EAAE;YACN,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,GAAG;YACZ,OAAO;YACP,iBAAiB,EAAE,aAAa;SACjC;QACD,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE;YACP,YAAY,EAAE,MAAM,CAAC,GAAG;YACxB,iBAAiB,EAAE,MAAM,CAAC,QAAQ;YAClC,qBAAqB,EAAE,MAAM,CAAC,eAAe;YAC7C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAqB,EACrB,MAAuB;IAEvB,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,SAAS,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACpC,MAAM,SAAS,CAAC,MAAM,CACpB,sEAAsE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAC9G,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"client-fee.js","sourceRoot":"","sources":["../src/client-fee.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC;;;;;;GAMG;AACH,MAAM,wBAAwB,GAAG,MAAO,CAAC;AAEzC,6DAA6D;AAC7D,MAAM,mBAAmB,GAAG,SAAS,CACnC,WAAW,CACT,0DAA0D;IACxD,iDAAiD;IACjD,oDAAoD;IACpD,8EAA8E,CACjF,CACF,CAAC;AAEF,MAAM,sBAAsB,GAAG,SAAS,CACtC,WAAW,CACT,oFAAoF,CACrF,CACF,CAAC;AAoBF;;;;;;;;;;GAUG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAuB,EACvB,OAAe,EACf,aAAsB,EACtB,IAA0B;IAE1B,MAAM,eAAe,GAAG,SAAS,CAC/B,mBAAmB,CACjB;QACE,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;KACpB,EACD;QACE,sBAAsB;QACtB,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACrC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,CAAC,OAAO,CAAC;QACf,aAAa;KACd,CACF,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,SAAS,CAC1B,mBAAmB,CACjB;QACE,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnB,EAAE,IAAI,EAAE,SAAS,EAAE;KACpB,EACD;QACE,mBAAmB;QACnB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,wBAAwB;QAC7C,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,OAAO;QACZ,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,iBAAiB;QACtB,IAAI,CAAC,YAAY;QACjB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,SAAS;KACf,CACF,CACF,CAAC;IAEF,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAqB,EACrB,MAAuB;IAEvB,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,SAAS,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACpC,MAAM,SAAS,CAAC,MAAM,CACpB,sEAAsE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAC9G,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;AAC9C,CAAC"}

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export type { ApprovalPayload, Eip1559Transaction, ExecutionReceipt, FyndPayload
 export { approvalSigningHash, assembleSignedSwap, DEFAULT_SETTLE_TIMEOUT_MS, swapSigningHash } from "./signing.js";
 export { permit2SigningHash, encodingOptions, withPermit2, withVaultFunds, } from "./permit2.js";
 export { clientFeeSigningHash, withClientFee, } from "./client-fee.js";
+export type { ClientFeeSwapContext } from "./client-fee.js";
 export { FyndClient } from "./client.js";
 export type { EthProvider, ExecutionOptions, FyndClientOptions, MinimalReceipt, RetryConfig, SigningHints, } from "./client.js";
 export { createFyndClient } from "./autogen.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,cAAc,EACd,WAAW,EACX,SAAS,EACT,eAAe,EACf,eAAe,EACf,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,WAAW,EACX,KAAK,EACL,cAAc,EACd,IAAI,EACJ,WAAW,EACX,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC9E,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACnH,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,cAAc,EACd,WAAW,EACX,SAAS,EACT,eAAe,EACf,eAAe,EACf,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,WAAW,EACX,KAAK,EACL,cAAc,EACd,IAAI,EACJ,WAAW,EACX,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC9E,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACnH,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAevC,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACnH,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AASzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAevC,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACnH,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,aAAa,GACd,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AASzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kayibal/fynd-client",
-  "version": "0.98.0",
+  "version": "0.99.1",
   "description": "TypeScript client for the Fynd DEX router",
   "repository": {
     "type": "git",