@aztec/foundation 0.0.1-commit.b6e433891 → 0.0.1-commit.b8a057fa

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (258) hide show
  1. package/dest/bigint-buffer/index.d.ts +1 -1
  2. package/dest/bigint-buffer/index.d.ts.map +1 -1
  3. package/dest/bigint-buffer/index.js +6 -1
  4. package/dest/branded-types/block_number.d.ts +3 -3
  5. package/dest/branded-types/block_number.d.ts.map +1 -1
  6. package/dest/branded-types/block_number.js +15 -4
  7. package/dest/branded-types/buffer32_hash.d.ts +27 -0
  8. package/dest/branded-types/buffer32_hash.d.ts.map +1 -0
  9. package/dest/branded-types/buffer32_hash.js +12 -0
  10. package/dest/branded-types/checkpoint_number.d.ts +9 -3
  11. package/dest/branded-types/checkpoint_number.d.ts.map +1 -1
  12. package/dest/branded-types/checkpoint_number.js +11 -0
  13. package/dest/branded-types/epoch.d.ts +2 -2
  14. package/dest/branded-types/epoch.d.ts.map +1 -1
  15. package/dest/branded-types/index.d.ts +2 -1
  16. package/dest/branded-types/index.d.ts.map +1 -1
  17. package/dest/branded-types/index.js +1 -0
  18. package/dest/branded-types/index_within_checkpoint.d.ts +2 -2
  19. package/dest/branded-types/index_within_checkpoint.d.ts.map +1 -1
  20. package/dest/branded-types/slot.d.ts +5 -2
  21. package/dest/branded-types/slot.d.ts.map +1 -1
  22. package/dest/branded-types/slot.js +3 -0
  23. package/dest/buffer/buffer16.d.ts +3 -1
  24. package/dest/buffer/buffer16.d.ts.map +1 -1
  25. package/dest/buffer/buffer32.d.ts +28 -61
  26. package/dest/buffer/buffer32.d.ts.map +1 -1
  27. package/dest/buffer/buffer32.js +29 -63
  28. package/dest/collection/array.d.ts +11 -1
  29. package/dest/collection/array.d.ts.map +1 -1
  30. package/dest/collection/array.js +33 -0
  31. package/dest/collection/index.d.ts +3 -1
  32. package/dest/collection/index.d.ts.map +1 -1
  33. package/dest/collection/index.js +2 -0
  34. package/dest/collection/lru_map.d.ts +41 -0
  35. package/dest/collection/lru_map.d.ts.map +1 -0
  36. package/dest/collection/lru_map.js +119 -0
  37. package/dest/collection/lru_set.d.ts +35 -0
  38. package/dest/collection/lru_set.d.ts.map +1 -0
  39. package/dest/collection/lru_set.js +95 -0
  40. package/dest/committable/committable.js +1 -1
  41. package/dest/config/env_var.d.ts +2 -2
  42. package/dest/config/env_var.d.ts.map +1 -1
  43. package/dest/config/index.d.ts +67 -37
  44. package/dest/config/index.d.ts.map +1 -1
  45. package/dest/config/index.js +72 -71
  46. package/dest/config/network_config.d.ts +11 -55
  47. package/dest/config/network_config.d.ts.map +1 -1
  48. package/dest/config/network_name.d.ts +2 -2
  49. package/dest/config/network_name.d.ts.map +1 -1
  50. package/dest/config/network_name.js +1 -3
  51. package/dest/config/secret_value.d.ts +2 -2
  52. package/dest/config/secret_value.d.ts.map +1 -1
  53. package/dest/crypto/aes128/index.d.ts +2 -1
  54. package/dest/crypto/aes128/index.d.ts.map +1 -1
  55. package/dest/crypto/aes128/index.js +11 -2
  56. package/dest/crypto/bls/bn254_keystore.d.ts +10 -177
  57. package/dest/crypto/bls/bn254_keystore.d.ts.map +1 -1
  58. package/dest/crypto/bls/bn254_keystore.js +22 -34
  59. package/dest/crypto/keys/index.d.ts +3 -2
  60. package/dest/crypto/keys/index.d.ts.map +1 -1
  61. package/dest/crypto/keys/index.js +30 -6
  62. package/dest/crypto/poseidon/index.d.ts +1 -1
  63. package/dest/crypto/poseidon/index.d.ts.map +1 -1
  64. package/dest/crypto/poseidon/index.js +40 -33
  65. package/dest/crypto/schnorr/index.d.ts +8 -7
  66. package/dest/crypto/schnorr/index.d.ts.map +1 -1
  67. package/dest/crypto/schnorr/index.js +6 -6
  68. package/dest/crypto/schnorr/signature.d.ts +9 -29
  69. package/dest/crypto/schnorr/signature.d.ts.map +1 -1
  70. package/dest/crypto/schnorr/signature.js +20 -36
  71. package/dest/curves/bls12/field.d.ts +3 -3
  72. package/dest/curves/bls12/field.d.ts.map +1 -1
  73. package/dest/curves/bls12/field.js +0 -5
  74. package/dest/curves/bls12/point.d.ts +2 -2
  75. package/dest/curves/bls12/point.d.ts.map +1 -1
  76. package/dest/curves/bn254/field.d.ts +23 -19
  77. package/dest/curves/bn254/field.d.ts.map +1 -1
  78. package/dest/curves/bn254/field.js +23 -17
  79. package/dest/curves/grumpkin/point.d.ts +14 -28
  80. package/dest/curves/grumpkin/point.d.ts.map +1 -1
  81. package/dest/curves/grumpkin/point.js +29 -43
  82. package/dest/eth-address/index.d.ts +2 -2
  83. package/dest/eth-address/index.d.ts.map +1 -1
  84. package/dest/eth-address/index.js +0 -3
  85. package/dest/eth-signature/eth_signature.d.ts +2 -2
  86. package/dest/eth-signature/eth_signature.d.ts.map +1 -1
  87. package/dest/fifo/fifo_frame_reader.d.ts +41 -0
  88. package/dest/fifo/fifo_frame_reader.d.ts.map +1 -0
  89. package/dest/fifo/fifo_frame_reader.js +91 -0
  90. package/dest/fifo/index.d.ts +2 -0
  91. package/dest/fifo/index.d.ts.map +1 -0
  92. package/dest/fifo/index.js +1 -0
  93. package/dest/fifo_set/fifo_set.d.ts +15 -0
  94. package/dest/fifo_set/fifo_set.d.ts.map +1 -0
  95. package/dest/fifo_set/fifo_set.js +39 -0
  96. package/dest/fifo_set/index.d.ts +2 -0
  97. package/dest/fifo_set/index.d.ts.map +1 -0
  98. package/dest/fifo_set/index.js +1 -0
  99. package/dest/json-rpc/client/fetch.d.ts +1 -1
  100. package/dest/json-rpc/client/fetch.d.ts.map +1 -1
  101. package/dest/json-rpc/client/fetch.js +4 -3
  102. package/dest/json-rpc/client/safe_json_rpc_client.d.ts +1 -1
  103. package/dest/json-rpc/client/safe_json_rpc_client.d.ts.map +1 -1
  104. package/dest/json-rpc/client/safe_json_rpc_client.js +2 -2
  105. package/dest/json-rpc/client/undici.d.ts +1 -1
  106. package/dest/json-rpc/client/undici.d.ts.map +1 -1
  107. package/dest/json-rpc/client/undici.js +5 -3
  108. package/dest/json-rpc/fixtures/test_state.d.ts +4 -8
  109. package/dest/json-rpc/fixtures/test_state.d.ts.map +1 -1
  110. package/dest/json-rpc/fixtures/test_state.js +57 -17
  111. package/dest/json-rpc/server/safe_json_rpc_server.d.ts +8 -3
  112. package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
  113. package/dest/json-rpc/server/safe_json_rpc_server.js +27 -13
  114. package/dest/log/pino-logger.d.ts +1 -1
  115. package/dest/log/pino-logger.d.ts.map +1 -1
  116. package/dest/log/pino-logger.js +17 -2
  117. package/dest/noir/noir_package_config.d.ts +19 -104
  118. package/dest/noir/noir_package_config.d.ts.map +1 -1
  119. package/dest/noir/noir_package_config.js +1 -1
  120. package/dest/promise/running-promise.d.ts +5 -4
  121. package/dest/promise/running-promise.d.ts.map +1 -1
  122. package/dest/promise/running-promise.js +7 -3
  123. package/dest/queue/batch_queue.d.ts +1 -1
  124. package/dest/queue/batch_queue.d.ts.map +1 -1
  125. package/dest/queue/batch_queue.js +1 -0
  126. package/dest/retry/index.d.ts +31 -3
  127. package/dest/retry/index.d.ts.map +1 -1
  128. package/dest/retry/index.js +44 -2
  129. package/dest/schemas/api.d.ts +12 -10
  130. package/dest/schemas/api.d.ts.map +1 -1
  131. package/dest/schemas/api.js +7 -1
  132. package/dest/schemas/parse.d.ts +4 -4
  133. package/dest/schemas/parse.d.ts.map +1 -1
  134. package/dest/schemas/parse.js +6 -5
  135. package/dest/schemas/schemas.d.ts +15 -15
  136. package/dest/schemas/types.d.ts +3 -3
  137. package/dest/schemas/types.d.ts.map +1 -1
  138. package/dest/schemas/utils.d.ts +7 -11
  139. package/dest/schemas/utils.d.ts.map +1 -1
  140. package/dest/schemas/utils.js +2 -18
  141. package/dest/serialize/buffer_sink.d.ts +134 -0
  142. package/dest/serialize/buffer_sink.d.ts.map +1 -0
  143. package/dest/serialize/buffer_sink.js +297 -0
  144. package/dest/serialize/index.d.ts +2 -1
  145. package/dest/serialize/index.d.ts.map +1 -1
  146. package/dest/serialize/index.js +1 -0
  147. package/dest/string/index.js +1 -1
  148. package/dest/testing/files/index.d.ts +2 -3
  149. package/dest/testing/files/index.d.ts.map +1 -1
  150. package/dest/testing/files/index.js +1 -2
  151. package/dest/timer/index.d.ts +2 -2
  152. package/dest/timer/index.d.ts.map +1 -1
  153. package/dest/timer/index.js +1 -1
  154. package/dest/timer/timeout.d.ts +3 -1
  155. package/dest/timer/timeout.d.ts.map +1 -1
  156. package/dest/timer/timeout.js +26 -0
  157. package/dest/transport/dispatch/create_dispatch_proxy.d.ts +11 -2
  158. package/dest/transport/dispatch/create_dispatch_proxy.d.ts.map +1 -1
  159. package/dest/transport/index.d.ts +1 -2
  160. package/dest/transport/index.d.ts.map +1 -1
  161. package/dest/transport/index.js +0 -1
  162. package/dest/trees/balanced_merkle_tree_root.d.ts +2 -3
  163. package/dest/trees/balanced_merkle_tree_root.d.ts.map +1 -1
  164. package/dest/trees/balanced_merkle_tree_root.js +2 -3
  165. package/dest/trees/hasher.d.ts +3 -2
  166. package/dest/trees/hasher.d.ts.map +1 -1
  167. package/dest/trees/hasher.js +5 -5
  168. package/dest/trees/indexed_merkle_tree_calculator.d.ts +1 -1
  169. package/dest/trees/indexed_merkle_tree_calculator.d.ts.map +1 -1
  170. package/dest/trees/indexed_merkle_tree_calculator.js +5 -1
  171. package/dest/trees/membership_witness.d.ts +2 -6
  172. package/dest/trees/membership_witness.d.ts.map +1 -1
  173. package/dest/trees/membership_witness.js +0 -9
  174. package/dest/trees/merkle_tree_calculator.d.ts +4 -2
  175. package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
  176. package/dest/trees/merkle_tree_calculator.js +1 -5
  177. package/dest/trees/sibling_path.d.ts +5 -4
  178. package/dest/trees/sibling_path.d.ts.map +1 -1
  179. package/dest/trees/sibling_path.js +10 -8
  180. package/dest/trees/unbalanced_merkle_tree_root.d.ts +2 -3
  181. package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -1
  182. package/dest/trees/unbalanced_merkle_tree_root.js +2 -3
  183. package/dest/types/index.d.ts +23 -1
  184. package/dest/types/index.d.ts.map +1 -1
  185. package/dest/types/index.js +15 -0
  186. package/package.json +6 -4
  187. package/src/bigint-buffer/index.ts +6 -1
  188. package/src/branded-types/block_number.ts +20 -2
  189. package/src/branded-types/buffer32_hash.ts +38 -0
  190. package/src/branded-types/checkpoint_number.ts +16 -1
  191. package/src/branded-types/epoch.ts +1 -1
  192. package/src/branded-types/index.ts +1 -0
  193. package/src/branded-types/index_within_checkpoint.ts +1 -1
  194. package/src/branded-types/slot.ts +6 -1
  195. package/src/buffer/buffer16.ts +3 -0
  196. package/src/buffer/buffer32.ts +39 -68
  197. package/src/collection/array.ts +34 -0
  198. package/src/collection/index.ts +2 -0
  199. package/src/collection/lru_map.ts +143 -0
  200. package/src/collection/lru_set.ts +115 -0
  201. package/src/committable/committable.ts +1 -1
  202. package/src/config/env_var.ts +48 -24
  203. package/src/config/index.ts +143 -122
  204. package/src/config/network_name.ts +2 -5
  205. package/src/config/secret_value.ts +1 -1
  206. package/src/crypto/aes128/index.ts +11 -2
  207. package/src/crypto/bls/bn254_keystore.ts +33 -43
  208. package/src/crypto/keys/index.ts +20 -4
  209. package/src/crypto/poseidon/index.ts +42 -34
  210. package/src/crypto/schnorr/index.ts +9 -8
  211. package/src/crypto/schnorr/signature.ts +17 -46
  212. package/src/curves/bls12/field.ts +0 -7
  213. package/src/curves/bn254/field.ts +35 -34
  214. package/src/curves/grumpkin/point.ts +23 -40
  215. package/src/eth-address/index.ts +0 -4
  216. package/src/fifo/fifo_frame_reader.ts +113 -0
  217. package/src/fifo/index.ts +1 -0
  218. package/src/fifo_set/fifo_set.ts +52 -0
  219. package/src/fifo_set/index.ts +1 -0
  220. package/src/json-rpc/client/fetch.ts +4 -3
  221. package/src/json-rpc/client/safe_json_rpc_client.ts +2 -2
  222. package/src/json-rpc/client/undici.ts +5 -3
  223. package/src/json-rpc/fixtures/test_state.ts +10 -10
  224. package/src/json-rpc/server/safe_json_rpc_server.ts +31 -13
  225. package/src/log/pino-logger.ts +19 -2
  226. package/src/noir/noir_package_config.ts +32 -20
  227. package/src/promise/running-promise.ts +8 -5
  228. package/src/queue/batch_queue.ts +1 -0
  229. package/src/retry/index.ts +66 -4
  230. package/src/schemas/api.ts +25 -25
  231. package/src/schemas/parse.ts +9 -6
  232. package/src/schemas/schemas.ts +4 -4
  233. package/src/schemas/types.ts +2 -2
  234. package/src/schemas/utils.ts +4 -38
  235. package/src/serialize/buffer_sink.ts +350 -0
  236. package/src/serialize/index.ts +1 -0
  237. package/src/string/index.ts +1 -1
  238. package/src/testing/files/index.ts +1 -2
  239. package/src/timer/index.ts +1 -1
  240. package/src/timer/timeout.ts +31 -0
  241. package/src/transport/dispatch/create_dispatch_proxy.ts +11 -1
  242. package/src/transport/index.ts +0 -1
  243. package/src/trees/balanced_merkle_tree_root.ts +2 -5
  244. package/src/trees/hasher.ts +6 -3
  245. package/src/trees/indexed_merkle_tree_calculator.ts +5 -1
  246. package/src/trees/membership_witness.ts +0 -8
  247. package/src/trees/merkle_tree_calculator.ts +4 -10
  248. package/src/trees/sibling_path.ts +11 -6
  249. package/src/trees/unbalanced_merkle_tree_root.ts +2 -5
  250. package/src/types/index.ts +47 -0
  251. package/dest/crypto/serialize.d.ts +0 -51
  252. package/dest/crypto/serialize.d.ts.map +0 -1
  253. package/dest/crypto/serialize.js +0 -68
  254. package/dest/transport/dispatch/create_dispatch_fn.d.ts +0 -25
  255. package/dest/transport/dispatch/create_dispatch_fn.d.ts.map +0 -1
  256. package/dest/transport/dispatch/create_dispatch_fn.js +0 -17
  257. package/src/crypto/serialize.ts +0 -85
  258. package/src/transport/dispatch/create_dispatch_fn.ts +0 -35
