@aztec/archiver 3.0.0-devnet.5 → 3.0.0-devnet.6-patch.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 +67 -60
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +391 -262
- package/dest/archiver/archiver_store.d.ts +21 -27
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +125 -140
- package/dest/archiver/config.d.ts +3 -2
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +13 -1
- package/dest/archiver/errors.d.ts +1 -1
- package/dest/archiver/errors.d.ts.map +1 -1
- package/dest/archiver/index.d.ts +1 -1
- package/dest/archiver/instrumentation.d.ts +5 -3
- package/dest/archiver/instrumentation.d.ts.map +1 -1
- package/dest/archiver/instrumentation.js +11 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts +10 -9
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +9 -8
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +2 -2
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +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 +2 -2
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +23 -29
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +7 -15
- package/dest/archiver/kv_archiver_store/log_store.d.ts +3 -10
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +4 -26
- package/dest/archiver/kv_archiver_store/message_store.d.ts +6 -5
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +15 -14
- package/dest/archiver/l1/bin/retrieve-calldata.d.ts +3 -0
- package/dest/archiver/l1/bin/retrieve-calldata.d.ts.map +1 -0
- package/dest/archiver/l1/bin/retrieve-calldata.js +147 -0
- package/dest/archiver/l1/calldata_retriever.d.ts +98 -0
- package/dest/archiver/l1/calldata_retriever.d.ts.map +1 -0
- package/dest/archiver/l1/calldata_retriever.js +403 -0
- package/dest/archiver/l1/data_retrieval.d.ts +87 -0
- package/dest/archiver/l1/data_retrieval.d.ts.map +1 -0
- package/dest/archiver/l1/data_retrieval.js +318 -0
- package/dest/archiver/l1/debug_tx.d.ts +19 -0
- package/dest/archiver/l1/debug_tx.d.ts.map +1 -0
- package/dest/archiver/l1/debug_tx.js +73 -0
- package/dest/archiver/l1/spire_proposer.d.ts +70 -0
- package/dest/archiver/l1/spire_proposer.d.ts.map +1 -0
- package/dest/archiver/l1/spire_proposer.js +157 -0
- package/dest/archiver/l1/trace_tx.d.ts +97 -0
- package/dest/archiver/l1/trace_tx.d.ts.map +1 -0
- package/dest/archiver/l1/trace_tx.js +91 -0
- package/dest/archiver/l1/types.d.ts +12 -0
- package/dest/archiver/l1/types.d.ts.map +1 -0
- package/dest/archiver/l1/types.js +3 -0
- package/dest/archiver/l1/validate_trace.d.ts +29 -0
- package/dest/archiver/l1/validate_trace.d.ts.map +1 -0
- package/dest/archiver/l1/validate_trace.js +150 -0
- package/dest/archiver/structs/data_retrieval.d.ts +1 -1
- package/dest/archiver/structs/inbox_message.d.ts +4 -4
- package/dest/archiver/structs/inbox_message.d.ts.map +1 -1
- package/dest/archiver/structs/inbox_message.js +6 -5
- package/dest/archiver/structs/published.d.ts +3 -2
- package/dest/archiver/structs/published.d.ts.map +1 -1
- package/dest/archiver/validation.d.ts +10 -4
- package/dest/archiver/validation.d.ts.map +1 -1
- package/dest/archiver/validation.js +29 -21
- package/dest/factory.d.ts +3 -5
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +3 -2
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- package/dest/rpc/index.d.ts +2 -2
- package/dest/test/index.d.ts +1 -1
- package/dest/test/mock_archiver.d.ts +16 -8
- package/dest/test/mock_archiver.d.ts.map +1 -1
- package/dest/test/mock_archiver.js +19 -14
- package/dest/test/mock_l1_to_l2_message_source.d.ts +7 -6
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
- package/dest/test/mock_l1_to_l2_message_source.js +10 -9
- package/dest/test/mock_l2_block_source.d.ts +15 -10
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +22 -9
- package/dest/test/mock_structs.d.ts +3 -2
- package/dest/test/mock_structs.d.ts.map +1 -1
- package/dest/test/mock_structs.js +9 -8
- package/package.json +18 -17
- package/src/archiver/archiver.ts +531 -345
- package/src/archiver/archiver_store.ts +24 -27
- package/src/archiver/archiver_store_test_suite.ts +151 -128
- package/src/archiver/config.ts +13 -7
- package/src/archiver/instrumentation.ts +16 -2
- package/src/archiver/kv_archiver_store/block_store.ts +18 -17
- 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 +23 -32
- package/src/archiver/kv_archiver_store/log_store.ts +4 -30
- package/src/archiver/kv_archiver_store/message_store.ts +21 -18
- package/src/archiver/l1/README.md +98 -0
- package/src/archiver/l1/bin/retrieve-calldata.ts +182 -0
- package/src/archiver/l1/calldata_retriever.ts +531 -0
- package/src/archiver/{data_retrieval.ts → l1/data_retrieval.ts} +196 -250
- package/src/archiver/l1/debug_tx.ts +99 -0
- package/src/archiver/l1/spire_proposer.ts +160 -0
- package/src/archiver/l1/trace_tx.ts +128 -0
- package/src/archiver/l1/types.ts +13 -0
- package/src/archiver/l1/validate_trace.ts +211 -0
- package/src/archiver/structs/inbox_message.ts +8 -8
- package/src/archiver/structs/published.ts +2 -1
- package/src/archiver/validation.ts +52 -27
- package/src/factory.ts +4 -5
- package/src/index.ts +1 -1
- package/src/test/fixtures/debug_traceTransaction-multicall3.json +88 -0
- package/src/test/fixtures/debug_traceTransaction-multiplePropose.json +153 -0
- package/src/test/fixtures/debug_traceTransaction-proxied.json +122 -0
- package/src/test/fixtures/trace_transaction-multicall3.json +65 -0
- package/src/test/fixtures/trace_transaction-multiplePropose.json +319 -0
- package/src/test/fixtures/trace_transaction-proxied.json +128 -0
- package/src/test/fixtures/trace_transaction-randomRevert.json +216 -0
- package/src/test/mock_archiver.ts +22 -16
- package/src/test/mock_l1_to_l2_message_source.ts +10 -9
- package/src/test/mock_l2_block_source.ts +32 -15
- package/src/test/mock_structs.ts +10 -9
- package/dest/archiver/data_retrieval.d.ts +0 -79
- package/dest/archiver/data_retrieval.d.ts.map +0 -1
- package/dest/archiver/data_retrieval.js +0 -362
|
@@ -0,0 +1,318 @@
|
|
|
1
|
+
import { BlobDeserializationError, SpongeBlob, decodeCheckpointBlobDataFromBlobs, encodeBlockBlobData } from '@aztec/blob-lib';
|
|
2
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
3
|
+
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
4
|
+
import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
8
|
+
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
9
|
+
import { Body, L2BlockNew } from '@aztec/stdlib/block';
|
|
10
|
+
import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
11
|
+
import { Proof } from '@aztec/stdlib/proofs';
|
|
12
|
+
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
13
|
+
import { BlockHeader, GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
|
|
14
|
+
import { decodeFunctionData, getAbiItem, hexToBytes } from 'viem';
|
|
15
|
+
import { NoBlobBodiesFoundError } from '../errors.js';
|
|
16
|
+
import { CalldataRetriever } from './calldata_retriever.js';
|
|
17
|
+
export async function retrievedToPublishedCheckpoint({ checkpointNumber, archiveRoot, header: checkpointHeader, checkpointBlobData, l1, chainId, version, attestations }) {
|
|
18
|
+
const { blocks: blocksBlobData } = checkpointBlobData;
|
|
19
|
+
// The lastArchiveRoot of a block is the new archive for the previous block.
|
|
20
|
+
const newArchiveRoots = blocksBlobData.map((b)=>b.lastArchiveRoot).slice(1).concat([
|
|
21
|
+
archiveRoot
|
|
22
|
+
]);
|
|
23
|
+
// An error will be thrown from `decodeCheckpointBlobDataFromBlobs` if it can't read a field for the
|
|
24
|
+
// `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
|
|
25
|
+
const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot;
|
|
26
|
+
const spongeBlob = SpongeBlob.init();
|
|
27
|
+
const l2Blocks = [];
|
|
28
|
+
for(let i = 0; i < blocksBlobData.length; i++){
|
|
29
|
+
const blockBlobData = blocksBlobData[i];
|
|
30
|
+
const { blockEndMarker, blockEndStateField, lastArchiveRoot, noteHashRoot, nullifierRoot, publicDataRoot } = blockBlobData;
|
|
31
|
+
const l2BlockNumber = blockEndMarker.blockNumber;
|
|
32
|
+
const globalVariables = GlobalVariables.from({
|
|
33
|
+
chainId,
|
|
34
|
+
version,
|
|
35
|
+
blockNumber: l2BlockNumber,
|
|
36
|
+
slotNumber: checkpointHeader.slotNumber,
|
|
37
|
+
timestamp: blockEndMarker.timestamp,
|
|
38
|
+
coinbase: checkpointHeader.coinbase,
|
|
39
|
+
feeRecipient: checkpointHeader.feeRecipient,
|
|
40
|
+
gasFees: checkpointHeader.gasFees
|
|
41
|
+
});
|
|
42
|
+
const state = StateReference.from({
|
|
43
|
+
l1ToL2MessageTree: new AppendOnlyTreeSnapshot(l1toL2MessageTreeRoot, blockEndStateField.l1ToL2MessageNextAvailableLeafIndex),
|
|
44
|
+
partial: PartialStateReference.from({
|
|
45
|
+
noteHashTree: new AppendOnlyTreeSnapshot(noteHashRoot, blockEndStateField.noteHashNextAvailableLeafIndex),
|
|
46
|
+
nullifierTree: new AppendOnlyTreeSnapshot(nullifierRoot, blockEndStateField.nullifierNextAvailableLeafIndex),
|
|
47
|
+
publicDataTree: new AppendOnlyTreeSnapshot(publicDataRoot, blockEndStateField.publicDataNextAvailableLeafIndex)
|
|
48
|
+
})
|
|
49
|
+
});
|
|
50
|
+
const body = Body.fromTxBlobData(checkpointBlobData.blocks[0].txs);
|
|
51
|
+
const blobFields = encodeBlockBlobData(blockBlobData);
|
|
52
|
+
await spongeBlob.absorb(blobFields);
|
|
53
|
+
const clonedSpongeBlob = spongeBlob.clone();
|
|
54
|
+
const spongeBlobHash = await clonedSpongeBlob.squeeze();
|
|
55
|
+
const header = BlockHeader.from({
|
|
56
|
+
lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
|
|
57
|
+
state,
|
|
58
|
+
spongeBlobHash,
|
|
59
|
+
globalVariables,
|
|
60
|
+
totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
|
|
61
|
+
totalManaUsed: new Fr(blockEndStateField.totalManaUsed)
|
|
62
|
+
});
|
|
63
|
+
const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
|
|
64
|
+
l2Blocks.push(new L2BlockNew(newArchive, header, body, checkpointNumber, i));
|
|
65
|
+
}
|
|
66
|
+
const lastBlock = l2Blocks.at(-1);
|
|
67
|
+
const checkpoint = Checkpoint.from({
|
|
68
|
+
archive: new AppendOnlyTreeSnapshot(archiveRoot, lastBlock.number + 1),
|
|
69
|
+
header: checkpointHeader,
|
|
70
|
+
blocks: l2Blocks,
|
|
71
|
+
number: checkpointNumber
|
|
72
|
+
});
|
|
73
|
+
return PublishedCheckpoint.from({
|
|
74
|
+
checkpoint,
|
|
75
|
+
l1,
|
|
76
|
+
attestations
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Fetches new checkpoints.
|
|
81
|
+
* @param publicClient - The viem public client to use for transaction retrieval.
|
|
82
|
+
* @param debugClient - The viem debug client to use for trace/debug RPC methods (optional).
|
|
83
|
+
* @param rollupAddress - The address of the rollup contract.
|
|
84
|
+
* @param searchStartBlock - The block number to use for starting the search.
|
|
85
|
+
* @param searchEndBlock - The highest block number that we should search up to.
|
|
86
|
+
* @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
|
|
87
|
+
* @returns An array of block; as well as the next eth block to search from.
|
|
88
|
+
*/ export async function retrieveCheckpointsFromRollup(rollup, publicClient, debugClient, blobSinkClient, searchStartBlock, searchEndBlock, contractAddresses, instrumentation, logger = createLogger('archiver')) {
|
|
89
|
+
const retrievedCheckpoints = [];
|
|
90
|
+
let rollupConstants;
|
|
91
|
+
do {
|
|
92
|
+
if (searchStartBlock > searchEndBlock) {
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
const checkpointProposedLogs = (await rollup.getEvents.CheckpointProposed({}, {
|
|
96
|
+
fromBlock: searchStartBlock,
|
|
97
|
+
toBlock: searchEndBlock
|
|
98
|
+
})).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
|
|
99
|
+
if (checkpointProposedLogs.length === 0) {
|
|
100
|
+
break;
|
|
101
|
+
}
|
|
102
|
+
const lastLog = checkpointProposedLogs.at(-1);
|
|
103
|
+
logger.debug(`Got ${checkpointProposedLogs.length} processed logs for checkpoints ${checkpointProposedLogs[0].args.checkpointNumber}-${lastLog.args.checkpointNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`);
|
|
104
|
+
if (rollupConstants === undefined) {
|
|
105
|
+
const [chainId, version, targetCommitteeSize] = await Promise.all([
|
|
106
|
+
publicClient.getChainId(),
|
|
107
|
+
rollup.read.getVersion(),
|
|
108
|
+
rollup.read.getTargetCommitteeSize()
|
|
109
|
+
]);
|
|
110
|
+
rollupConstants = {
|
|
111
|
+
chainId: new Fr(chainId),
|
|
112
|
+
version: new Fr(version),
|
|
113
|
+
targetCommitteeSize: Number(targetCommitteeSize)
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
const newCheckpoints = await processCheckpointProposedLogs(rollup, publicClient, debugClient, blobSinkClient, checkpointProposedLogs, rollupConstants, contractAddresses, instrumentation, logger);
|
|
117
|
+
retrievedCheckpoints.push(...newCheckpoints);
|
|
118
|
+
searchStartBlock = lastLog.blockNumber + 1n;
|
|
119
|
+
}while (searchStartBlock <= searchEndBlock)
|
|
120
|
+
// The asyncPool from processCheckpointProposedLogs will not necessarily return the checkpoints in order, so we sort them before returning.
|
|
121
|
+
return retrievedCheckpoints.sort((a, b)=>Number(a.l1.blockNumber - b.l1.blockNumber));
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Processes newly received CheckpointProposed logs.
|
|
125
|
+
* @param rollup - The rollup contract
|
|
126
|
+
* @param publicClient - The viem public client to use for transaction retrieval.
|
|
127
|
+
* @param debugClient - The viem debug client to use for trace/debug RPC methods (optional).
|
|
128
|
+
* @param logs - CheckpointProposed logs.
|
|
129
|
+
* @returns - An array of checkpoints.
|
|
130
|
+
*/ async function processCheckpointProposedLogs(rollup, publicClient, debugClient, blobSinkClient, logs, { chainId, version, targetCommitteeSize }, contractAddresses, instrumentation, logger) {
|
|
131
|
+
const retrievedCheckpoints = [];
|
|
132
|
+
const calldataRetriever = new CalldataRetriever(publicClient, debugClient, targetCommitteeSize, instrumentation, logger, {
|
|
133
|
+
...contractAddresses,
|
|
134
|
+
rollupAddress: EthAddress.fromString(rollup.address)
|
|
135
|
+
});
|
|
136
|
+
await asyncPool(10, logs, async (log)=>{
|
|
137
|
+
const checkpointNumber = CheckpointNumber.fromBigInt(log.args.checkpointNumber);
|
|
138
|
+
const archive = log.args.archive;
|
|
139
|
+
const archiveFromChain = await rollup.read.archiveAt([
|
|
140
|
+
BigInt(checkpointNumber)
|
|
141
|
+
]);
|
|
142
|
+
const blobHashes = log.args.versionedBlobHashes.map((blobHash)=>Buffer.from(blobHash.slice(2), 'hex'));
|
|
143
|
+
// The value from the event and contract will match only if the checkpoint is in the chain.
|
|
144
|
+
if (archive === archiveFromChain) {
|
|
145
|
+
const checkpoint = await calldataRetriever.getCheckpointFromRollupTx(log.transactionHash, blobHashes, checkpointNumber);
|
|
146
|
+
const checkpointBlobData = await getCheckpointBlobDataFromBlobs(blobSinkClient, checkpoint.blockHash, blobHashes, checkpointNumber, logger);
|
|
147
|
+
const l1 = {
|
|
148
|
+
blockNumber: log.blockNumber,
|
|
149
|
+
blockHash: log.blockHash,
|
|
150
|
+
timestamp: await getL1BlockTime(publicClient, log.blockNumber)
|
|
151
|
+
};
|
|
152
|
+
retrievedCheckpoints.push({
|
|
153
|
+
...checkpoint,
|
|
154
|
+
checkpointBlobData,
|
|
155
|
+
l1,
|
|
156
|
+
chainId,
|
|
157
|
+
version
|
|
158
|
+
});
|
|
159
|
+
logger.trace(`Retrieved checkpoint ${checkpointNumber} from L1 tx ${log.transactionHash}`, {
|
|
160
|
+
l1BlockNumber: log.blockNumber,
|
|
161
|
+
checkpointNumber,
|
|
162
|
+
archive: archive.toString(),
|
|
163
|
+
attestations: checkpoint.attestations
|
|
164
|
+
});
|
|
165
|
+
} else {
|
|
166
|
+
logger.warn(`Ignoring checkpoint ${checkpointNumber} due to archive root mismatch`, {
|
|
167
|
+
actual: archive,
|
|
168
|
+
expected: archiveFromChain
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
return retrievedCheckpoints;
|
|
173
|
+
}
|
|
174
|
+
export async function getL1BlockTime(publicClient, blockNumber) {
|
|
175
|
+
const block = await publicClient.getBlock({
|
|
176
|
+
blockNumber,
|
|
177
|
+
includeTransactions: false
|
|
178
|
+
});
|
|
179
|
+
return block.timestamp;
|
|
180
|
+
}
|
|
181
|
+
export async function getCheckpointBlobDataFromBlobs(blobSinkClient, blockHash, blobHashes, checkpointNumber, logger) {
|
|
182
|
+
const blobBodies = await blobSinkClient.getBlobSidecar(blockHash, blobHashes);
|
|
183
|
+
if (blobBodies.length === 0) {
|
|
184
|
+
throw new NoBlobBodiesFoundError(checkpointNumber);
|
|
185
|
+
}
|
|
186
|
+
let checkpointBlobData;
|
|
187
|
+
try {
|
|
188
|
+
// Attempt to decode the checkpoint blob data.
|
|
189
|
+
checkpointBlobData = decodeCheckpointBlobDataFromBlobs(blobBodies.map((b)=>b.blob));
|
|
190
|
+
} catch (err) {
|
|
191
|
+
if (err instanceof BlobDeserializationError) {
|
|
192
|
+
logger.fatal(err.message);
|
|
193
|
+
} else {
|
|
194
|
+
logger.fatal('Unable to sync: failed to decode fetched blob, this blob was likely not created by us');
|
|
195
|
+
}
|
|
196
|
+
// Throwing an error since this is most likely caused by a bug.
|
|
197
|
+
throw err;
|
|
198
|
+
}
|
|
199
|
+
return checkpointBlobData;
|
|
200
|
+
}
|
|
201
|
+
/** Given an L1 to L2 message, retrieves its corresponding event from the Inbox within a specific block range. */ export async function retrieveL1ToL2Message(inbox, leaf, fromBlock, toBlock) {
|
|
202
|
+
const logs = await inbox.getEvents.MessageSent({
|
|
203
|
+
hash: leaf.toString()
|
|
204
|
+
}, {
|
|
205
|
+
fromBlock,
|
|
206
|
+
toBlock
|
|
207
|
+
});
|
|
208
|
+
const messages = mapLogsInboxMessage(logs);
|
|
209
|
+
return messages.length > 0 ? messages[0] : undefined;
|
|
210
|
+
}
|
|
211
|
+
/**
|
|
212
|
+
* Fetch L1 to L2 messages.
|
|
213
|
+
* @param publicClient - The viem public client to use for transaction retrieval.
|
|
214
|
+
* @param inboxAddress - The address of the inbox contract to fetch messages from.
|
|
215
|
+
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
216
|
+
* @param searchStartBlock - The block number to use for starting the search.
|
|
217
|
+
* @param searchEndBlock - The highest block number that we should search up to.
|
|
218
|
+
* @returns An array of InboxLeaf and next eth block to search from.
|
|
219
|
+
*/ export async function retrieveL1ToL2Messages(inbox, searchStartBlock, searchEndBlock) {
|
|
220
|
+
const retrievedL1ToL2Messages = [];
|
|
221
|
+
while(searchStartBlock <= searchEndBlock){
|
|
222
|
+
const messageSentLogs = (await inbox.getEvents.MessageSent({}, {
|
|
223
|
+
fromBlock: searchStartBlock,
|
|
224
|
+
toBlock: searchEndBlock
|
|
225
|
+
})).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
|
|
226
|
+
if (messageSentLogs.length === 0) {
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
retrievedL1ToL2Messages.push(...mapLogsInboxMessage(messageSentLogs));
|
|
230
|
+
searchStartBlock = messageSentLogs.at(-1).blockNumber + 1n;
|
|
231
|
+
}
|
|
232
|
+
return retrievedL1ToL2Messages;
|
|
233
|
+
}
|
|
234
|
+
function mapLogsInboxMessage(logs) {
|
|
235
|
+
return logs.map((log)=>{
|
|
236
|
+
const { index, hash, checkpointNumber, rollingHash } = log.args;
|
|
237
|
+
return {
|
|
238
|
+
index: index,
|
|
239
|
+
leaf: Fr.fromHexString(hash),
|
|
240
|
+
l1BlockNumber: log.blockNumber,
|
|
241
|
+
l1BlockHash: Buffer32.fromString(log.blockHash),
|
|
242
|
+
checkpointNumber: CheckpointNumber.fromBigInt(checkpointNumber),
|
|
243
|
+
rollingHash: Buffer16.fromString(rollingHash)
|
|
244
|
+
};
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
/** Retrieves L2ProofVerified events from the rollup contract. */ export async function retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
|
|
248
|
+
const logs = await publicClient.getLogs({
|
|
249
|
+
address: rollupAddress.toString(),
|
|
250
|
+
fromBlock: searchStartBlock,
|
|
251
|
+
toBlock: searchEndBlock ? searchEndBlock : undefined,
|
|
252
|
+
strict: true,
|
|
253
|
+
event: getAbiItem({
|
|
254
|
+
abi: RollupAbi,
|
|
255
|
+
name: 'L2ProofVerified'
|
|
256
|
+
})
|
|
257
|
+
});
|
|
258
|
+
return logs.map((log)=>({
|
|
259
|
+
l1BlockNumber: log.blockNumber,
|
|
260
|
+
checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber),
|
|
261
|
+
proverId: Fr.fromHexString(log.args.proverId),
|
|
262
|
+
txHash: log.transactionHash
|
|
263
|
+
}));
|
|
264
|
+
}
|
|
265
|
+
/** Retrieve submitted proofs from the rollup contract */ export async function retrieveL2ProofsFromRollup(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
|
|
266
|
+
const logs = await retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock);
|
|
267
|
+
const retrievedData = [];
|
|
268
|
+
const lastProcessedL1BlockNumber = logs.length > 0 ? logs.at(-1).l1BlockNumber : searchStartBlock - 1n;
|
|
269
|
+
for (const { txHash, proverId, checkpointNumber } of logs){
|
|
270
|
+
const proofData = await getProofFromSubmitProofTx(publicClient, txHash, proverId);
|
|
271
|
+
retrievedData.push({
|
|
272
|
+
proof: proofData.proof,
|
|
273
|
+
proverId: proofData.proverId,
|
|
274
|
+
checkpointNumber,
|
|
275
|
+
txHash
|
|
276
|
+
});
|
|
277
|
+
}
|
|
278
|
+
return {
|
|
279
|
+
retrievedData,
|
|
280
|
+
lastProcessedL1BlockNumber
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
/**
|
|
284
|
+
* Gets epoch proof metadata (archive root and proof) from the calldata of an L1 transaction.
|
|
285
|
+
* Assumes that the block was published from an EOA.
|
|
286
|
+
* TODO: Add retries and error management.
|
|
287
|
+
* @param publicClient - The viem public client to use for transaction retrieval.
|
|
288
|
+
* @param txHash - Hash of the tx that published it.
|
|
289
|
+
* @param expectedProverId - Expected prover ID.
|
|
290
|
+
* @returns Epoch proof metadata from the calldata, deserialized.
|
|
291
|
+
*/ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedProverId) {
|
|
292
|
+
const { input: data } = await publicClient.getTransaction({
|
|
293
|
+
hash: txHash
|
|
294
|
+
});
|
|
295
|
+
const { functionName, args } = decodeFunctionData({
|
|
296
|
+
abi: RollupAbi,
|
|
297
|
+
data
|
|
298
|
+
});
|
|
299
|
+
let proverId;
|
|
300
|
+
let archiveRoot;
|
|
301
|
+
let proof;
|
|
302
|
+
if (functionName === 'submitEpochRootProof') {
|
|
303
|
+
const [decodedArgs] = args;
|
|
304
|
+
proverId = Fr.fromHexString(decodedArgs.args.proverId);
|
|
305
|
+
archiveRoot = Fr.fromHexString(decodedArgs.args.endArchive);
|
|
306
|
+
proof = Proof.fromBuffer(Buffer.from(hexToBytes(decodedArgs.proof)));
|
|
307
|
+
} else {
|
|
308
|
+
throw new Error(`Unexpected proof method called ${functionName}`);
|
|
309
|
+
}
|
|
310
|
+
if (!proverId.equals(expectedProverId)) {
|
|
311
|
+
throw new Error(`Prover ID mismatch: expected ${expectedProverId} but got ${proverId}`);
|
|
312
|
+
}
|
|
313
|
+
return {
|
|
314
|
+
proverId,
|
|
315
|
+
archiveRoot,
|
|
316
|
+
proof
|
|
317
|
+
};
|
|
318
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { DebugCallTrace, ViemPublicDebugClient } from '@aztec/ethereum/types';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
4
|
+
import { type ZodFor } from '@aztec/foundation/schemas';
|
|
5
|
+
import type { Hex } from 'viem';
|
|
6
|
+
import type { CallInfo } from './types.js';
|
|
7
|
+
/** Zod schema for validating call trace from debug_traceTransaction */
|
|
8
|
+
export declare const callTraceSchema: ZodFor<DebugCallTrace>;
|
|
9
|
+
/**
|
|
10
|
+
* Traces a transaction and extracts all CALL operations to a specific contract and function selector.
|
|
11
|
+
*
|
|
12
|
+
* @param client - The Viem public client
|
|
13
|
+
* @param txHash - The transaction hash to trace
|
|
14
|
+
* @param targetAddress - The contract address to filter for
|
|
15
|
+
* @param functionSelector - The 4-byte function selector to filter for (with or without 0x prefix)
|
|
16
|
+
* @returns Array of CallInfo objects containing from, gasUsed, input, and value for matching calls
|
|
17
|
+
*/
|
|
18
|
+
export declare function getSuccessfulCallsFromDebug(client: ViemPublicDebugClient, txHash: Hex, targetAddress: EthAddress, functionSelector: string, logger?: Logger): Promise<CallInfo[]>;
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWdfdHguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9sMS9kZWJ1Z190eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFHakUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUUzQyx1RUFBdUU7QUFDdkUsZUFBTyxNQUFNLGVBQWUsRUFBRSxNQUFNLENBQUMsY0FBYyxDQWFsRCxDQUFDO0FBRUY7Ozs7Ozs7O0dBUUc7QUFDSCx3QkFBc0IsMkJBQTJCLENBQy9DLE1BQU0sRUFBRSxxQkFBcUIsRUFDN0IsTUFBTSxFQUFFLEdBQUcsRUFDWCxhQUFhLEVBQUUsVUFBVSxFQUN6QixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0F3RHJCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"debug_tx.d.ts","sourceRoot":"","sources":["../../../src/archiver/l1/debug_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AAGjE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,uEAAuE;AACvE,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,cAAc,CAalD,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,qBAAqB,EAC7B,MAAM,EAAE,GAAG,EACX,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,MAAM,EACxB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,QAAQ,EAAE,CAAC,CAwDrB"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
+
import { schemas } from '@aztec/foundation/schemas';
|
|
3
|
+
import { withHexPrefix } from '@aztec/foundation/string';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
/** Zod schema for validating call trace from debug_traceTransaction */ export const callTraceSchema = z.lazy(()=>z.object({
|
|
6
|
+
from: schemas.HexStringWith0x,
|
|
7
|
+
to: schemas.HexStringWith0x.optional(),
|
|
8
|
+
type: z.string(),
|
|
9
|
+
input: schemas.HexStringWith0x.optional(),
|
|
10
|
+
output: schemas.HexStringWith0x.optional(),
|
|
11
|
+
gas: schemas.HexStringWith0x.optional(),
|
|
12
|
+
gasUsed: schemas.HexStringWith0x.optional(),
|
|
13
|
+
value: schemas.HexStringWith0x.optional(),
|
|
14
|
+
error: z.string().optional(),
|
|
15
|
+
calls: z.array(callTraceSchema).optional()
|
|
16
|
+
}));
|
|
17
|
+
/**
|
|
18
|
+
* Traces a transaction and extracts all CALL operations to a specific contract and function selector.
|
|
19
|
+
*
|
|
20
|
+
* @param client - The Viem public client
|
|
21
|
+
* @param txHash - The transaction hash to trace
|
|
22
|
+
* @param targetAddress - The contract address to filter for
|
|
23
|
+
* @param functionSelector - The 4-byte function selector to filter for (with or without 0x prefix)
|
|
24
|
+
* @returns Array of CallInfo objects containing from, gasUsed, input, and value for matching calls
|
|
25
|
+
*/ export async function getSuccessfulCallsFromDebug(client, txHash, targetAddress, functionSelector, logger) {
|
|
26
|
+
// Normalize inputs for comparison
|
|
27
|
+
const normalizedTarget = targetAddress.toString().toLowerCase();
|
|
28
|
+
const normalizedSelector = withHexPrefix(functionSelector.toLowerCase());
|
|
29
|
+
// Call debug_traceTransaction with callTracer
|
|
30
|
+
// Using 'any' here because debug_traceTransaction is not in viem's standard RPC types
|
|
31
|
+
const rawTrace = await client.request({
|
|
32
|
+
method: 'debug_traceTransaction',
|
|
33
|
+
params: [
|
|
34
|
+
txHash,
|
|
35
|
+
{
|
|
36
|
+
tracer: 'callTracer'
|
|
37
|
+
}
|
|
38
|
+
]
|
|
39
|
+
});
|
|
40
|
+
if (rawTrace === null || rawTrace === undefined) {
|
|
41
|
+
throw new Error(`Failed to retrieve debug_traceTransaction for ${txHash}`);
|
|
42
|
+
}
|
|
43
|
+
logger?.trace(`Retrieved debug_traceTransaction for ${txHash}`, {
|
|
44
|
+
trace: rawTrace
|
|
45
|
+
});
|
|
46
|
+
// Validate the response with zod
|
|
47
|
+
const trace = callTraceSchema.parse(rawTrace);
|
|
48
|
+
const results = [];
|
|
49
|
+
/**
|
|
50
|
+
* Recursively traverse the call trace tree
|
|
51
|
+
*/ function traverseCalls(callTrace) {
|
|
52
|
+
// Skip calls that have errors, and all its descendants
|
|
53
|
+
if (callTrace.error) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
// Check if this is a CALL (not DELEGATECALL or STATICCALL) to the target address with matching selector
|
|
57
|
+
if (callTrace.type.toUpperCase() === 'CALL' && callTrace.to?.toLowerCase() === normalizedTarget && callTrace.input?.toLowerCase().startsWith(normalizedSelector)) {
|
|
58
|
+
results.push({
|
|
59
|
+
from: EthAddress.fromString(callTrace.from),
|
|
60
|
+
gasUsed: callTrace.gasUsed === undefined ? undefined : BigInt(callTrace.gasUsed),
|
|
61
|
+
input: callTrace.input,
|
|
62
|
+
value: callTrace.value ? BigInt(callTrace.value) : 0n
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
// Recursively process nested calls
|
|
66
|
+
for (const nestedCall of callTrace.calls ?? []){
|
|
67
|
+
traverseCalls(nestedCall);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
// Start traversal from the root trace
|
|
71
|
+
traverseCalls(trace);
|
|
72
|
+
return results;
|
|
73
|
+
}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
import { type Hex, type Transaction } from 'viem';
|
|
3
|
+
export declare const SPIRE_PROPOSER_ADDRESS = "0x9ccc2f3ecde026230e11a5c8799ac7524f2bb294";
|
|
4
|
+
export declare const SPIRE_PROPOSER_EXPECTED_IMPLEMENTATION = "0x7d38d47e7c82195e6e607d3b0f1c20c615c7bf42";
|
|
5
|
+
export declare const EIP1967_IMPLEMENTATION_SLOT: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
|
|
6
|
+
export declare const SpireProposerAbi: readonly [{
|
|
7
|
+
readonly inputs: readonly [{
|
|
8
|
+
readonly components: readonly [{
|
|
9
|
+
readonly internalType: "address";
|
|
10
|
+
readonly name: "proposer";
|
|
11
|
+
readonly type: "address";
|
|
12
|
+
}, {
|
|
13
|
+
readonly internalType: "address";
|
|
14
|
+
readonly name: "target";
|
|
15
|
+
readonly type: "address";
|
|
16
|
+
}, {
|
|
17
|
+
readonly internalType: "bytes";
|
|
18
|
+
readonly name: "data";
|
|
19
|
+
readonly type: "bytes";
|
|
20
|
+
}, {
|
|
21
|
+
readonly internalType: "uint256";
|
|
22
|
+
readonly name: "value";
|
|
23
|
+
readonly type: "uint256";
|
|
24
|
+
}, {
|
|
25
|
+
readonly internalType: "uint256";
|
|
26
|
+
readonly name: "gasLimit";
|
|
27
|
+
readonly type: "uint256";
|
|
28
|
+
}];
|
|
29
|
+
readonly internalType: "struct IProposerMulticall.Call[]";
|
|
30
|
+
readonly name: "_calls";
|
|
31
|
+
readonly type: "tuple[]";
|
|
32
|
+
}];
|
|
33
|
+
readonly name: "multicall";
|
|
34
|
+
readonly outputs: readonly [];
|
|
35
|
+
readonly stateMutability: "nonpayable";
|
|
36
|
+
readonly type: "function";
|
|
37
|
+
}];
|
|
38
|
+
/**
|
|
39
|
+
* Verifies that a proxy contract points to the expected implementation using EIP-1967.
|
|
40
|
+
* @param publicClient - The viem public client
|
|
41
|
+
* @param proxyAddress - The proxy contract address
|
|
42
|
+
* @param expectedImplementation - The expected implementation address
|
|
43
|
+
* @param logger - Logger instance
|
|
44
|
+
* @returns True if the proxy points to the expected implementation
|
|
45
|
+
*/
|
|
46
|
+
export declare function verifyProxyImplementation(publicClient: {
|
|
47
|
+
getStorageAt: (params: {
|
|
48
|
+
address: Hex;
|
|
49
|
+
slot: Hex;
|
|
50
|
+
}) => Promise<Hex | undefined>;
|
|
51
|
+
}, proxyAddress: Hex, expectedImplementation: Hex, logger: Logger): Promise<boolean>;
|
|
52
|
+
/**
|
|
53
|
+
* Attempts to decode transaction as a Spire Proposer Multicall.
|
|
54
|
+
* Spire Proposer is a proxy contract that wraps multiple calls.
|
|
55
|
+
* Returns the target address and calldata of the wrapped call if validation succeeds and there is a single call.
|
|
56
|
+
* @param tx - The transaction to decode
|
|
57
|
+
* @param publicClient - The viem public client for proxy verification
|
|
58
|
+
* @param logger - Logger instance
|
|
59
|
+
* @returns Object with 'to' and 'data' of the wrapped call, or undefined if validation fails
|
|
60
|
+
*/
|
|
61
|
+
export declare function getCallFromSpireProposer(tx: Transaction, publicClient: {
|
|
62
|
+
getStorageAt: (params: {
|
|
63
|
+
address: Hex;
|
|
64
|
+
slot: Hex;
|
|
65
|
+
}) => Promise<Hex | undefined>;
|
|
66
|
+
}, logger: Logger): Promise<{
|
|
67
|
+
to: Hex;
|
|
68
|
+
data: Hex;
|
|
69
|
+
} | undefined>;
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3BpcmVfcHJvcG9zZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9sMS9zcGlyZV9wcm9wb3Nlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQUUsS0FBSyxXQUFXLEVBQXdDLE1BQU0sTUFBTSxDQUFDO0FBR3hGLGVBQU8sTUFBTSxzQkFBc0IsK0NBQStDLENBQUM7QUFDbkYsZUFBTyxNQUFNLHNDQUFzQywrQ0FBK0MsQ0FBQztBQUluRyxlQUFPLE1BQU0sMkJBQTJCLHNFQUN1QyxDQUFDO0FBR2hGLGVBQU8sTUFBTSxnQkFBZ0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFxQm5CLENBQUM7QUFFWDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLHlCQUF5QixDQUM3QyxZQUFZLEVBQUU7SUFBRSxZQUFZLEVBQUUsQ0FBQyxNQUFNLEVBQUU7UUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDO1FBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQTtLQUFFLEtBQUssT0FBTyxDQUFDLEdBQUcsR0FBRyxTQUFTLENBQUMsQ0FBQTtDQUFFLEVBQ2pHLFlBQVksRUFBRSxHQUFHLEVBQ2pCLHNCQUFzQixFQUFFLEdBQUcsRUFDM0IsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsT0FBTyxDQUFDLENBaUNsQjtBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLHdCQUF3QixDQUM1QyxFQUFFLEVBQUUsV0FBVyxFQUNmLFlBQVksRUFBRTtJQUFFLFlBQVksRUFBRSxDQUFDLE1BQU0sRUFBRTtRQUFFLE9BQU8sRUFBRSxHQUFHLENBQUM7UUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFBO0tBQUUsS0FBSyxPQUFPLENBQUMsR0FBRyxHQUFHLFNBQVMsQ0FBQyxDQUFBO0NBQUUsRUFDakcsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUM7SUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDO0lBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQTtDQUFFLEdBQUcsU0FBUyxDQUFDLENBNEQ3QyJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spire_proposer.d.ts","sourceRoot":"","sources":["../../../src/archiver/l1/spire_proposer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,WAAW,EAAwC,MAAM,MAAM,CAAC;AAGxF,eAAO,MAAM,sBAAsB,+CAA+C,CAAC;AACnF,eAAO,MAAM,sCAAsC,+CAA+C,CAAC;AAInG,eAAO,MAAM,2BAA2B,sEACuC,CAAC;AAGhF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqBnB,CAAC;AAEX;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE;IAAE,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,GAAG,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAA;CAAE,EACjG,YAAY,EAAE,GAAG,EACjB,sBAAsB,EAAE,GAAG,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CAiClB;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,WAAW,EACf,YAAY,EAAE;IAAE,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,GAAG,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAA;CAAE,EACjG,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,EAAE,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAAC,CA4D7C"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
+
import { decodeFunctionData, getAddress, trim } from 'viem';
|
|
3
|
+
// Spire Proposer Multicall constants
|
|
4
|
+
export const SPIRE_PROPOSER_ADDRESS = '0x9ccc2f3ecde026230e11a5c8799ac7524f2bb294';
|
|
5
|
+
export const SPIRE_PROPOSER_EXPECTED_IMPLEMENTATION = '0x7d38d47e7c82195e6e607d3b0f1c20c615c7bf42';
|
|
6
|
+
// EIP-1967 storage slot for implementation address
|
|
7
|
+
// keccak256("eip1967.proxy.implementation") - 1 = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc
|
|
8
|
+
export const EIP1967_IMPLEMENTATION_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc';
|
|
9
|
+
// Spire Proposer Multicall ABI
|
|
10
|
+
export const SpireProposerAbi = [
|
|
11
|
+
{
|
|
12
|
+
inputs: [
|
|
13
|
+
{
|
|
14
|
+
components: [
|
|
15
|
+
{
|
|
16
|
+
internalType: 'address',
|
|
17
|
+
name: 'proposer',
|
|
18
|
+
type: 'address'
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
internalType: 'address',
|
|
22
|
+
name: 'target',
|
|
23
|
+
type: 'address'
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
internalType: 'bytes',
|
|
27
|
+
name: 'data',
|
|
28
|
+
type: 'bytes'
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
internalType: 'uint256',
|
|
32
|
+
name: 'value',
|
|
33
|
+
type: 'uint256'
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
internalType: 'uint256',
|
|
37
|
+
name: 'gasLimit',
|
|
38
|
+
type: 'uint256'
|
|
39
|
+
}
|
|
40
|
+
],
|
|
41
|
+
internalType: 'struct IProposerMulticall.Call[]',
|
|
42
|
+
name: '_calls',
|
|
43
|
+
type: 'tuple[]'
|
|
44
|
+
}
|
|
45
|
+
],
|
|
46
|
+
name: 'multicall',
|
|
47
|
+
outputs: [],
|
|
48
|
+
stateMutability: 'nonpayable',
|
|
49
|
+
type: 'function'
|
|
50
|
+
}
|
|
51
|
+
];
|
|
52
|
+
/**
|
|
53
|
+
* Verifies that a proxy contract points to the expected implementation using EIP-1967.
|
|
54
|
+
* @param publicClient - The viem public client
|
|
55
|
+
* @param proxyAddress - The proxy contract address
|
|
56
|
+
* @param expectedImplementation - The expected implementation address
|
|
57
|
+
* @param logger - Logger instance
|
|
58
|
+
* @returns True if the proxy points to the expected implementation
|
|
59
|
+
*/ export async function verifyProxyImplementation(publicClient, proxyAddress, expectedImplementation, logger) {
|
|
60
|
+
try {
|
|
61
|
+
// Read the EIP-1967 implementation slot
|
|
62
|
+
const implementationData = await publicClient.getStorageAt({
|
|
63
|
+
address: proxyAddress,
|
|
64
|
+
slot: EIP1967_IMPLEMENTATION_SLOT
|
|
65
|
+
});
|
|
66
|
+
if (!implementationData) {
|
|
67
|
+
logger.warn(`No implementation found in EIP-1967 slot for proxy ${proxyAddress}`);
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
// The implementation address is stored in the last 20 bytes of the slot
|
|
71
|
+
// We need to extract and normalize it for comparison
|
|
72
|
+
const implementationAddress = getAddress(trim(implementationData));
|
|
73
|
+
const expectedAddress = getAddress(expectedImplementation);
|
|
74
|
+
const matches = implementationAddress.toLowerCase() === expectedAddress.toLowerCase();
|
|
75
|
+
if (!matches) {
|
|
76
|
+
logger.warn(`Proxy implementation mismatch: expected ${expectedAddress}, got ${implementationAddress}`, {
|
|
77
|
+
proxyAddress,
|
|
78
|
+
expectedImplementation,
|
|
79
|
+
actualImplementation: implementationAddress
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
return matches;
|
|
83
|
+
} catch (err) {
|
|
84
|
+
logger.warn(`Failed to verify proxy implementation for ${proxyAddress}: ${err}`);
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Attempts to decode transaction as a Spire Proposer Multicall.
|
|
90
|
+
* Spire Proposer is a proxy contract that wraps multiple calls.
|
|
91
|
+
* Returns the target address and calldata of the wrapped call if validation succeeds and there is a single call.
|
|
92
|
+
* @param tx - The transaction to decode
|
|
93
|
+
* @param publicClient - The viem public client for proxy verification
|
|
94
|
+
* @param logger - Logger instance
|
|
95
|
+
* @returns Object with 'to' and 'data' of the wrapped call, or undefined if validation fails
|
|
96
|
+
*/ export async function getCallFromSpireProposer(tx, publicClient, logger) {
|
|
97
|
+
const txHash = tx.hash;
|
|
98
|
+
try {
|
|
99
|
+
// Check if transaction is to the Spire Proposer address
|
|
100
|
+
if (!tx.to || !EthAddress.areEqual(tx.to, SPIRE_PROPOSER_ADDRESS)) {
|
|
101
|
+
logger.debug(`Transaction is not to Spire Proposer address (to: ${tx.to})`, {
|
|
102
|
+
txHash
|
|
103
|
+
});
|
|
104
|
+
return undefined;
|
|
105
|
+
}
|
|
106
|
+
// Verify the proxy points to the expected implementation
|
|
107
|
+
const isValidProxy = await verifyProxyImplementation(publicClient, tx.to, SPIRE_PROPOSER_EXPECTED_IMPLEMENTATION, logger);
|
|
108
|
+
if (!isValidProxy) {
|
|
109
|
+
logger.warn(`Spire Proposer proxy implementation verification failed`, {
|
|
110
|
+
txHash,
|
|
111
|
+
to: tx.to
|
|
112
|
+
});
|
|
113
|
+
return undefined;
|
|
114
|
+
}
|
|
115
|
+
// Try to decode as Spire Proposer multicall
|
|
116
|
+
const { functionName: spireFunctionName, args: spireArgs } = decodeFunctionData({
|
|
117
|
+
abi: SpireProposerAbi,
|
|
118
|
+
data: tx.input
|
|
119
|
+
});
|
|
120
|
+
// If not multicall, return undefined
|
|
121
|
+
if (spireFunctionName !== 'multicall') {
|
|
122
|
+
logger.warn(`Transaction to Spire Proposer is not multicall (got ${spireFunctionName})`, {
|
|
123
|
+
txHash
|
|
124
|
+
});
|
|
125
|
+
return undefined;
|
|
126
|
+
}
|
|
127
|
+
if (spireArgs.length !== 1) {
|
|
128
|
+
logger.warn(`Unexpected number of arguments for Spire Proposer multicall (got ${spireArgs.length})`, {
|
|
129
|
+
txHash
|
|
130
|
+
});
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
133
|
+
const [calls] = spireArgs;
|
|
134
|
+
// Validate exactly ONE call (see ./README.md for rationale)
|
|
135
|
+
if (calls.length !== 1) {
|
|
136
|
+
logger.warn(`Spire Proposer multicall must contain exactly one call (got ${calls.length})`, {
|
|
137
|
+
txHash
|
|
138
|
+
});
|
|
139
|
+
return undefined;
|
|
140
|
+
}
|
|
141
|
+
const call = calls[0];
|
|
142
|
+
// Successfully extracted the single wrapped call
|
|
143
|
+
logger.trace(`Decoded Spire Proposer with single call to ${call.target}`, {
|
|
144
|
+
txHash
|
|
145
|
+
});
|
|
146
|
+
return {
|
|
147
|
+
to: call.target,
|
|
148
|
+
data: call.data
|
|
149
|
+
};
|
|
150
|
+
} catch (err) {
|
|
151
|
+
// Any decoding error triggers fallback to trace
|
|
152
|
+
logger.warn(`Failed to decode Spire Proposer: ${err}`, {
|
|
153
|
+
txHash
|
|
154
|
+
});
|
|
155
|
+
return undefined;
|
|
156
|
+
}
|
|
157
|
+
}
|