@multiversx/sdk-dapp-liquidity 1.1.7 → 2.0.0-alpha.0

package/reactjs/adapters/SuiAdapter.mjs

@@ -0,0 +1,349 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { AdapterBlueprint, WalletConnectConnector, WcHelpersUtil } from "@reown/appkit-controllers";
+const WC_ID = "walletConnect";
+const DEFAULT_SUI_CAIP_CHAINS = ["sui:mainnet", "sui:testnet", "sui:devnet"];
+class SuiAdapter extends AdapterBlueprint {
+  constructor(opts) {
+    super({
+      namespace: "sui",
+      adapterType: "sui"
+    });
+    /**
+     * AppKit’s single WalletConnect UniversalProvider (same instance as Wagmi/EVM).
+     * @see @reown/appkit-adapter-solana — adapters must NOT call UniversalProvider.init() again
+     *   (duplicate Core breaks pairing / QR). `listenWalletConnect` attaches `display_uri` here only.
+     */
+    __publicField(this, "sharedWcProvider");
+    __publicField(this, "explicitCaipChainsFromInit");
+    /**
+     * AppKit passes `networks` here from `createAppKit({ networks })` filtered by namespace.
+     * `ChainController.getRequestedCaipNetworks('sui')` is often still empty → we must keep this.
+     */
+    __publicField(this, "suiNetworksFromConfig", []);
+    this.explicitCaipChainsFromInit = (opts == null ? void 0 : opts.explicitCaipChains) ?? [];
+  }
+  construct(params) {
+    super.construct(params);
+    this.suiNetworksFromConfig = params.networks ?? [];
+  }
+  /**
+   * Resolves CAIP-2 chain ids for the WC session. Never return [] (breaks pairing + QR UI).
+   */
+  pickChainsFromExplicit(explicit, chainId) {
+    if (explicit.length === 0) {
+      return DEFAULT_SUI_CAIP_CHAINS;
+    }
+    if (chainId !== void 0 && chainId !== null) {
+      const cid = chainId.toString();
+      const match = explicit.find(
+        (c) => c === `sui:${cid}` || c.endsWith(`:${cid}`)
+      );
+      if (match) {
+        return [match];
+      }
+    }
+    return explicit;
+  }
+  resolveSuiChainsForConnect(chainId) {
+    const fromController = this.getCaipNetworks("sui");
+    const source = fromController.length > 0 ? fromController : this.suiNetworksFromConfig;
+    if (source.length === 0) {
+      return this.pickChainsFromExplicit(
+        this.explicitCaipChainsFromInit,
+        chainId
+      );
+    }
+    const toCaip = (n) => n.caipNetworkId || `sui:${n.id}`;
+    if (chainId !== void 0 && chainId !== null) {
+      const match = source.find((n) => {
+        var _a;
+        return ((_a = n.id) == null ? void 0 : _a.toString()) === chainId.toString();
+      });
+      if (match) {
+        return [toCaip(match)];
+      }
+    }
+    return source.map(toCaip);
+  }
+  /**
+   * `WalletConnectConnector` typings require `caipNetworks` (ChainController may still be empty
+   * when this runs). Prefer networks from `construct`, else explicit/init CAIP ids.
+   */
+  getCaipNetworksForWalletConnectConnector() {
+    if (this.suiNetworksFromConfig.length > 0) {
+      return this.suiNetworksFromConfig;
+    }
+    const caipIds = this.explicitCaipChainsFromInit.length > 0 ? this.explicitCaipChainsFromInit : DEFAULT_SUI_CAIP_CHAINS;
+    return caipIds.map((caip) => {
+      const id = caip.startsWith("sui:") ? caip.slice(4) : caip;
+      return {
+        id,
+        chainNamespace: "sui",
+        caipNetworkId: caip,
+        name: "Sui",
+        nativeCurrency: { name: "SUI", symbol: "SUI", decimals: 9 },
+        rpcUrls: {
+          default: { http: [`https://fullnode.${id}.sui.io:443`] }
+        }
+      };
+    });
+  }
+  syncConnectors() {
+  }
+  async setUniversalProvider(sharedProvider) {
+    this.sharedWcProvider = sharedProvider;
+    const wcConnector = new WalletConnectConnector({
+      provider: sharedProvider,
+      namespace: "sui",
+      caipNetworks: this.getCaipNetworksForWalletConnectConnector()
+    });
+    this.addConnector(wcConnector);
+    WcHelpersUtil.listenWcProvider({
+      universalProvider: sharedProvider,
+      namespace: "sui",
+      onConnect: (accounts) => this.onConnect(accounts, WC_ID),
+      onDisconnect: () => this.onDisconnect(WC_ID),
+      onAccountsChanged: (accounts) => this.onAccountsChanged(accounts, WC_ID, false)
+    });
+  }
+  getWcProvider() {
+    if (!this.sharedWcProvider) {
+      throw new Error(
+        "SuiAdapter: UniversalProvider not ready — setUniversalProvider must run before connect"
+      );
+    }
+    return this.sharedWcProvider;
+  }
+  async connectWalletConnect(chainId) {
+    var _a, _b;
+    const wc = this.getWcProvider();
+    if ((_b = (_a = wc.session) == null ? void 0 : _a.namespaces) == null ? void 0 : _b["sui"]) {
+      const clientId2 = await wc.client.core.crypto.getClientId();
+      return { clientId: clientId2 };
+    }
+    const chains = this.resolveSuiChainsForConnect(chainId);
+    const safeChains = chains.length > 0 ? chains : DEFAULT_SUI_CAIP_CHAINS;
+    await wc.connect({
+      optionalNamespaces: {
+        sui: {
+          methods: [
+            "sui_signPersonalMessage",
+            "sui_signTransaction",
+            "sui_signAndExecuteTransaction"
+          ],
+          chains: safeChains,
+          events: []
+        }
+      }
+    });
+    const clientId = await wc.client.core.crypto.getClientId();
+    return { clientId };
+  }
+  async connect(params) {
+    var _a, _b, _c;
+    const connector = this.connectors.find((c) => c.id === params.id);
+    if (!connector) {
+      throw new Error("Sui connector not found");
+    }
+    const existingConnection = this.getConnection({
+      address: params.address,
+      connectorId: connector.id,
+      connections: this.connections,
+      connectors: this.connectors
+    });
+    if (existingConnection == null ? void 0 : existingConnection.account) {
+      const chainId2 = ((_a = existingConnection.caipNetwork) == null ? void 0 : _a.id) ?? params.chainId ?? "mainnet";
+      this.emit("accountChanged", {
+        address: existingConnection.account.address,
+        chainId: chainId2,
+        connector
+      });
+      return {
+        id: connector.id,
+        address: existingConnection.account.address,
+        chainId: chainId2,
+        provider: connector.provider,
+        type: connector.type
+      };
+    }
+    const wc = this.getWcProvider();
+    const accounts = WcHelpersUtil.getWalletConnectAccounts(
+      wc,
+      "sui"
+    );
+    const address = (_b = accounts[0]) == null ? void 0 : _b.address;
+    if (!address) {
+      throw new Error("No Sui account found after WalletConnect session");
+    }
+    const caipNetwork = (_c = this.getCaipNetworks()) == null ? void 0 : _c.find(
+      (n) => n.id === params.chainId
+    );
+    this.addConnection({
+      connectorId: connector.id,
+      accounts: [{ address }],
+      caipNetwork
+    });
+    const chainId = params.chainId ?? (caipNetwork == null ? void 0 : caipNetwork.id) ?? "mainnet";
+    this.emit("accountChanged", {
+      address,
+      chainId,
+      connector
+    });
+    return {
+      id: connector.id,
+      address,
+      chainId,
+      provider: connector.provider,
+      type: connector.type
+    };
+  }
+  async disconnect(params) {
+    if (params == null ? void 0 : params.id) {
+      if (this.sharedWcProvider) {
+        try {
+          await this.sharedWcProvider.disconnect();
+        } catch {
+        }
+      }
+      this.deleteConnection(params.id);
+    }
+    if (this.connections.length === 0) {
+      this.emit("disconnect");
+    } else {
+      this.emitFirstAvailableConnection();
+    }
+    return { connections: this.connections };
+  }
+  async getAccounts(params) {
+    if (!this.sharedWcProvider) {
+      return { accounts: [] };
+    }
+    const accounts = WcHelpersUtil.getWalletConnectAccounts(
+      this.sharedWcProvider,
+      "sui"
+    );
+    return {
+      accounts: accounts.map((a) => ({
+        namespace: "sui",
+        address: a.address,
+        type: "eoa"
+      }))
+    };
+  }
+  async getBalance(params) {
+    var _a, _b, _c;
+    if (!params.address) {
+      return { balance: "0", symbol: "SUI" };
+    }
+    try {
+      const caipNetwork = (_a = this.getCaipNetworks()) == null ? void 0 : _a.find(
+        (n) => n.id === params.chainId
+      );
+      const rpcUrl = `https://fullnode.${caipNetwork == null ? void 0 : caipNetwork.id}.sui.io:443`;
+      if (!rpcUrl) {
+        return { balance: "0", symbol: "SUI" };
+      }
+      const res = await fetch(rpcUrl, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          jsonrpc: "2.0",
+          id: 1,
+          method: "suix_getBalance",
+          params: [params.address, "0x2::sui::SUI"]
+        })
+      });
+      const data = await res.json();
+      const totalBalance = ((_b = data == null ? void 0 : data.result) == null ? void 0 : _b.totalBalance) ?? "0";
+      const formatted = (parseInt(totalBalance, 10) / 1e9).toString();
+      return {
+        balance: formatted,
+        symbol: ((_c = caipNetwork == null ? void 0 : caipNetwork.nativeCurrency) == null ? void 0 : _c.symbol) || "SUI"
+      };
+    } catch {
+      return { balance: "0", symbol: "SUI" };
+    }
+  }
+  async switchNetwork(params) {
+    await super.switchNetwork(params);
+  }
+  async syncConnection(params) {
+    return this.connect({ ...params, type: "" });
+  }
+  async syncConnections({
+    connectToFirstConnector,
+    caipNetwork
+  }) {
+    if (!this.sharedWcProvider) {
+      return;
+    }
+    const accounts = WcHelpersUtil.getWalletConnectAccounts(
+      this.sharedWcProvider,
+      "sui"
+    );
+    if (accounts.length > 0) {
+      this.addConnection({
+        connectorId: WC_ID,
+        accounts: accounts.map((a) => ({ address: a.address })),
+        caipNetwork
+      });
+    }
+    if (connectToFirstConnector) {
+      this.emitFirstAvailableConnection();
+    }
+  }
+  getWalletConnectProvider(params) {
+    return params.provider;
+  }
+  async signMessage(params) {
+    const wc = this.getWcProvider();
+    const result = await wc.request(
+      {
+        method: "sui_signPersonalMessage",
+        params: { message: params.message, address: params.address }
+      },
+      "sui:mainnet"
+    );
+    return { signature: result.signature };
+  }
+  async sendTransaction(params) {
+    const wc = this.getWcProvider();
+    const result = await wc.request(
+      {
+        method: "sui_signAndExecuteTransaction",
+        params: { transaction: params.data, address: params.to }
+      },
+      "sui:mainnet"
+    );
+    return { hash: result.digest };
+  }
+  async estimateGas() {
+    return { gas: 0n };
+  }
+  async writeContract() {
+    return { hash: "" };
+  }
+  parseUnits() {
+    return 0n;
+  }
+  formatUnits() {
+    return "";
+  }
+  async getCapabilities() {
+    return {};
+  }
+  async grantPermissions() {
+    return {};
+  }
+  async revokePermissions() {
+    return "0x";
+  }
+  async walletGetAssets() {
+    return {};
+  }
+}
+export {
+  SuiAdapter
+};

