@auditable/privacy-pool-zk-sdk 0.7.0 → 0.9.1-rc.0

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import * as snarkjs from 'snarkjs';
-import { StrKey, xdr, nativeToScVal, Address, Keypair, rpc, TransactionBuilder, Operation, authorizeEntry } from '@stellar/stellar-sdk';
+import { StrKey, Address, Keypair, rpc, TransactionBuilder, Operation, xdr, nativeToScVal, authorizeEntry } from '@stellar/stellar-sdk';
 import { buildBabyjub, buildMimc7, buildPoseidon } from 'circomlibjs';
 
 /* @ts-self-types="./client_sdk_wasm.d.ts" */
@@ -40,35 +39,69 @@ function buildWithdrawMerkleWitness(coin_json, state_json) {
 }
 
 /**
- * Calculate nullifier hash from nullifier decimal string.
+ * Calculate owner-bound nullifier hash from nullifier and spend-scalar decimal strings.
  * Returns hex string (0x...)
  * @param {string} nullifier_decimal
+ * @param {string} priv_key_scalar_decimal
  * @returns {string}
  */
-function calculateNullifierHash(nullifier_decimal) {
-    let deferred3_0;
-    let deferred3_1;
+function calculateNullifierHash(nullifier_decimal, priv_key_scalar_decimal) {
+    let deferred4_0;
+    let deferred4_1;
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(nullifier_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        wasm.calculateNullifierHash(retptr, ptr0, len0);
+        const ptr1 = passStringToWasm0(priv_key_scalar_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len1 = WASM_VECTOR_LEN;
+        wasm.calculateNullifierHash(retptr, ptr0, len0, ptr1, len1);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
         var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-        var ptr2 = r0;
-        var len2 = r1;
+        var ptr3 = r0;
+        var len3 = r1;
         if (r3) {
-            ptr2 = 0; len2 = 0;
+            ptr3 = 0; len3 = 0;
             throw takeObject(r2);
         }
-        deferred3_0 = ptr2;
-        deferred3_1 = len2;
-        return getStringFromWasm0(ptr2, len2);
+        deferred4_0 = ptr3;
+        deferred4_1 = len3;
+        return getStringFromWasm0(ptr3, len3);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_export4(deferred4_0, deferred4_1, 1);
+    }
+}
+
+/**
+ * `R = Poseidon255(2)(hi, lo)`; `scalar` is the raw Poseidon hash when it is
+ * already in `(0, BabyJub subgroup order)`. Out-of-range hashes fail so the
+ * caller can rejection-sample a new nonce.
+ * @param {string} nonce_decimal
+ * @param {string} recipient_hi_decimal
+ * @param {string} recipient_lo_decimal
+ * @returns {any}
+ */
+function derivedEscrowKey$1(nonce_decimal, recipient_hi_decimal, recipient_lo_decimal) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(nonce_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(recipient_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passStringToWasm0(recipient_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len2 = WASM_VECTOR_LEN;
+        wasm.derivedEscrowKey(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export4(deferred3_0, deferred3_1, 1);
     }
 }
 
@@ -149,26 +182,28 @@ function ecdhSharedKey(priv_hex, pub_x_hex, pub_y_hex) {
 }
 
 /**
- * Generate a new coin with random nullifier, secret, and shared-secret field elements.
- * `amount` is stroops (u64); JS passes `bigint`.
+ * Generate a new coin with random nullifier, secret, and owner public-key field elements.
+ * `amount_decimal` is an arbitrary-precision decimal field element (never JS `number`).
  * `asset_hi_decimal` / `asset_lo_decimal` are decimal Fr strings for the Stellar asset contract id (two limbs).
  * Returns JSON: { coin: { value, nullifier, secret, commitment, asset_hi, asset_lo }, commitment_hex, precommitement_hex }
- * @param {bigint} amount
+ * @param {string} amount_decimal
  * @param {string} asset_hi_decimal
  * @param {string} asset_lo_decimal
  * @param {string} application_id_decimal
  * @returns {any}
  */
-function generateCoin(amount, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
+function generateCoin(amount_decimal, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr0 = passStringToWasm0(amount_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr1 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr2 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len2 = WASM_VECTOR_LEN;
-        wasm.generateCoin(retptr, amount, ptr0, len0, ptr1, len1, ptr2, len2);
+        const ptr3 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len3 = WASM_VECTOR_LEN;
+        wasm.generateCoin(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -182,32 +217,34 @@ function generateCoin(amount, asset_hi_decimal, asset_lo_decimal, application_id
 }
 
 /**
- * `Poseidon₁(scalar)` secret + fixed ECDH shared coords (hex), matching an aligned deposit witness.
+ * `Poseidon₁(scalar)` secret + recipient owner public key (hex), matching an aligned deposit witness.
  * @param {string} scalar_hex
- * @param {string} shared_x_hex
- * @param {string} shared_y_hex
- * @param {bigint} amount
+ * @param {string} owner_x_hex
+ * @param {string} owner_y_hex
+ * @param {string} amount_decimal
  * @param {string} asset_hi_decimal
  * @param {string} asset_lo_decimal
  * @param {string} application_id_decimal
  * @returns {any}
  */
-function generateCoinForDepositWithSharedHex(scalar_hex, shared_x_hex, shared_y_hex, amount, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
+function generateCoinForDepositWithOwnerPubHex(scalar_hex, owner_x_hex, owner_y_hex, amount_decimal, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(scalar_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(shared_x_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr1 = passStringToWasm0(owner_x_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passStringToWasm0(shared_y_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr2 = passStringToWasm0(owner_y_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len2 = WASM_VECTOR_LEN;
-        const ptr3 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr3 = passStringToWasm0(amount_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len3 = WASM_VECTOR_LEN;
-        const ptr4 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr4 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len4 = WASM_VECTOR_LEN;
-        const ptr5 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr5 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len5 = WASM_VECTOR_LEN;
-        wasm.generateCoinForDepositWithSharedHex(retptr, ptr0, len0, ptr1, len1, ptr2, len2, amount, ptr3, len3, ptr4, len4, ptr5, len5);
+        const ptr6 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len6 = WASM_VECTOR_LEN;
+        wasm.generateCoinForDepositWithOwnerPubHex(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -223,24 +260,26 @@ function generateCoinForDepositWithSharedHex(scalar_hex, shared_x_hex, shared_y_
 /**
  * `secret` in coin = `Poseidon255(1)(scalar)` per `deposit.circom`; scalar is 32-byte hex (64 chars, optional `0x`).
  * @param {string} scalar_hex
- * @param {bigint} amount
+ * @param {string} amount_decimal
  * @param {string} asset_hi_decimal
  * @param {string} asset_lo_decimal
  * @param {string} application_id_decimal
  * @returns {any}
  */
-function generateCoinFromDepositEphemeralScalarHex(scalar_hex, amount, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
+function generateCoinFromDepositEphemeralScalarHex(scalar_hex, amount_decimal, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(scalar_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr1 = passStringToWasm0(amount_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr2 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len2 = WASM_VECTOR_LEN;
-        const ptr3 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr3 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len3 = WASM_VECTOR_LEN;
-        wasm.generateCoinFromDepositEphemeralScalarHex(retptr, ptr0, len0, amount, ptr1, len1, ptr2, len2, ptr3, len3);
+        const ptr4 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len4 = WASM_VECTOR_LEN;
+        wasm.generateCoinFromDepositEphemeralScalarHex(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -254,29 +293,31 @@ function generateCoinFromDepositEphemeralScalarHex(scalar_hex, amount, asset_hi_
 }
 
 /**
- * Same as `generateCoin`, but commitment uses the given ECDH shared key (64-char hex coords from `ecdhSharedKey`); shared coords are not stored in `coin` JSON.
- * @param {string} shared_x_hex
- * @param {string} shared_y_hex
- * @param {bigint} amount
+ * Same as `generateCoin`, but commitment uses the given owner public key (64-char hex coords).
+ * @param {string} owner_x_hex
+ * @param {string} owner_y_hex
+ * @param {string} amount_decimal
  * @param {string} asset_hi_decimal
  * @param {string} asset_lo_decimal
  * @param {string} application_id_decimal
  * @returns {any}
  */
-function generateCoinWithSharedSecretHex(shared_x_hex, shared_y_hex, amount, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
+function generateCoinWithOwnerPubHex(owner_x_hex, owner_y_hex, amount_decimal, asset_hi_decimal, asset_lo_decimal, application_id_decimal) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(shared_x_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr0 = passStringToWasm0(owner_x_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(shared_y_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr1 = passStringToWasm0(owner_y_hex, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr2 = passStringToWasm0(amount_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len2 = WASM_VECTOR_LEN;
-        const ptr3 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr3 = passStringToWasm0(asset_hi_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len3 = WASM_VECTOR_LEN;
-        const ptr4 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const ptr4 = passStringToWasm0(asset_lo_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len4 = WASM_VECTOR_LEN;
-        wasm.generateCoinWithSharedSecretHex(retptr, ptr0, len0, ptr1, len1, amount, ptr2, len2, ptr3, len3, ptr4, len4);
+        const ptr5 = passStringToWasm0(application_id_decimal, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len5 = WASM_VECTOR_LEN;
+        wasm.generateCoinWithOwnerPubHex(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -313,6 +354,38 @@ function proofToHex(proof_json) {
     }
 }
 
+/**
+ * Graph witness + arkworks Groth16 prove. Returns `{ proof_hex, public_hex }`.
+ * @param {Uint8Array} graph
+ * @param {Uint8Array} proving_key
+ * @param {Uint8Array} r1cs
+ * @param {string} inputs_json
+ * @returns {any}
+ */
+function proveGroth16(graph, proving_key, r1cs, inputs_json) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passArray8ToWasm0(graph, wasm.__wbindgen_export);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray8ToWasm0(proving_key, wasm.__wbindgen_export);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passArray8ToWasm0(r1cs, wasm.__wbindgen_export);
+        const len2 = WASM_VECTOR_LEN;
+        const ptr3 = passStringToWasm0(inputs_json, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len3 = WASM_VECTOR_LEN;
+        wasm.proveGroth16(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
 /**
  * Convert snarkjs public signals JSON to hex bytes for Soroban contract.
  * @param {string} public_json
@@ -523,6 +596,13 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
@@ -689,24 +769,26 @@ var wasmBindings = /*#__PURE__*/Object.freeze({
     buildWithdrawMerkleWitness: buildWithdrawMerkleWitness,
     calculateNullifierHash: calculateNullifierHash,
     default: __wbg_init,
+    derivedEscrowKey: derivedEscrowKey$1,
     ecdhEphemeralPublicKey: ecdhEphemeralPublicKey,
     ecdhEphemeralPublicKeyFromScalarHex: ecdhEphemeralPublicKeyFromScalarHex,
     ecdhSharedKey: ecdhSharedKey,
     generateCoin: generateCoin,
-    generateCoinForDepositWithSharedHex: generateCoinForDepositWithSharedHex,
+    generateCoinForDepositWithOwnerPubHex: generateCoinForDepositWithOwnerPubHex,
     generateCoinFromDepositEphemeralScalarHex: generateCoinFromDepositEphemeralScalarHex,
-    generateCoinWithSharedSecretHex: generateCoinWithSharedSecretHex,
+    generateCoinWithOwnerPubHex: generateCoinWithOwnerPubHex,
     initSync: initSync,
     proofToHex: proofToHex,
+    proveGroth16: proveGroth16,
     publicToHex: publicToHex
 });
 
-const isNode$2 = typeof process !== 'undefined' && !!process.versions?.node;
+const isNode$1 = typeof process !== 'undefined' && !!process.versions?.node;
 let wasmModule = null;
 async function loadWasm(wasmBinary) {
     if (wasmModule)
         return wasmModule;
-    if (isNode$2) {
+    if (isNode$1) {
         if (wasmBinary) {
             initSync({ module: wasmBinary });
         }
@@ -733,468 +815,301 @@ async function loadWasm(wasmBinary) {
     return wasmModule;
 }
 
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-var witness_calculator = async function builder(code, options) {
-
-    options = options || {};
-
-    let wasmModule;
-    try {
-	wasmModule = await WebAssembly.compile(code);
-    }  catch (err) {
-	console.log(err);
-	console.log("\nTry to run circom --c in order to generate c++ code instead\n");
-	throw new Error(err);
-    }
-
-    let wc;
-
-    let errStr = "";
-    let msgStr = "";
-    
-    const instance = await WebAssembly.instantiate(wasmModule, {
-        runtime: {
-            exceptionHandler : function(code) {
-		let err;
-                if (code == 1) {
-                    err = "Signal not found.\n";
-                } else if (code == 2) {
-                    err = "Too many signals set.\n";
-                } else if (code == 3) {
-                    err = "Signal already set.\n";
-		} else if (code == 4) {
-                    err = "Assert Failed.\n";
-		} else if (code == 5) {
-                    err = "Not enough memory.\n";
-		} else if (code == 6) {
-                    err = "Input signal array access exceeds the size.\n";
-		} else if (code == 7) {
-                    err = "Out of bounds array access.\n";
-		} else {
-		    err = "Unknown error.\n";
-                }
-                throw new Error(err + errStr);
-            },
-	    printErrorMessage : function() {
-		errStr += getMessage() + "\n";
-                // console.error(getMessage());
-	    },
-	    writeBufferMessage : function() {
-			const msg = getMessage();
-			// Any calls to `log()` will always end with a `\n`, so that's when we print and reset
-			if (msg === "\n") {
-				console.log(msgStr);
-				msgStr = "";
-			} else {
-				// If we've buffered other content, put a space in between the items
-				if (msgStr !== "") {
-					msgStr += " ";
-				}
-				// Then append the message to the message we are creating
-				msgStr += msg;
-			}
-	    },
-	    showSharedRWMemory : function() {
-		printSharedRWMemory ();
-            }
-
-        }
-    });
-
-    const sanityCheck =
-        options;
-//        options &&
-//        (
-//            options.sanityCheck ||
-//            options.logGetSignal ||
-//            options.logSetSignal ||
-//            options.logStartComponent ||
-//            options.logFinishComponent
-//        );
-
-    
-    wc = new WitnessCalculator(instance, sanityCheck);
-    return wc;
-
-    function getMessage() {
-        var message = "";
-	var c = instance.exports.getMessageChar();
-        while ( c != 0 ) {
-	    message += String.fromCharCode(c);
-	    c = instance.exports.getMessageChar();
-	}
-        return message;
-    }
-	
-    function printSharedRWMemory () {
-	const shared_rw_memory_size = instance.exports.getFieldNumLen32();
-	const arr = new Uint32Array(shared_rw_memory_size);
-	for (let j=0; j<shared_rw_memory_size; j++) {
-	    arr[shared_rw_memory_size-1-j] = instance.exports.readSharedRWMemory(j);
-	}
-
-	// If we've buffered other content, put a space in between the items
-	if (msgStr !== "") {
-		msgStr += " ";
-	}
-	// Then append the value to the message we are creating
-	msgStr += (fromArray32(arr).toString());
-	}
-
+/** Off-chain ZK layout table. Must stay byte-identical to `libs/zk::ZkLayoutParams`. */
+const LEGACY_ZK_NONCE = 0n;
+const COMMITMENT_V2_ZK_NONCE = 2n;
+const BINDING_ZK_NONCE = 3n;
+const SIX_BY_SIX_ZK_NONCE = 6n;
+const SIX_BY_SIX_BINDING_ZK_NONCE = 7n;
+const LEGACY_PUBLIC_INPUT_PREFIX_LEN = 5;
+const V2_PUBLIC_INPUT_PREFIX_LEN = 7;
+const NOTE_AUDIT_LEN$3 = 12;
+const NOTE_OUTPUT_LEN$2 = 6;
+var BundledZkCircuit;
+(function (BundledZkCircuit) {
+    BundledZkCircuit["TwoByTwo"] = "2x2";
+    BundledZkCircuit["SixBySix"] = "6x6";
+})(BundledZkCircuit || (BundledZkCircuit = {}));
+function isDevZkCircuitConfig(config) {
+    return !('circuit' in config);
+}
+const DEFAULT_ZK_CONFIG_NONCE = BINDING_ZK_NONCE;
+const DEFAULT_ZK_CIRCUITS = {
+    [BINDING_ZK_NONCE.toString()]: {
+        nIns: 2,
+        nOuts: 2,
+        publicNInputs: 1,
+        publicNOutputs: 1,
+        circuit: BundledZkCircuit.TwoByTwo,
+    },
+    [SIX_BY_SIX_BINDING_ZK_NONCE.toString()]: {
+        nIns: 6,
+        nOuts: 6,
+        publicNInputs: 1,
+        publicNOutputs: 1,
+        circuit: BundledZkCircuit.SixBySix,
+    },
 };
-
-class WitnessCalculator {
-    constructor(instance, sanityCheck) {
-        this.instance = instance;
-
-	this.version = this.instance.exports.getVersion();
-        this.n32 = this.instance.exports.getFieldNumLen32();
-
-        this.instance.exports.getRawPrime();
-        const arr = new Uint32Array(this.n32);
-        for (let i=0; i<this.n32; i++) {
-            arr[this.n32-1-i] = this.instance.exports.readSharedRWMemory(i);
-        }
-        this.prime = fromArray32(arr);
-
-        this.witnessSize = this.instance.exports.getWitnessSize();
-
-        this.sanityCheck = sanityCheck;
-    }
-    
-    circom_version() {
-	return this.instance.exports.getVersion();
-    }
-
-    async _doCalculateWitness(input_orig, sanityCheck) {
-	//input is assumed to be a map from signals to arrays of bigints
-        this.instance.exports.init((this.sanityCheck || sanityCheck) ? 1 : 0);
-	let prefix = "";
-	var input = new Object();
-	//console.log("Input: ", input_orig);
-	qualify_input(prefix,input_orig,input);
-	//console.log("Input after: ",input);	
-        const keys = Object.keys(input);
-	var input_counter = 0;
-        keys.forEach( (k) => {
-            const h = fnvHash(k);
-            const hMSB = parseInt(h.slice(0,8), 16);
-            const hLSB = parseInt(h.slice(8,16), 16);
-            const fArr = flatArray(input[k]);
-	    let signalSize = this.instance.exports.getInputSignalSize(hMSB, hLSB);
-	    if (signalSize < 0){
-		throw new Error(`Signal ${k} not found\n`);
-	    }
-	    if (fArr.length < signalSize) {
-		throw new Error(`Not enough values for input signal ${k}\n`);
-	    }
-	    if (fArr.length > signalSize) {
-		throw new Error(`Too many values for input signal ${k}\n`);
-	    }
-            for (let i=0; i<fArr.length; i++) {
-                const arrFr = toArray32(normalize(fArr[i],this.prime),this.n32);
-                for (let j=0; j<this.n32; j++) {
-		    this.instance.exports.writeSharedRWMemory(j,arrFr[this.n32-1-j]);
-		}
-		try {
-                    this.instance.exports.setInputSignal(hMSB, hLSB,i);
-		    input_counter++;
-		} catch (err) {
-		    // console.log(`After adding signal ${i} of ${k}`)
-                    throw new Error(err);
-		}
-            }
-
-        });
-	if (input_counter < this.instance.exports.getInputSize()) {
-	    throw new Error(`Not all inputs have been set. Only ${input_counter} out of ${this.instance.exports.getInputSize()}`);
-	}
+function layoutFromCircuitConfig(config) {
+    return zkLayoutFromShapeBinding(config.nIns, config.nOuts, config.publicNInputs, config.publicNOutputs, config.nIns + config.nOuts, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2);
+}
+function resolveZkCircuitConfig(zkCircuits, zkConfigNonce) {
+    const nonce = zkConfigNonce ?? DEFAULT_ZK_CONFIG_NONCE;
+    const circuits = zkCircuits ?? DEFAULT_ZK_CIRCUITS;
+    const config = circuits[nonce.toString()];
+    if (!config) {
+        throw new Error(`no zk circuit configured for nonce ${nonce.toString()}`);
     }
-
-    async calculateWitness(input, sanityCheck) {
-
-        const w = [];
-        await this._doCalculateWitness(input, sanityCheck);
-
-        for (let i=0; i<this.witnessSize; i++) {
-            this.instance.exports.getWitness(i);
-	    const arr = new Uint32Array(this.n32);
-            for (let j=0; j<this.n32; j++) {
-            arr[this.n32-1-j] = this.instance.exports.readSharedRWMemory(j);
-            }
-            w.push(fromArray32(arr));
-        }
-
-        return w;
+    return { nonce, config };
+}
+function bundledCircuitFileNames(circuit) {
+    if (circuit === BundledZkCircuit.SixBySix) {
+        return {
+            graphFileName: 'main_6x6.graph.bin',
+            r1csFileName: 'main_6x6.r1cs.gz',
+            provingKeyFileName: 'main_6x6_proving_key.bin',
+            verificationKeyFileName: 'main_6x6_verification_key.json',
+            zkeyFileName: 'main_6x6_final.zkey',
+        };
     }
-    
-
-    async calculateBinWitness(input, sanityCheck) {
-
-        const buff32 = new Uint32Array(this.witnessSize*this.n32);
-	const buff = new  Uint8Array( buff32.buffer);
-        await this._doCalculateWitness(input, sanityCheck);
-
-        for (let i=0; i<this.witnessSize; i++) {
-            this.instance.exports.getWitness(i);
-	    const pos = i*this.n32;
-            for (let j=0; j<this.n32; j++) {
-		buff32[pos+j] = this.instance.exports.readSharedRWMemory(j);
-            }
-        }
-
-	return buff;
+    return {
+        graphFileName: 'main.graph.bin',
+        r1csFileName: 'main.r1cs.gz',
+        provingKeyFileName: 'main_proving_key.bin',
+        verificationKeyFileName: 'main_verification_key.json',
+        zkeyFileName: 'main_final.zkey',
+    };
+}
+function zkLayoutFromShape(nIns, nOuts, publicNInputs, publicNOutputs, nAuditSlots, noteAuditLen, noteOutputLen, publicInputPrefixLen = LEGACY_PUBLIC_INPUT_PREFIX_LEN) {
+    const auditOffset = nIns + nOuts + nOuts * 2;
+    const outputNoteOffset = auditOffset + nAuditSlots * 2 + nAuditSlots * noteAuditLen + nAuditSlots;
+    return {
+        nIns,
+        nOuts,
+        publicNInputs,
+        publicNOutputs,
+        nAuditSlots,
+        noteAuditLen,
+        noteOutputLen,
+        publicInputPrefixLen,
+        auditOffset,
+        outputNoteOffset,
+    };
+}
+function zkLayoutFromShapeBinding(nIns, nOuts, publicNInputs, publicNOutputs, nAuditSlots, noteAuditLen, noteOutputLen) {
+    const auditOffset = nIns + nOuts + nOuts * 2;
+    const outputNoteOffset = auditOffset + 2 + nAuditSlots;
+    return {
+        nIns,
+        nOuts,
+        publicNInputs,
+        publicNOutputs,
+        nAuditSlots,
+        noteAuditLen,
+        noteOutputLen,
+        publicInputPrefixLen: V2_PUBLIC_INPUT_PREFIX_LEN,
+        auditOffset,
+        outputNoteOffset,
+    };
+}
+function ciphertextsInPublicSignals(layout) {
+    const withCiphertext = layout.auditOffset +
+        layout.nAuditSlots * 2 +
+        layout.nAuditSlots * layout.noteAuditLen +
+        layout.nAuditSlots;
+    return layout.outputNoteOffset === withCiphertext;
+}
+function ciphertextFieldCount(layout) {
+    return layout.nAuditSlots * layout.noteAuditLen + layout.nOuts * layout.noteOutputLen;
+}
+function auditEphemeralPublicKeyCount(layout) {
+    return ciphertextsInPublicSignals(layout) ? layout.nAuditSlots : 1;
+}
+function indexAuditTags(layout) {
+    if (ciphertextsInPublicSignals(layout)) {
+        return (layout.auditOffset +
+            layout.nAuditSlots * 2 +
+            layout.nAuditSlots * layout.noteAuditLen);
     }
-    
-
-    async calculateWTNSBin(input, sanityCheck) {
-
-        const buff32 = new Uint32Array(this.witnessSize*this.n32+this.n32+11);
-	const buff = new  Uint8Array( buff32.buffer);
-        await this._doCalculateWitness(input, sanityCheck);
-  
-	//"wtns"
-	buff[0] = "w".charCodeAt(0);
-	buff[1] = "t".charCodeAt(0);
-	buff[2] = "n".charCodeAt(0);
-	buff[3] = "s".charCodeAt(0);
-
-	//version 2
-	buff32[1] = 2;
-
-	//number of sections: 2
-	buff32[2] = 2;
-
-	//id section 1
-	buff32[3] = 1;
-
-	const n8 = this.n32*4;
-	//id section 1 length in 64bytes
-	const idSection1length = 8 + n8;
-	const idSection1lengthHex = idSection1length.toString(16);
-        buff32[4] = parseInt(idSection1lengthHex.slice(0,8), 16);
-        buff32[5] = parseInt(idSection1lengthHex.slice(8,16), 16);
-
-	//this.n32
-	buff32[6] = n8;
-
-	//prime number
-	this.instance.exports.getRawPrime();
-
-	var pos = 7;
-        for (let j=0; j<this.n32; j++) {
-	    buff32[pos+j] = this.instance.exports.readSharedRWMemory(j);
-        }
-	pos += this.n32;
-
-	// witness size
-	buff32[pos] = this.witnessSize;
-	pos++;
-
-	//id section 2
-	buff32[pos] = 2;
-	pos++;
-
-	// section 2 length
-	const idSection2length = n8*this.witnessSize;
-	const idSection2lengthHex = idSection2length.toString(16);
-        buff32[pos] = parseInt(idSection2lengthHex.slice(0,8), 16);
-        buff32[pos+1] = parseInt(idSection2lengthHex.slice(8,16), 16);
-
-	pos += 2;
-        for (let i=0; i<this.witnessSize; i++) {
-            this.instance.exports.getWitness(i);
-            for (let j=0; j<this.n32; j++) {
-		buff32[pos+j] = this.instance.exports.readSharedRWMemory(j);
-            }
-	    pos += this.n32;
-        }
-
-	return buff;
+    return layout.auditOffset + auditEphemeralPublicKeyCount(layout) * 2;
+}
+function indexOutputNoteTags(layout) {
+    if (ciphertextsInPublicSignals(layout)) {
+        return layout.outputNoteOffset + layout.nOuts * layout.noteOutputLen;
     }
-
+    return layout.outputNoteOffset;
 }
-
-
-function qualify_input_list(prefix,input,input1){
-    if (Array.isArray(input)) {
-	for (let i = 0; i<input.length; i++) {
-	    let new_prefix = prefix + "[" + i + "]";
-	    qualify_input_list(new_prefix,input[i],input1);
-	}
-    } else {
-	qualify_input(prefix,input,input1);
-    }
-}
-
-function qualify_input(prefix,input,input1) {
-    if (Array.isArray(input)) {
-	let a = flatArray(input);
-	if (a.length > 0) {
-	    let t = typeof a[0];
-	    for (let i = 1; i<a.length; i++) {
-		if (typeof a[i] != t){
-		    throw new Error(`Types are not the same in the key ${prefix}`);
-		}
-	    }
-	    if (t == "object") {
-		qualify_input_list(prefix,input,input1);
-	    } else {
-		input1[prefix] = input;
-	    }
-	} else {	    
-	    input1[prefix] = input;
-	}
-    } else if (typeof input == "object") {
-        const keys = Object.keys(input);
-	keys.forEach( (k) => {
-	    let new_prefix = prefix == ""? k : prefix + "." + k;
-	    qualify_input(new_prefix,input[k],input1);
-	});
-    } else {
-	input1[prefix] = input;
+function publicOutputsLen(layout) {
+    if (ciphertextsInPublicSignals(layout)) {
+        return layout.outputNoteOffset + layout.nOuts * layout.noteOutputLen + layout.nOuts;
     }
+    return layout.outputNoteOffset + layout.nOuts;
 }
-
-function toArray32(rem,size) {
-    const res = []; //new Uint32Array(size); //has no unshift
-    const radix = BigInt(0x100000000);
-    while (rem) {
-        res.unshift( Number(rem % radix));
-        rem = rem / radix;
+function totalPublicSignals(layout) {
+    return (publicOutputsLen(layout) +
+        layout.publicInputPrefixLen +
+        2 * layout.publicNInputs +
+        2 * layout.publicNOutputs +
+        layout.publicNInputs +
+        layout.publicNOutputs);
+}
+function stateRootIndex(layout) {
+    return publicOutputsLen(layout);
+}
+function legacyOwnerBoundLayout() {
+    return zkLayoutFromShape(2, 2, 1, 1, 4, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2);
+}
+function standardLayout() {
+    return zkLayoutFromShape(2, 2, 1, 1, 4, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2, V2_PUBLIC_INPUT_PREFIX_LEN);
+}
+function sixBySixLayout() {
+    return zkLayoutFromShape(6, 6, 1, 1, 12, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2, V2_PUBLIC_INPUT_PREFIX_LEN);
+}
+function standardBindingLayout() {
+    return zkLayoutFromShapeBinding(2, 2, 1, 1, 4, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2);
+}
+function sixBySixBindingLayout() {
+    return zkLayoutFromShapeBinding(6, 6, 1, 1, 12, NOTE_AUDIT_LEN$3, NOTE_OUTPUT_LEN$2);
+}
+function layoutForKnownNonce(nonce) {
+    if (nonce === LEGACY_ZK_NONCE) {
+        return legacyOwnerBoundLayout();
     }
-    if (size) {
-	var i = size - res.length;
-	while (i>0) {
-	    res.unshift(0);
-	    i--;
-	}
+    if (nonce === COMMITMENT_V2_ZK_NONCE) {
+        return standardLayout();
     }
-    return res;
-}
-
-function fromArray32(arr) { //returns a BigInt
-    var res = BigInt(0);
-    const radix = BigInt(0x100000000);
-    for (let i = 0; i<arr.length; i++) {
-        res = res*radix + BigInt(arr[i]);
+    if (nonce === BINDING_ZK_NONCE) {
+        return standardBindingLayout();
     }
-    return res;
-}
-
-function flatArray(a) {
-    var res = [];
-    fillArray(res, a);
-    return res;
-
-    function fillArray(res, a) {
-        if (Array.isArray(a)) {
-            for (let i=0; i<a.length; i++) {
-                fillArray(res, a[i]);
-            }
-        } else {
-            res.push(a);
-        }
+    if (nonce === SIX_BY_SIX_ZK_NONCE) {
+        return sixBySixLayout();
+    }
+    if (nonce === SIX_BY_SIX_BINDING_ZK_NONCE) {
+        return sixBySixBindingLayout();
     }
+    throw new Error(`unknown zk config nonce ${nonce.toString()}`);
 }
-
-function normalize(n, prime) {
-    let res = BigInt(n) % prime;
-    if (res < 0) res += prime;
-    return res
+function circuitProfileFromName(name) {
+    const normalized = name.trim().toLowerCase();
+    if (normalized === '6x6' || normalized === 'six' || normalized === '6') {
+        return {
+            name: '6x6',
+            nonce: SIX_BY_SIX_BINDING_ZK_NONCE,
+            layout: sixBySixBindingLayout(),
+            wasmFileName: 'main_6x6.wasm',
+            zkeyFileName: 'main_6x6_final.zkey',
+        };
+    }
+    if (normalized === '2x2' || normalized === 'standard' || normalized === '2') {
+        return {
+            name: '2x2',
+            nonce: BINDING_ZK_NONCE,
+            layout: standardBindingLayout(),
+            wasmFileName: 'main.wasm',
+            zkeyFileName: 'main_final.zkey',
+        };
+    }
+    throw new Error(`unknown circuit profile ${name}`);
 }
-
-function fnvHash(str) {
-    const uint64_max = BigInt(2) ** BigInt(64);
-    let hash = BigInt("0xCBF29CE484222325");
-    for (var i = 0; i < str.length; i++) {
-	hash ^= BigInt(str[i].charCodeAt());
-	hash *= BigInt(0x100000001B3);
-	hash %= uint64_max;
+function circuitProfileFromNonce(nonce) {
+    if (nonce === SIX_BY_SIX_ZK_NONCE ||
+        nonce === SIX_BY_SIX_BINDING_ZK_NONCE) {
+        return circuitProfileFromName('6x6');
     }
-    let shash = hash.toString(16);
-    let n = 16 - shash.length;
-    shash = '0'.repeat(n).concat(shash);
-    return shash;
+    return circuitProfileFromName('2x2');
 }
 
-var witnessCalculatorModule = /*@__PURE__*/getDefaultExportFromCjs(witness_calculator);
-
-const isNode$1 = typeof process !== 'undefined' && !!process.versions?.node;
-async function generateWitness(input, circuitWasm) {
-    let wasmBuffer;
-    let wc;
-    if (isNode$1) {
-        const fs = await import('fs');
-        const nodePath = await import('path');
-        const { fileURLToPath } = await import('url');
-        const dir = nodePath.dirname(fileURLToPath(import.meta.url));
-        const assetsDir = nodePath.resolve(dir, '..', 'assets');
-        wc = { default: witnessCalculatorModule };
-        if (circuitWasm) {
-            wasmBuffer = circuitWasm;
-        }
-        else {
-            const wasmPath = nodePath.resolve(assetsDir, 'main.wasm');
-            if (!fs.existsSync(wasmPath)) {
-                throw new Error(`Circuit WASM not found at ${wasmPath}. Run build.sh first.`);
-            }
-            wasmBuffer = fs.readFileSync(wasmPath);
-        }
-    }
-    else {
-        if (!circuitWasm) {
-            throw new Error('In browser, you must pass circuitWasm to PrivacyPoolSDK.init(). ' +
-                'Load the circuit WASM file via fetch() and pass the ArrayBuffer.');
-        }
-        wasmBuffer = circuitWasm;
-        wc = { default: witnessCalculatorModule };
+const ZK_ARTIFACT_GITHUB_REPO = "Polynom-Labs/stellar-privacy-layer-contracts";
+const ZK_SDK_PACKAGE_VERSION = "0.9.1-rc.0";
+function defaultZkArtifactBaseUrl(version = ZK_SDK_PACKAGE_VERSION) {
+    const tag = version.startsWith("v") ? version.slice(1) : version;
+    return `https://github.com/${ZK_ARTIFACT_GITHUB_REPO}/releases/download/v${tag}`;
+}
+function trimArtifactBaseUrl(value) {
+    let trimmed = value.trim();
+    while (trimmed.endsWith("/")) {
+        trimmed = trimmed.slice(0, -1);
     }
-    const calculator = await wc.default(wasmBuffer);
-    const wtns = await calculator.calculateWTNSBin(input, 0);
-    return wtns;
+    return trimmed;
 }
 
-// @ts-ignore - snarkjs types
 const isNode = typeof process !== 'undefined' && !!process.versions?.node;
-/**
- * Normalize BufferSource to Uint8Array. Required for @iden3/binfileutils/fastfile:
- * they read via data.buffer and data.byteOffset, which ArrayBuffer does not have.
- */
 function toUint8Array(src) {
-    if (src instanceof Uint8Array)
+    if (src instanceof Uint8Array) {
         return src;
-    if (src instanceof ArrayBuffer)
+    }
+    if (src instanceof ArrayBuffer) {
         return new Uint8Array(src);
+    }
     return new Uint8Array(src.buffer, src.byteOffset, src.byteLength);
 }
-async function generateProof(wtns, zkey) {
-    let zkeyData;
-    if (zkey) {
-        zkeyData = toUint8Array(zkey);
+function nodeEnvArtifactBaseUrl() {
+    if (!isNode) {
+        return undefined;
+    }
+    const fromEnv = process.env.ZK_ARTIFACT_BASE_URL?.trim();
+    return fromEnv ? trimArtifactBaseUrl(fromEnv) : undefined;
+}
+function resolveZkArtifactBaseUrl(explicit) {
+    const trimmed = explicit?.trim();
+    if (trimmed) {
+        return trimArtifactBaseUrl(trimmed);
+    }
+    return nodeEnvArtifactBaseUrl() ?? defaultZkArtifactBaseUrl();
+}
+function isHttpUrl(value) {
+    return /^https?:\/\//i.test(value) || value.startsWith('file:');
+}
+async function readNodeAssetFile(filePath) {
+    const fs = await import('fs');
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`Circuit artifact not found at ${filePath}. Set zkArtifactBaseUrl or ZK_ARTIFACT_BASE_URL.`);
+    }
+    return fs.readFileSync(filePath);
+}
+async function fetchArtifact(url) {
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch ${url}: ${String(response.status)}`);
+    }
+    return new Uint8Array(await response.arrayBuffer());
+}
+function remoteArtifactHref(base, fileName) {
+    const withSlash = `${trimArtifactBaseUrl(base)}/`;
+    if (isHttpUrl(withSlash)) {
+        return new URL(fileName, withSlash).href;
     }
-    else if (isNode) {
-        const fs = await import('fs');
+    if (typeof window !== 'undefined') {
+        return new URL(fileName, new URL(withSlash, window.location.href)).href;
+    }
+    return `${withSlash}${fileName}`;
+}
+async function loadNamedArtifact(base, fileName) {
+    if (isNode && !isHttpUrl(base)) {
         const nodePath = await import('path');
-        const { fileURLToPath } = await import('url');
-        const dir = nodePath.dirname(fileURLToPath(import.meta.url));
-        const zkeyPath = nodePath.resolve(dir, '..', 'assets', 'main_final.zkey');
-        if (!fs.existsSync(zkeyPath)) {
-            throw new Error(`Proving key not found at ${zkeyPath}. Run build.sh first.`);
-        }
-        const zkeyBuffer = fs.readFileSync(zkeyPath);
-        zkeyData = toUint8Array(zkeyBuffer);
+        return readNodeAssetFile(nodePath.resolve(base, fileName));
     }
-    else {
-        throw new Error('In browser, you must pass zkey to PrivacyPoolSDK.init(). ' +
-            'Load the zkey file via fetch() and pass the ArrayBuffer.');
+    return fetchArtifact(remoteArtifactHref(base, fileName));
+}
+async function loadBundledCircuitArtifacts(circuit, artifactBaseUrl) {
+    const base = resolveZkArtifactBaseUrl(artifactBaseUrl);
+    const names = bundledCircuitFileNames(circuit);
+    const [graph, r1cs, provingKey] = await Promise.all([
+        loadNamedArtifact(base, names.graphFileName),
+        loadNamedArtifact(base, names.r1csFileName),
+        loadNamedArtifact(base, names.provingKeyFileName),
+    ]);
+    return { graph, r1cs, provingKey };
+}
+async function resolveCircuitArtifacts(config, artifactBaseUrl) {
+    if (isDevZkCircuitConfig(config)) {
+        return {
+            graph: toUint8Array(config.circuitGraph),
+            r1cs: toUint8Array(config.r1cs),
+            provingKey: toUint8Array(config.provingKey),
+        };
     }
-    const wtnsData = toUint8Array(wtns);
-    const { proof, publicSignals } = await snarkjs.groth16.prove({ type: 'mem', data: zkeyData }, { type: 'mem', data: wtnsData });
-    return { proof, publicSignals };
+    return loadBundledCircuitArtifacts(config.circuit, artifactBaseUrl);
 }
 
 var dist = {};
@@ -1531,7 +1446,7 @@ function bytesToHex$1(bytes) {
     }
     return s;
 }
-function concatBytes(a, b) {
+function concatBytes$1(a, b) {
     const out = new Uint8Array(a.length + b.length);
     out.set(a, 0);
     out.set(b, a.length);
@@ -1547,7 +1462,7 @@ function encodeStealthAddress(decoded) {
     if (xb.length !== yb.length) {
         throw new Error('stealth-address: x and y must encode the same number of bytes for a reversible address');
     }
-    const payload = concatBytes(xb, yb);
+    const payload = concatBytes$1(xb, yb);
     const words = bech32.toWords(payload);
     return bech32.encode(STEALTH_ADDRESS_HRP, words, BECH32_STEALTH_LIMIT);
 }
@@ -1572,70 +1487,211 @@ function decodeStealthAddress(address) {
 
 /** Default nonce when deriving the wallet sign-in message. */
 const DEFAULT_STEALTH_SIGN_NONCE = 'main address';
+/** Domain tag mixed into the spend-scalar digest (H6). */
+const SPEND_SCALAR_DOMAIN_TAG = 'privacy-pool-spend-scalar-v1';
+/** Schema version bound into the spend-scalar message and digest. */
+const OWNER_BOUND_NOTE_SCHEMA_VERSION = 1;
+function resolveSpendScalarSchemaVersion(domain) {
+    return domain.schemaVersion ?? OWNER_BOUND_NOTE_SCHEMA_VERSION;
+}
 /**
- * Plaintext for Stellar wallet message signing (stealth address derivation).
+ * Plaintext for Stellar wallet message signing (spend-key derivation).
  * Sign the exact bytes of this string (UTF-8) with the stellar account key.
+ *
+ * The derived scalar is the owner-bound spend key for notes in this environment.
+ */
+function buildStealthAddressSignMessage(address, domain, nonce = DEFAULT_STEALTH_SIGN_NONCE) {
+    const schemaVersion = resolveSpendScalarSchemaVersion(domain);
+    return [
+        'Arcane privacy layer: derive your private-note spend key.',
+        '',
+        `Wallet: ${address}`,
+        `Network: ${domain.networkPassphrase}`,
+        `Pool: ${domain.poolContract}`,
+        `Registry: ${domain.registryContract}`,
+        `Schema: owner-bound-note-v${schemaVersion}`,
+        `Nonce: ${nonce}`,
+        '',
+        'This signature derives the key that authorizes spending your private notes in this environment.',
+    ].join('\n');
+}
+
+const DOM_PADDING = 1347436868n;
+const DOM_NULLIFIER = 1346917708n;
+const DOM_ESCROW = 1346720579n;
+const DOM_ENC = 1346719299n;
+const DOM_AUDIT_TAG = 1346458695n;
+const DOM_OUTPUT_NOTE_TAG = 1347310663n;
+const BABYJUB_SUBGROUP_ORDER = 2736030358979909402780800718157159386076813972158567259200215660948447373041n;
+/**
+ * Map any integer into `(0, l)` so it satisfies circom `LessThan(252)` vs
+ * `BABYJUB_SUBGROUP_ORDER` and `BabyPbk`. Values already in range are unchanged.
  */
-function buildStealthAddressSignMessage(address, nonce = DEFAULT_STEALTH_SIGN_NONCE) {
-    return `Privacy layer app needs you to sign the message for stealth address derivation with address:\n${address}\n and nonce:\n${nonce}.\n\n This will not authorize any transaction.`;
+function canonicalBabyJubScalarFromInteger(value) {
+    if (value > 0n && value < BABYJUB_SUBGROUP_ORDER) {
+        return value;
+    }
+    return (value % (BABYJUB_SUBGROUP_ORDER - 1n)) + 1n;
 }
 
-const TRANSACTION_N_AUDIT_SLOTS = 4;
-const DEFAULT_APPLICATION_ID = '101';
-/** BabyJub audit public key (decimal Fr) used in BDD / local demo when env is unset. */
-const DEMO_AUDIT_PUBLIC_KEY = [
-    '21605515851820432880964235241069234202284600780825340516808373216881770219365',
-    '18856460861531942120859708048677603751294231190189224157283439874962410808705',
-];
-function isActiveWithdraw(slot) {
-    return slot.value !== '0';
-}
-function isActiveDeposit(slot) {
-    return slot.value !== '0';
-}
-function resolveWithdrawSlot(slot) {
-    if (slot === 'dummy') {
-        return null;
+function hexToBytes(hex) {
+    const out = new Uint8Array(hex.length / 2);
+    for (let i = 0; i < out.length; i++) {
+        out[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
     }
-    return slot;
+    return out;
 }
-function resolveDepositSlot(slot) {
-    if (slot === 'dummy') {
-        return null;
+/** Base64 → bytes via `atob` (browsers; Node 16+). No Node `Buffer`. */
+function decodeBase64ToBytes(s) {
+    const t = s.replace(/\s/g, '');
+    if (typeof atob !== 'function') {
+        throw new Error('Base64 decoding requires atob (browser or Node 16+)');
+    }
+    try {
+        const binary = atob(t);
+        const out = new Uint8Array(binary.length);
+        for (let i = 0; i < binary.length; i++) {
+            out[i] = binary.charCodeAt(i);
+        }
+        return out;
+    }
+    catch {
+        throw new Error('Invalid base64 signature');
     }
-    return slot;
 }
-function buildUniformAuditParams(applicationId = DEFAULT_APPLICATION_ID, auditPublicKey) {
-    return {
-        applicationId,
-        noteAuditPublicKeys: [
-            auditPublicKey,
-            auditPublicKey,
-            auditPublicKey,
-            auditPublicKey,
-        ],
-        auditEphemeralScalars: [
-            randomFrDecimal253(),
-            randomFrDecimal253(),
-            randomFrDecimal253(),
-            randomFrDecimal253(),
-        ],
-    };
+/**
+ * Ed25519 signature as **128 hex chars** (optional `0x`) or **base64** (typically 88 chars for 64 bytes, whitespace ignored).
+ */
+function parseStellarEd25519SignatureRaw(input) {
+    const trimmed = input.trim();
+    const no0x = trimmed.replace(/^0x/i, '');
+    if (/^[0-9a-fA-F]+$/.test(no0x) && no0x.length === 128) {
+        return hexToBytes(no0x.toLowerCase());
+    }
+    const fromB64 = decodeBase64ToBytes(trimmed);
+    if (fromB64.length !== 64) {
+        throw new Error(`Decoded signature must be 64 bytes (Ed25519); got ${fromB64.length} from base64`);
+    }
+    return fromB64;
+}
+/** SHA-256 via Web Crypto only (`crypto.subtle`) — works in browsers and Node 19+ (global `crypto`). */
+async function sha256$1(data) {
+    const subtle = globalThis.crypto?.subtle;
+    if (!subtle) {
+        throw new Error('SHA-256 requires crypto.subtle (HTTPS or localhost in browsers, or Node.js 19+).');
+    }
+    const copy = new Uint8Array(data.length);
+    copy.set(data);
+    return new Uint8Array(await subtle.digest('SHA-256', copy));
+}
+function appendU32BE$1(parts, value) {
+    const buf = new Uint8Array(4);
+    new DataView(buf.buffer).setUint32(0, value >>> 0, false);
+    parts.push(buf);
+}
+function appendUtf8Prefixed(parts, text) {
+    const bytes = new TextEncoder().encode(text);
+    appendU32BE$1(parts, bytes.length);
+    parts.push(bytes);
+}
+function concatBytes(parts) {
+    const total = parts.reduce((sum, part) => sum + part.length, 0);
+    const out = new Uint8Array(total);
+    let offset = 0;
+    for (const part of parts) {
+        out.set(part, offset);
+        offset += part.length;
+    }
+    return out;
+}
+/**
+ * Domain-separated spend-scalar digest: SHA-256(
+ *   SPEND_SCALAR_DOMAIN_TAG || network || pool || registry || schemaVersion || signature
+ * ).
+ */
+async function spendScalarDigestFromStellarSignature(signature, domain) {
+    const raw = parseStellarEd25519SignatureRaw(signature);
+    const parts = [new TextEncoder().encode(SPEND_SCALAR_DOMAIN_TAG)];
+    appendUtf8Prefixed(parts, domain.networkPassphrase);
+    appendUtf8Prefixed(parts, domain.poolContract);
+    appendUtf8Prefixed(parts, domain.registryContract);
+    appendU32BE$1(parts, resolveSpendScalarSchemaVersion(domain));
+    parts.push(raw);
+    return sha256$1(concatBytes(parts));
+}
+function digestToCanonicalScalar(digest) {
+    let v = 0n;
+    for (let i = 0; i < digest.length; i++) {
+        v = (v << 8n) + BigInt(digest[i]);
+    }
+    return canonicalBabyJubScalarFromInteger(v);
+}
+function canonicalScalarHex(scalar) {
+    return scalar.toString(16).padStart(64, '0');
+}
+async function spendScalarHexFromStellarSignature(signature, domain) {
+    const digest = await spendScalarDigestFromStellarSignature(signature, domain);
+    return canonicalScalarHex(digestToCanonicalScalar(digest));
+}
+/**
+ * Stellar Ed25519 signature (hex or base64) → domain-separated SHA-256 → scalar → WASM ECDH.
+ */
+async function stealthAddressFromStellarSignature(ecdhFromScalarHex, encodeStealth, signature, domain) {
+    const digest = await spendScalarDigestFromStellarSignature(signature, domain);
+    const decoded = ecdhFromScalarHex(canonicalScalarHex(digestToCanonicalScalar(digest)));
+    return encodeStealth(decoded);
+}
+/**
+ * Domain-separated SHA-256(signature, network, pool, registry, schema) reduced into
+ * `(0, BabyJub subgroup order)` so `privKeyScalar` matches `BabyPbk` and circom `LessThan(l)`.
+ */
+async function privKeyScalarDecimalFromStellarSignature(signature, domain) {
+    const digest = await spendScalarDigestFromStellarSignature(signature, domain);
+    return digestToCanonicalScalar(digest).toString(10);
+}
+
+const TRANSACTION_N_AUDIT_SLOTS = 4;
+const DEFAULT_APPLICATION_ID = '101';
+/** BabyJub audit public key (decimal Fr) used in BDD / local demo when env is unset. */
+const DEMO_AUDIT_PUBLIC_KEY = [
+    '21605515851820432880964235241069234202284600780825340516808373216881770219365',
+    '18856460861531942120859708048677603751294231190189224157283439874962410808705',
+];
+function isActiveWithdraw(slot) {
+    return slot.value !== '0';
+}
+function isActiveDeposit(slot) {
+    return slot.value !== '0';
+}
+function resolveWithdrawSlot(slot) {
+    if (slot === 'dummy') {
+        return null;
+    }
+    return slot;
+}
+function resolveDepositSlot(slot) {
+    if (slot === 'dummy') {
+        return null;
+    }
+    return slot;
+}
+function buildUniformAuditParams(applicationId = DEFAULT_APPLICATION_ID, auditPublicKey, _nAuditSlots = TRANSACTION_N_AUDIT_SLOTS) {
+    return {
+        applicationId,
+        noteAuditPublicKey: auditPublicKey,
+        auditEphemeralScalar: randomFrDecimal253(),
+    };
 }
 function resolveSlotApplicationIds(audit, withdrawSlots, depositSlots) {
-    const w0 = resolveWithdrawSlot(withdrawSlots[0]);
-    const w1 = resolveWithdrawSlot(withdrawSlots[1]);
-    const d0 = resolveDepositSlot(depositSlots[0]);
-    const d1 = resolveDepositSlot(depositSlots[1]);
     return {
-        inputApplicationIds: [
-            w0 && isActiveWithdraw(w0) ? audit.applicationId : '0',
-            w1 && isActiveWithdraw(w1) ? audit.applicationId : '0',
-        ],
-        outputApplicationIds: [
-            d0 && isActiveDeposit(d0) ? audit.applicationId : '0',
-            d1 && isActiveDeposit(d1) ? audit.applicationId : '0',
-        ],
+        inputApplicationIds: withdrawSlots.map((slot) => {
+            const resolved = resolveWithdrawSlot(slot);
+            return resolved && isActiveWithdraw(resolved) ? audit.applicationId : '0';
+        }),
+        outputApplicationIds: depositSlots.map((slot) => {
+            const resolved = resolveDepositSlot(slot);
+            return resolved && isActiveDeposit(resolved) ? audit.applicationId : '0';
+        }),
     };
 }
 function withApplicationIdOnDeposit(deposit, applicationId) {
@@ -1644,16 +1700,34 @@ function withApplicationIdOnDeposit(deposit, applicationId) {
 function withApplicationIdOnWithdraw(withdraw, applicationId) {
     return { ...withdraw, applicationId };
 }
-function resolveTransactionAuditParams(applicationId, auditPublicKey) {
-    return buildUniformAuditParams(applicationId, auditPublicKey ?? DEMO_AUDIT_PUBLIC_KEY);
+/**
+ * Prefer an explicit key, then `NOTE_AUDIT_PUBLIC_KEY_X`/`_Y` env (decimal Fr),
+ * then the built-in demo key. Used by CLI/`demo.sh` for per-app audit pubkeys.
+ */
+function resolveAuditPublicKeyFromEnv(auditPublicKey) {
+    if (auditPublicKey) {
+        return auditPublicKey;
+    }
+    const x = process.env.NOTE_AUDIT_PUBLIC_KEY_X?.trim();
+    const y = process.env.NOTE_AUDIT_PUBLIC_KEY_Y?.trim();
+    if (x && y) {
+        return [x, y];
+    }
+    return DEMO_AUDIT_PUBLIC_KEY;
+}
+function resolveTransactionAuditParams(applicationId, auditPublicKey, nAuditSlots = TRANSACTION_N_AUDIT_SLOTS) {
+    return buildUniformAuditParams(applicationId, resolveAuditPublicKeyFromEnv(auditPublicKey), nAuditSlots);
 }
 
-/** Matches `Transaction(20, 2, 2, publicNInputs, publicNOutputs, 4, 9)` in `circuits/main.circom`. */
+/** Matches `Transaction(20, 2, 2, publicNInputs, publicNOutputs, 4, 12, 6)` in `circuits/main.circom`. */
 const TRANSACTION_TREE_DEPTH = 20;
 const TRANSACTION_N_INS = 2;
 const TRANSACTION_N_OUTS = 2;
-const NOTE_AUDIT_LEN$1 = 9;
+const NOTE_AUDIT_LEN$2 = 12;
 const NOTE_OUTPUT_LEN$1 = 6;
+/** Must match `Transaction(..., publicNInputs, publicNOutputs)` and contract `get_public_slot_config`. */
+const TRANSACTION_PUBLIC_N_INPUTS = 1;
+const TRANSACTION_PUBLIC_N_OUTPUTS = 1;
 /** BN254 scalar field modulus (ark `Fr`, circom signals). */
 const BN254_SCALAR_MOD = 21888242871839275222246405745257275088548364400416034343698204186575808495617n;
 /**
@@ -1661,6 +1735,29 @@ const BN254_SCALAR_MOD = 2188824287183927522224640574525727508854836440041603434
  * (matches `libs/cryptography` `scalar_mul_253`).
  */
 const BN254_BABYJUB_SCALAR_MAX_EXCLUSIVE = 1n << 253n;
+function padPublicLegs(legs, publicNInputs, publicNOutputs) {
+    const padPairs = (values, expected, label) => {
+        if (values.length > expected) {
+            throw new Error(`withdrawal-transaction-input: expected at most ${expected} ${label}`);
+        }
+        return [
+            ...values,
+            ...Array.from({ length: expected - values.length }, () => ['0', '0']),
+        ];
+    };
+    const padAmounts = (values, expected, label) => {
+        if (values.length > expected) {
+            throw new Error(`withdrawal-transaction-input: expected at most ${expected} ${label}`);
+        }
+        return [...values, ...Array.from({ length: expected - values.length }, () => '0')];
+    };
+    return {
+        publicWithdrawnAssets: padPairs(legs.publicWithdrawnAssets, publicNOutputs, 'public withdrawn assets'),
+        publicDepositedAssets: padPairs(legs.publicDepositedAssets, publicNInputs, 'public deposited assets'),
+        publicDeposits: padAmounts(legs.publicDeposits, publicNInputs, 'public deposits'),
+        publicWithdrawals: padAmounts(legs.publicWithdrawals, publicNOutputs, 'public withdrawals'),
+    };
+}
 function normalizeHex$1(hex) {
     const s = hex.trim().replace(/^0x/i, '');
     if (!/^[0-9a-fA-F]*$/.test(s)) {
@@ -1722,6 +1819,12 @@ function randomFrDecimal253() {
     const hex = generateRandomScalarHex32();
     return BigInt(`0x${normalizeHex$1(hex)}`).toString(10);
 }
+/** Spend-scalar hex in `(0, BabyJub subgroup order)` so dummy withdraws satisfy `LessThan(l)`. */
+function randomCanonicalBabyJubScalarHex() {
+    const hex = generateRandomScalarHex32();
+    const reduced = canonicalBabyJubScalarFromInteger(BigInt(`0x${normalizeHex$1(hex)}`));
+    return reduced.toString(16).padStart(64, '0');
+}
 function zerosTreeSiblings() {
     return Array(TRANSACTION_TREE_DEPTH).fill('0');
 }
@@ -1729,14 +1832,20 @@ function dummyWithdraw(wasm) {
     const nullifier = randomFrDecimal();
     const secretHex = generateRandomScalarHex32();
     const secret = (BigInt(`0x${normalizeHex$1(secretHex)}`) % BN254_SCALAR_MOD).toString(10);
-    const pt = wasm.ecdhEphemeralPublicKeyFromScalarHex(secretHex);
+    const scalarHex = randomCanonicalBabyJubScalarHex();
+    const privKeyScalar = scalarHexToFrDecimal(scalarHex);
+    const pt = wasm.ecdhEphemeralPublicKeyFromScalarHex(scalarHex);
     return {
         value: '0',
         nullifier,
         secret,
         asset: ['0', '0'],
         applicationId: '0',
-        ephemeralKeys: [coordHexToDecimal(pt.x), coordHexToDecimal(pt.y)],
+        ownerPub: [coordHexToDecimal(pt.x), coordHexToDecimal(pt.y)],
+        privKeyScalar,
+        paddingRandom: randomFrDecimal(),
+        escrowNonce: '0',
+        recipientStellar: ['0', '0'],
         stateSiblings: zerosTreeSiblings(),
         stateIndex: '0',
     };
@@ -1753,6 +1862,8 @@ function dummyDeposit(wasm) {
         asset: ['0', '0'],
         applicationId: '0',
         recipientPublicKeys: [coordHexToDecimal(pt.x), coordHexToDecimal(pt.y)],
+        escrowNonce: '0',
+        recipientStellar: ['0', '0'],
     };
 }
 function resolveWithdraw(slot, wasm) {
@@ -1767,37 +1878,63 @@ function resolveDepositsForWitness(depositSlots, wasm) {
         resolveDeposit(depositSlots[1], wasm),
     ];
 }
-function buildTransactionWitnessInput(publicParams, publicLegs, withdrawSlots, depositSlots, audit, wasm) {
-    const w0 = resolveWithdraw(withdrawSlots[0], wasm);
-    const w1 = resolveWithdraw(withdrawSlots[1], wasm);
-    const d0 = resolveDeposit(depositSlots[0], wasm);
-    const d1 = resolveDeposit(depositSlots[1], wasm);
-    const appIds = resolveSlotApplicationIds(audit, withdrawSlots, depositSlots);
+function padWithdrawSlots(slots, nIns) {
+    if (slots.length > nIns) {
+        throw new Error(`withdrawal-transaction-input: expected at most ${nIns} withdraw slots`);
+    }
+    return [...slots, ...Array.from({ length: nIns - slots.length }, () => 'dummy')];
+}
+function padDepositSlots(slots, nOuts) {
+    if (slots.length > nOuts) {
+        throw new Error(`withdrawal-transaction-input: expected at most ${nOuts} deposit slots`);
+    }
+    return [...slots, ...Array.from({ length: nOuts - slots.length }, () => 'dummy')];
+}
+function buildTransactionWitnessInput(publicParams, publicLegs, withdrawSlots, depositSlots, audit, wasm, dims = {}) {
+    const nIns = dims.nIns ?? TRANSACTION_N_INS;
+    const nOuts = dims.nOuts ?? TRANSACTION_N_OUTS;
+    const publicNInputs = dims.publicNInputs ?? TRANSACTION_PUBLIC_N_INPUTS;
+    const publicNOutputs = dims.publicNOutputs ?? TRANSACTION_PUBLIC_N_OUTPUTS;
+    const paddedWithdraws = padWithdrawSlots(withdrawSlots, nIns);
+    const paddedDeposits = padDepositSlots(depositSlots, nOuts);
+    const paddedLegs = padPublicLegs(publicLegs, publicNInputs, publicNOutputs);
+    const withdraws = paddedWithdraws.map((slot) => resolveWithdraw(slot, wasm));
+    const deposits = paddedDeposits.map((slot) => resolveDeposit(slot, wasm));
+    const appIds = resolveSlotApplicationIds(audit, paddedWithdraws, paddedDeposits);
     return {
         stateRoot: publicParams.stateRoot,
         withdrawAddressHi: publicParams.withdrawAddressHi,
         withdrawAddressLo: publicParams.withdrawAddressLo,
-        privKeyScalar: publicParams.privKeyScalar,
-        withdrawnValues: [w0.value, w1.value],
-        withdrawnNullifiers: [w0.nullifier, w1.nullifier],
-        withdrawnSecrets: [w0.secret, w1.secret],
-        withdrawnAssets: [w0.asset, w1.asset],
-        ephemeralKeys: [w0.ephemeralKeys, w1.ephemeralKeys],
-        stateSiblings: [w0.stateSiblings, w1.stateSiblings],
-        stateIndex: [w0.stateIndex, w1.stateIndex],
-        depositedValues: [d0.value, d1.value],
-        depositedNullifiers: [d0.nullifier, d1.nullifier],
-        depositedAssets: [d0.asset, d1.asset],
-        depositedEphemeralKeyScalars: [d0.ephemeralKeyScalar, d1.ephemeralKeyScalar],
-        depositedRecipientPublicKeys: [d0.recipientPublicKeys, d1.recipientPublicKeys],
+        escrowRecipientHi: publicParams.escrowRecipientHi ?? '0',
+        escrowRecipientLo: publicParams.escrowRecipientLo ?? '0',
+        sweepOutputOwnerPubX: publicParams.sweepOutputOwnerPubX ?? '0',
+        sweepOutputOwnerPubY: publicParams.sweepOutputOwnerPubY ?? '0',
+        privKeyScalars: withdraws.map((w) => w.privKeyScalar),
+        ownerPubs: withdraws.map((w) => w.ownerPub),
+        paddingRandoms: withdraws.map((w) => w.paddingRandom),
+        withdrawnValues: withdraws.map((w) => w.value),
+        withdrawnNullifiers: withdraws.map((w) => w.nullifier),
+        withdrawnSecrets: withdraws.map((w) => w.secret),
+        withdrawnAssets: withdraws.map((w) => w.asset),
+        withdrawnEscrowNonces: withdraws.map((w) => w.escrowNonce),
+        inputRecipientStellar: withdraws.map((w) => w.recipientStellar),
+        stateSiblings: withdraws.map((w) => w.stateSiblings),
+        stateIndex: withdraws.map((w) => w.stateIndex),
+        depositedValues: deposits.map((d) => d.value),
+        depositedNullifiers: deposits.map((d) => d.nullifier),
+        depositedAssets: deposits.map((d) => d.asset),
+        depositedEphemeralKeyScalars: deposits.map((d) => d.ephemeralKeyScalar),
+        depositedRecipientPublicKeys: deposits.map((d) => d.recipientPublicKeys),
+        depositedEscrowNonces: deposits.map((d) => d.escrowNonce ?? '0'),
+        outputRecipientStellar: deposits.map((d) => d.recipientStellar ?? ['0', '0']),
         inputApplicationIds: appIds.inputApplicationIds,
         outputApplicationIds: appIds.outputApplicationIds,
-        auditEphemeralScalars: audit.auditEphemeralScalars,
-        noteAuditPublicKeys: audit.noteAuditPublicKeys,
-        publicWithdrawnAssets: publicLegs.publicWithdrawnAssets,
-        publicDepositedAssets: publicLegs.publicDepositedAssets,
-        publicDeposits: publicLegs.publicDeposits,
-        publicWithdrawals: publicLegs.publicWithdrawals,
+        auditEphemeralScalar: audit.auditEphemeralScalar,
+        noteAuditPublicKey: audit.noteAuditPublicKey,
+        publicWithdrawnAssets: paddedLegs.publicWithdrawnAssets,
+        publicDepositedAssets: paddedLegs.publicDepositedAssets,
+        publicDeposits: paddedLegs.publicDeposits,
+        publicWithdrawals: paddedLegs.publicWithdrawals,
     };
 }
 /** `stpl1…` stealth address → `[x, y]` as decimal field strings for `depositedRecipientPublicKeys`. */
@@ -1805,135 +1942,574 @@ function recipientPublicKeysDecimalFromStealthAddress(stealthAddress) {
     const { x, y } = decodeStealthAddress(stealthAddress);
     return [coordHexToDecimal(x), coordHexToDecimal(y)];
 }
-/** First withdraw leg: Merkle witness + depositor ECDH point coordinates (hex). */
-function withdrawObjectFromMerkleWitness(witness, depositorEphemeralHex, applicationId) {
+/** First withdraw leg: Merkle witness + owner public key (hex) and matching scalar. */
+function withdrawObjectFromMerkleWitness(witness, ownerPubHex, applicationId, privKeyScalar) {
     return {
         value: witness.value,
         nullifier: witness.nullifier,
         secret: witness.secret,
         asset: witness.withdrawnAsset,
         applicationId,
-        ephemeralKeys: [
-            coordHexToDecimal(depositorEphemeralHex.x),
-            coordHexToDecimal(depositorEphemeralHex.y),
-        ],
+        ownerPub: [coordHexToDecimal(ownerPubHex.x), coordHexToDecimal(ownerPubHex.y)],
+        privKeyScalar,
+        paddingRandom: randomFrDecimal(),
+        escrowNonce: '0',
+        recipientStellar: ['0', '0'],
         stateSiblings: witness.stateSiblings,
         stateIndex: witness.stateIndex,
     };
 }
 
-function hexToBytes(hex) {
-    const out = new Uint8Array(hex.length / 2);
-    for (let i = 0; i < out.length; i++) {
-        out[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+const FR_SIZE$1 = 32;
+const CIPHERTEXT_BLOB_HEADER_BYTES = 4;
+const FR_MODULUS$1 = 21888242871839275222246405745257275088548364400416034343698204186575808495617n;
+function moduleFr$1(value) {
+    const reduced = value % FR_MODULUS$1;
+    return reduced >= 0n ? reduced : reduced + FR_MODULUS$1;
+}
+function fieldToBytes(value) {
+    let remaining = moduleFr$1(value);
+    const buf = Buffer.alloc(FR_SIZE$1);
+    for (let index = FR_SIZE$1 - 1; index >= 0; index -= 1) {
+        buf[index] = Number(remaining & 0xffn);
+        remaining >>= 8n;
     }
-    return out;
+    return buf;
 }
-function bytesToHexLower(bytes) {
-    let s = '';
-    for (let i = 0; i < bytes.length; i++) {
-        s += bytes[i].toString(16).padStart(2, '0');
+function decimalOrHexToBigint(value) {
+    const trimmed = value.trim();
+    if (/^0x/i.test(trimmed) || /^[0-9a-f]{64}$/i.test(trimmed)) {
+        return BigInt(`0x${trimmed.replace(/^0x/i, '')}`);
     }
-    return s;
+    return BigInt(trimmed);
 }
-/** Base64 → bytes via `atob` (browsers; Node 16+). No Node `Buffer`. */
-function decodeBase64ToBytes(s) {
-    const t = s.replace(/\s/g, '');
-    if (typeof atob !== 'function') {
-        throw new Error('Base64 decoding requires atob (browser or Node 16+)');
+function encodeCiphertextBlob(fields) {
+    const prefix = Buffer.alloc(CIPHERTEXT_BLOB_HEADER_BYTES);
+    prefix.writeUInt32BE(fields.length);
+    return Buffer.concat([
+        prefix,
+        ...fields.map((field) => fieldToBytes(decimalOrHexToBigint(field))),
+    ]);
+}
+function decodeCiphertextBlob(blob) {
+    if (blob.length < CIPHERTEXT_BLOB_HEADER_BYTES) {
+        throw new Error('ciphertext_bytes too short');
     }
-    try {
-        const binary = atob(t);
-        const out = new Uint8Array(binary.length);
-        for (let i = 0; i < binary.length; i++) {
-            out[i] = binary.charCodeAt(i);
-        }
-        return out;
+    const count = blob.readUInt32BE(0);
+    const need = CIPHERTEXT_BLOB_HEADER_BYTES + count * FR_SIZE$1;
+    if (blob.length < need) {
+        throw new Error('ciphertext_bytes truncated');
     }
-    catch {
-        throw new Error('Invalid base64 signature');
+    const fields = [];
+    let offset = CIPHERTEXT_BLOB_HEADER_BYTES;
+    for (let index = 0; index < count; index += 1) {
+        fields.push(blob.subarray(offset, offset + FR_SIZE$1).toString('hex'));
+        offset += FR_SIZE$1;
     }
+    return fields;
 }
-/**
- * Ed25519 signature as **128 hex chars** (optional `0x`) or **base64** (typically 88 chars for 64 bytes, whitespace ignored).
- */
-function parseStellarEd25519SignatureRaw(input) {
-    const trimmed = input.trim();
-    const no0x = trimmed.replace(/^0x/i, '');
-    if (/^[0-9a-fA-F]+$/.test(no0x) && no0x.length === 128) {
-        return hexToBytes(no0x.toLowerCase());
+function encodeTransactionCiphertextBlob(parameters) {
+    const expected = ciphertextFieldCount(parameters.layout);
+    const fields = [];
+    for (const slot of parameters.auditCiphertexts) {
+        fields.push(...slot);
     }
-    const fromB64 = decodeBase64ToBytes(trimmed);
-    if (fromB64.length !== 64) {
-        throw new Error(`Decoded signature must be 64 bytes (Ed25519); got ${fromB64.length} from base64`);
+    for (const note of parameters.outputNoteCiphertexts) {
+        fields.push(...note);
     }
-    return fromB64;
+    if (fields.length !== expected) {
+        throw new Error(`ciphertext blob expected ${String(expected)} fields, got ${String(fields.length)}`);
+    }
+    return encodeCiphertextBlob(fields);
 }
-/** SHA-256 via Web Crypto only (`crypto.subtle`) — works in browsers and Node 19+ (global `crypto`). */
-async function sha256$1(data) {
-    const subtle = globalThis.crypto?.subtle;
-    if (!subtle) {
-        throw new Error('SHA-256 requires crypto.subtle (HTTPS or localhost in browsers, or Node.js 19+).');
+function splitCiphertextBlob(parameters) {
+    const fields = decodeCiphertextBlob(parameters.blob);
+    const expected = ciphertextFieldCount(parameters.layout);
+    if (fields.length !== expected) {
+        throw new Error(`ciphertext blob expected ${String(expected)} fields, got ${String(fields.length)}`);
     }
-    const copy = new Uint8Array(data.length);
-    copy.set(data);
-    return new Uint8Array(await subtle.digest('SHA-256', copy));
+    const { nAuditSlots, noteAuditLen, nOuts, noteOutputLen } = parameters.layout;
+    const auditCiphertexts = [];
+    let offset = 0;
+    for (let slot = 0; slot < nAuditSlots; slot += 1) {
+        auditCiphertexts.push(fields.slice(offset, offset + noteAuditLen));
+        offset += noteAuditLen;
+    }
+    const outputNoteCiphertexts = [];
+    for (let note = 0; note < nOuts; note += 1) {
+        outputNoteCiphertexts.push(fields.slice(offset, offset + noteOutputLen));
+        offset += noteOutputLen;
+    }
+    return { auditCiphertexts, outputNoteCiphertexts };
 }
-/**
- * Stellar Ed25519 signature (hex or base64) → SHA-256(signature bytes) → scalar → WASM ECDH (no UTF-8 seed hash).
- */
-async function stealthAddressFromStellarSignature(ecdhFromScalarHex, encodeStealth, signature) {
-    const raw = parseStellarEd25519SignatureRaw(signature);
-    const scalar = await sha256$1(raw);
-    const scalarHex = bytesToHexLower(scalar);
-    const decoded = ecdhFromScalarHex(scalarHex);
-    return encodeStealth(decoded);
+
+const NOTE_OUTPUT_LEN = 6;
+const NOTE_AUDIT_LEN$1 = 12;
+const STREAM_DOMAIN = 1n;
+const FR_SIZE = 32;
+const FR_MODULUS = 21888242871839275222246405745257275088548364400416034343698204186575808495617n;
+const ONE = 1n;
+const ZERO = 0n;
+const BABYJUB_SCALAR_BITS = 253n;
+const SCALAR_253_MASK = (ONE << BABYJUB_SCALAR_BITS) - ONE;
+let primitivesPromise;
+function primitives() {
+    primitivesPromise ?? (primitivesPromise = Promise.all([
+        buildBabyjub(),
+        buildMimc7(),
+        buildPoseidon(),
+    ]).then(([babyJub, mimc7, poseidon]) => ({ babyJub, mimc7, poseidon })));
+    return primitivesPromise;
 }
-/**
- * SHA-256(signature) as 32-byte BE integer, truncated to **253 bits** (same effective scalar as
- * `libs/cryptography` `scalar_mul_253` / circom `Num2Bits(253)`), decimal for `privKeyScalar`.
- */
-async function privKeyScalarDecimalFromStellarSignature(signature) {
-    const raw = parseStellarEd25519SignatureRaw(signature);
-    const h = await sha256$1(raw);
-    let v = 0n;
-    for (let i = 0; i < h.length; i++) {
-        v = (v << 8n) + BigInt(h[i]);
+function normalizeHex(value) {
+    return value.trim().replace(/^0x/i, '').padStart(FR_SIZE * 2, '0');
+}
+function bigintFromHex(value) {
+    return BigInt(`0x${normalizeHex(value)}`);
+}
+function bigintFromDecimal(value) {
+    const parsed = BigInt(value);
+    return parsed % FR_MODULUS;
+}
+function bigintToFrHex(value) {
+    let v = moduleFr(value);
+    const buf = Buffer.alloc(FR_SIZE);
+    for (let index = FR_SIZE - 1; index >= 0; index -= 1) {
+        buf[index] = Number(v & 0xffn);
+        v >>= 8n;
     }
-    const mask = BN254_BABYJUB_SCALAR_MAX_EXCLUSIVE - 1n;
-    return (v & mask).toString(10);
+    return buf.toString('hex');
+}
+function frDecimalToHex(value) {
+    return bigintToFrHex(bigintFromDecimal(value));
+}
+function frDecimalFromBigint(value) {
+    const reduced = value >= ZERO ? value % FR_MODULUS : (value % FR_MODULUS) + FR_MODULUS;
+    return reduced.toString(10);
+}
+function fieldBigint(field, value) {
+    return BigInt(field.toString(value));
+}
+function moduleFr(value) {
+    const reduced = value % FR_MODULUS;
+    return reduced >= ZERO ? reduced : reduced + FR_MODULUS;
+}
+function mimcHash(parameters) {
+    return fieldBigint(parameters.mimc7.F, parameters.mimc7.hash(parameters.mimc7.F.e(parameters.message), parameters.mimc7.F.e(parameters.key)));
+}
+function poseidonHash(poseidon, inputs) {
+    return fieldBigint(poseidon.F, poseidon(inputs.map((input) => poseidon.F.e(input))));
+}
+function deriveEncCipherKey(poseidon, sharedX) {
+    return poseidonHash(poseidon, [DOM_ENC, sharedX]);
+}
+function sharedKeyFromDepositor(parameters) {
+    const scalarHex = frDecimalToHex(parameters.ephemeralKeyScalarDecimal);
+    const shared = parameters.ecdhShared(scalarHex, frDecimalToHex(parameters.recipientPublicKey[0]), frDecimalToHex(parameters.recipientPublicKey[1]));
+    return [bigintFromHex(shared.x), bigintFromHex(shared.y)];
+}
+function sharedKeyFromRecipient(parameters) {
+    const { babyJub, recipientScalarHex, ephemeralPublicKey } = parameters;
+    const point = [
+        babyJub.F.e(bigintFromHex(ephemeralPublicKey[0])),
+        babyJub.F.e(bigintFromHex(ephemeralPublicKey[1])),
+    ];
+    if (!babyJub.inCurve(point)) {
+        throw new Error('Created ephemeral public key is not on BabyJubJub curve');
+    }
+    const product = babyJub.mulPointEscalar(point, bigintFromHex(recipientScalarHex) & SCALAR_253_MASK);
+    return [
+        fieldBigint(babyJub.F, product[0]),
+        fieldBigint(babyJub.F, product[1]),
+    ];
+}
+function poseidonMacTag(parameters) {
+    return poseidonHash(parameters.poseidon, [
+        parameters.domain,
+        parameters.key,
+        parameters.nonce,
+        ...parameters.message,
+    ]);
+}
+function outputNoteTag(parameters) {
+    return poseidonMacTag({
+        poseidon: parameters.poseidon,
+        domain: DOM_OUTPUT_NOTE_TAG,
+        key: parameters.key,
+        nonce: parameters.nonce,
+        message: parameters.plaintext,
+    });
+}
+function encryptFields(parameters) {
+    return parameters.plaintext.map((field, index) => {
+        const seed = poseidonHash(parameters.poseidon, [
+            parameters.nonce,
+            STREAM_DOMAIN,
+            BigInt(index),
+        ]);
+        const stream = mimcHash({
+            mimc7: parameters.mimc7,
+            message: seed,
+            key: parameters.key,
+        });
+        return moduleFr(field + stream);
+    });
+}
+function decryptFields(parameters) {
+    return parameters.ciphertext.map((field, index) => {
+        const seed = poseidonHash(parameters.poseidon, [
+            parameters.nonce,
+            STREAM_DOMAIN,
+            BigInt(index),
+        ]);
+        const stream = mimcHash({
+            mimc7: parameters.mimc7,
+            message: seed,
+            key: parameters.key,
+        });
+        return moduleFr(bigintFromHex(field) - stream);
+    });
+}
+function plaintextBigints(plaintext) {
+    return [
+        bigintFromDecimal(plaintext.value),
+        bigintFromDecimal(plaintext.assetHi),
+        bigintFromDecimal(plaintext.assetLo),
+        bigintFromDecimal(plaintext.nullifier),
+        bigintFromDecimal(plaintext.secret),
+        bigintFromDecimal(plaintext.applicationId),
+    ];
+}
+function plaintextFromBigints(fields) {
+    return {
+        value: frDecimalFromBigint(fields[0] ?? ZERO),
+        assetHi: frDecimalFromBigint(fields[1] ?? ZERO),
+        assetLo: frDecimalFromBigint(fields[2] ?? ZERO),
+        nullifier: frDecimalFromBigint(fields[3] ?? ZERO),
+        secret: frDecimalFromBigint(fields[4] ?? ZERO),
+        applicationId: frDecimalFromBigint(fields[5] ?? ZERO),
+    };
+}
+async function secretFromDepositEphemeralScalarDecimal(ephemeralKeyScalarDecimal) {
+    const { poseidon } = await primitives();
+    const secret = poseidonHash(poseidon, [bigintFromDecimal(ephemeralKeyScalarDecimal)]);
+    return frDecimalFromBigint(secret);
+}
+async function encryptOutputNoteForDeposit(parameters) {
+    const { babyJub, mimc7, poseidon } = await primitives();
+    const secret = await secretFromDepositEphemeralScalarDecimal(parameters.deposit.ephemeralKeyScalar);
+    const plaintext = {
+        value: parameters.deposit.value,
+        assetHi: parameters.deposit.asset[0],
+        assetLo: parameters.deposit.asset[1],
+        nullifier: parameters.deposit.nullifier,
+        secret,
+        applicationId: parameters.deposit.applicationId,
+    };
+    const [sharedX, sharedY] = sharedKeyFromDepositor({
+        babyJub,
+        ecdhShared: parameters.ecdhShared,
+        ephemeralKeyScalarDecimal: parameters.deposit.ephemeralKeyScalar,
+        recipientPublicKey: parameters.deposit.recipientPublicKeys,
+    });
+    const key = deriveEncCipherKey(poseidon, sharedX);
+    const nonce = sharedY;
+    const message = plaintextBigints(plaintext);
+    const ciphertext = encryptFields({ mimc7, poseidon, key, nonce, plaintext: message });
+    const tag = outputNoteTag({ poseidon, key, nonce, plaintext: message });
+    return {
+        ciphertext: ciphertext.map((field) => frDecimalFromBigint(field)),
+        tag: frDecimalFromBigint(tag),
+    };
+}
+function ownerPubFromRecipientScalar(babyJub, recipientScalarHex) {
+    const product = babyJub.mulPointEscalar(babyJub.Base8, bigintFromHex(recipientScalarHex) & SCALAR_253_MASK);
+    return [
+        fieldBigint(babyJub.F, product[0]),
+        fieldBigint(babyJub.F, product[1]),
+    ];
+}
+function commitmentFromPlaintextAndOwnerPub(parameters) {
+    const commitment = poseidonHash(parameters.poseidon, [
+        bigintFromDecimal(parameters.plaintext.value),
+        bigintFromDecimal(parameters.plaintext.secret),
+        bigintFromDecimal(parameters.plaintext.nullifier),
+        parameters.ownerPub[0],
+        parameters.ownerPub[1],
+        parameters.ownerMode,
+        bigintFromDecimal(parameters.plaintext.assetHi),
+        bigintFromDecimal(parameters.plaintext.assetLo),
+        bigintFromDecimal(parameters.plaintext.applicationId),
+    ]);
+    return normalizeHex(commitment.toString(16));
+}
+async function decryptOutputNoteEvent(input) {
+    const { babyJub, mimc7, poseidon } = await primitives();
+    const [sharedX, sharedY] = sharedKeyFromRecipient({
+        babyJub,
+        recipientScalarHex: input.recipientScalarHex,
+        ephemeralPublicKey: input.createdEphemeralKey,
+    });
+    const key = deriveEncCipherKey(poseidon, sharedX);
+    const nonce = sharedY;
+    const decrypted = decryptFields({
+        mimc7,
+        poseidon,
+        key,
+        nonce,
+        ciphertext: input.ciphertext,
+    });
+    const expectedTag = outputNoteTag({
+        poseidon,
+        key,
+        nonce,
+        plaintext: decrypted,
+    });
+    if (expectedTag !== bigintFromHex(input.tag)) {
+        throw new Error('Output note tag verification failed');
+    }
+    const plaintext = plaintextFromBigints(decrypted);
+    const commitmentHex = commitmentFromPlaintextAndOwnerPub({
+        poseidon,
+        plaintext,
+        ownerPub: ownerPubFromRecipientScalar(babyJub, input.recipientScalarHex),
+        ownerMode: input.ownerMode ?? 0n,
+    });
+    const commitmentMatches = normalizeHex(input.commitmentHashHex) === commitmentHex;
+    if (!commitmentMatches) {
+        throw new Error('Output note commitment checksum mismatch');
+    }
+    return {
+        ...plaintext,
+        commitmentHex,
+        commitmentMatches,
+    };
+}
+function ownerModeFromEscrowNonce(escrowNonce) {
+    return bigintFromDecimal(escrowNonce) === ZERO ? ZERO : ONE;
+}
+function emptyFlagFromValue(value) {
+    return bigintFromDecimal(value) === ZERO ? ONE : ZERO;
+}
+function precommitmentFromOpening(parameters) {
+    const ownerKeyHash = poseidonHash(parameters.poseidon, [
+        parameters.ownerPub[0],
+        parameters.ownerPub[1],
+    ]);
+    return poseidonHash(parameters.poseidon, [
+        parameters.secret,
+        parameters.ownerMode,
+        ownerKeyHash,
+    ]);
+}
+async function encryptNoteAuditSlot(parameters) {
+    if (parameters.plaintext.length !== NOTE_AUDIT_LEN$1) {
+        throw new Error(`encryptNoteAuditSlot: expected ${String(NOTE_AUDIT_LEN$1)} limbs`);
+    }
+    const { babyJub, mimc7, poseidon } = await primitives();
+    const [sharedX, sharedY] = sharedKeyFromDepositor({
+        babyJub,
+        ecdhShared: parameters.ecdhShared,
+        ephemeralKeyScalarDecimal: parameters.auditEphemeralScalar,
+        recipientPublicKey: parameters.auditPublicKey,
+    });
+    const key = deriveEncCipherKey(poseidon, sharedX);
+    const nonce = sharedY;
+    const message = parameters.plaintext.map((field) => bigintFromDecimal(field));
+    const ciphertext = encryptFields({ mimc7, poseidon, key, nonce, plaintext: message });
+    const tag = poseidonMacTag({
+        poseidon,
+        domain: DOM_AUDIT_TAG,
+        key,
+        nonce,
+        message,
+    });
+    return {
+        ciphertext: ciphertext.map((field) => frDecimalFromBigint(field)),
+        tag: frDecimalFromBigint(tag),
+    };
+}
+function auditPlaintextForWithdraw(parameters) {
+    const value = parameters.witness.withdrawnValues[parameters.index] ?? '0';
+    const ownerPub = parameters.witness.ownerPubs[parameters.index] ?? ['0', '0'];
+    const escrowNonce = parameters.witness.withdrawnEscrowNonces[parameters.index] ?? '0';
+    const secret = bigintFromDecimal(parameters.witness.withdrawnSecrets[parameters.index] ?? '0');
+    const ownerMode = ownerModeFromEscrowNonce(escrowNonce);
+    const precommitment = precommitmentFromOpening({
+        poseidon: parameters.poseidon,
+        secret,
+        ownerMode,
+        ownerPub: [bigintFromDecimal(ownerPub[0]), bigintFromDecimal(ownerPub[1])],
+    });
+    const asset = parameters.witness.withdrawnAssets[parameters.index] ?? ['0', '0'];
+    const stellar = parameters.witness.inputRecipientStellar[parameters.index] ?? ['0', '0'];
+    return [
+        frDecimalFromBigint(emptyFlagFromValue(value)),
+        value,
+        asset[0],
+        asset[1],
+        frDecimalFromBigint(precommitment),
+        parameters.witness.withdrawnNullifiers[parameters.index] ?? '0',
+        ownerPub[0],
+        ownerPub[1],
+        parameters.witness.inputApplicationIds[parameters.index] ?? '0',
+        stellar[0],
+        stellar[1],
+        escrowNonce,
+    ];
+}
+async function auditPlaintextForDeposit(parameters) {
+    const value = parameters.witness.depositedValues[parameters.index] ?? '0';
+    const ownerPub = parameters.witness.depositedRecipientPublicKeys[parameters.index] ?? ['0', '0'];
+    const escrowNonce = parameters.witness.depositedEscrowNonces[parameters.index] ?? '0';
+    const secret = poseidonHash(parameters.poseidon, [
+        bigintFromDecimal(parameters.witness.depositedEphemeralKeyScalars[parameters.index] ?? '0'),
+    ]);
+    const ownerMode = ownerModeFromEscrowNonce(escrowNonce);
+    const precommitment = precommitmentFromOpening({
+        poseidon: parameters.poseidon,
+        secret,
+        ownerMode,
+        ownerPub: [bigintFromDecimal(ownerPub[0]), bigintFromDecimal(ownerPub[1])],
+    });
+    const asset = parameters.witness.depositedAssets[parameters.index] ?? ['0', '0'];
+    const stellar = parameters.witness.outputRecipientStellar[parameters.index] ?? ['0', '0'];
+    return [
+        frDecimalFromBigint(emptyFlagFromValue(value)),
+        value,
+        asset[0],
+        asset[1],
+        frDecimalFromBigint(precommitment),
+        parameters.witness.depositedNullifiers[parameters.index] ?? '0',
+        ownerPub[0],
+        ownerPub[1],
+        parameters.witness.outputApplicationIds[parameters.index] ?? '0',
+        stellar[0],
+        stellar[1],
+        escrowNonce,
+    ];
+}
+async function encryptTransactionCiphertextBlob(parameters) {
+    const { poseidon } = await primitives();
+    const nIns = parameters.witness.withdrawnValues.length;
+    const nOuts = parameters.witness.depositedValues.length;
+    const nAuditSlots = parameters.layout.nAuditSlots;
+    const auditCiphertexts = [];
+    for (let slot = 0; slot < nAuditSlots; slot += 1) {
+        const plaintext = slot < nIns
+            ? auditPlaintextForWithdraw({
+                poseidon,
+                witness: parameters.witness,
+                index: slot,
+            })
+            : await auditPlaintextForDeposit({
+                poseidon,
+                witness: parameters.witness,
+                index: slot - nIns,
+            });
+        const encrypted = await encryptNoteAuditSlot({
+            auditPublicKey: parameters.witness.noteAuditPublicKey,
+            auditEphemeralScalar: parameters.witness.auditEphemeralScalar,
+            plaintext,
+            ecdhShared: parameters.ecdhShared,
+        });
+        auditCiphertexts.push(encrypted.ciphertext);
+    }
+    const outputNoteCiphertexts = [];
+    for (let index = 0; index < nOuts; index += 1) {
+        const deposit = {
+            value: parameters.witness.depositedValues[index] ?? '0',
+            nullifier: parameters.witness.depositedNullifiers[index] ?? '0',
+            ephemeralKeyScalar: parameters.witness.depositedEphemeralKeyScalars[index] ?? '0',
+            asset: parameters.witness.depositedAssets[index] ?? ['0', '0'],
+            applicationId: parameters.witness.outputApplicationIds[index] ?? '0',
+            recipientPublicKeys: parameters.witness.depositedRecipientPublicKeys[index] ?? ['0', '0'],
+        };
+        const encrypted = await encryptOutputNoteForDeposit({
+            deposit,
+            ecdhShared: parameters.ecdhShared,
+        });
+        outputNoteCiphertexts.push([...encrypted.ciphertext]);
+    }
+    const blob = encodeTransactionCiphertextBlob({
+        layout: parameters.layout,
+        auditCiphertexts,
+        outputNoteCiphertexts,
+    });
+    return {
+        ciphertextHex: blob.toString('hex'),
+        auditCiphertexts,
+        outputNoteCiphertexts,
+    };
 }
 
-/** Stroops amount as WASM `u64` (`bigint`). */
-function wasmU64Stroops(amount) {
-    const b = typeof amount === 'bigint' ? amount : BigInt(amount);
-    if (b < 0n || b > 0xffffffffffffffffn) {
-        throw new RangeError('amount must be a non-negative u64 (stroops)');
+/** Stroops amount as a decimal field string. Reject JS `number` so 18-decimal values cannot silently narrow. */
+function coinValueDecimal(amount) {
+    if (typeof amount === "number") {
+        throw new TypeError("coin value must be bigint or decimal string, not number");
+    }
+    if (typeof amount === "bigint") {
+        if (amount < 0n) {
+            throw new RangeError("amount must be a non-negative integer");
+        }
+        return amount.toString(10);
+    }
+    if (typeof amount !== "string") {
+        throw new TypeError("coin value must be bigint or decimal string, not number");
+    }
+    const trimmed = amount.trim();
+    if (!/^[0-9]+$/.test(trimmed)) {
+        throw new TypeError("coin value decimal string must be a non-negative integer");
     }
-    return b;
+    return trimmed;
+}
+function generatedCoinFromWasm(value) {
+    const raw = value;
+    const precommitementHex = raw.precommitementHex ?? raw.precommitement_hex;
+    if (!precommitementHex) {
+        throw new Error("generated coin missing precommitement hex");
+    }
+    return {
+        coin: raw.coin,
+        commitment_hex: raw.commitment_hex,
+        precommitement_hex: precommitementHex,
+        precommitementHex,
+    };
 }
 class PrivacyPoolSDK {
-    constructor(wasm, options) {
+    constructor(wasm, options, resolved) {
         this.wasm = wasm;
         this.options = options;
+        this.zkConfigNonce = resolved.nonce;
+        this.circuitConfig = resolved.config;
+        this.layout = layoutFromCircuitConfig(resolved.config);
+    }
+    getZkConfigNonce() {
+        return this.zkConfigNonce;
+    }
+    getLayout() {
+        return this.layout;
     }
     /**
      * Initialize the SDK by loading WASM modules.
      *
-     * In Node.js, assets are loaded from the filesystem automatically.
-     * In browser, pass pre-loaded buffers via options:
+     * In Node.js, proving artifacts load from `zkArtifactBaseUrl` or
+     * `ZK_ARTIFACT_BASE_URL`, defaulting to this package's GitHub release.
+     * In browser, pass pre-loaded WASM via options:
      * ```ts
      * const sdk = await PrivacyPoolSDK.init({
      *   wasmBinary: await fetch('/pkg/client_sdk_wasm_bg.wasm').then(r => r.arrayBuffer()),
-     *   circuitWasm: await fetch('/assets/main.wasm').then(r => r.arrayBuffer()),
-     *   zkey: await fetch('/assets/main_final.zkey').then(r => r.arrayBuffer()),
+     *   zkArtifactBaseUrl: 'https://github.com/Polynom-Labs/stellar-privacy-layer-contracts/releases/download/v0.8.0',
      * });
      * ```
      */
     static async init(options) {
         const opts = options ?? {};
         const wasm = await loadWasm(opts.wasmBinary);
-        return new PrivacyPoolSDK(wasm, opts);
+        const resolved = resolveZkCircuitConfig(opts.zkCircuits, opts.zkConfigNonce);
+        const sdk = new PrivacyPoolSDK(wasm, opts, resolved);
+        sdk.circuitArtifacts = await resolveCircuitArtifacts(resolved.config, opts.zkArtifactBaseUrl);
+        return sdk;
     }
     /**
      * Uniform 32-byte scalar as lowercase hex (Web Crypto). Same in browser and Node 19+.
@@ -1942,39 +2518,40 @@ class PrivacyPoolSDK {
         return generateRandomScalarHex32();
     }
     /**
-     * Text to sign with a Stellar wallet for stealth derivation (UTF-8). No WASM required.
+     * Text to sign with a Stellar wallet for spend-key derivation (UTF-8). No WASM required.
+     * The message binds network, pool, registry, and schema version (H6).
      */
-    static buildStealthAddressSignMessage(address, nonce = DEFAULT_STEALTH_SIGN_NONCE) {
-        return buildStealthAddressSignMessage(address, nonce);
+    static buildStealthAddressSignMessage(address, domain, nonce = DEFAULT_STEALTH_SIGN_NONCE) {
+        return buildStealthAddressSignMessage(address, domain, nonce);
     }
     /**
-     * Generate a new coin with random nullifier, secret, and random shared-secret field elements (dev / self-contained tests).
-     * @param amount Stroops encoded as `bigint` or integer `number` (WASM `u64`).
+     * Generate a new coin with random nullifier, secret, and random owner-pub field elements (dev / self-contained tests).
+     * @param amount Decimal field element as `bigint` or decimal `string` (never JS `number`).
      * @param assetHiDecimal / assetLoDecimal Decimal Fr strings for Stellar asset contract id (two limbs).
      */
-    generateCoin(amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = '0') {
-        return this.wasm.generateCoin(wasmU64Stroops(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal);
+    generateCoin(amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = "0") {
+        return generatedCoinFromWasm(this.wasm.generateCoin(coinValueDecimal(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal));
     }
     /**
-     * Generate a coin with the same commitment shape as on-chain deposit: pass `ecdhSharedKey` output (hex x, y).
-     * @param amount Stroops (`bigint` | `number`).
+     * Generate a coin with the same commitment shape as on-chain deposit: pass owner public key (hex x, y).
+     * @param amount Decimal field element (`bigint` | `string`).
      */
-    generateCoinWithSharedSecret(shared, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = '0') {
-        return this.wasm.generateCoinWithSharedSecretHex(shared.x, shared.y, wasmU64Stroops(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal);
+    generateCoinWithOwnerPub(ownerPub, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = "0") {
+        return generatedCoinFromWasm(this.wasm.generateCoinWithOwnerPubHex(ownerPub.x, ownerPub.y, coinValueDecimal(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal));
     }
     /**
      * Coin for a depositor `ephemeralKeyScalar` (32-byte hex): `coin.secret = Poseidon255(1)(scalar)` as in `deposit.circom`.
-     * @param amount Stroops (`bigint` | `number`).
+     * @param amount Decimal field element (`bigint` | `string`).
      */
-    generateCoinFromDepositEphemeralScalarHex(scalarHex, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = '0') {
-        return this.wasm.generateCoinFromDepositEphemeralScalarHex(scalarHex, wasmU64Stroops(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal);
+    generateCoinFromDepositEphemeralScalarHex(scalarHex, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = "0") {
+        return generatedCoinFromWasm(this.wasm.generateCoinFromDepositEphemeralScalarHex(scalarHex, coinValueDecimal(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal));
     }
     /**
-     * Aligned deposit coin: `secret = Poseidon₁(scalar)` and ECDH shared key from hex coords (e.g. `ecdhSharedKey(scalar, recipient_x, recipient_y)`).
-     * @param amount Stroops (`bigint` | `number`).
+     * Aligned deposit coin: `secret = Poseidon₁(scalar)` and owner pub from recipient hex coords.
+     * @param amount Decimal field element (`bigint` | `string`).
      */
-    generateCoinForDepositWithSharedHex(scalarHex, sharedXHex, sharedYHex, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = '0') {
-        return this.wasm.generateCoinForDepositWithSharedHex(scalarHex, sharedXHex, sharedYHex, wasmU64Stroops(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal);
+    generateCoinForDepositWithOwnerPubHex(scalarHex, ownerXHex, ownerYHex, amount, assetHiDecimal, assetLoDecimal, applicationIdDecimal = "0") {
+        return generatedCoinFromWasm(this.wasm.generateCoinForDepositWithOwnerPubHex(scalarHex, ownerXHex, ownerYHex, coinValueDecimal(amount), assetHiDecimal, assetLoDecimal, applicationIdDecimal));
     }
     /**
      * Merkle root, path, and coin fields for the first withdraw leg (Rust LeanIMT + Poseidon).
@@ -1993,20 +2570,18 @@ class PrivacyPoolSDK {
      */
     async proveWithdrawal(coin, state, params) {
         const witness = this.buildWithdrawMerkleWitness(coin, state);
-        const w0 = withdrawObjectFromMerkleWitness(witness, {
-            x: params.ephemeralXHex,
-            y: params.ephemeralYHex,
-        }, params.applicationId ?? coin.application_id ?? '0');
+        const ownerPubHex = this.ecdhEphemeralPublicKeyFromScalarHex(BigInt(params.privKeyScalar).toString(16).padStart(64, "0"));
+        const w0 = withdrawObjectFromMerkleWitness(witness, ownerPubHex, params.applicationId ?? coin.application_id ?? "0", params.privKeyScalar);
         const fullV = BigInt(coin.value);
         let publicWithdrawals;
         let deposits;
         if (params.publicWithdrawStroops !== undefined) {
             const W = params.publicWithdrawStroops;
             if (params.changeRecipientStealthAddress === undefined) {
-                throw new Error('proveWithdrawal: changeRecipientStealthAddress is required when publicWithdrawStroops is set');
+                throw new Error("proveWithdrawal: changeRecipientStealthAddress is required when publicWithdrawStroops is set");
             }
             if (W <= 0n || W >= fullV) {
-                throw new Error('proveWithdrawal: publicWithdrawStroops must be strictly between 0 and coin.value');
+                throw new Error("proveWithdrawal: publicWithdrawStroops must be strictly between 0 and coin.value");
             }
             const change = fullV - W;
             publicWithdrawals = [W.toString()];
@@ -2015,29 +2590,29 @@ class PrivacyPoolSDK {
                 nullifier: randomFrDecimal(),
                 ephemeralKeyScalar: randomFrDecimal253(),
                 asset: [coin.asset_hi, coin.asset_lo],
-                applicationId: params.applicationId ?? '0',
+                applicationId: params.applicationId ?? "0",
                 recipientPublicKeys: recipientPublicKeysDecimalFromStealthAddress(params.changeRecipientStealthAddress),
             };
-            deposits = [changeDeposit, 'dummy'];
+            deposits = [changeDeposit];
         }
         else {
             publicWithdrawals = [coin.value];
-            deposits = ['dummy', 'dummy'];
+            deposits = [];
         }
         // On-chain `transact` sends `publicWithdrawals` / `publicWithdrawnAssets` to the withdraw account.
         const publicLegs = {
             publicWithdrawnAssets: [[coin.asset_hi, coin.asset_lo]],
-            publicDepositedAssets: [['0', '0']],
-            publicDeposits: ['0'],
+            publicDepositedAssets: [["0", "0"]],
+            publicDeposits: ["0"],
             publicWithdrawals,
         };
-        return this.proveTransaction({
+        return this.proveTransactionSlots({
             stateRoot: witness.stateRoot,
             withdrawAddressHi: params.withdrawAddressHi,
             withdrawAddressLo: params.withdrawAddressLo,
             privKeyScalar: params.privKeyScalar,
-        }, publicLegs, [w0, 'dummy'], deposits, params.audit
-            ?? resolveTransactionAuditParams(params.applicationId ?? coin.application_id ?? DEFAULT_APPLICATION_ID, DEMO_AUDIT_PUBLIC_KEY));
+        }, publicLegs, [w0], deposits, params.audit ??
+            resolveTransactionAuditParams(params.applicationId ?? coin.application_id ?? DEFAULT_APPLICATION_ID, DEMO_AUDIT_PUBLIC_KEY, this.layout.nAuditSlots));
     }
     /**
      * Convert a snarkjs proof JSON to hex bytes for Soroban.
@@ -2062,39 +2637,50 @@ class PrivacyPoolSDK {
         return this.wasm.ecdhSharedKey(scalarHex, recipientPubXHex, recipientPubYHex);
     }
     /**
-     * `Transaction(20,2,2)` proof from high-level legs: maps to witness input (incl. `"dummy"` ECDH via WASM), then Groth16 → Soroban hex.
-     *
-     * @param publicParams Public inputs: `stateRoot`, `withdrawAddressHi` / `withdrawAddressLo`, `privKeyScalar` (decimal field strings).
-     * @param publicLegs Public token legs (`publicWithdrawnAssets`, `publicDepositedAssets`, `publicDeposits`, `publicWithdrawals`).
-     * @param withdraws Exactly two withdraw slots (`WithdrawObject` or `"dummy"`).
-     * @param deposits Exactly two deposit slots (`DepositObject` or `"dummy"`).
+     * `Transaction(20,nIns,nOuts)` proof from high-level legs: maps to witness input (incl. `"dummy"` ECDH via WASM), then Groth16 → Soroban hex.
+     * Slots are padded to the selected ZK config layout (bundled 2×2 or 6×6).
      */
     async proveTransaction(publicParams, publicLegs, withdraws, deposits, audit) {
+        return this.proveTransactionSlots(publicParams, publicLegs, withdraws, deposits, audit);
+    }
+    async proveTransactionSlots(publicParams, publicLegs, withdraws, deposits, audit) {
         const wasmEcdh = {
             ecdhEphemeralPublicKeyFromScalarHex: (h) => this.wasm.ecdhEphemeralPublicKeyFromScalarHex(h),
         };
-        const witnessInput = buildTransactionWitnessInput(publicParams, publicLegs, withdraws, deposits, audit, wasmEcdh);
-        const wtns = await generateWitness(witnessInput, this.options.circuitWasm);
-        const { proof, publicSignals } = await generateProof(wtns, this.options.zkey);
+        const { nIns, nOuts, publicNInputs, publicNOutputs } = this.layout;
+        const witnessInput = buildTransactionWitnessInput(publicParams, publicLegs, withdraws, deposits, audit, wasmEcdh, { nIns, nOuts, publicNInputs, publicNOutputs });
+        const artifacts = this.circuitArtifacts;
+        if (!artifacts) {
+            throw new Error("PrivacyPoolSDK circuit artifacts are not loaded");
+        }
+        const proved = this.wasm.proveGroth16(artifacts.graph, artifacts.provingKey, artifacts.r1cs, JSON.stringify(witnessInput));
+        const encrypted = await encryptTransactionCiphertextBlob({
+            witness: witnessInput,
+            layout: this.layout,
+            ecdhShared: (priv, pubX, pubY) => this.wasm.ecdhSharedKey(priv, pubX, pubY),
+        });
         return {
-            proof_hex: this.proofToHex(proof),
-            public_hex: this.publicToHex(publicSignals),
+            proof_hex: proved.proof_hex,
+            public_hex: proved.public_hex,
+            ciphertext_hex: encrypted.ciphertextHex,
+            output_note_ephemeral_scalars: witnessInput.depositedEphemeralKeyScalars,
         };
     }
     /**
-     * Calculate nullifier hash: Poseidon(nullifier)
+     * Calculate owner-bound nullifier hash: Poseidon(DOM_NULLIFIER, nullifier, privKeyScalar)
      * @param nullifier Nullifier decimal string from coin data
+     * @param privKeyScalar Spend scalar decimal string
      * @returns Hex string (0x...) of the hash bytes
      */
-    calculateNullifierHash(nullifier) {
-        return this.wasm.calculateNullifierHash(nullifier);
+    calculateNullifierHash(nullifier, privKeyScalar) {
+        return this.wasm.calculateNullifierHash(nullifier, privKeyScalar);
     }
     /**
      * Ed25519 signature from signing {@link buildStealthAddressSignMessage}: **128 hex chars** (optional `0x`)
-     * or **base64** (64 raw bytes after decode). `SHA-256(signature bytes)` → scalar → ECDH → `stpl1` Bech32.
+     * or **base64** (64 raw bytes after decode). Domain-separated SHA-256 → scalar → ECDH → `stpl1` Bech32.
      */
-    async generateStealthAddressFromStellarSignature(signature) {
-        return stealthAddressFromStellarSignature((h) => this.wasm.ecdhEphemeralPublicKeyFromScalarHex(h), encodeStealthAddress, signature);
+    async generateStealthAddressFromStellarSignature(signature, domain) {
+        return stealthAddressFromStellarSignature((h) => this.wasm.ecdhEphemeralPublicKeyFromScalarHex(h), encodeStealthAddress, signature, domain);
     }
     encodeDecodedEphemeralKey(decoded) {
         return encodeDecodedEphemeralKey(decoded);
@@ -2116,11 +2702,30 @@ class PrivacyPoolSDK {
     }
 }
 
+/** @deprecated Witness generation is in the main SDK WASM (`proveGroth16`). */
+async function generateWitness(_input, _circuitWasm, _wasmFileName) {
+    throw new Error('generateWitness is removed. Call PrivacyPoolSDK.proveTransaction (graph witness + Groth16 in sdk.wasm).');
+}
+
 /** Pool Merkle tree depth (matches `coin::TREE_DEPTH` / `Transaction` circuit). */
 const POOL_MERKLE_TREE_DEPTH = 20;
 /** Default coin value in stroops (1 XLM); matches Rust `coin::COIN_VALUE`. */
 const COIN_VALUE_STROOPS = 1000000000;
 
+// Split a JS number into u32 halves without a BigInt allocation. Exact only for integers
+// `0 <= n < 2**53`; callers use it on byte / bit counters, which JS length math caps far below
+// that (an ArrayBuffer cannot exceed 2**53 - 1 bytes).
+const fromNumH = (n) => (n / 2 ** 32) | 0;
+const fromNumL = (n) => n >>> 0;
+// Drop-in replacement for `view.setBigUint64(byteOffset, BigInt(n), isLE)` without the per-call
+// BigInt allocation. Same `n < 2**53` precondition as `fromNumH`/`fromNumL`.
+function setU64FromNum(view, byteOffset, n, isLE) {
+    const h = fromNumH(n);
+    const l = fromNumL(n);
+    view.setUint32(byteOffset, isLE ? l : h, isLE);
+    view.setUint32(byteOffset + 4, isLE ? h : l, isLE);
+}
+
 /**
  * Checks if something is Uint8Array. Be careful: nodejs Buffer will return true.
  * @param a - value to test
@@ -2142,6 +2747,9 @@ function isBytes(a) {
             'BYTES_PER_ELEMENT' in a &&
             a.BYTES_PER_ELEMENT === 1));
 }
+// Shared error-message prefix builder. Only called on throw paths, so assert
+// success paths never pay for the string concatenation.
+const atitle = (title) => (title ? `"${title}" ` : '');
 /**
  * Asserts something is Uint8Array.
  * @param value - value to validate
@@ -2157,20 +2765,32 @@ function isBytes(a) {
  * ```
  */
 function abytes(value, length, title = '') {
+    // Success path first: this runs at the start of every update() / digestInto(), and the
+    // common `abytes(data)` form must not pay for length handling it does not use.
+    if (isBytes(value) && (length === undefined))
+        return value;
     const bytes = isBytes(value);
-    const len = value?.length;
-    const needsLen = length !== undefined;
-    if (!bytes || (needsLen)) {
-        const prefix = title && `"${title}" `;
-        const ofLen = '';
-        const got = bytes ? `length=${len}` : `type=${typeof value}`;
-        const message = prefix + 'expected Uint8Array' + ofLen + ', got ' + got;
-        if (!bytes)
-            throw new TypeError(message);
-        throw new RangeError(message);
-    }
-    return value;
-}
+    const ofLen = '';
+    const got = bytes ? `length=${value.length}` : `type=${typeof value}`;
+    const message = atitle(title) + 'expected Uint8Array' + ofLen + ', got ' + got;
+    if (!bytes)
+        throw new TypeError(message);
+    throw new RangeError(message);
+}
+const aobject = (value, label) => {
+    if (value === null || typeof value !== 'object' || Array.isArray(value))
+        throw new TypeError((label === 'object' ? '' : `"${label}" `) + 'expected object, got type=' + typeof value);
+};
+const aopts = (value, label) => {
+    aobject(value, label);
+    const proto = Object.getPrototypeOf(value);
+    if (proto !== Object.prototype && proto !== null)
+        throw new TypeError(`"${label}" expected plain object`);
+    // Object.assign() treats an own "__proto__" source key as a write to the target's legacy
+    // prototype setter. Reject it before merging so inherited option values cannot be injected.
+    if (Object.hasOwn(value, '__proto__'))
+        throw new TypeError(`"${label}.__proto__" is not allowed`);
+};
 /**
  * Asserts a hash instance has not been destroyed or finished.
  * @param instance - hash instance to validate
@@ -2186,10 +2806,12 @@ function abytes(value, length, title = '') {
  * ```
  */
 function aexists(instance, checkFinished = true) {
+    // Runs on every update()/digestInto(); the flags are library-owned booleans, so only their
+    // truthiness is checked - re-validating their type per call was pure hot-path overhead.
     if (instance.destroyed)
-        throw new Error('Hash instance has been destroyed');
+        throw new Error('hash was destroyed');
     if (checkFinished && instance.finished)
-        throw new Error('Hash#digest() has already been called');
+        throw new Error('digest() was already called');
 }
 /**
  * Asserts output is a sufficiently-sized byte array.
@@ -2208,10 +2830,12 @@ function aexists(instance, checkFinished = true) {
  * ```
  */
 function aoutput(out, instance) {
-    abytes(out, undefined, 'digestInto() output');
+    abytes(out, undefined, 'output');
+    // `outputLen` is a library-owned readonly number; the negated comparison keeps failing fast
+    // when it is missing/NaN (comparisons with undefined/NaN are false) without an anumber() call.
     const min = instance.outputLen;
-    if (out.length < min) {
-        throw new RangeError('"digestInto() output" expected to be of length >=' + min);
+    if (!(out.length >= min)) {
+        throw new RangeError('"output" expected length >= ' + min);
     }
 }
 /**
@@ -2286,6 +2910,28 @@ function bytesToHex(bytes) {
     }
     return hex;
 }
+/**
+ * Merges default options and passed options.
+ * @param defaults - base option object
+ * @param opts - user overrides
+ * @param title - label included in thrown override errors
+ * @returns Fresh merged option object with a null prototype.
+ * @throws On wrong argument types. {@link TypeError}
+ * @example
+ * Merge user overrides onto default options.
+ * ```ts
+ * checkOpts({ dkLen: 32 }, { asyncTick: 10 });
+ * ```
+ */
+function checkOpts(defaults, opts, title = 'opts') {
+    aopts(defaults, 'defaults');
+    if (opts !== undefined)
+        aopts(opts, title);
+    // Callers read optional fields directly, so omitted values must not fall through to ambient
+    // Object.prototype pollution (for example a forged `dkLen` changing SHAKE's default output).
+    const merged = Object.assign(Object.create(null), defaults, opts);
+    return merged;
+}
 /**
  * Creates a callable hash function from a stateful class constructor.
  * @param hashCons - hash constructor or factory
@@ -2294,6 +2940,7 @@ function bytesToHex(bytes) {
  *   Wrapper construction eagerly calls `hashCons(undefined)` once to read
  *   `outputLen` / `blockLen`, so constructor side effects happen at module
  *   init time.
+ * @throws On wrong argument types. {@link TypeError}
  * @example
  * Wrap a stateful hash constructor into a callable helper.
  * ```ts
@@ -2304,6 +2951,9 @@ function bytesToHex(bytes) {
  * ```
  */
 function createHasher(hashCons, info = {}) {
+    if (typeof hashCons !== 'function')
+        throw new TypeError('"hashCons" expected function, got type=' + typeof hashCons);
+    info = checkOpts({}, info, 'info');
     const hashC = (msg, opts) => hashCons(opts)
         .update(msg)
         .digest();
@@ -2415,6 +3065,7 @@ class HashMD {
         abytes(data);
         const { view, buffer, blockLen } = this;
         const len = data.length;
+        let processed = false;
         for (let pos = 0; pos < len;) {
             const take = Math.min(blockLen - this.pos, len - pos);
             // Fast path only when there is no buffered partial block: `take === blockLen` implies
@@ -2423,18 +3074,25 @@ class HashMD {
                 const dataView = createView(data);
                 for (; blockLen <= len - pos; pos += blockLen)
                     this.process(dataView, pos);
+                processed = true;
                 continue;
             }
-            buffer.set(data.subarray(pos, pos + take), this.pos);
+            // When the whole input is buffered in one go (common for short messages), passing `data`
+            // directly avoids allocating a subarray view.
+            buffer.set(pos === 0 && take === len ? data : data.subarray(pos, pos + take), this.pos);
             this.pos += take;
             pos += take;
             if (this.pos === blockLen) {
                 this.process(view, 0);
                 this.pos = 0;
+                processed = true;
             }
         }
         this.length += data.length;
-        this.roundClean();
+        // Shared schedule buffers only pick up input-derived words inside process(); if everything
+        // was buffered without processing, there is nothing to zero.
+        if (processed)
+            this.roundClean();
         return this;
     }
     digestInto(out) {
@@ -2446,32 +3104,33 @@ class HashMD {
         // was previously not allocated here. But it won't change performance.
         const { buffer, view, blockLen, isLE } = this;
         let { pos } = this;
-        // append the bit '1' to the message
+        // append the bit '1' to the message, then zero-pad the rest of the block
         buffer[pos++] = 0b10000000;
-        clean(this.buffer.subarray(pos));
+        buffer.fill(0, pos);
         // we have less than padOffset left in buffer, so we cannot put length in
         // current block, need process it and pad again
         if (this.padOffset > blockLen - pos) {
             this.process(view, 0);
-            pos = 0;
+            buffer.fill(0);
         }
-        // Pad until full block byte with zeros
-        for (let i = pos; i < blockLen; i++)
-            buffer[i] = 0;
         // `padOffset` reserves the whole length field. For SHA-384/512 the high 64 bits stay zero from
         // the padding fill above, and JS will overflow before user input can make that half non-zero.
-        // So we only need to write the low 64 bits here.
-        view.setBigUint64(blockLen - 8, BigInt(this.length * 8), isLE);
+        // So we only need to write the low 64 bits here (`length * 8` only scales the exponent of an
+        // integer below 2**53, so the split inside the helper stays exact).
+        setU64FromNum(view, blockLen - 8, this.length * 8, isLE);
         this.process(view, 0);
-        const oview = createView(out);
+        // The final block above is processed outside update(), so the shared message-schedule
+        // buffers (e.g. SHA256_W) would otherwise retain input-derived words after digest().
+        this.roundClean();
+        // digest() passes our own `buffer` as `out`; reuse its cached view instead of allocating one.
+        const oview = out === buffer ? view : createView(out);
         const len = this.outputLen;
         // NOTE: we do division by 4 later, which must be fused in single op with modulo by JIT
-        if (len % 4)
-            throw new Error('_sha2: outputLen must be aligned to 32bit');
         const outLen = len / 4;
         const state = this.get();
-        if (outLen > state.length)
-            throw new Error('_sha2: outputLen bigger than state');
+        // Subclass-misconfiguration invariant: outputLen must be 32-bit aligned and fit the state.
+        if (len % 4 || outLen > state.length)
+            throw new Error('invalid outputLen');
         for (let i = 0; i < outLen; i++)
             oview.setUint32(4 * i, state[i], isLE);
     }
@@ -2484,18 +3143,16 @@ class HashMD {
         this.destroy();
         return res;
     }
-    _cloneInto(to) {
-        to ||= new this.constructor();
-        to.set(...this.get());
-        const { blockLen, buffer, length, finished, destroyed, pos } = this;
+    _cloneIntoMeta(to) {
+        const { buffer, length, finished, destroyed, pos } = this;
         to.destroyed = destroyed;
         to.finished = finished;
         to.length = length;
         to.pos = pos;
         // Only partial-block bytes need copying: when `length % blockLen === 0`, `pos === 0` and
         // later `update()` / `digestInto()` overwrite `to.buffer` from the start before reading it.
-        if (length % blockLen)
-            to.buffer.set(buffer);
+        if (pos)
+            to.buffer.set(buffer); // Avoid a hot modulo guard.
         return to;
     }
     clone() {
@@ -2539,8 +3196,28 @@ const SHA256_K = /* @__PURE__ */ Uint32Array.from([
 const SHA256_W = /* @__PURE__ */ new Uint32Array(64);
 /** Internal SHA-224 / SHA-256 compression engine from RFC 6234 §6.2. */
 class SHA2_32B extends HashMD {
-    constructor(outputLen) {
+    // We cannot use array here since array allows indexing by variable
+    // which means optimizer/compiler cannot use registers.
+    // Numeric initializers matter: starting the fields as `undefined` changes
+    // V8's field representation and makes sha256 3x slower (measured).
+    A = 0;
+    B = 0;
+    C = 0;
+    D = 0;
+    E = 0;
+    F = 0;
+    G = 0;
+    H = 0;
+    constructor(outputLen, IV) {
         super(64, outputLen, 8, false);
+        this.A = IV[0] | 0;
+        this.B = IV[1] | 0;
+        this.C = IV[2] | 0;
+        this.D = IV[3] | 0;
+        this.E = IV[4] | 0;
+        this.F = IV[5] | 0;
+        this.G = IV[6] | 0;
+        this.H = IV[7] | 0;
     }
     get() {
         const { A, B, C, D, E, F, G, H } = this;
@@ -2557,6 +3234,10 @@ class SHA2_32B extends HashMD {
         this.G = G | 0;
         this.H = H | 0;
     }
+    _cloneInto(to) {
+        (to ||= new this.constructor()).set(...this.get());
+        return this._cloneIntoMeta(to);
+    }
     process(view, offset) {
         // Extend the first 16 words into the remaining 48 words w[16..63] of the message schedule array
         for (let i = 0; i < 16; i++, offset += 4)
@@ -2608,153 +3289,39 @@ class SHA2_32B extends HashMD {
 }
 /** Internal SHA-256 hash class grounded in RFC 6234 §6.2. */
 class _SHA256 extends SHA2_32B {
-    // We cannot use array here since array allows indexing by variable
-    // which means optimizer/compiler cannot use registers.
-    A = SHA256_IV[0] | 0;
-    B = SHA256_IV[1] | 0;
-    C = SHA256_IV[2] | 0;
-    D = SHA256_IV[3] | 0;
-    E = SHA256_IV[4] | 0;
-    F = SHA256_IV[5] | 0;
-    G = SHA256_IV[6] | 0;
-    H = SHA256_IV[7] | 0;
-    constructor() {
-        super(32);
-    }
-}
-/**
- * SHA2-256 hash function from RFC 4634. In JS it's the fastest: even faster than Blake3. Some info:
- *
- * - Trying 2^128 hashes would get 50% chance of collision, using birthday attack.
- * - BTC network is doing 2^70 hashes/sec (2^95 hashes/year) as per 2025.
- * - Each sha256 hash is executing 2^18 bit operations.
- * - Good 2024 ASICs can do 200Th/sec with 3500 watts of power, corresponding to 2^36 hashes/joule.
- * @param msg - message bytes to hash
- * @returns Digest bytes.
- * @example
- * Hash a message with SHA2-256.
- * ```ts
- * sha256(new Uint8Array([97, 98, 99]));
- * ```
- */
-const sha256 = /* @__PURE__ */ createHasher(() => new _SHA256(), 
-/* @__PURE__ */ oidNist(0x01));
-
-const ONBOARDING_ZERO_DOMAIN = 'privacy-pool-onboarding-zero-v1';
-function sha256Hex$1(data) {
-    return bytesToHex(sha256(data));
-}
-function appendU8$1(parts, value) {
-    parts.push(Buffer.from([value & 0xff]));
-}
-function appendU32BE$1(parts, value) {
-    const buf = Buffer.alloc(4);
-    buf.writeUInt32BE(value >>> 0);
-    parts.push(buf);
-}
-function appendU128BE$1(parts, value) {
-    const buf = Buffer.alloc(16);
-    buf.writeBigUInt64BE(value >> 64n, 0);
-    buf.writeBigUInt64BE(value & ((1n << 64n) - 1n), 8);
-    parts.push(buf);
-}
-function appendAddressStrkey$1(parts, address) {
-    const bytes = Buffer.from(address.trim(), 'utf8');
-    appendU32BE$1(parts, bytes.length);
-    parts.push(bytes);
-}
-function appendBytes32$1(parts, value) {
-    if (value.length !== 32) {
-        throw new Error(`expected 32-byte field, got ${value.length}`);
-    }
-    parts.push(value);
-}
-function appendBytesBlob(parts, data) {
-    appendU32BE$1(parts, data.length);
-    parts.push(data);
-}
-function encodePlaintextNote(parts, note) {
-    appendU128BE$1(parts, note.value);
-    appendBytes32$1(parts, note.asset_hi);
-    appendBytes32$1(parts, note.asset_lo);
-    appendBytes32$1(parts, note.nullifier);
-    appendBytes32$1(parts, note.secret);
-    if (note.deposited_ephemeral_scalar !== undefined) {
-        appendU8$1(parts, 1);
-        appendBytes32$1(parts, note.deposited_ephemeral_scalar);
-    }
-    else {
-        appendU8$1(parts, 0);
-    }
-}
-function encodeOptionalRegistration(parts, registration) {
-    if (registration.tag === 'None') {
-        appendU8$1(parts, 0);
-        return;
-    }
-    appendU8$1(parts, 1);
-    const reg = registration.values[0];
-    appendAddressStrkey$1(parts, reg.owner);
-    appendBytes32$1(parts, reg.public_key_x);
-    appendBytes32$1(parts, reg.public_key_y);
-}
-/** Canonical `onboardingHash` matching `libs/kyt-passage/src/lib.rs::hash_onboarding`. */
-function hashOnboardingCanonical(onboarding) {
-    if (onboarding === null || onboarding === undefined) {
-        return sha256Hex$1(Buffer.from(ONBOARDING_ZERO_DOMAIN, 'utf8'));
-    }
-    const parts = [];
-    appendAddressStrkey$1(parts, onboarding.owner);
-    appendBytes32$1(parts, onboarding.temp_public_key_x);
-    appendBytes32$1(parts, onboarding.temp_public_key_y);
-    appendBytesBlob(parts, onboarding.encrypted_private_key);
-    appendU32BE$1(parts, onboarding.notes.length);
-    for (const note of onboarding.notes) {
-        encodePlaintextNote(parts, note);
-    }
-    encodeOptionalRegistration(parts, onboarding.private_address_registration);
-    return sha256Hex$1(Buffer.concat(parts));
-}
-function onboardingContractValue(onboarding) {
-    return {
-        owner: onboarding.owner,
-        temp_public_key_x: onboarding.temp_public_key_x,
-        temp_public_key_y: onboarding.temp_public_key_y,
-        encrypted_private_key: onboarding.encrypted_private_key,
-        notes: {
-            notes: onboarding.notes.map((note) => ({
-                value: note.value,
-                asset_hi: note.asset_hi,
-                asset_lo: note.asset_lo,
-                nullifier: note.nullifier,
-                secret: note.secret,
-                deposited_ephemeral_scalar: note.deposited_ephemeral_scalar,
-            })),
-        },
-        private_address_registration: onboarding.private_address_registration,
-    };
-}
-function onboardingToScVal(onboarding) {
-    return nativeToScVal(onboardingContractValue(onboarding));
-}
-function onboardingOptionToScVal(onboarding) {
-    if (onboarding === null || onboarding === undefined) {
-        return xdr.ScVal.scvVoid();
-    }
-    return onboardingToScVal(onboarding);
-}
-function addressToScVal(address) {
-    return nativeToScVal(address, { type: 'address' });
+    constructor() {
+        super(32, SHA256_IV);
+    }
 }
+/**
+ * SHA2-256 hash function from RFC 4634. In JS it's the fastest: even faster than Blake3. Some info:
+ *
+ * - Trying 2^128 hashes would get 50% chance of collision, using birthday attack.
+ * - BTC network is doing 2^70 hashes/sec (2^95 hashes/year) as per 2025.
+ * - Each sha256 hash is executing 2^18 bit operations.
+ * - Good 2024 ASICs can do 200Th/sec with 3500 watts of power, corresponding to 2^36 hashes/joule.
+ * @param msg - message bytes to hash
+ * @param opts - Reserved hash options.
+ * @returns Digest bytes.
+ * @example
+ * Hash a message with SHA2-256.
+ * ```ts
+ * sha256(new Uint8Array([97, 98, 99]));
+ * ```
+ */
+const sha256 = /* @__PURE__ */ createHasher(() => new _SHA256(), 
+/* @__PURE__ */ oidNist(0x01));
 
 const KYT_PASSAGE_AUTH_DOMAIN = 'privacy-pool-kyt-passage-v1';
 const PUBLIC_LEG_CONTEXT_DOMAIN = 'privacy-pool-public-leg-context-v1';
-const PASSAGE_ID_DOMAIN = 'privacy-pool-passage-id-v1';
-const NOTE_AUDIT_LEN = 9;
-const TOTAL_PUBLIC_SIGNALS = 79;
+const PASSAGE_ID_DOMAIN = 'privacy-pool-passage-id-v3';
+const PASSAGE_ID_DOMAIN_V2 = 'privacy-pool-passage-id-v2';
+const PASSAGE_ID_DOMAIN_V1 = 'privacy-pool-passage-id-v1';
+const NOTE_AUDIT_LEN = 12;
+const TOTAL_PUBLIC_SIGNALS = 93;
+const NOTE_AUDIT_PLAINTEXT_LEN = 12;
 const FIELD_BYTES = 32;
 const LENGTH_PREFIX_BYTES = 4;
-const STATE_ROOT_SIGNAL_INDEX = 70;
 function sha256Hex(data) {
     return bytesToHex(sha256(data));
 }
@@ -2763,7 +3330,14 @@ function publicSignalsBuffer(publicSignalsBytes) {
         ? Buffer.from(publicSignalsBytes.replace(/^0x/, ''), 'hex')
         : publicSignalsBytes;
 }
-function parsePublicSignalsBytes(publicSignalsBytes) {
+function expectedSignalCountForNonce(zkConfigNonce = 0n) {
+    return totalPublicSignals(layoutForKnownNonce(zkConfigNonce));
+}
+function stateRootIndexForNonce(zkConfigNonce = 0n) {
+    return stateRootIndex(layoutForKnownNonce(zkConfigNonce));
+}
+function parsePublicSignalsBytes(publicSignalsBytes, zkConfigNonce = 0n) {
+    const expectedCount = expectedSignalCountForNonce(zkConfigNonce);
     const buf = publicSignalsBuffer(publicSignalsBytes);
     let offset = 0;
     let hasLengthPrefix = false;
@@ -2775,11 +3349,11 @@ function parsePublicSignalsBytes(publicSignalsBytes) {
         }
     }
     const signalBytes = buf.subarray(offset);
-    if (signalBytes.length !== TOTAL_PUBLIC_SIGNALS * FIELD_BYTES) {
-        throw new Error(`expected ${TOTAL_PUBLIC_SIGNALS} public signals`);
+    if (signalBytes.length !== expectedCount * FIELD_BYTES) {
+        throw new Error(`expected ${expectedCount} public signals`);
     }
     return {
-        fields: Array.from({ length: TOTAL_PUBLIC_SIGNALS }, (_, index) => Buffer.from(signalBytes.subarray(index * FIELD_BYTES, (index + 1) * FIELD_BYTES))),
+        fields: Array.from({ length: expectedCount }, (_, index) => Buffer.from(signalBytes.subarray(index * FIELD_BYTES, (index + 1) * FIELD_BYTES))),
         hasLengthPrefix,
     };
 }
@@ -2874,9 +3448,9 @@ function encodeLegSlot(parts, kind, slot, isPresent, assetHi, assetLo, amount, a
         parts.push(zeroAddressBuffer());
     }
 }
-function hashPublicSignalBytes(publicSignalsBytes) {
-    const parsed = parsePublicSignalsBytes(publicSignalsBytes);
-    parsed.fields[STATE_ROOT_SIGNAL_INDEX] = Buffer.alloc(FIELD_BYTES);
+function hashPublicSignalBytes(publicSignalsBytes, zkConfigNonce = 0n) {
+    const parsed = parsePublicSignalsBytes(publicSignalsBytes, zkConfigNonce);
+    parsed.fields[stateRootIndexForNonce(zkConfigNonce)] = Buffer.alloc(FIELD_BYTES);
     return sha256Hex(encodePublicSignalsBytes(parsed.fields, parsed.hasLengthPrefix));
 }
 function hashPublicLegContext(layout, input) {
@@ -2898,16 +3472,32 @@ function hashPublicLegContext(layout, input) {
     }
     return sha256Hex(Buffer.concat(parts));
 }
-function hashOnboarding(onboarding) {
-    return hashOnboardingCanonical(onboarding);
-}
-function derivePassageId(owner, nonce, publicSignalHash, publicLegContextHash, onboardingHash) {
+function derivePassageId(owner, nonce, publicSignalHash, publicLegContextHash, ciphertextHash) {
     const parts = [];
     appendBytes(parts, Buffer.from(PASSAGE_ID_DOMAIN, 'utf8'));
     appendAddressStrkey(parts, owner);
     appendU64BE(parts, nonce);
     appendBytes32(parts, publicSignalHash);
     appendBytes32(parts, publicLegContextHash);
+    appendBytes32(parts, ciphertextHash);
+    return sha256Hex(Buffer.concat(parts));
+}
+function derivePassageIdV2(owner, nonce, publicSignalHash, publicLegContextHash) {
+    const parts = [];
+    appendBytes(parts, Buffer.from(PASSAGE_ID_DOMAIN_V2, 'utf8'));
+    appendAddressStrkey(parts, owner);
+    appendU64BE(parts, nonce);
+    appendBytes32(parts, publicSignalHash);
+    appendBytes32(parts, publicLegContextHash);
+    return sha256Hex(Buffer.concat(parts));
+}
+function derivePassageIdV1(owner, nonce, publicSignalHash, publicLegContextHash, onboardingHash) {
+    const parts = [];
+    appendBytes(parts, Buffer.from(PASSAGE_ID_DOMAIN_V1, 'utf8'));
+    appendAddressStrkey(parts, owner);
+    appendU64BE(parts, nonce);
+    appendBytes32(parts, publicSignalHash);
+    appendBytes32(parts, publicLegContextHash);
     appendBytes32(parts, onboardingHash);
     return sha256Hex(Buffer.concat(parts));
 }
@@ -2929,32 +3519,93 @@ function buildKytPassageAuthorization(input) {
 }
 function derivePassageFromTransactContext(input) {
     const layout = input.layout ?? { publicNInputs: 1, publicNOutputs: 1 };
-    const nonce = input.nonce ?? 0n;
-    const publicSignalHash = hashPublicSignalBytes(input.publicSignalsBytes);
+    const nonce = BigInt(input.nonce ?? 0);
+    const publicSignalHash = hashPublicSignalBytes(input.publicSignalsBytes, nonce);
     const publicLegContextHash = hashPublicLegContext(layout, input.publicLegContext);
-    const onboardingHash = hashOnboarding(input.onboarding ?? null);
-    const passageId = derivePassageId(input.owner, nonce, publicSignalHash, publicLegContextHash, onboardingHash);
+    const zkLayout = layoutForKnownNonce(nonce);
+    const passageId = ciphertextsInPublicSignals(zkLayout)
+        ? derivePassageIdV2(input.owner, nonce, publicSignalHash, publicLegContextHash)
+        : derivePassageId(input.owner, nonce, publicSignalHash, publicLegContextHash, hashCiphertextBytes(input.ciphertextBytes ?? Buffer.alloc(0)));
     return {
         publicSignalHash,
         publicLegContextHash,
-        onboardingHash,
         passageId,
     };
 }
+function hashCiphertextBytes(ciphertextBytes) {
+    const buffer = typeof ciphertextBytes === 'string'
+        ? Buffer.from(ciphertextBytes.replace(/^0x/i, ''), 'hex')
+        : ciphertextBytes;
+    return sha256Hex(buffer);
+}
+function zeroBindingTagsInPublicSignals(publicSignalsBytes, zkConfigNonce = 0n) {
+    const layout = layoutForKnownNonce(zkConfigNonce);
+    if (ciphertextsInPublicSignals(layout)) {
+        return publicSignalsBuffer(publicSignalsBytes);
+    }
+    const parsed = parsePublicSignalsBytes(publicSignalsBytes, zkConfigNonce);
+    const zero = Buffer.alloc(FIELD_BYTES);
+    const auditStart = indexAuditTags(layout);
+    for (let slot = 0; slot < layout.nAuditSlots; slot += 1) {
+        parsed.fields[auditStart + slot] = Buffer.from(zero);
+    }
+    const outputStart = indexOutputNoteTags(layout);
+    for (let note = 0; note < layout.nOuts; note += 1) {
+        parsed.fields[outputStart + note] = Buffer.from(zero);
+    }
+    return encodePublicSignalsBytes(parsed.fields, parsed.hasLengthPrefix);
+}
+function spliceBindingTagsIntoPublicSignals(parameters) {
+    const layout = layoutForKnownNonce(parameters.zkConfigNonce);
+    const parsed = parsePublicSignalsBytes(parameters.publicSignalsBytes, parameters.zkConfigNonce);
+    const auditStart = indexAuditTags(layout);
+    for (let slot = 0; slot < layout.nAuditSlots; slot += 1) {
+        const tag = parameters.auditTags[slot];
+        if (tag !== undefined) {
+            parsed.fields[auditStart + slot] = fieldElementBuffer(tag);
+        }
+    }
+    const outputStart = indexOutputNoteTags(layout);
+    for (let note = 0; note < layout.nOuts; note += 1) {
+        const tag = parameters.outputNoteTags[note];
+        if (tag !== undefined) {
+            parsed.fields[outputStart + note] = fieldElementBuffer(tag);
+        }
+    }
+    return encodePublicSignalsBytes(parsed.fields, parsed.hasLengthPrefix);
+}
+function fieldElementBuffer(value) {
+    const trimmed = value.trim().replace(/^0x/i, '');
+    const asBigint = /^[0-9]+$/.test(trimmed)
+        ? BigInt(trimmed)
+        : BigInt(`0x${trimmed}`);
+    const buf = Buffer.alloc(FIELD_BYTES);
+    let remaining = asBigint;
+    for (let index = FIELD_BYTES - 1; index >= 0; index -= 1) {
+        buf[index] = Number(remaining & 0xffn);
+        remaining >>= 8n;
+    }
+    return buf;
+}
 async function inspectKytPassage(backendUrl, request) {
+    const nonce = BigInt(request.zkConfigNonce ?? 0);
+    const body = {
+        ...request,
+        publicSignalsBytes: zeroBindingTagsInPublicSignals(request.publicSignalsBytes, nonce).toString('hex'),
+    };
     const response = await fetch(`${backendUrl.replace(/\/$/, '')}/api/kyt/passages/inspect`, {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify(request),
+        body: JSON.stringify(body),
     });
     if (!response.ok) {
         throw new Error(`KYT inspect failed: ${response.status} ${await response.text()}`);
     }
-    const body = await response.json();
-    if (body.status !== 'approved') {
-        throw new Error(`KYT inspect rejected: ${JSON.stringify(body)}`);
+    const payload = await response.json();
+    if (payload.status !== 'approved') {
+        throw new Error(`KYT inspect rejected: ${JSON.stringify(payload)}`);
     }
-    return body;
+    return payload;
 }
 function signatureBase64ToBytes(signature) {
     const value = signature.trim();
@@ -2968,21 +3619,31 @@ var kytPassage = /*#__PURE__*/Object.freeze({
     __proto__: null,
     KYT_PASSAGE_AUTH_DOMAIN: KYT_PASSAGE_AUTH_DOMAIN,
     NOTE_AUDIT_LEN: NOTE_AUDIT_LEN,
+    NOTE_AUDIT_PLAINTEXT_LEN: NOTE_AUDIT_PLAINTEXT_LEN,
     PASSAGE_ID_DOMAIN: PASSAGE_ID_DOMAIN,
+    PASSAGE_ID_DOMAIN_V1: PASSAGE_ID_DOMAIN_V1,
+    PASSAGE_ID_DOMAIN_V2: PASSAGE_ID_DOMAIN_V2,
     PUBLIC_LEG_CONTEXT_DOMAIN: PUBLIC_LEG_CONTEXT_DOMAIN,
     TOTAL_PUBLIC_SIGNALS: TOTAL_PUBLIC_SIGNALS,
     addressToCanonicalXdr: addressToCanonicalXdr,
     buildKytPassageAuthorization: buildKytPassageAuthorization,
     derivePassageFromTransactContext: derivePassageFromTransactContext,
     derivePassageId: derivePassageId,
-    hashOnboarding: hashOnboarding,
+    derivePassageIdV1: derivePassageIdV1,
+    derivePassageIdV2: derivePassageIdV2,
+    hashCiphertextBytes: hashCiphertextBytes,
     hashPublicLegContext: hashPublicLegContext,
     hashPublicSignalBytes: hashPublicSignalBytes,
     inspectKytPassage: inspectKytPassage,
     signatureBase64ToBytes: signatureBase64ToBytes,
-    zeroAddressSentinelBuffer: zeroAddressSentinelBuffer
+    spliceBindingTagsIntoPublicSignals: spliceBindingTagsIntoPublicSignals,
+    zeroAddressSentinelBuffer: zeroAddressSentinelBuffer,
+    zeroBindingTagsInPublicSignals: zeroBindingTagsInPublicSignals
 });
 
+function addressToScVal(address) {
+    return nativeToScVal(address, { type: 'address' });
+}
 function passageIdHexToScVal(passageIdHex) {
     const bytes = Buffer.from(passageIdHex.replace(/^0x/, ''), 'hex');
     return xdr.ScVal.scvBytes(bytes);
@@ -3019,7 +3680,7 @@ function poolTransactOperation(params) {
             nativeToScVal(params.nonce, { type: 'u64' }),
             xdr.ScVal.scvBytes(params.proofBytes),
             xdr.ScVal.scvBytes(params.publicSignalsBytes),
-            onboardingOptionToScVal(params.onboarding),
+            xdr.ScVal.scvBytes(params.ciphertextBytes ?? Buffer.alloc(0)),
             kytAuthorizationOptionToScVal(params.kytAuthorization),
         ],
     });
@@ -3033,7 +3694,6 @@ function helperSubmitWithPassageOperation(helperContractId, params, passageId, e
             nativeToScVal(params.nonce, { type: 'u64' }),
             xdr.ScVal.scvBytes(params.proofBytes),
             xdr.ScVal.scvBytes(params.publicSignalsBytes),
-            onboardingOptionToScVal(params.onboarding),
             passageIdHexToScVal(passageId),
             xdr.ScVal.scvU32(expiresAtLedger),
             signatureToScVal(signatureBase64ToBytes(signature)),
@@ -3165,8 +3825,8 @@ async function registerKytPassage(params) {
         owner: params.owner,
         nonce: params.nonce,
         publicSignalsBytes: params.publicSignalsBytes,
+        ciphertextBytes: params.ciphertextBytes,
         publicLegContext: params.publicLegContext,
-        onboarding: params.onboarding,
     });
     await submitTransaction({
         source: params.source,
@@ -3215,8 +3875,8 @@ async function submitWithKytPassage(params) {
         owner: params.owner,
         nonce: params.nonce,
         publicSignalsBytes: params.publicSignalsBytes,
+        ciphertextBytes: params.ciphertextBytes,
         publicLegContext: params.publicLegContext,
-        onboarding: params.onboarding,
     });
     if (approved.passageId.replace(/^0x/, '') !== derivation.passageId) {
         throw new Error('KYT approval passageId does not match local transaction context');
@@ -3231,7 +3891,6 @@ async function submitWithKytPassage(params) {
             nonce: params.nonce,
             proofBytes: params.proofBytes,
             publicSignalsBytes: params.publicSignalsBytes,
-            onboarding: params.onboarding,
             kytSubmitHelperId: params.kytSubmitHelperId,
             passageId: derivation.passageId,
             expiresAtLedger: approved.expiresAtLedger,
@@ -3255,246 +3914,43 @@ function localSignKytPassageAuthorization(secretSeed, authorization) {
     return sig.toString('base64');
 }
 
-const NOTE_OUTPUT_LEN = 6;
-const OUTPUT_NOTE_TAG_DOMAIN = 3n;
-const STREAM_DOMAIN = 1n;
-const FR_SIZE = 32;
-const FR_MODULUS = 21888242871839275222246405745257275088548364400416034343698204186575808495617n;
-const ONE = 1n;
-const ZERO = 0n;
-const BABYJUB_SCALAR_BITS = 253n;
-const SCALAR_253_MASK = (ONE << BABYJUB_SCALAR_BITS) - ONE;
-let primitivesPromise;
-function primitives() {
-    primitivesPromise ?? (primitivesPromise = Promise.all([
-        buildBabyjub(),
-        buildMimc7(),
-        buildPoseidon(),
-    ]).then(([babyJub, mimc7, poseidon]) => ({ babyJub, mimc7, poseidon })));
-    return primitivesPromise;
-}
-function normalizeHex(value) {
-    return value.trim().replace(/^0x/i, '').padStart(FR_SIZE * 2, '0');
-}
-function bigintFromHex(value) {
-    return BigInt(`0x${normalizeHex(value)}`);
-}
-function bigintFromDecimal(value) {
-    const parsed = BigInt(value);
-    return parsed % FR_MODULUS;
-}
-function bigintToFrHex(value) {
-    let v = moduleFr(value);
-    const buf = Buffer.alloc(FR_SIZE);
-    for (let index = FR_SIZE - 1; index >= 0; index -= 1) {
-        buf[index] = Number(v & 0xffn);
-        v >>= 8n;
-    }
-    return buf.toString('hex');
-}
-function frDecimalToHex(value) {
-    return bigintToFrHex(bigintFromDecimal(value));
-}
-function frDecimalFromBigint(value) {
-    const reduced = value >= ZERO ? value % FR_MODULUS : (value % FR_MODULUS) + FR_MODULUS;
-    return reduced.toString(10);
-}
-function fieldBigint(field, value) {
-    return BigInt(field.toString(value));
-}
-function moduleFr(value) {
-    const reduced = value % FR_MODULUS;
-    return reduced >= ZERO ? reduced : reduced + FR_MODULUS;
-}
-function mimcHash(parameters) {
-    return fieldBigint(parameters.mimc7.F, parameters.mimc7.hash(parameters.mimc7.F.e(parameters.message), parameters.mimc7.F.e(parameters.key)));
-}
-function poseidonHash(poseidon, inputs) {
-    return fieldBigint(poseidon.F, poseidon(inputs.map((input) => poseidon.F.e(input))));
-}
-function sharedKeyFromDepositor(parameters) {
-    const scalarHex = frDecimalToHex(parameters.ephemeralKeyScalarDecimal);
-    const shared = parameters.ecdhShared(scalarHex, frDecimalToHex(parameters.recipientPublicKey[0]), frDecimalToHex(parameters.recipientPublicKey[1]));
-    return [bigintFromHex(shared.x), bigintFromHex(shared.y)];
-}
-function sharedKeyFromRecipient(parameters) {
-    const { babyJub, recipientScalarHex, ephemeralPublicKey } = parameters;
-    const point = [
-        babyJub.F.e(bigintFromHex(ephemeralPublicKey[0])),
-        babyJub.F.e(bigintFromHex(ephemeralPublicKey[1])),
-    ];
-    if (!babyJub.inCurve(point)) {
-        throw new Error('Created ephemeral public key is not on BabyJubJub curve');
-    }
-    const product = babyJub.mulPointEscalar(point, bigintFromHex(recipientScalarHex) & SCALAR_253_MASK);
-    return [
-        fieldBigint(babyJub.F, product[0]),
-        fieldBigint(babyJub.F, product[1]),
-    ];
+const SCALAR_HEX_LENGTH = 64;
+const OUT_OF_RANGE_MESSAGE = 'derived escrow hash is outside BabyJub subgroup; retry nonce';
+function hexFromCanonicalScalar(value) {
+    return value.toString(16).padStart(SCALAR_HEX_LENGTH, '0');
 }
-function outputNoteTag(parameters) {
-    let accumulator = poseidonHash(parameters.poseidon, [
-        parameters.nonce,
-        OUTPUT_NOTE_TAG_DOMAIN,
-        BigInt(parameters.plaintext.length),
-    ]);
-    for (const field of parameters.plaintext) {
-        accumulator = poseidonHash(parameters.poseidon, [accumulator, field]);
+function assertCanonicalBabyJubScalar(scalar) {
+    if (!(scalar > 0n && scalar < BABYJUB_SUBGROUP_ORDER)) {
+        throw new Error(OUT_OF_RANGE_MESSAGE);
     }
-    return mimcHash({
-        mimc7: parameters.mimc7,
-        message: accumulator,
-        key: parameters.key,
-    });
-}
-function encryptFields(parameters) {
-    return parameters.plaintext.map((field, index) => {
-        const seed = poseidonHash(parameters.poseidon, [
-            parameters.nonce,
-            STREAM_DOMAIN,
-            BigInt(index),
-        ]);
-        const stream = mimcHash({
-            mimc7: parameters.mimc7,
-            message: seed,
-            key: parameters.key,
-        });
-        return moduleFr(field + stream);
-    });
-}
-function decryptFields(parameters) {
-    return parameters.ciphertext.map((field, index) => {
-        const seed = poseidonHash(parameters.poseidon, [
-            parameters.nonce,
-            STREAM_DOMAIN,
-            BigInt(index),
-        ]);
-        const stream = mimcHash({
-            mimc7: parameters.mimc7,
-            message: seed,
-            key: parameters.key,
-        });
-        return moduleFr(bigintFromHex(field) - stream);
-    });
-}
-function plaintextBigints(plaintext) {
-    return [
-        bigintFromDecimal(plaintext.value),
-        bigintFromDecimal(plaintext.assetHi),
-        bigintFromDecimal(plaintext.assetLo),
-        bigintFromDecimal(plaintext.nullifier),
-        bigintFromDecimal(plaintext.secret),
-        bigintFromDecimal(plaintext.applicationId),
-    ];
-}
-function plaintextFromBigints(fields) {
-    return {
-        value: frDecimalFromBigint(fields[0] ?? ZERO),
-        assetHi: frDecimalFromBigint(fields[1] ?? ZERO),
-        assetLo: frDecimalFromBigint(fields[2] ?? ZERO),
-        nullifier: frDecimalFromBigint(fields[3] ?? ZERO),
-        secret: frDecimalFromBigint(fields[4] ?? ZERO),
-        applicationId: frDecimalFromBigint(fields[5] ?? ZERO),
-    };
-}
-async function secretFromDepositEphemeralScalarDecimal(ephemeralKeyScalarDecimal) {
-    const { poseidon } = await primitives();
-    const secret = poseidonHash(poseidon, [bigintFromDecimal(ephemeralKeyScalarDecimal)]);
-    return frDecimalFromBigint(secret);
 }
-async function encryptOutputNoteForDeposit(parameters) {
-    const { babyJub, mimc7, poseidon } = await primitives();
-    const secret = await secretFromDepositEphemeralScalarDecimal(parameters.deposit.ephemeralKeyScalar);
-    const plaintext = {
-        value: parameters.deposit.value,
-        assetHi: parameters.deposit.asset[0],
-        assetLo: parameters.deposit.asset[1],
-        nullifier: parameters.deposit.nullifier,
-        secret,
-        applicationId: parameters.deposit.applicationId,
-    };
-    const [key, nonce] = sharedKeyFromDepositor({
-        babyJub,
-        ecdhShared: parameters.ecdhShared,
-        ephemeralKeyScalarDecimal: parameters.deposit.ephemeralKeyScalar,
-        recipientPublicKey: parameters.deposit.recipientPublicKeys,
-    });
-    const message = plaintextBigints(plaintext);
-    const ciphertext = encryptFields({ mimc7, poseidon, key, nonce, plaintext: message });
-    const tag = outputNoteTag({ mimc7, poseidon, key, nonce, plaintext: message });
+async function derivedEscrowKey(nonce, recipientHi, recipientLo) {
+    const wasm = await loadWasm();
+    const out = wasm.derivedEscrowKey(nonce.toString(), recipientHi.toString(), recipientLo.toString());
+    const scalar = BigInt(`0x${out.scalarHex}`);
+    assertCanonicalBabyJubScalar(scalar);
     return {
-        ciphertext: ciphertext.map((field) => frDecimalFromBigint(field)),
-        tag: frDecimalFromBigint(tag),
+        scalarHex: hexFromCanonicalScalar(scalar),
+        pointXHex: out.pointXHex,
+        pointYHex: out.pointYHex,
     };
 }
-function commitmentFromPlaintextAndSharedSecret(parameters) {
-    const sharedX = bigintFromHex(parameters.sharedSecret.x);
-    const sharedY = bigintFromHex(parameters.sharedSecret.y);
-    const precommitment = poseidonHash(parameters.poseidon, [
-        bigintFromDecimal(parameters.plaintext.secret),
-        sharedX,
-        sharedY,
-    ]);
-    const balance = poseidonHash(parameters.poseidon, [
-        bigintFromDecimal(parameters.plaintext.value),
-        bigintFromDecimal(parameters.plaintext.assetHi),
-        bigintFromDecimal(parameters.plaintext.assetLo),
-    ]);
-    const appCommitment = poseidonHash(parameters.poseidon, [
-        bigintFromDecimal(parameters.plaintext.applicationId),
-        balance,
-        precommitment,
-    ]);
-    const commitment = poseidonHash(parameters.poseidon, [
-        bigintFromDecimal(parameters.plaintext.nullifier),
-        appCommitment,
-    ]);
-    return normalizeHex(commitment.toString(16));
-}
-async function decryptOutputNoteEvent(input) {
-    const { babyJub, mimc7, poseidon } = await primitives();
-    const [key, nonce] = sharedKeyFromRecipient({
-        babyJub,
-        recipientScalarHex: input.recipientScalarHex,
-        ephemeralPublicKey: input.createdEphemeralKey,
-    });
-    const decrypted = decryptFields({
-        mimc7,
-        poseidon,
-        key,
-        nonce,
-        ciphertext: input.ciphertext,
-    });
-    const expectedTag = outputNoteTag({
-        mimc7,
-        poseidon,
-        key,
-        nonce,
-        plaintext: decrypted,
-    });
-    if (expectedTag !== bigintFromHex(input.tag)) {
-        throw new Error('Output note tag verification failed');
-    }
-    const plaintext = plaintextFromBigints(decrypted);
-    const sharedSecret = {
-        x: bigintToFrHex(key),
-        y: bigintToFrHex(nonce),
-    };
-    const commitmentHex = commitmentFromPlaintextAndSharedSecret({
-        poseidon,
-        plaintext,
-        sharedSecret,
-    });
-    const commitmentMatches = normalizeHex(input.commitmentHashHex) === commitmentHex;
-    if (!commitmentMatches) {
-        throw new Error('Output note commitment checksum mismatch');
+async function sampleDerivedEscrowKey(recipientHi, recipientLo, startNonce = 1n, window = 1024n) {
+    for (let offset = 0n; offset < window; offset += 1n) {
+        const nonce = startNonce + offset;
+        try {
+            const key = await derivedEscrowKey(nonce, recipientHi, recipientLo);
+            return { nonce, key };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (!message.includes('outside BabyJub subgroup')) {
+                throw error;
+            }
+        }
     }
-    return {
-        ...plaintext,
-        commitmentHex,
-        commitmentMatches,
-    };
+    throw new Error(OUT_OF_RANGE_MESSAGE);
 }
 
-export { BN254_BABYJUB_SCALAR_MAX_EXCLUSIVE, BN254_SCALAR_MOD, COIN_VALUE_STROOPS, DECODED_EPHEMERAL_HRP, DEFAULT_APPLICATION_ID, DEFAULT_STEALTH_SIGN_NONCE, DEMO_AUDIT_PUBLIC_KEY, DEPOSITOR_SHARED_SECRET_PREIMAGE_HRP, NOTE_AUDIT_LEN as KYT_NOTE_AUDIT_LEN, NOTE_AUDIT_LEN$1 as NOTE_AUDIT_LEN, NOTE_OUTPUT_LEN$1 as NOTE_OUTPUT_LEN, NOTE_OUTPUT_LEN as OUTPUT_NOTE_LEN, POOL_MERKLE_TREE_DEPTH, PrivacyPoolSDK, STEALTH_ADDRESS_HRP, TOTAL_PUBLIC_SIGNALS, TRANSACTION_N_AUDIT_SLOTS, TRANSACTION_N_INS, TRANSACTION_N_OUTS, TRANSACTION_TREE_DEPTH, addressToCanonicalXdr, buildKytPassageAuthorization, buildStealthAddressSignMessage, buildTransactionWitnessInput, buildUniformAuditParams, coordHexToDecimal, decodeDecodedEphemeralKey, decodeDepositorSharedSecretPreimage, decodeStealthAddress, decryptOutputNoteEvent, derivePassageFromTransactContext, derivePassageId, ed25519PubkeyPayloadHexToWithdrawFrDecimals, encodeDecodedEphemeralKey, encodeDepositorSharedSecretPreimage, encodeStealthAddress, encryptOutputNoteForDeposit, generateRandomScalarHex32, hashOnboarding, hashOnboardingCanonical, hashPublicLegContext, hashPublicSignalBytes, inspectKytPassage, localSignKytPassageAuthorization, onboardingOptionToScVal, onboardingToScVal, planKytSubmit, privKeyScalarDecimalFromStellarSignature, randomFrDecimal, randomFrDecimal253, recipientPublicKeysDecimalFromStealthAddress, registerKytPassage, resolveDepositsForWitness, resolveSlotApplicationIds, resolveTransactionAuditParams, scalarHexToFrDecimal, sharedSecretFromDepositorPreimage, sharedSecretFromRecipientPreimage, stellarContractAddressToAssetFrDecimals, submitApprovedKytPassage, submitPoolTransact, submitWithKytPassage, withApplicationIdOnDeposit, withApplicationIdOnWithdraw, withdrawObjectFromMerkleWitness, zeroAddressSentinelBuffer };
+export { BABYJUB_SUBGROUP_ORDER, BINDING_ZK_NONCE, BN254_BABYJUB_SCALAR_MAX_EXCLUSIVE, BN254_SCALAR_MOD, BundledZkCircuit, COIN_VALUE_STROOPS, COMMITMENT_V2_ZK_NONCE, DECODED_EPHEMERAL_HRP, DEFAULT_APPLICATION_ID, DEFAULT_STEALTH_SIGN_NONCE, DEFAULT_ZK_CIRCUITS, DEFAULT_ZK_CONFIG_NONCE, DEMO_AUDIT_PUBLIC_KEY, DEPOSITOR_SHARED_SECRET_PREIMAGE_HRP, DOM_ENC, DOM_ESCROW, DOM_NULLIFIER, DOM_PADDING, NOTE_AUDIT_LEN as KYT_NOTE_AUDIT_LEN, LEGACY_ZK_NONCE, NOTE_AUDIT_LEN$2 as NOTE_AUDIT_LEN, NOTE_AUDIT_PLAINTEXT_LEN, NOTE_OUTPUT_LEN$1 as NOTE_OUTPUT_LEN, NOTE_OUTPUT_LEN as OUTPUT_NOTE_LEN, OWNER_BOUND_NOTE_SCHEMA_VERSION, POOL_MERKLE_TREE_DEPTH, PrivacyPoolSDK, SIX_BY_SIX_BINDING_ZK_NONCE, SIX_BY_SIX_ZK_NONCE, SPEND_SCALAR_DOMAIN_TAG, STEALTH_ADDRESS_HRP, TOTAL_PUBLIC_SIGNALS, TRANSACTION_N_AUDIT_SLOTS, TRANSACTION_N_INS, TRANSACTION_N_OUTS, TRANSACTION_TREE_DEPTH, ZK_ARTIFACT_GITHUB_REPO, ZK_SDK_PACKAGE_VERSION, addressToCanonicalXdr, auditEphemeralPublicKeyCount, buildKytPassageAuthorization, buildStealthAddressSignMessage, buildTransactionWitnessInput, buildUniformAuditParams, bundledCircuitFileNames, canonicalBabyJubScalarFromInteger, ciphertextFieldCount, ciphertextsInPublicSignals, circuitProfileFromName, circuitProfileFromNonce, coordHexToDecimal, decodeCiphertextBlob, decodeDecodedEphemeralKey, decodeDepositorSharedSecretPreimage, decodeStealthAddress, decryptOutputNoteEvent, defaultZkArtifactBaseUrl, derivePassageFromTransactContext, derivePassageId, derivePassageIdV1, derivePassageIdV2, derivedEscrowKey, ed25519PubkeyPayloadHexToWithdrawFrDecimals, encodeCiphertextBlob, encodeDecodedEphemeralKey, encodeDepositorSharedSecretPreimage, encodeStealthAddress, encodeTransactionCiphertextBlob, encryptNoteAuditSlot, encryptOutputNoteForDeposit, encryptTransactionCiphertextBlob, generateRandomScalarHex32, generateWitness, hashCiphertextBytes, hashPublicLegContext, hashPublicSignalBytes, indexAuditTags, indexOutputNoteTags, inspectKytPassage, layoutForKnownNonce, layoutFromCircuitConfig, localSignKytPassageAuthorization, padDepositSlots, padPublicLegs, padWithdrawSlots, planKytSubmit, poseidonMacTag, privKeyScalarDecimalFromStellarSignature, randomFrDecimal, randomFrDecimal253, recipientPublicKeysDecimalFromStealthAddress, registerKytPassage, resolveAuditPublicKeyFromEnv, resolveDepositsForWitness, resolveSlotApplicationIds, resolveSpendScalarSchemaVersion, resolveTransactionAuditParams, resolveZkCircuitConfig, sampleDerivedEscrowKey, scalarHexToFrDecimal, secretFromDepositEphemeralScalarDecimal, sharedSecretFromDepositorPreimage, sharedSecretFromRecipientPreimage, sixBySixBindingLayout, sixBySixLayout, spendScalarHexFromStellarSignature, spliceBindingTagsIntoPublicSignals, splitCiphertextBlob, standardBindingLayout, standardLayout, stateRootIndex, stellarContractAddressToAssetFrDecimals, submitApprovedKytPassage, submitPoolTransact, submitWithKytPassage, totalPublicSignals, withApplicationIdOnDeposit, withApplicationIdOnWithdraw, withdrawObjectFromMerkleWitness, zeroAddressSentinelBuffer, zeroBindingTagsInPublicSignals };
 //# sourceMappingURL=index.mjs.map