@chipi-stack/backend 14.16.0 → 14.17.0

package/dist/wallets.js

@@ -352,6 +352,7 @@ var init_stark = __esm({
 var execute_paymaster_raw_exports = {};
 __export(execute_paymaster_raw_exports, {
   executeShhhSponsoredRaw: () => executeShhhSponsoredRaw,
+  newOeNonce: () => newOeNonce,
   resolveShhhChainId: () => resolveShhhChainId,
   serializeExecuteFromOutsideV2Calldata: () => serializeExecuteFromOutsideV2Calldata
 });
@@ -478,13 +479,26 @@ init_encryption2();
 
 // src/execute-paymaster-transaction.ts
 init_encryption2();
+function feltEquals(value, expected) {
+  try {
+    return BigInt(value) === expected;
+  } catch {
+    return false;
+  }
+}
 function normalizeSignature(signature) {
   if (Array.isArray(signature)) {
     if (signature.length < 2) {
       throw new Error(`Array signature must have at least 2 elements, got ${signature.length}`);
     }
-    const r = signature[0];
-    const s = signature[1];
+    const isArgentSingle = signature.length === 5 && feltEquals(signature[0], 1n) && feltEquals(signature[1], 0n);
+    if (signature.length !== 2 && !isArgentSingle) {
+      throw new Error(
+        `Unsupported ${signature.length}-felt signature: expected [r, s] or Argent [1, 0, pubkey, r, s].`
+      );
+    }
+    const r = isArgentSingle ? signature[3] : signature[0];
+    const s = isArgentSingle ? signature[4] : signature[1];
     if (r == null || s == null) {
       throw new Error(`Signature elements must not be null/undefined. Got r=${r}, s=${s}`);
     }
@@ -923,7 +937,10 @@ var ChipiWallets = class {
           publicKey,
           walletType,
           starkKeyPubAX,
-          ...customClassHash && { classHash: customClassHash },
+          // The class the address above was computed with. SHHH always
+          // names it: chipi-back's default for clients that name none is
+          // the class SDKs up to 14.16 used (V8.4), not ours.
+          ...(customClassHash || isShhh) && { classHash: accountClassHash },
           // SHHH: tell chipi-back which signer kind + pubkey felts
           // produced this deployment so it can validate against the
           // expected SHHH constructor shape and populate the new
@@ -935,6 +952,11 @@ var ChipiWallets = class {
         }
       });
       const { typedData: typedData2, accountClassHash: accountClassHashResponse } = typedDataResponse;
+      if (isShhh && (!accountClassHashResponse || BigInt(accountClassHashResponse) !== BigInt(accountClassHash))) {
+        throw new Error(
+          `prepare-creation returned class ${accountClassHashResponse ?? "(none)"}, but the wallet address was computed with ${accountClassHash}. Not deploying.`
+        );
+      }
       let userSignaturePayload;
       if (isShhh) {
         userSignaturePayload = {