@invisi-labs/protocol 1.1.3 → 1.1.5

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as _invisi_labs_core from '@invisi-labs/core';
-import { Hex, Address, ReceivingKeyLookup, Wallet, Note, CreditDeliveryState, AuthorizedStatement } from '@invisi-labs/core';
-import { ContractRunner, Signer, Provider } from 'ethers';
+import { Hex, Address, ReceivingKeyLookup, PublicWallet, CreditDeliveryState, AuthorizedStatement, Note } from '@invisi-labs/core';
+import { ContractRunner, Provider } from 'ethers';
 import { DeploymentContext, CanonicalBlock, ProtocolDeployment, ProtocolRpcClient } from '@invisi-labs/rpc';
 export { CanonicalBlock, DeploymentContext, Membership, ProtocolDataProvider, ProtocolDataStatus, ProtocolUpdateRange, ProtocolUpdates } from '@invisi-labs/rpc';
 import { F as FundingParams, D as Delivery, I as InputSource, C as CreateCreditParams, a as CancelCreditParams, b as CreditDrawParams, T as TopUpCreditParams, c as TransactRequest, S as ShieldParams, d as ShieldOutput, e as CrossTreeTransactParams } from './types-BCTQjKzw.cjs';
@@ -105,8 +105,8 @@ declare function normalizeSources(sources: readonly InputSource[], inputCount: n
     merkleRoot: `0x${string}`;
 }[];
 declare const pad: (v: readonly bigint[], n: number) => bigint[];
