@1delta/trade-sdk 0.1.0 → 0.1.2

package/README.md

@@ -18,7 +18,7 @@ pnpm add @1delta/trade-sdk
 ## Basic Usage
 
 ```typescript
-import { initialize, fetchBridgeTrade, fetchAggregatorTrade } from '@1delta/trade-sdk';
+import { initialize, fetchBridgeTrade, fetchAggregatorTrade, Bridge } from '@1delta/trade-sdk';
 import { WalletClient } from 'viem';
 
 // Initialize the SDK
@@ -34,13 +34,16 @@ const walletClient: WalletClient = /* your wallet client */;
 setWalletClient(walletClient);
 
 // Fetch a bridge trade
-const trade = await fetchBridgeTrade(bridge, {
-  fromCurrency: fromToken,
-  toCurrency: toToken,
-  amount: '1000000000000000000', // 1.0 in wei
-  receiver: '0x...',
-  caller: '0x...',
-  slippage: 0.5, // 0.5%
+const trade = await fetchBridgeTrade({
+  bridge: Bridge.ACROSS,
+  input: {
+    fromCurrency: fromToken,
+    toCurrency: toToken,
+    amount: '1000000000000000000', // 1.0 in wei
+    receiver: '0x...',
+    caller: '0x...',
+    slippage: 0.5, // 0.5%
+  }
 });
 ```
 
@@ -54,7 +57,7 @@ Initializes the SDK with the given configuration.
 
 Sets the wallet client for transaction signing.
 
-### `fetchBridgeTrade(bridge: Bridge, input: BridgeInput): Promise<GenericTrade>`
+### `fetchBridgeTrade(input: BridgeInput): Promise<GenericTrade>`
 
 Fetches a bridge trade quote.
 

package/dist/aggregator/fetchAggregatorTrade.d.ts

@@ -1,6 +1,4 @@
 export * from './fetchAggregatorTrade';
-import { TradeAggregator } from '@1delta/aggregators';
-import { Bridge } from '@1delta/bridge-configs';
 import { AggregatorApiInput, GenericTrade, OneDeltaInput } from '@1delta/lib-utils';
