@aztec/archiver 0.23.0 → 0.26.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/archiver/archiver.d.ts +15 -11
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +67 -72
- package/dest/archiver/archiver_store.d.ts +37 -15
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +70 -54
- package/dest/archiver/data_retrieval.d.ts +18 -8
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +39 -14
- package/dest/archiver/eth_log_handlers.d.ts +25 -23
- package/dest/archiver/eth_log_handlers.d.ts.map +1 -1
- package/dest/archiver/eth_log_handlers.js +98 -57
- package/dest/archiver/kv_archiver_store/block_body_store.d.ts +27 -0
- package/dest/archiver/kv_archiver_store/block_body_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/block_body_store.js +47 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts +19 -11
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +58 -30
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +1 -0
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.js +4 -1
- package/dest/archiver/kv_archiver_store/contract_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_store.js +6 -3
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +36 -16
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +52 -22
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +4 -3
- package/dest/archiver/kv_archiver_store/message_store.d.ts +9 -9
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +34 -31
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +6 -6
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +18 -18
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +41 -16
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +78 -29
- package/dest/index.js +2 -2
- package/dest/rpc/archiver_client.d.ts.map +1 -1
- package/dest/rpc/archiver_client.js +3 -3
- package/dest/rpc/archiver_server.d.ts.map +1 -1
- package/dest/rpc/archiver_server.js +4 -3
- package/package.json +10 -10
- package/src/archiver/archiver.ts +625 -0
- package/src/archiver/archiver_store.ts +226 -0
- package/src/archiver/archiver_store_test_suite.ts +676 -0
- package/src/archiver/config.ts +89 -0
- package/src/archiver/data_retrieval.ts +232 -0
- package/src/archiver/eth_log_handlers.ts +342 -0
- package/src/archiver/index.ts +5 -0
- package/src/archiver/kv_archiver_store/block_body_store.ts +54 -0
- package/src/archiver/kv_archiver_store/block_store.ts +199 -0
- package/src/archiver/kv_archiver_store/contract_class_store.ts +68 -0
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +26 -0
- package/src/archiver/kv_archiver_store/contract_store.ts +98 -0
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +300 -0
- package/src/archiver/kv_archiver_store/log_store.ts +174 -0
- package/src/archiver/kv_archiver_store/message_store.ts +174 -0
- package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +91 -0
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +506 -0
- package/src/index.ts +55 -0
- package/src/rpc/archiver_client.ts +35 -0
- package/src/rpc/archiver_server.ts +41 -0
- package/src/rpc/index.ts +2 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { Body, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
3
|
import { Fr } from '@aztec/circuits.js';
|
|
3
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
5
|
import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
@@ -14,9 +15,13 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
14
15
|
*/
|
|
15
16
|
private l2BlockContexts;
|
|
16
17
|
/**
|
|
17
|
-
*
|
|
18
|
+
* A mapping of body hash to body
|
|
18
19
|
*/
|
|
19
|
-
private
|
|
20
|
+
private l2BlockBodies;
|
|
21
|
+
/**
|
|
22
|
+
* An array containing all the the tx effects in the L2 blocks that have been fetched so far.
|
|
23
|
+
*/
|
|
24
|
+
private txEffects;
|
|
20
25
|
/**
|
|
21
26
|
* An array containing all the encrypted logs that have been fetched so far.
|
|
22
27
|
* Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
|
|
@@ -52,6 +57,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
52
57
|
/** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
|
|
53
58
|
maxLogs: number);
|
|
54
59
|
getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
|
|
60
|
+
getContractClassIds(): Promise<Fr[]>;
|
|
55
61
|
getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
|
|
56
62
|
addContractClasses(data: ContractClassPublic[], _blockNumber: number): Promise<boolean>;
|
|
57
63
|
addContractInstances(data: ContractInstanceWithAddress[], _blockNumber: number): Promise<boolean>;
|
|
@@ -61,6 +67,19 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
61
67
|
* @returns True if the operation is successful (always in this implementation).
|
|
62
68
|
*/
|
|
63
69
|
addBlocks(blocks: L2Block[]): Promise<boolean>;
|
|
70
|
+
/**
|
|
71
|
+
* Append new block bodies to the store's list.
|
|
72
|
+
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
73
|
+
* @returns True if the operation is successful.
|
|
74
|
+
*/
|
|
75
|
+
addBlockBodies(blockBodies: Body[]): Promise<boolean>;
|
|
76
|
+
/**
|
|
77
|
+
* Gets block bodies that have the same txHashes as we supply.
|
|
78
|
+
*
|
|
79
|
+
* @param txsHashes - A list of txsHashes (body hashes).
|
|
80
|
+
* @returns The requested L2 block bodies
|
|
81
|
+
*/
|
|
82
|
+
getBlockBodies(txsHashes: Buffer[]): Promise<Body[]>;
|
|
64
83
|
/**
|
|
65
84
|
* Append new logs to the store's list.
|
|
66
85
|
* @param encryptedLogs - The encrypted logs to be added to the store.
|
|
@@ -78,18 +97,18 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
78
97
|
addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
|
|
79
98
|
/**
|
|
80
99
|
* Remove pending L1 to L2 messages from the store (if they were cancelled).
|
|
81
|
-
* @param messages - The
|
|
100
|
+
* @param messages - The entry keys to be removed from the store.
|
|
82
101
|
* @param l1BlockNumber - The L1 block number for which to remove the messages.
|
|
83
102
|
* @returns True if the operation is successful (always in this implementation).
|
|
84
103
|
*/
|
|
85
|
-
|
|
104
|
+
cancelPendingL1ToL2EntryKeys(messages: Fr[], l1BlockNumber: bigint): Promise<boolean>;
|
|
86
105
|
/**
|
|
87
106
|
* Messages that have been published in an L2 block are confirmed.
|
|
88
107
|
* Add them to the confirmed store, also remove them from the pending store.
|
|
89
|
-
* @param
|
|
108
|
+
* @param entryKeys - The entry keys to be removed from the store.
|
|
90
109
|
* @returns True if the operation is successful (always in this implementation).
|
|
91
110
|
*/
|
|
92
|
-
|
|
111
|
+
confirmL1ToL2EntryKeys(entryKeys: Fr[]): Promise<boolean>;
|
|
93
112
|
/**
|
|
94
113
|
* Store new extended contract data from an L2 block to the store's list.
|
|
95
114
|
* @param data - List of contracts' data to be added.
|
|
@@ -106,23 +125,29 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
106
125
|
*/
|
|
107
126
|
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
108
127
|
/**
|
|
109
|
-
* Gets
|
|
110
|
-
* @param txHash - The txHash of the
|
|
111
|
-
* @returns The requested
|
|
128
|
+
* Gets a tx effect.
|
|
129
|
+
* @param txHash - The txHash of the tx effect.
|
|
130
|
+
* @returns The requested tx effect.
|
|
131
|
+
*/
|
|
132
|
+
getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
|
|
133
|
+
/**
|
|
134
|
+
* Gets a receipt of a settled tx.
|
|
135
|
+
* @param txHash - The hash of a tx we try to get the receipt for.
|
|
136
|
+
* @returns The requested tx receipt (or undefined if not found).
|
|
112
137
|
*/
|
|
113
|
-
|
|
138
|
+
getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
|
|
114
139
|
/**
|
|
115
140
|
* Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
|
|
116
141
|
* @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
|
|
117
|
-
* @returns The requested L1 to L2
|
|
142
|
+
* @returns The requested L1 to L2 entry keys.
|
|
118
143
|
*/
|
|
119
|
-
|
|
144
|
+
getPendingL1ToL2EntryKeys(limit?: number): Promise<Fr[]>;
|
|
120
145
|
/**
|
|
121
|
-
* Gets the confirmed L1 to L2 message corresponding to the given
|
|
122
|
-
* @param
|
|
146
|
+
* Gets the confirmed L1 to L2 message corresponding to the given entry key.
|
|
147
|
+
* @param entryKey - The entry key to look up.
|
|
123
148
|
* @returns The requested L1 to L2 message or throws if not found.
|
|
124
149
|
*/
|
|
125
|
-
getConfirmedL1ToL2Message(
|
|
150
|
+
getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message>;
|
|
126
151
|
/**
|
|
127
152
|
* Gets up to `limit` amount of logs starting from `from`.
|
|
128
153
|
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,oBAAoB,EAEpB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ExtendedUnencryptedL2Log,
|
|
2
|
-
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
|
|
1
|
+
import { ExtendedUnencryptedL2Log, L2BlockContext, LogId, LogType, TxReceipt, TxStatus, UnencryptedL2Log, } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr, INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
|
|
3
3
|
import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
4
4
|
/**
|
|
5
5
|
* Simple, in-memory implementation of an archiver data store.
|
|
@@ -14,9 +14,13 @@ export class MemoryArchiverStore {
|
|
|
14
14
|
*/
|
|
15
15
|
this.l2BlockContexts = [];
|
|
16
16
|
/**
|
|
17
|
-
*
|
|
17
|
+
* A mapping of body hash to body
|
|
18
18
|
*/
|
|
19
|
-
this.
|
|
19
|
+
this.l2BlockBodies = new Map();
|
|
20
|
+
/**
|
|
21
|
+
* An array containing all the the tx effects in the L2 blocks that have been fetched so far.
|
|
22
|
+
*/
|
|
23
|
+
this.txEffects = [];
|
|
20
24
|
/**
|
|
21
25
|
* An array containing all the encrypted logs that have been fetched so far.
|
|
22
26
|
* Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
|
|
@@ -52,6 +56,9 @@ export class MemoryArchiverStore {
|
|
|
52
56
|
getContractClass(id) {
|
|
53
57
|
return Promise.resolve(this.contractClasses.get(id.toString()));
|
|
54
58
|
}
|
|
59
|
+
getContractClassIds() {
|
|
60
|
+
return Promise.resolve(Array.from(this.contractClasses.keys()).map(key => Fr.fromString(key)));
|
|
61
|
+
}
|
|
55
62
|
getContractInstance(address) {
|
|
56
63
|
return Promise.resolve(this.contractInstances.get(address.toString()));
|
|
57
64
|
}
|
|
@@ -74,9 +81,33 @@ export class MemoryArchiverStore {
|
|
|
74
81
|
*/
|
|
75
82
|
addBlocks(blocks) {
|
|
76
83
|
this.l2BlockContexts.push(...blocks.map(block => new L2BlockContext(block)));
|
|
77
|
-
this.
|
|
84
|
+
this.txEffects.push(...blocks.flatMap(b => b.getTxs()));
|
|
85
|
+
return Promise.resolve(true);
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Append new block bodies to the store's list.
|
|
89
|
+
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
90
|
+
* @returns True if the operation is successful.
|
|
91
|
+
*/
|
|
92
|
+
addBlockBodies(blockBodies) {
|
|
93
|
+
for (const body of blockBodies) {
|
|
94
|
+
void this.l2BlockBodies.set(body.getCalldataHash().toString('hex'), body);
|
|
95
|
+
}
|
|
78
96
|
return Promise.resolve(true);
|
|
79
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Gets block bodies that have the same txHashes as we supply.
|
|
100
|
+
*
|
|
101
|
+
* @param txsHashes - A list of txsHashes (body hashes).
|
|
102
|
+
* @returns The requested L2 block bodies
|
|
103
|
+
*/
|
|
104
|
+
getBlockBodies(txsHashes) {
|
|
105
|
+
const blockBodies = txsHashes.map(txsHash => this.l2BlockBodies.get(txsHash.toString('hex')));
|
|
106
|
+
if (blockBodies.some(bodyBuffer => bodyBuffer === undefined)) {
|
|
107
|
+
throw new Error('Block body is undefined');
|
|
108
|
+
}
|
|
109
|
+
return Promise.resolve(blockBodies);
|
|
110
|
+
}
|
|
80
111
|
/**
|
|
81
112
|
* Append new logs to the store's list.
|
|
82
113
|
* @param encryptedLogs - The encrypted logs to be added to the store.
|
|
@@ -111,11 +142,11 @@ export class MemoryArchiverStore {
|
|
|
111
142
|
}
|
|
112
143
|
/**
|
|
113
144
|
* Remove pending L1 to L2 messages from the store (if they were cancelled).
|
|
114
|
-
* @param messages - The
|
|
145
|
+
* @param messages - The entry keys to be removed from the store.
|
|
115
146
|
* @param l1BlockNumber - The L1 block number for which to remove the messages.
|
|
116
147
|
* @returns True if the operation is successful (always in this implementation).
|
|
117
148
|
*/
|
|
118
|
-
|
|
149
|
+
cancelPendingL1ToL2EntryKeys(messages, l1BlockNumber) {
|
|
119
150
|
if (l1BlockNumber <= this.lastL1BlockCancelledMessages) {
|
|
120
151
|
return Promise.resolve(false);
|
|
121
152
|
}
|
|
@@ -128,13 +159,16 @@ export class MemoryArchiverStore {
|
|
|
128
159
|
/**
|
|
129
160
|
* Messages that have been published in an L2 block are confirmed.
|
|
130
161
|
* Add them to the confirmed store, also remove them from the pending store.
|
|
131
|
-
* @param
|
|
162
|
+
* @param entryKeys - The entry keys to be removed from the store.
|
|
132
163
|
* @returns True if the operation is successful (always in this implementation).
|
|
133
164
|
*/
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
165
|
+
confirmL1ToL2EntryKeys(entryKeys) {
|
|
166
|
+
entryKeys.forEach(entryKey => {
|
|
167
|
+
if (entryKey.equals(Fr.ZERO)) {
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
this.confirmedL1ToL2Messages.addMessage(entryKey, this.pendingL1ToL2Messages.getMessage(entryKey));
|
|
171
|
+
this.pendingL1ToL2Messages.removeMessage(entryKey);
|
|
138
172
|
});
|
|
139
173
|
return Promise.resolve(true);
|
|
140
174
|
}
|
|
@@ -179,31 +213,46 @@ export class MemoryArchiverStore {
|
|
|
179
213
|
return Promise.resolve(this.l2BlockContexts.slice(fromIndex, toIndex).map(blockContext => blockContext.block));
|
|
180
214
|
}
|
|
181
215
|
/**
|
|
182
|
-
* Gets
|
|
183
|
-
* @param txHash - The txHash of the
|
|
184
|
-
* @returns The requested
|
|
216
|
+
* Gets a tx effect.
|
|
217
|
+
* @param txHash - The txHash of the tx effect.
|
|
218
|
+
* @returns The requested tx effect.
|
|
219
|
+
*/
|
|
220
|
+
getTxEffect(txHash) {
|
|
221
|
+
const txEffect = this.txEffects.find(tx => tx.txHash.equals(txHash));
|
|
222
|
+
return Promise.resolve(txEffect);
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* Gets a receipt of a settled tx.
|
|
226
|
+
* @param txHash - The hash of a tx we try to get the receipt for.
|
|
227
|
+
* @returns The requested tx receipt (or undefined if not found).
|
|
185
228
|
*/
|
|
186
|
-
|
|
187
|
-
const
|
|
188
|
-
|
|
229
|
+
getSettledTxReceipt(txHash) {
|
|
230
|
+
for (const blockContext of this.l2BlockContexts) {
|
|
231
|
+
for (const currentTxHash of blockContext.getTxHashes()) {
|
|
232
|
+
if (currentTxHash.equals(txHash)) {
|
|
233
|
+
return Promise.resolve(new TxReceipt(txHash, TxStatus.MINED, '', blockContext.block.hash().toBuffer(), blockContext.block.number));
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
return Promise.resolve(undefined);
|
|
189
238
|
}
|
|
190
239
|
/**
|
|
191
240
|
* Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
|
|
192
241
|
* @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
|
|
193
|
-
* @returns The requested L1 to L2
|
|
242
|
+
* @returns The requested L1 to L2 entry keys.
|
|
194
243
|
*/
|
|
195
|
-
|
|
196
|
-
return Promise.resolve(this.pendingL1ToL2Messages.
|
|
244
|
+
getPendingL1ToL2EntryKeys(limit = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) {
|
|
245
|
+
return Promise.resolve(this.pendingL1ToL2Messages.getEntryKeys(limit));
|
|
197
246
|
}
|
|
198
247
|
/**
|
|
199
|
-
* Gets the confirmed L1 to L2 message corresponding to the given
|
|
200
|
-
* @param
|
|
248
|
+
* Gets the confirmed L1 to L2 message corresponding to the given entry key.
|
|
249
|
+
* @param entryKey - The entry key to look up.
|
|
201
250
|
* @returns The requested L1 to L2 message or throws if not found.
|
|
202
251
|
*/
|
|
203
|
-
getConfirmedL1ToL2Message(
|
|
204
|
-
const message = this.confirmedL1ToL2Messages.getMessage(
|
|
252
|
+
getConfirmedL1ToL2Message(entryKey) {
|
|
253
|
+
const message = this.confirmedL1ToL2Messages.getMessage(entryKey);
|
|
205
254
|
if (!message) {
|
|
206
|
-
throw new Error(`L1 to L2 Message with key ${
|
|
255
|
+
throw new Error(`L1 to L2 Message with key ${entryKey.toString()} not found in the confirmed messages store`);
|
|
207
256
|
}
|
|
208
257
|
return Promise.resolve(message);
|
|
209
258
|
}
|
|
@@ -329,7 +378,7 @@ export class MemoryArchiverStore {
|
|
|
329
378
|
return Promise.resolve(undefined);
|
|
330
379
|
}
|
|
331
380
|
for (const blockContext of this.l2BlockContexts) {
|
|
332
|
-
for (const contractData of blockContext.block.
|
|
381
|
+
for (const contractData of blockContext.block.body.txEffects.flatMap(txEffect => txEffect.contractData)) {
|
|
333
382
|
if (contractData.contractAddress.equals(contractAddress)) {
|
|
334
383
|
return Promise.resolve(contractData);
|
|
335
384
|
}
|
|
@@ -348,7 +397,7 @@ export class MemoryArchiverStore {
|
|
|
348
397
|
return Promise.resolve([]);
|
|
349
398
|
}
|
|
350
399
|
const block = this.l2BlockContexts[l2BlockNum - INITIAL_L2_BLOCK_NUM]?.block;
|
|
351
|
-
return Promise.resolve(block?.
|
|
400
|
+
return Promise.resolve(block?.body.txEffects.flatMap(txEffect => txEffect.contractData));
|
|
352
401
|
}
|
|
353
402
|
/**
|
|
354
403
|
* Gets the number of the latest L2 block processed.
|
|
@@ -371,4 +420,4 @@ export class MemoryArchiverStore {
|
|
|
371
420
|
});
|
|
372
421
|
}
|
|
373
422
|
}
|
|
374
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
423
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
package/dest/index.js
CHANGED
|
@@ -19,7 +19,7 @@ async function main() {
|
|
|
19
19
|
transport: http(rpcUrl),
|
|
20
20
|
});
|
|
21
21
|
const archiverStore = new MemoryArchiverStore(1000);
|
|
22
|
-
const archiver = new Archiver(publicClient, l1Contracts.rollupAddress, l1Contracts.inboxAddress, l1Contracts.registryAddress, l1Contracts.contractDeploymentEmitterAddress, archiverStore);
|
|
22
|
+
const archiver = new Archiver(publicClient, l1Contracts.rollupAddress, l1Contracts.availabilityOracleAddress, l1Contracts.inboxAddress, l1Contracts.registryAddress, l1Contracts.contractDeploymentEmitterAddress, archiverStore);
|
|
23
23
|
const shutdown = async () => {
|
|
24
24
|
await archiver.stop();
|
|
25
25
|
process.exit(0);
|
|
@@ -35,4 +35,4 @@ if (process.argv[1] === fileURLToPath(import.meta.url).replace(/\/index\.js$/, '
|
|
|
35
35
|
process.exit(1);
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDakUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkRBQTJELENBQUM7QUFFaEcsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGdCQUFnQixDQUFDO0FBRS9CLE1BQU0sR0FBRyxHQUFHLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFFaEQ7O0dBRUc7QUFDSCx5Q0FBeUM7QUFDekMsS0FBSyxVQUFVLElBQUk7SUFDakIsTUFBTSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQztJQUNsQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLE1BQU0sQ0FBQztJQUV2QyxNQUFNLFlBQVksR0FBRyxrQkFBa0IsQ0FBQztRQUN0QyxLQUFLLEVBQUUsU0FBUztRQUNoQixTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQztLQUN4QixDQUFDLENBQUM7SUFFSCxNQUFNLGFBQWEsR0FBRyxJQUFJLG1CQUFtQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXBELE1BQU0sUUFBUSxHQUFHLElBQUksUUFBUSxDQUMzQixZQUFZLEVBQ1osV0FBVyxDQUFDLGFBQWEsRUFDekIsV0FBVyxDQUFDLHlCQUF5QixFQUNyQyxXQUFXLENBQUMsWUFBWSxFQUN4QixXQUFXLENBQUMsZUFBZSxFQUMzQixXQUFXLENBQUMsZ0NBQWdDLEVBQzVDLGFBQWEsQ0FDZCxDQUFDO0lBRUYsTUFBTSxRQUFRLEdBQUcsS0FBSyxJQUFJLEVBQUU7UUFDMUIsTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDLENBQUM7SUFDRixPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNwQyxDQUFDO0FBRUQsaUVBQWlFO0FBQ2pFLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUM7SUFDbkYsbUVBQW1FO0lBQ25FLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNqQixHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_client.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver_client.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_client.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,eAAO,MAAM,oBAAoB,QAAS,MAAM,qGAAuC,aAkBpF,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ContractData, EncodedContractFunction, ExtendedContractData, ExtendedUnencryptedL2Log, L1ToL2Message, L2Block, L2BlockL2Logs, } from '@aztec/circuit-types';
|
|
1
|
+
import { ContractData, EncodedContractFunction, ExtendedContractData, ExtendedUnencryptedL2Log, L1ToL2Message, L2Block, L2BlockL2Logs, NullifierMembershipWitness, TxReceipt, } from '@aztec/circuit-types';
|
|
2
2
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
4
4
|
export const createArchiverClient = (url, fetch = makeFetch([1, 2, 3], true)) => createJsonRpcClient(url, {
|
|
@@ -11,5 +11,5 @@ export const createArchiverClient = (url, fetch = makeFetch([1, 2, 3], true)) =>
|
|
|
11
11
|
L1ToL2Message,
|
|
12
12
|
L2Block,
|
|
13
13
|
L2BlockL2Logs,
|
|
14
|
-
}, {}, false, 'archiver', fetch);
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
}, { TxReceipt, NullifierMembershipWitness }, false, 'archiver', fetch);
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JwYy9hcmNoaXZlcl9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWix1QkFBdUIsRUFDdkIsb0JBQW9CLEVBQ3BCLHdCQUF3QixFQUN4QixhQUFhLEVBQ2IsT0FBTyxFQUNQLGFBQWEsRUFDYiwwQkFBMEIsRUFDMUIsU0FBUyxHQUNWLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFJbkYsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLEVBQWlCLEVBQUUsQ0FDckcsbUJBQW1CLENBQ2pCLEdBQUcsRUFDSDtJQUNFLFlBQVk7SUFDWix1QkFBdUI7SUFDdkIsVUFBVTtJQUNWLG9CQUFvQjtJQUNwQix3QkFBd0I7SUFDeEIsRUFBRTtJQUNGLGFBQWE7SUFDYixPQUFPO0lBQ1AsYUFBYTtDQUNkLEVBQ0QsRUFBRSxTQUFTLEVBQUUsMEJBQTBCLEVBQUUsRUFDekMsS0FBSyxFQUNMLFVBQVUsRUFDVixLQUFLLENBQ04sQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_server.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver_server.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,QAAQ,GAAG,aAAa,CAkBhF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ContractData, EncodedContractFunction, ExtendedContractData, ExtendedUnencryptedL2Log, L1ToL2Message, L2Block, L2BlockL2Logs, } from '@aztec/circuit-types';
|
|
1
|
+
import { ContractData, EncodedContractFunction, ExtendedContractData, ExtendedUnencryptedL2Log, L1ToL2Message, L2Block, L2BlockL2Logs, NullifierMembershipWitness, TxEffect, TxReceipt, } from '@aztec/circuit-types';
|
|
2
2
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
4
4
|
/**
|
|
@@ -17,6 +17,7 @@ export function createArchiverRpcServer(archiverService) {
|
|
|
17
17
|
L1ToL2Message,
|
|
18
18
|
L2Block,
|
|
19
19
|
L2BlockL2Logs,
|
|
20
|
-
|
|
20
|
+
TxEffect,
|
|
21
|
+
}, { TxReceipt, NullifierMembershipWitness }, ['start', 'stop']);
|
|
21
22
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JwYy9hcmNoaXZlcl9zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWix1QkFBdUIsRUFDdkIsb0JBQW9CLEVBQ3BCLHdCQUF3QixFQUN4QixhQUFhLEVBQ2IsT0FBTyxFQUNQLGFBQWEsRUFDYiwwQkFBMEIsRUFDMUIsUUFBUSxFQUNSLFNBQVMsR0FDVixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSWxFOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsZUFBeUI7SUFDL0QsT0FBTyxJQUFJLGFBQWEsQ0FDdEIsZUFBZSxFQUNmO1FBQ0UsWUFBWTtRQUNaLHVCQUF1QjtRQUN2QixVQUFVO1FBQ1Ysb0JBQW9CO1FBQ3BCLHdCQUF3QjtRQUN4QixFQUFFO1FBQ0YsYUFBYTtRQUNiLE9BQU87UUFDUCxhQUFhO1FBQ2IsUUFBUTtLQUNULEVBQ0QsRUFBRSxTQUFTLEVBQUUsMEJBQTBCLEVBQUUsRUFDekMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQ2xCLENBQUM7QUFDSixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -35,20 +35,20 @@
|
|
|
35
35
|
"workerThreads": true
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@aztec/circuit-types": "0.
|
|
39
|
-
"@aztec/circuits.js": "0.
|
|
40
|
-
"@aztec/ethereum": "0.
|
|
41
|
-
"@aztec/foundation": "0.
|
|
42
|
-
"@aztec/kv-store": "0.
|
|
43
|
-
"@aztec/l1-artifacts": "0.
|
|
44
|
-
"@aztec/protocol-contracts": "0.
|
|
45
|
-
"@aztec/types": "0.
|
|
38
|
+
"@aztec/circuit-types": "0.26.1",
|
|
39
|
+
"@aztec/circuits.js": "0.26.1",
|
|
40
|
+
"@aztec/ethereum": "0.26.1",
|
|
41
|
+
"@aztec/foundation": "0.26.1",
|
|
42
|
+
"@aztec/kv-store": "0.26.1",
|
|
43
|
+
"@aztec/l1-artifacts": "0.26.1",
|
|
44
|
+
"@aztec/protocol-contracts": "0.26.1",
|
|
45
|
+
"@aztec/types": "0.26.1",
|
|
46
46
|
"debug": "^4.3.4",
|
|
47
47
|
"lmdb": "^2.9.2",
|
|
48
48
|
"lodash.omit": "^4.5.0",
|
|
49
49
|
"tsc-watch": "^6.0.0",
|
|
50
50
|
"tslib": "^2.5.0",
|
|
51
|
-
"viem": "
|
|
51
|
+
"viem": "^2.7.15",
|
|
52
52
|
"ws": "^8.13.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|