@aztec/protocol-contracts 0.66.0 → 0.67.0

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.
@@ -40,16 +40,16 @@ export const ProtocolContractAddress = {
40
40
  Router: AztecAddress.fromBigInt(6n),
41
41
  };
42
42
  export const ProtocolContractLeaf = {
43
- AuthRegistry: Fr.fromString('0x194b371c7bdeccf4d05da449050ebe872229d3cba4c4536c031622ff44fbfc62'),
44
- ContractInstanceDeployer: Fr.fromString('0x1d81c2d60d6efc1c0900e61363b42d5b4061eb072bf24c9c2fada66f2a42ec9c'),
45
- ContractClassRegisterer: Fr.fromString('0x2fc2a8dc51d9e2e8c2e32b8cf81a84b5ccac0e5141c1bf34f189785182227023'),
46
- MultiCallEntrypoint: Fr.fromString('0x1a4789b76f310ef589b51de47fcc21bfc77e9b3bd95b536f96a919a347444059'),
47
- FeeJuice: Fr.fromString('0x16d26688bfb802eb0d16696a1ee768c4c557f0b19047ec095e65d97a1319f2ce'),
48
- Router: Fr.fromString('0x06d74e4755ec0ca5a22f205b9d56ba62eeb3fe38562673525f5c7069f7d12602'),
43
+ AuthRegistry: Fr.fromHexString('0x20cbeffab0531a2ee8fa157414c739bfc0e0342ea09f6d01585788d9f240604c'),
44
+ ContractInstanceDeployer: Fr.fromHexString('0x2a4082a69fc451db387d9f144b787ac902ad578240e7d36b14d177636d337bb0'),
45
+ ContractClassRegisterer: Fr.fromHexString('0x2b0db891d2642079a447e67e7d680dc246686a195412972676c8f3144a34fce5'),
46
+ MultiCallEntrypoint: Fr.fromHexString('0x0a4a88882c1846ddfcfda6ed67c443bdfc75603a2ab08d893ab7b62c671461ce'),
47
+ FeeJuice: Fr.fromHexString('0x1848a1f8bdcfe420358552e038f34fd9dd60c92ae2f5e3d6e6b252d3e2f5f109'),
48
+ Router: Fr.fromHexString('0x071af2035c8806f50406f313bc3d482fac6adba36cc4b3b83d16371e69bc7f66'),
49
49
  };
50
- export const protocolContractTreeRoot = Fr.fromString('0x1a478770d19a56359ba8e79fba88ea78151cf429fb1785f0541dae7b8f2d68bc');
50
+ export const protocolContractTreeRoot = Fr.fromHexString('0x296690a67333fb896eff0ef812d31f9be26161726e47057bb688ddcf08164453');
51
51
  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(11121068431693264234253912047066709627593769337094408533543930778360n);
52
52
  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(2889881020989534926461066592611988634597302675057895885580456197069n);
53
53
  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(24399338136397901754495080759185489776044879232766421623673792970137n);
