@7kprotocol/sdk-ts 3.5.4 → 3.6.1-beta.0

package/README.md

@@ -29,8 +29,6 @@ Key features:
 - **Limit Orders**: Place and manage limit orders for token swaps
 - **DCA Orders**: Set up dollar-cost averaging strategies for automated
   recurring purchases
-- **BluefinX Integration**: Access RFQ-based trading with sponsored transactions
-  and MEV protection
 - **Type Safety**: Full TypeScript support with comprehensive type definitions
 - **Mainnet Support**: Production-ready SDK for Sui mainnet
 - **Flexible Configuration**: Customize API keys, slippage, commissions, and
@@ -112,7 +110,7 @@ import SevenK from "@7kprotocol/sdk-ts";
 or import specific functions as needed:
 
 ```typescript
-import { getQuote, buildTx } from "@7kprotocol/sdk-ts";
+import { MetaAg, getTokenPrice } from "@7kprotocol/sdk-ts";
 ```
 
 Note: this package only supports **mainnet**.
@@ -121,14 +119,6 @@ Note: this package only supports **mainnet**.
 
 See [Meta Aggregator](docs/META_AG.md).
 
-## Swap
-
-See [Swap](docs/SWAP.md).
-
-## BluefinX
-
-See [BluefinX](docs/BLUEFINX.md).
-
 ## Limit Orders
 
 See [Limit Orders](docs/LIMIT.md).

package/lib/cjs/config/fetchClient.js

