@sodax/sdk 0.0.1-rc.16 → 0.0.1-rc.17

package/README.md

@@ -11,7 +11,6 @@ The Sodax SDK provides a comprehensive interface for interacting with the Sodax
   - ICON ✅
   - Solana ✅
   - Injective ✅
-  - Havah ❌ Coming soon
 
 ### Lend and Borrow (Money Market)
   - EVM (Arbitrum, Avalanche, Base, BSC, Optimism, Polygon, Sonic) ✅
@@ -20,7 +19,6 @@ The Sodax SDK provides a comprehensive interface for interacting with the Sodax
   - ICON ✅
   - Solana ✅
   - Injective ✅
-  - Havah ❌ Coming soon
 
 
 ## Installation
@@ -225,9 +223,8 @@ As part of Sodax suite, xWagmi SDK is also going to be provided as one example w
   - `ISuiWalletProvider`: Sui ✅
   - `IIconWalletProvider`: ICON ✅
   - `IStellarWalletProvider`: Stellar ✅
-  - Solana ✅
-  - Injective ✅
-  - Havah ❌ Coming soon
+  - `ISolanaWalletProvider`: Solana ✅
+  - `IInjectiveWalletProvider`: Injective ✅
 
 ### Initialising Spoke Provider
 

package/dist/index.cjs

