@1delta/trade-sdk 0.1.9 → 0.1.10

package/dist/composedTrades/index.d.ts

@@ -1,4 +1,4 @@
-export * from './across/acrossWithSwaps';
-export * from './axelar/axelarWithSwaps';
-export * from './gaszip/gaszipWithSwaps';
+import { GenericTrade } from '@1delta/lib-utils';
+import { BridgeInput } from '../types';
+export declare const fetchExactInBridgeTrade: (input: BridgeInput, controller: AbortController) => Promise<GenericTrade | undefined>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/composedTrades/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/composedTrades/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AA8BtC,eAAO,MAAM,uBAAuB,GAClC,OAAO,WAAW,EAClB,YAAY,eAAe,KAC1B,OAAO,CAAC,YAAY,GAAG,SAAS,CAoBlC,CAAA"}

package/dist/composedTrades/index.js

@@ -1,3 +1,40 @@
-export * from './across/acrossWithSwaps';
-export * from './axelar/axelarWithSwaps';
-export * from './gaszip/gaszipWithSwaps';
+import { Bridge } from '@1delta/bridge-configs';
+import { fetchBridgeTrade as fetchBridgeTradeInternal } from '../bridge';
+import { AcrossAdapter } from './across/acrossAdapter';
+import { AxelarAdapter } from './axelar/axelarAdapter';
+import { GaszipAdapter } from './gaszip/gaszipAdapter';
+import { ComposableBridgeAdapter, composeBridgeTrade } from './general';
+const composedAdapters = {
+    [Bridge.ACROSS]: AcrossAdapter,
+    [Bridge.AXELAR]: AxelarAdapter,
+    [Bridge.GASZIP]: GaszipAdapter,
+};
+const composableBridgeSet = new Set([
+    Bridge.BUTTER,
+    // takes too long, should work though
+    Bridge.CROSSCURVE,
+    // cannot be called by contracts
+    // Bridge.LAYERSWAP,
+    Bridge.LIFI,
+    // untested
+    // Bridge.ORBITER,
+    // untested
+    // Bridge.SQUID_V1,
+    Bridge.SQUID_V2,
+    Bridge.STARGATE_BUS,
+    Bridge.STARGATE_TAXI,
+    Bridge.SYMBIOSIS,
+    Bridge.XY,
+]);
+export const fetchExactInBridgeTrade = async (input, controller) => {
+    const { bridge, input: internalInput } = input;
+    const adapter = composedAdapters[bridge];
+    if (bridge === Bridge.ACROSS) {
+        console.log('Adapter is AcrossAdapter', adapter, internalInput);
+    }
+    if (adapter)
+        return composeBridgeTrade(bridge, internalInput, adapter, controller);
+    if (composableBridgeSet.has(bridge))
+        return composeBridgeTrade(bridge, internalInput, ComposableBridgeAdapter, controller);
+    return fetchBridgeTradeInternal(bridge, internalInput, controller);
+};

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,EAQL,aAAa,EAIb,aAAa,EACb,YAAY,EAGb,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,QAAQ,GAAE,YAAY,EAAO,EAC7B,SAAS,GAAE,aAAa,EAAO;;;;GAiThC"}
+{"version":3,"file":"createSwapAndBridgeCalldata.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/createSwapAndBridgeCalldata.ts"],"names":[],"mappings":"AAcA,OAAO,EAQL,aAAa,EAIb,aAAa,EACb,YAAY,EAGb,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,QAAQ,GAAE,YAAY,EAAO,EAC7B,SAAS,GAAE,aAAa,EAAO;;;;GAiRhC"}

package/dist/composedTrades/utils/createSwapAndBridgeCalldata.js

@@ -1,6 +1,6 @@
 import { Bridge } from '@1delta/bridge-configs';
 import { encodeAcrossBridgeNative, encodeAcrossBridgeToken, encodeApprove, encodeExternalCall, encodeGasZipEvmBridge, encodeSquidRouterCall, encodeStargateV2BridgeSimpleTaxi, encodeSweep, encodeTransferIn, encodeTryExternalCall, SweepType, } from '@1delta/calldatalib';