@@ -1,17 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchClient = fetchClient;
-const index_1 = require("./index");
 async function fetchClient(input, init) {
     const headers = new Headers(init?.headers);
-    const apiKey = (index_1.Config.getApiKey() || "").trim();
-    const bluefinXApiKey = (index_1.Config.getBluefinXApiKey() || "").trim();
-    if (apiKey) {
-        headers.set("apiKey", apiKey);
-    }
-    if (bluefinXApiKey) {
-        headers.set("Bluefin-X-API-Key", bluefinXApiKey);
-    }
+    // intercept the request and add the headers go here...
     const modifiedInit = {
         ...init,
         headers,

package/lib/cjs/constants/_7k.js

@@ -1,15 +1,18 @@
 "use strict";
+// export const _7K_PACKAGE_ID =
+//   "0x62412b7268c35f3808336aee57a52836501f40b8ba5d936f8ad275e672befd04";
+// //legacy V4: "0xe8f996ea6ff38c557c253d3b93cfe2ebf393816487266786371aa4532a9229f2";
+// //legacy V3: "0x7ea6e27ad7af6f3b8671d59df1aaebd7c03dddab893e52a714227b2f4fe91519";
+// //legacy V2: "0xa13447019cd982d6bef91cf7b46ad384a52583b1dfc2bdecf31ef0c4bd787a0f";
+// //legacy V1: "0xd48e7cdc9e92bec69ce3baa75578010458a0c5b2733d661a84971e8cef6806bc";
+// export const _7K_CONFIG =
+//   "0x47442a93f7727d188ba7cb71031170d1786af70013cb7ad5115f3fe877ff0c54";
+// //legacy v3: "0x0f8fc23dbcc9362b72c7a4c5aa53fcefa02ebfbb83a812c8c262ccd2c076d9ee";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._7K_PARTNER_ADDRESS = exports._7K_META_CONFIG = exports._7K_META_VAULT = exports._7K_META_PACKAGE_ID = exports._7K_META_PUBLISHED_AT = exports._7K_VAULT = exports._7K_CONFIG = exports._7K_PACKAGE_ID = void 0;
-exports._7K_PACKAGE_ID = "0x62412b7268c35f3808336aee57a52836501f40b8ba5d936f8ad275e672befd04";
-//legacy V4: "0xe8f996ea6ff38c557c253d3b93cfe2ebf393816487266786371aa4532a9229f2";
-//legacy V3: "0x7ea6e27ad7af6f3b8671d59df1aaebd7c03dddab893e52a714227b2f4fe91519";
-//legacy V2: "0xa13447019cd982d6bef91cf7b46ad384a52583b1dfc2bdecf31ef0c4bd787a0f";
-//legacy V1: "0xd48e7cdc9e92bec69ce3baa75578010458a0c5b2733d661a84971e8cef6806bc";
-exports._7K_CONFIG = "0x47442a93f7727d188ba7cb71031170d1786af70013cb7ad5115f3fe877ff0c54";
-//legacy v3: "0x0f8fc23dbcc9362b72c7a4c5aa53fcefa02ebfbb83a812c8c262ccd2c076d9ee";
-exports._7K_VAULT = "0x442ad50389ed5cda6f7a6f5a7ae6361a4c05ef1d9fb2e54fbba5a268d690bfe6";
-//legacy v3: "0x39a3c55742c0e011b6f65548e73cf589e1ae5e82dbfab449ca57f24c3bcd9514";
+exports._7K_PARTNER_ADDRESS = exports._7K_META_CONFIG = exports._7K_META_VAULT = exports._7K_META_PACKAGE_ID = exports._7K_META_PUBLISHED_AT = void 0;
+// export const _7K_VAULT =
+//   "0x442ad50389ed5cda6f7a6f5a7ae6361a4c05ef1d9fb2e54fbba5a268d690bfe6";
+// //legacy v3: "0x39a3c55742c0e011b6f65548e73cf589e1ae5e82dbfab449ca57f24c3bcd9514";
 exports._7K_META_PUBLISHED_AT = "0x17c0b1f7a6ad73f51268f16b8c06c049eecc2f28a270cdd29c06e3d2dea23302";
 exports._7K_META_PACKAGE_ID = "0x17c0b1f7a6ad73f51268f16b8c06c049eecc2f28a270cdd29c06e3d2dea23302";
 exports._7K_META_VAULT = "0x9a8abd32fe5721307ce3b697cf982ee84e9ffbd58d667a4a199f1683c1a3d23c";

package/lib/cjs/constants/apiEndpoints.js

@@ -4,6 +4,6 @@ exports.API_ENDPOINTS = void 0;
 exports.API_ENDPOINTS = {
     MAIN: "https://api.7k.ag",
     LO_DCA: "https://lod-dca.7k.ag",
-    PRICES: "https://prices.7k.ag",
+    PRICES: "https://lp-pro-api.7k.ag/price",
     STATISTIC: "https://statistic.7k.ag",
 };

package/lib/cjs/features/metaAg/common.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.timeout = exports.metaSettle = exports.simulateAggregator = exports.simulateSwapTx = void 0;
+const transactions_1 = require("@mysten/sui/transactions");
+const _7k_1 = require("../../constants/_7k");
+const swap_1 = require("../../utils/swap");
+const error_1 = require("./error");
+const simulateSwapTx = async (tx, inspector, simulation) => {
+    const res = await (0, exports.timeout)(() => inspector.devInspectTransactionBlock({
+        sender: simulation.sender,
+        transactionBlock: tx,
+    }), simulation.timeout ?? 2000);
+    if (res.effects.status.status === "failure") {
+        throw new error_1.MetaAgError(res.error ?? "Simulation failed", error_1.MetaAgErrorCode.SIMULATION_FAILED, { error: res.error });
+    }
+    const amountOut = extractAmountOutWrapper(res.events);
+    return {
+        simulatedAmountOut: amountOut,
+        gasUsed: res.effects.gasUsed,
+    };
+};
+exports.simulateSwapTx = simulateSwapTx;
+const simulateAggregator = async (provider, quote, simulation, inspector, options) => {
+    const tx = new transactions_1.Transaction();
+    const coinOut = await provider.swap({
+        quote,
+        coinIn: (0, transactions_1.coinWithBalance)({
+            balance: BigInt(quote.amountIn),
+            type: quote.coinTypeIn,
+            useGasCoin: false,
+        }),
+        signer: simulation.sender,
+        tx,
+    });
+    tx.add((0, exports.metaSettle)(quote, coinOut, 10000, options.tipBps, options.partner, options.partnerCommissionBps));
+    tx.transferObjects([coinOut], simulation.sender);
+    const res = await (0, exports.simulateSwapTx)(tx, inspector, simulation);
+    return {
+        id: quote.id,
+        provider: provider.kind,
+        ...res,
+    };
+};
+exports.simulateAggregator = simulateAggregator;
+/**
+ * this settlement does not charge commission fee for partner, since all integrated aggregators already charge commission fee for partner
+ * @param quote Meta Aggregator Quote
+ * @param coinOut Coin Out Object
+ * @param slippageBps Slippage Bps
+ * @param tipBps Tip Bps default = 0
+ * @param partner address of partner for analytic default is zero address
+ */
+const metaSettle = (quote, coinOut, slippageBps = 100, tipBps = 0, partner, commissionBps = 0) => {
+    return (tx) => {
+        const { minAmount, expectedAmount } = (0, swap_1.getExpectedReturn)(quote.rawAmountOut, slippageBps, commissionBps, tipBps);
+        if (tipBps > 0) {
+            tx.moveCall({
+                target: `${_7k_1._7K_META_PUBLISHED_AT}::vault::collect_tip`,
+                typeArguments: [quote.coinTypeOut],
+                arguments: [
+                    tx.object(_7k_1._7K_META_VAULT),
+                    tx.object(_7k_1._7K_META_CONFIG),
+                    coinOut,
+                    tx.pure.u64(tipBps),
+                ],
+            });
+        }
+        tx.moveCall({
+            target: `${_7k_1._7K_META_PUBLISHED_AT}::settle::settle`,
+            typeArguments: [quote.coinTypeIn, quote.coinTypeOut],
+            arguments: [
+                tx.object(_7k_1._7K_META_CONFIG),
+                tx.object(_7k_1._7K_META_VAULT),
+                tx.pure.u64(quote.amountIn),
+                coinOut,
+                tx.pure.u64(minAmount),
+                tx.pure.u64(expectedAmount),
+                tx.pure.option("address", partner),
+                tx.pure.u64(commissionBps),
+                tx.pure.u64(0), // ps
+            ],
+        });
+    };
+};
+exports.metaSettle = metaSettle;
+const extractAmountOutWrapper = (events) => {
+    const swapEvent = events
+        .filter((event) => event.type === `${_7k_1._7K_META_PACKAGE_ID}::settle::Swap`)
+        ?.pop();
+    return swapEvent?.parsedJson?.amount_out;
+};
+const timeout = async (fn, timeout, msg) => {
+    if (timeout <= 0)
+        return fn();
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new error_1.MetaAgError(`Timeout ${msg ?? "operation"}`, error_1.MetaAgErrorCode.TIMEOUT, { timeout })), timeout);
+        fn()
+            .then(resolve)
+            .catch(reject)
+            .finally(() => clearTimeout(timer));
+    });
+};
+exports.timeout = timeout;