@@ -6241,8 +6241,8 @@ var spokeChainConfig = {
     nativeToken: "0x0000000000000000000000000000000000000000",
     bnUSD: "0x6958a4CBFe11406E2a1c1d3a71A1971aD8B3b92F",
     supportedTokens: {
-      Sonic: {
-        symbol: "Sonic",
+      S: {
+        symbol: "S",
         name: "Sonic",
         decimals: 18,
         address: "0x0000000000000000000000000000000000000000"
@@ -6265,8 +6265,8 @@ var spokeChainConfig = {
         decimals: 6,
         address: "0x6047828dc181963ba44974801FF68e538dA5eaF9"
       },
-      wSonic: {
-        symbol: "wSonic",
+      wS: {
+        symbol: "wS",
         name: "Wrapped Sonic",
         decimals: 18,
         address: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38"
@@ -7030,42 +7030,42 @@ var hubVaults = {
 var hubAssets = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].nativeToken]: {
-      asset: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
       decimal: 18,
       symbol: "S",
       name: "Sonic",
       vault: hubVaults.sodaS.address
     },
-    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic.address]: {
-      asset: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
+    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address]: {
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
       decimal: 18,
-      symbol: "wSonic",
+      symbol: "wS",
       name: "Sonic",
       vault: hubVaults.sodaS.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH.address]: {
-      asset: "0x50c42dEAcD8Fc9773493ED674b675bE577f2634b",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH.address,
       decimal: 18,
       symbol: "WETH",
       name: "Wrapped Ethereum",
       vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
-      asset: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC.address,
       decimal: 6,
       symbol: "USDC ",
       name: "USD Coin",
       vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
-      asset: "0x6047828dc181963ba44974801ff68e538da5eaf9",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT.address,
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
       vault: hubVaults.sodaUSDT.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.SODA.address]: {
-      asset: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.SODA.address,
       decimal: 18,
       symbol: "SODA",
       name: "SODA",
@@ -7527,10 +7527,11 @@ var solverConfig = {
 var getSolverConfig = (chainId) => solverConfig[chainId];
 var solverSupportedTokens = {
   [types.SONIC_MAINNET_CHAIN_ID]: [
-    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH, // NOTE: Planned for next release (1 - 2 weeks)
-    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC, // NOTE: Planned for next release (1 - 2 weeks)
-    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT, // NOTE: Planned for next release (1 - 2 weeks)
-    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic, // NOTE: Planned for next release (1 - 2 weeks)
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.S,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS
   ],
   [types.AVALANCHE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.AVAX,
@@ -7697,11 +7698,11 @@ var moneyMarketSupportedTokens = {
   ],
   [types.NIBIRU_MAINNET_CHAIN_ID]: [],
   [types.SONIC_MAINNET_CHAIN_ID]: [
-    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.Sonic,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.S,
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH,
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT,
-    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS
   ]
 };
 var migrationConfig = {
@@ -9052,16 +9053,28 @@ var EvmWalletAbstraction = class {
 var WalletAbstractionService = class {
   constructor() {
   }
-  static async getUserHubWalletAddress(chainId, address, hubProvider, spokeProvider) {
-    if (chainId === hubProvider.chainConfig.chain.id) {
+  /**
+   * Gets the hub wallet address for a user based on their spoke chain address.
+   * @param address - The user's address on the spoke chain
+   * @param spokeProvider - The provider for interacting with the spoke chain
+   * @param hubProvider - The provider for interacting with the hub chain
+   * @returns The user's hub wallet address
+   */
+  static async getUserHubWalletAddress(address, spokeProvider, hubProvider) {
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, address);
+    if (spokeProvider.chainConfig.chain.id === hubProvider.chainConfig.chain.id) {
       if (spokeProvider instanceof SonicSpokeProvider) {
-        return SonicSpokeService.getUserRouter(address, spokeProvider);
+        return SonicSpokeService.getUserRouter(encodedAddress, spokeProvider);
       }
       throw new Error(
         "[WalletAbstractionService.getUserHubWalletAddress] Invalid spoke provider. Sonic spoke provider is required."
       );
     }
-    return EvmWalletAbstraction.getUserHubWalletAddress(chainId, address, hubProvider);
+    return EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      encodedAddress,
+      hubProvider
+    );
   }
 };
 async function retry(action, retryCount = DEFAULT_MAX_RETRY, delayMs = DEFAULT_RETRY_DELAY_MS) {
@@ -9439,26 +9452,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9513,12 +9532,11 @@ var MoneyMarketService = class _MoneyMarketService {
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
-      const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-        spokeProvider.chainConfig.chain.id,
-        walletAddressBytes,
-        this.hubProvider,
-        spokeProvider
+        walletAddress,
+        spokeProvider,
+        this.hubProvider
       );
       const data = this.buildSupplyData(
         params.token,
@@ -9526,7 +9544,6 @@ var MoneyMarketService = class _MoneyMarketService {
         params.amount,
         spokeProvider.chainConfig.chain.id
       );
-      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const txResult = await SpokeService.deposit(
         {
           from: walletAddress,
@@ -9593,26 +9610,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9664,16 +9687,16 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildBorrowData(
       hubWallet,
-      walletAddressBytes,
+      encodedAddress,
       params.token,
       params.amount,
       spokeProvider.chainConfig.chain.id
@@ -9722,26 +9745,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9793,16 +9822,16 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildWithdrawData(
       hubWallet,
-      walletAddressBytes,
+      encodedAddress,
       params.token,
       params.amount,
       spokeProvider.chainConfig.chain.id
@@ -9851,26 +9880,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9924,15 +9959,13 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildRepayData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
-    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const txResult = await SpokeService.deposit(
       {
         from: walletAddress,
@@ -12531,7 +12564,7 @@ var SolverService = class {
    * @param {CreateIntentParams} payload - The intent to create
    * @param {ISpokeProvider} spokeProvider - The spoke provider
    * @param {number} timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[SolverExecutionResponse, Intent, PacketData], IntentError<IntentErrorCode>>>} The solver execution response, intent, and packet data
+   * @returns {Promise<Result<[SolverExecutionResponse, Intent, Hex], IntentError<IntentErrorCode>>>} The solver execution response, intent, and packet data
    *
    * @example
    * const payload = {
@@ -12567,42 +12600,48 @@ var SolverService = class {
         return createIntentResult;
       }
       const [spokeTxHash, intent, data] = createIntentResult.value;
-      const intentRelayChainId = getIntentRelayChainId(payload.srcChain).toString();
-      const submitPayload = payload.srcChain === types.SOLANA_MAINNET_CHAIN_ID && data ? {
-        action: "submit",
-        params: {
-          chain_id: intentRelayChainId,
-          tx_hash: spokeTxHash,
-          data: {
-            address: intent.creator,
-            payload: data
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const intentRelayChainId = getIntentRelayChainId(payload.srcChain).toString();
+        const submitPayload = payload.srcChain === types.SOLANA_MAINNET_CHAIN_ID && data ? {
+          action: "submit",
+          params: {
+            chain_id: intentRelayChainId,
+            tx_hash: spokeTxHash,
+            data: {
+              address: intent.creator,
+              payload: data
+            }
           }
+        } : {
+          action: "submit",
+          params: {
+            chain_id: intentRelayChainId,
+            tx_hash: spokeTxHash
+          }
+        };
+        const submitResult = await this.submitIntent(submitPayload);
+        if (!submitResult.ok) {
+          return submitResult;
         }
-      } : {
-        action: "submit",
-        params: {
-          chain_id: intentRelayChainId,
-          tx_hash: spokeTxHash
+        const packet = await waitUntilIntentExecuted({
+          intentRelayChainId,
+          spokeTxHash,
+          timeout,
+          apiUrl: this.config.relayerApiEndpoint
+        });
+        if (!packet.ok) {
+          return {
+            ok: false,
+            error: packet.error
+          };
         }
-      };
-      const submitResult = await this.submitIntent(submitPayload);
-      if (!submitResult.ok) {
-        return submitResult;
-      }
-      const packet = await waitUntilIntentExecuted({
-        intentRelayChainId,
-        spokeTxHash,
-        timeout,
-        apiUrl: this.config.relayerApiEndpoint
-      });
-      if (!packet.ok) {
-        return {
-          ok: false,
-          error: packet.error
-        };
+        intentTxHash = packet.value.dst_tx_hash;
+      } else {
+        intentTxHash = spokeTxHash;
       }
       const result = await this.postExecution({
-        intent_tx_hash: packet.value.dst_tx_hash
+        intent_tx_hash: intentTxHash
       });
       if (!result.ok) {
         return {
@@ -12615,7 +12654,7 @@ var SolverService = class {
       }
       return {
         ok: true,
-        value: [result.value, intent, packet.value]
+        value: [result.value, intent, intentTxHash]
       };
     } catch (error) {
       return {
@@ -12785,12 +12824,7 @@ var SolverService = class {
         "srcAddress must be the same as wallet address"
       );
       const walletAddressBytes = encodeAddress(params.srcChain, walletAddress);
-      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(
-        params.srcChain,
-        walletAddressBytes,
-        this.hubProvider,
-        spokeProvider
-      );
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
         {
           ...params,
@@ -12840,13 +12874,9 @@ var SolverService = class {
     try {
       invariant2__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
       invariant2__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
-      const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
-      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(
-        spokeProvider.chainConfig.chain.id,
-        walletAddressBytes,
-        this.hubProvider,
-        spokeProvider
-      );
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      const walletAddressBytes = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const calls = [];
       const intentsContract = this.config.intentsContract;
       calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
@@ -14568,6 +14598,7 @@ var SolverIntentErrorCode = /* @__PURE__ */ ((SolverIntentErrorCode2) => {
 exports.BalnSwapService = BalnSwapService;
 exports.BigIntToHex = BigIntToHex;
 exports.BnUSDMigrationService = BnUSDMigrationService;
+exports.ChainIdToIntentRelayChainId = ChainIdToIntentRelayChainId;
 exports.DEFAULT_MAX_RETRY = DEFAULT_MAX_RETRY;
 exports.DEFAULT_RELAYER_API_ENDPOINT = DEFAULT_RELAYER_API_ENDPOINT;
 exports.DEFAULT_RELAY_TX_TIMEOUT = DEFAULT_RELAY_TX_TIMEOUT;