@d13co/use-wallet 4.5.13 → 4.5.15

package/dist/index.cjs

@@ -8653,16 +8653,16 @@ var AlgoXEvmBaseWallet = class extends BaseWallet {
     this.store = params.store;
   }
   /**
-   * Default metadata for Algo x EVM wallets.
+   * Default metadata for xChain EVM wallets.
    * Subclasses MUST override this with their own metadata including isAlgoXEvm: "EVM"
    */
   static defaultMetadata;
   /**
-   * Initialize the Algo x EVM SDK for deriving Algorand addresses
+   * Initialize the xChain EVM SDK for deriving Algorand addresses
    */
   async initializeEvmSdk() {
     if (!this.algoXEvmSdk) {
-      this.logger.info("Initializing Algo x EVM SDK...");
+      this.logger.info("Initializing xChain EVM SDK...");
       if (!this.algorandClient) {
         const { AlgorandClient } = await import("@algorandfoundation/algokit-utils");
         const algodClient = this.getAlgodClient();
@@ -8672,7 +8672,7 @@ var AlgoXEvmBaseWallet = class extends BaseWallet {
       }
       const { AlgoXEvmSdk } = await import("algo-x-evm-sdk");
       this.algoXEvmSdk = new AlgoXEvmSdk({ algorand: this.algorandClient });
-      this.logger.info("Algo x EVM SDK initialized");
+      this.logger.info("xChain EVM SDK initialized");
     }
     return this.algoXEvmSdk;
   }
@@ -8748,23 +8748,33 @@ var AlgoXEvmBaseWallet = class extends BaseWallet {
         const flatTxns = flattenTxnGroup(txnGroup);
         txnsToSign = this.processEncodedTxns(flatTxns, indexesToSign);
       }
-      const firstTxn = txnsToSign[0];
-      const algorandAddress = firstTxn.txn.sender.toString();
-      let evmAddress = this.evmAddressMap.get(algorandAddress);
-      if (!evmAddress) {
-        const walletState = this.store.state.wallets[this.id];
-        if (walletState) {
-          for (const account of walletState.accounts) {
-            const addr = account.metadata?.evmAddress;
-            if (addr) {
-              this.evmAddressMap.set(account.address, addr);
-            }
+      const walletState = this.store.state.wallets[this.id];
+      if (walletState) {
+        for (const account of walletState.accounts) {
+          const addr = account.metadata?.evmAddress;
+          if (addr && !this.evmAddressMap.has(account.address)) {
+            this.evmAddressMap.set(account.address, addr);
           }
-          evmAddress = this.evmAddressMap.get(algorandAddress);
         }
       }
-      if (!evmAddress) {
-        throw new Error(`No EVM address found for Algorand address: ${algorandAddress}`);
+      const allTxns = txnsToSign.map((t) => t.txn);
+      const signIndexes = txnsToSign.reduce((acc, t, i) => {
+        if (!("signers" in t)) acc.push(i);
+        return acc;
+      }, []);
+      const evmGroups = /* @__PURE__ */ new Map();
+      for (const idx of signIndexes) {
+        const algorandAddress = allTxns[idx].sender.toString();
+        const evmAddress = this.evmAddressMap.get(algorandAddress);
+        if (!evmAddress) {
+          throw new Error(`No EVM address found for Algorand address: ${algorandAddress}`);
+        }
+        const group = evmGroups.get(evmAddress);
+        if (group) {
+          group.push(idx);
+        } else {
+          evmGroups.set(evmAddress, [idx]);
+        }
       }
       const onBeforeSign = this.options.uiHooks?.onBeforeSign ?? this.managerUIHooks?.onBeforeSign;
       if (onBeforeSign) {
@@ -8772,16 +8782,18 @@ var AlgoXEvmBaseWallet = class extends BaseWallet {
         const txnsAsUint8 = txnsToSign.map(({ txn }) => import_algosdk11.default.encodeUnsignedTransaction(txn));
         await onBeforeSign(txnsAsUint8, indexesToSign);
       }
-      const { signer: evmSigner } = await algoXEvmSdk.getSigner({
-        evmAddress,
-        signMessage: (typedData) => this.signWithProvider(typedData, evmAddress)
-      });
-      const allTxns = txnsToSign.map((t) => t.txn);
-      const signIndexes = txnsToSign.reduce((acc, t, i) => {
-        if (!("signers" in t)) acc.push(i);
-        return acc;
-      }, []);
-      const signedBlobs = await evmSigner(allTxns, signIndexes);
+      const signedResult = new Array(txnsToSign.length).fill(null);
+      console.log("EVM Groups for signing:", evmGroups);
+      for (const [evmAddress, indexes] of evmGroups) {
+        const { signer: evmSigner } = await algoXEvmSdk.getSigner({
+          evmAddress,
+          signMessage: (typedData) => this.signWithProvider(typedData, evmAddress)
+        });
+        const signedBlobs = await evmSigner(allTxns, indexes);
+        for (let i = 0; i < indexes.length; i++) {
+          signedResult[indexes[i]] = signedBlobs[i];
+        }
+      }
       const onAfterSign = this.options.uiHooks?.onAfterSign ?? this.managerUIHooks?.onAfterSign;
       if (onAfterSign) {
         this.logger.debug("Running onAfterSign hook");
@@ -8790,15 +8802,8 @@ var AlgoXEvmBaseWallet = class extends BaseWallet {
         } catch (e) {
         }
       }
-      let signedIdx = 0;
-      const result = txnsToSign.map((_2, index) => {
-        if (signIndexes.includes(index)) {
-          return signedBlobs[signedIdx++];
-        }
-        return null;
-      });
-      this.logger.debug("Transactions signed successfully", result);
-      return result;
+      this.logger.debug("Transactions signed successfully", signedResult);
+      return signedResult;
     } catch (error) {
       try {
         const onAfterSignCleanup = this.options.uiHooks?.onAfterSign ?? this.managerUIHooks?.onAfterSign;
@@ -8951,36 +8956,35 @@ var RainbowKitWallet = class _RainbowKitWallet extends AlgoXEvmBaseWallet {
   }
   /**
    * Read connected EVM accounts from wagmi state.
-   * If not connected, tries the getEvmAccounts callback, then falls back to
-   * connecting with the first available connector.
-   *
-   * When getEvmAccounts is provided, it is always called (to show the wallet
-   * selection UI). The callback is responsible for any disconnect/reconnect
-   * needed to present a fresh selection.
+   * If already connected (e.g. auto-reconnect on page refresh), uses the
+   * existing connection directly.  Otherwise tries the getEvmAccounts
+   * callback (wallet picker UI), then falls back to connecting with the
+   * first available connector.
    */
   async getConnectedEvmAddresses() {
     const { getAccount, connect: wagmiConnect } = await import("@wagmi/core");
+    const existing = getAccount(this.wagmiConfig);
+    if (existing.isConnected && existing.address) {
+      this.logger.info("Using existing wagmi connection");
+      return {
+        addresses: existing.addresses ? [...existing.addresses] : [existing.address],
+        connectorInfo: _RainbowKitWallet.extractConnectorInfo(existing)
+      };
+    }
     if (this.options.getEvmAccounts) {
       const addresses = await this.options.getEvmAccounts();
       if (addresses.length > 0) {
-        const account2 = getAccount(this.wagmiConfig);
-        const connectorInfo = _RainbowKitWallet.extractConnectorInfo(account2);
-        if (account2.isConnected && account2.address) {
+        const account = getAccount(this.wagmiConfig);
+        const connectorInfo = _RainbowKitWallet.extractConnectorInfo(account);
+        if (account.isConnected && account.address) {
           return {
-            addresses: account2.addresses ? [...account2.addresses] : [account2.address],
+            addresses: account.addresses ? [...account.addresses] : [account.address],
             connectorInfo
           };
         }
         return { addresses, connectorInfo };
       }
     }
-    const account = getAccount(this.wagmiConfig);
-    if (account.isConnected && account.address) {
-      return {
-        addresses: account.addresses ? [...account.addresses] : [account.address],
-        connectorInfo: _RainbowKitWallet.extractConnectorInfo(account)
-      };
-    }
     const connectors = this.wagmiConfig.connectors;
     if (connectors.length > 0) {
       this.logger.info("Attempting connection with first available connector...");