@1delta/trade-sdk 0.1.6 → 0.1.7

package/dist/aggregator/fetchAggregatorTrade.d.ts

@@ -1,4 +1,3 @@
-export * from './fetchAggregatorTrade';
 import { AggregatorApiInput, GenericTrade, OneDeltaInput } from '@1delta/lib-utils';
 export declare const fetchAggregatorTrade: (aggregator: string, input: AggregatorApiInput | OneDeltaInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
 //# sourceMappingURL=fetchAggregatorTrade.d.ts.map

package/dist/aggregator/fetchAggregatorTrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchAggregatorTrade.d.ts","sourceRoot":"","sources":["../../src/aggregator/fetchAggregatorTrade.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AAMtC,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACd,MAAM,mBAAmB,CAAA;AAI1B,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB,OAAO,kBAAkB,GAAG,aAAa,EACzC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAclC,CAAA"}
+{"version":3,"file":"fetchAggregatorTrade.d.ts","sourceRoot":"","sources":["../../src/aggregator/fetchAggregatorTrade.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,kBAAkB,EAIlB,YAAY,EACZ,aAAa,EACd,MAAM,mBAAmB,CAAA;AAQ1B,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB,OAAO,kBAAkB,GAAG,aAAa,EACzC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAclC,CAAA"}

package/dist/aggregator/fetchAggregatorTrade.js

@@ -1,8 +1,61 @@
-export * from './fetchAggregatorTrade';
 import { fetchAggregatorTrade as fetchAggregatorTradeWithoutConfigs, } from '@1delta/aggregators';
 import { getSwapAggregators } from '@1delta/bridge-configs';
-import { fetchBridgeTrade } from '../bridge';
+import { ChainType, ChainUtils, } from '@1delta/lib-utils';
+import { fetchBridgeTrade } from '../bridge/fetchBridgeTrade';
+import { createSwapAndBridgeCalldata, requireDeltaContracts, } from '../composedTrades/utils';
 export const fetchAggregatorTrade = async (aggregator, input, controller) => {
+    const needsAdditionalCalls = !!input.additionalCalls && input.additionalCalls.length > 0;
+    if (input.disableComposer) {
+        if (needsAdditionalCalls)
+            throw new Error(`Aggregator ${aggregator.toString()} does not support additional calls without composer`);
+        return fetchSwapTrade(aggregator, input, controller);
+    }
+    else {
+        return fetchAggregatorWithComposerTrade(aggregator, input, controller);
+    }
+};
+const fetchAggregatorWithComposerTrade = async (aggregator, input, controller) => {
+    let trade = undefined;
+    const { forwarder, composer } = requireDeltaContracts(input.chainId);
+    trade = await fetchSwapTrade(aggregator, { ...input, caller: forwarder, receiver: forwarder }, controller);
+    if (!trade)
+        return undefined;
+    if (!trade.assemble)
+        throw new Error(`Aggregator ${aggregator.toString()} does not support composer`);
+    const assemble = async () => {
+        try {
+            const chainId = input.fromCurrency.chainId;
+            if (ChainUtils.isEvm(chainId)) {
+                const fundsToPull = [
+                    {
+                        address: trade.inputAmount.currency.address,
+                        amount: trade.inputAmount.amount,
+                    },
+                ];
+                const tx = await createSwapAndBridgeCalldata([trade], input.caller, input.receiver, true, fundsToPull, false, true, input.additionalCalls);
+                return {
+                    [ChainType.EVM]: {
+                        calldata: tx.calldata,
+                        value: tx.value.toString(),
+                        to: tx.to,
+                    },
+                };
+            }
+            return undefined;
+        }
+        catch (error) {
+            console.log(`cannot compose ${aggregator.toString()} swap tx:`, error);
+            return undefined;
+        }
+    };
+    return {
+        ...trade,
+        assemble,
+        approvalTarget: composer,
+        target: composer,
+    };
+};
+const fetchSwapTrade = async (aggregator, input, controller) => {
     if (getSwapAggregators().includes(aggregator)) {
         return await fetchBridgeTrade(aggregator, { ...input, order: 'CHEAPEST' }, controller);
     }

package/dist/composedTrades/across/acrossWithSwap.js

@@ -82,6 +82,7 @@ const fetchAcrossTradeWithDestinationCalls = async (input, controller) => {
                 caller: getAcrossMulticallHandler(toChainId),
                 receiver: input.receiver,
                 flashSwap: undefined,
+                disableComposer: true,
             };
             const destinationSwapTrade = await fetchBestTrade(destinationSwapInput, controller);
             if (!destinationSwapTrade || !destinationSwapTrade.assemble)

package/dist/composedTrades/across/acrossWithSwaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acrossWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/across/acrossWithSwaps.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAOZ,WAAW,EAGZ,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAA;AAsB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,GAAG,SAAS,EAC5B,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAqKlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"acrossWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/across/acrossWithSwaps.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAOZ,WAAW,EAGZ,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAA;AAsB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,GAAG,SAAS,EAC5B,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAsKlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/composedTrades/across/acrossWithSwaps.js

@@ -48,6 +48,7 @@ export const fetchAcrossTradeWithSwaps = async (input, getCurrency, controller)
             caller: forwarder,
             receiver: forwarder,
             flashSwap: undefined,
+            disableComposer: true,
         };
         sourceSwapTrade = await fetchBestTrade(sourceSwapInput, controller);
     }

package/dist/composedTrades/across/calldata/createAcrossMessage.d.ts

@@ -1,5 +1,5 @@
+import { DeltaCall } from '@1delta/lib-utils';
 import { Hex } from 'viem';
-import { DeltaCall } from '../../../types/deltaCall';
 import { DestinationSwapData } from '../../../types/destinationSwapData';
 import { AcrossCall } from './types';
 /**

package/dist/composedTrades/across/calldata/createAcrossMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAcrossMessage.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/across/calldata/createAcrossMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,GAAG,EAAY,MAAM,MAAM,CAAA;AAGjE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAGxE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,uBAAuB,CACrC,uBAAuB,EAAE,MAAM,EAC/B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,SAAS,EAAE,EAC5B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,GAAG,CA4DL;AAED,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,mBAAmB,GACvC,UAAU,EAAE,CA8Bd;AAED,wBAAgB,wBAAwB,CACtC,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,EAAE,GACtB,GAAG,CAWL"}
+{"version":3,"file":"createAcrossMessage.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/across/calldata/createAcrossMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAA+B,GAAG,EAAY,MAAM,MAAM,CAAA;AAGjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAGxE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,uBAAuB,CACrC,uBAAuB,EAAE,MAAM,EAC/B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,SAAS,EAAE,EAC5B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,GAAG,CA4DL;AAED,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,mBAAmB,GACvC,UAAU,EAAE,CA8Bd;AAED,wBAAgB,wBAAwB,CACtC,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,EAAE,GACtB,GAAG,CAWL"}

package/dist/composedTrades/axelar/axelarWithSwap.js

@@ -64,6 +64,7 @@ const fetchAxelarTradeWithDestinationCalls = async (input, getPrices, controller
                 caller: squidMulticall,
                 receiver: squidMulticall,
                 flashSwap: undefined,
+                disableComposer: true,
             };
             const destinationSwapTrade = await fetchBestTrade(destinationSwapInput, controller);
             if (!destinationSwapTrade || !destinationSwapTrade.assemble)

package/dist/composedTrades/axelar/axelarWithSwaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axelarWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/axelar/axelarWithSwaps.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAMZ,WAAW,EAGX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAmB,eAAe,EAAE,MAAM,aAAa,CAAA;AAmB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,GAAG,SAAS,EAC5B,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAqKlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"axelarWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/axelar/axelarWithSwaps.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAMZ,WAAW,EAGX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAmB,eAAe,EAAE,MAAM,aAAa,CAAA;AAmB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,GAAG,SAAS,EAC5B,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAsKlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/composedTrades/axelar/axelarWithSwaps.js

@@ -47,6 +47,7 @@ export const fetchAxelarTradeWithSwaps = async (input, getCurrency, getPrices, c
             caller: forwarder,
             receiver: forwarder,
             flashSwap: undefined,
+            disableComposer: true,
         };
         sourceSwapTrade = await fetchBestTrade(sourceSwapInput, controller);
     }

package/dist/composedTrades/axelar/squid/createSquidPayload.d.ts

@@ -1,5 +1,5 @@
+import { DeltaCall } from '@1delta/lib-utils';
 import { Hex } from 'viem';
-import { DeltaCall } from '../../../types/deltaCall';
 import { DestinationSwapData } from '../../../types/destinationSwapData';
 /**
  * Creates the final `payload` for a complete cross-chain swap using Squid.

package/dist/composedTrades/axelar/squid/createSquidPayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSquidPayload.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/createSquidPayload.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,GAAG,EAAyB,MAAM,MAAM,CAAA;AAG9E,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAyDxE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,SAAS,EAAE,EAC5B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,GAAG,CA6DL"}
+{"version":3,"file":"createSquidPayload.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/createSquidPayload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAA+B,GAAG,EAAyB,MAAM,MAAM,CAAA;AAG9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAyDxE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,SAAS,EAAE,EAC5B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,GAAG,CA6DL"}

package/dist/composedTrades/gaszip/gaszipWithSwaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gaszipWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/gaszip/gaszipWithSwaps.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,YAAY,EASb,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAmB,eAAe,EAAE,MAAM,aAAa,CAAA;AAoB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAkJlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"gaszipWithSwaps.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/gaszip/gaszipWithSwaps.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,YAAY,EASb,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAmB,eAAe,EAAE,MAAM,aAAa,CAAA;AAoB9D,eAAO,MAAM,yBAAyB,GACpC,OAAO,eAAe,EACtB,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAmJlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/composedTrades/gaszip/gaszipWithSwaps.js

@@ -45,6 +45,7 @@ export const fetchGaszipTradeWithSwaps = async (input, controller) => {
             caller: forwarder,
             receiver: forwarder,
             flashSwap: undefined,
+            disableComposer: true,
         };
         sourceSwapTrade = await fetchBestTrade(sourceSwapInput, controller);
     }

package/dist/composedTrades/utils/createSwapAndBridgeCalldata.d.ts

@@ -1,8 +1,8 @@
-import { InternalTrade } from '@1delta/lib-utils';
+import { DeltaCall, InternalTrade } from '@1delta/lib-utils';
 export declare function createSwapAndBridgeCalldata(trades: InternalTrade[], account: string, bridgeReceiver: string, sweep: boolean, fundsToPull?: {
     address: string;
     amount: bigint;
-}[], catchRevert?: boolean, sweepDust?: boolean): Promise<{
+}[], catchRevert?: boolean, sweepDust?: boolean, additionalCalls?: DeltaCall[]): Promise<{
     calldata: `0x${string}`;
     value: bigint;
     to: string;

package/dist/composedTrades/utils/createSwapAndBridgeCalldata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSwapAndBridgeCalldata.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/createSwapAndBridgeCalldata.ts"],"names":[],"mappings":"AAcA,OAAO,EAOL,aAAa,EAKd,MAAM,mBAAmB,CAAA;AAG1B,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,aAAa,EAAE,EACvB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,OAAO,EACd,WAAW,GAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAO,EACvD,WAAW,GAAE,OAAc,EAC3B,SAAS,GAAE,OAAe;;;;GAgO3B"}
+{"version":3,"file":"createSwapAndBridgeCalldata.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/createSwapAndBridgeCalldata.ts"],"names":[],"mappings":"AAcA,OAAO,EAGL,SAAS,EAKT,aAAa,EAKd,MAAM,mBAAmB,CAAA;AAK1B,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,aAAa,EAAE,EACvB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,OAAO,EACd,WAAW,GAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAO,EACvD,WAAW,GAAE,OAAc,EAC3B,SAAS,GAAE,OAAe,EAC1B,eAAe,GAAE,SAAS,EAAO;;;;GA2OlC"}

package/dist/composedTrades/utils/createSwapAndBridgeCalldata.js

@@ -2,7 +2,8 @@ import { Bridge } from '@1delta/bridge-configs';
 import { encodeAcrossBridgeNative, encodeAcrossBridgeToken, encodeApprove, encodeExternalCall, encodeGasZipEvmBridge, encodeSquidRouterCall, encodeStargateV2BridgeSimpleTaxi, encodeSweep, encodeTransferIn, encodeTryExternalCall, SweepType, } from '@1delta/calldatalib';
 import { buildMetaSwapParams, CurrencyHandler, encodeComposerCompose, getDeltaComposerProxyAddress, getForwarderAddress, minimumAmountInFromAmount, packCommands, TradeUtils, } from '@1delta/lib-utils';
 import { encodePacked, pad } from 'viem';
-export async function createSwapAndBridgeCalldata(trades, account, bridgeReceiver, sweep, fundsToPull = [], catchRevert = true, sweepDust = false) {
+import { createDeltaCalls } from '../../deltaCall';
+export async function createSwapAndBridgeCalldata(trades, account, bridgeReceiver, sweep, fundsToPull = [], catchRevert = true, sweepDust = false, additionalCalls = []) {
     if (!trades || trades.length === 0 || !isSameSourceChainId(trades))
         throw new Error(`Invalid trades array. Must have at least one trade and all trades must be on the same chain`);
     const sourceChainId = trades[0].inputAmount.currency.chainId;
@@ -95,6 +96,7 @@ export async function createSwapAndBridgeCalldata(trades, account, bridgeReceive
             sweepTokens.push(sweepOutputToken);
         }
     }
+    const sweepCommands = [];
     if (sweep) {
         const sameChainTrades = trades.filter((t) => t.inputAmount.currency.chainId === t.outputAmount.currency.chainId);
         const currencyToAmount = TradeUtils.groupAmountByCurrency({
@@ -104,7 +106,7 @@ export async function createSwapAndBridgeCalldata(trades, account, bridgeReceive
         });
         for (const [currency, amount] of currencyToAmount.entries()) {
             const sweepCall = encodeSweep(currency.address, account, sweepDust ? 0n : amount, SweepType.VALIDATE);
-            commands.push(sweepCall);
+            sweepCommands.push(sweepCall);
         }
     }
     let value = 0n;
@@ -115,9 +117,15 @@ export async function createSwapAndBridgeCalldata(trades, account, bridgeReceive
         else
             transferInCommands.push(encodeTransferIn(address, forwarder, amount));
     }
+    const { composerCommands, forwarderCommands } = createDeltaCalls(sourceChainId, additionalCalls);
     const calldata = encodeComposerCompose(packCommands([
         ...transferInCommands,
-        encodeExternalCall(forwarder, value, false, packCommands(commands)),
+        ...composerCommands,
+        encodeExternalCall(forwarder, value, false, packCommands([
+            ...commands,
+            ...forwarderCommands,
+            ...sweepCommands,
+        ])),
     ]));
     return { calldata, value, to: composerProxy };
 }

package/dist/composedTrades/utils/fetchBridgeAndGasTrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchBridgeAndGasTrade.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/fetchBridgeAndGasTrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAEL,YAAY,EAEZ,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAG7C,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,EAClB,OAAO,eAAe,EACtB,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CACR;IAAE,WAAW,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CA6E9E,CAAA"}
+{"version":3,"file":"fetchBridgeAndGasTrade.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/fetchBridgeAndGasTrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAEL,YAAY,EAEZ,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAG7C,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,EAClB,OAAO,eAAe,EACtB,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CACR;IAAE,WAAW,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CA4E9E,CAAA"}

package/dist/composedTrades/utils/fetchBridgeAndGasTrade.js

@@ -18,27 +18,27 @@ export const fetchBridgeAndGasTrade = async (aggregator, input, getPrices, contr
     const bridgeTokenIsNative = CurrencyHandler.isNative(input.fromCurrency);
     if (bridgeTokenIsNative) {
         const adjustedAmount = BigInt(input.swapAmount) - bridgeTrade.gasAmount;
-        const updatedStargateTrade = await fetchBridgeTrade(aggregator, {
+        const updatedTrade = await fetchBridgeTrade(aggregator, {
             ...input,
             swapAmount: adjustedAmount.toString(),
         }, controller);
         bridgeTrade.gasAmount = undefined;
-        if (updatedStargateTrade)
-            return { gasTrade: undefined, bridgeTrade: updatedStargateTrade };
+        if (updatedTrade)
+            return { gasTrade: undefined, bridgeTrade: updatedTrade };
     }
     else {
         const adjustedGasAmount = (bridgeTrade.gasAmount * 110n + BigInt(gasTradeSlippage)) / 100n; // increase by 10% + gas trade slippage
         const gasTrade = await fetchGasTrade(adjustedGasAmount);
         if (gasTrade) {
             const adjustedAmount = BigInt(input.swapAmount) - gasTrade.inputAmount.amount;
-            const updatedStargateTrade = await fetchBridgeTrade(aggregator, {
+            const updatedTrade = await fetchBridgeTrade(aggregator, {
                 ...input,
                 swapAmount: adjustedAmount.toString(),
             }, controller);
             bridgeTrade.gasAmount = undefined;
-            const isEnoughGas = gasTrade.outputAmount.amount >= (updatedStargateTrade?.gasAmount ?? 0n);
-            if (isEnoughGas && updatedStargateTrade)
-                return { gasTrade, bridgeTrade: updatedStargateTrade };
+            const isEnoughGas = gasTrade.outputAmount.amount >= (updatedTrade?.gasAmount ?? 0n);
+            if (isEnoughGas && updatedTrade)
+                return { gasTrade, bridgeTrade: updatedTrade };
         }
     }
     return undefined;

package/dist/composedTrades/utils/index.d.ts

@@ -1,3 +1,5 @@
+export * from './createSwapAndBridgeCalldata';
 export * from './fetchBridgeAndGasTrade';
 export * from './multichainUtils';
+export * from './requireDeltaContracts';
 //# sourceMappingURL=index.d.ts.map

package/dist/composedTrades/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAA;AAC7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/dist/composedTrades/utils/index.js

@@ -1,2 +1,4 @@
+export * from './createSwapAndBridgeCalldata';
 export * from './fetchBridgeAndGasTrade';
 export * from './multichainUtils';
+export * from './requireDeltaContracts';

package/dist/composedTrades/utils/multichainUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multichainUtils.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/multichainUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EAEb,WAAW,EAEX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAK7C,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,YAAY,CAAA;IACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;CACnC;AAWD,wBAAsB,cAAc,CAClC,KAAK,EAAE,eAAe,EACtB,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,YAAY,CAAC,CAyEvB;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,4BAA4B,EACvC,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwCpC;AAID,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAKR"}
+{"version":3,"file":"multichainUtils.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/multichainUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EAEb,WAAW,EAEX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAK7C,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,YAAY,CAAA;IACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;CACnC;AAWD,wBAAsB,cAAc,CAClC,KAAK,EAAE,eAAe,EACtB,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,YAAY,CAAC,CAyEvB;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,4BAA4B,EACvC,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAyCpC;AAID,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAKR"}

package/dist/composedTrades/utils/multichainUtils.js

@@ -92,6 +92,7 @@ export async function getExactOutputTrade(currencyIn, currencyOut, outputAmount,
         receiver: caller,
         simpleRoute: true,
         flashSwap: undefined,
+        disableComposer: true,
     };
     return await fetchBestTrade(quoteInput, controller);
 }

package/dist/deltaCall/createDeltaCallsCalldata.d.ts

@@ -1,5 +1,5 @@
+import { DeltaCall } from '@1delta/lib-utils';
 import { Address, Hex } from 'viem';
-import { DeltaCall } from '../types/deltaCall';
 export declare const createDeltaCallsCalldata: (chainId: string, calls: DeltaCall[], sweepProps?: {
     tokensToSweep: string[];
     receiver: string;
@@ -7,4 +7,8 @@ export declare const createDeltaCallsCalldata: (chainId: string, calls: DeltaCal
     calldata: Hex;
     to: Address;
 };
+export declare const createDeltaCalls: (chainId: string, calls: DeltaCall[]) => {
+    composerCommands: Hex[];
+    forwarderCommands: Hex[];
+};
 //# sourceMappingURL=createDeltaCallsCalldata.d.ts.map

package/dist/deltaCall/createDeltaCallsCalldata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDeltaCallsCalldata.d.ts","sourceRoot":"","sources":["../../src/deltaCall/createDeltaCallsCalldata.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAGnC,OAAO,EAAuB,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAInE,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,OAAO,SAAS,EAAE,EAClB,aAAa;IACX,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB,KACA;IACD,QAAQ,EAAE,GAAG,CAAA;IACb,EAAE,EAAE,OAAO,CAAA;CAuCZ,CAAA"}
+{"version":3,"file":"createDeltaCallsCalldata.d.ts","sourceRoot":"","sources":["../../src/deltaCall/createDeltaCallsCalldata.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,SAAS,EAGV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAMnC,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,OAAO,SAAS,EAAE,EAClB,aAAa;IACX,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB,KACA;IACD,QAAQ,EAAE,GAAG,CAAA;IACb,EAAE,EAAE,OAAO,CAAA;CAoCZ,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,EACf,OAAO,SAAS,EAAE,KACjB;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAA;IACvB,iBAAiB,EAAE,GAAG,EAAE,CAAA;CAazB,CAAA"}

package/dist/deltaCall/createDeltaCallsCalldata.js

@@ -1,17 +1,11 @@
 import { encodeExternalCall, encodeSweep, SweepType } from '@1delta/calldatalib';
-import { encodeComposerCompose, packCommands } from '@1delta/lib-utils';
+import { COMPOSER_CALL_TYPES, encodeComposerCompose, packCommands, } from '@1delta/lib-utils';
 import { requireDeltaContracts } from '../composedTrades/utils/requireDeltaContracts';
-import { COMPOSER_CALL_TYPES } from '../types/deltaCall';
 import { toComposerCall } from './toComposerCall';
 import { toForwarderCall } from './toForwarderCall';
 export const createDeltaCallsCalldata = (chainId, calls, sweepProps) => {
     const { forwarder, composer } = requireDeltaContracts(chainId);
-    const composerCommands = calls
-        .filter((call) => COMPOSER_CALL_TYPES.includes(call.callType))
-        .flatMap((call) => toComposerCall(call, forwarder));
-    const forwarderCommands = calls
-        .filter((call) => !COMPOSER_CALL_TYPES.includes(call.callType))
-        .map((call) => toForwarderCall(call));
+    const { composerCommands, forwarderCommands } = createDeltaCalls(chainId, calls);
     // sweep tokens at the end
     if (sweepProps) {
         const { tokensToSweep, receiver } = sweepProps;
@@ -26,3 +20,13 @@ export const createDeltaCallsCalldata = (chainId, calls, sweepProps) => {
     ]));
     return { calldata, to: composer };
 };
+export const createDeltaCalls = (chainId, calls) => {
+    const { forwarder } = requireDeltaContracts(chainId);
+    const composerCommands = calls
+        .filter((call) => COMPOSER_CALL_TYPES.includes(call.callType))
+        .flatMap((call) => toComposerCall(call, forwarder));
+    const forwarderCommands = calls
+        .filter((call) => !COMPOSER_CALL_TYPES.includes(call.callType))
+        .map((call) => toForwarderCall(call));
+    return { composerCommands, forwarderCommands };
+};

package/dist/deltaCall/toComposerCall.d.ts

@@ -1,4 +1,4 @@
+import { DeltaCall } from '@1delta/lib-utils';
 import { Hex } from 'viem';
-import { DeltaCall } from '../types/deltaCall';
 export declare function toComposerCall(call: DeltaCall, receiver: string): Hex[];
 //# sourceMappingURL=toComposerCall.d.ts.map

package/dist/deltaCall/toComposerCall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toComposerCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toComposerCall.ts"],"names":[],"mappings":"AAMA,OAAO,EAAW,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,OAAO,EACL,SAAS,EAGV,MAAM,oBAAoB,CAAA;AAE3B,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,CAgDvE"}
+{"version":3,"file":"toComposerCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toComposerCall.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,SAAS,EAGV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAW,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,CAgDvE"}

package/dist/deltaCall/toComposerCall.js

@@ -1,5 +1,5 @@
 import { encodePermit, encodePermit2TransferFrom, encodeTransferIn, PermitIds, } from '@1delta/calldatalib';
-import { DeltaCallPermitType, DeltaCallType, } from '../types/deltaCall';
+import { DeltaCallPermitType, DeltaCallType, } from '@1delta/lib-utils';
 export function toComposerCall(call, receiver) {
     switch (call.callType) {
         case DeltaCallType.TRANSFER_IN: {

package/dist/deltaCall/toForwarderCall.d.ts

@@ -1,4 +1,4 @@
+import { DeltaCall } from '@1delta/lib-utils';
 import { Hex } from 'viem';
-import { DeltaCall } from '../types/deltaCall';
 export declare function toForwarderCall(call: DeltaCall): Hex;
 //# sourceMappingURL=toForwarderCall.d.ts.map

package/dist/deltaCall/toForwarderCall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toForwarderCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toForwarderCall.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,OAAO,EAAE,SAAS,EAAiB,MAAM,oBAAoB,CAAA;AAE7D,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,GAAG,CA4CpD"}
+{"version":3,"file":"toForwarderCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toForwarderCall.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAiB,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAW,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,GAAG,CA4CpD"}

package/dist/deltaCall/toForwarderCall.js

@@ -1,5 +1,5 @@
 import { encodeApprove, encodeExternalCall, encodeExternalCallWithReplace, encodeSweep, SweepType, } from '@1delta/calldatalib';
-import { DeltaCallType } from '../types/deltaCall';
+import { DeltaCallType } from '@1delta/lib-utils';
 export function toForwarderCall(call) {
     switch (call.callType) {
         case DeltaCallType.FULL_TOKEN_BALANCE: {

package/dist/index.d.ts

@@ -3,10 +3,10 @@ export { fetchBridgeTrade as fetchBridgeTradeWithoutComposed } from './bridge';
 export * from './core';
 export { createDeltaCallsCalldata } from './deltaCall';
 export * from './initialize';
-export type { BridgeInput, DeltaCall, DeltaCallPermitType, DeltaCallType, } from './types';
+export type { BridgeInput } from './types';
 export { TradeAggregator } from '@1delta/aggregators';
 export { Bridge, getBridges, getCowSwapSlippage, getSwapAggregators, } from '@1delta/bridge-configs';
 export type { Params as BridgeParams, Status as BridgeStatus, } from '@1delta/bridge-core';
 export { getBridgeIcon, getStatus as getBridgeStatus, } from '@1delta/bridge-core';
-export type { AggregatorApiInput, useGeneralPricesCallbackType, } from '@1delta/lib-utils';
+export type { AggregatorApiInput, DeltaCall, DeltaCallPermitType, DeltaCallType, useGeneralPricesCallbackType, } from '@1delta/lib-utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,gBAAgB,IAAI,+BAA+B,EAAE,MAAM,UAAU,CAAA;AAC9E,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,cAAc,cAAc,CAAA;AAC5B,YAAY,EACV,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,aAAa,GACd,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EACL,MAAM,EACN,UAAU,EACV,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EACV,MAAM,IAAI,YAAY,EACtB,MAAM,IAAI,YAAY,GACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,aAAa,EACb,SAAS,IAAI,eAAe,GAC7B,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EACV,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,gBAAgB,IAAI,+BAA+B,EAAE,MAAM,UAAU,CAAA;AAC9E,cAAc,QAAQ,CAAA;AACtB,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,cAAc,cAAc,CAAA;AAC5B,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EACL,MAAM,EACN,UAAU,EACV,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EACV,MAAM,IAAI,YAAY,EACtB,MAAM,IAAI,YAAY,GACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,aAAa,EACb,SAAS,IAAI,eAAe,GAC7B,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EACV,kBAAkB,EAClB,SAAS,EACT,mBAAmB,EACnB,aAAa,EACb,4BAA4B,GAC7B,MAAM,mBAAmB,CAAA"}

package/dist/types/bridgeInput.d.ts

@@ -1,6 +1,5 @@
 import { Bridge } from '@1delta/bridge-configs';
-import { RawCurrency, TradeType } from '@1delta/lib-utils';
-import { DeltaCall } from './deltaCall';
+import { DeltaCall, RawCurrency, TradeType } from '@1delta/lib-utils';
 export interface BaseBridgeInput {
     slippage: number;
     tradeType: TradeType;
@@ -30,6 +29,8 @@ export interface AcrossBaseInput extends BaseBridgeInput, AdditionalCalls {
 }
 export interface AxelarBaseInput extends BaseBridgeInput, AdditionalCallsWithGasLimit, WithGasInput {
 }
+export interface SwapAggregatorInput extends BaseBridgeInput, AdditionalCalls {
+}
 type AcrossInput = {
     bridge: Bridge.ACROSS;
     input: AcrossBaseInput;
@@ -38,10 +39,14 @@ type AxelarInput = {
     bridge: Bridge.AXELAR;
     input: AxelarBaseInput;
 };
+type ZenlinkInput = {
+    bridge: Bridge.Zenlink;
+    input: SwapAggregatorInput;
+};
 interface DefaultBridgeInput extends BaseBridgeInput {
-    bridge: Exclude<Bridge, Bridge.AXELAR | Bridge.ACROSS>;
+    bridge: Exclude<Bridge, Bridge.AXELAR | Bridge.ACROSS | Bridge.Zenlink>;
     input: BaseBridgeInput;
 }
-export type BridgeInput = AcrossInput | AxelarInput | DefaultBridgeInput;
+export type BridgeInput = AcrossInput | AxelarInput | ZenlinkInput | DefaultBridgeInput;
 export {};
 //# sourceMappingURL=bridgeInput.d.ts.map

package/dist/types/bridgeInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeInput.d.ts","sourceRoot":"","sources":["../../src/types/bridgeInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,UAAU,EAAE,WAAW,GAAG,SAAS,CAAA;IACnC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,UAAU,GAAG,SAAS,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,UAAU,YAAY;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,UAAU,eAAe;IACvB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAA;CAC9B;AAED,UAAU,2BAA2B;IACnC,eAAe,CAAC,EAAE;QAChB,KAAK,EAAE,SAAS,EAAE,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe,EAAE,eAAe;CAAG;AAE5E,MAAM,WAAW,eACf,SAAQ,eAAe,EACrB,2BAA2B,EAC3B,YAAY;CAAG;AAEnB,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAA;IACrB,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAA;IACrB,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,UAAU,kBAAmB,SAAQ,eAAe;IAClD,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IACtD,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"bridgeInput.d.ts","sourceRoot":"","sources":["../../src/types/bridgeInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAErE,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,UAAU,EAAE,WAAW,GAAG,SAAS,CAAA;IACnC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,UAAU,GAAG,SAAS,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,UAAU,YAAY;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,UAAU,eAAe;IACvB,eAAe,CAAC,EAAE,SAAS,EAAE,CAAA;CAC9B;AAED,UAAU,2BAA2B;IACnC,eAAe,CAAC,EAAE;QAChB,KAAK,EAAE,SAAS,EAAE,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe,EAAE,eAAe;CAAG;AAE5E,MAAM,WAAW,eACf,SAAQ,eAAe,EACrB,2BAA2B,EAC3B,YAAY;CAAG;AAEnB,MAAM,WAAW,mBAAoB,SAAQ,eAAe,EAAE,eAAe;CAAG;AAEhF,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAA;IACrB,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAA;IACrB,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAA;IACtB,KAAK,EAAE,mBAAmB,CAAA;CAC3B,CAAA;AAED,UAAU,kBAAmB,SAAQ,eAAe;IAClD,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;IACvE,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,WAAW,GACX,YAAY,GACZ,kBAAkB,CAAA"}

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 export * from './aggregatorInput';
 export * from './bridgeInput';
-export * from './deltaCall';
 export * from './destinationSwapData';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA"}

package/dist/types/index.js

@@ -1,4 +1,3 @@
 export * from './aggregatorInput';
 export * from './bridgeInput';
-export * from './deltaCall';
 export * from './destinationSwapData';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/trade-sdk",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "1Delta Trade SDK for handling cross-chain swaps and bridges",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,8 +12,8 @@
     "viem": "^2.40.3",
     "@1delta/aggregators": "0.1.6",
     "@1delta/bridge-configs": "0.1.6",
-    "@1delta/lib-utils": "0.1.6",
-    "@1delta/bridge-core": "0.1.3"
+    "@1delta/bridge-core": "0.1.3",
+    "@1delta/lib-utils": "0.1.7"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",

package/dist/types/deltaCall.d.ts

@@ -1,62 +0,0 @@
-import { Hex } from 'viem';
-export declare enum DeltaCallType {
-    DEFAULT = 0,
-    FULL_TOKEN_BALANCE = 1,
-    FULL_NATIVE_BALANCE = 2,
-    SWEEP_WITH_VALIDATION = 3,
-    TRANSFER_IN = 4,
-    APPROVE = 5
-}
-export declare enum DeltaCallPermitType {
-    ERC20_PERMIT = 0,
-    PERMIT2 = 1,
-    NONE = 2
-}
-export declare const COMPOSER_CALL_TYPES: DeltaCallType[];
-interface BaseCall {
-    target: string;
-    value?: bigint;
-    callData: Hex;
-}
-interface FullTokenBalanceCall extends BaseCall {
-    callType: DeltaCallType.FULL_TOKEN_BALANCE;
-    tokenAddress: string;
-    balanceOfInjectIndex: number;
-}
-interface FullNativeBalanceCall extends Omit<BaseCall, 'value'> {
-    callType: DeltaCallType.FULL_NATIVE_BALANCE;
-}
-interface SweepWithValidationCall {
-    callType: DeltaCallType.SWEEP_WITH_VALIDATION;
-    tokenAddress: string;
-    limit: bigint;
-    receiver: string;
-}
-interface BaseTransferInCall {
-    callType: DeltaCallType.TRANSFER_IN;
-    tokenAddress: string;
-    amount?: bigint;
-}
-interface NonePermitTransferInCall extends BaseTransferInCall {
-    permitType: DeltaCallPermitType.NONE;
-}
-interface ERC20PermitCall extends BaseTransferInCall {
-    permitType: DeltaCallPermitType.ERC20_PERMIT;
-    permitData: Hex;
-}
-interface Permit2Call extends BaseTransferInCall {
-    permitType: DeltaCallPermitType.PERMIT2;
-    permitData: Hex;
-}
-type TransferInCall = ERC20PermitCall | Permit2Call | NonePermitTransferInCall;
-interface ApproveCall {
-    callType: DeltaCallType.APPROVE;
-    tokenAddress: string;
-    spender: string;
-}
-interface DefaultCall extends BaseCall {
-    callType: DeltaCallType.DEFAULT;
-}
-export type DeltaCall = FullTokenBalanceCall | FullNativeBalanceCall | SweepWithValidationCall | TransferInCall | ApproveCall | DefaultCall;
-export {};
-//# sourceMappingURL=deltaCall.d.ts.map

package/dist/types/deltaCall.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deltaCall.d.ts","sourceRoot":"","sources":["../../src/types/deltaCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE1B,oBAAY,aAAa;IACvB,OAAO,IAAI;IACX,kBAAkB,IAAI;IACtB,mBAAmB,IAAI;IACvB,qBAAqB,IAAI;IACzB,WAAW,IAAI;IACf,OAAO,IAAI;CACZ;AAED,oBAAY,mBAAmB;IAC7B,YAAY,IAAI;IAChB,OAAO,IAAI;IACX,IAAI,IAAI;CACT;AAED,eAAO,MAAM,mBAAmB,iBAA8B,CAAA;AAE9D,UAAU,QAAQ;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,GAAG,CAAA;CACd;AAED,UAAU,oBAAqB,SAAQ,QAAQ;IAC7C,QAAQ,EAAE,aAAa,CAAC,kBAAkB,CAAA;IAC1C,YAAY,EAAE,MAAM,CAAA;IACpB,oBAAoB,EAAE,MAAM,CAAA;CAC7B;AAED,UAAU,qBAAsB,SAAQ,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC7D,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAA;CAC5C;AAED,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,aAAa,CAAC,qBAAqB,CAAA;IAC7C,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAA;IACnC,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,wBAAyB,SAAQ,kBAAkB;IAC3D,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAA;CACrC;AAED,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,UAAU,EAAE,mBAAmB,CAAC,YAAY,CAAA;IAC5C,UAAU,EAAE,GAAG,CAAA;CAChB;AAED,UAAU,WAAY,SAAQ,kBAAkB;IAC9C,UAAU,EAAE,mBAAmB,CAAC,OAAO,CAAA;IACvC,UAAU,EAAE,GAAG,CAAA;CAChB;AAED,KAAK,cAAc,GAAG,eAAe,GAAG,WAAW,GAAG,wBAAwB,CAAA;AAE9E,UAAU,WAAW;IACnB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAA;IAC/B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,WAAY,SAAQ,QAAQ;IACpC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAA;CAChC;AAED,MAAM,MAAM,SAAS,GACjB,oBAAoB,GACpB,qBAAqB,GACrB,uBAAuB,GACvB,cAAc,GACd,WAAW,GACX,WAAW,CAAA"}

package/dist/types/deltaCall.js

@@ -1,16 +0,0 @@
-export var DeltaCallType;
-(function (DeltaCallType) {
-    DeltaCallType[DeltaCallType["DEFAULT"] = 0] = "DEFAULT";
-    DeltaCallType[DeltaCallType["FULL_TOKEN_BALANCE"] = 1] = "FULL_TOKEN_BALANCE";
-    DeltaCallType[DeltaCallType["FULL_NATIVE_BALANCE"] = 2] = "FULL_NATIVE_BALANCE";
-    DeltaCallType[DeltaCallType["SWEEP_WITH_VALIDATION"] = 3] = "SWEEP_WITH_VALIDATION";
-    DeltaCallType[DeltaCallType["TRANSFER_IN"] = 4] = "TRANSFER_IN";
-    DeltaCallType[DeltaCallType["APPROVE"] = 5] = "APPROVE";
-})(DeltaCallType || (DeltaCallType = {}));
-export var DeltaCallPermitType;
-(function (DeltaCallPermitType) {
-    DeltaCallPermitType[DeltaCallPermitType["ERC20_PERMIT"] = 0] = "ERC20_PERMIT";
-    DeltaCallPermitType[DeltaCallPermitType["PERMIT2"] = 1] = "PERMIT2";
-    DeltaCallPermitType[DeltaCallPermitType["NONE"] = 2] = "NONE";
-})(DeltaCallPermitType || (DeltaCallPermitType = {}));
-export const COMPOSER_CALL_TYPES = [DeltaCallType.TRANSFER_IN];