@aztec/archiver 4.0.0-nightly.20260112 → 4.0.0-nightly.20260114
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/README.md +139 -22
- package/dest/archiver/archive_source_base.d.ts +75 -0
- package/dest/archiver/archive_source_base.d.ts.map +1 -0
- package/dest/archiver/archive_source_base.js +202 -0
- package/dest/archiver/archiver.d.ts +32 -168
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +123 -613
- package/dest/archiver/archiver_store_updates.d.ts +38 -0
- package/dest/archiver/archiver_store_updates.d.ts.map +1 -0
- package/dest/archiver/archiver_store_updates.js +212 -0
- package/dest/archiver/config.js +2 -2
- package/dest/archiver/index.d.ts +3 -2
- package/dest/archiver/index.d.ts.map +1 -1
- package/dest/archiver/index.js +2 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts +12 -5
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +23 -4
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +1 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.js +1 -1
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +1 -1
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +173 -12
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +159 -48
- package/dest/archiver/l1/calldata_retriever.d.ts +2 -2
- package/dest/archiver/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/archiver/l1/calldata_retriever.js +2 -2
- package/dest/archiver/l1/data_retrieval.d.ts +9 -11
- package/dest/archiver/l1/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/l1/data_retrieval.js +32 -51
- package/dest/archiver/l1/validate_trace.js +1 -1
- package/dest/archiver/test/fake_l1_state.d.ts +173 -0
- package/dest/archiver/test/fake_l1_state.d.ts.map +1 -0
- package/dest/archiver/test/fake_l1_state.js +364 -0
- package/dest/archiver/validation.d.ts +4 -4
- package/dest/archiver/validation.d.ts.map +1 -1
- package/dest/archiver/validation.js +1 -1
- package/dest/test/mock_l1_to_l2_message_source.d.ts +2 -2
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
- package/dest/test/mock_l1_to_l2_message_source.js +12 -3
- package/dest/test/mock_l2_block_source.d.ts +8 -4
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +65 -19
- package/package.json +13 -13
- package/src/archiver/archive_source_base.ts +339 -0
- package/src/archiver/archiver.ts +166 -815
- package/src/archiver/archiver_store_updates.ts +321 -0
- package/src/archiver/config.ts +2 -2
- package/src/archiver/index.ts +2 -1
- package/src/archiver/kv_archiver_store/block_store.ts +36 -8
- package/src/archiver/kv_archiver_store/contract_class_store.ts +1 -1
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +1 -1
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +177 -11
- package/src/archiver/l1/calldata_retriever.ts +2 -2
- package/src/archiver/l1/data_retrieval.ts +51 -68
- package/src/archiver/l1/validate_trace.ts +1 -1
- package/src/archiver/test/fake_l1_state.ts +561 -0
- package/src/archiver/validation.ts +6 -6
- package/src/test/mock_l1_to_l2_message_source.ts +10 -4
- package/src/test/mock_l2_block_source.ts +76 -18
- package/dest/archiver/archiver_store.d.ts +0 -308
- package/dest/archiver/archiver_store.d.ts.map +0 -1
- package/dest/archiver/archiver_store.js +0 -4
- package/dest/archiver/archiver_store_test_suite.d.ts +0 -8
- package/dest/archiver/archiver_store_test_suite.d.ts.map +0 -1
- package/dest/archiver/archiver_store_test_suite.js +0 -2770
- package/src/archiver/archiver_store.ts +0 -372
- package/src/archiver/archiver_store_test_suite.ts +0 -2843
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import type { L2BlockNew, ValidateCheckpointResult } from '@aztec/stdlib/block';
|
|
3
|
+
import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
4
|
+
import type { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
|
|
5
|
+
/**
|
|
6
|
+
* Adds blocks to the store with contract class/instance extraction from logs.
|
|
7
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
|
|
8
|
+
* and individually broadcasted functions from the block logs.
|
|
9
|
+
*
|
|
10
|
+
* @param store - The archiver data store.
|
|
11
|
+
* @param blocks - The L2 blocks to add.
|
|
12
|
+
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
13
|
+
* @returns True if the operation is successful.
|
|
14
|
+
*/
|
|
15
|
+
export declare function addBlocksWithContractData(store: KVArchiverDataStore, blocks: L2BlockNew[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
|
|
16
|
+
/**
|
|
17
|
+
* Adds checkpoints to the store with contract class/instance extraction from logs.
|
|
18
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
|
|
19
|
+
* and individually broadcasted functions from the checkpoint block logs.
|
|
20
|
+
*
|
|
21
|
+
* @param store - The archiver data store.
|
|
22
|
+
* @param checkpoints - The published checkpoints to add.
|
|
23
|
+
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
24
|
+
* @returns True if the operation is successful.
|
|
25
|
+
*/
|
|
26
|
+
export declare function addCheckpointsWithContractData(store: KVArchiverDataStore, checkpoints: PublishedCheckpoint[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
|
|
27
|
+
/**
|
|
28
|
+
* Unwinds checkpoints from the store with reverse contract extraction.
|
|
29
|
+
* Deletes ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated data
|
|
30
|
+
* that was stored for the unwound checkpoints.
|
|
31
|
+
*
|
|
32
|
+
* @param store - The archiver data store.
|
|
33
|
+
* @param from - The checkpoint number to unwind from (must be the current tip).
|
|
34
|
+
* @param checkpointsToUnwind - The number of checkpoints to unwind.
|
|
35
|
+
* @returns True if the operation is successful.
|
|
36
|
+
*/
|
|
37
|
+
export declare function unwindCheckpointsWithContractData(store: KVArchiverDataStore, from: CheckpointNumber, checkpointsToUnwind: number): Promise<boolean>;
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc3RvcmVfdXBkYXRlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2FyY2hpdmVyX3N0b3JlX3VwZGF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQWUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQVlyRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBYXBFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFVcEY7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLHlCQUF5QixDQUN2QyxLQUFLLEVBQUUsbUJBQW1CLEVBQzFCLE1BQU0sRUFBRSxVQUFVLEVBQUUsRUFDcEIsNEJBQTRCLENBQUMsRUFBRSx3QkFBd0IsR0FDdEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWVsQjtBQUVEOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FDNUMsS0FBSyxFQUFFLG1CQUFtQixFQUMxQixXQUFXLEVBQUUsbUJBQW1CLEVBQUUsRUFDbEMsNEJBQTRCLENBQUMsRUFBRSx3QkFBd0IsR0FDdEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWdCbEI7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBc0IsaUNBQWlDLENBQ3JELEtBQUssRUFBRSxtQkFBbUIsRUFDMUIsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQzFCLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0E0Q2xCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"archiver_store_updates.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_updates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAYrF,OAAO,KAAK,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAapE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAUpF;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,UAAU,EAAE,EACpB,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAelB;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,mBAAmB,EAC1B,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED;;;;;;;;;GASG;AACH,wBAAsB,iCAAiC,CACrD,KAAK,EAAE,mBAAmB,EAC1B,IAAI,EAAE,gBAAgB,EACtB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC,CA4ClB"}
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
4
|
+
import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
|
|
5
|
+
import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
|
|
6
|
+
import groupBy from 'lodash.groupby';
|
|
7
|
+
const log = createLogger('archiver:store-updates');
|
|
8
|
+
/** Operation type for contract data updates. */ var Operation = /*#__PURE__*/ function(Operation) {
|
|
9
|
+
Operation[Operation["Store"] = 0] = "Store";
|
|
10
|
+
Operation[Operation["Delete"] = 1] = "Delete";
|
|
11
|
+
return Operation;
|
|
12
|
+
}(Operation || {});
|
|
13
|
+
/**
|
|
14
|
+
* Adds blocks to the store with contract class/instance extraction from logs.
|
|
15
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
|
|
16
|
+
* and individually broadcasted functions from the block logs.
|
|
17
|
+
*
|
|
18
|
+
* @param store - The archiver data store.
|
|
19
|
+
* @param blocks - The L2 blocks to add.
|
|
20
|
+
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
21
|
+
* @returns True if the operation is successful.
|
|
22
|
+
*/ export function addBlocksWithContractData(store, blocks, pendingChainValidationStatus) {
|
|
23
|
+
return store.transactionAsync(async ()=>{
|
|
24
|
+
await store.addBlocks(blocks);
|
|
25
|
+
const opResults = await Promise.all([
|
|
26
|
+
// Update the pending chain validation status if provided
|
|
27
|
+
pendingChainValidationStatus && store.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
28
|
+
// Add any logs emitted during the retrieved blocks
|
|
29
|
+
store.addLogs(blocks),
|
|
30
|
+
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
31
|
+
...blocks.map((block)=>addBlockDataToDB(store, block))
|
|
32
|
+
]);
|
|
33
|
+
return opResults.every(Boolean);
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Adds checkpoints to the store with contract class/instance extraction from logs.
|
|
38
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
|
|
39
|
+
* and individually broadcasted functions from the checkpoint block logs.
|
|
40
|
+
*
|
|
41
|
+
* @param store - The archiver data store.
|
|
42
|
+
* @param checkpoints - The published checkpoints to add.
|
|
43
|
+
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
44
|
+
* @returns True if the operation is successful.
|
|
45
|
+
*/ export function addCheckpointsWithContractData(store, checkpoints, pendingChainValidationStatus) {
|
|
46
|
+
return store.transactionAsync(async ()=>{
|
|
47
|
+
await store.addCheckpoints(checkpoints);
|
|
48
|
+
const allBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks);
|
|
49
|
+
const opResults = await Promise.all([
|
|
50
|
+
// Update the pending chain validation status if provided
|
|
51
|
+
pendingChainValidationStatus && store.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
52
|
+
// Add any logs emitted during the retrieved blocks
|
|
53
|
+
store.addLogs(allBlocks),
|
|
54
|
+
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
55
|
+
...allBlocks.map((block)=>addBlockDataToDB(store, block))
|
|
56
|
+
]);
|
|
57
|
+
return opResults.every(Boolean);
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Unwinds checkpoints from the store with reverse contract extraction.
|
|
62
|
+
* Deletes ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated data
|
|
63
|
+
* that was stored for the unwound checkpoints.
|
|
64
|
+
*
|
|
65
|
+
* @param store - The archiver data store.
|
|
66
|
+
* @param from - The checkpoint number to unwind from (must be the current tip).
|
|
67
|
+
* @param checkpointsToUnwind - The number of checkpoints to unwind.
|
|
68
|
+
* @returns True if the operation is successful.
|
|
69
|
+
*/ export async function unwindCheckpointsWithContractData(store, from, checkpointsToUnwind) {
|
|
70
|
+
if (checkpointsToUnwind <= 0) {
|
|
71
|
+
throw new Error(`Cannot unwind ${checkpointsToUnwind} blocks`);
|
|
72
|
+
}
|
|
73
|
+
const last = await store.getSynchedCheckpointNumber();
|
|
74
|
+
if (from != last) {
|
|
75
|
+
throw new Error(`Cannot unwind checkpoints from checkpoint ${from} when the last checkpoint is ${last}`);
|
|
76
|
+
}
|
|
77
|
+
const blocks = [];
|
|
78
|
+
const lastCheckpointNumber = from + checkpointsToUnwind - 1;
|
|
79
|
+
for(let checkpointNumber = from; checkpointNumber <= lastCheckpointNumber; checkpointNumber++){
|
|
80
|
+
const blocksForCheckpoint = await store.getBlocksForCheckpoint(checkpointNumber);
|
|
81
|
+
if (!blocksForCheckpoint) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
blocks.push(...blocksForCheckpoint);
|
|
85
|
+
}
|
|
86
|
+
const opResults = await Promise.all([
|
|
87
|
+
// Prune rolls back to the last proven block, which is by definition valid
|
|
88
|
+
store.setPendingChainValidationStatus({
|
|
89
|
+
valid: true
|
|
90
|
+
}),
|
|
91
|
+
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
92
|
+
...blocks.map(async (block)=>{
|
|
93
|
+
const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
|
|
94
|
+
// ContractInstancePublished event logs are broadcast in privateLogs.
|
|
95
|
+
const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
|
|
96
|
+
const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
|
|
97
|
+
return (await Promise.all([
|
|
98
|
+
updatePublishedContractClasses(store, contractClassLogs, block.number, 1),
|
|
99
|
+
updateDeployedContractInstances(store, privateLogs, block.number, 1),
|
|
100
|
+
updateUpdatedContractInstances(store, publicLogs, block.header.globalVariables.timestamp, 1)
|
|
101
|
+
])).every(Boolean);
|
|
102
|
+
}),
|
|
103
|
+
store.deleteLogs(blocks),
|
|
104
|
+
store.unwindCheckpoints(from, checkpointsToUnwind)
|
|
105
|
+
]);
|
|
106
|
+
return opResults.every(Boolean);
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Extracts and stores contract data from a single block.
|
|
110
|
+
*/ async function addBlockDataToDB(store, block) {
|
|
111
|
+
const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
|
|
112
|
+
// ContractInstancePublished event logs are broadcast in privateLogs.
|
|
113
|
+
const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
|
|
114
|
+
const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
|
|
115
|
+
return (await Promise.all([
|
|
116
|
+
updatePublishedContractClasses(store, contractClassLogs, block.number, 0),
|
|
117
|
+
updateDeployedContractInstances(store, privateLogs, block.number, 0),
|
|
118
|
+
updateUpdatedContractInstances(store, publicLogs, block.header.globalVariables.timestamp, 0),
|
|
119
|
+
storeBroadcastedIndividualFunctions(store, contractClassLogs, block.number)
|
|
120
|
+
])).every(Boolean);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Extracts and stores contract classes out of ContractClassPublished events emitted by the class registry contract.
|
|
124
|
+
*/ async function updatePublishedContractClasses(store, allLogs, blockNum, operation) {
|
|
125
|
+
const contractClassPublishedEvents = allLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log));
|
|
126
|
+
const contractClasses = await Promise.all(contractClassPublishedEvents.map((e)=>e.toContractClassPublic()));
|
|
127
|
+
if (contractClasses.length > 0) {
|
|
128
|
+
contractClasses.forEach((c)=>log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
129
|
+
if (operation == 0) {
|
|
130
|
+
// TODO: Will probably want to create some worker threads to compute these bytecode commitments as they are expensive
|
|
131
|
+
const commitments = await Promise.all(contractClasses.map((c)=>computePublicBytecodeCommitment(c.packedBytecode)));
|
|
132
|
+
return await store.addContractClasses(contractClasses, commitments, blockNum);
|
|
133
|
+
} else if (operation == 1) {
|
|
134
|
+
return await store.deleteContractClasses(contractClasses, blockNum);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
|
|
141
|
+
*/ async function updateDeployedContractInstances(store, allLogs, blockNum, operation) {
|
|
142
|
+
const contractInstances = allLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log)).map((e)=>e.toContractInstance());
|
|
143
|
+
if (contractInstances.length > 0) {
|
|
144
|
+
contractInstances.forEach((c)=>log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
145
|
+
if (operation == 0) {
|
|
146
|
+
return await store.addContractInstances(contractInstances, blockNum);
|
|
147
|
+
} else if (operation == 1) {
|
|
148
|
+
return await store.deleteContractInstances(contractInstances, blockNum);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return true;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Extracts and stores contract instance updates out of ContractInstanceUpdated events.
|
|
155
|
+
*/ async function updateUpdatedContractInstances(store, allLogs, timestamp, operation) {
|
|
156
|
+
const contractUpdates = allLogs.filter((log)=>ContractInstanceUpdatedEvent.isContractInstanceUpdatedEvent(log)).map((log)=>ContractInstanceUpdatedEvent.fromLog(log)).map((e)=>e.toContractInstanceUpdate());
|
|
157
|
+
if (contractUpdates.length > 0) {
|
|
158
|
+
contractUpdates.forEach((c)=>log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
|
|
159
|
+
if (operation == 0) {
|
|
160
|
+
return await store.addContractInstanceUpdates(contractUpdates, timestamp);
|
|
161
|
+
} else if (operation == 1) {
|
|
162
|
+
return await store.deleteContractInstanceUpdates(contractUpdates, timestamp);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return true;
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Stores the functions that were broadcasted individually.
|
|
169
|
+
*
|
|
170
|
+
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
171
|
+
* and will be deleted as part of the class if needed.
|
|
172
|
+
*/ async function storeBroadcastedIndividualFunctions(store, allLogs, _blockNum) {
|
|
173
|
+
// Filter out private and utility function broadcast events
|
|
174
|
+
const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
|
|
175
|
+
const utilityFnEvents = allLogs.filter((log)=>UtilityFunctionBroadcastedEvent.isUtilityFunctionBroadcastedEvent(log)).map((log)=>UtilityFunctionBroadcastedEvent.fromLog(log));
|
|
176
|
+
// Group all events by contract class id
|
|
177
|
+
for (const [classIdString, classEvents] of Object.entries(groupBy([
|
|
178
|
+
...privateFnEvents,
|
|
179
|
+
...utilityFnEvents
|
|
180
|
+
], (e)=>e.contractClassId.toString()))){
|
|
181
|
+
const contractClassId = Fr.fromHexString(classIdString);
|
|
182
|
+
const contractClass = await store.getContractClass(contractClassId);
|
|
183
|
+
if (!contractClass) {
|
|
184
|
+
log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
// Split private and utility functions, and filter out invalid ones
|
|
188
|
+
const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
|
|
189
|
+
const privateFns = allFns.filter((fn)=>'utilityFunctionsTreeRoot' in fn);
|
|
190
|
+
const utilityFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
|
|
191
|
+
const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
|
|
192
|
+
fn,
|
|
193
|
+
valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
|
|
194
|
+
})));
|
|
195
|
+
const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
196
|
+
const utilityFunctionsWithValidity = await Promise.all(utilityFns.map(async (fn)=>({
|
|
197
|
+
fn,
|
|
198
|
+
valid: await isValidUtilityFunctionMembershipProof(fn, contractClass)
|
|
199
|
+
})));
|
|
200
|
+
const validUtilityFns = utilityFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
201
|
+
const validFnCount = validPrivateFns.length + validUtilityFns.length;
|
|
202
|
+
if (validFnCount !== allFns.length) {
|
|
203
|
+
log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
204
|
+
}
|
|
205
|
+
// Store the functions in the contract class in a single operation
|
|
206
|
+
if (validFnCount > 0) {
|
|
207
|
+
log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
208
|
+
}
|
|
209
|
+
return await store.addFunctions(contractClassId, validPrivateFns, validUtilityFns);
|
|
210
|
+
}
|
|
211
|
+
return true;
|
|
212
|
+
}
|
package/dest/archiver/config.js
CHANGED
|
@@ -26,8 +26,8 @@ export const archiverConfigMappings = {
|
|
|
26
26
|
parseEnv: (val)=>val ? +val : undefined,
|
|
27
27
|
description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.'
|
|
28
28
|
},
|
|
29
|
-
|
|
30
|
-
description: '
|
|
29
|
+
skipValidateCheckpointAttestations: {
|
|
30
|
+
description: 'Skip validating checkpoint attestations (for testing purposes only)',
|
|
31
31
|
...booleanConfigHelper(false)
|
|
32
32
|
},
|
|
33
33
|
maxAllowedEthClientDriftSeconds: {
|
package/dest/archiver/index.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export * from './archiver.js';
|
|
2
|
+
export * from './archive_source_base.js';
|
|
3
|
+
export * from './archiver_store_updates.js';
|
|
2
4
|
export * from './config.js';
|
|
3
5
|
export { type L1PublishedData } from './structs/published.js';
|
|
4
|
-
export type { ArchiverDataStore } from './archiver_store.js';
|
|
5
6
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './kv_archiver_store/kv_archiver_store.js';
|
|
6
7
|
export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcmNoaXZlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxhQUFhLENBQUM7QUFDNUIsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDcEcsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0RBQWdELENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}
|
package/dest/archiver/index.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export * from './archiver.js';
|
|
2
|
+
export * from './archive_source_base.js';
|
|
3
|
+
export * from './archiver_store_updates.js';
|
|
2
4
|
export * from './config.js';
|
|
3
5
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './kv_archiver_store/kv_archiver_store.js';
|
|
4
6
|
export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';
|
|
@@ -2,7 +2,7 @@ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
4
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
|
-
import { CheckpointedL2Block, L2BlockHash, L2BlockNew, type
|
|
5
|
+
import { CheckpointedL2Block, L2BlockHash, L2BlockNew, type ValidateCheckpointResult } from '@aztec/stdlib/block';
|
|
6
6
|
import { L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
7
7
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
8
8
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
@@ -18,7 +18,7 @@ export type CheckpointData = {
|
|
|
18
18
|
attestations: Buffer[];
|
|
19
19
|
};
|
|
20
20
|
/**
|
|
21
|
-
* LMDB
|
|
21
|
+
* LMDB-based block storage for the archiver.
|
|
22
22
|
*/
|
|
23
23
|
export declare class BlockStore {
|
|
24
24
|
#private;
|
|
@@ -57,6 +57,13 @@ export declare class BlockStore {
|
|
|
57
57
|
getLatestBlockNumber(): Promise<BlockNumber>;
|
|
58
58
|
getLatestCheckpointNumber(): Promise<CheckpointNumber>;
|
|
59
59
|
getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined>;
|
|
60
|
+
/**
|
|
61
|
+
* Gets up to `limit` amount of Checkpointed L2 blocks starting from `from`.
|
|
62
|
+
* @param start - Number of the first block to return (inclusive).
|
|
63
|
+
* @param limit - The number of blocks to return.
|
|
64
|
+
* @returns The requested L2 blocks
|
|
65
|
+
*/
|
|
66
|
+
getCheckpointedBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<CheckpointedL2Block>;
|
|
60
67
|
getCheckpointedBlockByHash(blockHash: Fr): Promise<CheckpointedL2Block | undefined>;
|
|
61
68
|
getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined>;
|
|
62
69
|
/**
|
|
@@ -147,11 +154,11 @@ export declare class BlockStore {
|
|
|
147
154
|
* Gets the pending chain validation status.
|
|
148
155
|
* @returns The validation status or undefined if not set.
|
|
149
156
|
*/
|
|
150
|
-
getPendingChainValidationStatus(): Promise<
|
|
157
|
+
getPendingChainValidationStatus(): Promise<ValidateCheckpointResult | undefined>;
|
|
151
158
|
/**
|
|
152
159
|
* Sets the pending chain validation status.
|
|
153
160
|
* @param status - The validation status to store.
|
|
154
161
|
*/
|
|
155
|
-
setPendingChainValidationStatus(status:
|
|
162
|
+
setPendingChainValidationStatus(status: ValidateCheckpointResult | undefined): Promise<void>;
|
|
156
163
|
}
|
|
157
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBTXBELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUE2QyxNQUFNLGlCQUFpQixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFFTCxtQkFBbUIsRUFFbkIsV0FBVyxFQUNYLFVBQVUsRUFDVixLQUFLLHdCQUF3QixFQUc5QixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxlQUFlLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNoRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZUFBZSxFQUVwQixNQUFNLEVBQ04sU0FBUyxFQUdWLE1BQU0sa0JBQWtCLENBQUM7QUFjMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBc0J6RSxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQzNCLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDO0lBQ25DLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztJQUN6QixPQUFPLEVBQUUsc0JBQXNCLENBQUM7SUFDaEMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLEVBQUUs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAMpD,OAAO,KAAK,EAAE,iBAAiB,EAA6C,MAAM,iBAAiB,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAEL,mBAAmB,EAEnB,WAAW,EACX,UAAU,EACV,KAAK,
|
|
1
|
+
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
5
5
|
import { BufferReader } from '@aztec/foundation/serialize';
|
|
6
6
|
import { bufferToHex } from '@aztec/foundation/string';
|
|
7
7
|
import { isDefined } from '@aztec/foundation/types';
|
|
8
|
-
import { Body, CheckpointedL2Block, CommitteeAttestation, L2BlockHash, L2BlockNew,
|
|
8
|
+
import { Body, CheckpointedL2Block, CommitteeAttestation, L2BlockHash, L2BlockNew, deserializeValidateCheckpointResult, serializeValidateCheckpointResult } from '@aztec/stdlib/block';
|
|
9
9
|
import { L1PublishedData } from '@aztec/stdlib/checkpoint';
|
|
10
10
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
11
11
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
@@ -13,7 +13,7 @@ import { BlockHeader, TxHash, TxReceipt, deserializeIndexedTxEffect, serializeIn
|
|
|
13
13
|
import { BlockArchiveNotConsistentError, BlockIndexNotSequentialError, BlockNotFoundError, BlockNumberNotSequentialError, CheckpointNotFoundError, CheckpointNumberNotConsistentError, CheckpointNumberNotSequentialError, InitialBlockNumberNotSequentialError, InitialCheckpointNumberNotSequentialError } from '../errors.js';
|
|
14
14
|
export { TxReceipt } from '@aztec/stdlib/tx';
|
|
15
15
|
/**
|
|
16
|
-
* LMDB
|
|
16
|
+
* LMDB-based block storage for the archiver.
|
|
17
17
|
*/ export class BlockStore {
|
|
18
18
|
db;
|
|
19
19
|
/** Map block number to block data */ #blocks;
|
|
@@ -344,6 +344,25 @@ export { TxReceipt } from '@aztec/stdlib/tx';
|
|
|
344
344
|
}
|
|
345
345
|
return new CheckpointedL2Block(CheckpointNumber(checkpoint.checkpointNumber), block, L1PublishedData.fromBuffer(checkpoint.l1), checkpoint.attestations.map((buf)=>CommitteeAttestation.fromBuffer(buf)));
|
|
346
346
|
}
|
|
347
|
+
/**
|
|
348
|
+
* Gets up to `limit` amount of Checkpointed L2 blocks starting from `from`.
|
|
349
|
+
* @param start - Number of the first block to return (inclusive).
|
|
350
|
+
* @param limit - The number of blocks to return.
|
|
351
|
+
* @returns The requested L2 blocks
|
|
352
|
+
*/ async *getCheckpointedBlocks(start, limit) {
|
|
353
|
+
const checkpointCache = new Map();
|
|
354
|
+
for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
|
|
355
|
+
const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
|
|
356
|
+
if (block) {
|
|
357
|
+
const checkpoint = checkpointCache.get(CheckpointNumber(blockStorage.checkpointNumber)) ?? await this.#checkpoints.getAsync(blockStorage.checkpointNumber);
|
|
358
|
+
if (checkpoint) {
|
|
359
|
+
checkpointCache.set(CheckpointNumber(blockStorage.checkpointNumber), checkpoint);
|
|
360
|
+
const checkpointedBlock = new CheckpointedL2Block(CheckpointNumber(checkpoint.checkpointNumber), block, L1PublishedData.fromBuffer(checkpoint.l1), checkpoint.attestations.map((buf)=>CommitteeAttestation.fromBuffer(buf)));
|
|
361
|
+
yield checkpointedBlock;
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
}
|
|
347
366
|
async getCheckpointedBlockByHash(blockHash) {
|
|
348
367
|
const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
|
|
349
368
|
if (blockNumber === undefined) {
|
|
@@ -591,14 +610,14 @@ export { TxReceipt } from '@aztec/stdlib/tx';
|
|
|
591
610
|
if (!buffer) {
|
|
592
611
|
return undefined;
|
|
593
612
|
}
|
|
594
|
-
return
|
|
613
|
+
return deserializeValidateCheckpointResult(buffer);
|
|
595
614
|
}
|
|
596
615
|
/**
|
|
597
616
|
* Sets the pending chain validation status.
|
|
598
617
|
* @param status - The validation status to store.
|
|
599
618
|
*/ async setPendingChainValidationStatus(status) {
|
|
600
619
|
if (status) {
|
|
601
|
-
const buffer =
|
|
620
|
+
const buffer = serializeValidateCheckpointResult(status);
|
|
602
621
|
await this.#pendingChainValidationStatus.set(buffer);
|
|
603
622
|
} else {
|
|
604
623
|
await this.#pendingChainValidationStatus.delete();
|
|
@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
|
|
|
2
2
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
3
3
|
import type { ContractClassPublic, ExecutablePrivateFunctionWithMembershipProof, UtilityFunctionWithMembershipProof } from '@aztec/stdlib/contract';
|
|
4
4
|
/**
|
|
5
|
-
* LMDB
|
|
5
|
+
* LMDB-based contract class storage for the archiver.
|
|
6
6
|
*/
|
|
7
7
|
export declare class ContractClassStore {
|
|
8
8
|
#private;
|
|
@@ -4,7 +4,7 @@ import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/s
|
|
|
4
4
|
import { FunctionSelector } from '@aztec/stdlib/abi';
|
|
5
5
|
import { Vector } from '@aztec/stdlib/types';
|
|
6
6
|
/**
|
|
7
|
-
* LMDB
|
|
7
|
+
* LMDB-based contract class storage for the archiver.
|
|
8
8
|
*/ export class ContractClassStore {
|
|
9
9
|
db;
|
|
10
10
|
#contractClasses;
|
|
@@ -5,7 +5,7 @@ import { type ContractInstanceUpdateWithAddress, type ContractInstanceWithAddres
|
|
|
5
5
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
6
6
|
type ContractInstanceUpdateKey = [string, string] | [string, string, number];
|
|
7
7
|
/**
|
|
8
|
-
* LMDB
|
|
8
|
+
* LMDB-based contract instance storage for the archiver.
|
|
9
9
|
*/
|
|
10
10
|
export declare class ContractInstanceStore {
|
|
11
11
|
#private;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SerializableContractInstance, SerializableContractInstanceUpdate } from '@aztec/stdlib/contract';
|
|
2
2
|
/**
|
|
3
|
-
* LMDB
|
|
3
|
+
* LMDB-based contract instance storage for the archiver.
|
|
4
4
|
*/ export class ContractInstanceStore {
|
|
5
5
|
db;
|
|
6
6
|
#contractInstances;
|