-import { buildMetaSwapParams, CurrencyHandler, DeltaCallType, encodeComposerCompose, getDeltaComposerProxyAddress, getForwarderAddress, LendingCall, minimumAmountInFromAmount, packCommands, TradeUtils, } from '@1delta/lib-utils';
+import { buildMetaSwapParams, CurrencyHandler, encodeComposerCompose, getDeltaComposerProxyAddress, getForwarderAddress, minimumAmountInFromAmount, packCommands, TradeUtils, } from '@1delta/lib-utils';
 import { encodePacked, pad } from 'viem';
 import { createDeltaCalls } from '../../deltaCall';
 export async function createSwapAndBridgeCalldata(trades, account, bridgeReceiver, sweep, fundsToPull = [], catchRevert = true, sweepDust = false, preCalls = [], postCalls = []) {
@@ -136,30 +136,6 @@ export async function createSwapAndBridgeCalldata(trades, account, bridgeReceive
         else
             transferInCommands.push(encodeTransferIn(address, forwarder, amount));
     }
-    const nativeWithdrawOrBorrowCalls = preCalls.filter((c) => c.callType === DeltaCallType.LENDING &&
-        (c.lendingAction === LendingCall.DeltaCallLendingAction.WITHDRAW ||
-            c.lendingAction === LendingCall.DeltaCallLendingAction.BORROW) &&
-        CurrencyHandler.isNativeAddress(c.tokenAddress, sourceChainId));
-    if (nativeWithdrawOrBorrowCalls.length > 0) {
-        const bridgeTrade = trades.find((t) => t.aggregator === Bridge.AXELAR ||
-            t.aggregator === Bridge.STARGATE_TAXI ||
-            t.aggregator === Bridge.GASZIP);
-        let requiredBridgeFee = 0n;
-        if (bridgeTrade?.crossChainParams) {
-            if (bridgeTrade.aggregator === Bridge.AXELAR) {
-                requiredBridgeFee = safeBigInt(bridgeTrade.crossChainParams.totalFeeInNative);
-            }
-            else {
-                requiredBridgeFee = safeBigInt(bridgeTrade.crossChainParams.nativeFee);
-            }
-        }
-        if (requiredBridgeFee > 0n) {
-            value = requiredBridgeFee;
-        }
-        else {
-            value = 0n;
-        }
-    }
     const preCommands = preComposerCommands.length > 0 ? preComposerCommands : transferInCommands;
     const calldata = encodeComposerCompose(packCommands([
         ...preCommands,

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

@@ -2,4 +2,5 @@ export * from './createSwapAndBridgeCalldata';
 export * from './fetchBridgeAndGasTrade';
 export * from './multichainUtils';
 export * from './requireDeltaContracts';
+export * from './validateContracts';
 //# 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,+BAA+B,CAAA;AAC7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,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;AACvC,cAAc,qBAAqB,CAAA"}

package/dist/composedTrades/utils/index.js

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

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

@@ -0,0 +1,5 @@
+export declare const validateContracts: (chainId: string) => {
+    forwarder: string;
+    composer: string;
+};
+//# sourceMappingURL=validateContracts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validateContracts.d.ts","sourceRoot":"","sources":["../../../src/composedTrades/utils/validateContracts.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM;;;CAQhD,CAAA"}

package/dist/composedTrades/utils/validateContracts.js

@@ -0,0 +1,11 @@
+import { getDeltaComposerProxyAddress, getForwarderAddress, } from '@1delta/lib-utils';
+// Extract contract address validation
+export const validateContracts = (chainId) => {
+    const forwarder = getForwarderAddress(chainId);
+    if (!forwarder)
+        throw new Error('Forwarder contract not found');
+    const composer = getDeltaComposerProxyAddress(chainId);
+    if (!composer)
+        throw new Error('Composer proxy contract not found');
+    return { forwarder, composer };
+};

package/dist/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,YAAY,EAEb,MAAM,mBAAmB,CAAA;AAU1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGrC,eAAO,MAAM,gBAAgB,GAC3B,OAAO,WAAW,EAClB,YAAY,eAAe,KAC1B,OAAO,CAAC,YAAY,GAAG,SAAS,CA0BlC,CAAA;AAmBD,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,EACf,OAAO,SAAS,EAAE,EAClB,OAAO,MAAM,EACb,mBAAmB;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB,KACA,kBAOF,CAAA"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,YAAY,EAEb,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGrC,eAAO,MAAM,gBAAgB,GAC3B,OAAO,WAAW,EAClB,YAAY,eAAe,KAC1B,OAAO,CAAC,YAAY,GAAG,SAAS,CA0BlC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,EACf,OAAO,SAAS,EAAE,EAClB,OAAO,MAAM,EACb,mBAAmB;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;CACjB,KACA,kBAOF,CAAA"}

package/dist/core.js

@@ -1,8 +1,6 @@
 import { Bridge } from '@1delta/bridge-configs';
 import { TradeType, } from '@1delta/lib-utils';
-import { isProductionEnv } from '@1delta/lib-utils';
-import { fetchBridgeTrade as fetchBridgeTradeInternal } from './bridge';
-import { fetchAcrossTradeWithSwaps, fetchAxelarTradeWithSwaps, fetchGaszipTradeWithSwaps, } from './composedTrades';
+import { fetchExactInBridgeTrade } from './composedTrades';
 import { createDeltaCallsCalldata } from './deltaCall';
 import { reverseQuote } from './utils';
 export const fetchBridgeTrade = async (input, controller) => {
@@ -24,16 +22,6 @@ export const fetchBridgeTrade = async (input, controller) => {
     };
     return fetchExactInBridgeTrade(bridgeInput, controller);
 };
-const fetchExactInBridgeTrade = async (input, controller) => {
-    const { bridge, input: internalInput } = input;
-    if (bridge === Bridge.ACROSS)
-        return fetchAcrossTradeWithSwaps(internalInput, controller);
-    if (bridge === Bridge.AXELAR)
-        return fetchAxelarTradeWithSwaps(internalInput, controller);
-    if (bridge === Bridge.GASZIP && !isProductionEnv())
-        return fetchGaszipTradeWithSwaps(internalInput, controller);
-    return fetchBridgeTradeInternal(bridge, internalInput, controller);
-};
 export const assembleDeltaCalls = (chainId, calls, value, sweepTokensProps) => {
     const { calldata, to } = createDeltaCallsCalldata(chainId, calls, sweepTokensProps);
     return { calldata, to, value: value.toString() };

package/dist/index.d.ts

@@ -3,6 +3,8 @@ export { fetchBridgeTrade as fetchBridgeTradeWithoutComposed } from './bridge';
 export * from './core';
 export * from './initialize';
 export type { getCurrencyGetter, getPriceGetter } from './registry';
+export * from './tradeExecution';
+export type { ApprovalInfo } from './tradeExecution/types';
 export type { BridgeInput } from './types';
 export { TradeAggregator } from '@1delta/aggregators';
 export { Bridge, getBridges, getCowSwapSlippage, getSwapAggregators, } from '@1delta/bridge-configs';

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,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACnE,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,cAAc,EACd,SAAS,EACT,aAAa,EACb,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,WAAW,EACX,4BAA4B,GAC7B,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,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,cAAc,cAAc,CAAA;AAC5B,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACnE,cAAc,kBAAkB,CAAA;AAChC,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,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,cAAc,EACd,SAAS,EACT,aAAa,EACb,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,WAAW,EACX,4BAA4B,GAC7B,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/index.js

@@ -2,6 +2,7 @@ export { fetchAggregatorTrade, getAvailableAggregators } from './aggregator';
 export { fetchBridgeTrade as fetchBridgeTradeWithoutComposed } from './bridge';
 export * from './core';
 export * from './initialize';
+export * from './tradeExecution';
 export { TradeAggregator } from '@1delta/aggregators';
 export { Bridge, getBridges, getCowSwapSlippage, getSwapAggregators, } from '@1delta/bridge-configs';
 export { getBridgeIcon, getStatus as getBridgeStatus, } from '@1delta/bridge-core';

package/dist/initialize.d.ts

@@ -5,8 +5,8 @@ import { CurrencyGetter, PriceGetter } from '@1delta/lib-utils';
 import { WalletClient } from 'viem';
 type SdkConfig = {
     isProductionEnv: boolean;
-    priceGetter: PriceGetter;
-    currencyGetter: CurrencyGetter;
+    priceGetter?: PriceGetter;
+    currencyGetter?: CurrencyGetter;
     loadChainData?: boolean;
     loadSquidData?: boolean;
     load1deltaConfigs?: boolean;

package/dist/initialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../src/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EACL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAEL,cAAc,EACd,WAAW,EAEZ,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAWnC,KAAK,SAAS,GAAG;IACf,eAAe,EAAE,OAAO,CAAA;IACxB,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,cAAc,CAAA;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,mBAAmB,CAAC,EAAE,eAAe,EAAE,CAAA;IACvC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAClC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CAChD,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,UAAU,GAAU,QAAQ,SAAS,KAAG,OAAO,CAAC,IAAI,CA0BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,cAAc,YAAY,SAEzD,CAAA"}
+{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../src/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EACL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAEL,cAAc,EACd,WAAW,EAEZ,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAWnC,KAAK,SAAS,GAAG;IACf,eAAe,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,mBAAmB,CAAC,EAAE,eAAe,EAAE,CAAA;IACvC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAClC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CAChD,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,UAAU,GAAU,QAAQ,SAAS,KAAG,OAAO,CAAC,IAAI,CA0BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,cAAc,YAAY,SAEzD,CAAA"}

package/dist/registry/currency.d.ts

@@ -1,4 +1,4 @@
 import { CurrencyGetter } from '@1delta/lib-utils';
-export declare function registerCurrencyGetter(currencyGetter: CurrencyGetter): void;
+export declare function registerCurrencyGetter(currencyGetter?: CurrencyGetter): void;
 export declare function getCurrencyGetter(): CurrencyGetter;
 //# sourceMappingURL=currency.d.ts.map

package/dist/registry/currency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"currency.d.ts","sourceRoot":"","sources":["../../src/registry/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIlD,wBAAgB,sBAAsB,CAAC,cAAc,EAAE,cAAc,QAEpE;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CAkBlD"}
+{"version":3,"file":"currency.d.ts","sourceRoot":"","sources":["../../src/registry/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIlD,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,cAAc,QAErE;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CAkBlD"}

package/dist/registry/currency.js

@@ -1,6 +1,7 @@
 const registry = [];
 export function registerCurrencyGetter(currencyGetter) {
-    registry.push(currencyGetter);
+    if (currencyGetter)
+        registry.push(currencyGetter);
 }
 export function getCurrencyGetter() {
     return (chainId, tokenAddress) => {

package/dist/registry/price.d.ts

@@ -1,4 +1,4 @@
 import { PriceGetter } from '@1delta/lib-utils';
-export declare function registerPriceGetter(priceGetter: PriceGetter): void;
+export declare function registerPriceGetter(priceGetter?: PriceGetter): void;
 export declare function getPriceGetter(): PriceGetter;
 //# sourceMappingURL=price.d.ts.map

package/dist/registry/price.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/registry/price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAI/C,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,QAE3D;AAED,wBAAgB,cAAc,IAAI,WAAW,CAiB5C"}
+{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/registry/price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAI/C,wBAAgB,mBAAmB,CAAC,WAAW,CAAC,EAAE,WAAW,QAE5D;AAED,wBAAgB,cAAc,IAAI,WAAW,CAiB5C"}

package/dist/registry/price.js

@@ -1,6 +1,7 @@
 const registry = [];
 export function registerPriceGetter(priceGetter) {
-    registry.push(priceGetter);
+    if (priceGetter)
+        registry.push(priceGetter);
 }
 export function getPriceGetter() {
     return (priceQueries) => {

package/dist/tradeExecution/getStatusFromTrade.d.ts

@@ -0,0 +1,20 @@
+import { Status as BridgeStatus } from '@1delta/bridge-core';
+import { GenericTrade } from '@1delta/lib-utils';
+import { PublicClient } from 'viem';
+/**
+ * Provide a current status from a trade
+ * @param fromHash tx hash on source chain
+ * @param trade trade object
+ * @returns status object
+ */
+export declare function getStatusFromTrade(fromHash: string, trade: GenericTrade, publicClient?: PublicClient): Promise<{
+    fromHash?: string | undefined;
+    toHash?: string | undefined;
+    message?: string;
+    statusInfo: {
+        status: BridgeStatus;
+        message?: string;
+        bridgeResponseResult?: any;
+    };
+} | null>;
+//# sourceMappingURL=getStatusFromTrade.d.ts.map

package/dist/tradeExecution/getStatusFromTrade.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStatusFromTrade.d.ts","sourceRoot":"","sources":["../../src/tradeExecution/getStatusFromTrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,IAAI,YAAY,EACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAmB,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAInC;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,YAAY,EACnB,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE;QACV,MAAM,EAAE,YAAY,CAAA;QACpB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,oBAAoB,CAAC,EAAE,GAAG,CAAA;KAC3B,CAAA;CACF,GAAG,IAAI,CAAC,CA0ER"}

package/dist/tradeExecution/getStatusFromTrade.js

@@ -0,0 +1,71 @@
+import { getStatus as getBridgeStatus, } from '@1delta/bridge-core';
+import { getViemProvider } from '@1delta/lib-utils';
+import { isBridge } from './isBridge';
+/**
+ * Provide a current status from a trade
+ * @param fromHash tx hash on source chain
+ * @param trade trade object
+ * @returns status object
+ */
+export async function getStatusFromTrade(fromHash, trade, publicClient) {
+    const provider = publicClient ??
+        (await getViemProvider({ chainId: trade.inputAmount.currency.chainId }));
+    if (!isBridge(trade)) {
+        const receipt = await provider
+            ?.getTransactionReceipt({ hash: fromHash })
+            .catch(() => null);
+        if (!receipt) {
+            return {
+                fromHash,
+                toHash: fromHash,
+                statusInfo: {
+                    status: 'PENDING',
+                },
+            };
+        }
+        if (receipt.status === 'success') {
+            return {
+                fromHash,
+                toHash: fromHash,
+                statusInfo: {
+                    status: 'DONE',
+                },
+            };
+        }
+        if (receipt.status === 'reverted') {
+            return {
+                fromHash,
+                toHash: fromHash,
+                statusInfo: {
+                    message: 'Transaction reverted.',
+                    status: 'FAILED',
+                },
+            };
+        }
+        return {
+            fromHash,
+            toHash: fromHash,
+            statusInfo: {
+                status: 'PENDING',
+            },
+        };
+    }
+    const srcReceipt = await provider
+        ?.getTransactionReceipt({ hash: fromHash })
+        .catch(() => null);
+    if (srcReceipt && srcReceipt.status === 'reverted') {
+        return {
+            fromHash,
+            toHash: fromHash,
+            statusInfo: {
+                message: 'Source chain transaction reverted.',
+                status: 'FAILED',
+            },
+        };
+    }
+    return await getBridgeStatus(trade.aggregator, {
+        fromChainId: trade.inputAmount.currency.chainId,
+        toChainId: trade.outputAmount.currency.chainId,
+        fromHash,
+    }, trade.crossChainParams);
+}

package/dist/tradeExecution/getTransactionData.d.ts

@@ -0,0 +1,13 @@
+import { GenericTrade } from '@1delta/lib-utils';
+import { Address, Hex } from 'viem';
+/**
+ * Build txn from trade
+ * We need to move this to the SDK
+ * @param trade sdk object that generates calldata via `assemble`
+ */
+export declare function getTransactionData(trade: GenericTrade): Promise<{
+    to: Address;
+    data: Hex;
+    value: bigint;
+} | null>;
+//# sourceMappingURL=getTransactionData.d.ts.map

package/dist/tradeExecution/getTransactionData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTransactionData.d.ts","sourceRoot":"","sources":["../../src/tradeExecution/getTransactionData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAEnC;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC;IACrE,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,EAAE,GAAG,CAAA;IACT,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,IAAI,CAAC,CAiDR"}

package/dist/tradeExecution/getTransactionData.js

@@ -0,0 +1,50 @@
+/**
+ * Build txn from trade
+ * We need to move this to the SDK
+ * @param trade sdk object that generates calldata via `assemble`
+ */
+export async function getTransactionData(trade) {
+    if (!trade)
+        return null;
+    if ('assemble' in trade &&
+        trade.assemble &&
+        typeof trade.assemble === 'function') {
+        const assembled = await trade.assemble();
+        const assembledItems = Array.isArray(assembled) ? assembled : [assembled];
+        for (const item of assembledItems) {
+            if (item && 'EVM' in item && item.EVM) {
+                const tx = item.EVM;
+                const calldata = tx.calldata ?? tx.data;
+                const toAddress = (tx.to ?? trade.target);
+                if (!toAddress) {
+                    throw new Error('Missing transaction target address');
+                }
+                return {
+                    to: toAddress,
+                    data: calldata,
+                    value: tx.value ?? 0n,
+                };
+            }
+            if (item && item.transaction) {
+                const tx = item.transaction;
+                const calldata = tx.calldata ?? tx.data;
+                if (tx && calldata && tx.to) {
+                    return {
+                        to: tx.to,
+                        data: calldata,
+                        value: tx.value ?? 0n,
+                    };
+                }
+            }
+            if (item && item.to && (item.calldata || item.data)) {
+                const calldata = item.calldata ?? item.data;
+                return {
+                    to: item.to,
+                    data: calldata,
+                    value: item.value ?? 0n,
+                };
+            }
+        }
+    }
+    throw new Error('No assemble function found');
+}

package/dist/tradeExecution/index.d.ts

@@ -0,0 +1,13 @@
+import { GenericTrade } from '@1delta/lib-utils';
+import type { PublicClient, WalletClient } from 'viem';
+import { ExecutionTracker, ApprovalInfo } from './types';
+export declare function executeTrade(args: {
+    trade: GenericTrade;
+    account: string;
+    walletClient: WalletClient;
+    publicClient: PublicClient;
+    needsApproval: boolean;
+    approvals?: ApprovalInfo[];
+}): ExecutionTracker;
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tradeExecution/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAO,YAAY,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAO3D,OAAO,EAAkB,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,YAAY,CAAA;IAC1B,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;CAC3B,GAAG,gBAAgB,CAiMnB;AAED,cAAc,SAAS,CAAA"}

package/dist/tradeExecution/index.js

@@ -0,0 +1,150 @@
+import { createApproveTransaction } from '@1delta/calldata-sdk';
+import { zeroAddress } from 'viem';
+import { getTransactionData } from './getTransactionData';
+import { isBridge } from './isBridge';
+import { signEvmDataOrMessage } from './signData';
+import { trackTradeCompletion } from './trackTradeCompletion';
+export function executeTrade(args) {
+    const listeners = new Set();
+    let cancelled = false;
+    const emit = (event) => {
+        listeners.forEach((l) => l(event));
+    };
+    const tracker = {
+        on: (listener) => listeners.add(listener),
+        off: (listener) => listeners.delete(listener),
+        cancel: () => {
+            cancelled = true;
+        },
+        done: null,
+    };
+    tracker.done = (async () => {
+        await Promise.resolve(); // required for listeners to be registered before event emitting
+        try {
+            // -----------------------------------------------------
+            // 1. APPROVAL
+            // -----------------------------------------------------
+            const chain = args.walletClient.chain;
+            if (!chain)
+                throw new Error('Missing chain on walletClient');
+            if (args.approvals && args.approvals.length > 0) {
+                for (const approval of args.approvals) {
+                    if (approval.needsApproval && approval.token !== zeroAddress) {
+                        emit({ type: 'approval:start' });
+                        let approvalTxHash;
+                        if (approval.approvalTransaction) {
+                            const tx = approval.approvalTransaction;
+                            if (!tx.to || !tx.data)
+                                throw new Error('Invalid approvalTransaction');
+                            approvalTxHash = await args.walletClient.sendTransaction({
+                                to: tx.to,
+                                data: tx.data,
+                                value: tx.value ?? 0n,
+                                account: args.account,
+                                chain,
+                            });
+                        }
+                        else {
+                            const approveTx = createApproveTransaction(String(chain.id), args.account, approval.spender, approval.token, approval.requiredAmount);
+                            approvalTxHash = await args.walletClient.sendTransaction({
+                                to: approveTx.to,
+                                data: approveTx.data,
+                                value: approveTx.value ?? 0n,
+                                account: args.account,
+                                chain,
+                            });
+                        }
+                        emit({ type: 'approval:sent', txHash: approvalTxHash });
+                        await args.publicClient.waitForTransactionReceipt({
+                            hash: approvalTxHash,
+                        });
+                        emit({ type: 'approval:confirmed', txHash: approvalTxHash });
+                        if (cancelled)
+                            throw new Error('Cancelled');
+                    }
+                }
+            }
+            const spender = args.trade?.approvalTarget || args.trade?.target;
+            if (args.needsApproval &&
+                args.trade?.inputAmount.currency.address !== zeroAddress) {
+                if (!spender)
+                    throw new Error('Missing approval target');
+                emit({ type: 'approval:start' });
+                const approveTx = createApproveTransaction(String(chain.id), args.account, spender, args.trade?.inputAmount.currency.address, args.trade?.inputAmount.amount);
+                const approvalTxHash = await args.walletClient.sendTransaction({
+                    to: approveTx.to,
+                    data: approveTx.data,
+                    value: approveTx.value ?? 0n,
+                    account: args.account,
+                    chain,
+                });
+                emit({ type: 'approval:sent', txHash: approvalTxHash });
+                await args.publicClient.waitForTransactionReceipt({
+                    hash: approvalTxHash,
+                });
+                emit({ type: 'approval:confirmed', txHash: approvalTxHash });
+            }
+            if (cancelled)
+                throw new Error('Cancelled');
+            // -----------------------------------------------------
+            // 2. SIGN + SEND MAIN TRANSACTION / Execute Order
+            // -----------------------------------------------------
+            let txHash;
+            if (args.trade && args.trade.order) {
+                emit({ type: 'tx:signing' });
+                const orderSignature = args.trade.order.dataToSign
+                    ? await signEvmDataOrMessage(args.walletClient, args.account, args.trade.order.dataToSign)
+                    : undefined;
+                await args.trade.order.broadcastIntent(orderSignature);
+                const result = await args.trade.order.trackIntent();
+                if (!result.EVM?.hash)
+                    throw new Error('Transaction hash not found');
+                txHash = result.EVM.hash;
+            }
+            else {
+                emit({ type: 'tx:signing' });
+                const txData = await getTransactionData(args.trade);
+                if (!txData)
+                    throw new Error('Transaction creation failed');
+                txHash = await args.walletClient.sendTransaction({
+                    ...txData,
+                    account: args.account,
+                    chain,
+                });
+            }
+            emit({ type: 'tx:sent', src: txHash });
+            const receipt = await args.publicClient.waitForTransactionReceipt({
+                hash: txHash,
+            });
+            if (receipt.status === 'reverted') {
+                emit({
+                    type: 'error',
+                    error: new Error('Source chain transaction failed (reverted)'),
+                    src: txHash,
+                });
+                return { srcHash: txHash, completed: false };
+            }
+            emit({ type: 'tx:confirmed', src: txHash });
+            // -----------------------------------------------------
+            // 3. BRIDGE TRACKING
+            // -----------------------------------------------------
+            if (isBridge(args.trade)) {
+                emit({ type: 'tracking', srcHash: txHash });
+                const eventSummary = await trackTradeCompletion(txHash, args.trade, emit);
+                emit(eventSummary);
+                return { srcHash: txHash, dstHash: eventSummary.dst, completed: true };
+            }
+            // -----------------------------------------------------
+            // 4. NO BRIDGE → DONE
+            // -----------------------------------------------------
+            emit({ type: 'done', src: txHash });
+            return { srcHash: txHash, completed: true };
+        }
+        catch (error) {
+            emit({ type: 'error', error });
+            return { completed: false };
+        }
+    })();
+    return tracker;
+}
+export * from './types';

package/dist/tradeExecution/isBridge.d.ts

@@ -0,0 +1,3 @@
+import { GenericTrade } from '@1delta/lib-utils';
+export declare function isBridge(trade?: GenericTrade): boolean;
+//# sourceMappingURL=isBridge.d.ts.map

package/dist/tradeExecution/isBridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isBridge.d.ts","sourceRoot":"","sources":["../../src/tradeExecution/isBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,WAE5C"}

package/dist/tradeExecution/isBridge.js

@@ -0,0 +1,3 @@
+export function isBridge(trade) {
+    return trade?.inputAmount.currency.chainId !== trade?.outputAmount.currency.chainId;
+}

package/dist/tradeExecution/signData.d.ts

@@ -0,0 +1,4 @@
+import { EvmSignInputs } from '@1delta/lib-utils';
+import { WalletClient } from 'viem';
+export declare function signEvmDataOrMessage(walletClient: WalletClient, account: string, inputs: EvmSignInputs): Promise<`0x${string}`>;
+//# sourceMappingURL=signData.d.ts.map

package/dist/tradeExecution/signData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signData.d.ts","sourceRoot":"","sources":["../../src/tradeExecution/signData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAW,YAAY,EAAE,MAAM,MAAM,CAAA;AAE5C,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,aAAa,0BAwBtB"}