@1delta/trade-sdk 0.1.8 → 0.1.9

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

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

package/dist/aggregator/fetchAggregatorTrade.js

@@ -1,5 +1,6 @@
 import { fetchAggregatorTrade as fetchAggregatorTradeWithoutConfigs, TradeAggregator, } from '@1delta/aggregators';
 import { getSwapAggregators } from '@1delta/bridge-configs';
+import { getAllConfigs } from '@1delta/bridge-core';
 import { ChainType, ChainUtils, TradeType, } from '@1delta/lib-utils';
 import { fetchBridgeTrade } from '../bridge/fetchBridgeTrade';
 import { createSwapAndBridgeCalldata, requireDeltaContracts, } from '../composedTrades/utils';
@@ -76,7 +77,8 @@ const fetchSwapTrade = async (aggregator, input, controller) => {
     return fetchExactInSwapTrade(aggregator, input, controller);
 };
 const fetchExactInSwapTrade = async (aggregator, input, controller) => {
-    if (getSwapAggregators().includes(aggregator)) {
+    if (getSwapAggregators().includes(aggregator) ||
+        getAllConfigs().some((config) => config.name === aggregator)) {
         return await fetchBridgeTrade(aggregator, { ...input, order: 'CHEAPEST' }, controller);
     }
     else {

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,EAGb,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"}
+{"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"}

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, encodeComposerCompose, getDeltaComposerProxyAddress, getForwarderAddress, minimumAmountInFromAmount, packCommands, TradeUtils, } from '@1delta/lib-utils';
+import { buildMetaSwapParams, CurrencyHandler, DeltaCallType, encodeComposerCompose, getDeltaComposerProxyAddress, getForwarderAddress, LendingCall, 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,6 +136,30 @@ 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/deltaCall/toComposerCall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toComposerCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toComposerCall.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,SAAS,EAIV,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,CAyHvE"}
+{"version":3,"file":"toComposerCall.d.ts","sourceRoot":"","sources":["../../src/deltaCall/toComposerCall.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,SAAS,EAIV,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,CAmHvE"}

package/dist/deltaCall/toComposerCall.js

@@ -22,16 +22,13 @@ export function toComposerCall(call, receiver) {
                     return [withdrawCall];
                 }
                 case LendingCall.DeltaCallLendingAction.DEPOSIT: {
-                    const isMaxIn = call.amount === 0n;
                     const depositCall = ComposerLendingActions.createDeposit({
                         lender: call.lender,
                         chainId: call.chainId,
                         asset: call.tokenAddress,
                         amount: call.amount,
                         receiver: call.receiver, // user is receiver
-                        transferType: isMaxIn
-                            ? TransferToLenderType.UserBalance
-                            : TransferToLenderType.Amount,
+                        transferType: call.transferType,
                         morphoParams: call.morphoParams,
                         useOverride: call.useOverride,
                     });
@@ -51,16 +48,13 @@ export function toComposerCall(call, receiver) {
                     return [borrowCall];
                 }
                 case LendingCall.DeltaCallLendingAction.REPAY: {
-                    const isMaxIn = call.amount === 0n;
                     const repayCall = ComposerLendingActions.createRepay({
                         lender: call.lender,
                         chainId: call.chainId,
                         asset: call.tokenAddress,
                         amount: call.amount,
                         receiver: call.receiver,
-                        transferType: isMaxIn
-                            ? TransferToLenderType.UserBalance
-                            : TransferToLenderType.Amount,
+                        transferType: call.transferType,
                         lendingMode: call.lendingMode,
                         morphoParams: call.morphoParams,
                         useOverride: call.useOverride,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/trade-sdk",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "1Delta Trade SDK for handling cross-chain swaps and bridges",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,11 +10,11 @@
     "@1delta/calldata-sdk": "^0.0.132",
     "@1delta/calldatalib": "^0.0.46",
     "@1delta/data-sdk": "0.0.11",
-    "viem": "^2.43.4",
+    "viem": "^2.43.5",
     "@1delta/aggregators": "0.1.6",
-    "@1delta/lib-utils": "0.1.9",
     "@1delta/bridge-core": "0.1.3",
-    "@1delta/bridge-configs": "0.1.8"
+    "@1delta/lib-utils": "0.1.10",
+    "@1delta/bridge-configs": "0.1.9"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",