@d13co/use-wallet 4.5.2 → 4.5.4

package/dist/index.d.cts

@@ -490,14 +490,8 @@ declare abstract class LiquidEvmBaseWallet extends BaseWallet {
      * Convert bytes to hex string with 0x prefix
      */
     protected bytesToHex(bytes: Uint8Array): string;
-    /**
-     * 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[];
+    private processTxns;
+    private processEncodedTxns;
     /**
      * Sign Algorand transactions using EVM wallet signatures
      */

package/dist/index.d.ts

@@ -490,14 +490,8 @@ declare abstract class LiquidEvmBaseWallet extends BaseWallet {
      * Convert bytes to hex string with 0x prefix
      */
     protected bytesToHex(bytes: Uint8Array): string;
-    /**
-     * 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[];
+    private processTxns;
+    private processEncodedTxns;
     /**
      * Sign Algorand transactions using EVM wallet signatures
      */

package/dist/index.js

@@ -37,10 +37,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/@magic-sdk+types@24.22.0/node_modules/@magic-sdk/types/dist/es/index.mjs
+// ../../../../node_modules/.pnpm/@magic-sdk+types@24.22.0/node_modules/@magic-sdk/types/dist/es/index.mjs
 var m, v, u, _, f, g, Z, E, y, x, A, R, I, N, h, T, O, S, b, C, F, U, k, L, w, D, G, V, H, q, W, J, Y, B, P, j, Q, X, z;
 var init_es = __esm({
-  "../../node_modules/.pnpm/@magic-sdk+types@24.22.0/node_modules/@magic-sdk/types/dist/es/index.mjs"() {
+  "../../../../node_modules/.pnpm/@magic-sdk+types@24.22.0/node_modules/@magic-sdk/types/dist/es/index.mjs"() {
     "use strict";
     m = ((o) => (o.MissingApiKey = "MISSING_API_KEY", o.ModalNotReady = "MODAL_NOT_READY", o.ConnectionLost = "CONNECTION_WAS_LOST", o.MalformedResponse = "MALFORMED_RESPONSE", o.InvalidArgument = "INVALID_ARGUMENT", o.ExtensionNotInitialized = "EXTENSION_NOT_INITIALIZED", o.IncompatibleExtensions = "INCOMPATIBLE_EXTENSIONS", o))(m || {});
     v = ((s) => (s.SyncWeb3Method = "SYNC_WEB3_METHOD", s.DuplicateIframe = "DUPLICATE_IFRAME", s.ReactNativeEndpointConfiguration = "REACT_NATIVE_ENDPOINT_CONFIGURATION", s.DeprecationNotice = "DEPRECATION_NOTICE", s.ProductAnnouncement = "ANNOUNCEMENT", s))(v || {});
@@ -84,7 +84,7 @@ var init_es = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@magic-sdk+provider@29.5.0_localforage@1.10.0/node_modules/@magic-sdk/provider/dist/es/index.mjs
+// ../../../../node_modules/.pnpm/@magic-sdk+provider@29.5.0_localforage@1.10.0/node_modules/@magic-sdk/provider/dist/es/index.mjs
 function ir(r10) {
   let e = { exports: {} };
   return r10(e, e.exports), e.exports;
@@ -387,7 +387,7 @@ function On(r10) {
 }
 var Yt, Ne, Qt, Zt, er, tr, rr, nr, sr, or, Nt, ar, $e, cr, h2, Z2, ze, ot, lr, dr, Ye, oe, Qe, Ze, X2, M, ur, J2, pr, mr, hr, Er, fr, gr, yr, Rr, vr, Tr, Ir, br, Pr, Ae, z2, Y2, et, tt, Q2, y2, E2, wr, xr, Sr, rt, Mr, T2, Cr, Nr, Ar, $r, Lr, Or, _r, kr, Dr, qr, it, Ur, nt, st, Fr, Wr, ie, ae, at, m2, ut, $, U2, L2, de, te, Qr, me, pe, R2, x2, A2, Zr, en, tn, rn, Oe, _e, he, bt, nn, sn, St, K, At, De, $t, f2, Tn, ye, Ue, Fe, We, Je, In, Te, Ie, Pe, we, H2, xe, Me, je, An, Ht, Bt, $n, Ve, Xt, Be, Ce, He;
 var init_es2 = __esm({
-  "../../node_modules/.pnpm/@magic-sdk+provider@29.5.0_localforage@1.10.0/node_modules/@magic-sdk/provider/dist/es/index.mjs"() {
+  "../../../../node_modules/.pnpm/@magic-sdk+provider@29.5.0_localforage@1.10.0/node_modules/@magic-sdk/provider/dist/es/index.mjs"() {
     "use strict";
     init_es();
     init_es();
@@ -1507,16 +1507,16 @@ var init_es2 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@magic-sdk+commons@25.4.2_@magic-sdk+provider@29.5.0_localforage@1.10.0__@magic-sdk+types@24.22.0/node_modules/@magic-sdk/commons/dist/es/index.mjs
+// ../../../../node_modules/.pnpm/@magic-sdk+commons@25.4.2_@magic-sdk+provider@29.5.0_localforage@1.10.0__@magic-sdk+types@24.22.0/node_modules/@magic-sdk/commons/dist/es/index.mjs
 var init_es3 = __esm({
-  "../../node_modules/.pnpm/@magic-sdk+commons@25.4.2_@magic-sdk+provider@29.5.0_localforage@1.10.0__@magic-sdk+types@24.22.0/node_modules/@magic-sdk/commons/dist/es/index.mjs"() {
+  "../../../../node_modules/.pnpm/@magic-sdk+commons@25.4.2_@magic-sdk+provider@29.5.0_localforage@1.10.0__@magic-sdk+types@24.22.0/node_modules/@magic-sdk/commons/dist/es/index.mjs"() {
     "use strict";
     init_es2();
     init_es();
   }
 });
 
-// ../../node_modules/.pnpm/magic-sdk@29.4.2/node_modules/magic-sdk/dist/es/index.mjs
+// ../../../../node_modules/.pnpm/magic-sdk@29.4.2/node_modules/magic-sdk/dist/es/index.mjs
 var es_exports = {};
 __export(es_exports, {
   AuthEventOnReceived: () => k,
@@ -1575,7 +1575,7 @@ function st2(_2) {
 }
 var $r2, Qe2, Zr2, qr2, kr2, et2, de2, Je2, rt2, $e2, qe2, er2, pe2, Te2, at2, ye2, wt2;
 var init_es4 = __esm({
-  "../../node_modules/.pnpm/magic-sdk@29.4.2/node_modules/magic-sdk/dist/es/index.mjs"() {
+  "../../../../node_modules/.pnpm/magic-sdk@29.4.2/node_modules/magic-sdk/dist/es/index.mjs"() {
     "use strict";
     init_es2();
     init_es2();
@@ -3199,14 +3199,14 @@ var init_es4 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@magic-ext+algorand@24.4.2/node_modules/@magic-ext/algorand/dist/es/index.mjs
+// ../../../../node_modules/.pnpm/@magic-ext+algorand@24.4.2/node_modules/@magic-ext/algorand/dist/es/index.mjs
 var es_exports2 = {};
 __export(es_exports2, {
   AlgorandExtension: () => r9
 });
 var r9;
 var init_es5 = __esm({
-  "../../node_modules/.pnpm/@magic-ext+algorand@24.4.2/node_modules/@magic-ext/algorand/dist/es/index.mjs"() {
+  "../../../../node_modules/.pnpm/@magic-ext+algorand@24.4.2/node_modules/@magic-ext/algorand/dist/es/index.mjs"() {
     "use strict";
     init_es3();
     r9 = class extends He.Internal {
@@ -3236,9 +3236,9 @@ var init_es5 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/tweetnacl@1.0.3/node_modules/tweetnacl/nacl-fast.js
+// ../../../../node_modules/.pnpm/tweetnacl@1.0.3/node_modules/tweetnacl/nacl-fast.js
 var require_nacl_fast = __commonJS({
-  "../../node_modules/.pnpm/tweetnacl@1.0.3/node_modules/tweetnacl/nacl-fast.js"(exports, module) {
+  "../../../../node_modules/.pnpm/tweetnacl@1.0.3/node_modules/tweetnacl/nacl-fast.js"(exports, module) {
     "use strict";
     (function(nacl) {
       "use strict";
@@ -8224,7 +8224,9 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
     if (currentChainId === ALGORAND_CHAIN_ID_HEX) {
       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",
@@ -8285,9 +8287,6 @@ var LiquidEvmBaseWallet = class extends BaseWallet {
   bytesToHex(bytes) {
     return "0x" + Array.from(bytes).map((b3) => b3.toString(16).padStart(2, "0")).join("");
   }
-  /**
-   * Process transaction group to extract transactions that need signing
-   */
   processTxns(txnGroup, indexesToSign) {
     const txnsToSign = [];
     txnGroup.forEach((txn, index) => {
@@ -8295,14 +8294,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) => {
@@ -8313,7 +8311,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;
@@ -8324,25 +8324,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 = algosdk9.msgpackRawDecode(txnBuffer);
-          const isSigned = isSignedTxn(decodedObj);
-          return isSigned ? algosdk9.decodeSignedTransaction(txnBuffer).txn : algosdk9.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();
       const evmAddress = this.evmAddressMap.get(algorandAddress);
       if (!evmAddress) {
         throw new Error(`No EVM address found for Algorand address: ${algorandAddress}`);
@@ -8350,14 +8342,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 }) => algosdk9.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");
@@ -8366,12 +8364,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;
       });