@aztec/protocol-contracts 0.65.2 → 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.
- package/artifacts/AuthRegistry.json +546 -574
- package/artifacts/ContractClassRegisterer.json +419 -494
- package/artifacts/ContractInstanceDeployer.json +157 -221
- package/artifacts/FeeJuice.json +685 -753
- package/artifacts/MultiCallEntrypoint.json +89 -121
- package/artifacts/Router.json +595 -659
- package/dest/class-registerer/contract_class_registered_event.d.ts +17 -0
- package/dest/class-registerer/contract_class_registered_event.d.ts.map +1 -0
- package/dest/class-registerer/contract_class_registered_event.js +60 -0
- package/dest/class-registerer/index.d.ts +3 -0
- package/dest/class-registerer/index.d.ts.map +1 -1
- package/dest/class-registerer/index.js +4 -1
- package/dest/class-registerer/private_function_broadcasted_event.d.ts +43 -0
- package/dest/class-registerer/private_function_broadcasted_event.d.ts.map +1 -0
- package/dest/class-registerer/private_function_broadcasted_event.js +87 -0
- package/dest/class-registerer/unconstrained_function_broadcasted_event.d.ts +37 -0
- package/dest/class-registerer/unconstrained_function_broadcasted_event.d.ts.map +1 -0
- package/dest/class-registerer/unconstrained_function_broadcasted_event.js +83 -0
- package/dest/index.d.ts +5 -0
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +6 -1
- package/dest/instance-deployer/contract_instance_deployed_event.d.ts +18 -0
- package/dest/instance-deployer/contract_instance_deployed_event.d.ts.map +1 -0
- package/dest/instance-deployer/contract_instance_deployed_event.js +47 -0
- package/dest/instance-deployer/index.d.ts +1 -0
- package/dest/instance-deployer/index.d.ts.map +1 -1
- package/dest/instance-deployer/index.js +2 -1
- package/dest/protocol_contract_data.d.ts +4 -0
- package/dest/protocol_contract_data.d.ts.map +1 -1
- package/dest/protocol_contract_data.js +12 -8
- package/dest/scripts/generate_data.js +20 -6
- package/dest/tests/fixtures.d.ts +8 -0
- package/dest/tests/fixtures.d.ts.map +1 -0
- package/dest/tests/fixtures.js +27 -0
- package/package.json +10 -4
- package/src/class-registerer/contract_class_registered_event.ts +86 -0
- package/src/class-registerer/index.ts +4 -0
- package/src/class-registerer/private_function_broadcasted_event.ts +115 -0
- package/src/class-registerer/unconstrained_function_broadcasted_event.ts +109 -0
- package/src/index.ts +5 -0
- package/src/instance-deployer/contract_instance_deployed_event.ts +61 -0
- package/src/instance-deployer/index.ts +2 -0
- package/src/protocol_contract_data.ts +21 -8
- package/src/scripts/generate_data.ts +23 -4
- package/src/tests/fixtures.ts +31 -0
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, Fr, MULTI_CALL_ENTRYPOINT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, ROUTER_ADDRESS, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
|
|
1
|
+
import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, FEE_JUICE_ADDRESS, Fr, MULTI_CALL_ENTRYPOINT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE, REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE, REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE, ROUTER_ADDRESS, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
|
|
2
|
+
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
2
3
|
import { createConsoleLogger } from '@aztec/foundation/log';
|
|
3
4
|
import { loadContractArtifact } from '@aztec/types/abi';
|
|
4
|
-
import fs from 'fs
|
|
5
|
+
import { promises as fs } from 'fs';
|
|
5
6
|
import path from 'path';
|
|
6
7
|
import { buildProtocolContractTree } from '../build_protocol_contract_tree.js';
|
|
7
|
-
const log = createConsoleLogger('
|
|
8
|
+
const log = createConsoleLogger('autogenerate');
|
|
8
9
|
const noirContractsRoot = '../../noir-projects/noir-contracts';
|
|
9
10
|
const srcPath = path.join(noirContractsRoot, './target');
|
|
10
11
|
const destArtifactsDir = './artifacts';
|
|
@@ -105,14 +106,25 @@ function generateContractAddresses(names) {
|
|
|
105
106
|
function generateContractLeaves(names, leaves) {
|
|
106
107
|
return `
|
|
107
108
|
export const ProtocolContractLeaf = {
|
|
108
|
-
${leaves.map((leaf, i) => `${names[i]}: Fr.
|
|
109
|
+
${leaves.map((leaf, i) => `${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
|
|
109
110
|
};
|
|
110
111
|
`;
|
|
111
112
|
}
|
|
112
113
|
function generateRoot(names, leaves) {
|
|
113
114
|
const root = computeRoot(names, leaves);
|
|
114
115
|
return `
|
|
115
|
-
export const protocolContractTreeRoot = Fr.
|
|
116
|
+
export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
|
|
117
|
+
`;
|
|
118
|
+
}
|
|
119
|
+
function generateLogTags() {
|
|
120
|
+
return `
|
|
121
|
+
export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}n);
|
|
122
|
+
export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
|
|
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.fromHexString('${poseidon2Hash([
|
|
125
|
+
DEPLOYER_CONTRACT_ADDRESS,
|
|
126
|
+
DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
|
|
127
|
+
])}');
|
|
116
128
|
`;
|
|
117
129
|
}
|
|
118
130
|
async function generateOutputFile(names, leaves) {
|
|
@@ -134,6 +146,8 @@ async function generateOutputFile(names, leaves) {
|
|
|
134
146
|
${generateContractLeaves(names, leaves)}
|
|
135
147
|
|
|
136
148
|
${generateRoot(names, leaves)}
|
|
149
|
+
|
|
150
|
+
${generateLogTags()}
|
|
137
151
|
`;
|
|
138
152
|
await fs.writeFile(outputFilePath, content);
|
|
139
153
|
}
|
|
@@ -158,4 +172,4 @@ catch (err) {
|
|
|
158
172
|
log(`Error copying protocol contract artifacts: ${err}`);
|
|
159
173
|
process.exit(1);
|
|
160
174
|
}
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY3JpcHRzL2dlbmVyYXRlX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWiwrQkFBK0IsRUFDL0IseUJBQXlCLEVBQ3pCLCtDQUErQyxFQUMvQyxpQkFBaUIsRUFDakIsRUFBRSxFQUNGLDZCQUE2QixFQUM3QiwyQkFBMkIsRUFDM0IsZ0RBQWdELEVBQ2hELG1EQUFtRCxFQUNuRCx5REFBeUQsRUFDekQsY0FBYyxFQUNkLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUd4RCxPQUFPLEVBQUUsUUFBUSxJQUFJLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFFeEIsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFL0UsTUFBTSxHQUFHLEdBQUcsbUJBQW1CLENBQUMsY0FBYyxDQUFDLENBQUM7QUFFaEQsTUFBTSxpQkFBaUIsR0FBRyxvQ0FBb0MsQ0FBQztBQUMvRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ3pELE1BQU0sZ0JBQWdCLEdBQUcsYUFBYSxDQUFDO0FBQ3ZDLE1BQU0sY0FBYyxHQUFHLGlDQUFpQyxDQUFDO0FBRXpELE1BQU0sSUFBSSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXZCLE1BQU0sc0JBQXNCLEdBQStCO0lBQ3pELFlBQVksRUFBRSwrQkFBK0I7SUFDN0Ms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
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
+
export declare function getSampleContractClassRegisteredEventPayload(): Buffer;
|
|
4
|
+
export declare function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer;
|
|
5
|
+
export declare function getSampleUnconstrainedFunctionBroadcastedEventPayload(): Buffer;
|
|
6
|
+
export declare function getSampleContractInstanceDeployedEventPayload(): Buffer;
|
|
7
|
+
export declare function getPathToFixture(name: string): string;
|
|
8
|
+
//# sourceMappingURL=fixtures.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/tests/fixtures.ts"],"names":[],"mappings":";;AAKA,wBAAgB,4CAA4C,IAAI,MAAM,CAGrE;AAGD,wBAAgB,+CAA+C,IAAI,MAAM,CAGxE;AAGD,wBAAgB,qDAAqD,IAAI,MAAM,CAG9E;AAGD,wBAAgB,6CAA6C,IAAI,MAAM,CAGtE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,UAE5C"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { readFileSync } from 'fs';
|
|
2
|
+
import { dirname, resolve } from 'path';
|
|
3
|
+
import { fileURLToPath } from 'url';
|
|
4
|
+
// Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
|
|
5
|
+
export function getSampleContractClassRegisteredEventPayload() {
|
|
6
|
+
const path = getPathToFixture('ContractClassRegisteredEventData.hex');
|
|
7
|
+
return Buffer.from(readFileSync(path).toString(), 'hex');
|
|
8
|
+
}
|
|
9
|
+
// Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
|
|
10
|
+
export function getSamplePrivateFunctionBroadcastedEventPayload() {
|
|
11
|
+
const path = getPathToFixture('PrivateFunctionBroadcastedEventData.hex');
|
|
12
|
+
return Buffer.from(readFileSync(path).toString(), 'hex');
|
|
13
|
+
}
|
|
14
|
+
// Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
|
|
15
|
+
export function getSampleUnconstrainedFunctionBroadcastedEventPayload() {
|
|
16
|
+
const path = getPathToFixture('UnconstrainedFunctionBroadcastedEventData.hex');
|
|
17
|
+
return Buffer.from(readFileSync(path).toString(), 'hex');
|
|
18
|
+
}
|
|
19
|
+
// Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
|
|
20
|
+
export function getSampleContractInstanceDeployedEventPayload() {
|
|
21
|
+
const path = getPathToFixture('ContractInstanceDeployedEventData.hex');
|
|
22
|
+
return Buffer.from(readFileSync(path).toString(), 'hex');
|
|
23
|
+
}
|
|
24
|
+
export function getPathToFixture(name) {
|
|
25
|
+
return resolve(dirname(fileURLToPath(import.meta.url)), `../../fixtures/${name}`);
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdHMvZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLElBQUksQ0FBQztBQUNsQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN4QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXBDLHdIQUF3SDtBQUN4SCxNQUFNLFVBQVUsNENBQTRDO0lBQzFELE1BQU0sSUFBSSxHQUFHLGdCQUFnQixDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFDdEUsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUMzRCxDQUFDO0FBRUQsd0hBQXdIO0FBQ3hILE1BQU0sVUFBVSwrQ0FBK0M7SUFDN0QsTUFBTSxJQUFJLEdBQUcsZ0JBQWdCLENBQUMseUNBQXlDLENBQUMsQ0FBQztJQUN6RSxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQzNELENBQUM7QUFFRCx3SEFBd0g7QUFDeEgsTUFBTSxVQUFVLHFEQUFxRDtJQUNuRSxNQUFNLElBQUksR0FBRyxnQkFBZ0IsQ0FBQywrQ0FBK0MsQ0FBQyxDQUFDO0lBQy9FLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFDM0QsQ0FBQztBQUVELHdIQUF3SDtBQUN4SCxNQUFNLFVBQVUsNkNBQTZDO0lBQzNELE1BQU0sSUFBSSxHQUFHLGdCQUFnQixDQUFDLHVDQUF1QyxDQUFDLENBQUM7SUFDdkUsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUMzRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLElBQVk7SUFDM0MsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsa0JBQWtCLElBQUksRUFBRSxDQUFDLENBQUM7QUFDcEYsQ0FBQyJ9
|
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.
|
|
5
|
+
"version": "0.67.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
8
8
|
".": "./dest/index.js",
|
|
@@ -64,18 +64,24 @@
|
|
|
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.
|
|
71
|
-
"@aztec/foundation": "0.
|
|
72
|
-
"@aztec/types": "0.
|
|
74
|
+
"@aztec/circuits.js": "0.67.0",
|
|
75
|
+
"@aztec/foundation": "0.67.0",
|
|
76
|
+
"@aztec/types": "0.67.0",
|
|
77
|
+
"lodash.chunk": "^4.2.0",
|
|
73
78
|
"lodash.omit": "^4.5.0",
|
|
74
79
|
"tslib": "^2.4.0"
|
|
75
80
|
},
|
|
76
81
|
"devDependencies": {
|
|
77
82
|
"@jest/globals": "^29.5.0",
|
|
78
83
|
"@types/jest": "^29.5.0",
|
|
84
|
+
"@types/lodash.chunk": "^4.2.9",
|
|
79
85
|
"@types/lodash.omit": "^4.5.9",
|
|
80
86
|
"@types/node": "^18.7.23",
|
|
81
87
|
"jest": "^29.5.0",
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type ContractClassPublic,
|
|
3
|
+
PUBLIC_DISPATCH_SELECTOR,
|
|
4
|
+
type PublicFunction,
|
|
5
|
+
computeContractClassId,
|
|
6
|
+
computePublicBytecodeCommitment,
|
|
7
|
+
} from '@aztec/circuits.js';
|
|
8
|
+
import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi';
|
|
9
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
10
|
+
import { BufferReader } from '@aztec/foundation/serialize';
|
|
11
|
+
|
|
12
|
+
import chunk from 'lodash.chunk';
|
|
13
|
+
|
|
14
|
+
import { REGISTERER_CONTRACT_CLASS_REGISTERED_TAG } from '../protocol_contract_data.js';
|
|
15
|
+
|
|
16
|
+
/** Event emitted from the ContractClassRegisterer. */
|
|
17
|
+
export class ContractClassRegisteredEvent {
|
|
18
|
+
constructor(
|
|
19
|
+
public readonly contractClassId: Fr,
|
|
20
|
+
public readonly version: number,
|
|
21
|
+
public readonly artifactHash: Fr,
|
|
22
|
+
public readonly privateFunctionsRoot: Fr,
|
|
23
|
+
public readonly packedPublicBytecode: Buffer,
|
|
24
|
+
) {}
|
|
25
|
+
|
|
26
|
+
static isContractClassRegisteredEvent(log: Buffer) {
|
|
27
|
+
return log.subarray(0, 32).equals(REGISTERER_CONTRACT_CLASS_REGISTERED_TAG.toBuffer());
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
static fromLog(log: Buffer) {
|
|
31
|
+
const reader = new BufferReader(log.subarray(32));
|
|
32
|
+
const contractClassId = reader.readObject(Fr);
|
|
33
|
+
const version = reader.readObject(Fr).toNumber();
|
|
34
|
+
const artifactHash = reader.readObject(Fr);
|
|
35
|
+
const privateFunctionsRoot = reader.readObject(Fr);
|
|
36
|
+
const packedPublicBytecode = bufferFromFields(
|
|
37
|
+
chunk(reader.readToEnd(), Fr.SIZE_IN_BYTES).map(Buffer.from).map(Fr.fromBuffer),
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
return new ContractClassRegisteredEvent(
|
|
41
|
+
contractClassId,
|
|
42
|
+
version,
|
|
43
|
+
artifactHash,
|
|
44
|
+
privateFunctionsRoot,
|
|
45
|
+
packedPublicBytecode,
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
toContractClassPublic(): ContractClassPublic {
|
|
50
|
+
const computedClassId = computeContractClassId({
|
|
51
|
+
artifactHash: this.artifactHash,
|
|
52
|
+
privateFunctionsRoot: this.privateFunctionsRoot,
|
|
53
|
+
publicBytecodeCommitment: computePublicBytecodeCommitment(this.packedPublicBytecode),
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
if (!computedClassId.equals(this.contractClassId)) {
|
|
57
|
+
throw new Error(
|
|
58
|
+
`Invalid contract class id: computed ${computedClassId.toString()} but event broadcasted ${this.contractClassId.toString()}`,
|
|
59
|
+
);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
if (this.version !== 1) {
|
|
63
|
+
throw new Error(`Unexpected contract class version ${this.version}`);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Remove public functions.
|
|
67
|
+
const publicFunctions: PublicFunction[] = [];
|
|
68
|
+
if (this.packedPublicBytecode.length > 0) {
|
|
69
|
+
publicFunctions.push({
|
|
70
|
+
selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
|
|
71
|
+
bytecode: this.packedPublicBytecode,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
return {
|
|
76
|
+
id: this.contractClassId,
|
|
77
|
+
artifactHash: this.artifactHash,
|
|
78
|
+
packedBytecode: this.packedPublicBytecode,
|
|
79
|
+
privateFunctionsRoot: this.privateFunctionsRoot,
|
|
80
|
+
publicFunctions: publicFunctions,
|
|
81
|
+
version: this.version,
|
|
82
|
+
privateFunctions: [],
|
|
83
|
+
unconstrainedFunctions: [],
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
|
|
2
2
|
|
|
3
|
+
export * from './contract_class_registered_event.js';
|
|
4
|
+
export * from './private_function_broadcasted_event.js';
|
|
5
|
+
export * from './unconstrained_function_broadcasted_event.js';
|
|
6
|
+
|
|
3
7
|
/** Returns the canonical deployment of the class registerer contract. */
|
|
4
8
|
export function getCanonicalClassRegisterer(): ProtocolContract {
|
|
5
9
|
return getCanonicalProtocolContract('ContractClassRegisterer');
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
|
|
3
|
+
type ExecutablePrivateFunctionWithMembershipProof,
|
|
4
|
+
FUNCTION_TREE_HEIGHT,
|
|
5
|
+
MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
|
|
6
|
+
type PrivateFunction,
|
|
7
|
+
REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS,
|
|
8
|
+
} from '@aztec/circuits.js';
|
|
9
|
+
import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi';
|
|
10
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
11
|
+
import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
|
|
12
|
+
|
|
13
|
+
import chunk from 'lodash.chunk';
|
|
14
|
+
|
|
15
|
+
import { REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG } from '../protocol_contract_data.js';
|
|
16
|
+
|
|
17
|
+
/** Event emitted from the ContractClassRegisterer. */
|
|
18
|
+
export class PrivateFunctionBroadcastedEvent {
|
|
19
|
+
constructor(
|
|
20
|
+
public readonly contractClassId: Fr,
|
|
21
|
+
public readonly artifactMetadataHash: Fr,
|
|
22
|
+
public readonly unconstrainedFunctionsArtifactTreeRoot: Fr,
|
|
23
|
+
public readonly privateFunctionTreeSiblingPath: Tuple<Fr, typeof FUNCTION_TREE_HEIGHT>,
|
|
24
|
+
public readonly privateFunctionTreeLeafIndex: number,
|
|
25
|
+
public readonly artifactFunctionTreeSiblingPath: Tuple<Fr, typeof ARTIFACT_FUNCTION_TREE_MAX_HEIGHT>,
|
|
26
|
+
public readonly artifactFunctionTreeLeafIndex: number,
|
|
27
|
+
public readonly privateFunction: BroadcastedPrivateFunction,
|
|
28
|
+
) {}
|
|
29
|
+
|
|
30
|
+
static isPrivateFunctionBroadcastedEvent(log: Buffer) {
|
|
31
|
+
return log.subarray(0, 32).equals(REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG.toBuffer());
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
static fromLog(log: Buffer) {
|
|
35
|
+
const expectedLength =
|
|
36
|
+
32 *
|
|
37
|
+
(MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS +
|
|
38
|
+
REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS);
|
|
39
|
+
if (log.length !== expectedLength) {
|
|
40
|
+
throw new Error(
|
|
41
|
+
`Unexpected PrivateFunctionBroadcastedEvent log length: got ${log.length} but expected ${expectedLength}`,
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
const reader = new BufferReader(log.subarray(32));
|
|
46
|
+
const event = PrivateFunctionBroadcastedEvent.fromBuffer(reader);
|
|
47
|
+
if (!reader.isEmpty()) {
|
|
48
|
+
throw new Error(
|
|
49
|
+
`Unexpected data after parsing PrivateFunctionBroadcastedEvent: ${reader.readToEnd().toString('hex')}`,
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return event;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
57
|
+
const reader = BufferReader.asReader(buffer);
|
|
58
|
+
const contractClassId = reader.readObject(Fr);
|
|
59
|
+
const artifactMetadataHash = reader.readObject(Fr);
|
|
60
|
+
const unconstrainedFunctionsArtifactTreeRoot = reader.readObject(Fr);
|
|
61
|
+
const privateFunctionTreeSiblingPath = reader.readArray(FUNCTION_TREE_HEIGHT, Fr);
|
|
62
|
+
const privateFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
|
|
63
|
+
const artifactFunctionTreeSiblingPath = reader.readArray(ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, Fr);
|
|
64
|
+
const artifactFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
|
|
65
|
+
const privateFunction = BroadcastedPrivateFunction.fromBuffer(reader);
|
|
66
|
+
|
|
67
|
+
return new PrivateFunctionBroadcastedEvent(
|
|
68
|
+
contractClassId,
|
|
69
|
+
artifactMetadataHash,
|
|
70
|
+
unconstrainedFunctionsArtifactTreeRoot,
|
|
71
|
+
privateFunctionTreeSiblingPath,
|
|
72
|
+
privateFunctionTreeLeafIndex,
|
|
73
|
+
artifactFunctionTreeSiblingPath,
|
|
74
|
+
artifactFunctionTreeLeafIndex,
|
|
75
|
+
privateFunction,
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
toFunctionWithMembershipProof(): ExecutablePrivateFunctionWithMembershipProof {
|
|
80
|
+
return {
|
|
81
|
+
...this.privateFunction,
|
|
82
|
+
bytecode: this.privateFunction.bytecode,
|
|
83
|
+
functionMetadataHash: this.privateFunction.metadataHash,
|
|
84
|
+
artifactMetadataHash: this.artifactMetadataHash,
|
|
85
|
+
unconstrainedFunctionsArtifactTreeRoot: this.unconstrainedFunctionsArtifactTreeRoot,
|
|
86
|
+
privateFunctionTreeSiblingPath: this.privateFunctionTreeSiblingPath,
|
|
87
|
+
privateFunctionTreeLeafIndex: this.privateFunctionTreeLeafIndex,
|
|
88
|
+
artifactTreeSiblingPath: this.artifactFunctionTreeSiblingPath.filter(fr => !fr.isZero()),
|
|
89
|
+
artifactTreeLeafIndex: this.artifactFunctionTreeLeafIndex,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
export class BroadcastedPrivateFunction implements PrivateFunction {
|
|
95
|
+
constructor(
|
|
96
|
+
/** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
|
|
97
|
+
public readonly selector: FunctionSelector,
|
|
98
|
+
/** Artifact metadata hash */
|
|
99
|
+
public readonly metadataHash: Fr,
|
|
100
|
+
/** Hash of the verification key associated to this private function. */
|
|
101
|
+
public readonly vkHash: Fr,
|
|
102
|
+
/** ACIR and Brillig bytecode */
|
|
103
|
+
public readonly bytecode: Buffer,
|
|
104
|
+
) {}
|
|
105
|
+
|
|
106
|
+
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
107
|
+
const reader = BufferReader.asReader(buffer);
|
|
108
|
+
const selector = FunctionSelector.fromField(reader.readObject(Fr));
|
|
109
|
+
const metadataHash = reader.readObject(Fr);
|
|
110
|
+
const vkHash = reader.readObject(Fr);
|
|
111
|
+
const encodedBytecode = reader.readBytes(MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS * 32);
|
|
112
|
+
const bytecode = bufferFromFields(chunk(encodedBytecode, Fr.SIZE_IN_BYTES).map(Buffer.from).map(Fr.fromBuffer));
|
|
113
|
+
return new BroadcastedPrivateFunction(selector, metadataHash, vkHash, bytecode);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
|
|
3
|
+
MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS,
|
|
4
|
+
REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS,
|
|
5
|
+
type UnconstrainedFunction,
|
|
6
|
+
type UnconstrainedFunctionWithMembershipProof,
|
|
7
|
+
} from '@aztec/circuits.js';
|
|
8
|
+
import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi';
|
|
9
|
+
import { removeArrayPaddingEnd } from '@aztec/foundation/collection';
|
|
10
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
11
|
+
import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
|
|
12
|
+
|
|
13
|
+
import chunk from 'lodash.chunk';
|
|
14
|
+
|
|
15
|
+
import { REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG } from '../protocol_contract_data.js';
|
|
16
|
+
|
|
17
|
+
/** Event emitted from the ContractClassRegisterer. */
|
|
18
|
+
export class UnconstrainedFunctionBroadcastedEvent {
|
|
19
|
+
constructor(
|
|
20
|
+
public readonly contractClassId: Fr,
|
|
21
|
+
public readonly artifactMetadataHash: Fr,
|
|
22
|
+
public readonly privateFunctionsArtifactTreeRoot: Fr,
|
|
23
|
+
public readonly artifactFunctionTreeSiblingPath: Tuple<Fr, typeof ARTIFACT_FUNCTION_TREE_MAX_HEIGHT>,
|
|
24
|
+
public readonly artifactFunctionTreeLeafIndex: number,
|
|
25
|
+
public readonly unconstrainedFunction: BroadcastedUnconstrainedFunction,
|
|
26
|
+
) {}
|
|
27
|
+
|
|
28
|
+
static isUnconstrainedFunctionBroadcastedEvent(log: Buffer) {
|
|
29
|
+
return log.subarray(0, 32).equals(REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG.toBuffer());
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
static fromLog(log: Buffer) {
|
|
33
|
+
const expectedLength =
|
|
34
|
+
32 *
|
|
35
|
+
(MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS +
|
|
36
|
+
REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS);
|
|
37
|
+
if (log.length !== expectedLength) {
|
|
38
|
+
throw new Error(
|
|
39
|
+
`Unexpected UnconstrainedFunctionBroadcastedEvent log length: got ${log.length} but expected ${expectedLength}`,
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const reader = new BufferReader(log.subarray(32));
|
|
44
|
+
const event = UnconstrainedFunctionBroadcastedEvent.fromBuffer(reader);
|
|
45
|
+
if (!reader.isEmpty()) {
|
|
46
|
+
throw new Error(
|
|
47
|
+
`Unexpected data after parsing UnconstrainedFunctionBroadcastedEvent: ${reader.readToEnd().toString('hex')}`,
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return event;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
55
|
+
const reader = BufferReader.asReader(buffer);
|
|
56
|
+
const contractClassId = reader.readObject(Fr);
|
|
57
|
+
const artifactMetadataHash = reader.readObject(Fr);
|
|
58
|
+
const privateFunctionsArtifactTreeRoot = reader.readObject(Fr);
|
|
59
|
+
const artifactFunctionTreeSiblingPath = reader.readArray(ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, Fr);
|
|
60
|
+
const artifactFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
|
|
61
|
+
const unconstrainedFunction = BroadcastedUnconstrainedFunction.fromBuffer(reader);
|
|
62
|
+
|
|
63
|
+
return new UnconstrainedFunctionBroadcastedEvent(
|
|
64
|
+
contractClassId,
|
|
65
|
+
artifactMetadataHash,
|
|
66
|
+
privateFunctionsArtifactTreeRoot,
|
|
67
|
+
artifactFunctionTreeSiblingPath,
|
|
68
|
+
artifactFunctionTreeLeafIndex,
|
|
69
|
+
unconstrainedFunction,
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
toFunctionWithMembershipProof(): UnconstrainedFunctionWithMembershipProof {
|
|
74
|
+
// We should be able to safely remove the zero elements that pad the variable-length sibling path,
|
|
75
|
+
// since a sibling with value zero can only occur on the tree leaves, so the sibling path will never end
|
|
76
|
+
// in a zero. The only exception is a tree with depth 2 with one non-zero leaf, where the sibling path would
|
|
77
|
+
// be a single zero element, but in that case the artifact tree should be just the single leaf.
|
|
78
|
+
const artifactTreeSiblingPath = removeArrayPaddingEnd(this.artifactFunctionTreeSiblingPath, Fr.isZero);
|
|
79
|
+
return {
|
|
80
|
+
...this.unconstrainedFunction,
|
|
81
|
+
bytecode: this.unconstrainedFunction.bytecode,
|
|
82
|
+
functionMetadataHash: this.unconstrainedFunction.metadataHash,
|
|
83
|
+
artifactMetadataHash: this.artifactMetadataHash,
|
|
84
|
+
privateFunctionsArtifactTreeRoot: this.privateFunctionsArtifactTreeRoot,
|
|
85
|
+
artifactTreeSiblingPath,
|
|
86
|
+
artifactTreeLeafIndex: this.artifactFunctionTreeLeafIndex,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export class BroadcastedUnconstrainedFunction implements UnconstrainedFunction {
|
|
92
|
+
constructor(
|
|
93
|
+
/** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
|
|
94
|
+
public readonly selector: FunctionSelector,
|
|
95
|
+
/** Artifact metadata hash */
|
|
96
|
+
public readonly metadataHash: Fr,
|
|
97
|
+
/** Brillig bytecode */
|
|
98
|
+
public readonly bytecode: Buffer,
|
|
99
|
+
) {}
|
|
100
|
+
|
|
101
|
+
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
102
|
+
const reader = BufferReader.asReader(buffer);
|
|
103
|
+
const selector = FunctionSelector.fromField(reader.readObject(Fr));
|
|
104
|
+
const metadataHash = reader.readObject(Fr);
|
|
105
|
+
const encodedBytecode = reader.readBytes(MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS * 32);
|
|
106
|
+
const bytecode = bufferFromFields(chunk(encodedBytecode, Fr.SIZE_IN_BYTES).map(Buffer.from).map(Fr.fromBuffer));
|
|
107
|
+
return new BroadcastedUnconstrainedFunction(selector, metadataHash, bytecode);
|
|
108
|
+
}
|
|
109
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
export * from './auth-registry/index.js';
|
|
2
|
+
export * from './class-registerer/index.js';
|
|
3
|
+
export * from './fee-juice/index.js';
|
|
4
|
+
export * from './instance-deployer/index.js';
|
|
5
|
+
export * from './multi-call-entrypoint/index.js';
|
|
1
6
|
export * from './protocol_contract.js';
|
|
2
7
|
export * from './protocol_contract_data.js';
|
|
3
8
|
export * from './protocol_contract_tree.js';
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { type ContractInstanceWithAddress, type PrivateLog, PublicKeys } from '@aztec/circuits.js';
|
|
2
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
4
|
+
import { BufferReader } from '@aztec/foundation/serialize';
|
|
5
|
+
|
|
6
|
+
import { DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG } from '../protocol_contract_data.js';
|
|
7
|
+
|
|
8
|
+
/** Event emitted from the ContractInstanceDeployer. */
|
|
9
|
+
export class ContractInstanceDeployedEvent {
|
|
10
|
+
constructor(
|
|
11
|
+
public readonly address: AztecAddress,
|
|
12
|
+
public readonly version: number,
|
|
13
|
+
public readonly salt: Fr,
|
|
14
|
+
public readonly contractClassId: Fr,
|
|
15
|
+
public readonly initializationHash: Fr,
|
|
16
|
+
public readonly publicKeys: PublicKeys,
|
|
17
|
+
public readonly deployer: AztecAddress,
|
|
18
|
+
) {}
|
|
19
|
+
|
|
20
|
+
static isContractInstanceDeployedEvent(log: PrivateLog) {
|
|
21
|
+
return log.fields[0].equals(DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
static fromLog(log: PrivateLog) {
|
|
25
|
+
const bufferWithoutTag = log.toBuffer().subarray(32);
|
|
26
|
+
const reader = new BufferReader(bufferWithoutTag);
|
|
27
|
+
const address = reader.readObject(AztecAddress);
|
|
28
|
+
const version = reader.readObject(Fr).toNumber();
|
|
29
|
+
const salt = reader.readObject(Fr);
|
|
30
|
+
const contractClassId = reader.readObject(Fr);
|
|
31
|
+
const initializationHash = reader.readObject(Fr);
|
|
32
|
+
const publicKeys = reader.readObject(PublicKeys);
|
|
33
|
+
const deployer = reader.readObject(AztecAddress);
|
|
34
|
+
|
|
35
|
+
return new ContractInstanceDeployedEvent(
|
|
36
|
+
address,
|
|
37
|
+
version,
|
|
38
|
+
salt,
|
|
39
|
+
contractClassId,
|
|
40
|
+
initializationHash,
|
|
41
|
+
publicKeys,
|
|
42
|
+
deployer,
|
|
43
|
+
);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
toContractInstance(): ContractInstanceWithAddress {
|
|
47
|
+
if (this.version !== 1) {
|
|
48
|
+
throw new Error(`Unexpected contract instance version ${this.version}`);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return {
|
|
52
|
+
address: this.address,
|
|
53
|
+
version: this.version,
|
|
54
|
+
contractClassId: this.contractClassId,
|
|
55
|
+
initializationHash: this.initializationHash,
|
|
56
|
+
publicKeys: this.publicKeys,
|
|
57
|
+
salt: this.salt,
|
|
58
|
+
deployer: this.deployer,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
|
|
2
2
|
|
|
3
|
+
export * from './contract_instance_deployed_event.js';
|
|
4
|
+
|
|
3
5
|
/** Returns the canonical deployment of the instance deployer contract. */
|
|
4
6
|
export function getCanonicalInstanceDeployer(): ProtocolContract {
|
|
5
7
|
return getCanonicalProtocolContract('ContractInstanceDeployer');
|
|
@@ -50,14 +50,27 @@ export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>
|
|
|
50
50
|
};
|
|
51
51
|
|
|
52
52
|
export const ProtocolContractLeaf = {
|
|
53
|
-
AuthRegistry: Fr.
|
|
54
|
-
ContractInstanceDeployer: Fr.
|
|
55
|
-
ContractClassRegisterer: Fr.
|
|
56
|
-
MultiCallEntrypoint: Fr.
|
|
57
|
-
FeeJuice: Fr.
|
|
58
|
-
Router: Fr.
|
|
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.
|
|
62
|
-
'
|
|
61
|
+
export const protocolContractTreeRoot = Fr.fromHexString(
|
|
62
|
+
'0x296690a67333fb896eff0ef812d31f9be26161726e47057bb688ddcf08164453',
|
|
63
|
+
);
|
|
64
|
+
|
|
65
|
+
export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(
|
|
66
|
+
11121068431693264234253912047066709627593769337094408533543930778360n,
|
|
67
|
+
);
|
|
68
|
+
export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(
|
|
69
|
+
2889881020989534926461066592611988634597302675057895885580456197069n,
|
|
70
|
+
);
|
|
71
|
+
export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(
|
|
72
|
+
24399338136397901754495080759185489776044879232766421623673792970137n,
|
|
73
|
+
);
|
|
74
|
+
export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString(
|
|
75
|
+
'0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2',
|
|
63
76
|
);
|