@sodax/sdk 1.2.0-beta → 1.2.2-beta

package/dist/index.mjs

@@ -17684,37 +17684,18 @@ var StakingService = class {
       if (params.action === "stake" || params.action === "unstake" || params.action === "instantUnstake") {
         invariant6(params.amount > 0n, "Amount must be greater than 0");
         const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-        const targetToken = params.action === "stake" || spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
+        const targetToken = params.action === "stake" || !isHubSpokeProvider(spokeProvider, this.hubProvider) ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
         invariant6(targetToken, "Target token not found");
-        if (isEvmSpokeProviderType(spokeProvider)) {
-          const allowanceResult = await Erc20Service.isAllowanceValid(
-            targetToken,
-            params.amount,
+        if (isEvmSpokeProviderType(spokeProvider) || isSonicSpokeProviderType(spokeProvider)) {
+          const spender = isHubSpokeProvider(spokeProvider, this.hubProvider) ? await HubService.getUserRouter(
             walletAddress,
-            spokeProvider.chainConfig.addresses.assetManager,
-            spokeProvider
-          );
-          if (!allowanceResult.ok) {
-            return {
-              ok: false,
-              error: {
-                code: "ALLOWANCE_CHECK_FAILED",
-                error: allowanceResult.error
-              }
-            };
-          }
-          return {
-            ok: true,
-            value: allowanceResult.value
-          };
-        }
-        if (isSonicSpokeProviderType(spokeProvider)) {
-          const userRouter = await SonicSpokeService.getUserRouter(walletAddress, spokeProvider);
+            this.hubProvider
+          ) : spokeProvider.chainConfig.addresses.assetManager;
           const allowanceResult = await Erc20Service.isAllowanceValid(
             targetToken,
             params.amount,
             walletAddress,
-            userRouter,
+            spender,
             spokeProvider
           );
           if (!allowanceResult.ok) {
@@ -17775,13 +17756,17 @@ var StakingService = class {
       if (params.action === "stake" || params.action === "unstake" || params.action === "instantUnstake") {
         invariant6(params.amount > 0n, "Amount must be greater than 0");
         const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-        const targetToken = params.action === "stake" || spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
+        const targetToken = params.action === "stake" || !isHubSpokeProvider(spokeProvider, this.hubProvider) ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
         invariant6(targetToken, "Target token not found");
-        if (isEvmSpokeProviderType(spokeProvider)) {
+        if (isEvmSpokeProviderType(spokeProvider) || isSonicSpokeProviderType(spokeProvider)) {
+          const spender = isHubSpokeProvider(spokeProvider, this.hubProvider) ? await HubService.getUserRouter(
+            walletAddress,
+            this.hubProvider
+          ) : spokeProvider.chainConfig.addresses.assetManager;
           const result = await Erc20Service.approve(
             targetToken,
             params.amount,
-            spokeProvider.chainConfig.addresses.assetManager,
+            spender,
             spokeProvider,
             raw
           );
@@ -17790,17 +17775,6 @@ var StakingService = class {
             value: result
           };
         }
-        if (isSonicSpokeProviderType(spokeProvider)) {
-          const userRouter = await SonicSpokeService.getUserRouter(
-            walletAddress,
-            spokeProvider
-          );
-          const result = await Erc20Service.approve(targetToken, params.amount, userRouter, spokeProvider, raw);
-          return {
-            ok: true,
-            value: result
-          };
-        }
         if (isStellarSpokeProviderType(spokeProvider)) {
           const result = await StellarSpokeService.requestTrustline(targetToken, params.amount, spokeProvider, raw);
           return {
@@ -17860,7 +17834,7 @@ var StakingService = class {
         };
       }
       let hubTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (!isHubSpokeProvider(spokeProvider, this.hubProvider)) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -17917,16 +17891,12 @@ var StakingService = class {
       invariant6(sodaToken, "SODA token not found");
       const sodaAsset = this.configService.getHubAssetInfo(spokeProvider.chainConfig.chain.id, sodaToken.address);
       invariant6(sodaAsset, "SODA asset not found");
-      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+      const hubWallet = await HubService.getUserHubWalletAddress(
         walletAddress,
-        spokeProvider,
+        spokeProvider.chainConfig.chain.id,
         this.hubProvider
       );
-      let to = hubWallet;
-      if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
-        to = walletAddress;
-      }
-      const data = this.buildStakeData(sodaAsset, to, params);
+      const data = this.buildStakeData(sodaAsset, hubWallet, params);
       const txResult = await SpokeService.deposit(
         {
           from: walletAddress,
@@ -17997,7 +17967,7 @@ var StakingService = class {
         };
       }
       let hubTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (!isHubSpokeProvider(spokeProvider, this.hubProvider)) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -18049,11 +18019,10 @@ var StakingService = class {
     raw
   }) {
     try {
-      const isHub = this.hubProvider.chainConfig.chain.id === spokeProvider.chainConfig.chain.id;
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+      const hubWallet = await HubService.getUserHubWalletAddress(
         walletAddress,
-        spokeProvider,
+        spokeProvider.chainConfig.chain.id,
         this.hubProvider
       );
       const xSoda = this.hubProvider.chainConfig.addresses.xSoda;
@@ -18063,23 +18032,7 @@ var StakingService = class {
         this.hubProvider.publicClient
       );
       const data = this.buildUnstakeData(hubWallet, params, xSoda, underlyingSodaAmount);
-      let txResult;
-      if (isHub) {
-        txResult = await SpokeService.deposit(
-          {
-            from: walletAddress,
-            to: hubWallet,
-            token: this.hubProvider.chainConfig.addresses.xSoda,
-            amount: params.amount,
-            data
-          },
-          spokeProvider,
-          this.hubProvider,
-          raw
-        );
-      } else {
-        txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
-      }
+      const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
       return {
         ok: true,
         value: txResult,
@@ -18133,7 +18086,7 @@ var StakingService = class {
         };
       }
       let hubTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (!isHubSpokeProvider(spokeProvider, this.hubProvider)) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -18183,11 +18136,10 @@ var StakingService = class {
     raw
   }) {
     try {
-      const isHub = this.hubProvider.chainConfig.chain.id === spokeProvider.chainConfig.chain.id;
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+      const hubWallet = await HubService.getUserHubWalletAddress(
         walletAddress,
-        spokeProvider,
+        spokeProvider.chainConfig.chain.id,
         this.hubProvider
       );
       const sodaToken = spokeProvider.chainConfig.supportedTokens.SODA;
@@ -18200,23 +18152,7 @@ var StakingService = class {
         encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress),
         params
       );
-      let txResult;
-      if (isHub) {
-        txResult = await SpokeService.deposit(
-          {
-            from: walletAddress,
-            to: hubWallet,
-            token: this.hubProvider.chainConfig.addresses.xSoda,
-            amount: params.amount,
-            data
-          },
-          spokeProvider,
-          this.hubProvider,
-          raw
-        );
-      } else {
-        txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
-      }
+      const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
       return {
         ok: true,
         value: txResult,
@@ -18282,7 +18218,7 @@ var StakingService = class {
         };
       }
       let hubTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (!isHubSpokeProvider(spokeProvider, this.hubProvider)) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -18333,9 +18269,9 @@ var StakingService = class {
   }) {
     try {
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+      const hubWallet = await HubService.getUserHubWalletAddress(
         walletAddress,
-        spokeProvider,
+        spokeProvider.chainConfig.chain.id,
         this.hubProvider
       );
       const sodaToken = spokeProvider.chainConfig.supportedTokens.SODA;
@@ -18418,7 +18354,7 @@ var StakingService = class {
         };
       }
       let hubTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (!isHubSpokeProvider(spokeProvider, this.hubProvider)) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -18469,16 +18405,11 @@ var StakingService = class {
   }) {
     try {
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      let hubWallet;
-      if (spokeProvider instanceof SonicSpokeProvider) {
-        hubWallet = walletAddress;
-      } else {
-        hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
-          walletAddress,
-          spokeProvider,
-          this.hubProvider
-        );
-      }
+      const hubWallet = await HubService.getUserHubWalletAddress(
+        walletAddress,
+        spokeProvider.chainConfig.chain.id,
+        this.hubProvider
+      );
       const data = await this.buildCancelUnstakeData(params, hubWallet);
       const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
       return {
@@ -18534,12 +18465,9 @@ var StakingService = class {
   async getStakingInfoFromSpoke(spokeProvider) {
     try {
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      if (spokeProvider instanceof SonicSpokeProvider) {
-        return this.getStakingInfo(walletAddress);
-      }
-      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+      const hubWallet = await HubService.getUserHubWalletAddress(
         walletAddress,
-        spokeProvider,
+        spokeProvider.chainConfig.chain.id,
         this.hubProvider
       );
       return this.getStakingInfo(hubWallet);
@@ -18563,8 +18491,12 @@ var StakingService = class {
       invariant6(userAddress, "User address is required");
       const hubConfig = getHubChainConfig();
       const xSoda = hubConfig.addresses.xSoda;
-      const totalUnderlying = await StakingLogic.getXSodaTotalAssets(xSoda, this.hubProvider.publicClient);
-      const userXSodaShares = await this.getXSodaBalance(xSoda, userAddress);
+      const [totalUnderlying, userXSodaShares] = await Promise.all([
+        StakingLogic.getXSodaTotalAssets(xSoda, this.hubProvider.publicClient),
+        // Get total assets in xSoda vault (total underlying SODA)
+        this.getXSodaBalance(xSoda, userAddress)
+        // Get user's raw xSODA shares
+      ]);
       const userXSodaValue = await StakingLogic.convertXSodaSharesToSoda(
         xSoda,
         userXSodaShares,
@@ -18607,9 +18539,9 @@ var StakingService = class {
         userAddress = param;
       } else {
         const walletAddress = await param.walletProvider.getWalletAddress();
-        userAddress = await WalletAbstractionService.getUserAbstractedWalletAddress(
+        userAddress = await HubService.getUserHubWalletAddress(
           walletAddress,
-          param,
+          param.chainConfig.chain.id,
           this.hubProvider
         );
       }
@@ -18712,9 +18644,9 @@ var StakingService = class {
         userAddress = param;
       } else {
         const walletAddress = await param.walletProvider.getWalletAddress();
-        userAddress = await WalletAbstractionService.getUserAbstractedWalletAddress(
+        userAddress = await HubService.getUserHubWalletAddress(
           walletAddress,
-          param,
+          param.chainConfig.chain.id,
           this.hubProvider
         );
       }