54
- export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
55
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3hELE9BQU8sZ0JBQWdCLE1BQU0sZ0NBQWdDLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDdEYsT0FBTywyQkFBMkIsTUFBTSwyQ0FBMkMsQ0FBQyxTQUFTLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUM1RyxPQUFPLDRCQUE0QixNQUFNLDRDQUE0QyxDQUFDLFNBQVMsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBQzlHLE9BQU8sWUFBWSxNQUFNLDRCQUE0QixDQUFDLFNBQVMsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBQzlFLE9BQU8sdUJBQXVCLE1BQU0sdUNBQXVDLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDcEcsT0FBTyxVQUFVLE1BQU0sMEJBQTBCLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFFMUUsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUc7SUFDbkMsY0FBYztJQUNkLDBCQUEwQjtJQUMxQix5QkFBeUI7SUFDekIscUJBQXFCO0lBQ3JCLFVBQVU7SUFDVixRQUFRO0NBQ0EsQ0FBQztBQUlYLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFtRDtJQUN0RixZQUFZLEVBQUUsb0JBQW9CLENBQUMsZ0JBQXdDLENBQUM7SUFDNUUsd0JBQXdCLEVBQUUsb0JBQW9CLENBQUMsNEJBQW9ELENBQUM7SUFDcEcsdUJBQXVCLEVBQUUsb0JBQW9CLENBQUMsMkJBQW1ELENBQUM7SUFDbEcsbUJBQW1CLEVBQUUsb0JBQW9CLENBQUMsdUJBQStDLENBQUM7SUFDMUYsUUFBUSxFQUFFLG9CQUFvQixDQUFDLFlBQW9DLENBQUM7SUFDcEUsTUFBTSxFQUFFLG9CQUFvQixDQUFDLFVBQWtDLENBQUM7Q0FDakUsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFxQztJQUNwRSxZQUFZLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3ZCLHdCQUF3QixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuQyx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbEMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzlCLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkIsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztDQUNsQixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQStDO0lBQ2pGLFlBQVksRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUN6Qyx3QkFBd0IsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNyRCx1QkFBdUIsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNwRCxtQkFBbUIsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNoRCxRQUFRLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLFlBQVksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO0NBQ3BDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRztJQUNsQyxZQUFZLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxvRUFBb0UsQ0FBQztJQUNqRyx3QkFBd0IsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLG9FQUFvRSxDQUFDO0lBQzdHLHVCQUF1QixFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsb0VBQW9FLENBQUM7SUFDNUcsbUJBQW1CLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxvRUFBb0UsQ0FBQztJQUN4RyxRQUFRLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxvRUFBb0UsQ0FBQztJQUM3RixNQUFNLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxvRUFBb0UsQ0FBQztDQUM1RixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FDbkQsb0VBQW9FLENBQ3JFLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSx3Q0FBd0MsR0FBRyxJQUFJLEVBQUUsQ0FDNUQscUVBQXFFLENBQ3RFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSwyQ0FBMkMsR0FBRyxJQUFJLEVBQUUsQ0FDL0Qsb0VBQW9FLENBQ3JFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSxpREFBaUQsR0FBRyxJQUFJLEVBQUUsQ0FDckUscUVBQXFFLENBQ3RFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSx1Q0FBdUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUNsRSxvRUFBb0UsQ0FDckUsQ0FBQyJ9
54
+ export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3hELE9BQU8sZ0JBQWdCLE1BQU0sZ0NBQWdDLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDdEYsT0FBTywyQkFBMkIsTUFBTSwyQ0FBMkMsQ0FBQyxTQUFTLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUM1RyxPQUFPLDRCQUE0QixNQUFNLDRDQUE0QyxDQUFDLFNBQVMsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBQzlHLE9BQU8sWUFBWSxNQUFNLDRCQUE0QixDQUFDLFNBQVMsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBQzlFLE9BQU8sdUJBQXVCLE1BQU0sdUNBQXVDLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDcEcsT0FBTyxVQUFVLE1BQU0sMEJBQTBCLENBQUMsU0FBUyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFFMUUsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUc7SUFDbkMsY0FBYztJQUNkLDBCQUEwQjtJQUMxQix5QkFBeUI7SUFDekIscUJBQXFCO0lBQ3JCLFVBQVU7SUFDVixRQUFRO0NBQ0EsQ0FBQztBQUlYLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFtRDtJQUN0RixZQUFZLEVBQUUsb0JBQW9CLENBQUMsZ0JBQXdDLENBQUM7SUFDNUUsd0JBQXdCLEVBQUUsb0JBQW9CLENBQUMsNEJBQW9ELENBQUM7SUFDcEcsdUJBQXVCLEVBQUUsb0JBQW9CLENBQUMsMkJBQW1ELENBQUM7SUFDbEcsbUJBQW1CLEVBQUUsb0JBQW9CLENBQUMsdUJBQStDLENBQUM7SUFDMUYsUUFBUSxFQUFFLG9CQUFvQixDQUFDLFlBQW9DLENBQUM7SUFDcEUsTUFBTSxFQUFFLG9CQUFvQixDQUFDLFVBQWtDLENBQUM7Q0FDakUsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFxQztJQUNwRSxZQUFZLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3ZCLHdCQUF3QixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuQyx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbEMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzlCLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkIsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztDQUNsQixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQStDO0lBQ2pGLFlBQVksRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUN6Qyx3QkFBd0IsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNyRCx1QkFBdUIsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNwRCxtQkFBbUIsRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztJQUNoRCxRQUFRLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLFlBQVksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO0NBQ3BDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRztJQUNsQyxZQUFZLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztJQUNwRyx3QkFBd0IsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLG9FQUFvRSxDQUFDO0lBQ2hILHVCQUF1QixFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDL0csbUJBQW1CLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztJQUMzRyxRQUFRLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztJQUNoRyxNQUFNLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztDQUMvRixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FDdEQsb0VBQW9FLENBQ3JFLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSx3Q0FBd0MsR0FBRyxJQUFJLEVBQUUsQ0FDNUQscUVBQXFFLENBQ3RFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSwyQ0FBMkMsR0FBRyxJQUFJLEVBQUUsQ0FDL0Qsb0VBQW9FLENBQ3JFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSxpREFBaUQsR0FBRyxJQUFJLEVBQUUsQ0FDckUscUVBQXFFLENBQ3RFLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSx1Q0FBdUMsR0FBRyxFQUFFLENBQUMsYUFBYSxDQUNyRSxvRUFBb0UsQ0FDckUsQ0FBQyJ9
@@ -2,10 +2,10 @@ import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRES
2
2
  import { poseidon2Hash } from '@aztec/foundation/crypto';