package/reactjs/components/AmountInput/AmountInput.js

@@ -50,7 +50,7 @@ const AmountInput = ({
             allowNegative: false,
             disabled,
             className: reactjs_utils_mxClsx.mxClsx(
-              "liq-text-3xl liq-leading-9 liq-min-h-12 liq-py-0 liq-w-full liq-h-full liq-border-none liq-font-medium liq-px-0 liq-outline-0 liq-bg-transparent",
+              "liq-text-3xl liq-leading-9 liq-min-h-12 liq-py-0 liq-w-full liq-h-full liq-border-none liq-font-medium liq-px-0 liq-outline-0 liq-bg-transparent focus-visible:liq-outline-none",
               {
                 "liq-disabled liq-animate-pulse": disabled && !omitDisableClass
               },

package/reactjs/components/AmountInput/AmountInput.mjs

@@ -47,7 +47,7 @@ const AmountInput = ({
             allowNegative: false,
             disabled,
             className: mxClsx(
-              "liq-text-3xl liq-leading-9 liq-min-h-12 liq-py-0 liq-w-full liq-h-full liq-border-none liq-font-medium liq-px-0 liq-outline-0 liq-bg-transparent",
+              "liq-text-3xl liq-leading-9 liq-min-h-12 liq-py-0 liq-w-full liq-h-full liq-border-none liq-font-medium liq-px-0 liq-outline-0 liq-bg-transparent focus-visible:liq-outline-none",
               {
                 "liq-disabled liq-animate-pulse": disabled && !omitDisableClass
               },

package/reactjs/components/BridgeForm/Deposit.js

@@ -11,11 +11,14 @@ const debounce = require("lodash/debounce");
 const React = require("react");
 const reactToastify = require("react-toastify");
 const reactjs_components_BridgeForm_hooks_useBridgeTokenSelection = require("./hooks/useBridgeTokenSelection.js");
+const reactjs_components_BridgeForm_utils_bridgeFormHelpers = require("./utils/bridgeFormHelpers.js");
 const constants_index = require("../../../constants/index.js");
 const helpers_getApiURL = require("../../../helpers/getApiURL.js");
 const types_chainType = require("../../../types/chainType.js");
 const reactjs_context_useWeb3App = require("../../context/useWeb3App.js");
+const reactjs_helpers_resolveBridgeApiChainId = require("../../helpers/resolveBridgeApiChainId.js");
 const reactjs_hooks_useAccount = require("../../hooks/useAccount.js");
+const reactjs_hooks_useBridgeApiChainId = require("../../hooks/useBridgeApiChainId.js");
 const reactjs_hooks_useBridgeFormik = require("../../hooks/useBridgeFormik.js");
 const reactjs_hooks_useFetchBridgeData = require("../../hooks/useFetchBridgeData.js");
 const reactjs_hooks_useGetChainId = require("../../hooks/useGetChainId.js");
@@ -42,6 +45,7 @@ require("wagmi");
 const reactjs_components_Connect_MvxConnectButton = require("../Connect/MvxConnectButton.js");
 const reactjs_components_Connect_BridgeAccountDisplay = require("../Connect/BridgeAccountDisplay.js");
 const reactjs_components_Connect_MvxAccountDisplay = require("../Connect/MvxAccountDisplay.js");
+require("@reown/appkit-controllers");
 const reactjs_components_ToggleDirection_ToggleDirection = require("../ToggleDirection/ToggleDirection.js");
 const reactjs_components_TokenSelector_TokenSelector = require("../TokenSelector/TokenSelector.js");
 let fetchRateInterval;
@@ -81,6 +85,7 @@ const Deposit = ({
     bridgeOnly
   } = reactjs_context_useWeb3App.useWeb3App();
   const chainId = reactjs_hooks_useGetChainId.useGetChainId();
+  const bridgeApiChainId = reactjs_hooks_useBridgeApiChainId.useBridgeApiChainId();
   const {
     evmTokensWithBalances,
     mvxTokensWithBalances,
@@ -96,16 +101,14 @@ const Deposit = ({
   });
   const isTokensLoading = tokensLoading || isLoadingEvmTokensBalances || isLoadingMvxTokensBalances || isChainsLoading;
   const activeChain = React.useMemo(() => {
-    return sdkChains.find(
-      (chain) => chain.id.toString() === (chainId == null ? void 0 : chainId.toString())
-    );
+    return sdkChains.find((chain) => reactjs_helpers_resolveBridgeApiChainId.sameBridgeApiChainId(chain.id, chainId));
   }, [chainId, sdkChains]);
   const mvxChain = React.useMemo(() => {
     return chains.find(
       (chain) => chain.chainId.toString() === mvxChainId.toString()
     );
   }, [chainId, chains]);
-  const { evm, solana, bitcoin } = reactjs_hooks_useSignTransaction.useSignTransaction();
+  const { evm, solana, bitcoin, sui } = reactjs_hooks_useSignTransaction.useSignTransaction();
   const sendTransactions = reactjs_hooks_useSendTransactions.useSendTransactions();
   const {
     mutate: getRate,
@@ -117,7 +120,7 @@ const Deposit = ({
   const handleSwitchNetwork = React.useCallback(
     (chain) => {
       const sdkChain = sdkChains.find(
-        (c) => c.id.toString() === chain.id.toString()
+        (c) => reactjs_helpers_resolveBridgeApiChainId.sameBridgeApiChainId(c.id, chain.id)
       );
       if (sdkChain) {
         switchNetwork(sdkChain);
@@ -161,15 +164,19 @@ const Deposit = ({
       return selectedChainOption;
     }
     return chains.find(
-      (chain) => chain.chainId.toString() === firstToken.chainId.toString()
+      (chain) => reactjs_helpers_resolveBridgeApiChainId.sameBridgeApiChainId(chain.chainId, firstToken.chainId)
     ) ?? selectedChainOption;
   }, [firstToken == null ? void 0 : firstToken.chainId, chains, selectedChainOption]);
+  const bridgeFromChainId = React.useMemo(
+    () => reactjs_helpers_resolveBridgeApiChainId.toBridgeApiChainId(firstToken == null ? void 0 : firstToken.chainId) ?? bridgeApiChainId,
+    [firstToken == null ? void 0 : firstToken.chainId, bridgeApiChainId]
+  );
   const bridgeAddress = account.address;
   const isAuthenticated = account.isConnected && Boolean(bridgeAddress);
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = React.useCallback(
     debounce(async (amount) => {
-      if (!amount || !Number(amount) || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !chainId) {
+      if (!amount || !Number(amount) || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !bridgeFromChainId) {
         return;
       }
       getRate({
@@ -177,7 +184,7 @@ const Deposit = ({
         body: {
           tokenIn: firstToken.address,
           amountIn: amount,
-          fromChainId: chainId.toString(),
+          fromChainId: bridgeFromChainId,
           tokenOut: secondToken.address,
           toChainId: mvxChainId
         }
@@ -185,6 +192,7 @@ const Deposit = ({
     }, 500),
     [
       account.address,
+      bridgeFromChainId,
       firstToken == null ? void 0 : firstToken.address,
       secondToken == null ? void 0 : secondToken.address,
       selectedChainOption
@@ -243,6 +251,7 @@ const Deposit = ({
       transactions,
       provider
     }) => {
+      var _a2, _b2, _c;
       const signedTransactions = [];
       setPendingSigning(true);
       setSigningTransactionsCount(() => transactions.length);
@@ -251,8 +260,8 @@ const Deposit = ({
         for (const transaction of transactions) {
           ++txIndex;
           try {
-            switch (selectedChainOption == null ? void 0 : selectedChainOption.chainType) {
-              case types_chainType.ChainType.evm:
+            switch (reactjs_components_BridgeForm_utils_bridgeFormHelpers.resolveSigningChainType(transaction, firstTokenChain)) {
+              case types_chainType.ChainType.evm: {
                 const hash = await evm.signTransaction({
                   ...transaction,
                   value: BigInt(transaction.value),
@@ -281,6 +290,7 @@ const Deposit = ({
                   hash
                 });
                 break;
+              }
               case types_chainType.ChainType.sol:
                 if (!transaction.instructions || !transaction.feePayer) {
                   break;
@@ -311,6 +321,29 @@ const Deposit = ({
                   txHash: psbt
                 });
                 break;
+              case types_chainType.ChainType.sui: {
+                const serializedTx = (_a2 = transaction.suiParams) == null ? void 0 : _a2.transactionBytes;
+                const sender = (_b2 = transaction.suiParams) == null ? void 0 : _b2.sender;
+                if (!serializedTx || !sender) {
+                  console.error("No Sui transaction bytes or sender address");
+                  break;
+                }
+                const signature = await sui.signTransaction({
+                  transaction: serializedTx,
+                  address: sender
+                });
+                if (!signature) {
+                  break;
+                }
+                signedTransactions.push({
+                  ...transaction,
+                  suiParams: {
+                    ...transaction.suiParams,
+                    signature
+                  }
+                });
+                break;
+              }
               default:
                 reactToastify.toast.error("Provider not supported");
                 setPendingSigning(false);
@@ -327,13 +360,15 @@ const Deposit = ({
             return;
           }
         }
-        await sendTransactions({
+        const { data: batch } = await sendTransactions({
           transactions: signedTransactions,
           provider,
           url: helpers_getApiURL.getApiURL() ?? "",
           token: nativeAuthToken ?? ""
         });
-        const txHashes = signedTransactions.map((tx) => tx.txHash);
+        const apiHashes = ((_c = batch.transactions) == null ? void 0 : _c.map((tx) => tx.txHash).filter((h) => Boolean(h))) ?? [];
+        const localHashes = signedTransactions.map((tx) => tx.txHash).filter((h) => Boolean(h));
+        const txHashes = apiHashes.length > 0 ? apiHashes : localHashes.length > 0 ? localHashes : batch.batchId ? [batch.batchId] : [];
         onSuccess(txHashes);
         setPendingSigning(false);
       } catch (e) {
@@ -349,14 +384,18 @@ const Deposit = ({
       }
     },
     [
-      selectedChainOption,
+      firstTokenChain == null ? void 0 : firstTokenChain.chainType,
       bridgeAddress,
+      config,
       handleOnChangeFirstAmount,
       handleOnChangeSecondAmount,
       nativeAuthToken,
       onSuccess,
       sendTransactions,
-      evm.signTransaction
+      bitcoin.signTransaction,
+      evm.signTransaction,
+      solana.signTransaction,
+      sui.signTransaction
     ]
   );
   const {
@@ -375,7 +414,7 @@ const Deposit = ({
     receiver: mvxAddress ?? "",
     firstToken,
     firstAmount,
-    fromChainId: chainId == null ? void 0 : chainId.toString(),
+    fromChainId: bridgeFromChainId,
     toChainId: mvxChainId,
     secondToken,
     secondAmount,
@@ -583,14 +622,14 @@ const Deposit = ({
               className: "liq-w-full disabled:liq-bg-neutral-850/50 liq-py-3 hover:enabled:liq-bg-primary !liq-text-primary-200",
               disabled: !hasAmounts || isPendingRate || !mvxAddress || !account.address || hasError || pendingSigning,
               children: [
-                hasAmounts && !pendingSigning && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "liq-flex liq-justify-center liq-gap-2", children: [
+                hasAmounts && !pendingSigning && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "liq-flex liq-justify-center liq-items-center liq-gap-2", children: [
                   /* @__PURE__ */ jsxRuntime.jsx("div", { children: "Deposit on " }),
                   /* @__PURE__ */ jsxRuntime.jsx(
                     "img",
                     {
                       src: (mvxChain == null ? void 0 : mvxChain.pngUrl) ?? "",
                       alt: "",
-                      className: "liq-h-[1.5rem] liq-w-[1.5rem]"
+                      className: "liq-h-[1.5rem] liq-w-[1.5rem] liq-rounded-lg"
                     }
                   ),
                   /* @__PURE__ */ jsxRuntime.jsx("div", { children: "MultiversX" })
@@ -611,7 +650,7 @@ const Deposit = ({
                     {
                       src: (mvxChain == null ? void 0 : mvxChain.pngUrl) ?? "",
                       alt: "",
-                      className: "liq-h-[1.5rem] liq-w-[1.5rem]"
+                      className: "liq-h-[1.5rem] liq-w-[1.5rem] liq-rounded-lg"
                     }
                   ),
                   /* @__PURE__ */ jsxRuntime.jsx("div", { children: "MultiversX" })