@d13co/use-wallet 4.5.5 → 4.5.7

package/dist/index.d.cts

@@ -550,11 +550,8 @@ declare abstract class LiquidEvmBaseWallet extends BaseWallet {
     /**
      * Process transaction group to extract transactions that need signing
      */
-    protected processTxns(txnGroup: algosdk.Transaction[], indexesToSign?: number[]): algosdk.Transaction[];
-    /**
-     * Process encoded transaction group to extract transactions that need signing
-     */
-    protected processEncodedTxns(txnGroup: Uint8Array[], indexesToSign?: number[]): algosdk.Transaction[];
+    protected processTxns(txnGroup: algosdk.Transaction[], indexesToSign?: number[]): SignerTransaction[];
+    private processEncodedTxns;
     /**
      * Sign Algorand transactions using EVM wallet signatures
      */
@@ -582,6 +579,9 @@ interface RainbowKitWalletOptions extends LiquidEvmOptions {
 declare class RainbowKitWallet extends LiquidEvmBaseWallet {
     protected options: RainbowKitWalletOptions;
     private _connecting;
+    private _disconnecting;
+    /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+    get isDisconnecting(): boolean;
     constructor(params: WalletConstructor<WalletId.RAINBOWKIT>);
     static defaultMetadata: {
         name: string;

package/dist/index.d.ts

@@ -550,11 +550,8 @@ declare abstract class LiquidEvmBaseWallet extends BaseWallet {
     /**
      * Process transaction group to extract transactions that need signing
      */
-    protected processTxns(txnGroup: algosdk.Transaction[], indexesToSign?: number[]): algosdk.Transaction[];
-    /**
-     * Process encoded transaction group to extract transactions that need signing
-     */
-    protected processEncodedTxns(txnGroup: Uint8Array[], indexesToSign?: number[]): algosdk.Transaction[];
+    protected processTxns(txnGroup: algosdk.Transaction[], indexesToSign?: number[]): SignerTransaction[];
+    private processEncodedTxns;
     /**
      * Sign Algorand transactions using EVM wallet signatures
      */
@@ -582,6 +579,9 @@ interface RainbowKitWalletOptions extends LiquidEvmOptions {
 declare class RainbowKitWallet extends LiquidEvmBaseWallet {
     protected options: RainbowKitWalletOptions;
     private _connecting;
+    private _disconnecting;
+    /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+    get isDisconnecting(): boolean;
     constructor(params: WalletConstructor<WalletId.RAINBOWKIT>);
     static defaultMetadata: {
         name: string;

package/dist/index.js

@@ -8623,7 +8623,9 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
     if (currentChainId.toLowerCase() === ALGORAND_CHAIN_ID_HEX.toLowerCase()) {
       return;
     }
-    this.logger.info(`Wrong chain (${currentChainId}), switching to Algorand (${ALGORAND_CHAIN_ID_HEX})...`);
+    this.logger.info(
+      `Wrong chain (${currentChainId}), switching to Algorand (${ALGORAND_CHAIN_ID_HEX})...`
+    );
     try {
       await provider.request({
         method: "wallet_switchEthereumChain",
@@ -8694,14 +8696,13 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
       const signer = txn.sender.toString();
       const canSignTxn = this.addresses.includes(signer);
       if (isIndexMatch && canSignTxn) {
-        txnsToSign.push(txn);
+        txnsToSign.push({ txn });
+      } else {
+        txnsToSign.push({ txn, signers: [] });
       }
     });
     return txnsToSign;
   }
-  /**
-   * Process encoded transaction group to extract transactions that need signing
-   */
   processEncodedTxns(txnGroup, indexesToSign) {
     const txnsToSign = [];
     txnGroup.forEach((txnBuffer, index) => {
@@ -8712,7 +8713,9 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
       const signer = txn.sender.toString();
       const canSignTxn = !isSigned && this.addresses.includes(signer);
       if (isIndexMatch && canSignTxn) {
-        txnsToSign.push(txn);
+        txnsToSign.push({ txn });
+      } else {
+        txnsToSign.push({ txn, signers: [] });
       }
     });
     return txnsToSign;
@@ -8723,25 +8726,17 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
   signTransactions = async (txnGroup, indexesToSign) => {
     try {
       this.logger.debug("Signing transactions...", { txnGroup, indexesToSign });
-      const evmSdk = await this.initializeEvmSdk();
-      let flatTxns = [];
+      const liquidEvmSdk = await this.initializeEvmSdk();
+      let txnsToSign = [];
       if (isTransactionArray(txnGroup)) {
-        flatTxns = flattenTxnGroup(txnGroup);
+        const flatTxns = flattenTxnGroup(txnGroup);
+        txnsToSign = this.processTxns(flatTxns, indexesToSign);
       } else {
-        const flatEncoded = flattenTxnGroup(txnGroup);
-        flatTxns = flatEncoded.map((txnBuffer) => {
-          const decodedObj = algosdk11.msgpackRawDecode(txnBuffer);
-          const isSigned = isSignedTxn(decodedObj);
-          return isSigned ? algosdk11.decodeSignedTransaction(txnBuffer).txn : algosdk11.decodeUnsignedTransaction(txnBuffer);
-        });
-      }
-      const txnsToSign = isTransactionArray(txnGroup) ? this.processTxns(flatTxns, indexesToSign) : this.processEncodedTxns(flattenTxnGroup(txnGroup), indexesToSign);
-      if (txnsToSign.length === 0) {
-        this.logger.debug("No transactions to sign");
-        return flatTxns.map(() => null);
+        const flatTxns = flattenTxnGroup(txnGroup);
+        txnsToSign = this.processEncodedTxns(flatTxns, indexesToSign);
       }
       const firstTxn = txnsToSign[0];
-      const algorandAddress = firstTxn.sender.toString();
+      const algorandAddress = firstTxn.txn.sender.toString();
       let evmAddress = this.evmAddressMap.get(algorandAddress);
       if (!evmAddress) {
         const walletState = this.store.state.wallets[this.id];
@@ -8761,14 +8756,20 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
       const onBeforeSign = this.options.uiHooks?.onBeforeSign ?? this.managerUIHooks?.onBeforeSign;
       if (onBeforeSign) {
         this.logger.debug("Running onBeforeSign hook", { txnGroup, indexesToSign });
-        await onBeforeSign(txnGroup, indexesToSign);
+        const txnsAsUint8 = txnsToSign.map(({ txn }) => algosdk11.encodeUnsignedTransaction(txn));
+        await onBeforeSign(txnsAsUint8, indexesToSign);
       }
       await this.ensureAlgorandChain();
-      const signedBlobs = await evmSdk.signTxn({
+      const { signer: evmSigner } = await liquidEvmSdk.getSigner({
         evmAddress,
-        txns: flatTxns,
         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 onAfterSign = this.options.uiHooks?.onAfterSign ?? this.managerUIHooks?.onAfterSign;
       if (onAfterSign) {
         this.logger.debug("Running onAfterSign hook");
@@ -8777,12 +8778,10 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
         } catch (e) {
         }
       }
-      const result = flatTxns.map((txn, index) => {
-        const isIndexMatch = !indexesToSign || indexesToSign.includes(index);
-        const signer = txn.sender.toString();
-        const canSignTxn = this.addresses.includes(signer);
-        if (isIndexMatch && canSignTxn) {
-          return signedBlobs[index];
+      let signedIdx = 0;
+      const result = txnsToSign.map((_2, index) => {
+        if (signIndexes.includes(index)) {
+          return signedBlobs[signedIdx++];
         }
         return null;
       });
@@ -8840,22 +8839,25 @@ import {
 } from "liquid-accounts-evm";
 var ICON13 = `data:image/svg+xml;base64,${btoa(`
 <svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="120" height="120" rx="24" fill="url(#rk_bg)"/>
-  <path d="M24 86V76.8C24 55.9 40.9 39 61.8 39H66C70.418 39 74 42.582 74 47V86" stroke="#FF4000" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M36 86V76.8C36 62.3 47.7 50.6 62.2 50.6H64C67.314 50.6 70 53.286 70 56.6V86" stroke="#FF9500" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M48 86V76.8C48 68.8 54.5 62.3 62.5 62.3H62.7C65.461 62.3 67.7 64.539 67.7 67.3V86" stroke="#00C853" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <path d="M60 86V76.8C60 75 61.5 73.5 63.3 73.5C65.1 73.5 66.6 75 66.6 76.8V86" stroke="#2979FF" stroke-width="8" stroke-linecap="round" fill="none"/>
-  <defs>
-    <linearGradient id="rk_bg" x1="0" y1="0" x2="120" y2="120">
-      <stop stop-color="#1A1B23"/>
-      <stop offset="1" stop-color="#13141B"/>
-    </linearGradient>
-  </defs>
+  <rect width="120" height="120" rx="24" fill="#627EEA"/>
+  <svg x="30" y="11" width="60" height="98" viewBox="420.1 80.7 1079.8 1758.6">
+    <path d="m959.8 80.7-539.7 895.6 539.7-245.3z" fill="white"/>
+    <path d="m959.8 731-539.7 245.3 539.7 319.1z" fill="white" fill-opacity=".602"/>
+    <path d="m1499.6 976.3-539.8-895.6v650.3z" fill="white" fill-opacity=".602"/>
+    <path d="m959.8 1295.4 539.8-319.1-539.8-245.3z" fill="white" fill-opacity=".2"/>
+    <path d="m420.1 1078.7 539.7 760.6v-441.7z" fill="white"/>
+    <path d="m959.8 1397.6v441.7l540.1-760.6z" fill="white" fill-opacity=".602"/>
+  </svg>
 </svg>
 `)}`;
 var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
   options;
   _connecting = false;
+  _disconnecting = false;
+  /** True while disconnect() is running. Used by the bridge to prevent re-entrancy. */
+  get isDisconnecting() {
+    return this._disconnecting;
+  }
   constructor(params) {
     super(params);
     this.options = params.options || {};
@@ -9042,12 +9044,15 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
     }
   };
   disconnect = async () => {
+    this._disconnecting = true;
     this.logger.info("Disconnecting...");
     try {
       const { disconnect: wagmiDisconnect } = await import("@wagmi/core");
       await wagmiDisconnect(this.wagmiConfig);
     } catch (error) {
       this.logger.warn("wagmi disconnect error:", error.message);
+    } finally {
+      this._disconnecting = false;
     }
     this.evmAddressMap.clear();
     this.updateMetadata(_RainbowKitWallet.defaultMetadata);
@@ -9074,8 +9079,8 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
     if (account.isConnected && account.address) {
       evmAddresses = account.addresses ? [...account.addresses] : [account.address];
       connectorInfo = _RainbowKitWallet.extractConnectorInfo(account);
-    } else {
-      this.logger.warn("EVM wallet not yet connected, resuming from persisted state");
+    } else if (account.status === "reconnecting") {
+      this.logger.warn("EVM wallet reconnecting, resuming from persisted state");
       evmAddresses = walletState.accounts.map((a) => a.metadata?.evmAddress).filter(Boolean);
       if (evmAddresses.length === 0) {
         this.logger.warn("No persisted EVM addresses, cannot resume");
@@ -9083,6 +9088,10 @@ var RainbowKitWallet = class _RainbowKitWallet extends LiquidEvmBaseWallet {
         return;
       }
       connectorInfo = {};
+    } else {
+      this.logger.warn("EVM wallet reconnect failed (status: disconnected), disconnecting");
+      this.onDisconnect();
+      return;
     }
     if (!connectorInfo.name && walletState.accounts.length > 0) {
       const first = walletState.accounts[0];