@d13co/use-wallet 4.5.5 → 4.5.6

package/dist/index.cjs

@@ -8668,7 +8668,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",
@@ -8739,14 +8741,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) => {
@@ -8757,7 +8758,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;
@@ -8768,25 +8771,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 = import_algosdk11.default.msgpackRawDecode(txnBuffer);
-          const isSigned = isSignedTxn(decodedObj);
-          return isSigned ? import_algosdk11.default.decodeSignedTransaction(txnBuffer).txn : import_algosdk11.default.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];
@@ -8806,14 +8801,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 }) => import_algosdk11.default.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");
@@ -8822,12 +8823,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;
       });