@sodax/sdk 0.0.1-rc.44 → 0.0.1-rc.46

package/dist/index.cjs

@@ -11837,15 +11837,10 @@ var SonicSpokeService = class _SonicSpokeService {
       throw new Error("[SonicSpokeService.getWithdrawInfo] Hub asset not found");
     }
     const vaultAddress = assetConfig.vault;
-    const [normalizedIncome, reserveData] = await Promise.all([
-      dataService.getReserveNormalizedIncome(vaultAddress),
-      dataService.getReserveData(vaultAddress)
-    ]);
-    const aTokenAddress = reserveData.aTokenAddress;
-    const aTokenAmount = MoneyMarketService.calculateATokenAmount(amount, normalizedIncome);
+    const aTokenAddress = (await dataService.getReserveData(vaultAddress)).aTokenAddress;
     return {
       aTokenAddress,
-      aTokenAmount,
+      aTokenAmount: amount,
       token
     };
   }
@@ -11883,7 +11878,7 @@ var SonicSpokeService = class _SonicSpokeService {
     try {
       const spenderAddress = spender ?? await _SonicSpokeService.getUserRouter(from, spokeProvider);
       return Erc20Service.isAllowanceValid(
-        withdrawInfo.token,
+        withdrawInfo.aTokenAddress,
         withdrawInfo.aTokenAmount,
         from,
         spenderAddress,
@@ -11974,16 +11969,12 @@ var SonicSpokeService = class _SonicSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
-  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService, userRouterAddress) {
-    const userRouter = userRouterAddress ?? await _SonicSpokeService.getUserRouter(from, spokeProvider);
-    let token = withdrawInfo.token;
-    if (withdrawInfo.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
-      token = spokeProvider.chainConfig.addresses.wrappedSonic;
-    }
+  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService) {
+    const userRouter = await _SonicSpokeService.getUserRouter(from, spokeProvider);
     const withdrawCall = moneyMarketService.buildWithdrawData(
       userRouter,
       from,
-      token,
+      withdrawInfo.token,
       amount,
       spokeProvider.chainConfig.chain.id
     );
@@ -12001,6 +11992,18 @@ var SonicSpokeService = class _SonicSpokeService {
       ],
       withdrawCall
     )[0];
+    const transferFromCall = Erc20Service.encodeTransferFrom(
+      withdrawInfo.aTokenAddress,
+      from,
+      userRouter,
+      withdrawInfo.aTokenAmount
+    );
+    calls.unshift({
+      address: transferFromCall.address,
+      value: transferFromCall.value,
+      data: transferFromCall.data
+    });
+    console.log("calls", calls);
     return encodeContractCalls(calls);
   }
 };
@@ -17830,7 +17833,7 @@ var Sodax = class {
     this.relayerApiEndpoint = config?.relayerApiEndpoint ?? DEFAULT_RELAYER_API_ENDPOINT;
     this.hubProvider = new EvmHubProvider(config?.hubProviderConfig);
     this.solver = config && config.solver ? new SolverService(config.solver, this.hubProvider, this.relayerApiEndpoint) : new SolverService(void 0, this.hubProvider, this.relayerApiEndpoint);
-    this.moneyMarket = config && config.moneyMarket ? new MoneyMarketService(config.moneyMarket, this.hubProvider, this.relayerApiEndpoint) : new MoneyMarketService(void 0, this.hubProvider, this.relayerApiEndpoint);
+    this.moneyMarket = config && config.moneyMarket ? new MoneyMarketService2(config.moneyMarket, this.hubProvider, this.relayerApiEndpoint) : new MoneyMarketService2(void 0, this.hubProvider, this.relayerApiEndpoint);
     this.migration = config && config.migration ? new MigrationService(this.hubProvider, config.migration) : new MigrationService(this.hubProvider);
     this.bridge = config && config.bridge ? new BridgeService(this.hubProvider, this.relayerApiEndpoint, config.bridge) : new BridgeService(this.hubProvider, this.relayerApiEndpoint);
     this.backendApiService = new BackendApiService(config?.backendApiConfig);
@@ -19440,7 +19443,7 @@ function formatBasisPoints(value) {
 }
 
 // src/moneyMarket/MoneyMarketService.ts
-var MoneyMarketService = class _MoneyMarketService {
+var MoneyMarketService2 = class _MoneyMarketService {
   config;
   hubProvider;
   data;
@@ -20180,8 +20183,7 @@ var MoneyMarketService = class _MoneyMarketService {
         withdrawInfo,
         params.amount,
         spokeProvider,
-        this,
-        hubWallet
+        this
       );
     } else {
       data = this.buildWithdrawData(
@@ -20766,7 +20768,7 @@ exports.LockupPeriod = LockupPeriod;
 exports.MAX_UINT256 = MAX_UINT256;
 exports.MigrationService = MigrationService;
 exports.MoneyMarketDataService = MoneyMarketDataService;
-exports.MoneyMarketService = MoneyMarketService;
+exports.MoneyMarketService = MoneyMarketService2;
 exports.RAY = RAY;
 exports.RAY_DECIMALS = RAY_DECIMALS;
 exports.SECONDS_PER_YEAR = SECONDS_PER_YEAR;