-export declare const fetchAggregatorTrade: (aggregator: TradeAggregator | Bridge, input: AggregatorApiInput | OneDeltaInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
+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;AACtC,OAAO,EAGL,eAAe,EAChB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,MAAM,EAAsB,MAAM,wBAAwB,CAAA;AACnE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACd,MAAM,mBAAmB,CAAA;AAI1B,eAAO,MAAM,oBAAoB,GAC/B,YAAY,eAAe,GAAG,MAAM,EACpC,OAAO,kBAAkB,GAAG,aAAa,EACzC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAgBlC,CAAA"}
+{"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;AAK1B,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB,OAAO,kBAAkB,GAAG,aAAa,EACzC,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAgBlC,CAAA"}

package/dist/aggregator/fetchAggregatorTrade.js

@@ -1,7 +1,8 @@
 export * from './fetchAggregatorTrade';
-import { fetchAggregatorTrade as fetchAggregatorTradeWithoutConfigs, getAvailableAggregators, } from '@1delta/aggregators';
+import { fetchAggregatorTrade as fetchAggregatorTradeWithoutConfigs, } from '@1delta/aggregators';
 import { getSwapAggregators } from '@1delta/bridge-configs';
 import { fetchBridgeTrade } from '../bridge';
+import { getAvailableAggregators } from './getAvailableAggregators';
 export const fetchAggregatorTrade = async (aggregator, input, controller) => {
     if (!getAvailableAggregators(input.chainId))
         return undefined;

package/dist/bridge/fetchBridgeTrade.d.ts

@@ -1,5 +1,5 @@
 import { Bridge } from '@1delta/bridge-configs';
 import { GenericTrade } from '@1delta/lib-utils';
-import { BridgeInput } from '../types';
-export declare const fetchBridgeTrade: (bridge: Bridge, input: BridgeInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
+import { BaseBridgeInput } from '../types';
+export declare const fetchBridgeTrade: (bridge: Bridge, input: BaseBridgeInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
 //# sourceMappingURL=fetchBridgeTrade.d.ts.map

package/dist/bridge/fetchBridgeTrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchBridgeTrade.d.ts","sourceRoot":"","sources":["../../src/bridge/fetchBridgeTrade.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAU/C,OAAO,EAKL,YAAY,EAWb,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,EACd,OAAO,WAAW,EAClB,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAiMlC,CAAA"}
+{"version":3,"file":"fetchBridgeTrade.d.ts","sourceRoot":"","sources":["../../src/bridge/fetchBridgeTrade.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAU/C,OAAO,EAKL,YAAY,EAWb,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,EACd,OAAO,eAAe,EACtB,aAAa,eAAe,KAC3B,OAAO,CAAC,YAAY,GAAG,SAAS,CAiMlC,CAAA"}

package/dist/composedTrades/across/acrossWithSwap.d.ts

@@ -1,6 +1,6 @@
 import { GenericTrade, RawCurrency } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export interface AcrossWithSwapInput extends BridgeInput {
+import { BaseBridgeInput } from '../../types';
+export interface AcrossWithSwapInput extends BaseBridgeInput {
     bridgeToCurrency: RawCurrency | undefined;
 }
 export declare const fetchAcrossTradeWithSwap: (input: AcrossWithSwapInput, controller?: AbortController) => Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"acrossWithSwap.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/across/acrossWithSwap.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAKZ,WAAW,EAEZ,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AAO1D,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAA;CAC1C;AAED,eAAO,MAAM,wBAAwB,GACnC,OAAO,mBAAmB,EAC1B,aAAa,eAAe,KAC3B,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CA6C/D,CAAA;AAED,eAAe,wBAAwB,CAAA"}
+{"version":3,"file":"acrossWithSwap.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/across/acrossWithSwap.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAKZ,WAAW,EAEZ,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAmB,eAAe,EAAE,MAAM,aAAa,CAAA;AAO9D,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAA;CAC1C;AAED,eAAO,MAAM,wBAAwB,GACnC,OAAO,mBAAmB,EAC1B,aAAa,eAAe,KAC3B,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CA6C/D,CAAA;AAED,eAAe,wBAAwB,CAAA"}

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

@@ -1,5 +1,5 @@
 import { GenericTrade, RawCurrency } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export declare const fetchAcrossTradeWithSwaps: (input: BridgeInput, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency | undefined, controller?: AbortController) => Promise<GenericTrade | undefined>;
+import { BaseBridgeInput } from '../../types';
+export declare const fetchAcrossTradeWithSwaps: (input: BaseBridgeInput, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency | undefined, controller?: AbortController) => Promise<GenericTrade | undefined>;
 export default fetchAcrossTradeWithSwaps;
 //# sourceMappingURL=acrossWithSwaps.d.ts.map

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,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AAsB1D,eAAO,MAAM,yBAAyB,GACpC,OAAO,WAAW,EAClB,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,CAoKlC,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,EAAmB,eAAe,EAAE,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,CAoKlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/composedTrades/axelar/axelarWithSwap.d.ts

@@ -1,6 +1,6 @@
 import { GenericTrade, RawCurrency, useGeneralPricesCallbackType } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export interface AxelarWithSwapInput extends BridgeInput {
+import { BaseAxelarComposedInput } from '../../types';
+export interface AxelarWithSwapInput extends BaseAxelarComposedInput {
     bridgeToCurrency: RawCurrency | undefined;
 }
 export declare const fetchAxelarTradeWithSwap: (input: AxelarWithSwapInput, getPrices: useGeneralPricesCallbackType, controller?: AbortController) => Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"axelarWithSwap.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/axelar/axelarWithSwap.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,YAAY,EAGZ,WAAW,EAEX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AAK1D,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAA;CAC1C;AAED,eAAO,MAAM,wBAAwB,GACnC,OAAO,mBAAmB,EAC1B,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CAAC;IACT,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IAC/B,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;IAClC,QAAQ,EAAE,MAAM,CAAA;CACjB,CA2CA,CAAA;AAED,eAAe,wBAAwB,CAAA"}
+{"version":3,"file":"axelarWithSwap.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/axelar/axelarWithSwap.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,YAAY,EAGZ,WAAW,EAEX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAEL,uBAAuB,EAExB,MAAM,aAAa,CAAA;AAKpB,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAA;CAC1C;AAED,eAAO,MAAM,wBAAwB,GACnC,OAAO,mBAAmB,EAC1B,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CAAC;IACT,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IAC/B,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;IAClC,QAAQ,EAAE,MAAM,CAAA;CACjB,CA8CA,CAAA;AAED,eAAe,wBAAwB,CAAA"}

package/dist/composedTrades/axelar/axelarWithSwap.js

@@ -3,7 +3,7 @@ import { CurrencyHandler, normalizeDecimals, TradeType, } from '@1delta/lib-util
 import { fetchBridgeTrade } from '../../bridge/fetchBridgeTrade';
 import { fetchBridgeAndGasTrade } from '../utils/fetchBridgeAndGasTrade';
 import { fetchBestTrade } from '../utils/multichainUtils';
-import { createSquidSwapPayload } from './squid/createSquidPayload';
+import { createSquidDestinationPayload } from './squid/createSquidPayload';
 export const fetchAxelarTradeWithSwap = async (input, getPrices, controller) => {
     if (!input.bridgeToCurrency)
         throw new Error('BridgeToCurrency undefined');
@@ -11,8 +11,9 @@ export const fetchAxelarTradeWithSwap = async (input, getPrices, controller) =>
         throw new Error('ToCurrency undefined');
     const toChainId = input.toCurrency.chainId;
     const toTokenIsBridgeToken = CurrencyHandler.equal(input.bridgeToCurrency, input.toCurrency);
+    const needDestinationCalls = (input.additionalCalls?.length ?? 0) > 0 || !toTokenIsBridgeToken;
     const squidRouter = await getRequiredSquidRouter(toChainId);
-    if (toTokenIsBridgeToken) {
+    if (!needDestinationCalls) {
         // direct case
         const message = createSquidPayload(input.receiver);
         const bridgeAndGasTrade = await fetchBridgeAndGasTrade(Bridge.AXELAR, { ...input, message }, getPrices, controller);
@@ -23,8 +24,8 @@ export const fetchAxelarTradeWithSwap = async (input, getPrices, controller) =>
         };
     }
     else {
-        // swap case
-        const bridgeAndGasTrade = await fetchAxelarTradeWithDestinationSwap(input, getPrices, controller);
+        // destination calls case
+        const bridgeAndGasTrade = await fetchAxelarTradeWithDestinationCalls(input, getPrices, controller);
         return {
             trade: bridgeAndGasTrade?.bridgeTrade,
             gasTrade: bridgeAndGasTrade?.gasTrade,
@@ -33,7 +34,7 @@ export const fetchAxelarTradeWithSwap = async (input, getPrices, controller) =>
     }
 };
 export default fetchAxelarTradeWithSwap;
-const fetchAxelarTradeWithDestinationSwap = async (input, getPrices, controller) => {
+const fetchAxelarTradeWithDestinationCalls = async (input, getPrices, controller) => {
     if (!input.swapAmount)
         throw new Error('Swap amount undefined');
     if (!input.fromCurrency)
@@ -44,30 +45,46 @@ const fetchAxelarTradeWithDestinationSwap = async (input, getPrices, controller)
         throw new Error('BridgeToCurrency undefined');
     const toChainId = input.toCurrency.chainId;
     const squidMulticall = await getRequiredSquidMulticaller(toChainId);
+    const additionalCalls = input.additionalCalls ?? [];
+    const needsSwap = !CurrencyHandler.equal(input.bridgeToCurrency, input.toCurrency);
     const fetchSwapAndMessage = async (amount) => {
-        const destinationSwapInput = {
-            chainId: toChainId,
-            tradeType: TradeType.EXACT_INPUT,
-            fromCurrency: input.bridgeToCurrency,
-            toCurrency: input.toCurrency,
-            slippage: input.slippage,
-            swapAmount: amount.toString(),
-            txOrigin: squidMulticall,
-            caller: squidMulticall,
-            receiver: squidMulticall,
-            flashSwap: undefined,
-        };
-        const destinationSwapTrade = await fetchBestTrade(destinationSwapInput, controller);
-        if (!destinationSwapTrade || !destinationSwapTrade.assemble)
-            return undefined;
-        const tx = await destinationSwapTrade.assemble();
-        if (!tx?.EVM)
-            return undefined;
-        const message = createSquidSwapPayload(destinationSwapTrade.inputAmount.currency.address, destinationSwapTrade.inputAmount.amount, destinationSwapTrade.target, [tx.EVM], input.receiver, [
-            destinationSwapTrade.inputAmount.currency.address,
-            destinationSwapTrade.outputAmount.currency.address,
-        ]);
-        return { message, destinationSwapTrade };
+        if (needsSwap) {
+            // Handle destination swap case
+            const destinationSwapInput = {
+                chainId: toChainId,
+                tradeType: TradeType.EXACT_INPUT,
+                fromCurrency: input.bridgeToCurrency,
+                toCurrency: input.toCurrency,
+                slippage: input.slippage,
+                swapAmount: amount.toString(),
+                txOrigin: squidMulticall,
+                caller: squidMulticall,
+                receiver: squidMulticall,
+                flashSwap: undefined,
+            };
+            const destinationSwapTrade = await fetchBestTrade(destinationSwapInput, controller);
+            if (!destinationSwapTrade || !destinationSwapTrade.assemble)
+                return undefined;
+            const tx = await destinationSwapTrade.assemble();
+            if (!tx?.EVM)
+                return undefined;
+            const message = createSquidDestinationPayload(input.receiver, [
+                destinationSwapTrade.inputAmount.currency.address,
+                destinationSwapTrade.outputAmount.currency.address,
+            ], additionalCalls, {
+                tokenToApprove: destinationSwapTrade.inputAmount.currency.address,
+                amountToApprove: destinationSwapTrade.inputAmount.amount,
+                spender: destinationSwapTrade.target,
+                calls: [tx.EVM],
+            });
+            return { message, destinationSwapTrade };
+        }
+        else if (additionalCalls.length > 0) {
+            // Handle only destination calls case
+            const message = createSquidDestinationPayload(input.receiver, [input.bridgeToCurrency.address], additionalCalls);
+            return { message, destinationSwapTrade: undefined };
+        }
+        return undefined;
     };
     const destinationSwapAmount = normalizeDecimals(BigInt(input.swapAmount), input.fromCurrency.decimals, input.bridgeToCurrency.decimals);
     const swap = await fetchSwapAndMessage(destinationSwapAmount);
@@ -83,9 +100,14 @@ const fetchAxelarTradeWithDestinationSwap = async (input, getPrices, controller)
     if (!bridgeAndGasTrade)
         return undefined;
     const { bridgeTrade, gasTrade } = bridgeAndGasTrade;
-    const updatedSwap = await fetchSwapAndMessage(bridgeTrade.outputAmount.amount);
-    if (!updatedSwap)
-        return undefined;
+    // Only update swap if we actually need a swap
+    let updatedSwap = swap;
+    if (needsSwap) {
+        const newSwap = await fetchSwapAndMessage(bridgeTrade.outputAmount.amount);
+        if (!newSwap)
+            return undefined;
+        updatedSwap = newSwap;
+    }
     const updatedAxelarTrade = await fetchBridgeTrade(Bridge.AXELAR, { ...axelarInput, message: updatedSwap.message }, controller);
     if (!updatedAxelarTrade)
         return undefined;
@@ -98,9 +120,13 @@ const fetchAxelarTradeWithDestinationSwap = async (input, getPrices, controller)
     };
     const composedTrade = {
         ...updatedAxelarTrade,
-        outputAmount: updatedSwap.destinationSwapTrade.outputAmount,
-        outputAmountRealized: updatedSwap.destinationSwapTrade.outputAmountRealized,
-        stringified: `${updatedAxelarTrade?.stringified}-${updatedSwap.destinationSwapTrade.stringified}`,
+        outputAmount: updatedSwap.destinationSwapTrade?.outputAmount ??
+            updatedAxelarTrade.outputAmount,
+        outputAmountRealized: updatedSwap.destinationSwapTrade?.outputAmountRealized ??
+            updatedAxelarTrade.outputAmountRealized,
+        stringified: updatedSwap.destinationSwapTrade
+            ? `${updatedAxelarTrade?.stringified}-${updatedSwap.destinationSwapTrade.stringified}`
+            : updatedAxelarTrade.stringified,
         refresh,
     };
     return { bridgeTrade: composedTrade, gasTrade };

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

@@ -0,0 +1,5 @@
+import { GenericTrade, RawCurrency, useGeneralPricesCallbackType } from '@1delta/lib-utils';
+import { BaseAxelarComposedInput } from '../../types';
+export declare const fetchAxelarTradeWithSwaps: (input: BaseAxelarComposedInput, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency | undefined, getPrices: useGeneralPricesCallbackType, controller?: AbortController) => Promise<GenericTrade | undefined>;
+export default fetchAxelarTradeWithSwaps;
+//# sourceMappingURL=axelarWithSwaps.d.ts.map

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

@@ -0,0 +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,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAmBtE,eAAO,MAAM,yBAAyB,GACpC,OAAO,uBAAuB,EAC9B,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,CA8JlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

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

@@ -1,5 +1,6 @@
 import { EvmGenericCallInfo } from '@1delta/lib-utils';
 import { Hex } from 'viem';
+import { SimpleSquidCall } from './types';
 /**
  * Creates the final `payload` for a complete "Approve -> Execute -> Drain" sequence
  * using the Squid multicaller.
@@ -18,5 +19,12 @@ import { Hex } from 'viem';
  * @param tokensToDrain - An array of ERC20 token addresses expected as output from the middle calls.
  * @returns The final, ABI-encoded `payload` as a hex string (`Hex`).
  */
-export declare function createSquidSwapPayload(tokenToApprove: string, amountToApprove: bigint, spender: string, calls: EvmGenericCallInfo[], refundAndDrainAddress: string, tokensToDrain: string[]): Hex;
+export declare function createSquidDestinationPayload(refundAndDrainAddress: string, tokensToDrain: string[], additionalCalls: SimpleSquidCall[], destinationSwapData?: DestinationSwapData): Hex;
+interface DestinationSwapData {
+    tokenToApprove: string;
+    amountToApprove: bigint;
+    spender: string;
+    calls: EvmGenericCallInfo[];
+}
+export {};
 //# sourceMappingURL=createSquidPayload.d.ts.map

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":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAIL,GAAG,EAIJ,MAAM,MAAM,CAAA;AAiEb;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,EAAE,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,aAAa,EAAE,MAAM,EAAE,GACtB,GAAG,CAqDL"}
+{"version":3,"file":"createSquidPayload.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/createSquidPayload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAA+B,GAAG,EAAyB,MAAM,MAAM,CAAA;AAG9E,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAsD9D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,CAC3C,qBAAqB,EAAE,MAAM,EAC7B,aAAa,EAAE,MAAM,EAAE,EACvB,eAAe,EAAE,eAAe,EAAE,EAClC,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,GAAG,CAYL;AAED,UAAU,mBAAmB;IAC3B,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,kBAAkB,EAAE,CAAA;CAC5B"}

package/dist/composedTrades/axelar/squid/createSquidPayload.js

@@ -1,6 +1,7 @@
 import { createSquidPayload } from '@1delta/bridge-configs';
-import { encodeAbiParameters, encodeFunctionData, parseAbi, parseAbiParameters, zeroAddress, } from 'viem';
-import { SquidCallType } from './types';
+import { encodeFunctionData, parseAbi, zeroAddress } from 'viem';
+import { toSquidCall } from './simpleSquidCall';
+import { SimpleSquidCallType } from './types';
 /**
  * [Helper] Creates the specific "drain" calls for the SquidMulticall contract.
  *
@@ -10,22 +11,19 @@ import { SquidCallType } from './types';
  *
  * @param receiverAddress - The destination address for the drained tokens.
  * @param tokensToDrain - An array of ERC20 token addresses to drain from the multicall contract.
- * @returns An array of `SquidCall` objects configured for draining.
+ * @returns An array of `SimpleSquidCall` objects configured for draining.
  */
 function createSquidDrainCalls(receiverAddress, tokensToDrain) {
     const erc20TransferAbi = parseAbi([
         'function transfer(address recipient, uint256 amount)',
     ]);
-    const fullTokenBalancePayloadAbi = parseAbiParameters('address, uint256');
     const drainCalls = tokensToDrain.map((tokenToDrain) => {
         const isNative = tokenToDrain === zeroAddress;
         if (isNative) {
             const nativeDrainCall = {
-                callType: SquidCallType.FULL_NATIVE_BALANCE,
+                callType: SimpleSquidCallType.FULL_NATIVE_BALANCE,
                 target: receiverAddress,
-                value: 0n,
                 callData: '0x',
-                payload: '0x',
             };
             return nativeDrainCall;
         }
@@ -34,16 +32,12 @@ function createSquidDrainCalls(receiverAddress, tokensToDrain) {
             functionName: 'transfer',
             args: [receiverAddress, 0n], // Amount is a placeholder
         });
-        const specialPayload = encodeAbiParameters(fullTokenBalancePayloadAbi, [
-            tokenToDrain,
-            1n, // The `amount` is the parameter at index 1
-        ]);
         const drainCall = {
-            callType: SquidCallType.FULL_TOKEN_BALANCE,
+            callType: SimpleSquidCallType.FULL_TOKEN_BALANCE,
             target: tokenToDrain,
             value: 0n,
             callData: transferCalldata,
-            payload: specialPayload,
+            balanceOfInjectIndex: 1,
         };
         return drainCall;
     });
@@ -67,17 +61,24 @@ function createSquidDrainCalls(receiverAddress, tokensToDrain) {
  * @param tokensToDrain - An array of ERC20 token addresses expected as output from the middle calls.
  * @returns The final, ABI-encoded `payload` as a hex string (`Hex`).
  */
-export function createSquidSwapPayload(tokenToApprove, amountToApprove, spender, calls, refundAndDrainAddress, tokensToDrain) {
+export function createSquidDestinationPayload(refundAndDrainAddress, tokensToDrain, additionalCalls, destinationSwapData) {
+    const swapCalls = destinationSwapData
+        ? createSquidSwapCalls(destinationSwapData)
+        : [];
+    const drainCalls = createSquidDrainCalls(refundAndDrainAddress, tokensToDrain);
+    const allCalls = [...swapCalls, ...additionalCalls, ...drainCalls];
+    const allSquidCalls = allCalls.map((call) => toSquidCall(call));
+    return createSquidPayload(refundAndDrainAddress, allSquidCalls);
+}
+function createSquidSwapCalls(destinationSwapData) {
+    const { tokenToApprove, amountToApprove, spender, calls } = destinationSwapData;
+    console.log('Axelar destinationSwapData', destinationSwapData);
     if (calls.some((call) => !call.to || !call.calldata)) {
         throw new Error('Invalid call data');
     }
-    const tokenAddressPayload = encodeAbiParameters(parseAbiParameters('address'), [tokenToApprove]);
     const transferFromCall = {
-        callType: SquidCallType.COLLECT_TOKEN_BALANCE,
-        target: zeroAddress,
-        value: 0n,
-        callData: '0x',
-        payload: tokenAddressPayload,
+        callType: SimpleSquidCallType.COLLECT_TOKEN_BALANCE,
+        tokenAddress: tokenToApprove,
     };
     const erc20ApproveAbi = parseAbi([
         'function approve(address spender, uint256 amount)',
@@ -88,25 +89,16 @@ export function createSquidSwapPayload(tokenToApprove, amountToApprove, spender,
         args: [spender, amountToApprove],
     });
     const approveCall = {
-        callType: SquidCallType.DEFAULT,
+        callType: SimpleSquidCallType.DEFAULT,
         target: tokenToApprove,
         value: 0n,
         callData: approveCalldata,
-        payload: '0x',
     };
     const middleCalls = calls.map((call) => ({
-        callType: SquidCallType.DEFAULT,
+        callType: SimpleSquidCallType.DEFAULT,
         target: call.to,
         callData: call.calldata,
         value: BigInt(call.value ?? 0n),
-        payload: '0x',
     }));
-    const drainCalls = createSquidDrainCalls(refundAndDrainAddress, tokensToDrain);
-    const allCalls = [
-        transferFromCall,
-        approveCall,
-        ...middleCalls,
-        ...drainCalls,
-    ];
-    return createSquidPayload(refundAndDrainAddress, allCalls);
+    return [transferFromCall, approveCall, ...middleCalls];
 }

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

@@ -0,0 +1,3 @@
+import { SimpleSquidCall, SquidCall } from './types';
+export declare function toSquidCall(simpleCall: SimpleSquidCall): SquidCall;
+//# sourceMappingURL=simpleSquidCall.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"simpleSquidCall.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/simpleSquidCall.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EAEf,SAAS,EAEV,MAAM,SAAS,CAAA;AAEhB,wBAAgB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CA4ClE"}

package/dist/composedTrades/axelar/squid/simpleSquidCall.js

@@ -0,0 +1,47 @@
+import { encodeAbiParameters, parseAbiParameters, zeroAddress, } from 'viem';
+import { SimpleSquidCallType, SquidCallType, } from './types';
+export function toSquidCall(simpleCall) {
+    switch (simpleCall.callType) {
+        case SimpleSquidCallType.FULL_TOKEN_BALANCE: {
+            return {
+                callType: SquidCallType.FULL_TOKEN_BALANCE,
+                target: simpleCall.target,
+                value: simpleCall.value ?? 0n,
+                callData: simpleCall.callData,
+                payload: encodeAbiParameters(parseAbiParameters('address, uint256'), [
+                    simpleCall.target,
+                    BigInt(simpleCall.balanceOfInjectIndex),
+                ]),
+            };
+        }
+        case SimpleSquidCallType.FULL_NATIVE_BALANCE: {
+            return {
+                callType: SquidCallType.FULL_NATIVE_BALANCE,
+                target: simpleCall.target,
+                value: 0n,
+                callData: simpleCall.callData,
+                payload: '0x',
+            };
+        }
+        case SimpleSquidCallType.COLLECT_TOKEN_BALANCE: {
+            return {
+                callType: SquidCallType.COLLECT_TOKEN_BALANCE,
+                target: zeroAddress,
+                value: 0n,
+                callData: '0x',
+                payload: encodeAbiParameters(parseAbiParameters('address'), [
+                    simpleCall.tokenAddress,
+                ]),
+            };
+        }
+        default: {
+            return {
+                callType: SquidCallType.DEFAULT,
+                target: simpleCall.target,
+                value: simpleCall.value ?? 0n,
+                callData: simpleCall.callData,
+                payload: '0x',
+            };
+        }
+    }
+}

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

@@ -12,4 +12,31 @@ export interface SquidCall {
     callData: Hex;
     payload: Hex;
 }
+export declare enum SimpleSquidCallType {
+    DEFAULT = 0,
+    FULL_TOKEN_BALANCE = 1,
+    FULL_NATIVE_BALANCE = 2,
+    COLLECT_TOKEN_BALANCE = 3
+}
+interface BaseSquidCall {
+    target: string;
+    value?: bigint;
+    callData: Hex;
+}
+interface FullTokenBalanceSquidCall extends BaseSquidCall {
+    callType: SimpleSquidCallType.FULL_TOKEN_BALANCE;
+    balanceOfInjectIndex: number;
+}
+interface FullNativeBalanceSquidCall extends Omit<BaseSquidCall, 'value'> {
+    callType: SimpleSquidCallType.FULL_NATIVE_BALANCE;
+}
+interface CollectTokenBalanceSquidCall extends Omit<BaseSquidCall, 'target' | 'callData' | 'value'> {
+    callType: SimpleSquidCallType.COLLECT_TOKEN_BALANCE;
+    tokenAddress: string;
+}
+interface DefaultSquidCall extends BaseSquidCall {
+    callType: SimpleSquidCallType.DEFAULT;
+}
+export type SimpleSquidCall = FullTokenBalanceSquidCall | FullNativeBalanceSquidCall | CollectTokenBalanceSquidCall | DefaultSquidCall;
+export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,oBAAY,aAAa;IACvB,OAAO,IAAI;IACX,kBAAkB,IAAI;IACtB,mBAAmB,IAAI;IACvB,qBAAqB,IAAI;CAC1B;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,GAAG,CAAA;CACb"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/composedTrades/axelar/squid/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC,oBAAY,aAAa;IACvB,OAAO,IAAI;IACX,kBAAkB,IAAI;IACtB,mBAAmB,IAAI;IACvB,qBAAqB,IAAI;CAC1B;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,GAAG,CAAA;CACb;AAED,oBAAY,mBAAmB;IAC7B,OAAO,IAAwB;IAC/B,kBAAkB,IAAmC;IACrD,mBAAmB,IAAoC;IACvD,qBAAqB,IAAsC;CAC5D;AAED,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,GAAG,CAAA;CACd;AAED,UAAU,yBAA0B,SAAQ,aAAa;IACvD,QAAQ,EAAE,mBAAmB,CAAC,kBAAkB,CAAA;IAChD,oBAAoB,EAAE,MAAM,CAAA;CAC7B;AAED,UAAU,0BAA2B,SAAQ,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;IACvE,QAAQ,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;CAClD;AAED,UAAU,4BACR,SAAQ,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IAC5D,QAAQ,EAAE,mBAAmB,CAAC,qBAAqB,CAAA;IACnD,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC9C,QAAQ,EAAE,mBAAmB,CAAC,OAAO,CAAA;CACtC;AAED,MAAM,MAAM,eAAe,GACvB,yBAAyB,GACzB,0BAA0B,GAC1B,4BAA4B,GAC5B,gBAAgB,CAAA"}

package/dist/composedTrades/axelar/squid/types.js

@@ -5,3 +5,10 @@ export var SquidCallType;
     SquidCallType[SquidCallType["FULL_NATIVE_BALANCE"] = 2] = "FULL_NATIVE_BALANCE";
     SquidCallType[SquidCallType["COLLECT_TOKEN_BALANCE"] = 3] = "COLLECT_TOKEN_BALANCE";
 })(SquidCallType || (SquidCallType = {}));
+export var SimpleSquidCallType;
+(function (SimpleSquidCallType) {
+    SimpleSquidCallType[SimpleSquidCallType["DEFAULT"] = 0] = "DEFAULT";
+    SimpleSquidCallType[SimpleSquidCallType["FULL_TOKEN_BALANCE"] = 1] = "FULL_TOKEN_BALANCE";
+    SimpleSquidCallType[SimpleSquidCallType["FULL_NATIVE_BALANCE"] = 2] = "FULL_NATIVE_BALANCE";
+    SimpleSquidCallType[SimpleSquidCallType["COLLECT_TOKEN_BALANCE"] = 3] = "COLLECT_TOKEN_BALANCE";
+})(SimpleSquidCallType || (SimpleSquidCallType = {}));

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

@@ -1,5 +1,5 @@
 import { GenericTrade } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export declare const fetchGaszipTradeWithSwaps: (input: BridgeInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
+import { BaseBridgeInput } from '../../types';
+export declare const fetchGaszipTradeWithSwaps: (input: BaseBridgeInput, controller?: AbortController) => Promise<GenericTrade | undefined>;
 export default fetchGaszipTradeWithSwaps;
 //# sourceMappingURL=gaszipWithSwaps.d.ts.map

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,WAAW,EAAE,MAAM,aAAa,CAAA;AAoB1D,eAAO,MAAM,yBAAyB,GACpC,OAAO,WAAW,EAClB,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,CAkJlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/composedTrades/index.d.ts

@@ -1,4 +1,4 @@
 export * from './across/acrossWithSwaps';
-export * from './axelar/AxelarWithSwaps';
+export * from './axelar/axelarWithSwaps';
 export * from './gaszip/gaszipWithSwaps';
 //# sourceMappingURL=index.d.ts.map

package/dist/composedTrades/index.js

@@ -1,3 +1,3 @@
 export * from './across/acrossWithSwaps';
-export * from './axelar/AxelarWithSwaps';
+export * from './axelar/axelarWithSwaps';
 export * from './gaszip/gaszipWithSwaps';

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

@@ -1,7 +1,7 @@
 import { Bridge } from '@1delta/bridge-configs';
 import { GenericTrade, useGeneralPricesCallbackType } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export declare const fetchBridgeAndGasTrade: (aggregator: Bridge, input: BridgeInput, getPrices: useGeneralPricesCallbackType, controller?: AbortController) => Promise<{
+import { BaseBridgeInput } from '../../types';
+export declare const fetchBridgeAndGasTrade: (aggregator: Bridge, input: BaseBridgeInput, getPrices: useGeneralPricesCallbackType, controller?: AbortController) => Promise<{
     bridgeTrade: GenericTrade;
     gasTrade: GenericTrade | undefined;
 } | undefined>;

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,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzC,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,EAClB,OAAO,WAAW,EAClB,WAAW,4BAA4B,EACvC,aAAa,eAAe,KAC3B,OAAO,CACR;IAAE,WAAW,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CAwE9E,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,CAwE9E,CAAA"}

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":"AAKA,OAAO,EAEL,YAAY,EACZ,aAAa,EAEb,WAAW,EAEX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAE1B,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,CA0EvB;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,CAwCpC;AAID,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,MAAM,CAKR"}

package/dist/composedTrades/utils/multichainUtils.js

@@ -1,15 +1,15 @@
-import { fetchAggregatorTrade, getAvailableAggregators, TradeAggregator, } from '@1delta/aggregators';
+import { TradeAggregator } from '@1delta/aggregators';
 import { devLog, PricePriority, TradeType, } from '@1delta/lib-utils';
+import { fetchAggregatorTrade, getAvailableAggregators } from '../../aggregator';
 import { reverseQuote } from '../../utils';
 // --- Fetching Logic ---
-const AGGREGATOR_TIMEOUT_MS = 500;
+const AGGREGATOR_TIMEOUT_MS = 750;
 const PRIORITY_AGGREGATORS = [
     TradeAggregator.Odos,
     TradeAggregator.Kyberswap,
 ];
 export async function fetchBestTrade(input, controller) {
     const allAggregators = getAvailableAggregators(input.chainId).filter((aggregator) => aggregator !== TradeAggregator.Bebop &&
-        aggregator !== TradeAggregator.OneDelta &&
         aggregator !== TradeAggregator.Wowmax);
     const trades = [];
     let timeout;

package/dist/core.d.ts

@@ -1,5 +1,4 @@
-import { Bridge } from '@1delta/bridge-configs';
 import { GenericTrade, RawCurrency, useGeneralPricesCallbackType } from '@1delta/lib-utils';
 import { BridgeInput } from './types';
-export declare const fetchBridgeTrade: (bridge: Bridge, input: BridgeInput, getPrices: useGeneralPricesCallbackType, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency, controller: AbortController) => Promise<GenericTrade | undefined>;
+export declare const fetchBridgeTrade: (input: BridgeInput, getPrices: useGeneralPricesCallbackType, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency, controller: AbortController) => Promise<GenericTrade | undefined>;
 //# sourceMappingURL=core.d.ts.map

package/dist/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAS1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,EACd,OAAO,WAAW,EAClB,WAAW,4BAA4B,EACvC,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,EAChB,YAAY,eAAe,KAC1B,OAAO,CAAC,YAAY,GAAG,SAAS,CAWlC,CAAA"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,4BAA4B,EAC7B,MAAM,mBAAmB,CAAA;AAS1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,eAAO,MAAM,gBAAgB,GAC3B,OAAO,WAAW,EAClB,WAAW,4BAA4B,EACvC,aAAa,CACX,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,KAC7B,WAAW,EAChB,YAAY,eAAe,KAC1B,OAAO,CAAC,YAAY,GAAG,SAAS,CAiBlC,CAAA"}

package/dist/core.js

@@ -2,12 +2,13 @@ import { Bridge } from '@1delta/bridge-configs';
 import { isProductionEnv } from '@1delta/lib-utils';
 import { fetchBridgeTrade as fetchBridgeTradeInternal } from './bridge';
 import { fetchAcrossTradeWithSwaps, fetchAxelarTradeWithSwaps, fetchGaszipTradeWithSwaps, } from './composedTrades';
-export const fetchBridgeTrade = async (bridge, input, getPrices, getCurrency, controller) => {
+export const fetchBridgeTrade = async (input, getPrices, getCurrency, controller) => {
+    const { bridge, input: internalInput } = input;
     if (bridge === Bridge.ACROSS)
-        return fetchAcrossTradeWithSwaps(input, getCurrency, controller);
+        return fetchAcrossTradeWithSwaps(internalInput, getCurrency, controller);
     if (bridge === Bridge.AXELAR)
-        return fetchAxelarTradeWithSwaps(input, getCurrency, getPrices, controller);
+        return fetchAxelarTradeWithSwaps(internalInput, getCurrency, getPrices, controller);
     if (bridge === Bridge.GASZIP && !isProductionEnv())
-        return fetchGaszipTradeWithSwaps(input, controller);
-    return fetchBridgeTradeInternal(bridge, input, controller);
+        return fetchGaszipTradeWithSwaps(internalInput, controller);
+    return fetchBridgeTradeInternal(bridge, internalInput, controller);
 };

package/dist/index.d.ts

@@ -1,8 +1,11 @@
 export { fetchAggregatorTrade, getAvailableAggregators } from './aggregator';
 export { fetchBridgeTrade as fetchBridgeTradeWithoutComposed } from './bridge';
+export type { SimpleSquidCall, SimpleSquidCallType, } from './composedTrades/axelar/squid/types';
 export * from './core';
 export * from './initialize';
+export type { BridgeInput } from './types';
 export { TradeAggregator } from '@1delta/aggregators';
 export { Bridge } from '@1delta/bridge-configs';
 export { getStatus as getBridgeStatus } from '@1delta/bridge-core';
+export type { 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,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,qBAAqB,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,YAAY,EACV,eAAe,EACf,mBAAmB,GACpB,MAAM,qCAAqC,CAAA;AAC5C,cAAc,QAAQ,CAAA;AACtB,cAAc,cAAc,CAAA;AAC5B,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAClE,YAAY,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/types/bridgeInput.d.ts

@@ -1,18 +1,7 @@
-import { GenericTrade, RawCurrency, RawCurrencyAmount, TradeType } from '@1delta/lib-utils';
-export type BridgeState = GenericTrade;
-export interface BridgeMultiInput {
-    slippage: number;
-    tradeType: TradeType;
-    fromCurrencies: RawCurrency[];
-    toCurrency: RawCurrency | undefined;
-    swapAmounts: string[];
-    caller: string;
-    receiver: string;
-    order: 'CHEAPEST' | 'FASTEST';
-    parsedAmount: RawCurrencyAmount | undefined;
-    usePermit?: boolean;
-}
-export interface BridgeInput {
+import { Bridge } from '@1delta/bridge-configs';
+import { RawCurrency, TradeType } from '@1delta/lib-utils';
+import { SimpleSquidCall } from '../composedTrades/axelar/squid/types';
+export interface BaseBridgeInput {
     slippage: number;
     tradeType: TradeType;
     fromCurrency: RawCurrency | undefined;
@@ -25,8 +14,17 @@ export interface BridgeInput {
     usePermit?: boolean;
     destinationGasLimit?: bigint;
 }
-export interface BridgeApiInput extends Omit<BridgeInput, 'slippage'> {
-    slippage: number | 'auto';
-    defaultSlippage: number;
+export interface BaseAxelarComposedInput extends BaseBridgeInput {
+    additionalCalls?: SimpleSquidCall[];
+}
+interface AxelarComposedInput {
+    bridge: Bridge.AXELAR;
+    input: BaseAxelarComposedInput;
+}
+interface DefaultBridgeInput extends BaseBridgeInput {
+    bridge: Exclude<Bridge, Bridge.AXELAR>;
+    input: BaseBridgeInput;
 }
+export type BridgeInput = AxelarComposedInput | 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,EACL,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,SAAS,EACV,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,WAAW,GAAG,YAAY,CAAA;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,WAAW,EAAE,CAAA;IAC7B,UAAU,EAAE,WAAW,GAAG,SAAS,CAAA;IACnC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,UAAU,GAAG,SAAS,CAAA;IAC7B,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,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,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC;IACnE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;CACxB"}
+{"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,eAAe,EAAE,MAAM,sCAAsC,CAAA;AAEtE,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,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,eAAe,CAAC,EAAE,eAAe,EAAE,CAAA;CACpC;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAA;IACrB,KAAK,EAAE,uBAAuB,CAAA;CAC/B;AAED,UAAU,kBAAmB,SAAQ,eAAe;IAClD,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IACtC,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,kBAAkB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/trade-sdk",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "1Delta Trade SDK for handling cross-chain swaps and bridges",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,10 +10,10 @@
     "@1delta/calldatalib": "^0.0.42",
     "viem": "^2.33.0",
     "@1delta/data-sdk": "^0.0.8",
-    "@1delta/aggregators": "0.1.0",
-    "@1delta/bridge-core": "0.1.0",
-    "@1delta/bridge-configs": "0.1.0",
-    "@1delta/lib-utils": "0.1.0"
+    "@1delta/bridge-configs": "0.1.2",
+    "@1delta/aggregators": "0.1.2",
+    "@1delta/bridge-core": "0.1.1",
+    "@1delta/lib-utils": "0.1.3"
   },
   "devDependencies": {
     "@types/node": "^18.0.0",

package/dist/composedTrades/axelar/AxelarWithSwaps.d.ts

@@ -1,5 +0,0 @@
-import { GenericTrade, RawCurrency, useGeneralPricesCallbackType } from '@1delta/lib-utils';
-import { BridgeInput } from '../../types';
-export declare const fetchAxelarTradeWithSwaps: (input: BridgeInput, getCurrency: (chainId: string | undefined, tokenAddress: string | undefined) => RawCurrency | undefined, getPrices: useGeneralPricesCallbackType, controller?: AbortController) => Promise<GenericTrade | undefined>;
-export default fetchAxelarTradeWithSwaps;
-//# sourceMappingURL=AxelarWithSwaps.d.ts.map

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

@@ -1 +0,0 @@
-{"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,WAAW,EAAE,MAAM,aAAa,CAAA;AAmB1D,eAAO,MAAM,yBAAyB,GACpC,OAAO,WAAW,EAClB,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,CA8JlC,CAAA;AAED,eAAe,yBAAyB,CAAA"}