package/lib/cjs/features/metaAg/error.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetaAgError = exports.MetaAgErrorCode = void 0;
+var MetaAgErrorCode;
+(function (MetaAgErrorCode) {
+    MetaAgErrorCode[MetaAgErrorCode["UNKNOWN"] = 1000] = "UNKNOWN";
+    MetaAgErrorCode[MetaAgErrorCode["TIMEOUT"] = 1001] = "TIMEOUT";
+    MetaAgErrorCode[MetaAgErrorCode["PROVIDER_NOT_FOUND"] = 1002] = "PROVIDER_NOT_FOUND";
+    MetaAgErrorCode[MetaAgErrorCode["PROVIDER_NOT_SUPPORTED"] = 1003] = "PROVIDER_NOT_SUPPORTED";
+    MetaAgErrorCode[MetaAgErrorCode["INVALID_QUOTE"] = 1004] = "INVALID_QUOTE";
+    MetaAgErrorCode[MetaAgErrorCode["QUOTE_NOT_FOUND"] = 1005] = "QUOTE_NOT_FOUND";
+    MetaAgErrorCode[MetaAgErrorCode["INVALID_SIGNER_ADDRESS"] = 1006] = "INVALID_SIGNER_ADDRESS";
+    MetaAgErrorCode[MetaAgErrorCode["PROVIDER_NOT_SUPPORT_SWAP"] = 1007] = "PROVIDER_NOT_SUPPORT_SWAP";
+    MetaAgErrorCode[MetaAgErrorCode["SIMULATION_FAILED"] = 1008] = "SIMULATION_FAILED";
+    // OKX error
+    MetaAgErrorCode[MetaAgErrorCode["OKX_FINALIZE_COMMAND_NOT_FOUND"] = 1100] = "OKX_FINALIZE_COMMAND_NOT_FOUND";
+})(MetaAgErrorCode || (exports.MetaAgErrorCode = MetaAgErrorCode = {}));
+class MetaAgError extends Error {
+    constructor(message, code, details) {
+        super(message);
+        this.name = "MetaAgError";
+        this.code = code ?? MetaAgErrorCode.UNKNOWN;
+        this.details = details;
+    }
+    static assert(condition, message, code, details) {
+        if (!condition) {
+            throw new MetaAgError(message ?? "Assertion failed", code, details);
+        }
+    }
+}
+exports.MetaAgError = MetaAgError;

