@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212
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/account.d.ts +1 -1
- package/dest/chain.d.ts +1 -1
- package/dest/client.d.ts +2 -2
- package/dest/client.d.ts.map +1 -1
- package/dest/config.d.ts +16 -8
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +160 -62
- package/dest/constants.d.ts +1 -1
- package/dest/contracts/empire_base.d.ts +7 -6
- package/dest/contracts/empire_base.d.ts.map +1 -1
- package/dest/contracts/empire_base.js +1 -1
- package/dest/contracts/empire_slashing_proposer.d.ts +7 -6
- package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.js +9 -3
- package/dest/contracts/errors.d.ts +1 -1
- package/dest/contracts/errors.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.d.ts +4 -4
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_juice.d.ts +1 -1
- package/dest/contracts/fee_juice.d.ts.map +1 -1
- package/dest/contracts/governance.d.ts +16 -16
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +7 -3
- package/dest/contracts/governance_proposer.d.ts +6 -6
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +9 -4
- package/dest/contracts/gse.d.ts +1 -1
- package/dest/contracts/gse.d.ts.map +1 -1
- package/dest/contracts/inbox.d.ts +1 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/index.d.ts +1 -1
- package/dest/contracts/multicall.d.ts +5 -7
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +6 -4
- package/dest/contracts/registry.d.ts +1 -1
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/rollup.d.ts +83 -72
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +144 -139
- package/dest/contracts/slasher_contract.d.ts +11 -1
- package/dest/contracts/slasher_contract.d.ts.map +1 -1
- package/dest/contracts/slasher_contract.js +18 -0
- package/dest/contracts/tally_slashing_proposer.d.ts +30 -9
- package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/tally_slashing_proposer.js +58 -8
- package/dest/contracts/utils.d.ts +1 -1
- package/dest/deploy_l1_contracts.d.ts +477 -15
- package/dest/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_l1_contracts.js +610 -386
- package/dest/eth-signer/eth-signer.d.ts +1 -1
- package/dest/eth-signer/index.d.ts +1 -1
- package/dest/forwarder_proxy.d.ts +32 -0
- package/dest/forwarder_proxy.d.ts.map +1 -0
- package/dest/forwarder_proxy.js +93 -0
- package/dest/l1_artifacts.d.ts +14258 -6015
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_artifacts.js +10 -5
- package/dest/l1_contract_addresses.d.ts +8 -4
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +16 -26
- package/dest/l1_reader.d.ts +4 -2
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +14 -8
- package/dest/l1_tx_utils/config.d.ts +59 -0
- package/dest/l1_tx_utils/config.d.ts.map +1 -0
- package/dest/l1_tx_utils/config.js +96 -0
- package/dest/l1_tx_utils/constants.d.ts +6 -0
- package/dest/l1_tx_utils/constants.d.ts.map +1 -0
- package/dest/l1_tx_utils/constants.js +14 -0
- package/dest/l1_tx_utils/factory.d.ts +24 -0
- package/dest/l1_tx_utils/factory.d.ts.map +1 -0
- package/dest/l1_tx_utils/factory.js +12 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +41 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +48 -0
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -0
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -0
- package/dest/l1_tx_utils/index-blobs.js +2 -0
- package/dest/l1_tx_utils/index.d.ts +10 -0
- package/dest/l1_tx_utils/index.d.ts.map +1 -0
- package/dest/l1_tx_utils/index.js +10 -0
- package/dest/l1_tx_utils/interfaces.d.ts +76 -0
- package/dest/l1_tx_utils/interfaces.d.ts.map +1 -0
- package/dest/l1_tx_utils/interfaces.js +4 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +94 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_tx_utils.js +623 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +26 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +26 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +94 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +431 -0
- package/dest/l1_tx_utils/signer.d.ts +4 -0
- package/dest/l1_tx_utils/signer.d.ts.map +1 -0
- package/dest/l1_tx_utils/signer.js +16 -0
- package/dest/l1_tx_utils/types.d.ts +67 -0
- package/dest/l1_tx_utils/types.d.ts.map +1 -0
- package/dest/l1_tx_utils/types.js +26 -0
- package/dest/l1_tx_utils/utils.d.ts +4 -0
- package/dest/l1_tx_utils/utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/utils.js +14 -0
- package/dest/l1_types.d.ts +1 -1
- package/dest/publisher_manager.d.ts +8 -3
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +36 -8
- package/dest/queries.d.ts +1 -1
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +13 -12
- package/dest/test/chain_monitor.d.ts +33 -19
- package/dest/test/chain_monitor.d.ts.map +1 -1
- package/dest/test/chain_monitor.js +100 -33
- package/dest/test/delayed_tx_utils.d.ts +3 -3
- package/dest/test/delayed_tx_utils.d.ts.map +1 -1
- package/dest/test/delayed_tx_utils.js +2 -2
- package/dest/test/eth_cheat_codes.d.ts +36 -14
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +124 -31
- package/dest/test/eth_cheat_codes_with_state.d.ts +1 -1
- package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -1
- package/dest/test/index.d.ts +1 -1
- package/dest/test/rollup_cheat_codes.d.ts +23 -20
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +79 -42
- package/dest/test/start_anvil.d.ts +2 -1
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +2 -1
- package/dest/test/tx_delayer.d.ts +1 -1
- package/dest/test/tx_delayer.d.ts.map +1 -1
- package/dest/test/tx_delayer.js +3 -2
- package/dest/test/upgrade_utils.d.ts +1 -1
- package/dest/test/upgrade_utils.d.ts.map +1 -1
- package/dest/test/upgrade_utils.js +3 -2
- package/dest/types.d.ts +57 -2
- package/dest/types.d.ts.map +1 -1
- package/dest/utils.d.ts +2 -2
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +10 -161
- package/dest/zkPassportVerifierAddress.d.ts +1 -1
- package/dest/zkPassportVerifierAddress.js +1 -1
- package/package.json +27 -13
- package/src/client.ts +1 -1
- package/src/config.ts +177 -65
- package/src/contracts/empire_base.ts +7 -6
- package/src/contracts/empire_slashing_proposer.ts +18 -8
- package/src/contracts/fee_asset_handler.ts +1 -1
- package/src/contracts/governance.ts +3 -3
- package/src/contracts/governance_proposer.ts +14 -9
- package/src/contracts/multicall.ts +12 -10
- package/src/contracts/rollup.ts +170 -171
- package/src/contracts/slasher_contract.ts +22 -0
- package/src/contracts/tally_slashing_proposer.ts +63 -12
- package/src/deploy_l1_contracts.ts +610 -337
- package/src/forwarder_proxy.ts +108 -0
- package/src/l1_artifacts.ts +14 -6
- package/src/l1_contract_addresses.ts +17 -26
- package/src/l1_reader.ts +17 -9
- package/src/l1_tx_utils/README.md +177 -0
- package/src/l1_tx_utils/config.ts +161 -0
- package/src/l1_tx_utils/constants.ts +18 -0
- package/src/l1_tx_utils/factory.ts +64 -0
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +119 -0
- package/src/l1_tx_utils/index-blobs.ts +2 -0
- package/src/l1_tx_utils/index.ts +12 -0
- package/src/l1_tx_utils/interfaces.ts +86 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +738 -0
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +77 -0
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +557 -0
- package/src/l1_tx_utils/signer.ts +28 -0
- package/src/l1_tx_utils/types.ts +85 -0
- package/src/l1_tx_utils/utils.ts +16 -0
- package/src/publisher_manager.ts +51 -9
- package/src/queries.ts +16 -8
- package/src/test/chain_monitor.ts +118 -36
- package/src/test/delayed_tx_utils.ts +2 -2
- package/src/test/eth_cheat_codes.ts +149 -30
- package/src/test/rollup_cheat_codes.ts +94 -52
- package/src/test/start_anvil.ts +2 -0
- package/src/test/tx_delayer.ts +4 -2
- package/src/test/upgrade_utils.ts +3 -2
- package/src/types.ts +62 -0
- package/src/utils.ts +12 -184
- package/src/zkPassportVerifierAddress.ts +1 -1
- package/dest/index.d.ts +0 -18
- package/dest/index.d.ts.map +0 -1
- package/dest/index.js +0 -17
- package/dest/l1_tx_utils.d.ts +0 -250
- package/dest/l1_tx_utils.d.ts.map +0 -1
- package/dest/l1_tx_utils.js +0 -826
- package/dest/l1_tx_utils_with_blobs.d.ts +0 -19
- package/dest/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils_with_blobs.js +0 -85
- package/src/index.ts +0 -17
- package/src/l1_tx_utils.ts +0 -1105
- package/src/l1_tx_utils_with_blobs.ts +0 -144
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { L1TxRequest } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import type { ViemClient } from '@aztec/ethereum/types';
|
|
3
|
+
import { tryExtractEvent } from '@aztec/ethereum/utils';
|
|
4
|
+
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
5
|
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
3
6
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
7
|
import { Signature } from '@aztec/foundation/eth-signature';
|
|
8
|
+
import { hexToBuffer } from '@aztec/foundation/string';
|
|
5
9
|
import { TallySlashingProposerAbi } from '@aztec/l1-artifacts/TallySlashingProposerAbi';
|
|
6
10
|
|
|
7
|
-
import EventEmitter from 'events';
|
|
8
11
|
import {
|
|
9
12
|
type GetContractReturnType,
|
|
10
13
|
type Hex,
|
|
@@ -18,7 +21,7 @@ import {
|
|
|
18
21
|
* Wrapper around the TallySlashingProposer contract that provides
|
|
19
22
|
* a TypeScript interface for interacting with the consensus-based slashing system.
|
|
20
23
|
*/
|
|
21
|
-
export class TallySlashingProposerContract
|
|
24
|
+
export class TallySlashingProposerContract {
|
|
22
25
|
private readonly contract: GetContractReturnType<typeof TallySlashingProposerAbi, ViemClient>;
|
|
23
26
|
|
|
24
27
|
public readonly type = 'tally' as const;
|
|
@@ -27,7 +30,6 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
27
30
|
public readonly client: ViemClient,
|
|
28
31
|
address: Hex | EthAddress,
|
|
29
32
|
) {
|
|
30
|
-
super();
|
|
31
33
|
this.contract = getContract({
|
|
32
34
|
address: typeof address === 'string' ? address : address.toString(),
|
|
33
35
|
abi: TallySlashingProposerAbi,
|
|
@@ -86,11 +88,20 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
86
88
|
*/
|
|
87
89
|
public async getRound(round: bigint): Promise<{
|
|
88
90
|
isExecuted: boolean;
|
|
89
|
-
readyToExecute: boolean;
|
|
90
91
|
voteCount: bigint;
|
|
91
92
|
}> {
|
|
92
|
-
const [isExecuted,
|
|
93
|
-
return { isExecuted,
|
|
93
|
+
const [isExecuted, voteCount] = await this.contract.read.getRound([round]);
|
|
94
|
+
return { isExecuted, voteCount };
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Check if a round is ready to execute at a given slot
|
|
99
|
+
* @param round - The round number to check
|
|
100
|
+
* @param slot - The slot number to check at
|
|
101
|
+
* @returns Whether the round is ready to execute
|
|
102
|
+
*/
|
|
103
|
+
public async isRoundReadyToExecute(round: bigint, slot: SlotNumber): Promise<boolean> {
|
|
104
|
+
return await this.contract.read.isRoundReadyToExecute([round, BigInt(slot)]);
|
|
94
105
|
}
|
|
95
106
|
|
|
96
107
|
/** Returns the slash actions and payload address for a given round (zero if no slash actions) */
|
|
@@ -141,7 +152,7 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
141
152
|
*/
|
|
142
153
|
public async buildVoteRequestFromSigner(
|
|
143
154
|
votes: Hex,
|
|
144
|
-
slot:
|
|
155
|
+
slot: SlotNumber,
|
|
145
156
|
signer: (msg: TypedDataDefinition) => Promise<Hex>,
|
|
146
157
|
): Promise<L1TxRequest> {
|
|
147
158
|
const typedData = this.buildVoteTypedData(votes, slot);
|
|
@@ -158,7 +169,7 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
158
169
|
}
|
|
159
170
|
|
|
160
171
|
/** Returns the typed data definition to EIP712-sign for voting */
|
|
161
|
-
public buildVoteTypedData(votes: Hex, slot:
|
|
172
|
+
public buildVoteTypedData(votes: Hex, slot: SlotNumber): TypedDataDefinition {
|
|
162
173
|
const domain = {
|
|
163
174
|
name: 'TallySlashingProposer',
|
|
164
175
|
version: '1',
|
|
@@ -179,12 +190,12 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
179
190
|
],
|
|
180
191
|
};
|
|
181
192
|
|
|
182
|
-
return { domain, types, primaryType: 'Vote', message: { votes, slot } };
|
|
193
|
+
return { domain, types, primaryType: 'Vote', message: { votes, slot: BigInt(slot) } };
|
|
183
194
|
}
|
|
184
195
|
|
|
185
196
|
/** Gets the digest to sign for voting directly from the contract */
|
|
186
|
-
public async getVoteDataDigest(votes: Hex, slot:
|
|
187
|
-
return Buffer32.fromString(await this.contract.read.getVoteSignatureDigest([votes, slot]));
|
|
197
|
+
public async getVoteDataDigest(votes: Hex, slot: SlotNumber): Promise<Buffer32> {
|
|
198
|
+
return Buffer32.fromString(await this.contract.read.getVoteSignatureDigest([votes, BigInt(slot)]));
|
|
188
199
|
}
|
|
189
200
|
|
|
190
201
|
/**
|
|
@@ -221,6 +232,21 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
221
232
|
};
|
|
222
233
|
}
|
|
223
234
|
|
|
235
|
+
/** Returns the last vote emitted for a given round */
|
|
236
|
+
public async getLastVote(round: bigint) {
|
|
237
|
+
const { voteCount } = await this.getRound(round);
|
|
238
|
+
const validators = (await this.contract.simulate.getSlashTargetCommittees([round])).result.flat();
|
|
239
|
+
const vote = await this.contract.read.getVotes([round, voteCount - 1n]);
|
|
240
|
+
const decoded = decodeSlashConsensusVotes(hexToBuffer(vote));
|
|
241
|
+
const slashAmounts = await this.getSlashingAmounts();
|
|
242
|
+
return decoded
|
|
243
|
+
.map((units, i) => ({
|
|
244
|
+
validator: EthAddress.fromString(validators[i]),
|
|
245
|
+
slashAmount: slashAmounts[units - 1] ?? 0n,
|
|
246
|
+
}))
|
|
247
|
+
.filter(v => v.slashAmount > 0n);
|
|
248
|
+
}
|
|
249
|
+
|
|
224
250
|
/**
|
|
225
251
|
* Listen for VoteCast events
|
|
226
252
|
* @param callback - Callback function to handle vote cast events
|
|
@@ -265,3 +291,28 @@ export class TallySlashingProposerContract extends EventEmitter {
|
|
|
265
291
|
);
|
|
266
292
|
}
|
|
267
293
|
}
|
|
294
|
+
|
|
295
|
+
/**
|
|
296
|
+
* Decodes a Buffer containing slash votes back into an array of numbers.
|
|
297
|
+
* Each vote is represented as a 2-bit value (0, 1, 2, or 3) representing slashing units.
|
|
298
|
+
* @dev This should live in stdlib next to encodeSlashConsensusVotes but is here since we
|
|
299
|
+
* do not have a dependency to stdlib from the ethereum package. We need a larger refactor to fix this.
|
|
300
|
+
* @param buffer - The Buffer containing encoded slash votes
|
|
301
|
+
* @returns An array of numbers representing the slash votes
|
|
302
|
+
*/
|
|
303
|
+
export function decodeSlashConsensusVotes(buffer: Buffer): number[] {
|
|
304
|
+
const votes: number[] = [];
|
|
305
|
+
for (let i = 0; i < buffer.length; i++) {
|
|
306
|
+
const voteByte = buffer.readUInt8(i);
|
|
307
|
+
// Decode votes from Solidity's bit order (LSB to MSB)
|
|
308
|
+
// Bits 0-1: validator at index i*4
|
|
309
|
+
// Bits 2-3: validator at index i*4+1
|
|
310
|
+
// Bits 4-5: validator at index i*4+2
|
|
311
|
+
// Bits 6-7: validator at index i*4+3
|
|
312
|
+
votes.push((voteByte >> 0) & 0x03);
|
|
313
|
+
votes.push((voteByte >> 2) & 0x03);
|
|
314
|
+
votes.push((voteByte >> 4) & 0x03);
|
|
315
|
+
votes.push((voteByte >> 6) & 0x03);
|
|
316
|
+
}
|
|
317
|
+
return votes;
|
|
318
|
+
}
|