@invisi-labs/protocol 1.1.5 → 1.1.6

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   invisiAddressRegistryAbi,
   invisiFactoryAbi,
   invisiProtocolAbi
-} from "./chunk-47SC3EAI.js";
+} from "./chunk-BYJ4LXCJ.js";
 
 // src/AddressRegistry.ts
 import { getAddress as getAddress2, keccak256 } from "ethers";
@@ -38,10 +38,10 @@ function hexBytes(value, length) {
     throw new Error(`Expected ${length} hexadecimal bytes`);
   return getBytes(value);
 }
-function normalizeKeys(walletIdentity, keys) {
+function normalizeKeys(ownerAddress, keys) {
   const decoded = decodeAddress(
     ReceivingAddress.from({
-      walletIdentity,
+      ownerAddress,
       viewingPublicKey: hexBytes(keys.viewingPublicKey, 33),
       clueKey: hexBytes(keys.clueKey, 32)
     }).toString()
@@ -56,14 +56,14 @@ function normalize(context, registration, options) {
   uint64(context.chainId, "chainId");
   const registryAddress = getAddress(context.registryAddress);
   if (BigInt(registryAddress) === 0n) throw new Error("Registry address must be nonzero");
-  if (!/^0x(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/.test(registration.walletIdentity))
+  if (!/^0x(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/.test(registration.ownerAddress))
     throw new Error("Wallet identity must be an EVM owner or padded bytes32");
-  const walletIdentity = decodeAddress(
+  const ownerAddress = decodeAddress(
     ReceivingAddress.fromIdentity(
-      toBeHex(BigInt(registration.walletIdentity), 20)
+      toBeHex(BigInt(registration.ownerAddress), 20)
     ).toString()
-  ).walletIdentity;
-  const keys = normalizeKeys(walletIdentity, registration.keys);
+  ).ownerAddress;
+  const keys = normalizeKeys(ownerAddress, registration.keys);
   const nonce = uint64(registration.nonce, "nonce"), deadline = uint64(registration.deadline, "deadline");
   if (nonce === MAX_NONCE) throw new Error("Registry nonce exhausted");
   if (options.update !== void 0 && typeof options.update !== "boolean")
@@ -74,7 +74,7 @@ function normalize(context, registration, options) {
     throw new Error("Registry nonce mismatch");
   if (context.now !== void 0 && deadline < uint64(context.now, "now"))
     throw new Error("Registration expired");
-  return { registryAddress, registration: { walletIdentity, keys, nonce, deadline } };
+  return { registryAddress, registration: { ownerAddress, keys, nonce, deadline } };
 }
 function registrationTypedData(context, registration, options = {}) {
   const { registryAddress, registration: r } = normalize(context, registration, options);
@@ -97,7 +97,7 @@ function registrationTypedData(context, registration, options = {}) {
       ]
     },
     message: {
-      walletIdentity: toBeHex(BigInt(r.walletIdentity), 32),
+      walletIdentity: toBeHex(BigInt(r.ownerAddress), 32),
       ...r.keys,
       nonce: r.nonce,
       deadline: r.deadline
@@ -119,8 +119,11 @@ function buildRegistrationCalldata(context, registration, signature, options = {
       options.update ? "updateKeys" : "registerKeys",
       [
         {
-          ...normalized.registration,
-          walletIdentity: toBeHex(BigInt(normalized.registration.walletIdentity), 32)
+          // The registry wire schema retains its deployed EIP-712/ABI field name.
+          walletIdentity: toBeHex(BigInt(normalized.registration.ownerAddress), 32),
+          keys: normalized.registration.keys,
+          nonce: normalized.registration.nonce,
+          deadline: normalized.registration.deadline
         },
         signature
       ]
@@ -130,10 +133,10 @@ function buildRegistrationCalldata(context, registration, signature, options = {
 function createRegistryReceivingKeyLookup(client, registryAddress) {
   const address = getAddress(registryAddress);
   if (BigInt(address) === 0n) throw new Error("Registry address must be nonzero");
-  return async (walletIdentity) => {
+  return async (ownerAddress) => {
     const identity = decodeAddress(
-      ReceivingAddress.fromIdentity(walletIdentity).toString()
-    ).walletIdentity;
+      ReceivingAddress.fromIdentity(ownerAddress).toString()
+    ).ownerAddress;
     const [keys, nonce] = await new Contract(
       address,
       invisiAddressRegistryAbi,
@@ -181,7 +184,7 @@ var RegistrationOperation = class _RegistrationOperation {
     const context = { ...registry.context, now: block.timestamp };
     const nonce = await runtime.reader.getRegistryNonce(
       context,
-      runtime.wallet.walletIdentity,
+      runtime.wallet.ownerAddress,
       block
     );
     check(
@@ -195,7 +198,7 @@ var RegistrationOperation = class _RegistrationOperation {
     const address = ReceivingAddress2.parse(await registry.resolve(runtime.wallet.getAddress()));
     const keys = address.getReceivingKeys();
     const registration = {
-      walletIdentity: runtime.wallet.walletIdentity,
+      ownerAddress: runtime.wallet.ownerAddress,
       keys: {
         viewingPublicKey: hexlify2(keys.viewingPublicKey),
         clueKey: hexlify2(keys.clueKey)
@@ -247,7 +250,7 @@ var RegistrationOperation = class _RegistrationOperation {
       "registry signature must be nonempty hexadecimal bytes"
     );
     const p = this.#plan;
-    const owner = p.registration.walletIdentity;
+    const owner = p.registration.ownerAddress;
     let valid = false;
     try {
       const bytes = getBytes2(signature);
@@ -321,7 +324,7 @@ var RegistrationOperation = class _RegistrationOperation {
     check(
       await this.#runtime.reader.getRegistryNonce(
         p.context,
-        p.registration.walletIdentity,
+        p.registration.ownerAddress,
         block
       ) === p.registration.nonce,
       "registry nonce changed; prepare again"
@@ -372,7 +375,7 @@ var RegistrationOperation = class _RegistrationOperation {
       const transaction = await reader.getTransaction(hash);
       const call = this.call();
       check(
-        transaction && transaction.transactionHash === hash && transaction.to.toLowerCase() === call.to.toLowerCase() && transaction.data.toLowerCase() === call.data.toLowerCase() && transaction.value === 0n && (this.#signature !== "0x" || BigInt(transaction.from) === BigInt(p.registration.walletIdentity)),
+        transaction && transaction.transactionHash === hash && transaction.to.toLowerCase() === call.to.toLowerCase() && transaction.data.toLowerCase() === call.data.toLowerCase() && transaction.value === 0n && (this.#signature !== "0x" || BigInt(transaction.from) === BigInt(p.registration.ownerAddress)),
         "registry transaction differs from frozen request"
       );
       check(
@@ -394,7 +397,7 @@ var RegistrationOperation = class _RegistrationOperation {
                 topics: log.topics
               })
             );
-            return event.eventName === "ReceivingKeysSet" && BigInt(event.args.walletIdentity) === BigInt(p.registration.walletIdentity) && event.args.viewingPublicKey.toLowerCase() === p.registration.keys.viewingPublicKey.toLowerCase() && event.args.clueKey.toLowerCase() === p.registration.keys.clueKey.toLowerCase() && event.args.nextNonce === p.registration.nonce + 1n;
+            return event.eventName === "ReceivingKeysSet" && BigInt(event.args.walletIdentity) === BigInt(p.registration.ownerAddress) && event.args.viewingPublicKey.toLowerCase() === p.registration.keys.viewingPublicKey.toLowerCase() && event.args.clueKey.toLowerCase() === p.registration.keys.clueKey.toLowerCase() && event.args.nextNonce === p.registration.nonce + 1n;
           } catch {
             return false;
           }
@@ -417,7 +420,7 @@ var RegistrationOperation = class _RegistrationOperation {
       }
     }
     const head = await reader.getBlock(await reader.getLatestBlockNumber());
-    const nonce = await reader.getRegistryNonce(p.context, p.registration.walletIdentity, head);
+    const nonce = await reader.getRegistryNonce(p.context, p.registration.ownerAddress, head);
     check(
       (await reader.getBlock(head.number)).hash === head.hash,
       "canonical registry block changed during reconciliation"
@@ -496,17 +499,8 @@ var AddressRegistry = class {
   }
 };
 
-// src/credit-create.ts
-import {
-  AbiCoder as AbiCoder2,
-  dataLength as dataLength2,
-  getAddress as getAddress4,
-  Interface as Interface3,
-  isHexString as isHexString3,
-  keccak256 as keccak2563,
-  ParamType as ParamType2
-} from "ethers";
-import { computeWalletAuthorizationDigest, walletAuthorizationTypedData } from "@invisi-labs/core";
+// src/fee.ts
+import { getAddress as getAddress4 } from "ethers";
 
 // src/validation.ts
 import { MAX_CIPHERTEXT_BYTES } from "@invisi-labs/core";
@@ -611,6 +605,8 @@ function normalizeOpaqueDelivery(value, options = {}) {
       throw new Error("absent output requires an empty delivery");
     return { ciphertext: "0x", clue: "0x" };
   }
+  if (options.allowEmpty && value.ciphertext === "0x" && value.clue === "0x")
+    return { ciphertext: "0x", clue: "0x" };
   const ciphertext = envelope(value.ciphertext, 1, void 0, MAX_CIPHERTEXT_BYTES);
   const clue = envelope(value.clue, 68);
   if (clue.slice(130, 132).toLowerCase() !== "18") throw new Error("clue precision must be 24");
@@ -669,9 +665,28 @@ var fundingFields = [
   { name: "deadline", type: "uint256" }
 ];
 
+// src/fee.ts
+function normalizeFee(p) {
+  const feeRecipient = getAddress4(p.feeRecipient ?? ZERO_ADDRESS);
+  const feeAmount = uint(p.feeAmount ?? 0n, 128, "feeAmount");
+  if (BigInt(feeRecipient) === 0n !== (feeAmount === 0n))
+    throw new Error("invalid fee context");
+  return { feeRecipient, feeAmount };
+}
+
 // src/credit-create.ts
+import {
+  AbiCoder as AbiCoder2,
+  dataLength as dataLength2,
+  getAddress as getAddress5,
+  Interface as Interface3,
+  isHexString as isHexString3,
+  keccak256 as keccak2563,
+  ParamType as ParamType2
+} from "ethers";
+import { computeWalletAuthorizationDigest, walletAuthorizationTypedData } from "@invisi-labs/core";
 var creationTuple = [
-  "(address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32 creditCommitment,bytes32 changeCommitment,address owner,uint256 expiry,uint256 deadline)"
+  "(address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32 creditCommitment,bytes32 changeCommitment,address owner,uint256 expiry,uint256 deadline,address feeRecipient,uint256 feeAmount)"
 ][0];
 var CREATE_CREDIT_FIELDS = [
   "token",
@@ -681,25 +696,31 @@ var CREATE_CREDIT_FIELDS = [
   "changeCommitment",
   "owner",
   "expiry",
-  "deadline"
+  "deadline",
+  "feeRecipient",
+  "feeAmount"
 ];
 function validateCreateCreditRequest(c, p, cs, funding = {}) {
   known(p, CREATE_CREDIT_FIELDS);
-  if (getAddress4(p.token) !== getAddress4(c.tokenAddress))
+  if (getAddress5(p.token) !== getAddress5(c.tokenAddress))
     throw new Error("request token mismatch");
-  const ctx = normalizeContext(c), ns = notes(p.nullifiers, "nullifiers"), sources = normalizeSources(p.sources, ns.length, 10), creditCommitment = word(field(p.creditCommitment)), changeCommitment = word(field(p.changeCommitment)), owner = getAddress4(p.owner), expiry = uint(p.expiry, 64, "expiry"), deadline = checkDeadline(c, p.deadline), f = normalizeFunding(funding);
+  const ctx = normalizeContext(c), ns = notes(p.nullifiers, "nullifiers"), sources = normalizeSources(p.sources, ns.length, 10), creditCommitment = word(field(p.creditCommitment)), changeCommitment = word(field(p.changeCommitment)), owner = getAddress5(p.owner), expiry = uint(p.expiry, 64, "expiry"), deadline = checkDeadline(c, p.deadline), f = normalizeFunding(funding);
   if (BigInt(creditCommitment) === 0n || creditCommitment === changeCommitment)
     throw new Error("zero or duplicate commitment");
   if (BigInt(owner) === 0n || expiry === 0n || c.now !== void 0 && expiry <= c.now)
     throw new Error("owner must be nonzero and expiry future");
   if (dense(cs, "deliveries").length !== 3) throw new Error("deliveries count mismatch");
   const deliveries = cs.map(
-    (v, i) => normalizeOpaqueDelivery(v, { empty: i === 2 && BigInt(changeCommitment) === 0n })
+    (v, i) => normalizeOpaqueDelivery(v, {
+      empty: i === 2 && BigInt(changeCommitment) === 0n,
+      allowEmpty: i === 2
+    })
   );
   if (ns.length === 0 && f.amount === 0n)
     throw new Error("empty inputs require positive funding");
   return {
     ...ctx,
+    ...normalizeFee(p),
     sources,
     nullifiers: ns,
     actualCount: ns.length,
@@ -738,7 +759,9 @@ function createCreditBaseInputs(c, p, cs, f = {}) {
     r.expiry,
     r.deadline,
     r.funding.amount,
-    BigInt(r.funding.payer)
+    BigInt(r.funding.payer),
+    BigInt(r.feeRecipient),
+    r.feeAmount
   ].map(word);
 }
 function createCreditPublicInputs(c, p, deliveries, funding = {}) {
@@ -771,7 +794,7 @@ function createCreditRequestHash(p, cs, f = {}) {
       ].map((parameter) => ParamType2.from(parameter)),
       [
         keccak2563(new TextEncoder().encode("InvisiCreateCredit")),
-        p,
+        { ...p, ...normalizeFee(p) },
         deliveriesHash(cs),
         r.funding.payer,
         r.funding.amount
@@ -809,7 +832,7 @@ function buildCreateCreditCalldata(p) {
   return {
     data: new Interface3(invisiProtocolAbi).encodeFunctionData("createCredit", [
       encodeCreditProof(p.proof),
-      p.params,
+      { ...p.params, ...normalizeFee(p.params) },
       p.deliveries,
       r.funding
     ]),
@@ -826,7 +849,7 @@ function encodeCreditProof(proof) {
 }
 
 // src/credit-lifecycle.ts
-import { AbiCoder as AbiCoder3, getAddress as getAddress5, Interface as Interface4, keccak256 as keccak2564, ParamType as ParamType3 } from "ethers";
+import { AbiCoder as AbiCoder3, getAddress as getAddress6, Interface as Interface4, keccak256 as keccak2564, ParamType as ParamType3 } from "ethers";
 import {
   creditPeriods,
   computeWalletAuthorizationDigest as computeWalletAuthorizationDigest2,
@@ -856,7 +879,7 @@ function validateCreditDrawRequest(c, p, cs) {
     "totalAmount",
     "deadline"
   ]);
-  if (getAddress5(p.token) !== getAddress5(c.tokenAddress))
+  if (getAddress6(p.token) !== getAddress6(c.tokenAddress))
     throw new Error("request token mismatch");
   const ctx = normalizeContext(c), ns = notes(p.nullifiers, "nullifiers"), profile = selectCreditDrawCircuit(ns.length), sources = normalizeSources(p.sources, ns.length, profile.maxSize);
   for (const [key, v] of Object.entries({
@@ -874,7 +897,7 @@ function validateCreditDrawRequest(c, p, cs) {
     if (BigInt(remainderCommitments[i]) === 0n && BigInt(recoveryAmounts[i]) !== 0n)
       throw new Error("full draw requires zero recovery amount");
   }
-  const spender = getAddress5(p.spender), totalAmount = uint(p.totalAmount, profile.totalBits, "totalAmount");
+  const spender = getAddress6(p.spender), totalAmount = uint(p.totalAmount, profile.totalBits, "totalAmount");
   if (BigInt(spender) === 0n || totalAmount === 0n)
     throw new Error("spender and total amount must be positive");
   if (dense(cs, "deliveries").length !== 2 * ns.length)
@@ -927,13 +950,25 @@ function creditDrawBaseInputs(c, p, cs) {
   ].map(word);
 }
 function validateCancelCreditRequest(c, p) {
-  known(p, ["token", "source", "nullifier", "owner", "amount", "deadline"]);
-  if (getAddress5(p.token) !== getAddress5(c.tokenAddress))
+  known(p, [
+    "token",
+    "source",
+    "nullifier",
+    "owner",
+    "amount",
+    "deadline",
+    "feeRecipient",
+    "feeAmount"
+  ]);
+  if (getAddress6(p.token) !== getAddress6(c.tokenAddress))
     throw new Error("request token mismatch");
-  const ctx = normalizeContext(c), source = normalizeSources([p.source], 1, 1)[0], nullifier = notes([p.nullifier], "nullifier")[0], owner = getAddress5(p.owner), amount = uint(p.amount, 126, "amount");
+  const ctx = normalizeContext(c), source = normalizeSources([p.source], 1, 1)[0], nullifier = notes([p.nullifier], "nullifier")[0], owner = getAddress6(p.owner), amount = uint(p.amount, 126, "amount");
   if (BigInt(owner) === 0n || amount === 0n) throw new Error("owner and amount must be positive");
+  const fee = normalizeFee(p);
+  if (fee.feeAmount >= amount) throw new Error("fee must leave a positive owner refund");
   return {
     ...ctx,
+    ...fee,
     source,
     nullifier,
     owner,
@@ -952,7 +987,9 @@ function cancelCreditBaseInputs(c, p) {
     BigInt(r.source.merkleRoot),
     BigInt(r.nullifier),
     r.amount,
-    r.deadline
+    r.deadline,
+    BigInt(r.feeRecipient),
+    r.feeAmount
   ].map(word);
 }
 function validateTopUpCreditRequest(c, p, cs, funding = {}) {
@@ -976,10 +1013,10 @@ function topUpCreditBaseInputs(c, p, cs, f = {}) {
   ];
 }
 var cancelTuple = [
-  "(address token,(uint256 treeId,bytes32 merkleRoot) source,bytes32 nullifier,address owner,uint256 amount,uint256 deadline)"
+  "(address token,(uint256 treeId,bytes32 merkleRoot) source,bytes32 nullifier,address owner,uint256 amount,uint256 deadline,address feeRecipient,uint256 feeAmount)"
 ][0];
 var topTuple = [
-  "((address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32 creditCommitment,bytes32 changeCommitment,address owner,uint256 expiry,uint256 deadline) creation,(uint256 treeId,bytes32 merkleRoot) creditSource,bytes32 creditNullifier,uint256 previousExpiry)"
+  "((address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32 creditCommitment,bytes32 changeCommitment,address owner,uint256 expiry,uint256 deadline,address feeRecipient,uint256 feeAmount) creation,(uint256 treeId,bytes32 merkleRoot) creditSource,bytes32 creditNullifier,uint256 previousExpiry)"
 ][0];
 var hashContext2 = {
   chainId: 0n,
@@ -991,7 +1028,10 @@ function cancelCreditRequestHash(p) {
   return keccak2564(
     AbiCoder3.defaultAbiCoder().encode(
       [{ type: "bytes32" }, cancelTuple].map((parameter) => ParamType3.from(parameter)),
-      [keccak2564(new TextEncoder().encode("InvisiCancelCredit")), p]
+      [
+        keccak2564(new TextEncoder().encode("InvisiCancelCredit")),
+        { ...p, ...normalizeFee(p) }
+      ]
     )
   );
 }
@@ -1013,7 +1053,7 @@ function topUpCreditRequestHash(p, cs, f = {}) {
       ].map((parameter) => ParamType3.from(parameter)),
       [
         keccak2564(new TextEncoder().encode("InvisiTopUpCredit")),
-        p,
+        { ...p, creation: { ...p.creation, ...normalizeFee(p.creation) } },
         deliveriesHash(cs),
         r.creation.funding.payer,
         r.creation.funding.amount
@@ -1101,7 +1141,7 @@ function buildCancelCreditCalldata(p) {
   return {
     data: new Interface4(invisiProtocolAbi).encodeFunctionData("cancelCredit", [
       encodeCreditProof(p.proof),
-      p.params
+      { ...p.params, ...normalizeFee(p.params) }
     ])
   };
 }
@@ -1111,7 +1151,7 @@ function buildTopUpCreditCalldata(p) {
   return {
     data: new Interface4(invisiProtocolAbi).encodeFunctionData("topUpCredit", [
       encodeCreditProof(p.proof),
-      p.params,
+      { ...p.params, creation: { ...p.params.creation, ...normalizeFee(p.params.creation) } },
       p.deliveries,
       r.creation.funding
     ]),
@@ -1120,7 +1160,7 @@ function buildTopUpCreditCalldata(p) {
 }
 
 // src/funds.ts
-import { AbiCoder as AbiCoder4, getAddress as getAddress6, Interface as Interface5, keccak256 as keccak2565, ParamType as ParamType4, TypedDataEncoder as TypedDataEncoder2 } from "ethers";
+import { AbiCoder as AbiCoder4, getAddress as getAddress7, Interface as Interface5, keccak256 as keccak2565, ParamType as ParamType4, TypedDataEncoder as TypedDataEncoder2 } from "ethers";
 import { computeNoteCommitment, walletAuthorizationTypedData as walletAuthorizationTypedData3 } from "@invisi-labs/core";
 var TRANSACT_CAPACITIES = [14, 56, 112, 168];
 function selectTransactCapacity(inputs, outputs) {
@@ -1130,7 +1170,7 @@ function selectTransactCapacity(inputs, outputs) {
 }
 function normalizeTransactRequest(c, p, cs, funding = {}) {
   const ctx = normalizeContext(c);
-  if (getAddress6(p.token) !== ctx.tokenAddress)
+  if (getAddress7(p.token) !== ctx.tokenAddress)
     throw new Error("request token mismatch");
   known(p, [
     "token",
@@ -1139,12 +1179,21 @@ function normalizeTransactRequest(c, p, cs, funding = {}) {
     "outputCommitments",
     "withdrawalAddress",
     "withdrawalAmount",
-    "deadline"
+    "deadline",
+    "feeRecipient",
+    "feeAmount"
   ]);
   const ns = notes(p.nullifiers, "nullifiers"), os = notes(p.outputCommitments, "outputCommitments"), capacity = selectTransactCapacity(ns.length, os.length);
-  const sources = normalizeSources(p.sources, ns.length, capacity), deliveries = dense(cs, "deliveries").map((v) => normalizeOpaqueDelivery(v));
+  const sources = normalizeSources(p.sources, ns.length, capacity), deliveries = dense(cs, "deliveries").map(
+    (v) => normalizeOpaqueDelivery(v, { allowEmpty: true })
+  );
   if (deliveries.length !== os.length) throw new Error("deliveries count mismatch");
-  const withdrawalAmount = uint(p.withdrawalAmount, 128, "withdrawalAmount"), withdrawalAddress = getAddress6(p.withdrawalAddress), f = normalizeFunding(funding);
+  const withdrawalAmount = uint(p.withdrawalAmount, 128, "withdrawalAmount"), withdrawalAddress = getAddress7(p.withdrawalAddress), f = normalizeFunding(funding);
+  const feeAmount = uint(p.feeAmount ?? 0n, 128, "feeAmount");
+  const feeRecipient = getAddress7(
+    p.feeRecipient ?? "0x0000000000000000000000000000000000000000"
+  );
+  if (feeAmount === 0n !== (BigInt(feeRecipient) === 0n)) throw new Error("invalid fee");
   if (withdrawalAmount === 0n !== (BigInt(withdrawalAddress) === 0n) || os.length === 0 && withdrawalAmount === 0n)
     throw new Error("invalid withdrawal");
   if (ns.length === 0 && (f.amount === 0n || withdrawalAmount !== 0n))
@@ -1171,6 +1220,8 @@ function normalizeTransactRequest(c, p, cs, funding = {}) {
     deliveriesHash: deliveriesHash(deliveries),
     withdrawalAddress,
     withdrawalAmount,
+    feeRecipient,
+    feeAmount,
     deadline: checkDeadline(c, p.deadline),
     depositAmount: f.amount,
     depositPayer: f.payer,
@@ -1195,7 +1246,9 @@ function transactPublicInputs(c, p, cs, f = {}) {
     r.withdrawalAmount,
     r.deadline,
     r.depositAmount,
-    BigInt(r.depositPayer)
+    BigInt(r.depositPayer),
+    BigInt(r.feeRecipient),
+    r.feeAmount
   ].map(word);
 }
 function encodeTransactTypedData(c, p, deliveries, f = {}) {
@@ -1208,10 +1261,10 @@ function encodeTransactTypedData(c, p, deliveries, f = {}) {
   });
 }
 var singleTuple = [
-  "(address token,bytes32 merkleRoot,bytes32[] nullifiers,bytes32[] outputCommitments,uint256 inputTreeId,address withdrawalAddress,uint256 withdrawalAmount,uint256 deadline)"
+  "(address token,bytes32 merkleRoot,bytes32[] nullifiers,bytes32[] outputCommitments,uint256 inputTreeId,address withdrawalAddress,uint256 withdrawalAmount,uint256 deadline,address feeRecipient,uint256 feeAmount)"
 ][0];
 var crossTuple = [
-  "(address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32[] outputCommitments,address withdrawalAddress,uint256 withdrawalAmount,uint256 deadline)"
+  "(address token,(uint256 treeId,bytes32 merkleRoot)[] sources,bytes32[] nullifiers,bytes32[] outputCommitments,address withdrawalAddress,uint256 withdrawalAmount,uint256 deadline,address feeRecipient,uint256 feeAmount)"
 ][0];
 function transactFundingRequestHash(proof, p, cs) {
   const single = {
@@ -1222,7 +1275,9 @@ function transactFundingRequestHash(proof, p, cs) {
     inputTreeId: p.sources[0]?.treeId ?? 0n,
     withdrawalAddress: p.withdrawalAddress,
     withdrawalAmount: p.withdrawalAmount,
-    deadline: p.deadline
+    deadline: p.deadline,
+    feeRecipient: p.feeRecipient ?? "0x0000000000000000000000000000000000000000",
+    feeAmount: p.feeAmount ?? 0n
   };
   return p.sources.length > 1 ? keccak2565(
     AbiCoder4.defaultAbiCoder().encode(
@@ -1232,7 +1287,7 @@ function transactFundingRequestHash(proof, p, cs) {
       [
         keccak2565(new TextEncoder().encode("InvisiCrossTreeTransact")),
         keccak2565(proof),
-        p,
+        { ...p, feeRecipient: single.feeRecipient, feeAmount: single.feeAmount },
         deliveriesHash(cs)
       ]
     )
@@ -1273,7 +1328,9 @@ function buildTransactCalldata(p) {
       outputCommitments: r.outputCommitments,
       withdrawalAddress: r.withdrawalAddress,
       withdrawalAmount: r.withdrawalAmount,
-      deadline: r.deadline
+      deadline: r.deadline,
+      feeRecipient: r.feeRecipient,
+      feeAmount: r.feeAmount
     },
     deliveries: p.deliveries,
     funding: r.funding
@@ -1287,7 +1344,7 @@ function buildTransactCalldata(p) {
 function buildTransactAggregateCalldata(p) {
   if (![4, 8, 12].includes(dense(p.requests, "requests").length))
     throw new Error("aggregate requires 4, 8 or 12 requests");
-  for (const request of p.requests) {
+  const requests = p.requests.map((request) => {
     const r = normalizeTransactRequest(
       { ...p.context, tokenAddress: request.params.token },
       request.params,
@@ -1296,21 +1353,25 @@ function buildTransactAggregateCalldata(p) {
     );
     if (r.capacity !== 14) throw new Error("aggregate supports only capacity 14");
     validateFundingSubmission(r.funding, p.caller, p.context.now);
-  }
+    return {
+      ...request,
+      params: { ...request.params, feeRecipient: r.feeRecipient, feeAmount: r.feeAmount }
+    };
+  });
   return {
     data: new Interface5(
       invisiProtocolAbi.filter(
         (item) => item.type === "function" && item.name === "transact" && item.inputs[1]?.type === "tuple[]"
       )
-    ).encodeFunctionData("transact", [p.proof, p.requests]),
+    ).encodeFunctionData("transact", [p.proof, requests]),
     capacity: 14
   };
 }
 async function validateShieldRequest(p) {
   normalizeContext(p.context);
-  if (getAddress6(p.params.token) !== getAddress6(p.context.tokenAddress))
+  if (getAddress7(p.params.token) !== getAddress7(p.context.tokenAddress))
     throw new Error("request token mismatch");
-  known(p.params, ["token", "outputCommitments", "deadline"]);
+  known(p.params, ["token", "outputCommitments", "deadline", "feeRecipient", "feeAmount"]);
   checkDeadline(p.context, p.params.deadline);
   const outputs = dense(p.outputs, "outputs"), commitments = notes(p.params.outputCommitments, "outputCommitments"), cs = dense(p.deliveries, "deliveries"), f = normalizeFunding(p.funding);
   if (outputs.length < 1 || outputs.length > 10 || commitments.length !== outputs.length || cs.length !== outputs.length)
@@ -1321,7 +1382,7 @@ async function validateShieldRequest(p) {
     uint(o.amount, 128, "amount");
     if (o.amount === 0n) throw new Error("amount must be positive");
     field(o.identity);
-    normalizeOpaqueDelivery(cs[i]);
+    normalizeOpaqueDelivery(cs[i], { allowEmpty: true });
     if (await computeNoteCommitment(
       p.context.chainId,
       o.identity,
@@ -1331,7 +1392,8 @@ async function validateShieldRequest(p) {
       throw new Error("output commitment mismatch");
     total += o.amount;
   }
-  if (total !== f.amount) throw new Error("funding must equal output total");
+  if (total + normalizeFee(p.params).feeAmount !== f.amount)
+    throw new Error("funding must equal output total plus fee");
   return f;
 }
 function shieldFundingRequestHash(params, outputs, cs) {
@@ -1345,13 +1407,13 @@ function shieldFundingRequestHash(params, outputs, cs) {
     AbiCoder4.defaultAbiCoder().encode(
       [
         "bytes32",
-        "(address token,bytes32[] outputCommitments,uint256 deadline)",
+        "(address token,bytes32[] outputCommitments,uint256 deadline,address feeRecipient,uint256 feeAmount)",
         "bytes32",
         "bytes32"
       ].map((parameter) => ParamType4.from(parameter)),
       [
         keccak2565(new TextEncoder().encode("InvisiShield")),
-        params,
+        { ...params, ...normalizeFee(params) },
         outputHash,
         deliveriesHash(cs)
       ]
@@ -1378,7 +1440,7 @@ async function buildShieldCalldata(p) {
   validateFundingSubmission(f, p.caller, p.context.now);
   return {
     data: new Interface5(invisiProtocolAbi).encodeFunctionData("shield", [
-      p.params,
+      { ...p.params, ...normalizeFee(p.params) },
       p.outputs,
       p.deliveries,
       f
@@ -1445,7 +1507,7 @@ function encodeAggregateFundingTypedData(c, r) {
 }
 
 // src/Protocol.ts
-import { Contract as Contract2, getAddress as getAddress7, keccak256 as keccak2567 } from "ethers";
+import { Contract as Contract2, getAddress as getAddress8, keccak256 as keccak2567 } from "ethers";
 import {
   defineDeployment
 } from "@invisi-labs/rpc";
@@ -1566,7 +1628,7 @@ var Protocol = class _Protocol {
     const reader = "getNetwork" in connection ? {
       getChainId: async () => (await connection.getNetwork()).chainId,
       getCode: async (address) => await connection.getCode(address),
-      getProtocolAddressRegistry: async (address) => getAddress7(
+      getProtocolAddressRegistry: async (address) => getAddress8(
         await new Contract2(
           address,
           ["function addressRegistry() view returns (address)"],
@@ -1592,9 +1654,9 @@ var Protocol = class _Protocol {
     if (registry) {
       if (!reader.getProtocolAddressRegistry)
         throw new Error("registry binding reader capability is missing");
-      if (getAddress7(
+      if (getAddress8(
         await reader.getProtocolAddressRegistry(this.context.protocolAddress)
-      ) !== getAddress7(registry.address))
+      ) !== getAddress8(registry.address))
         throw new Error("protocol registry binding mismatch");
       const registryCode = await reader.getCode(registry.address);
       if (!/^0x(?:[0-9a-fA-F]{2})+$/.test(registryCode) || keccak2567(registryCode) !== registry.runtimeCodeHash)
@@ -1611,7 +1673,7 @@ var Protocol = class _Protocol {
   /** Build an operation context for one asset within this same deployment. */
   forToken(tokenAddress) {
     return new TokenProtocol(
-      { ...this.context, tokenAddress: getAddress7(tokenAddress) },
+      { ...this.context, tokenAddress: getAddress8(tokenAddress) },
       { expectedRuntimeCodeHash: this.deployment.protocol.runtimeCodeHash }
     );
   }
@@ -1628,7 +1690,7 @@ import {
 async function verifyNoteCommitment(params) {
   const expected = await computeNoteCommitment2(
     params.chainId,
-    await computeNoteIdentity(BigInt(params.walletIdentity), BigInt(params.nonce)),
+    await computeNoteIdentity(BigInt(params.ownerAddress), BigInt(params.nonce)),
     BigInt(params.tokenAddress),
     params.amount
   );
@@ -1675,12 +1737,12 @@ import {
 // src/witness-layouts.json
 var witness_layouts_default = {
   transact_user_slots14: {
-    artifactSha256: "486a749ae3944ae83a7ff2d298e7469b18737d88553a7d99c4782f22f7332996",
+    artifactSha256: "df9458f0be9c8905241ee74e5f11c0e1c348ef749fe1a9d599034a983f08dbd5",
     keys: {
-      evm: "7b3e65d5201246e733a1816489d80acb219a98e8606e1b81e6d48ff0c1fd537a",
-      "noir-recursive": "148957e28e6339a8ce1121851fb7a232e31f4c5b741e415733b8d627f4b62649"
+      evm: "a9db580b09d05f09d4ea58b8d9755855525b8cc20beee4b1fbfe4cad10251e4e",
+      "noir-recursive": "912191fc9484b2c0ab869d44900054b1a7c25c3256177abfc102884f3fa7d7ed"
     },
-    publicInputCount: 57,
+    publicInputCount: 59,
     public: [
       {
         name: "chain_id",
@@ -1762,6 +1824,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -1774,11 +1846,11 @@ var witness_layouts_default = {
       }
     ],
     private: [
-      "wallet_identity",
+      "input_owner_address",
       "public_key_x",
       "public_key_y",
       "signature",
-      "output_wallet_identities",
+      "output_identities",
       "amounts",
       "nonces",
       "leaf_indices",
@@ -1787,11 +1859,11 @@ var witness_layouts_default = {
     ]
   },
   transact_user_slots56: {
-    artifactSha256: "169db2ff23c15adb14756edf9bb99bbd343df807b3e1c7f1f510070897e653cf",
+    artifactSha256: "370299e1ee32a57b6a81ccdbf5e95efef144bee17d38d402bbbfbaa392d355d8",
     keys: {
-      evm: "cbf54de94bff266bf846f9722c0f3ffa1fb7a0f9f478466f193de0e9123ce7f5"
+      evm: "2bb2fdf9ef33200038aa6e0a9f35e2a7252bf3946f5b5d68dd0ae85172adeddf"
     },
-    publicInputCount: 183,
+    publicInputCount: 185,
     public: [
       {
         name: "chain_id",
@@ -1873,6 +1945,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -1885,11 +1967,11 @@ var witness_layouts_default = {
       }
     ],
     private: [
-      "wallet_identity",
+      "input_owner_address",
       "public_key_x",
       "public_key_y",
       "signature",
-      "output_wallet_identities",
+      "output_identities",
       "amounts",
       "nonces",
       "leaf_indices",
@@ -1898,11 +1980,11 @@ var witness_layouts_default = {
     ]
   },
   transact_user_slots112: {
-    artifactSha256: "221bbbd6ff0c7d7dec74677e52484f082b3e176bb0fa47f3236064e396d73739",
+    artifactSha256: "259417390705f5ced1cbd671582a2fe40dbf7a259d8717f4e90989dc4368ad91",
     keys: {
-      evm: "67b2d361b023f193ecdb5a9aefbe2840349ee5ce848ab4101416734f3a7e91e9"
+      evm: "523652b9391818c0af0af8668ba2cd786be25ef00e6bcafa662ed829a32746a7"
     },
-    publicInputCount: 351,
+    publicInputCount: 353,
     public: [
       {
         name: "chain_id",
@@ -1984,6 +2066,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -1996,11 +2088,11 @@ var witness_layouts_default = {
       }
     ],
     private: [
-      "wallet_identity",
+      "input_owner_address",
       "public_key_x",
       "public_key_y",
       "signature",
-      "output_wallet_identities",
+      "output_identities",
       "amounts",
       "nonces",
       "leaf_indices",
@@ -2009,11 +2101,11 @@ var witness_layouts_default = {
     ]
   },
   transact_user_slots168: {
-    artifactSha256: "d479253eaaacc973806a84e142e2362d873bba0f150ce050d32b8d9b2947adc8",
+    artifactSha256: "2a86703ca068c50f305d3b4b856ab3b2145d066da0bab894eac8e7c174c20292",
     keys: {
-      evm: "c50e72b0718c6393f82f5a67e248ba093d0db56ece42bbf092da93e9369c2624"
+      evm: "c9d821fdd5b8cfcdc7fe93e673a8c99487879a4680c8f1b86c0b5c05a3cad515"
     },
-    publicInputCount: 519,
+    publicInputCount: 521,
     public: [
       {
         name: "chain_id",
@@ -2095,6 +2187,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -2107,11 +2209,11 @@ var witness_layouts_default = {
       }
     ],
     private: [
-      "wallet_identity",
+      "input_owner_address",
       "public_key_x",
       "public_key_y",
       "signature",
-      "output_wallet_identities",
+      "output_identities",
       "amounts",
       "nonces",
       "leaf_indices",
@@ -2120,11 +2222,11 @@ var witness_layouts_default = {
     ]
   },
   transact_aggregate_14_4: {
-    artifactSha256: "4fe7c63fb80cba35af4c4525fbabcfb75033286e681afbdcb3fb043c03456246",
+    artifactSha256: "4cd3f3d0dbcac9a48fec728450fd73a247321f655da02bd08db789e07b47527b",
     keys: {
-      evm: "664d4ff0de6b8c876ce990ea368d7a59cee411463c24dd5621d64c8949554674"
+      evm: "6654b125cb96d5f4dd263c82cb34b0862bf63ff761fe5feab834f10283a0265d"
     },
-    publicInputCount: 229,
+    publicInputCount: 237,
     public: [
       {
         name: "statements",
@@ -2144,11 +2246,11 @@ var witness_layouts_default = {
     ]
   },
   transact_aggregate_14_8: {
-    artifactSha256: "0a266ad4bb4c6dce42b1e851fcbb34b1becae1edd6bf6af82d7b9ed7184576df",
+    artifactSha256: "b36ff5370043782364d41dbe00443970292b0240429f241c974ae6c9b10debfe",
     keys: {
-      evm: "042139122d0eee8beeaa9c18397276fa5a2872218495fa16ca438fbdd80fa3e1"
+      evm: "2ad5b8b24109edf24197e97fbad35519d7d18558df19183ca3f91c4089ce4421"
     },
-    publicInputCount: 457,
+    publicInputCount: 473,
     public: [
       {
         name: "statements",
@@ -2168,11 +2270,11 @@ var witness_layouts_default = {
     ]
   },
   transact_aggregate_14_12: {
-    artifactSha256: "738849e83eb4a78eb69cb6e20a86f6f27ba3784d04a83abd338f84de5c20d7d2",
+    artifactSha256: "1191a92a333d826d4c4bd6a2e701a7751beb609904f8b928e3816f276d6fda67",
     keys: {
-      evm: "539928b264aea4d07a41e772d5d5a7b7666a6883decb985c27ca7422e7f8ea1f"
+      evm: "a8b06d969e97f53624fae05d08aa548182ad09db24fe60159fae61d243c0cb9d"
     },
-    publicInputCount: 685,
+    publicInputCount: 709,
     public: [
       {
         name: "statements",
@@ -2192,11 +2294,11 @@ var witness_layouts_default = {
     ]
   },
   create_credit: {
-    artifactSha256: "3ed6cfdee4f5fd840f023580f76c208768777fea79737f2511377e5c55be0230",
+    artifactSha256: "16a41fd585d5f925e4e93fd6a308e1ca8c90ea287778871cb0d214f0d0e223ce",
     keys: {
-      evm: "56f663c6053be0d158a271022d200c732597efd3a2e0be48fe94549d0b1795e0"
+      evm: "e8d3dc1f6922dbe1a0aa6016e65664be28d7005180ee943a4b237ac5518971bb"
     },
-    publicInputCount: 46,
+    publicInputCount: 48,
     public: [
       {
         name: "chain_id",
@@ -2283,6 +2385,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -2841,11 +2953,11 @@ var witness_layouts_default = {
     ]
   },
   credit_cancel: {
-    artifactSha256: "b4459c2cf756d096e37291cf4d7cd129866b6d420b6d03c928f383b057112ccb",
+    artifactSha256: "6485609280fe5a3d44ca9f1865b29b44253b3d2cd49770d000e7bb7a3db8e65d",
     keys: {
-      evm: "fc8ad196ef15f3328afcc8f01d867a3ebefd15451c2813948442fab1923b73b2"
+      evm: "d74cf842d204cdf271c06a69482ddff11568e89630346b634d486205bec4bd9e"
     },
-    publicInputCount: 11,
+    publicInputCount: 13,
     public: [
       {
         name: "chain_id",
@@ -2892,6 +3004,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -2925,11 +3047,11 @@ var witness_layouts_default = {
     ]
   },
   credit_top_up: {
-    artifactSha256: "2ffebd5753ec1b0c050204d4f97498765fe61ea01a793a9b2466c2f97536345c",
+    artifactSha256: "3004eea1c26ec8e33f8fc9ee171a3b6af250682efb607f7003ae58f8327998ab",
     keys: {
-      evm: "40b02a9d2e7eb7b49daaac4b7760328537b7982fd5a225cc065bb74cd5ef44b3"
+      evm: "b7f378a871a27649c3f7fd1af554c8f87d99bcf0780b21972e910212ed4e5a0d"
     },
-    publicInputCount: 50,
+    publicInputCount: 52,
     public: [
       {
         name: "chain_id",
@@ -3016,6 +3138,16 @@ var witness_layouts_default = {
         count: 1,
         array: false
       },
+      {
+        name: "fee_recipient",
+        count: 1,
+        array: false
+      },
+      {
+        name: "fee_amount",
+        count: 1,
+        array: false
+      },
       {
         name: "credit_tree_id",
         count: 1,
@@ -3177,7 +3309,7 @@ var WitnessBuilder = class {
       words: words.slice(0, -2).map(BigInt)
     };
     check2(
-      signed.walletIdentity === identity && signed.digest === computeWalletAuthorizationDigest3(request),
+      signed.ownerAddress === identity && signed.digest === computeWalletAuthorizationDigest3(request),
       "authorization statement mismatch"
     );
     const witness = signed.withWitness((value) => value);
@@ -3212,7 +3344,7 @@ var WitnessBuilder = class {
     this.context(note);
     return computeNoteCommitment3(
       note.chainId,
-      await computeNoteIdentity2(BigInt(note.walletIdentity), note.nonce),
+      await computeNoteIdentity2(BigInt(note.ownerAddress), note.nonce),
       note.tokenAddress,
       note.amount
     );
@@ -3237,7 +3369,7 @@ var WitnessBuilder = class {
     check2(inputs.length === nullifiers.length, "input count mismatch");
     return Promise.all(
       inputs.map(async (input, i) => {
-        check2(input.note.walletIdentity === identity, "input wallet mismatch");
+        check2(input.note.ownerAddress === identity, "input wallet mismatch");
         const leaf = await this.noteLeaf(input.note);
         check2(
           await computeNoteNullifier(input.note.chainId, input.note.nonce, leaf) === nullifiers[i],
@@ -3253,8 +3385,8 @@ var WitnessBuilder = class {
       p.inputs.length === n.inputCount && p.outputs.length === n.outputCount,
       "note count mismatch"
     );
-    const identity = p.inputs[0]?.note.walletIdentity;
-    const unsignedSweep = !!identity && !p.authorization && n.outputCount === 0 && n.depositAmount === 0n && BigInt(p.params.withdrawalAddress) === BigInt(identity);
+    const identity = p.inputs[0]?.note.ownerAddress;
+    const unsignedSweep = !!identity && !p.authorization && n.outputCount === 0 && n.depositAmount === 0n && n.feeAmount === 0n && BigInt(p.params.withdrawalAddress) === BigInt(identity);
     const authority = identity && !unsignedSweep ? await this.authority("transact", n.capacity, words, p.authorization, identity) : zeroAuthority();
     const sources = await this.noteInputs(
       p.inputs,
@@ -3263,22 +3395,44 @@ var WitnessBuilder = class {
       identity ?? "0x" + "00".repeat(32),
       authority
     );
-    for (const [i, note] of p.outputs.entries())
-      check2(
-        await this.noteLeaf(note) === p.params.outputCommitments[i],
-        "output commitment mismatch"
-      );
-    const all = [...p.inputs.map((input) => input.note), ...p.outputs];
+    const outputs = await Promise.all(
+      p.outputs.map(async (output, i) => {
+        const opening = "identity" in output ? output.note : output;
+        const identity2 = "identity" in output ? field(output.identity) : BigInt(
+          await computeNoteIdentity2(BigInt(output.ownerAddress), output.nonce)
+        );
+        const amount = uint(output.amount, 128, "output amount");
+        check2(identity2 !== 0n && amount !== 0n, "zero output identity or amount");
+        if (opening) {
+          this.context(opening);
+          check2(
+            opening.amount === amount && BigInt(
+              await computeNoteIdentity2(
+                BigInt(opening.ownerAddress),
+                opening.nonce
+              )
+            ) === identity2,
+            "output opening mismatch"
+          );
+        }
+        const commitment = await computeNoteCommitment3(
+          c.chainId,
+          word(identity2),
+          BigInt(c.tokenAddress),
+          amount
+        );
+        check2(commitment === p.params.outputCommitments[i], "output commitment mismatch");
+        return { identity: identity2, amount };
+      })
+    );
+    const all = [...p.inputs.map((input) => input.note), ...outputs];
     return provingRequest(
       `transact_user_slots${n.capacity}`,
       {
-        wallet_identity: identity ? BigInt(identity) : 0n,
+        input_owner_address: identity ? BigInt(identity) : 0n,
         ...authority,
-        output_wallet_identities: pad2(
-          [
-            ...p.inputs.map(() => 0n),
-            ...p.outputs.map((note) => BigInt(note.walletIdentity))
-          ],
+        output_identities: pad2(
+          [...p.inputs.map(() => 0n), ...outputs.map((output) => output.identity)],
           n.capacity,
           () => 0n
         ),
@@ -3288,7 +3442,7 @@ var WitnessBuilder = class {
           () => 0n
         ),
         nonces: pad2(
-          all.map((note) => note.nonce),
+          [...p.inputs.map((input) => input.note.nonce), ...outputs.map(() => 0n)],
           n.capacity,
           () => 0n
         ),
@@ -3332,7 +3486,7 @@ var WitnessBuilder = class {
     );
     if (p.change)
       check2(
-        p.change.walletIdentity === note.ownerWalletIdentity && await this.noteLeaf(p.change) === p.params.changeCommitment,
+        p.change.ownerAddress === note.ownerWalletIdentity && await this.noteLeaf(p.change) === p.params.changeCommitment,
         "change commitment mismatch"
       );
     else check2(BigInt(p.params.changeCommitment) === 0n, "missing change note");
@@ -3551,14 +3705,14 @@ var WitnessBuilder = class {
 };
 
 // src/factory.ts
-import { Contract as Contract3, getAddress as getAddress8 } from "ethers";
+import { Contract as Contract3, getAddress as getAddress9 } from "ethers";
 async function resolveInstanceAddress(client, factoryAddress, salt) {
   const instance = await new Contract3(
-    getAddress8(factoryAddress),
+    getAddress9(factoryAddress),
     invisiFactoryAbi,
     client
   ).getFunction("getInstanceAddress")(salt);
-  return getAddress8(instance);
+  return getAddress9(instance);
 }
 export {
   AddressRegistry,