package/lib/cjs/features/metaAg/index.js

@@ -37,13 +37,14 @@ exports.MetaAg = void 0;
 const client_1 = require("@mysten/sui/client");
 const transactions_1 = require("@mysten/sui/transactions");
 const utils_1 = require("@mysten/sui/utils");
-const _7k_1 = require("../../constants/_7k");
 const sui_1 = require("../../constants/sui");
 const metaAg_1 = require("../../types/metaAg");
-const condition_1 = require("../../utils/condition");
+const sui_2 = require("../../utils/sui");
 const SuiClientUtils_1 = require("../../utils/SuiClientUtils");
-const buildTx_1 = require("../swap/buildTx");
-const bluefin_1 = require("./providers/bluefin");
+const swap_1 = require("../../utils/swap");
+const common_1 = require("./common");
+const error_1 = require("./error");
+const okx_1 = require("./providers/okx");
 const HERMES_API = "https://hermes.pyth.network";
 const DEFAULT_PROVIDERS = {
     [metaAg_1.EProvider.BLUEFIN7K]: {},
@@ -72,10 +73,11 @@ class MetaAg {
         if (p)
             return p;
         const providerOptions = this.options.providers[provider];
-        (0, condition_1.assert)(!!providerOptions, `Provider not found: ${provider}`);
+        error_1.MetaAgError.assert(!!providerOptions, `Provider not found: ${provider}`, error_1.MetaAgErrorCode.PROVIDER_NOT_FOUND, { provider });
         switch (provider) {
             case metaAg_1.EProvider.BLUEFIN7K:
-                this.providers[metaAg_1.EProvider.BLUEFIN7K] = new bluefin_1.BluefinProvider(providerOptions, this.options, this.client);
+                const { Bluefin7kProvider } = await Promise.resolve().then(() => __importStar(require("./providers/bluefin7k"))).catch(catchImportError(metaAg_1.EProvider.BLUEFIN7K));
+                this.providers[metaAg_1.EProvider.BLUEFIN7K] = new Bluefin7kProvider(providerOptions, this.options, this.client);
                 break;
             case metaAg_1.EProvider.FLOWX:
                 const { FlowxProvider } = await Promise.resolve().then(() => __importStar(require("./providers/flowx"))).catch(catchImportError(metaAg_1.EProvider.FLOWX));
@@ -85,69 +87,64 @@ class MetaAg {
                 const { CetusProvider } = await Promise.resolve().then(() => __importStar(require("./providers/cetus"))).catch(catchImportError(metaAg_1.EProvider.CETUS));
                 this.providers[metaAg_1.EProvider.CETUS] = new CetusProvider(providerOptions, this.options, this.client);
                 break;
+            case metaAg_1.EProvider.OKX:
+                this.providers[metaAg_1.EProvider.OKX] = new okx_1.OkxProvider(providerOptions, this.options, this.client);
+                break;
             default:
-                throw new Error(`Provider not supported: ${provider}`);
+                throw new error_1.MetaAgError(`Provider not supported: ${provider}`, error_1.MetaAgErrorCode.PROVIDER_NOT_SUPPORTED, { provider });
         }
         return this.providers[provider];
     }
     async _simulate(provider, quote, simulation) {
         try {
-            const tx = new transactions_1.Transaction();
-            const id = quote.id;
-            const coinOut = await provider.swap({
-                quote,
-                coinIn: (0, transactions_1.coinWithBalance)({
-                    balance: BigInt(quote.amountIn),
-                    type: quote.coinTypeIn,
-                    useGasCoin: false,
-                }),
-                signer: simulation.sender,
-                tx,
-            });
-            tx.add(metaSettle(quote, coinOut, 10000, this.options.tipBps, this.options.partner, this.options.partnerCommissionBps));
-            tx.transferObjects([coinOut], simulation.sender);
-            const res = await timeout(() => this.inspector.devInspectTransactionBlock({
-                sender: simulation.sender,
-                transactionBlock: tx,
-            }), simulation.timeout ?? 2000, `simulation for ${provider.kind} provider with id ${id}`);
-            if (res.effects.status.status === "failure") {
-                throw new Error(res.error ?? "Simulation failed");
+            if ((0, metaAg_1.isAggregatorProvider)(provider)) {
+                return (0, common_1.simulateAggregator)(provider, quote, simulation, this.inspector, this.options);
+            }
+            switch (quote.provider) {
+                case metaAg_1.EProvider.OKX:
+                    return (0, okx_1.simulateOKXSwap)(quote, this.inspector, simulation, this.options);
+                default:
+                    throw new error_1.MetaAgError(`Provider not supported: ${provider.kind}`, error_1.MetaAgErrorCode.PROVIDER_NOT_SUPPORTED, { provider: provider.kind });
             }
-            const amountOut = extractAmountOutWrapper(res.events);
-            return {
-                id,
-                simulatedAmountOut: amountOut,
-                gasUsed: res.effects.gasUsed,
-                provider: provider.kind,
-            };
         }
         catch (error) {
-            console.warn(`Failed to simulate ${provider.kind}: `, error);
+            console.warn(error, { provider: provider.kind, quote: quote.id });
         }
     }
-    async _quote(provider, options, simulation) {
-        const quote = await timeout(async () => {
+    async _quote(provider, options) {
+        const quote = await (0, common_1.timeout)(async () => {
             const quote = await provider.quote(options);
-            const { expectedAmount } = (0, buildTx_1.getExpectedReturn)(quote.rawAmountOut, 0, this.options.partnerCommissionBps, this.options.tipBps);
+            if (!quote)
+                return null;
+            const { expectedAmount } = (0, swap_1.getExpectedReturn)(quote.rawAmountOut, 0, this.options.partnerCommissionBps, this.options.tipBps);
             quote.amountOut = expectedAmount;
             return quote;
-        }, options.timeout ?? 2000, `quote for ${provider.kind} provider from ${options.coinInType} to ${options.coinOutType}`);
-        if (simulation) {
-            if (simulation.onSimulated) {
-                this._simulate(provider, quote, simulation).then((payload) => {
-                    if (payload) {
-                        simulation.onSimulated?.(payload);
-                    }
-                });
-            }
-            else {
-                const updated = await this._simulate(provider, quote, simulation);
-                quote.simulatedAmountOut = updated?.simulatedAmountOut;
-                quote.gasUsed = updated?.gasUsed;
-            }
-        }
+        }, options.timeout ?? 2000, `quote for ${provider.kind} provider from ${options.coinTypeIn} to ${options.coinTypeOut}`);
         return quote;
     }
+    async _fastSwap({ quote, signer, useGasCoin, signTransaction }, getTransactionBlockParams) {
+        const tx = new transactions_1.Transaction();
+        const coin = await this.swap({
+            quote,
+            signer,
+            tx,
+            coinIn: (0, transactions_1.coinWithBalance)({
+                type: quote.coinTypeIn,
+                balance: BigInt(quote.amountIn),
+                useGasCoin,
+            }),
+        });
+        tx.transferObjects([coin], signer);
+        tx.setSenderIfNotSet(signer);
+        const txBytes = await tx.build({ client: this.client });
+        const { signature, bytes } = await signTransaction((0, utils_1.toBase64)(txBytes));
+        return this.client.executeTransactionBlock({
+            transactionBlock: bytes,
+            signature,
+            options: getTransactionBlockParams?.options,
+            signal: getTransactionBlockParams?.signal,
+        });
+    }
     /**
      * Get quotes from all providers
      * @param options - quote options
@@ -157,35 +154,73 @@ class MetaAg {
     async quote(options, simulation) {
         const opts = {
             ...options,
-            coinInType: (0, utils_1.normalizeStructTag)(options.coinInType),
-            coinOutType: (0, utils_1.normalizeStructTag)(options.coinOutType),
+            coinTypeIn: (0, utils_1.normalizeStructTag)(options.coinTypeIn),
+            coinTypeOut: (0, utils_1.normalizeStructTag)(options.coinTypeOut),
         };
         const quotes = await Promise.allSettled(Object.entries(this.options.providers)
             .filter(([_k, v]) => !v.disabled)
             .map(async ([provider]) => {
             const p = await this._getProvider(provider);
-            return this._quote(p, opts, simulation);
+            return this._quote(p, opts);
         }));
-        return quotes
+        const result = quotes
             .map((quote) => quote.status === "fulfilled"
             ? quote.value
             : (console.log(quote.reason), null))
             .filter((quote) => quote !== null);
+        if (simulation) {
+            const requests = result.map(async (quote) => {
+                const provider = await this._getProvider(quote.provider);
+                const updated = await this._simulate(provider, quote, simulation);
+                quote.simulatedAmountOut = updated?.simulatedAmountOut;
+                quote.gasUsed = updated?.gasUsed;
+                simulation?.onSimulated?.({ ...quote });
+            });
+            if (!simulation.onSimulated) {
+                await Promise.all(requests);
+            }
+        }
+        return result;
     }
     /**
      * Build transaction from quote
+     * @info Use this function to build composable transaction (ie: add more commands after the swap, consume the coin out object)
+     * @warning Providers that build transaction on the fly (typically RFQ, Swap-API providers ie: Okx, ...) are not supported, please use `fastSwap` instead
      * @param options - build tx options
      * @param slippageBps - slippage bps if not specified, fallback to global slippage bps, if none of them specified, default to 100
      * @returns coin out object, you must consume it by transferObjects, or other sub sequence commands
      */
     async swap(options, slippageBps) {
         const provider = await this._getProvider(options.quote.provider);
-        (0, condition_1.assert)(!!provider, `Provider not found: ${options.quote.provider}`);
+        error_1.MetaAgError.assert(!!provider, `Provider not found: ${options.quote.provider}`, error_1.MetaAgErrorCode.PROVIDER_NOT_FOUND, { provider: options.quote.provider });
+        error_1.MetaAgError.assert((0, metaAg_1.isAggregatorProvider)(provider), `Provider does not support swap: ${provider.kind}, use fastSwap instead`, error_1.MetaAgErrorCode.PROVIDER_NOT_SUPPORT_SWAP, { provider: provider.kind });
+        error_1.MetaAgError.assert(!(0, sui_2.isSystemAddress)(options.signer), "Invalid signer address", error_1.MetaAgErrorCode.INVALID_SIGNER_ADDRESS, { signer: options.signer });
         const coinOut = await provider.swap(options);
-        options.tx.add(metaSettle(options.quote, coinOut, slippageBps ?? this.options.slippageBps ?? 100, this.options.tipBps, this.options.partner, this.options.partnerCommissionBps));
+        options.tx.add((0, common_1.metaSettle)(options.quote, coinOut, slippageBps ?? this.options.slippageBps ?? 100, this.options.tipBps, this.options.partner, this.options.partnerCommissionBps));
         options.tx.setSenderIfNotSet(options.signer);
         return coinOut;
     }
+    /**
+     * Build, Sign, and Execute transaction in one step
+     * @param options - fast swap options
+     * @returns - txDigest of the transaction
+     */
+    async fastSwap(options, getTransactionBlockParams) {
+        error_1.MetaAgError.assert(!(0, sui_2.isSystemAddress)(options.signer), "Invalid signer address", error_1.MetaAgErrorCode.INVALID_SIGNER_ADDRESS, { signer: options.signer });
+        const provider = await this._getProvider(options.quote.provider);
+        if ((0, metaAg_1.isAggregatorProvider)(provider)) {
+            return this._fastSwap(options, getTransactionBlockParams);
+        }
+        else if ((0, metaAg_1.isSwapAPIProvider)(provider)) {
+            return this.client.waitForTransaction({
+                ...getTransactionBlockParams,
+                digest: await provider.fastSwap(options),
+            });
+        }
+        else {
+            throw new error_1.MetaAgError(`Provider not supported: ${provider.kind}`, error_1.MetaAgErrorCode.PROVIDER_NOT_SUPPORTED, { provider: provider.kind });
+        }
+    }
     /**
      * Update meta aggregator options
      * @param options - update options payload
@@ -219,71 +254,15 @@ class MetaAg {
     }
 }
 exports.MetaAg = MetaAg;
-/**
- * this settlement does not charge commission fee for partner, since all integrated aggregators already charge commission fee for partner
- * @param quote Meta Aggregator Quote
- * @param coinOut Coin Out Object
- * @param slippageBps Slippage Bps
- * @param tipBps Tip Bps default = 0
- * @param partner address of partner for analytic default is zero address
- */
-const metaSettle = (quote, coinOut, slippageBps = 100, tipBps = 0, partner, commissionBps = 0) => {
-    return (tx) => {
-        const { minAmount, expectedAmount } = (0, buildTx_1.getExpectedReturn)(quote.rawAmountOut, slippageBps, commissionBps, tipBps);
-        if (tipBps > 0) {
-            tx.moveCall({
-                target: `${_7k_1._7K_META_PUBLISHED_AT}::vault::collect_tip`,
-                typeArguments: [quote.coinTypeOut],
-                arguments: [
-                    tx.object(_7k_1._7K_META_VAULT),
-                    tx.object(_7k_1._7K_META_CONFIG),
-                    coinOut,
-                    tx.pure.u64(tipBps),
-                ],
-            });
-        }
-        tx.moveCall({
-            target: `${_7k_1._7K_META_PUBLISHED_AT}::settle::settle`,
-            typeArguments: [quote.coinTypeIn, quote.coinTypeOut],
-            arguments: [
-                tx.object(_7k_1._7K_META_CONFIG),
-                tx.object(_7k_1._7K_META_VAULT),
-                tx.pure.u64(quote.amountIn),
-                coinOut,
-                tx.pure.u64(minAmount),
-                tx.pure.u64(expectedAmount),
-                tx.pure.option("address", partner),
-                tx.pure.u64(commissionBps),
-                tx.pure.u64(0), // ps
-            ],
-        });
-    };
-};
-const extractAmountOutWrapper = (events) => {
-    const swapEvent = events
-        .filter((event) => event.type === `${_7k_1._7K_META_PACKAGE_ID}::settle::Swap`)
-        ?.pop();
-    return swapEvent?.parsedJson?.amount_out;
-};
 const catchImportError = (provider) => {
     return (e) => {
         const map = {
             [metaAg_1.EProvider.CETUS]: "@cetusprotocol/aggregator-sdk",
             [metaAg_1.EProvider.FLOWX]: "@flowx-finance/sdk",
-            [metaAg_1.EProvider.BLUEFIN7K]: "@7kprotocol/sdk-ts",
+            [metaAg_1.EProvider.BLUEFIN7K]: "@bluefin-exchange/bluefin7k-aggregator-sdk",
+            [metaAg_1.EProvider.OKX]: "",
         };
         console.warn(`Please install ${map[provider]} to use ${provider} provider`);
         throw e;
     };
 };
-const timeout = async (fn, timeout, msg) => {
-    if (timeout <= 0)
-        return fn();
-    return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => reject(new Error(`Timeout ${msg ?? "operation"}`)), timeout);
-        fn()
-            .then(resolve)
-            .catch(reject)
-            .finally(() => clearTimeout(timer));
-    });
-};

package/lib/cjs/features/metaAg/providers/bluefin7k.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Bluefin7kProvider = void 0;
+const bluefin7k_aggregator_sdk_1 = require("@bluefin-exchange/bluefin7k-aggregator-sdk");
+const uuid_1 = require("uuid");
+const _7k_1 = require("../../../constants/_7k");
+const metaAg_1 = require("../../../types/metaAg");
+const error_1 = require("../error");
+class Bluefin7kProvider {
+    constructor(options, metaOptions, client) {
+        this.options = options;
+        this.metaOptions = metaOptions;
+        this.kind = metaAg_1.EProvider.BLUEFIN7K;
+        if (options.apiKey)
+            bluefin7k_aggregator_sdk_1.Config.setApiKey(options.apiKey);
+        bluefin7k_aggregator_sdk_1.Config.setSuiClient(client);
+    }
+    async quote(quoteOptions) {
+        const quote = await (0, bluefin7k_aggregator_sdk_1.getQuote)({
+            tokenIn: quoteOptions.coinTypeIn,
+            tokenOut: quoteOptions.coinTypeOut,
+            amountIn: quoteOptions.amountIn,
+            sources: this.options.sources,
+            excludedPools: this.options.excludedPools,
+            targetPools: this.options.targetPools,
+        });
+        error_1.MetaAgError.assert(!!quote, "No quote found", error_1.MetaAgErrorCode.QUOTE_NOT_FOUND, { provider: this.kind });
+        return {
+            id: (0, uuid_1.v4)(),
+            provider: metaAg_1.EProvider.BLUEFIN7K,
+            quote,
+            amountIn: quote.swapAmountWithDecimal,
+            rawAmountOut: quote.returnAmountWithDecimal,
+            amountOut: quote.returnAmountWithDecimal,
+            coinTypeIn: quoteOptions.coinTypeIn,
+            coinTypeOut: quoteOptions.coinTypeOut,
+        };
+    }
+    async swap({ quote, signer, tx, coinIn }) {
+        error_1.MetaAgError.assert(quote.provider === metaAg_1.EProvider.BLUEFIN7K, "Invalid quote", error_1.MetaAgErrorCode.INVALID_QUOTE, { quote, expectedProvider: metaAg_1.EProvider.BLUEFIN7K });
+        const { coinOut } = await (0, bluefin7k_aggregator_sdk_1.buildTx)({
+            quoteResponse: quote.quote,
+            accountAddress: signer,
+            commission: {
+                commissionBps: 0,
+                partner: _7k_1._7K_PARTNER_ADDRESS,
+            },
+            slippage: 1,
+            extendTx: {
+                tx,
+                coinIn,
+            },
+        });
+        return coinOut;
+    }
+}
+exports.Bluefin7kProvider = Bluefin7kProvider;

package/lib/cjs/features/metaAg/providers/cetus.js

@@ -5,7 +5,7 @@ const aggregator_sdk_1 = require("@cetusprotocol/aggregator-sdk");
 const uuid_1 = require("uuid");
 const _7k_1 = require("../../../constants/_7k");
 const metaAg_1 = require("../../../types/metaAg");
-const condition_1 = require("../../../utils/condition");
+const error_1 = require("../error");
 class CetusProvider {
     constructor(options, metaOptions, client) {
         this.options = options;
@@ -24,8 +24,8 @@ class CetusProvider {
         const quote = await this.cetusClient.findRouters({
             amount: quoteOptions.amountIn,
             byAmountIn: true,
-            from: quoteOptions.coinInType,
-            target: quoteOptions.coinOutType,
+            from: quoteOptions.coinTypeIn,
+            target: quoteOptions.coinTypeOut,
             providers: this.options.sources,
             splitCount: this.options.splitCount,
             splitAlgorithm: this.options.splitAlgorithm,
@@ -33,7 +33,7 @@ class CetusProvider {
             depth: this.options.depth,
             liquidityChanges: this.options.liquidityChanges,
         });
-        (0, condition_1.assert)(!!quote, "No quote found");
+        error_1.MetaAgError.assert(!!quote, "No quote found", error_1.MetaAgErrorCode.QUOTE_NOT_FOUND, { provider: this.kind });
         return {
             id: (0, uuid_1.v4)(),
             provider: metaAg_1.EProvider.CETUS,
@@ -41,12 +41,12 @@ class CetusProvider {
             amountIn: quote.amountIn.toString() || "0",
             rawAmountOut: quote.amountOut.toString() || "0",
             amountOut: quote.amountOut.toString() || "0",
-            coinTypeIn: quoteOptions.coinInType,
-            coinTypeOut: quoteOptions.coinOutType,
+            coinTypeIn: quoteOptions.coinTypeIn,
+            coinTypeOut: quoteOptions.coinTypeOut,
         };
     }
     async swap(options) {
-        (0, condition_1.assert)(options.quote.provider === metaAg_1.EProvider.CETUS, "Expect Cetus quote");
+        error_1.MetaAgError.assert(options.quote.provider === metaAg_1.EProvider.CETUS, "Expect Cetus quote", error_1.MetaAgErrorCode.INVALID_QUOTE, { quote: options.quote, expectedProvider: metaAg_1.EProvider.CETUS });
         const coinOut = await this.cetusClient.routerSwap({
             inputCoin: options.coinIn,
             router: options.quote.quote,