@invisi-labs/protocol 1.1.1 → 1.1.3

package/dist/index.cjs

@@ -4271,8 +4271,8 @@ function notes(v, name) {
     throw new Error(`duplicate or zero ${name}`);
   return r;
 }
-function envelope(v, length, version) {
-  if (!(0, import_ethers4.isHexString)(v) || !/^0x(?:[a-fA-F0-9]{2})*$/.test(v) || (0, import_ethers4.dataLength)(v) !== length)
+function envelope(v, length, version, maximum = length) {
+  if (!(0, import_ethers4.isHexString)(v) || !/^0x(?:[a-fA-F0-9]{2})*$/.test(v) || (0, import_ethers4.dataLength)(v) < length || (0, import_ethers4.dataLength)(v) > maximum)
     throw new Error(`ciphertext must be ${length} bytes`);
   if (version !== void 0 && Number.parseInt(v.slice(2, 4), 16) !== version)
     throw new Error("unsupported ciphertext envelope version");
@@ -4318,8 +4318,9 @@ function normalizeDelivery(value, options = {}) {
   }
   const ciphertext = envelope(
     value.ciphertext,
-    options.credit ? 400 : 158,
-    options.credit ? 3 : 1
+    options.credit ? 498 : 160,
+    options.credit ? 5 : 2,
+    options.credit ? 754 : 416
   );
   const clue = envelope(value.clue, 68);
   if (clue.slice(130, 132).toLowerCase() !== "18") throw new Error("clue precision must be 24");
@@ -4545,7 +4546,7 @@ function selectCreditDrawCircuit(count) {
   return {
     name: `credit_draw_slots${maxSize}`,
     maxSize,
-    publicInputCount: 6 * maxSize + 12,
+    publicInputCount: 6 * maxSize + 14,
     totalBits: 126 + Math.ceil(Math.log2(maxSize))
   };
 }
@@ -4598,7 +4599,8 @@ function validateCreditDrawRequest(c, p, cs) {
     totalAmount,
     deadline: checkDeadline(c, p.deadline),
     deliveries,
-    profile
+    profile,
+    periods: (0, import_core5.creditPeriods)(c.timestamp)
   };
 }
 function creditDrawBaseInputs(c, p, cs) {
@@ -4625,7 +4627,9 @@ function creditDrawBaseInputs(c, p, cs) {
     r.deadline,
     h >> 128n,
     h & (1n << 128n) - 1n,
-    ...pad(r.recoveryAmounts.map(BigInt), n)
+    ...pad(r.recoveryAmounts.map(BigInt), n),
+    r.periods.currentDay,
+    r.periods.currentMonth
   ].map(word);
 }
 function validateCancelCreditRequest(c, p) {
@@ -5341,7 +5345,8 @@ async function verifyCreditCommitment(params) {
     params.amount,
     params.nonce,
     params.expiry,
-    await (0, import_core8.computeCreditSharedKeyHash)(params.creditSharedKey)
+    await (0, import_core8.computeCreditSharedKeyHash)(params.creditSharedKey),
+    params
   );
   return BigInt(expected) === BigInt(params.creditCommitment);
 }
@@ -5900,9 +5905,9 @@ var witness_layouts_default = {
     ]
   },
   create_credit: {
-    artifactSha256: "078c6d2da1ed2d6bd27fab28af9970261fe626a0b22ae56ad170e5d15b1b05ba",
+    artifactSha256: "3ed6cfdee4f5fd840f023580f76c208768777fea79737f2511377e5c55be0230",
     keys: {
-      evm: "8285456447e92833a4fa9c330b9c667a3a1b9e48649578082041b9738f037c8f"
+      evm: "56f663c6053be0d158a271022d200c732597efd3a2e0be48fe94549d0b1795e0"
     },
     publicInputCount: 46,
     public: [
@@ -6017,16 +6022,19 @@ var witness_layouts_default = {
       "credit_amount",
       "credit_nonce",
       "credit_shared_key",
+      "single_limit",
+      "daily_limit",
+      "monthly_limit",
       "change_amount",
       "change_nonce"
     ]
   },
   credit_draw_slots1: {
-    artifactSha256: "2b9da9d3d1dbd411d9be1bbe2b34305ac5dce7c7d18e3857d8e2be7dd9bf7c21",
+    artifactSha256: "4542b227e0552b45c302f1dace21cadeba4962c96244e021472f1f7531cff8d1",
     keys: {
-      evm: "613699a440f50a0937e4c57e5152b5fdea42c31b10157d6b93226fef313df553"
+      evm: "43c051a2bedf9454c12e70b10156361e414944823ba23e80662c16c7ced0a2ce"
     },
-    publicInputCount: 18,
+    publicInputCount: 20,
     public: [
       {
         name: "chain_id",
@@ -6108,6 +6116,16 @@ var witness_layouts_default = {
         count: 1,
         array: true
       },
+      {
+        name: "current_day",
+        count: 1,
+        array: false
+      },
+      {
+        name: "current_month",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -6132,15 +6150,22 @@ var witness_layouts_default = {
       "leaf_indices",
       "merkle_paths",
       "input_source_indices",
-      "draw_amounts"
+      "draw_amounts",
+      "single_limits",
+      "daily_limits",
+      "monthly_limits",
+      "last_days",
+      "daily_spents",
+      "last_months",
+      "monthly_spents"
     ]
   },
   credit_draw_slots12: {
-    artifactSha256: "92b741e161a99c05b8810bc24cee6bafc1cebc85347ea47fe511ee6c8f7065be",
+    artifactSha256: "dd72b0867fc3be7cd90de263bd2d0892075cb18eb4f6dd671b13111710f10369",
     keys: {
-      evm: "a5ae214784fe6e523977ef4e283a6d217fc3f4ec0c5a40effb275693a74ee5ce"
+      evm: "5e31d771e6294993736078596d9c69f21fe7595eda50e3cce6d7406b65cf1443"
     },
-    publicInputCount: 84,
+    publicInputCount: 86,
     public: [
       {
         name: "chain_id",
@@ -6222,6 +6247,16 @@ var witness_layouts_default = {
         count: 12,
         array: true
       },
+      {
+        name: "current_day",
+        count: 1,
+        array: false
+      },
+      {
+        name: "current_month",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -6246,15 +6281,22 @@ var witness_layouts_default = {
       "leaf_indices",
       "merkle_paths",
       "input_source_indices",
-      "draw_amounts"
+      "draw_amounts",
+      "single_limits",
+      "daily_limits",
+      "monthly_limits",
+      "last_days",
+      "daily_spents",
+      "last_months",
+      "monthly_spents"
     ]
   },
   credit_draw_slots50: {
-    artifactSha256: "9c6a23d5dbca3a1aeed461c908f228e89642550775cbc519d633bb1c984a3d04",
+    artifactSha256: "09c7469866748b4c0c4bbf2b040844771948a170999f6dc7a38fe5c0ecda4054",
     keys: {
-      evm: "f0b192e2cb312148c7a16fae3acaed9efb01b0c6a1b381ce03468f00b4ef0f2a"
+      evm: "7b613225b6f32a077011d4196c356e836d22dcd116efe687fde53144fbd8db9f"
     },
-    publicInputCount: 312,
+    publicInputCount: 314,
     public: [
       {
         name: "chain_id",
@@ -6336,6 +6378,16 @@ var witness_layouts_default = {
         count: 50,
         array: true
       },
+      {
+        name: "current_day",
+        count: 1,
+        array: false
+      },
+      {
+        name: "current_month",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -6360,15 +6412,22 @@ var witness_layouts_default = {
       "leaf_indices",
       "merkle_paths",
       "input_source_indices",
-      "draw_amounts"
+      "draw_amounts",
+      "single_limits",
+      "daily_limits",
+      "monthly_limits",
+      "last_days",
+      "daily_spents",
+      "last_months",
+      "monthly_spents"
     ]
   },
   credit_draw_slots120: {
-    artifactSha256: "69686a4f0a8a98d8cef06485b0de1804ca2e8f47ce0244287a03ceef4d67625a",
+    artifactSha256: "6ccd0366a669c50fd5da875c3eae194fe8aa4c36d35a5f9ebfd64636ea599b48",
     keys: {
-      evm: "6f32ca89775f332a9193af9b1e25641ef14fda9fbdd2685c33ee775d3c170b92"
+      evm: "d715848afc5c1ecdfcef5ed5026865abef5040a3bc232fd65330a5ffee8475fb"
     },
-    publicInputCount: 732,
+    publicInputCount: 734,
     public: [
       {
         name: "chain_id",
@@ -6450,6 +6509,16 @@ var witness_layouts_default = {
         count: 120,
         array: true
       },
+      {
+        name: "current_day",
+        count: 1,
+        array: false
+      },
+      {
+        name: "current_month",
+        count: 1,
+        array: false
+      },
       {
         name: "auth_digest_high",
         count: 1,
@@ -6474,13 +6543,20 @@ var witness_layouts_default = {
       "leaf_indices",
       "merkle_paths",
       "input_source_indices",
-      "draw_amounts"
+      "draw_amounts",
+      "single_limits",
+      "daily_limits",
+      "monthly_limits",
+      "last_days",
+      "daily_spents",
+      "last_months",
+      "monthly_spents"
     ]
   },
   credit_cancel: {
-    artifactSha256: "ff278a04f22d2886c9f27f7785a0b8fc317dd242fd4aa9d0d9398d18b7513daf",
+    artifactSha256: "b4459c2cf756d096e37291cf4d7cd129866b6d420b6d03c928f383b057112ccb",
     keys: {
-      evm: "1f8a3c20cb081d6a90962556da3124919cc4e5675e59ad31562af39299da02fb"
+      evm: "fc8ad196ef15f3328afcc8f01d867a3ebefd15451c2813948442fab1923b73b2"
     },
     publicInputCount: 11,
     public: [
@@ -6550,14 +6626,21 @@ var witness_layouts_default = {
       "input_nonce",
       "expiry",
       "credit_shared_key",
+      "single_limit",
+      "daily_limit",
+      "monthly_limit",
+      "last_day",
+      "daily_spent",
+      "last_month",
+      "monthly_spent",
       "leaf_index",
       "merkle_path"
     ]
   },
   credit_top_up: {
-    artifactSha256: "fbe662363d9814983f7940f74369117cd6c84783945fbf527b0ed48d011b58a4",
+    artifactSha256: "2ffebd5753ec1b0c050204d4f97498765fe61ea01a793a9b2466c2f97536345c",
     keys: {
-      evm: "44436f31414497a708355426da051ee48ba63fdebcb6cfd72347c37c34c98c50"
+      evm: "40b02a9d2e7eb7b49daaac4b7760328537b7982fd5a225cc065bb74cd5ef44b3"
     },
     publicInputCount: 50,
     public: [
@@ -6692,6 +6775,16 @@ var witness_layouts_default = {
       "credit_amount",
       "credit_nonce",
       "credit_shared_key",
+      "single_limit",
+      "daily_limit",
+      "monthly_limit",
+      "previous_single_limit",
+      "previous_daily_limit",
+      "previous_monthly_limit",
+      "last_day",
+      "daily_spent",
+      "last_month",
+      "monthly_spent",
       "change_amount",
       "change_nonce",
       "previous_credit_amount",
@@ -6707,6 +6800,20 @@ var pad2 = (values, count, zero) => {
   if (values.length > count) throw new Error("witness capacity exceeded");
   return [...values, ...Array.from({ length: count - values.length }, zero)];
 };
+var policyWitness = (note, usage = true) => {
+  const p = (0, import_core10.normalizeCreditPolicy)(note);
+  return {
+    single_limit: p.singleLimit,
+    daily_limit: p.dailyLimit,
+    monthly_limit: p.monthlyLimit,
+    ...usage ? {
+      last_day: p.lastDay,
+      daily_spent: p.dailySpent,
+      last_month: p.lastMonth,
+      monthly_spent: p.monthlySpent
+    } : {}
+  };
+};
 var zeros = () => Array(16).fill(0n);
 var zeroAuthority = () => ({
   public_key_x: Array(32).fill(0),
@@ -6835,7 +6942,8 @@ var WitnessBuilder = class {
       note.amount,
       note.nonce,
       note.expiry,
-      await (0, import_core10.computeCreditSharedKeyHash)(note.creditSharedKey)
+      await (0, import_core10.computeCreditSharedKeyHash)(note.creditSharedKey),
+      note
     );
   }
   async noteInputs(inputs, sources, nullifiers, identity, authority) {
@@ -6919,6 +7027,8 @@ var WitnessBuilder = class {
       await this.creditLeaf(note) === p.params.creditCommitment && note.ownerPayout === BigInt(p.params.owner) && note.expiry === p.params.expiry,
       "Credit creation mismatch"
     );
+    if (operation === "create-credit" && [note.lastDay, note.dailySpent, note.lastMonth, note.monthlySpent].some((v) => v !== 0n))
+      throw new Error("new Credit usage must be zero");
     const authority = await this.authority(
       operation,
       10,
@@ -6965,6 +7075,7 @@ var WitnessBuilder = class {
       spender_payout: note.spenderPayout,
       spender_wallet_identity: BigInt(note.spenderWalletIdentity),
       owner_wallet_identity: BigInt(note.ownerWalletIdentity),
+      ...policyWitness(note, operation === "top-up-credit"),
       credit_amount: note.amount,
       credit_nonce: note.nonce,
       credit_shared_key: note.creditSharedKey,
@@ -7006,6 +7117,7 @@ var WitnessBuilder = class {
         spender_payout: note.spenderPayout,
         spender_wallet_identity: BigInt(note.spenderWalletIdentity),
         owner_wallet_identity: BigInt(note.ownerWalletIdentity),
+        ...policyWitness(note),
         input_nonce: note.nonce,
         expiry: note.expiry,
         credit_shared_key: note.creditSharedKey,
@@ -7016,7 +7128,7 @@ var WitnessBuilder = class {
     );
   }
   async drawCredit(p) {
-    const c = this.#protocol.context, profile = selectCreditDrawCircuit(p.inputs.length), capacity = profile.maxSize;
+    const c = { ...this.#protocol.context, timestamp: p.timestamp }, profile = selectCreditDrawCircuit(p.inputs.length), capacity = profile.maxSize;
     check2(
       p.inputs.length === p.amounts.length && p.inputs.length === p.params.nullifiers.length,
       "draw input count mismatch"
@@ -7031,6 +7143,7 @@ var WitnessBuilder = class {
     );
     const sourceIndices = await Promise.all(
       notes2.map(async (note, i) => {
+        (0, import_core10.applyCreditDrawUsage)(note, p.amounts[i], p.timestamp);
         const leaf = await this.creditLeaf(note);
         check2(
           note.spenderWalletIdentity === identity && note.spenderPayout === BigInt(p.params.spender) && note.expiry === p.params.expiries[i] && p.amounts[i] > 0n && p.amounts[i] <= note.amount && await (0, import_core10.computeCreditNullifier)(c.chainId, note.creditSharedKey, leaf) === p.params.nullifiers[i],
@@ -7043,6 +7156,26 @@ var WitnessBuilder = class {
       profile.name,
       {
         ...authority,
+        ...Object.fromEntries(
+          Object.entries({
+            singleLimit: "single_limits",
+            dailyLimit: "daily_limits",
+            monthlyLimit: "monthly_limits",
+            lastDay: "last_days",
+            dailySpent: "daily_spents",
+            lastMonth: "last_months",
+            monthlySpent: "monthly_spents"
+          }).map(([key, name]) => [
+            name,
+            pad2(
+              notes2.map(
+                (note) => (0, import_core10.normalizeCreditPolicy)(note)[key]
+              ),
+              capacity,
+              () => 0n
+            )
+          ])
+        ),
         spender_wallet_identity: BigInt(identity),
         owner_payouts: pad2(
           notes2.map((note) => note.ownerPayout),
@@ -7092,7 +7225,11 @@ var WitnessBuilder = class {
       "ownerWalletIdentity",
       "spenderPayout",
       "ownerPayout",
-      "creditSharedKey"
+      "creditSharedKey",
+      "lastDay",
+      "dailySpent",
+      "lastMonth",
+      "monthlySpent"
     ])
       check2(old[field2] === note[field2], "Credit role or payout changed");
     check2(
@@ -7113,6 +7250,9 @@ var WitnessBuilder = class {
       "credit_top_up",
       {
         ...base,
+        previous_single_limit: old.singleLimit,
+        previous_daily_limit: old.dailyLimit,
+        previous_monthly_limit: old.monthlyLimit,
         previous_credit_amount: old.amount,
         previous_credit_nonce: old.nonce,
         previous_credit_leaf_index: BigInt(p.previous.leafIndex),