@@ -1,7 +1,6 @@
1
1
  export type NetworkNames =
2
2
  | 'local'
3
- | 'staging-ignition'
4
- | 'staging-public'
3
+ | 'staging'
5
4
  | 'testnet'
6
5
  | 'mainnet'
7
6
  | 'next-net'
@@ -12,9 +11,7 @@ export function getActiveNetworkName(name?: string): NetworkNames {
12
11
  const network = name || process.env.NETWORK;
13
12
  if (!network || network === '' || network === 'local') {
14
13
  return 'local';
15
- } else if (network === 'staging-ignition') {
16
- return network;
17
- } else if (network === 'staging-public') {
14
+ } else if (network === 'staging') {
18
15
  return network;
19
16
  } else if (network === 'testnet' || network === 'alpha-testnet') {
20
17
  return 'testnet';
@@ -43,7 +43,7 @@ export class SecretValue<T> {
43
43
  /**
44
44
  * Returns a Zod schema
45
45
  */
46
- static schema<O>(valueSchema: ZodType<O, any, any>): ZodType<SecretValue<O>, any, any> {
46
+ static schema<O>(valueSchema: ZodType<O, any>): ZodType<SecretValue<O>, any> {
47
47
  return valueSchema.transform(value => new SecretValue<O>(value));
48
48
  }
49
49
  }
@@ -59,10 +59,19 @@ export class Aes128 {
59
59
  * @param iv - AES initialization vector.
60
60
  * @param key - Key to decrypt with.
61
61
  * @returns Decrypted data.
62
+ * @throws If the decrypted buffer has invalid PKCS#7 padding.
62
63
  */
63
64
  public async decryptBufferCBC(data: Uint8Array, iv: Uint8Array, key: Uint8Array) {
64
65
  const paddedBuffer = await this.decryptBufferCBCKeepPadding(data, iv, key);
65
- const paddingToRemove = paddedBuffer[paddedBuffer.length - 1];
66
- return paddedBuffer.subarray(0, paddedBuffer.length - paddingToRemove);
66
+ const paddingLen = paddedBuffer[paddedBuffer.length - 1];
67
+ if (paddingLen === 0 || paddingLen > 16) {
68
+ throw new Error(`Invalid PKCS#7 padding length: ${paddingLen}`);
69
+ }
70
+ for (let i = paddedBuffer.length - paddingLen; i < paddedBuffer.length; i++) {
71
+ if (paddedBuffer[i] !== paddingLen) {
72
+ throw new Error('Invalid PKCS#7 padding');
73
+ }
74
+ }
75
+ return paddedBuffer.subarray(0, paddedBuffer.length - paddingLen);
67
76
  }
68
77
  }
@@ -1,7 +1,8 @@
1
1
  import { randomBytes } from '@aztec/foundation/crypto/random';
2
2
 
3
- import { createCipheriv, createDecipheriv, createHash, pbkdf2Sync, randomUUID } from 'crypto';
3
+ import { createCipheriv, createDecipheriv, createHash, pbkdf2, pbkdf2Sync, randomUUID } from 'crypto';
4
4
  import { readFileSync } from 'fs';
5
+ import { promisify } from 'util';
5
6
  import { z } from 'zod';
6
7
 
7
8
  /**
@@ -100,24 +101,15 @@ export interface Bn254KeystoreInterface {
100
101
  version: number;
101
102
  }
102
103
 
103
- /**
104
- * Creates a BN254 keystore object for a BN254 BLS private key.
105
- *
106
- * Uses PBKDF2 with SHA-256 for key derivation and AES-128-CTR for encryption,
107
- * following the EIP-2335 specification format.
108
- *
109
- * @param password - Password for encrypting the private key
110
- * @param privateKeyHex - Private key as 0x-prefixed hex string (32 bytes)
111
- * @param pubkeyHex - Public key as hex string (compressed or uncompressed)
112
- * @param derivationPath - BIP-44 style derivation path (e.g., "m/12381/3600/0/0/0")
113
- * @returns BN254 keystore object ready to be serialized to JSON
114
- * @throws Error if private key is not 32-byte hex
115
- */
116
- export function createBn254Keystore(
117
- password: string,
104
+ const pbkdf2Async = promisify(pbkdf2);
105
+
106
+ function createBn254KeystoreFromDerivedKey(
118
107
  privateKeyHex: string,
119
108
  pubkeyHex: string,
120
109
  derivationPath: string,
110
+ salt: Buffer,
111
+ iv: Buffer,
112
+ dk: Buffer,
121
113
  ): Bn254Keystore {
122
114
  const ensureHex = (hex: string) => hex.replace(/^0x/i, '');
123
115
  const privHex = ensureHex(privateKeyHex);
@@ -125,11 +117,7 @@ export function createBn254Keystore(
125
117
  throw new Error('BLS private key must be 32-byte hex');
126
118
  }
127
119
 
128
- const salt = randomBytes(32);
129
- const iv = randomBytes(16);
130
- const dk = pbkdf2Sync(Buffer.from(password.normalize('NFKD'), 'utf8'), salt, 262144, 32, 'sha256');
131
120
  const cipherKey = dk.subarray(0, 16);
132
-
133
121
  const cipher = createCipheriv('aes-128-ctr', cipherKey, iv);
134
122
  const plaintext = Buffer.from(privHex, 'hex');
135
123
  const ciphertext = Buffer.concat([cipher.update(plaintext), cipher.final()]);
@@ -166,6 +154,31 @@ export function createBn254Keystore(
166
154
  };
167
155
  }
168
156
 
157
+ /**
158
+ * Creates a BN254 keystore object for a BN254 BLS private key.
159
+ *
160
+ * Uses PBKDF2 with SHA-256 for key derivation and AES-128-CTR for encryption,
161
+ * following the EIP-2335 specification format.
162
+ *
163
+ * @param password - Password for encrypting the private key
164
+ * @param privateKeyHex - Private key as 0x-prefixed hex string (32 bytes)
165
+ * @param pubkeyHex - Public key as hex string (compressed or uncompressed)
166
+ * @param derivationPath - BIP-44 style derivation path (e.g., "m/12381/3600/0/0/0")
167
+ * @returns BN254 keystore object ready to be serialized to JSON
168
+ * @throws Error if private key is not 32-byte hex
169
+ */
170
+ export async function createBn254Keystore(
171
+ password: string,
172
+ privateKeyHex: string,
173
+ pubkeyHex: string,
174
+ derivationPath: string,
175
+ ): Promise<Bn254Keystore> {
176
+ const salt = randomBytes(32);
177
+ const iv = randomBytes(16);
178
+ const dk = await pbkdf2Async(Buffer.from(password.normalize('NFKD'), 'utf8'), salt, 262144, 32, 'sha256');
179
+ return createBn254KeystoreFromDerivedKey(privateKeyHex, pubkeyHex, derivationPath, salt, iv, dk);
180
+ }
181
+
169
182
  /**
170
183
  * Loads and validates a BN254 keystore file.
171
184
  *
@@ -262,26 +275,3 @@ export function decryptBn254KeystoreFromObject(keystore: Bn254Keystore, password
262
275
  throw new Bn254KeystoreError(`Failed to decrypt keystore: ${String(error)}`, error as Error);
263
276
  }
264
277
  }
265
-
266
- /**
267
- * Validates that a decrypted private key matches the public key in the keystore.
268
- *
269
- * @param privateKeyHex - Decrypted private key (0x-prefixed)
270
- * @param expectedPubkey - Expected public key from keystore
271
- * @param computePublicKey - Function to compute public key from private key
272
- * @returns true if keys match, false otherwise
273
- */
274
- export function verifyBn254Keypair(
275
- privateKeyHex: string,
276
- expectedPubkey: string,
277
- computePublicKey: (privateKey: string) => string,
278
- ): boolean {
279
- try {
280
- const computedPubkey = computePublicKey(privateKeyHex);
281
- const normalizedExpected = expectedPubkey.toLowerCase().replace(/^0x/i, '');
282
- const normalizedComputed = computedPubkey.toLowerCase().replace(/^0x/i, '');
283
- return normalizedExpected === normalizedComputed;
284
- } catch {
285
- return false;
286
- }
287
- }
@@ -1,10 +1,26 @@
1
- import { BarretenbergSync } from '@aztec/bb.js';
1
+ import { BarretenbergSync, CircuitKind } from '@aztec/bb.js';
2
2
 
3
3
  import { Fr } from '../../curves/bn254/field.js';
4
4
 
5
- export async function vkAsFieldsMegaHonk(input: Buffer): Promise<Fr[]> {
5
+ export async function vkAsFields(input: Buffer, kind: CircuitKind): Promise<Fr[]> {
6
6
  await BarretenbergSync.initSingleton();
7
7
  const api = BarretenbergSync.getSingleton();
8
- const response = api.megaVkAsFields({ verificationKey: input });
9
- return response.fields.map(field => Fr.fromBuffer(Buffer.from(field)));
8
+ switch (kind) {
9
+ case CircuitKind.App: {
10
+ const response = api.megaAppVkAsFields({ verificationKey: input });
11
+ return response.fields.map(field => Fr.fromBuffer(Buffer.from(field)));
12
+ }
13
+ case CircuitKind.Kernel: {
14
+ const response = api.megaKernelVkAsFields({ verificationKey: input });
15
+ return response.fields.map(field => Fr.fromBuffer(Buffer.from(field)));
16
+ }
17
+ case CircuitKind.HidingKernel: {
18
+ const response = api.megaZKVkAsFields({ verificationKey: input });
19
+ return response.fields.map(field => Fr.fromBuffer(Buffer.from(field)));
20
+ }
21
+ default: {
22
+ const _exhaustive: never = kind;
23
+ throw new Error(`vkAsFields: unhandled CircuitKind ${_exhaustive}`);
24
+ }
25
+ }
10
26
  }
@@ -1,21 +1,35 @@
1
- import { Barretenberg } from '@aztec/bb.js';
1
+ import { Barretenberg, BarretenbergSync } from '@aztec/bb.js';
2
2
 
3
3
  import { Fr } from '../../curves/bn254/field.js';
4
4
  import { type Fieldable, serializeToFields } from '../../serialize/serialize.js';
5
5
 
6
+ const IS_BROWSER = typeof self !== 'undefined';
7
+
8
+ async function poseidon2HashFields(inputFields: Fr[]): Promise<Fr> {
9
+ if (IS_BROWSER) {
10
+ await BarretenbergSync.initSingleton();
11
+ const api = BarretenbergSync.getSingleton();
12
+ const response = api.poseidon2Hash({
13
+ inputs: inputFields.map(i => i.toBuffer()),
14
+ });
15
+ return Fr.fromBuffer(Buffer.from(response.hash));
16
+ } else {
17
+ await Barretenberg.initSingleton();
18
+ const api = Barretenberg.getSingleton();
19
+ const response = await api.poseidon2Hash({
20
+ inputs: inputFields.map(i => i.toBuffer()),
21
+ });
22
+ return Fr.fromBuffer(Buffer.from(response.hash));
23
+ }
24
+ }
25
+
6
26
  /**
7
27
  * Create a poseidon hash (field) from an array of input fields.
8
28
  * @param input - The input fields to hash.
9
29
  * @returns The poseidon hash.
10
30
  */
11
- export async function poseidon2Hash(input: Fieldable[]): Promise<Fr> {
12
- const inputFields = serializeToFields(input);
13
- await Barretenberg.initSingleton();
14
- const api = Barretenberg.getSingleton();
15
- const response = await api.poseidon2Hash({
16
- inputs: inputFields.map(i => i.toBuffer()),
17
- });
18
- return Fr.fromBuffer(Buffer.from(response.hash));
31
+ export function poseidon2Hash(input: Fieldable[]): Promise<Fr> {
32
+ return poseidon2HashFields(serializeToFields(input));
19
33
  }
20
34
 
21
35
  /**
@@ -24,15 +38,10 @@ export async function poseidon2Hash(input: Fieldable[]): Promise<Fr> {
24
38
  * @param separator - The domain separator.
25
39
  * @returns The poseidon hash.
26
40
  */
27
- export async function poseidon2HashWithSeparator(input: Fieldable[], separator: number): Promise<Fr> {
41
+ export function poseidon2HashWithSeparator(input: Fieldable[], separator: number): Promise<Fr> {
28
42
  const inputFields = serializeToFields(input);
29
43
  inputFields.unshift(new Fr(separator));
30
- await Barretenberg.initSingleton();
31
- const api = Barretenberg.getSingleton();
32
- const response = await api.poseidon2Hash({
33
- inputs: inputFields.map(i => i.toBuffer()),
34
- });
35
- return Fr.fromBuffer(Buffer.from(response.hash));
44
+ return poseidon2HashFields(inputFields);
36
45
  }
37
46
 
38
47
  /**
@@ -42,19 +51,24 @@ export async function poseidon2HashWithSeparator(input: Fieldable[], separator:
42
51
  */
43
52
  export async function poseidon2Permutation(input: Fieldable[]): Promise<Fr[]> {
44
53
  const inputFields = serializeToFields(input);
45
- // We'd like this assertion but it's not possible to use it in the browser.
46
- // assert(input.length === 4, 'Input state must be of size 4');
47
- await Barretenberg.initSingleton();
48
- const api = Barretenberg.getSingleton();
49
- const response = await api.poseidon2Permutation({
50
- inputs: inputFields.map(i => i.toBuffer()),
51
- });
52
- // We'd like this assertion but it's not possible to use it in the browser.
53
- // assert(response.outputs.length === 4, 'Output state must be of size 4');
54
- return response.outputs.map(o => Fr.fromBuffer(Buffer.from(o)));
54
+ if (IS_BROWSER) {
55
+ await BarretenbergSync.initSingleton();
56
+ const api = BarretenbergSync.getSingleton();
57
+ const response = api.poseidon2Permutation({
58
+ inputs: inputFields.map(i => i.toBuffer()),
59
+ });
60
+ return response.outputs.map(o => Fr.fromBuffer(Buffer.from(o)));
61
+ } else {
62
+ await Barretenberg.initSingleton();
63
+ const api = Barretenberg.getSingleton();
64
+ const response = await api.poseidon2Permutation({
65
+ inputs: inputFields.map(i => i.toBuffer()),
66
+ });
67
+ return response.outputs.map(o => Fr.fromBuffer(Buffer.from(o)));
68
+ }
55
69
  }
56
70
 
57
- export async function poseidon2HashBytes(input: Buffer): Promise<Fr> {
71
+ export function poseidon2HashBytes(input: Buffer): Promise<Fr> {
58
72
  const inputFields = [];
59
73
  for (let i = 0; i < input.length; i += 31) {
60
74
  const fieldBytes = Buffer.alloc(32, 0);
@@ -65,11 +79,5 @@ export async function poseidon2HashBytes(input: Buffer): Promise<Fr> {
65
79
  inputFields.push(Fr.fromBuffer(fieldBytes));
66
80
  }
67
81
 
68
- await Barretenberg.initSingleton();
69
- const api = Barretenberg.getSingleton();
70
- const response = await api.poseidon2Hash({
71
- inputs: inputFields.map(i => i.toBuffer()),
72
- });
73
-
74
- return Fr.fromBuffer(Buffer.from(response.hash));
82
+ return poseidon2HashFields(inputFields);
75
83
  }
@@ -1,4 +1,5 @@
1
1
  import { BarretenbergSync } from '@aztec/bb.js';
2
+ import type { Fr } from '@aztec/foundation/curves/bn254';
2
3
  import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
3
4
  import { Point } from '@aztec/foundation/curves/grumpkin';
4
5
 
@@ -23,33 +24,33 @@ export class Schnorr {
23
24
  }
24
25
 
25
26
  /**
26
- * Constructs a Schnorr signature given a msg and a private key.
27
- * @param msg - Message over which the signature is constructed.
27
+ * Constructs a Schnorr signature over a 32-byte message field element.
28
+ * @param msg - The message hash, as a grumpkin base field element.
28
29
  * @param privateKey - The private key of the signer.
29
30
  * @returns A Schnorr signature of the form (s, e).
30
31
  */
31
- public async constructSignature(msg: Uint8Array, privateKey: GrumpkinScalar) {
32
+ public async constructSignature(msg: Fr, privateKey: GrumpkinScalar) {
32
33
  await BarretenbergSync.initSingleton();
33
34
  const api = BarretenbergSync.getSingleton();
34
35
  const response = api.schnorrConstructSignature({
35
- message: msg,
36
+ messageField: msg.toBuffer(),
36
37
  privateKey: privateKey.toBuffer(),
37
38
  });
38
39
  return new SchnorrSignature(Buffer.from([...response.s, ...response.e]));
39
40
  }
40
41
 
41
42
  /**
42
- * Verifies a Schnorr signature given a Grumpkin public key.
43
- * @param msg - Message over which the signature was constructed.
43
+ * Verifies a Schnorr signature against a Grumpkin public key.
44
+ * @param msg - The message hash, as a grumpkin base field element.
44
45
  * @param pubKey - The Grumpkin public key of the signer.
45
46
  * @param sig - The Schnorr signature.
46
47
  * @returns True or false.
47
48
  */
48
- public async verifySignature(msg: Uint8Array, pubKey: Point, sig: SchnorrSignature) {
49
+ public async verifySignature(msg: Fr, pubKey: Point, sig: SchnorrSignature) {
49
50
  await BarretenbergSync.initSingleton();
50
51
  const api = BarretenbergSync.getSingleton();
51
52
  const response = api.schnorrVerifySignature({
52
- message: msg,
53
+ messageField: msg.toBuffer(),
53
54
  publicKey: { x: pubKey.x.toBuffer(), y: pubKey.y.toBuffer() },
54
55
  s: sig.s,
55
56
  e: sig.e,
@@ -1,6 +1,5 @@
1
- import { randomBytes } from '@aztec/foundation/crypto/random';
2
1
  import { Fr } from '@aztec/foundation/curves/bn254';
3
- import { BufferReader, mapTuple } from '@aztec/foundation/serialize';
2
+ import { mapTuple } from '@aztec/foundation/serialize';
4
3
 
5
4
  import type { Signature } from '../signature/index.js';
6
5
 
@@ -14,46 +13,12 @@ export class SchnorrSignature implements Signature {
14
13
  */
15
14
  public static SIZE = 64;
16
15
 
17
- /**
18
- * An empty signature.
19
- */
20
- public static EMPTY = new SchnorrSignature(Buffer.alloc(64));
21
-
22
16
  constructor(private buffer: Buffer) {
23
17
  if (buffer.length !== SchnorrSignature.SIZE) {
24
18
  throw new Error(`Invalid signature buffer of length ${buffer.length}.`);
25
19
  }
26
20
  }
27
21
 
28
- /**
29
- * Determines if the provided signature is valid or not.
30
- * @param signature - The data to be checked.
31
- * @returns Boolean indicating if the provided data is a valid schnorr signature.
32
- */
33
- public static isSignature(signature: string) {
34
- return /^(0x)?[0-9a-f]{128}$/i.test(signature);
35
- }
36
-
37
- /**
38
- * Constructs a SchnorrSignature from the provided string.
39
- * @param signature - The string to be converted to a schnorr signature.
40
- * @returns The constructed schnorr signature.
41
- */
42
- public static fromString(signature: string) {
43
- if (!SchnorrSignature.isSignature(signature)) {
44
- throw new Error(`Invalid signature string: ${signature}`);
45
- }
46
- return new SchnorrSignature(Buffer.from(signature.replace(/^0x/i, ''), 'hex'));
47
- }
48
-
49
- /**
50
- * Generates a random schnorr signature.
51
- * @returns The randomly constructed signature.
52
- */
53
- public static random() {
54
- return new SchnorrSignature(randomBytes(64));
55
- }
56
-
57
22
  /**
58
23
  * Returns the 's' component of the signature.
59
24
  * @returns A buffer containing the signature's 's' component.
@@ -78,16 +43,6 @@ export class SchnorrSignature implements Signature {
78
43
  return this.buffer;
79
44
  }
80
45
 
81
- /**
82
- * Deserializes from a buffer.
83
- * @param buffer - The buffer representation of the object.
84
- * @returns The new object.
85
- */
86
- static fromBuffer(buffer: Buffer | BufferReader): SchnorrSignature {
87
- const reader = BufferReader.asReader(buffer);
88
- return new SchnorrSignature(reader.readBytes(SchnorrSignature.SIZE));
89
- }
90
-
91
46
  /**
92
47
  * Returns the full signature as a hex string.
93
48
  * @returns A string containing the signature in hex format.
@@ -113,4 +68,20 @@ export class SchnorrSignature implements Signature {
113
68
 
114
69
  return mapTuple([buf1, buf2, buf3], Fr.fromBuffer);
115
70
  }
71
+
72
+ /**
73
+ * Splits the signature into the four 128-bit limbs that Noir's `EmbeddedCurveScalar` consumes:
74
+ * `[s.lo, s.hi, e.lo, e.hi]`, where each component scalar is encoded as `lo + hi * 2^128`.
75
+ *
76
+ * Each 32-byte big-endian component is sliced into its top 16 bytes (`hi`) and bottom 16 bytes
77
+ * (`lo`); each half is zero-padded into a 32-byte buffer and decoded as `Fr` (big-endian).
78
+ */
79
+ toLimbFields(): [Fr, Fr, Fr, Fr] {
80
+ const limb = (start: number) => {
81
+ const buf = Buffer.alloc(32);
82
+ this.buffer.copy(buf, 16, start, start + 16);
83
+ return Fr.fromBuffer(buf);
84
+ };
85
+ return [limb(16), limb(0), limb(48), limb(32)];
86
+ }
116
87
  }
@@ -6,7 +6,6 @@ import { toBigIntBE, toBufferBE } from '../../bigint-buffer/index.js';
6
6
  import { randomBytes } from '../../crypto/random/index.js';
7
7
  import { hexSchemaFor } from '../../schemas/utils.js';
8
8
  import { BufferReader } from '../../serialize/buffer_reader.js';
9
- import { TypeRegistry } from '../../serialize/type_registry.js';
10
9
  import { Fr } from '../bn254/field.js';
11
10
 
12
11
  /**
@@ -323,9 +322,6 @@ export class BLS12Fr extends BLS12Field {
323
322
  }
324
323
  }
325
324
 
326
- // For deserializing JSON.
327
- TypeRegistry.register('BLS12Fr', BLS12Fr);
328
-
329
325
  /**
330
326
  * Fq field class.
331
327
  * @dev This class is used to represent elements of BLS12-381 base field.
@@ -458,6 +454,3 @@ export class BLS12Fq extends BLS12Field {
458
454
  return hexSchemaFor(BLS12Fq);
459
455
  }
460
456
  }
461
-
462
- // For deserializing JSON.
463
- TypeRegistry.register('BLS12Fq', BLS12Fq);
@@ -6,9 +6,7 @@ import { toBigIntBE, toBufferBE } from '../../bigint-buffer/index.js';
6
6
  import { randomBytes } from '../../crypto/random/index.js';
7
7
  import { hexSchemaFor } from '../../schemas/utils.js';
8
8
  import { BufferReader } from '../../serialize/buffer_reader.js';
9
- import { TypeRegistry } from '../../serialize/type_registry.js';
10
-
11
- /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
9
+ import type { BufferSink } from '../../serialize/buffer_sink.js';
12
10
 
13
11
  /**
14
12
  * Represents a field derived from BaseField.
@@ -67,10 +65,16 @@ abstract class BaseField {
67
65
  protected abstract modulus(): bigint;
68
66
 
69
67
  /**
70
- * Converts the bigint to a Buffer.
68
+ * Converts the bigint to a Buffer. With a sink, streams the 32 big-endian bytes straight in (no allocation)
69
+ * and returns undefined; without one, returns a freshly allocated buffer.
71
70
  */
72
- toBuffer(): Buffer {
73
- return toBufferBE(this.asBigInt, 32);
71
+ toBuffer(): Buffer;
72
+ toBuffer(sink: BufferSink): void;
73
+ toBuffer(sink?: BufferSink): Buffer | void {
74
+ if (!sink) {
75
+ return toBufferBE(this.asBigInt, BaseField.SIZE_IN_BYTES);
76
+ }
77
+ sink.writeField(this.asBigInt);
74
78
  }
75
79
 
76
80
  toString(): `0x${string}` {
@@ -187,10 +191,25 @@ function fromHexString<T extends BaseField>(buf: string, f: DerivedField<T>) {
187
191
  return new f(toBigIntBE(buffer));
188
192
  }
189
193
 
190
- /** Branding to ensure fields are not interchangeable types. */
191
- export interface Fr {
192
- /** Brand. */
193
- _branding: 'Fr';
194
+ /**
195
+ * Abstract unbranded base class for BN254 scalar field elements.
196
+ * Extend this instead of Fr when defining a branded subtype (e.g. BlockHash)
197
+ * to avoid inheriting Fr's `_branding`.
198
+ */
199
+ export abstract class BaseFr extends BaseField {
200
+ static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
201
+
202
+ constructor(value: number | bigint | boolean | BaseField | Buffer) {
203
+ super(value);
204
+ }
205
+
206
+ protected modulus() {
207
+ return BaseFr.MODULUS;
208
+ }
209
+
210
+ toJSON() {
211
+ return this.toString();
212
+ }
194
213
  }
195
214
 
196
215
  /**
@@ -198,10 +217,12 @@ export interface Fr {
198
217
  * @dev This class is used to represent elements of BN254 scalar field or elements in the base field of Grumpkin.
199
218
  * (Grumpkin's scalar field corresponds to BN254's base field and vice versa.)
200
219
  */
201
- export class Fr extends BaseField {
220
+ export class Fr extends BaseFr {
221
+ /** Branding for nominal typing. */
222
+ declare private readonly _branding: 'Fr';
223
+ static override MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
202
224
  static ZERO = new Fr(0n);
203
225
  static ONE = new Fr(1n);
204
- static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
205
226
  static MAX_FIELD_VALUE = new Fr(this.MODULUS - 1n);
206
227
 
207
228
  constructor(value: number | bigint | boolean | Fr | Buffer) {
@@ -212,10 +233,6 @@ export class Fr extends BaseField {
212
233
  return `Fr<${this.toString()}>`;
213
234
  }
214
235
 
215
- protected modulus() {
216
- return Fr.MODULUS;
217
- }
218
-
219
236
  static random() {
220
237
  return random(Fr);
221
238
  }
@@ -320,10 +337,6 @@ export class Fr extends BaseField {
320
337
  return Fr.fromBuffer(Buffer.from(response.value));
321
338
  }
322
339
 
323
- toJSON() {
324
- return this.toString();
325
- }
326
-
327
340
  /**
328
341
  * Creates an Fr instance from a plain object without Zod validation.
329
342
  * This method is optimized for performance and skips validation, making it suitable
@@ -345,23 +358,14 @@ export class Fr extends BaseField {
345
358
  }
346
359
  }
347
360
 
348
- // For deserializing JSON.
349
- TypeRegistry.register('Fr', Fr);
350
-
351
- /**
352
- * Branding to ensure fields are not interchangeable types.
353
- */
354
- export interface Fq {
355
- /** Brand. */
356
- _branding: 'Fq';
357
- }
358
-
359
361
  /**
360
362
  * Fq field class.
361
363
  * @dev This class is used to represent elements of BN254 base field or elements in the scalar field of Grumpkin.
362
364
  * (Grumpkin's scalar field corresponds to BN254's base field and vice versa.)
363
365
  */
364
366
  export class Fq extends BaseField {
367
+ /** Branding for nominal typing. */
368
+ declare private readonly _branding: 'Fq';
365
369
  static ZERO = new Fq(0n);
366
370
  static MODULUS = 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47n;
367
371
  private static HIGH_SHIFT = BigInt((BaseField.SIZE_IN_BYTES / 2) * 8);
@@ -470,9 +474,6 @@ export class Fq extends BaseField {
470
474
  }
471
475
  }
472
476
 
473
- // For deserializing JSON.
474
- TypeRegistry.register('Fq', Fq);
475
-
476
477
  // Beware: Performance bottleneck below
477
478
 
478
479
  /**