3
3
  import { createConsoleLogger } from '@aztec/foundation/log';
4
4
  import { loadContractArtifact } from '@aztec/types/abi';
5
- import fs from 'fs/promises';
5
+ import { promises as fs } from 'fs';
6
6
  import path from 'path';
7
7
  import { buildProtocolContractTree } from '../build_protocol_contract_tree.js';
8
- const log = createConsoleLogger('aztec:autogenerate');
8
+ const log = createConsoleLogger('autogenerate');
9
9
  const noirContractsRoot = '../../noir-projects/noir-contracts';
10
10
  const srcPath = path.join(noirContractsRoot, './target');
11
11
  const destArtifactsDir = './artifacts';
@@ -106,14 +106,14 @@ function generateContractAddresses(names) {
106
106
  function generateContractLeaves(names, leaves) {
107
107
  return `
108
108
  export const ProtocolContractLeaf = {
109
- ${leaves.map((leaf, i) => `${names[i]}: Fr.fromString('${leaf.toString()}')`).join(',\n')}
109
+ ${leaves.map((leaf, i) => `${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
110
110
  };
111
111
  `;
112
112
  }
113
113
  function generateRoot(names, leaves) {
114
114
  const root = computeRoot(names, leaves);
115
115
  return `
116
- export const protocolContractTreeRoot = Fr.fromString('${root.toString()}');
116
+ export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
117
117
  `;
118
118
  }
119
119
  function generateLogTags() {
@@ -121,7 +121,7 @@ function generateLogTags() {
121
121
  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}n);
122
122
  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
123
123
  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
124
- export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromString('${poseidon2Hash([
124
+ export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('${poseidon2Hash([
125
125
  DEPLOYER_CONTRACT_ADDRESS,
126
126
  DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
127
127
  ])}');
@@ -172,4 +172,4 @@ catch (err) {
172
172
  log(`Error copying protocol contract artifacts: ${err}`);
173
173
  process.exit(1);
174
174
  }
175
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY3JpcHRzL2dlbmVyYXRlX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWiwrQkFBK0IsRUFDL0IseUJBQXlCLEVBQ3pCLCtDQUErQyxFQUMvQyxpQkFBaUIsRUFDakIsRUFBRSxFQUNGLDZCQUE2QixFQUM3QiwyQkFBMkIsRUFDM0IsZ0RBQWdELEVBQ2hELG1EQUFtRCxFQUNuRCx5REFBeUQsRUFDekQsY0FBYyxFQUNkLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUd4RCxPQUFPLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDN0IsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRXhCLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRS9FLE1BQU0sR0FBRyxHQUFHLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFFdEQsTUFBTSxpQkFBaUIsR0FBRyxvQ0FBb0MsQ0FBQztBQUMvRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ3pELE1BQU0sZ0JBQWdCLEdBQUcsYUFBYSxDQUFDO0FBQ3ZDLE1BQU0sY0FBYyxHQUFHLGlDQUFpQyxDQUFDO0FBRXpELE1BQU0sSUFBSSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXZCLE1BQU0sc0JBQXNCLEdBQStCO0lBQ3pELFlBQVksRUFBRSwrQkFBK0I7SUFDN0Msd0JBQXdCLEVBQUUseUJBQXlC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
175
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY3JpcHRzL2dlbmVyYXRlX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWiwrQkFBK0IsRUFDL0IseUJBQXlCLEVBQ3pCLCtDQUErQyxFQUMvQyxpQkFBaUIsRUFDakIsRUFBRSxFQUNGLDZCQUE2QixFQUM3QiwyQkFBMkIsRUFDM0IsZ0RBQWdELEVBQ2hELG1EQUFtRCxFQUNuRCx5REFBeUQsRUFDekQsY0FBYyxFQUNkLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUd4RCxPQUFPLEVBQUUsUUFBUSxJQUFJLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFFeEIsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFL0UsTUFBTSxHQUFHLEdBQUcsbUJBQW1CLENBQUMsY0FBYyxDQUFDLENBQUM7QUFFaEQsTUFBTSxpQkFBaUIsR0FBRyxvQ0FBb0MsQ0FBQztBQUMvRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ3pELE1BQU0sZ0JBQWdCLEdBQUcsYUFBYSxDQUFDO0FBQ3ZDLE1BQU0sY0FBYyxHQUFHLGlDQUFpQyxDQUFDO0FBRXpELE1BQU0sSUFBSSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXZCLE1BQU0sc0JBQXNCLEdBQStCO0lBQ3pELFlBQVksRUFBRSwrQkFBK0I7SUFDN0Ms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
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@aztec/protocol-contracts",
3
3
  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/protocol-contracts",
4
4
  "description": "Canonical Noir contracts for the Aztec Network",
5
- "version": "0.66.0",
5
+ "version": "0.67.0",
6
6
  "type": "module",
7
7
  "exports": {
8
8
  ".": "./dest/index.js",
@@ -64,12 +64,16 @@
64
64
  "summaryThreshold": 9999
65
65
  }
66
66
  ]
67
+ ],
68
+ "testTimeout": 30000,
69
+ "setupFiles": [
70
+ "../../foundation/src/jest/setup.mjs"
67
71
  ]
68
72
  },
69
73
  "dependencies": {
70
- "@aztec/circuits.js": "0.66.0",
71
- "@aztec/foundation": "0.66.0",
72
- "@aztec/types": "0.66.0",
74
+ "@aztec/circuits.js": "0.67.0",
75
+ "@aztec/foundation": "0.67.0",
76
+ "@aztec/types": "0.67.0",
73
77
  "lodash.chunk": "^4.2.0",
74
78
  "lodash.omit": "^4.5.0",
75
79
  "tslib": "^2.4.0"
@@ -50,16 +50,16 @@ export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>
50
50
  };
51
51
 
52
52
  export const ProtocolContractLeaf = {
53
- AuthRegistry: Fr.fromString('0x194b371c7bdeccf4d05da449050ebe872229d3cba4c4536c031622ff44fbfc62'),
54
- ContractInstanceDeployer: Fr.fromString('0x1d81c2d60d6efc1c0900e61363b42d5b4061eb072bf24c9c2fada66f2a42ec9c'),
55
- ContractClassRegisterer: Fr.fromString('0x2fc2a8dc51d9e2e8c2e32b8cf81a84b5ccac0e5141c1bf34f189785182227023'),
56
- MultiCallEntrypoint: Fr.fromString('0x1a4789b76f310ef589b51de47fcc21bfc77e9b3bd95b536f96a919a347444059'),
57
- FeeJuice: Fr.fromString('0x16d26688bfb802eb0d16696a1ee768c4c557f0b19047ec095e65d97a1319f2ce'),
58
- Router: Fr.fromString('0x06d74e4755ec0ca5a22f205b9d56ba62eeb3fe38562673525f5c7069f7d12602'),
53
+ AuthRegistry: Fr.fromHexString('0x20cbeffab0531a2ee8fa157414c739bfc0e0342ea09f6d01585788d9f240604c'),
54
+ ContractInstanceDeployer: Fr.fromHexString('0x2a4082a69fc451db387d9f144b787ac902ad578240e7d36b14d177636d337bb0'),
55
+ ContractClassRegisterer: Fr.fromHexString('0x2b0db891d2642079a447e67e7d680dc246686a195412972676c8f3144a34fce5'),
56
+ MultiCallEntrypoint: Fr.fromHexString('0x0a4a88882c1846ddfcfda6ed67c443bdfc75603a2ab08d893ab7b62c671461ce'),
57
+ FeeJuice: Fr.fromHexString('0x1848a1f8bdcfe420358552e038f34fd9dd60c92ae2f5e3d6e6b252d3e2f5f109'),
58
+ Router: Fr.fromHexString('0x071af2035c8806f50406f313bc3d482fac6adba36cc4b3b83d16371e69bc7f66'),
59
59
  };
60
60
 
61
- export const protocolContractTreeRoot = Fr.fromString(
62
- '0x1a478770d19a56359ba8e79fba88ea78151cf429fb1785f0541dae7b8f2d68bc',
61
+ export const protocolContractTreeRoot = Fr.fromHexString(
62
+ '0x296690a67333fb896eff0ef812d31f9be26161726e47057bb688ddcf08164453',
63
63
  );
64
64
 
65
65
  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(
@@ -71,6 +71,6 @@ export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(
71
71
  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(
72
72
  24399338136397901754495080759185489776044879232766421623673792970137n,
73
73
  );
74
- export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromString(
74
+ export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString(
75
75
  '0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2',
76
76
  );
@@ -18,12 +18,12 @@ import { createConsoleLogger } from '@aztec/foundation/log';
18
18
  import { loadContractArtifact } from '@aztec/types/abi';
19
19
  import { type NoirCompiledContract } from '@aztec/types/noir';
20
20
 
21
- import fs from 'fs/promises';
21
+ import { promises as fs } from 'fs';
22
22
  import path from 'path';
23
23
 
24
24
  import { buildProtocolContractTree } from '../build_protocol_contract_tree.js';
25
25
 
26
- const log = createConsoleLogger('aztec:autogenerate');
26
+ const log = createConsoleLogger('autogenerate');
27
27
 
28
28
  const noirContractsRoot = '../../noir-projects/noir-contracts';
29
29
  const srcPath = path.join(noirContractsRoot, './target');
@@ -137,7 +137,7 @@ function generateContractAddresses(names: string[]) {
137
137
  function generateContractLeaves(names: string[], leaves: Fr[]) {
138
138
  return `
139
139
  export const ProtocolContractLeaf = {
140
- ${leaves.map((leaf, i) => `${names[i]}: Fr.fromString('${leaf.toString()}')`).join(',\n')}
140
+ ${leaves.map((leaf, i) => `${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
141
141
  };
142
142
  `;
143
143
  }
@@ -145,7 +145,7 @@ function generateContractLeaves(names: string[], leaves: Fr[]) {
145
145
  function generateRoot(names: string[], leaves: Fr[]) {
146
146
  const root = computeRoot(names, leaves);
147
147
  return `
148
- export const protocolContractTreeRoot = Fr.fromString('${root.toString()}');
148
+ export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
149
149
  `;
150
150
  }
151
151
 
@@ -154,7 +154,7 @@ function generateLogTags() {
154
154
  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}n);
155
155
  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
156
156
  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
157
- export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromString('${poseidon2Hash([
157
+ export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('${poseidon2Hash([
158
158
  DEPLOYER_CONTRACT_ADDRESS,
159
159
  DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
160
160
  ])}');