@spicenet-io/spiceflow-core 0.3.5 → 0.3.7

package/dist/chains/index.d.ts

@@ -1,6 +1,7 @@
 export type { Network, ChainMeta, ChainType } from "./types.js";
 export { CHAINS } from "./list.js";
 import type { Network, ChainMeta } from "./types.js";
+import { type Chain } from "viem";
 export declare function getChainMeta(chainId: number): ChainMeta | undefined;
 export declare function getChainsByNetwork(network: Network): ChainMeta[];
 export declare function getChainIdsByNetwork(network: Network): number[];
@@ -9,6 +10,9 @@ export declare function getTestnetChains(): ChainMeta[];
 /** Returns ALL chains for a network including non-EVM (StarkNet). */
 export declare function getAllChainsByNetwork(network: Network): ChainMeta[];
 export declare function getDelegateContract(chainId: number): `0x${string}` | undefined;
+export declare const VIEM_CHAINS: Record<number, Chain>;
+export declare function getViemChain(chainId: number): Chain | undefined;
+export declare function requireViemChain(chainId: number): Chain;
 export declare function isStarknetChain(chainId: number): boolean;
 /**
  * StarkNet Mainnet chain ID as a JS number.

package/dist/chains/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/chains/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGrD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAEnE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAIhE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAE/D;AAED,wBAAgB,gBAAgB,IAAI,SAAS,EAAE,CAE9C;AAED,wBAAgB,gBAAgB,IAAI,SAAS,EAAE,CAE9C;AAED,qEAAqE;AACrE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAEnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,GAAG,SAAS,CAE9E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/chains/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAE/C,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAEnE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAIhE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAE/D;AAED,wBAAgB,gBAAgB,IAAI,SAAS,EAAE,CAE9C;AAED,wBAAgB,gBAAgB,IAAI,SAAS,EAAE,CAE9C;AAED,qEAAqE;AACrE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAEnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,GAAG,SAAS,CAE9E;AA8BD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAI7C,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAE/D;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAKvD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAyB,CAAC"}

package/dist/config.d.ts

@@ -1,4 +1,6 @@
 import type { PublicClient } from "viem";
+export declare const SPICENET_NATIVE_CHAIN_ID = 4321;
+export declare function isSpicenetChainId(chainId: bigint | number | string): boolean;
 export interface SpiceFlowConfig {
     txApiUrl: string;
     delegateAddressForChain: (chainId: number) => `0x${string}`;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,KAAK,MAAM,EAAE,CAAC;IAC5D,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,YAAY,CAAC;CACzD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzC,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAE5E;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,KAAK,MAAM,EAAE,CAAC;IAC5D,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,YAAY,CAAC;CACzD"}

package/dist/index.cjs

@@ -27,9 +27,11 @@ __export(index_exports, {
   HttpError: () => HttpError,
   IntentHashAbi: () => IntentHashAbi,
   NATIVE_TOKEN_ADDRESS: () => NATIVE_TOKEN_ADDRESS,
+  SPICENET_NATIVE_CHAIN_ID: () => SPICENET_NATIVE_CHAIN_ID,
   STARKNET_MAINNET_CHAIN_ID: () => STARKNET_MAINNET_CHAIN_ID,
   SpiceFlowCore: () => SpiceFlowCore,
   TOKENS: () => TOKENS,
+  VIEM_CHAINS: () => VIEM_CHAINS,
   WCBTC_ABI: () => WCBTC_ABI,
   ZERO_ADDRESS: () => ZERO_ADDRESS,
   applySlippage: () => applySlippage,
@@ -53,15 +55,20 @@ __export(index_exports, {
   getRecentBlock: () => getRecentBlock,
   getTestnetChains: () => getTestnetChains,
   getTokenByAddress: () => getTokenByAddress,
+  getTokenBySymbol: () => getTokenBySymbol,
   getTokenDefinition: () => getTokenDefinition,
   getTokensForChain: () => getTokensForChain,
+  getViemChain: () => getViemChain,
   hashChainBatches: () => hashChainBatches,
   isBtcDenominated: () => isBtcDenominated,
   isNativeToken: () => isNativeToken,
+  isSpicenetChainId: () => isSpicenetChainId,
   isStarknetChain: () => isStarknetChain,
   isUsdDenominated: () => isUsdDenominated,
   normalizeNativeTokenAddress: () => normalizeNativeTokenAddress,
   prepareRFQT: () => prepareRFQT,
+  requireTokenBySymbol: () => requireTokenBySymbol,
+  requireViemChain: () => requireViemChain,
   resolveTokenRef: () => resolveTokenRef,
   submitTransaction: () => submitTransaction,
   truncateAddress: () => truncateAddress,
@@ -71,6 +78,12 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/config.ts
+var SPICENET_NATIVE_CHAIN_ID = 4321;
+function isSpicenetChainId(chainId) {
+  return BigInt(chainId) === BigInt(SPICENET_NATIVE_CHAIN_ID);
+}
+
 // src/authorization.ts
 var import_viem = require("viem");
 var CallComponents = [
@@ -661,6 +674,18 @@ function getTokenByAddress(address, chainId) {
   if (!entry) return void 0;
   return _resolve(entry.token, entry.deployment);
 }
+function getTokenBySymbol(symbol, chainId) {
+  return getTokensForChain(chainId).find(
+    (token) => token.symbol.toUpperCase() === symbol.toUpperCase()
+  );
+}
+function requireTokenBySymbol(symbol, chainId) {
+  const token = getTokenBySymbol(symbol, chainId);
+  if (token) return token;
+  throw new Error(
+    `Token "${symbol}" not found on chain ${chainId} in the token registry.`
+  );
+}
 function getTokenDefinition(address) {
   return _addressIndex.get(address.toLowerCase());
 }
@@ -693,10 +718,7 @@ function isBtcDenominated(address) {
 }
 function resolveTokenRef(ref) {
   const [symbol, chainId] = ref;
-  const tokens = getTokensForChain(chainId);
-  const match = tokens.find(
-    (t) => t.symbol.toUpperCase() === symbol.toUpperCase()
-  );
+  const match = getTokenBySymbol(symbol, chainId);
   if (!match) {
     throw new Error(
       `Token "${symbol}" not found on chain ${chainId} in the token registry.`
@@ -910,6 +932,7 @@ var CHAINS = {
 };
 
 // src/chains/index.ts
+var import_viem2 = require("viem");
 function getChainMeta(chainId) {
   return CHAINS[chainId];
 }
@@ -933,6 +956,41 @@ function getAllChainsByNetwork(network) {
 function getDelegateContract(chainId) {
   return CHAINS[chainId]?.delegateContract;
 }
+function toViemChain(meta) {
+  if (meta.chainType === "starknet") return void 0;
+  return (0, import_viem2.defineChain)({
+    id: meta.id,
+    name: meta.name,
+    nativeCurrency: meta.nativeCurrency,
+    rpcUrls: {
+      default: {
+        http: [meta.rpcUrl]
+      },
+      public: {
+        http: [meta.rpcUrl]
+      }
+    },
+    ...meta.blockExplorer ? {
+      blockExplorers: {
+        default: {
+          name: meta.displayName || meta.name,
+          url: meta.blockExplorer
+        }
+      }
+    } : {}
+  });
+}
+var VIEM_CHAINS = Object.fromEntries(
+  Object.values(CHAINS).map((meta) => [meta.id, toViemChain(meta)]).filter((entry) => entry[1] !== void 0)
+);
+function getViemChain(chainId) {
+  return VIEM_CHAINS[chainId];
+}
+function requireViemChain(chainId) {
+  const chain = getViemChain(chainId);
+  if (chain) return chain;
+  throw new Error(`Viem chain not found for chain ${chainId}.`);
+}
 function isStarknetChain(chainId) {
   return getChainMeta(chainId)?.chainType === "starknet";
 }
@@ -1353,7 +1411,7 @@ var uniV3SwapRouterAbi = [
 ];
 
 // src/swap.ts
-var import_viem2 = require("viem");
+var import_viem3 = require("viem");
 function applySlippage(amount, slippage = 0.03) {
   const slippageBps = BigInt(Math.floor((1 - slippage) * 1e4));
   return amount * slippageBps / 10000n;
@@ -1372,8 +1430,8 @@ function buildUniV3SwapCalls(params) {
     {
       to: tokenIn,
       value: 0n,
-      data: (0, import_viem2.encodeFunctionData)({
-        abi: import_viem2.erc20Abi,
+      data: (0, import_viem3.encodeFunctionData)({
+        abi: import_viem3.erc20Abi,
         functionName: "approve",
         args: [config.swapRouter, amountIn]
       })
@@ -1381,7 +1439,7 @@ function buildUniV3SwapCalls(params) {
     {
       to: config.swapRouter,
       value: 0n,
-      data: (0, import_viem2.encodeFunctionData)({
+      data: (0, import_viem3.encodeFunctionData)({
         abi: uniV3SwapRouterAbi,
         functionName: "exactInputSingle",
         args: [
@@ -1409,9 +1467,11 @@ function buildUniV3SwapCalls(params) {
   HttpError,
   IntentHashAbi,
   NATIVE_TOKEN_ADDRESS,
+  SPICENET_NATIVE_CHAIN_ID,
   STARKNET_MAINNET_CHAIN_ID,
   SpiceFlowCore,
   TOKENS,
+  VIEM_CHAINS,
   WCBTC_ABI,
   ZERO_ADDRESS,
   applySlippage,
@@ -1435,15 +1495,20 @@ function buildUniV3SwapCalls(params) {
   getRecentBlock,
   getTestnetChains,
   getTokenByAddress,
+  getTokenBySymbol,
   getTokenDefinition,
   getTokensForChain,
+  getViemChain,
   hashChainBatches,
   isBtcDenominated,
   isNativeToken,
+  isSpicenetChainId,
   isStarknetChain,
   isUsdDenominated,
   normalizeNativeTokenAddress,
   prepareRFQT,
+  requireTokenBySymbol,
+  requireViemChain,
   resolveTokenRef,
   submitTransaction,
   truncateAddress,

package/dist/index.js

@@ -1,3 +1,9 @@
+// src/config.ts
+var SPICENET_NATIVE_CHAIN_ID = 4321;
+function isSpicenetChainId(chainId) {
+  return BigInt(chainId) === BigInt(SPICENET_NATIVE_CHAIN_ID);
+}
+
 // src/authorization.ts
 import { encodeAbiParameters, keccak256 } from "viem";
 var CallComponents = [
@@ -588,6 +594,18 @@ function getTokenByAddress(address, chainId) {
   if (!entry) return void 0;
   return _resolve(entry.token, entry.deployment);
 }
+function getTokenBySymbol(symbol, chainId) {
+  return getTokensForChain(chainId).find(
+    (token) => token.symbol.toUpperCase() === symbol.toUpperCase()
+  );
+}
+function requireTokenBySymbol(symbol, chainId) {
+  const token = getTokenBySymbol(symbol, chainId);
+  if (token) return token;
+  throw new Error(
+    `Token "${symbol}" not found on chain ${chainId} in the token registry.`
+  );
+}
 function getTokenDefinition(address) {
   return _addressIndex.get(address.toLowerCase());
 }
@@ -620,10 +638,7 @@ function isBtcDenominated(address) {
 }
 function resolveTokenRef(ref) {
   const [symbol, chainId] = ref;
-  const tokens = getTokensForChain(chainId);
-  const match = tokens.find(
-    (t) => t.symbol.toUpperCase() === symbol.toUpperCase()
-  );
+  const match = getTokenBySymbol(symbol, chainId);
   if (!match) {
     throw new Error(
       `Token "${symbol}" not found on chain ${chainId} in the token registry.`
@@ -837,6 +852,7 @@ var CHAINS = {
 };
 
 // src/chains/index.ts
+import { defineChain } from "viem";
 function getChainMeta(chainId) {
   return CHAINS[chainId];
 }
@@ -860,6 +876,41 @@ function getAllChainsByNetwork(network) {
 function getDelegateContract(chainId) {
   return CHAINS[chainId]?.delegateContract;
 }
+function toViemChain(meta) {
+  if (meta.chainType === "starknet") return void 0;
+  return defineChain({
+    id: meta.id,
+    name: meta.name,
+    nativeCurrency: meta.nativeCurrency,
+    rpcUrls: {
+      default: {
+        http: [meta.rpcUrl]
+      },
+      public: {
+        http: [meta.rpcUrl]
+      }
+    },
+    ...meta.blockExplorer ? {
+      blockExplorers: {
+        default: {
+          name: meta.displayName || meta.name,
+          url: meta.blockExplorer
+        }
+      }
+    } : {}
+  });
+}
+var VIEM_CHAINS = Object.fromEntries(
+  Object.values(CHAINS).map((meta) => [meta.id, toViemChain(meta)]).filter((entry) => entry[1] !== void 0)
+);
+function getViemChain(chainId) {
+  return VIEM_CHAINS[chainId];
+}
+function requireViemChain(chainId) {
+  const chain = getViemChain(chainId);
+  if (chain) return chain;
+  throw new Error(`Viem chain not found for chain ${chainId}.`);
+}
 function isStarknetChain(chainId) {
   return getChainMeta(chainId)?.chainType === "starknet";
 }
@@ -1335,9 +1386,11 @@ export {
   HttpError,
   IntentHashAbi,
   NATIVE_TOKEN_ADDRESS,
+  SPICENET_NATIVE_CHAIN_ID,
   STARKNET_MAINNET_CHAIN_ID,
   SpiceFlowCore,
   TOKENS,
+  VIEM_CHAINS,
   WCBTC_ABI,
   ZERO_ADDRESS,
   applySlippage,
@@ -1361,15 +1414,20 @@ export {
   getRecentBlock,
   getTestnetChains,
   getTokenByAddress,
+  getTokenBySymbol,
   getTokenDefinition,
   getTokensForChain,
+  getViemChain,
   hashChainBatches,
   isBtcDenominated,
   isNativeToken,
+  isSpicenetChainId,
   isStarknetChain,
   isUsdDenominated,
   normalizeNativeTokenAddress,
   prepareRFQT,
+  requireTokenBySymbol,
+  requireViemChain,
   resolveTokenRef,
   submitTransaction,
   truncateAddress,

package/dist/tokens/index.d.ts

@@ -4,6 +4,8 @@ import type { TokenDefinition, TokenDeployment, Token } from "./types.js";
 import type { ChainToken, TokenRef } from "../types.js";
 export declare function getTokensForChain(chainId: number): Token[];
 export declare function getTokenByAddress(address: string, chainId: number): Token | undefined;
+export declare function getTokenBySymbol(symbol: string, chainId: number): Token | undefined;
+export declare function requireTokenBySymbol(symbol: string, chainId: number): Token;
 export declare function getTokenDefinition(address: string): TokenDefinition | undefined;
 export declare function getDeployment(address: string, chainId: number): TokenDeployment | undefined;
 export declare function getEquivalentAddresses(tokenAddress: string): string[];

package/dist/tokens/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tokens/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AA8DxD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,CAI1D;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAIrF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE/E;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE3F;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAIrE;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAK3D;AAKD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,UAAU,CAmBzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tokens/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AA8DxD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,CAI1D;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAIrF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAInF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAO3E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE/E;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE3F;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAIrE;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAK3D;AAKD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,UAAU,CAgBzD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spicenet-io/spiceflow-core",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",