-declare function normalizeDelivery(value: Delivery, options?: {
-    credit?: boolean;
+/** Receipt/transport validation must not reject unrelated future wallet codecs. */
+declare function normalizeOpaqueDelivery(value: Delivery, options?: {
     empty?: boolean;
 }): Delivery;
 declare const deliveriesHash: (v: readonly Delivery[]) => Hex;
@@ -183,9 +183,8 @@ interface RegistryReader extends Pick<ChainReader, "getChainId" | "getCode" | "g
     getRegistryNonce(context: RegistryContext, walletIdentity: Hex, block: CanonicalBlock): Promise<bigint>;
 }
 interface RegistrationPreparation {
-    wallet: Wallet;
+    wallet: PublicWallet;
     reader: RegistryReader;
-    signer?: Signer;
     deadline?: bigint;
     update?: boolean;
 }
@@ -207,10 +206,13 @@ declare class RegistrationOperation {
         chainId: bigint;
         registryAddress: `0x${string}`;
     };
-    /** Sign with ethers, or attach externally obtained ERC-1271 signature bytes. */
-    authorize(options?: {
+    /** Export portable EIP-712 data for external signing. */
+    exportRegistrationAuthorization(options?: {
+        signal?: AbortSignal;
+    }): Promise<_invisi_labs_core.SigningRequest>;
+    /** Validate and attach an independently obtained EOA or ERC-1271 signature. */
+    withSignature(signature: string, options?: {
         signal?: AbortSignal;
-        signature?: Hex;
     }): Promise<RegistrationOperation>;
     /** Empty signatures require the transaction sender to be the wallet owner. */
     authorizeDirect(): Promise<RegistrationOperation>;
@@ -927,16 +929,6 @@ interface VerifyCreditCommitmentParams extends Partial<_invisi_labs_core.CreditP
  */
 declare function verifyCreditCommitment(params: VerifyCreditCommitmentParams): Promise<boolean>;
 
-interface BuildWithdrawalCalldataParams extends Omit<BuildTransactCalldataParams, "deliveries"> {
-    sourceNotes: readonly Note[];
-}
-/** Prepare a full public withdrawal whose spending authority is already proven in the supplied proof. */
-declare function buildWithdrawalCalldata(p: BuildWithdrawalCalldataParams): Promise<{
-    data: `0x${string}`;
-    capacity: 112 | 14 | 56 | 168;
-    approveAmount: bigint;
-}>;
-
 interface NoteMembership {
     note: Note;
     treeId: bigint;
@@ -1007,4 +999,4 @@ declare class WitnessBuilder {
  */
 declare function resolveInstanceAddress(client: ContractRunner, factoryAddress: `0x${string}`, salt: `0x${string}`): Promise<`0x${string}`>;
 
-export { type AddressRegistration, AddressRegistry, type AddressRegistryOptions, type AggregateMemberInput, type BuildCancelCreditCalldataParams, type BuildCreateCreditCalldataParams, type BuildCreditDrawCalldataParams, type BuildShieldCalldataParams, type BuildTopUpCreditCalldataParams, type BuildTransactAggregateCalldataParams, type BuildTransactCalldataParams, type BuildWithdrawalCalldataParams, CREATE_CREDIT_FIELDS, CREDIT_DRAW_CAPACITIES, type CancelCreditWitnessParams, type CanonicalReceipt, type ChainReader, type CreateCreditWitnessParams, type CreditMembership, type DrawCreditWitnessParams, EMPTY_FUNDING, EMPTY_PERMIT, FIELD_MODULUS, type FactoryReader, type FundingInput, type NoteMembership, Protocol, type ProtocolLog, type ProtocolOptions, type RegistrationCalldata, RegistrationOperation, type RegistrationOptions, type RegistrationPreparation, type RegistrationStatus, type RegistryContext, type RegistryReadClient, type RegistryReader, type RegistryReceivingKeys, TRANSACT_CAPACITIES, TokenProtocol, type TokenProtocolOptions, type TopUpCreditWitnessParams, type TransactCapacity, type TransactRequestParams, type TransactWitnessParams, type TransactionCall, type TransactionContext, type VerifyCreditCommitmentParams, type VerifyNoteCommitmentParams, WitnessBuilder, ZERO_ADDRESS, ZERO_WORD, aggregateMemberRequestHash, aggregatePublicInputs, buildCancelCreditCalldata, buildCreateCreditCalldata, buildCreditDrawCalldata, buildRegistrationCalldata, buildShieldCalldata, buildTopUpCreditCalldata, buildTransactAggregateCalldata, buildTransactCalldata, buildWithdrawalCalldata, cancelCreditBaseInputs, cancelCreditPublicInputs, cancelCreditRequestHash, checkDeadline, createCreditBaseInputs, createCreditPublicInputs, createCreditRequestHash, createRegistryReceivingKeyLookup, creditDrawBaseInputs, creditDrawPublicInputs, deliveriesHash, dense, encodeAggregateFundingTypedData, encodeCancelCreditTypedData, encodeCreateCreditFundingTypedData, encodeCreateCreditTypedData, encodeCreditDrawTypedData, encodeCreditProof, encodeShieldFundingTypedData, encodeTopUpCreditFundingTypedData, encodeTopUpCreditTypedData, encodeTransactFundingTypedData, encodeTransactTypedData, envelope, field, fundingFields, getEIP712Domain, known, normalizeContext, normalizeDelivery, normalizeFunding, normalizeSources, normalizeTransactRequest, notes, pad, registrationDigest, registrationTypedData, resolveInstanceAddress, selectCreditDrawCircuit, selectTransactCapacity, shieldFundingRequestHash, topUpCreditBaseInputs, topUpCreditPublicInputs, topUpCreditRequestHash, transactFundingRequestHash, transactPublicInputs, transactUserPublicInputs, uint, validateCancelCreditRequest, validateCreateCreditRequest, validateCreditDrawRequest, validateFundingSubmission, validateShieldRequest, validateTopUpCreditRequest, verifyCreditCommitment, verifyNoteCommitment, word };
+export { type AddressRegistration, AddressRegistry, type AddressRegistryOptions, type AggregateMemberInput, type BuildCancelCreditCalldataParams, type BuildCreateCreditCalldataParams, type BuildCreditDrawCalldataParams, type BuildShieldCalldataParams, type BuildTopUpCreditCalldataParams, type BuildTransactAggregateCalldataParams, type BuildTransactCalldataParams, CREATE_CREDIT_FIELDS, CREDIT_DRAW_CAPACITIES, type CancelCreditWitnessParams, type CanonicalReceipt, type ChainReader, type CreateCreditWitnessParams, type CreditMembership, type DrawCreditWitnessParams, EMPTY_FUNDING, EMPTY_PERMIT, FIELD_MODULUS, type FactoryReader, type FundingInput, type NoteMembership, Protocol, type ProtocolLog, type ProtocolOptions, type RegistrationCalldata, RegistrationOperation, type RegistrationOptions, type RegistrationPreparation, type RegistrationStatus, type RegistryContext, type RegistryReadClient, type RegistryReader, type RegistryReceivingKeys, TRANSACT_CAPACITIES, TokenProtocol, type TokenProtocolOptions, type TopUpCreditWitnessParams, type TransactCapacity, type TransactRequestParams, type TransactWitnessParams, type TransactionCall, type TransactionContext, type VerifyCreditCommitmentParams, type VerifyNoteCommitmentParams, WitnessBuilder, ZERO_ADDRESS, ZERO_WORD, aggregateMemberRequestHash, aggregatePublicInputs, buildCancelCreditCalldata, buildCreateCreditCalldata, buildCreditDrawCalldata, buildRegistrationCalldata, buildShieldCalldata, buildTopUpCreditCalldata, buildTransactAggregateCalldata, buildTransactCalldata, cancelCreditBaseInputs, cancelCreditPublicInputs, cancelCreditRequestHash, checkDeadline, createCreditBaseInputs, createCreditPublicInputs, createCreditRequestHash, createRegistryReceivingKeyLookup, creditDrawBaseInputs, creditDrawPublicInputs, deliveriesHash, dense, encodeAggregateFundingTypedData, encodeCancelCreditTypedData, encodeCreateCreditFundingTypedData, encodeCreateCreditTypedData, encodeCreditDrawTypedData, encodeCreditProof, encodeShieldFundingTypedData, encodeTopUpCreditFundingTypedData, encodeTopUpCreditTypedData, encodeTransactFundingTypedData, encodeTransactTypedData, envelope, field, fundingFields, getEIP712Domain, known, normalizeContext, normalizeFunding, normalizeOpaqueDelivery, normalizeSources, normalizeTransactRequest, notes, pad, registrationDigest, registrationTypedData, resolveInstanceAddress, selectCreditDrawCircuit, selectTransactCapacity, shieldFundingRequestHash, topUpCreditBaseInputs, topUpCreditPublicInputs, topUpCreditRequestHash, transactFundingRequestHash, transactPublicInputs, transactUserPublicInputs, uint, validateCancelCreditRequest, validateCreateCreditRequest, validateCreditDrawRequest, validateFundingSubmission, validateShieldRequest, validateTopUpCreditRequest, verifyCreditCommitment, verifyNoteCommitment, word };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _invisi_labs_core from '@invisi-labs/core';
-import { Hex, Address, ReceivingKeyLookup, Wallet, Note, CreditDeliveryState, AuthorizedStatement } from '@invisi-labs/core';
-import { ContractRunner, Signer, Provider } from 'ethers';
+import { Hex, Address, ReceivingKeyLookup, PublicWallet, CreditDeliveryState, AuthorizedStatement, Note } from '@invisi-labs/core';
+import { ContractRunner, Provider } from 'ethers';
 import { DeploymentContext, CanonicalBlock, ProtocolDeployment, ProtocolRpcClient } from '@invisi-labs/rpc';
 export { CanonicalBlock, DeploymentContext, Membership, ProtocolDataProvider, ProtocolDataStatus, ProtocolUpdateRange, ProtocolUpdates } from '@invisi-labs/rpc';
 import { F as FundingParams, D as Delivery, I as InputSource, C as CreateCreditParams, a as CancelCreditParams, b as CreditDrawParams, T as TopUpCreditParams, c as TransactRequest, S as ShieldParams, d as ShieldOutput, e as CrossTreeTransactParams } from './types-BCTQjKzw.js';
@@ -105,8 +105,8 @@ declare function normalizeSources(sources: readonly InputSource[], inputCount: n
     merkleRoot: `0x${string}`;
 }[];
 declare const pad: (v: readonly bigint[], n: number) => bigint[];
-declare function normalizeDelivery(value: Delivery, options?: {
-    credit?: boolean;
+/** Receipt/transport validation must not reject unrelated future wallet codecs. */
+declare function normalizeOpaqueDelivery(value: Delivery, options?: {
     empty?: boolean;
 }): Delivery;
 declare const deliveriesHash: (v: readonly Delivery[]) => Hex;
@@ -183,9 +183,8 @@ interface RegistryReader extends Pick<ChainReader, "getChainId" | "getCode" | "g
     getRegistryNonce(context: RegistryContext, walletIdentity: Hex, block: CanonicalBlock): Promise<bigint>;
 }
 interface RegistrationPreparation {
-    wallet: Wallet;
+    wallet: PublicWallet;
     reader: RegistryReader;
-    signer?: Signer;
     deadline?: bigint;
     update?: boolean;
 }
@@ -207,10 +206,13 @@ declare class RegistrationOperation {
         chainId: bigint;
         registryAddress: `0x${string}`;
     };
-    /** Sign with ethers, or attach externally obtained ERC-1271 signature bytes. */
-    authorize(options?: {
+    /** Export portable EIP-712 data for external signing. */
+    exportRegistrationAuthorization(options?: {
+        signal?: AbortSignal;
+    }): Promise<_invisi_labs_core.SigningRequest>;
+    /** Validate and attach an independently obtained EOA or ERC-1271 signature. */
+    withSignature(signature: string, options?: {
         signal?: AbortSignal;
-        signature?: Hex;
     }): Promise<RegistrationOperation>;
     /** Empty signatures require the transaction sender to be the wallet owner. */
     authorizeDirect(): Promise<RegistrationOperation>;
@@ -927,16 +929,6 @@ interface VerifyCreditCommitmentParams extends Partial<_invisi_labs_core.CreditP
  */
 declare function verifyCreditCommitment(params: VerifyCreditCommitmentParams): Promise<boolean>;
 
-interface BuildWithdrawalCalldataParams extends Omit<BuildTransactCalldataParams, "deliveries"> {
-    sourceNotes: readonly Note[];
-}
-/** Prepare a full public withdrawal whose spending authority is already proven in the supplied proof. */
-declare function buildWithdrawalCalldata(p: BuildWithdrawalCalldataParams): Promise<{
-    data: `0x${string}`;
-    capacity: 112 | 14 | 56 | 168;
-    approveAmount: bigint;
-}>;
-
 interface NoteMembership {
     note: Note;
     treeId: bigint;
@@ -1007,4 +999,4 @@ declare class WitnessBuilder {
  */
 declare function resolveInstanceAddress(client: ContractRunner, factoryAddress: `0x${string}`, salt: `0x${string}`): Promise<`0x${string}`>;
 
-export { type AddressRegistration, AddressRegistry, type AddressRegistryOptions, type AggregateMemberInput, type BuildCancelCreditCalldataParams, type BuildCreateCreditCalldataParams, type BuildCreditDrawCalldataParams, type BuildShieldCalldataParams, type BuildTopUpCreditCalldataParams, type BuildTransactAggregateCalldataParams, type BuildTransactCalldataParams, type BuildWithdrawalCalldataParams, CREATE_CREDIT_FIELDS, CREDIT_DRAW_CAPACITIES, type CancelCreditWitnessParams, type CanonicalReceipt, type ChainReader, type CreateCreditWitnessParams, type CreditMembership, type DrawCreditWitnessParams, EMPTY_FUNDING, EMPTY_PERMIT, FIELD_MODULUS, type FactoryReader, type FundingInput, type NoteMembership, Protocol, type ProtocolLog, type ProtocolOptions, type RegistrationCalldata, RegistrationOperation, type RegistrationOptions, type RegistrationPreparation, type RegistrationStatus, type RegistryContext, type RegistryReadClient, type RegistryReader, type RegistryReceivingKeys, TRANSACT_CAPACITIES, TokenProtocol, type TokenProtocolOptions, type TopUpCreditWitnessParams, type TransactCapacity, type TransactRequestParams, type TransactWitnessParams, type TransactionCall, type TransactionContext, type VerifyCreditCommitmentParams, type VerifyNoteCommitmentParams, WitnessBuilder, ZERO_ADDRESS, ZERO_WORD, aggregateMemberRequestHash, aggregatePublicInputs, buildCancelCreditCalldata, buildCreateCreditCalldata, buildCreditDrawCalldata, buildRegistrationCalldata, buildShieldCalldata, buildTopUpCreditCalldata, buildTransactAggregateCalldata, buildTransactCalldata, buildWithdrawalCalldata, cancelCreditBaseInputs, cancelCreditPublicInputs, cancelCreditRequestHash, checkDeadline, createCreditBaseInputs, createCreditPublicInputs, createCreditRequestHash, createRegistryReceivingKeyLookup, creditDrawBaseInputs, creditDrawPublicInputs, deliveriesHash, dense, encodeAggregateFundingTypedData, encodeCancelCreditTypedData, encodeCreateCreditFundingTypedData, encodeCreateCreditTypedData, encodeCreditDrawTypedData, encodeCreditProof, encodeShieldFundingTypedData, encodeTopUpCreditFundingTypedData, encodeTopUpCreditTypedData, encodeTransactFundingTypedData, encodeTransactTypedData, envelope, field, fundingFields, getEIP712Domain, known, normalizeContext, normalizeDelivery, normalizeFunding, normalizeSources, normalizeTransactRequest, notes, pad, registrationDigest, registrationTypedData, resolveInstanceAddress, selectCreditDrawCircuit, selectTransactCapacity, shieldFundingRequestHash, topUpCreditBaseInputs, topUpCreditPublicInputs, topUpCreditRequestHash, transactFundingRequestHash, transactPublicInputs, transactUserPublicInputs, uint, validateCancelCreditRequest, validateCreateCreditRequest, validateCreditDrawRequest, validateFundingSubmission, validateShieldRequest, validateTopUpCreditRequest, verifyCreditCommitment, verifyNoteCommitment, word };
+export { type AddressRegistration, AddressRegistry, type AddressRegistryOptions, type AggregateMemberInput, type BuildCancelCreditCalldataParams, type BuildCreateCreditCalldataParams, type BuildCreditDrawCalldataParams, type BuildShieldCalldataParams, type BuildTopUpCreditCalldataParams, type BuildTransactAggregateCalldataParams, type BuildTransactCalldataParams, CREATE_CREDIT_FIELDS, CREDIT_DRAW_CAPACITIES, type CancelCreditWitnessParams, type CanonicalReceipt, type ChainReader, type CreateCreditWitnessParams, type CreditMembership, type DrawCreditWitnessParams, EMPTY_FUNDING, EMPTY_PERMIT, FIELD_MODULUS, type FactoryReader, type FundingInput, type NoteMembership, Protocol, type ProtocolLog, type ProtocolOptions, type RegistrationCalldata, RegistrationOperation, type RegistrationOptions, type RegistrationPreparation, type RegistrationStatus, type RegistryContext, type RegistryReadClient, type RegistryReader, type RegistryReceivingKeys, TRANSACT_CAPACITIES, TokenProtocol, type TokenProtocolOptions, type TopUpCreditWitnessParams, type TransactCapacity, type TransactRequestParams, type TransactWitnessParams, type TransactionCall, type TransactionContext, type VerifyCreditCommitmentParams, type VerifyNoteCommitmentParams, WitnessBuilder, ZERO_ADDRESS, ZERO_WORD, aggregateMemberRequestHash, aggregatePublicInputs, buildCancelCreditCalldata, buildCreateCreditCalldata, buildCreditDrawCalldata, buildRegistrationCalldata, buildShieldCalldata, buildTopUpCreditCalldata, buildTransactAggregateCalldata, buildTransactCalldata, cancelCreditBaseInputs, cancelCreditPublicInputs, cancelCreditRequestHash, checkDeadline, createCreditBaseInputs, createCreditPublicInputs, createCreditRequestHash, createRegistryReceivingKeyLookup, creditDrawBaseInputs, creditDrawPublicInputs, deliveriesHash, dense, encodeAggregateFundingTypedData, encodeCancelCreditTypedData, encodeCreateCreditFundingTypedData, encodeCreateCreditTypedData, encodeCreditDrawTypedData, encodeCreditProof, encodeShieldFundingTypedData, encodeTopUpCreditFundingTypedData, encodeTopUpCreditTypedData, encodeTransactFundingTypedData, encodeTransactTypedData, envelope, field, fundingFields, getEIP712Domain, known, normalizeContext, normalizeFunding, normalizeOpaqueDelivery, normalizeSources, normalizeTransactRequest, notes, pad, registrationDigest, registrationTypedData, resolveInstanceAddress, selectCreditDrawCircuit, selectTransactCapacity, shieldFundingRequestHash, topUpCreditBaseInputs, topUpCreditPublicInputs, topUpCreditRequestHash, transactFundingRequestHash, transactPublicInputs, transactUserPublicInputs, uint, validateCancelCreditRequest, validateCreateCreditRequest, validateCreditDrawRequest, validateFundingSubmission, validateShieldRequest, validateTopUpCreditRequest, verifyCreditCommitment, verifyNoteCommitment, word };

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 
 // src/RegistrationOperation.ts
 import { hexlify as hexlify2, Interface as Interface2, getBytes as getBytes2, verifyTypedData } from "ethers";
-import { ReceivingAddress as ReceivingAddress2 } from "@invisi-labs/core";
+import { ReceivingAddress as ReceivingAddress2, createSigningRequest } from "@invisi-labs/core";
 
 // src/registry.ts
 import {
@@ -228,27 +228,20 @@ var RegistrationOperation = class _RegistrationOperation {
       update: this.#plan.update
     };
   }
-  /** Sign with ethers, or attach externally obtained ERC-1271 signature bytes. */
-  async authorize(options = {}) {
+  /** Export portable EIP-712 data for external signing. */
+  async exportRegistrationAuthorization(options = {}) {
+    check(this.status === "prepared", "registry operation is not awaiting authorization");
+    options.signal?.throwIfAborted();
+    await this.validateFreshness();
+    options.signal?.throwIfAborted();
+    return createSigningRequest(this.typedData());
+  }
+  /** Validate and attach an independently obtained EOA or ERC-1271 signature. */
+  async withSignature(signature, options = {}) {
     check(this.status === "prepared", "registry operation is not awaiting authorization");
     options.signal?.throwIfAborted();
     await this.validateFreshness();
     options.signal?.throwIfAborted();
-    let signature = options.signature;
-    if (signature === void 0) {
-      const signer = this.#runtime.signer;
-      check(signer, "registry signer capability is missing");
-      check(
-        BigInt(await signer.getAddress()) === BigInt(this.#plan.registration.walletIdentity),
-        "registry signer does not match wallet owner"
-      );
-      const typed = this.typedData();
-      signature = await signer.signTypedData(
-        typed.domain,
-        typed.types,
-        typed.message
-      );
-    }
     check(
       /^0x(?:[a-fA-F0-9]{2})+$/.test(signature),
       "registry signature must be nonempty hexadecimal bytes"
@@ -516,6 +509,7 @@ import {
 import { computeWalletAuthorizationDigest, walletAuthorizationTypedData } from "@invisi-labs/core";
 
 // src/validation.ts
+import { MAX_CIPHERTEXT_BYTES } from "@invisi-labs/core";
 import {
   AbiCoder,
   dataLength,
@@ -610,19 +604,14 @@ var pad = (v, n) => [
   ...v,
   ...Array(n - v.length).fill(0n)
 ];
-function normalizeDelivery(value, options = {}) {
+function normalizeOpaqueDelivery(value, options = {}) {
   known(value, ["ciphertext", "clue"], "delivery");
   if (options.empty) {
     if (value.ciphertext !== "0x" || value.clue !== "0x")
       throw new Error("absent output requires an empty delivery");
     return { ciphertext: "0x", clue: "0x" };
   }
-  const ciphertext = envelope(
-    value.ciphertext,
-    options.credit ? 498 : 160,
-    options.credit ? 5 : 2,
-    options.credit ? 754 : 416
-  );
+  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");
   return { ciphertext, clue };
@@ -705,7 +694,7 @@ function validateCreateCreditRequest(c, p, cs, funding = {}) {
     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) => normalizeDelivery(v, { credit: i < 2, empty: i === 2 && BigInt(changeCommitment) === 0n })
+    (v, i) => normalizeOpaqueDelivery(v, { empty: i === 2 && BigInt(changeCommitment) === 0n })
   );
   if (ns.length === 0 && f.amount === 0n)
     throw new Error("empty inputs require positive funding");
@@ -891,7 +880,7 @@ function validateCreditDrawRequest(c, p, cs) {
   if (dense(cs, "deliveries").length !== 2 * ns.length)
     throw new Error("deliveries count mismatch");
   const deliveries = cs.map(
-    (v, i) => BigInt(remainderCommitments[Math.floor(i / 2)]) === 0n ? normalizeDelivery(v, { empty: true }) : normalizeDelivery(v, { credit: true })
+    (v, i) => BigInt(remainderCommitments[Math.floor(i / 2)]) === 0n ? normalizeOpaqueDelivery(v, { empty: true }) : normalizeOpaqueDelivery(v, {})
   );
   return {
     ...ctx,
@@ -1153,7 +1142,7 @@ function normalizeTransactRequest(c, p, cs, funding = {}) {
     "deadline"
   ]);
   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) => normalizeDelivery(v));
+  const sources = normalizeSources(p.sources, ns.length, capacity), deliveries = dense(cs, "deliveries").map((v) => normalizeOpaqueDelivery(v));
   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);
   if (withdrawalAmount === 0n !== (BigInt(withdrawalAddress) === 0n) || os.length === 0 && withdrawalAmount === 0n)
@@ -1332,7 +1321,7 @@ async function validateShieldRequest(p) {
     uint(o.amount, 128, "amount");
     if (o.amount === 0n) throw new Error("amount must be positive");
     field(o.identity);
-    normalizeDelivery(cs[i]);
+    normalizeOpaqueDelivery(cs[i]);
     if (await computeNoteCommitment(
       p.context.chainId,
       o.identity,
@@ -1664,40 +1653,6 @@ async function verifyCreditCommitment(params) {
   return BigInt(expected) === BigInt(params.creditCommitment);
 }
 
-// src/withdrawal.ts
-import {
-  computeNoteCommitment as computeNoteCommitment3,
-  computeNoteIdentity as computeNoteIdentity2,
-  computeNoteNullifier
-} from "@invisi-labs/core";
-async function buildWithdrawalCalldata(p) {
-  const r = normalizeTransactRequest(p.context, p.params, [], p.funding);
-  if (r.outputCount !== 0 || r.depositAmount !== 0n || p.sourceNotes.length === 0 || p.sourceNotes.length !== r.inputCount) {
-    throw new Error("full withdrawal requires inputs, no private outputs and no funding");
-  }
-  const walletIdentity = BigInt(p.sourceNotes[0].walletIdentity);
-  let total = 0n;
-  for (const [index, note] of p.sourceNotes.entries()) {
-    if (note.chainId !== p.context.chainId || note.protocolAddress !== BigInt(p.context.protocolAddress))
-      throw new Error("source note context mismatch");
-    if (BigInt(note.walletIdentity) !== walletIdentity || note.tokenAddress !== BigInt(p.context.tokenAddress) || note.amount <= 0n)
-      throw new Error("source note wallet/token/amount mismatch");
-    const commitment = await computeNoteCommitment3(
-      note.chainId,
-      await computeNoteIdentity2(walletIdentity, note.nonce),
-      note.tokenAddress,
-      note.amount
-    );
-    const nullifier = await computeNoteNullifier(note.chainId, note.nonce, commitment);
-    if (nullifier.toLowerCase() !== r.nullifiers[index].toLowerCase())
-      throw new Error("source note nullifier mismatch");
-    total += note.amount;
-  }
-  if (r.withdrawalAmount !== total)
-    throw new Error("withdrawal must equal the full input balance");
-  return buildTransactCalldata({ ...p, deliveries: [] });
-}
-
 // src/witness.ts
 import {
   computeCreditCommitment as computeCreditCommitment2,
@@ -1705,9 +1660,9 @@ import {
   applyCreditDrawUsage,
   computeCreditNullifier,
   computeCreditSharedKeyHash as computeCreditSharedKeyHash2,
-  computeNoteCommitment as computeNoteCommitment4,
-  computeNoteIdentity as computeNoteIdentity3,
-  computeNoteNullifier as computeNoteNullifier2,
+  computeNoteCommitment as computeNoteCommitment3,
+  computeNoteIdentity as computeNoteIdentity2,
+  computeNoteNullifier,
   computeWalletAuthorizationDigest as computeWalletAuthorizationDigest3,
   normalizeCreditDeliveryState,
   poseidonHash,
@@ -3255,9 +3210,9 @@ var WitnessBuilder = class {
   }
   async noteLeaf(note) {
     this.context(note);
-    return computeNoteCommitment4(
+    return computeNoteCommitment3(
       note.chainId,
-      await computeNoteIdentity3(BigInt(note.walletIdentity), note.nonce),
+      await computeNoteIdentity2(BigInt(note.walletIdentity), note.nonce),
       note.tokenAddress,
       note.amount
     );
@@ -3285,7 +3240,7 @@ var WitnessBuilder = class {
         check2(input.note.walletIdentity === identity, "input wallet mismatch");
         const leaf = await this.noteLeaf(input.note);
         check2(
-          await computeNoteNullifier2(input.note.chainId, input.note.nonce, leaf) === nullifiers[i],
+          await computeNoteNullifier(input.note.chainId, input.note.nonce, leaf) === nullifiers[i],
           "input nullifier mismatch"
         );
         return BigInt(await this.membership(leaf, input, sources));
@@ -3629,7 +3584,6 @@ export {
   buildTopUpCreditCalldata,
   buildTransactAggregateCalldata,
   buildTransactCalldata,
-  buildWithdrawalCalldata,
   cancelCreditBaseInputs,
   cancelCreditPublicInputs,
   cancelCreditRequestHash,
@@ -3659,8 +3613,8 @@ export {
   getEIP712Domain,
   known,
   normalizeContext,
-  normalizeDelivery,
   normalizeFunding,
+  normalizeOpaqueDelivery,
   normalizeSources,
   normalizeTransactRequest,
   notes,