@aztec-labs/simulator 6.1.0-nightly.20261112 → 6.1.0-rc.1
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/dest/private/acvm/serialize.d.ts +1 -1
- package/dest/private/acvm/serialize.d.ts.map +1 -1
- package/dest/private/acvm/serialize.js +2 -1
- package/dest/public/avm/testing/account_proof_fetcher.js +5 -6
- package/dest/public/fixtures/bulk_test.d.ts +1 -1
- package/dest/public/fixtures/bulk_test.d.ts.map +1 -1
- package/dest/public/fixtures/bulk_test.js +3 -6
- package/dest/public/fixtures/utils.d.ts +6 -2
- package/dest/public/fixtures/utils.d.ts.map +1 -1
- package/dest/public/fixtures/utils.js +5 -2
- package/dest/public/public_db_sources.d.ts +3 -1
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +3 -0
- package/package.json +10 -10
- package/src/private/acvm/serialize.ts +2 -1
- package/src/public/avm/testing/account_proof_fetcher.ts +4 -7
- package/src/public/fixtures/bulk_test.ts +3 -2
- package/src/public/fixtures/utils.ts +10 -1
- package/src/public/public_db_sources.ts +5 -0
|
@@ -39,4 +39,4 @@ export declare function arrayToBoundedVec(bVecStorage: ACVMField[], maxLen: numb
|
|
|
39
39
|
* @returns Serialized BoundedVec following Noir intrinsic serialization.
|
|
40
40
|
*/
|
|
41
41
|
export declare function arrayOfArraysToBoundedVecOfArrays(bVecStorage: ACVMField[][], maxLen: number, nestedArrayLength: number): [ACVMField[], ACVMField];
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VyaWFsaXplLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJpdmF0ZS9hY3ZtL3NlcmlhbGl6ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUVoQyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQWdCakQ7Ozs7R0FJRztBQUNILHdCQUFnQixXQUFXLENBQ3pCLEtBQUssRUFBRSxZQUFZLEdBQUcsVUFBVSxHQUFHLEVBQUUsR0FBRyxNQUFNLEdBQUcsT0FBTyxHQUFHLE1BQU0sR0FBRyxNQUFNLEdBQUcsU0FBUyxHQUNyRixTQUFTLENBWVg7QUFFRDs7R0FFRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsRUFBRSxHQUFHLEVBQUUsRUFBRSxxQkFFeEQ7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixhQUFhLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxVQUFVLENBQUMsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSx1QkFLbkc7QUFFRCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUFFLENBRTNEO0FBRUQsd0JBQWdCLGtCQUFrQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sR0FBRyxDQUFDLFNBQVMsRUFBRSxFQUFFLFNBQVMsQ0FBQyxDQUczRjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsV0FBVyxFQUFFLFNBQVMsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FTcEc7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsaUNBQWlDLENBQy9DLFdBQVcsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUMxQixNQUFNLEVBQUUsTUFBTSxFQUNkLGlCQUFpQixFQUFFLE1BQU0sR0FDeEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FzQjFCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GACrF,SAAS,CAYX;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,qBAExD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,uBAKnG;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CAG3F;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CASpG;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,SAAS,EAAE,EAAE,EAC1B,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,GACxB,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CAsB1B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
2
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
2
3
|
import { Buffer } from 'buffer';
|
|
3
4
|
/**
|
|
4
5
|
* Adapts the buffer to the field size.
|
|
@@ -27,7 +28,7 @@ import { Buffer } from 'buffer';
|
|
|
27
28
|
} else {
|
|
28
29
|
buffer = value.toBuffer();
|
|
29
30
|
}
|
|
30
|
-
return
|
|
31
|
+
return bufferToHex(adaptBufferSize(buffer));
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
34
|
* Converts a single value or an array of single values into the equivalent ACVM field representation.
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Fetches an account proof from the Ethereum mainnet and saves it as account_proof.json.
|
|
3
3
|
* This script is not using any Aztec library code, so it's easily portable.
|
|
4
|
-
*/ import {
|
|
4
|
+
*/ import { times } from '@aztec-labs/foundation/collection';
|
|
5
|
+
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
5
6
|
import fs from 'fs';
|
|
6
7
|
import { dirname, join } from 'path';
|
|
7
8
|
import { fileURLToPath } from 'url';
|
|
@@ -23,9 +24,7 @@ function toBytes(hex) {
|
|
|
23
24
|
}
|
|
24
25
|
function bytesToU64s(bytes) {
|
|
25
26
|
const paddedBytes = padTo(bytes, 32);
|
|
26
|
-
return
|
|
27
|
-
length: 4
|
|
28
|
-
}, (_, i)=>{
|
|
27
|
+
return times(4, (i)=>{
|
|
29
28
|
let val = 0n;
|
|
30
29
|
for(let j = 0; j < 8; j++){
|
|
31
30
|
val += BigInt(paddedBytes[i * 8 + j]) << BigInt(j * 8);
|
|
@@ -56,7 +55,7 @@ function parseNode(rlp) {
|
|
|
56
55
|
// Should be safe when working with branches and extensions without embedded children.
|
|
57
56
|
const decoded = fromRlp(rlp);
|
|
58
57
|
const node = {
|
|
59
|
-
rows:
|
|
58
|
+
rows: times(16, ()=>Array(32).fill(0)),
|
|
60
59
|
row_exist: Array(16).fill(false),
|
|
61
60
|
node_type: 0
|
|
62
61
|
};
|
|
@@ -90,7 +89,7 @@ function parseProof(proof, maxLen) {
|
|
|
90
89
|
const nodes = proof.slice(0, -1).slice(0, maxLen).map(parseNode);
|
|
91
90
|
while(nodes.length < maxLen){
|
|
92
91
|
nodes.push({
|
|
93
|
-
rows:
|
|
92
|
+
rows: times(16, ()=>Array(32).fill(0)),
|
|
94
93
|
row_exist: Array(16).fill(false),
|
|
95
94
|
node_type: 0
|
|
96
95
|
});
|
|
@@ -3,4 +3,4 @@ import type { ContractArtifact } from '@aztec-labs/stdlib/abi';
|
|
|
3
3
|
import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
|
|
4
4
|
export declare function bulkTest(tester: PublicTxSimulationTester, logger: Logger, avmTestContractArtifact: ContractArtifact): Promise<import("@aztec-labs/stdlib/avm").PublicTxResult>;
|
|
5
5
|
export declare function megaBulkTest(tester: PublicTxSimulationTester, logger: Logger, avmTestContractArtifact: ContractArtifact): Promise<import("@aztec-labs/stdlib/avm").PublicTxResult>;
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVsa190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL2J1bGtfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRy9ELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRTVFLHdCQUFzQixRQUFRLENBQzVCLE1BQU0sRUFBRSx3QkFBd0IsRUFDaEMsTUFBTSxFQUFFLE1BQU0sRUFDZCx1QkFBdUIsRUFBRSxnQkFBZ0IsNERBZ0cxQztBQUVELHdCQUFzQixZQUFZLENBQ2hDLE1BQU0sRUFBRSx3QkFBd0IsRUFDaEMsTUFBTSxFQUFFLE1BQU0sRUFDZCx1QkFBdUIsRUFBRSxnQkFBZ0IsNERBaUYxQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk_test.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/bulk_test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bulk_test.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/bulk_test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,wBAAwB,EAChC,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,gBAAgB,4DAgG1C;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,wBAAwB,EAChC,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,gBAAgB,4DAiF1C"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
1
2
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
2
3
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
3
4
|
import { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
|
|
@@ -73,9 +74,7 @@ export async function bulkTest(tester, logger, avmTestContractArtifact) {
|
|
|
73
74
|
address: avmTestContract.address,
|
|
74
75
|
fnName: 'assert_calldata_copy_large',
|
|
75
76
|
args: [
|
|
76
|
-
|
|
77
|
-
length: 300
|
|
78
|
-
}, ()=>Fr.random()),
|
|
77
|
+
times(300, ()=>Fr.random()),
|
|
79
78
|
/* with_selector: */ true
|
|
80
79
|
]
|
|
81
80
|
},
|
|
@@ -91,9 +90,7 @@ export async function bulkTest(tester, logger, avmTestContractArtifact) {
|
|
|
91
90
|
address: avmTestContract.address,
|
|
92
91
|
fnName: 'assert_calldata_copy_large',
|
|
93
92
|
args: [
|
|
94
|
-
|
|
95
|
-
length: 300
|
|
96
|
-
}, ()=>Fr.random()),
|
|
93
|
+
times(300, ()=>Fr.random()),
|
|
97
94
|
/* with_selector: */ true
|
|
98
95
|
]
|
|
99
96
|
},
|
|
@@ -22,5 +22,9 @@ export type TestPrivateInsertions = {
|
|
|
22
22
|
export declare function createTxForPublicCalls(privateInsertions: TestPrivateInsertions, setupCallRequests: PublicCallRequestWithCalldata[], appCallRequests: PublicCallRequestWithCalldata[], teardownCallRequest?: PublicCallRequestWithCalldata, feePayer?: AztecAddress, gasUsedByPrivate?: Gas, globals?: GlobalVariables, gasLimits?: Gas): Promise<Tx>;
|
|
23
23
|
export declare function createTxForPrivateOnly(feePayer?: AztecAddress, gasUsedByPrivate?: Gas): Promise<Tx>;
|
|
24
24
|
export declare function addNewContractClassToTx(tx: Tx, contractClass: ContractClassPublic, skipNullifierInsertion?: boolean): Promise<void>;
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
/**
|
|
26
|
+
* Publishes a contract instance in the tx. A tx with public calls gets it in its revertible half unless `revertible` is
|
|
27
|
+
* false.
|
|
28
|
+
*/
|
|
29
|
+
export declare function addNewContractInstanceToTx(tx: Tx, contractInstance: ContractInstanceWithAddress, skipNullifierInsertion?: boolean, revertible?: boolean): Promise<void>;
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvZml4dHVyZXMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBR3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BHLE9BQU8sRUFBRSxHQUFHLEVBQXdCLE1BQU0sd0JBQXdCLENBQUM7QUFVbkUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV4RSxPQUFPLEVBRUwsZUFBZSxFQUVmLDZCQUE2QixFQUM3QixFQUFFLEVBR0gsTUFBTSx1QkFBdUIsQ0FBQztBQU0vQixNQUFNLE1BQU0scUJBQXFCLEdBQUc7SUFDbEMsVUFBVSxDQUFDLEVBQUU7UUFDWCxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUNsQixVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUNsQixVQUFVLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0tBQ3BDLENBQUM7SUFDRixhQUFhLENBQUMsRUFBRTtRQUNkLFVBQVUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2xCLFVBQVUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2xCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixFQUFFLENBQUM7S0FDcEMsQ0FBQztDQUNILENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFzQixzQkFBc0IsQ0FDMUMsaUJBQWlCLEVBQUUscUJBQXFCLEVBQ3hDLGlCQUFpQixFQUFFLDZCQUE2QixFQUFFLEVBQ2xELGVBQWUsRUFBRSw2QkFBNkIsRUFBRSxFQUNoRCxtQkFBbUIsQ0FBQyxFQUFFLDZCQUE2QixFQUNuRCxRQUFRLGVBQXNCLEVBQzlCLGdCQUFnQixHQUFFLEdBQWlCLEVBQ25DLE9BQU8sR0FBRSxlQUF5QyxFQUNsRCxTQUFTLENBQUMsRUFBRSxHQUFHLEdBQ2QsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQTRGYjtBQUVELHdCQUFzQixzQkFBc0IsQ0FDMUMsUUFBUSxlQUFzQixFQUM5QixnQkFBZ0IsR0FBRSxHQUFxQixHQUN0QyxPQUFPLENBQUMsRUFBRSxDQUFDLENBMEJiO0FBRUQsd0JBQXNCLHVCQUF1QixDQUMzQyxFQUFFLEVBQUUsRUFBRSxFQUNOLGFBQWEsRUFBRSxtQkFBbUIsRUFDbEMsc0JBQXNCLFVBQVEsaUJBNkIvQjtBQUVEOzs7R0FHRztBQUNILHdCQUFzQiwwQkFBMEIsQ0FDOUMsRUFBRSxFQUFFLEVBQUUsRUFDTixnQkFBZ0IsRUFBRSwyQkFBMkIsRUFDN0Msc0JBQXNCLFVBQVEsRUFDOUIsVUFBVSxVQUFPLGlCQTZDbEIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACpG,OAAO,EAAE,GAAG,EAAwB,MAAM,wBAAwB,CAAC;AAUnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,EAEL,eAAe,EAEf,6BAA6B,EAC7B,EAAE,EAGH,MAAM,uBAAuB,CAAC;AAM/B,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE;QACX,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACpC,CAAC;IACF,aAAa,CAAC,EAAE;QACd,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACpC,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,iBAAiB,EAAE,qBAAqB,EACxC,iBAAiB,EAAE,6BAA6B,EAAE,EAClD,eAAe,EAAE,6BAA6B,EAAE,EAChD,mBAAmB,CAAC,EAAE,6BAA6B,EACnD,QAAQ,eAAsB,EAC9B,gBAAgB,GAAE,GAAiB,EACnC,OAAO,GAAE,eAAyC,EAClD,SAAS,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,EAAE,CAAC,CA4Fb;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,eAAsB,EAC9B,gBAAgB,GAAE,GAAqB,GACtC,OAAO,CAAC,EAAE,CAAC,CA0Bb;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,mBAAmB,EAClC,sBAAsB,UAAQ,iBA6B/B;AAED,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,EAAE,EACN,gBAAgB,EAAE,2BAA2B,EAC7C,sBAAsB,UAAQ,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACpG,OAAO,EAAE,GAAG,EAAwB,MAAM,wBAAwB,CAAC;AAUnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,EAEL,eAAe,EAEf,6BAA6B,EAC7B,EAAE,EAGH,MAAM,uBAAuB,CAAC;AAM/B,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,CAAC,EAAE;QACX,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACpC,CAAC;IACF,aAAa,CAAC,EAAE;QACd,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACpC,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,iBAAiB,EAAE,qBAAqB,EACxC,iBAAiB,EAAE,6BAA6B,EAAE,EAClD,eAAe,EAAE,6BAA6B,EAAE,EAChD,mBAAmB,CAAC,EAAE,6BAA6B,EACnD,QAAQ,eAAsB,EAC9B,gBAAgB,GAAE,GAAiB,EACnC,OAAO,GAAE,eAAyC,EAClD,SAAS,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,EAAE,CAAC,CA4Fb;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,eAAsB,EAC9B,gBAAgB,GAAE,GAAqB,GACtC,OAAO,CAAC,EAAE,CAAC,CA0Bb;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,mBAAmB,EAClC,sBAAsB,UAAQ,iBA6B/B;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,EAAE,EACN,gBAAgB,EAAE,2BAA2B,EAC7C,sBAAsB,UAAQ,EAC9B,UAAU,UAAO,iBA6ClB"}
|
|
@@ -136,7 +136,10 @@ export async function addNewContractClassToTx(tx, contractClass, skipNullifierIn
|
|
|
136
136
|
accumulatedData.contractClassLogsHashes[nextLogIndex] = contractClassLogHash;
|
|
137
137
|
tx.contractClassLogFields.push(logFields);
|
|
138
138
|
}
|
|
139
|
-
|
|
139
|
+
/**
|
|
140
|
+
* Publishes a contract instance in the tx. A tx with public calls gets it in its revertible half unless `revertible` is
|
|
141
|
+
* false.
|
|
142
|
+
*/ export async function addNewContractInstanceToTx(tx, contractInstance, skipNullifierInsertion = false, revertible = true) {
|
|
140
143
|
// Only ivpk_m is broadcast as a point (x, y); the other five keys are hashes.
|
|
141
144
|
const publicKeysAsFields = [
|
|
142
145
|
contractInstance.publicKeys.npkMHash,
|
|
@@ -160,7 +163,7 @@ export async function addNewContractInstanceToTx(tx, contractInstance, skipNulli
|
|
|
160
163
|
];
|
|
161
164
|
const contractInstanceLog = new PrivateLog(padArrayEnd(logFields, Fr.ZERO, PRIVATE_LOG_SIZE_IN_FIELDS), logFields.length);
|
|
162
165
|
const contractAddressNullifier = await siloNullifier(AztecAddress.fromNumberUnsafe(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), contractInstance.address.toField());
|
|
163
|
-
const accumulatedData = tx.data.forPublic ? tx.data.forPublic.revertibleAccumulatedData : tx.data.forRollup.end;
|
|
166
|
+
const accumulatedData = tx.data.forPublic ? revertible ? tx.data.forPublic.revertibleAccumulatedData : tx.data.forPublic.nonRevertibleAccumulatedData : tx.data.forRollup.end;
|
|
164
167
|
if (!skipNullifierInsertion) {
|
|
165
168
|
const nextNullifierIndex = countAccumulatedItems(accumulatedData.nullifiers);
|
|
166
169
|
accumulatedData.nullifiers[nextNullifierIndex] = contractAddressNullifier;
|
|
@@ -19,6 +19,8 @@ export declare class PublicContractsDB implements PublicContractsDBInterface {
|
|
|
19
19
|
constructor(dataSource: ContractDataSource, bindings?: LoggerBindings);
|
|
20
20
|
/** Parses raw contract deployment data and inserts the resulting contracts into the current checkpoint. */
|
|
21
21
|
addContractsFromLogs(contractDeploymentData: ContractDeploymentData): void;
|
|
22
|
+
/** Adds the contracts the tx publishes in its non-revertible half, which the AVM makes visible before setup. */
|
|
23
|
+
addNewNonRevertibleContracts(tx: Tx): void;
|
|
22
24
|
addNewContracts(tx: Tx): void;
|
|
23
25
|
/** Inserts typed contract instances directly into the current checkpoint. */
|
|
24
26
|
addContracts(contractInstances?: ContractInstanceWithAddress[]): void;
|
|
@@ -80,4 +82,4 @@ export declare class PublicTreesDB implements PublicStateDBInterface {
|
|
|
80
82
|
revertCheckpoint(): Promise<void>;
|
|
81
83
|
getTreeSnapshots(): Promise<TreeSnapshots>;
|
|
82
84
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2RiX3NvdXJjZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX2RiX3NvdXJjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3pELE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUk1RixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3JFLE9BQU8sRUFFTCxLQUFLLG1CQUFtQixFQUN4QixLQUFLLGtCQUFrQixFQUN2QixLQUFLLHNCQUFzQixFQUMzQixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFdEYsT0FBTyxFQUNMLFlBQVksRUFLYixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUl2RCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzdGOzs7R0FHRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLDBCQUEwQjtJQU1oRSxPQUFPLENBQUMsVUFBVTtJQUxwQixPQUFPLENBQUMsa0JBQWtCLENBQTBEO0lBRXBGLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxVQUFVLEVBQUUsa0JBQWtCLEVBQ3RDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFRCwyR0FBMkc7SUFDcEcsb0JBQW9CLENBQUMs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAI5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,2BAA2B,EAEjC,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EACL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAIvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG7F;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,0BAA0B;IAMhE,OAAO,CAAC,UAAU;IALpB,OAAO,CAAC,kBAAkB,CAA0D;IAEpF,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,UAAU,EAAE,kBAAkB,EACtC,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAED,2GAA2G;IACpG,oBAAoB,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI,CAYhF;IAED,gHAAgH;IACzG,4BAA4B,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAEhD;IAEM,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAInC;IAED,6EAA6E;IACtE,YAAY,CAAC,iBAAiB,CAAC,EAAE,2BAA2B,EAAE,GAAG,IAAI,CAK3E;IAED;;;OAGG;IACI,gBAAgB,IAAI,IAAI,CAI9B;IAED;;OAEG;IACI,gBAAgB,IAAI,IAAI,CAM9B;IAED;;;;;OAKG;IACI,wBAAwB,IAAI,IAAI,CAMtC;IAED;;;OAGG;IACI,gBAAgB,IAAI,IAAI,CAK9B;IAED,OAAO,CAAC,eAAe;IAaV,mBAAmB,CAC9B,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAGlD;IAEY,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAG3F;IAEY,qBAAqB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAqB/E;IAEY,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEhH;IAED,OAAO,CAAC,4BAA4B;IAWpC,OAAO,CAAC,8BAA8B;CAWvC;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,aAAc,YAAW,sBAAsB;IAIxD,OAAO,CAAC,QAAQ,CAAC,EAAE;IAHrB,OAAO,CAAC,MAAM,CAAS;IAEvB,YACmB,EAAE,EAAE,yBAAyB,EAC9C,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEY,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAyBtE;IAEY,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvF;IAEY,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAgB9D;IAEY,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAgBvD;IAEY,aAAa,CAAC,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAStD;IAEY,oBAAoB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBjE;IAEY,cAAc,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAS9D;IAEY,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiChF;IAEY,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7C;IAEY,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7C;IAEY,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7C;IAEY,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CAQtD;CACF"}
|
|
@@ -31,6 +31,9 @@ import { L1ToL2MessageIndexOutOfRangeError, NoteHashIndexOutOfRangeError } from
|
|
|
31
31
|
this.addContractClassesFromEvents(ContractClassPublishedEvent.extractContractClassEvents(contractDeploymentData.getContractClassLogs()), currentState);
|
|
32
32
|
this.addContractInstancesFromEvents(ContractInstancePublishedEvent.extractContractInstanceEvents(contractDeploymentData.getPrivateLogs()), currentState);
|
|
33
33
|
}
|
|
34
|
+
/** Adds the contracts the tx publishes in its non-revertible half, which the AVM makes visible before setup. */ addNewNonRevertibleContracts(tx) {
|
|
35
|
+
this.addContractsFromLogs(AllContractDeploymentData.fromTx(tx).getNonRevertibleContractDeploymentData());
|
|
36
|
+
}
|
|
34
37
|
addNewContracts(tx) {
|
|
35
38
|
const contractDeploymentData = AllContractDeploymentData.fromTx(tx);
|
|
36
39
|
this.addContractsFromLogs(contractDeploymentData.getNonRevertibleContractDeploymentData());
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/simulator",
|
|
3
|
-
"version": "6.1.0-
|
|
3
|
+
"version": "6.1.0-rc.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./server": "./dest/server.js",
|
|
@@ -68,13 +68,13 @@
|
|
|
68
68
|
"@aztec-foundation/noir-acvm_js": "6.1.0-nightly.20261111",
|
|
69
69
|
"@aztec-foundation/noir-noirc_abi": "6.1.0-nightly.20261111",
|
|
70
70
|
"@aztec-foundation/noir-types": "6.1.0-nightly.20261111",
|
|
71
|
-
"@aztec-labs/constants": "6.1.0-
|
|
72
|
-
"@aztec-labs/foundation": "6.1.0-
|
|
73
|
-
"@aztec-labs/protocol-contracts": "6.1.0-
|
|
74
|
-
"@aztec-labs/standard-contracts": "6.1.0-
|
|
75
|
-
"@aztec-labs/stdlib": "6.1.0-
|
|
76
|
-
"@aztec-labs/telemetry-client": "6.1.0-
|
|
77
|
-
"@aztec-labs/world-state": "6.1.0-
|
|
71
|
+
"@aztec-labs/constants": "6.1.0-rc.1",
|
|
72
|
+
"@aztec-labs/foundation": "6.1.0-rc.1",
|
|
73
|
+
"@aztec-labs/protocol-contracts": "6.1.0-rc.1",
|
|
74
|
+
"@aztec-labs/standard-contracts": "6.1.0-rc.1",
|
|
75
|
+
"@aztec-labs/stdlib": "6.1.0-rc.1",
|
|
76
|
+
"@aztec-labs/telemetry-client": "6.1.0-rc.1",
|
|
77
|
+
"@aztec-labs/world-state": "6.1.0-rc.1",
|
|
78
78
|
"buffer": "^6.0.3",
|
|
79
79
|
"lodash.clonedeep": "^4.5.0",
|
|
80
80
|
"lodash.merge": "^4.6.2",
|
|
@@ -82,8 +82,8 @@
|
|
|
82
82
|
"tslib": "^2.4.0"
|
|
83
83
|
},
|
|
84
84
|
"devDependencies": {
|
|
85
|
-
"@aztec-labs/noir-contracts.js": "6.1.0-
|
|
86
|
-
"@aztec-labs/noir-test-contracts.js": "6.1.0-
|
|
85
|
+
"@aztec-labs/noir-contracts.js": "6.1.0-rc.1",
|
|
86
|
+
"@aztec-labs/noir-test-contracts.js": "6.1.0-rc.1",
|
|
87
87
|
"@jest/globals": "^30.0.0",
|
|
88
88
|
"@types/jest": "^30.0.0",
|
|
89
89
|
"@types/lodash.clonedeep": "^4.5.7",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
2
2
|
import type { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
3
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
3
4
|
import type { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
|
|
4
5
|
import { Buffer } from 'buffer';
|
|
5
6
|
|
|
@@ -37,7 +38,7 @@ export function toACVMField(
|
|
|
37
38
|
} else {
|
|
38
39
|
buffer = value.toBuffer();
|
|
39
40
|
}
|
|
40
|
-
return
|
|
41
|
+
return bufferToHex(adaptBufferSize(buffer));
|
|
41
42
|
}
|
|
42
43
|
|
|
43
44
|
/**
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Fetches an account proof from the Ethereum mainnet and saves it as account_proof.json.
|
|
3
3
|
* This script is not using any Aztec library code, so it's easily portable.
|
|
4
4
|
*/
|
|
5
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
5
6
|
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
6
7
|
import fs from 'fs';
|
|
7
8
|
import { dirname, join } from 'path';
|
|
@@ -26,7 +27,7 @@ function toBytes(hex: `0x${string}`) {
|
|
|
26
27
|
|
|
27
28
|
function bytesToU64s(bytes: number[]) {
|
|
28
29
|
const paddedBytes = padTo(bytes, 32);
|
|
29
|
-
return
|
|
30
|
+
return times(4, i => {
|
|
30
31
|
let val = 0n;
|
|
31
32
|
for (let j = 0; j < 8; j++) {
|
|
32
33
|
val += BigInt(paddedBytes[i * 8 + j]) << BigInt(j * 8);
|
|
@@ -51,9 +52,7 @@ function parseNode(rlp: `0x${string}`) {
|
|
|
51
52
|
// Should be safe when working with branches and extensions without embedded children.
|
|
52
53
|
const decoded = fromRlp(rlp) as `0x${string}`[];
|
|
53
54
|
const node = {
|
|
54
|
-
rows:
|
|
55
|
-
.fill(0)
|
|
56
|
-
.map(() => Array(32).fill(0)),
|
|
55
|
+
rows: times(16, () => Array(32).fill(0)),
|
|
57
56
|
row_exist: Array(16).fill(false),
|
|
58
57
|
node_type: 0,
|
|
59
58
|
};
|
|
@@ -90,9 +89,7 @@ function parseProof(proof: `0x${string}`[], maxLen: number) {
|
|
|
90
89
|
const nodes = proof.slice(0, -1).slice(0, maxLen).map(parseNode);
|
|
91
90
|
while (nodes.length < maxLen) {
|
|
92
91
|
nodes.push({
|
|
93
|
-
rows:
|
|
94
|
-
.fill(0)
|
|
95
|
-
.map(() => Array(32).fill(0)),
|
|
92
|
+
rows: times(16, () => Array(32).fill(0)),
|
|
96
93
|
row_exist: Array(16).fill(false),
|
|
97
94
|
node_type: 0,
|
|
98
95
|
});
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
1
2
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
2
3
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
3
4
|
import { Timer } from '@aztec-labs/foundation/timer';
|
|
@@ -71,7 +72,7 @@ export async function bulkTest(
|
|
|
71
72
|
{
|
|
72
73
|
address: avmTestContract.address,
|
|
73
74
|
fnName: 'assert_calldata_copy_large',
|
|
74
|
-
args: [
|
|
75
|
+
args: [times(300, () => Fr.random()), /* with_selector: */ true],
|
|
75
76
|
},
|
|
76
77
|
{
|
|
77
78
|
address: avmTestContract.address,
|
|
@@ -81,7 +82,7 @@ export async function bulkTest(
|
|
|
81
82
|
{
|
|
82
83
|
address: avmTestContract.address,
|
|
83
84
|
fnName: 'assert_calldata_copy_large',
|
|
84
|
-
args: [
|
|
85
|
+
args: [times(300, () => Fr.random()), /* with_selector: */ true],
|
|
85
86
|
},
|
|
86
87
|
// 3 calls to external contracts
|
|
87
88
|
{ address: avmTestContract.address, fnName: 'call_fee_juice', args: [] },
|
|
@@ -222,10 +222,15 @@ export async function addNewContractClassToTx(
|
|
|
222
222
|
tx.contractClassLogFields.push(logFields);
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
+
/**
|
|
226
|
+
* Publishes a contract instance in the tx. A tx with public calls gets it in its revertible half unless `revertible` is
|
|
227
|
+
* false.
|
|
228
|
+
*/
|
|
225
229
|
export async function addNewContractInstanceToTx(
|
|
226
230
|
tx: Tx,
|
|
227
231
|
contractInstance: ContractInstanceWithAddress,
|
|
228
232
|
skipNullifierInsertion = false,
|
|
233
|
+
revertible = true,
|
|
229
234
|
) {
|
|
230
235
|
// Only ivpk_m is broadcast as a point (x, y); the other five keys are hashes.
|
|
231
236
|
const publicKeysAsFields = [
|
|
@@ -258,7 +263,11 @@ export async function addNewContractInstanceToTx(
|
|
|
258
263
|
contractInstance.address.toField(),
|
|
259
264
|
);
|
|
260
265
|
|
|
261
|
-
const accumulatedData = tx.data.forPublic
|
|
266
|
+
const accumulatedData = tx.data.forPublic
|
|
267
|
+
? revertible
|
|
268
|
+
? tx.data.forPublic.revertibleAccumulatedData
|
|
269
|
+
: tx.data.forPublic.nonRevertibleAccumulatedData
|
|
270
|
+
: tx.data.forRollup!.end;
|
|
262
271
|
if (!skipNullifierInsertion) {
|
|
263
272
|
const nextNullifierIndex = countAccumulatedItems(accumulatedData.nullifiers);
|
|
264
273
|
accumulatedData.nullifiers[nextNullifierIndex] = contractAddressNullifier;
|
|
@@ -69,6 +69,11 @@ export class PublicContractsDB implements PublicContractsDBInterface {
|
|
|
69
69
|
);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
+
/** Adds the contracts the tx publishes in its non-revertible half, which the AVM makes visible before setup. */
|
|
73
|
+
public addNewNonRevertibleContracts(tx: Tx): void {
|
|
74
|
+
this.addContractsFromLogs(AllContractDeploymentData.fromTx(tx).getNonRevertibleContractDeploymentData());
|
|
75
|
+
}
|
|
76
|
+
|
|
72
77
|
public addNewContracts(tx: Tx): void {
|
|
73
78
|
const contractDeploymentData = AllContractDeploymentData.fromTx(tx);
|
|
74
79
|
this.addContractsFromLogs(contractDeploymentData.getNonRevertibleContractDeploymentData());
|