@aztec/ethereum 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df
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/client.d.ts +25 -3
- package/dest/client.d.ts.map +1 -1
- package/dest/client.js +60 -8
- package/dest/config.d.ts +29 -8
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +68 -13
- package/dest/contracts/chain_state_override.d.ts +78 -0
- package/dest/contracts/chain_state_override.d.ts.map +1 -0
- package/dest/contracts/chain_state_override.js +137 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts +105 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
- package/dest/contracts/fee_asset_price_oracle.js +656 -0
- package/dest/contracts/governance.d.ts +108 -33
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +196 -15
- package/dest/contracts/governance_proposer.d.ts +33 -1
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +53 -2
- package/dest/contracts/gse.d.ts +4 -2
- package/dest/contracts/gse.d.ts.map +1 -1
- package/dest/contracts/gse.js +2 -2
- package/dest/contracts/inbox.d.ts +3 -3
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +12 -7
- package/dest/contracts/index.d.ts +4 -3
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +3 -2
- package/dest/contracts/multicall.d.ts +130 -13
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +203 -94
- package/dest/contracts/outbox.d.ts +27 -4
- package/dest/contracts/outbox.d.ts.map +1 -1
- package/dest/contracts/outbox.js +34 -7
- package/dest/contracts/registry.d.ts +3 -1
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/registry.js +30 -1
- package/dest/contracts/rollup.d.ts +5419 -31
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +400 -75
- package/dest/contracts/{tally_slashing_proposer.d.ts → slashing_proposer.d.ts} +3 -4
- package/dest/contracts/slashing_proposer.d.ts.map +1 -0
- package/dest/contracts/{tally_slashing_proposer.js → slashing_proposer.js} +13 -15
- package/dest/deploy_aztec_l1_contracts.d.ts +19 -12
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +61 -36
- package/dest/deploy_l1_contract.js +3 -3
- package/dest/foundry_binary.d.ts +13 -0
- package/dest/foundry_binary.d.ts.map +1 -0
- package/dest/foundry_binary.js +52 -0
- package/dest/l1_artifacts.d.ts +15524 -15847
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_artifacts.js +9 -24
- package/dest/l1_contract_addresses.d.ts +61 -65
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +101 -82
- package/dest/l1_reader.d.ts +5 -5
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +9 -7
- package/dest/l1_tx_utils/config.d.ts +7 -1
- package/dest/l1_tx_utils/config.d.ts.map +1 -1
- package/dest/l1_tx_utils/config.js +17 -4
- package/dest/l1_tx_utils/factory.d.ts +18 -10
- package/dest/l1_tx_utils/factory.d.ts.map +1 -1
- package/dest/l1_tx_utils/factory.js +17 -7
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
- package/dest/l1_tx_utils/index-blobs.js +2 -2
- package/dest/l1_tx_utils/index.d.ts +2 -1
- package/dest/l1_tx_utils/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/index.js +1 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +23 -4
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_fee_analyzer.js +65 -3
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +26 -7
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +179 -82
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +10 -5
- package/dest/l1_tx_utils/tx_delayer.d.ts +58 -0
- package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
- package/dest/{test → l1_tx_utils}/tx_delayer.js +67 -37
- package/dest/l1_tx_utils/types.d.ts +27 -1
- package/dest/l1_tx_utils/types.d.ts.map +1 -1
- package/dest/l1_tx_utils/types.js +10 -0
- package/dest/publisher_manager.d.ts +34 -8
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +119 -8
- package/dest/queries.d.ts +13 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +69 -4
- package/dest/test/blob_kzg_warmup.d.ts +19 -0
- package/dest/test/blob_kzg_warmup.d.ts.map +1 -0
- package/dest/test/blob_kzg_warmup.js +64 -0
- package/dest/test/chain_monitor.d.ts +55 -4
- package/dest/test/chain_monitor.d.ts.map +1 -1
- package/dest/test/chain_monitor.js +104 -3
- package/dest/test/eth_cheat_codes.d.ts +37 -6
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +89 -41
- package/dest/test/index.d.ts +2 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +1 -2
- package/dest/test/rollup_cheat_codes.d.ts +60 -3
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +86 -7
- package/dest/test/start_anvil.d.ts +23 -3
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +182 -32
- package/dest/test/upgrade_utils.js +2 -2
- package/dest/utils.d.ts +9 -2
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +48 -16
- package/package.json +6 -9
- package/src/client.ts +66 -2
- package/src/config.ts +96 -17
- package/src/contracts/chain_state_override.ts +200 -0
- package/src/contracts/fee_asset_price_oracle.ts +285 -0
- package/src/contracts/governance.ts +269 -12
- package/src/contracts/governance_proposer.ts +54 -1
- package/src/contracts/gse.ts +7 -2
- package/src/contracts/inbox.ts +13 -5
- package/src/contracts/index.ts +3 -2
- package/src/contracts/multicall.ts +247 -106
- package/src/contracts/outbox.ts +42 -8
- package/src/contracts/registry.ts +31 -1
- package/src/contracts/rollup.ts +457 -86
- package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +14 -16
- package/src/deploy_aztec_l1_contracts.ts +88 -47
- package/src/deploy_l1_contract.ts +3 -3
- package/src/foundry_binary.ts +57 -0
- package/src/l1_artifacts.ts +12 -35
- package/src/l1_contract_addresses.ts +120 -94
- package/src/l1_reader.ts +17 -10
- package/src/l1_tx_utils/config.ts +23 -3
- package/src/l1_tx_utils/factory.ts +31 -31
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
- package/src/l1_tx_utils/index-blobs.ts +2 -2
- package/src/l1_tx_utils/index.ts +1 -0
- package/src/l1_tx_utils/l1_fee_analyzer.ts +75 -3
- package/src/l1_tx_utils/l1_tx_utils.ts +164 -62
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +10 -5
- package/src/{test → l1_tx_utils}/tx_delayer.ts +93 -56
- package/src/l1_tx_utils/types.ts +32 -0
- package/src/publisher_manager.ts +143 -12
- package/src/queries.ts +76 -4
- package/src/test/blob_kzg_warmup.ts +65 -0
- package/src/test/chain_monitor.ts +148 -3
- package/src/test/eth_cheat_codes.ts +82 -45
- package/src/test/index.ts +1 -2
- package/src/test/rollup_cheat_codes.ts +115 -6
- package/src/test/start_anvil.ts +212 -32
- package/src/test/upgrade_utils.ts +2 -2
- package/src/utils.ts +45 -18
- package/dest/contracts/empire_slashing_proposer.d.ts +0 -67
- package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
- package/dest/contracts/empire_slashing_proposer.js +0 -207
- package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
- package/dest/generated/l1-contracts-defaults.d.ts +0 -30
- package/dest/generated/l1-contracts-defaults.d.ts.map +0 -1
- package/dest/generated/l1-contracts-defaults.js +0 -30
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
- package/dest/test/delayed_tx_utils.d.ts +0 -13
- package/dest/test/delayed_tx_utils.d.ts.map +0 -1
- package/dest/test/delayed_tx_utils.js +0 -28
- package/dest/test/tx_delayer.d.ts +0 -36
- package/dest/test/tx_delayer.d.ts.map +0 -1
- package/src/contracts/empire_slashing_proposer.ts +0 -259
- package/src/generated/l1-contracts-defaults.ts +0 -32
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
- package/src/test/delayed_tx_utils.ts +0 -52
package/dest/contracts/rollup.js
CHANGED
|
@@ -376,25 +376,20 @@ import { Buffer32 } from '@aztec/foundation/buffer';
|
|
|
376
376
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
377
377
|
import { memoize } from '@aztec/foundation/decorators';
|
|
378
378
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
379
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
379
380
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
381
|
+
import { getErrorCause } from '@aztec/foundation/types';
|
|
380
382
|
import { EscapeHatchAbi } from '@aztec/l1-artifacts/EscapeHatchAbi';
|
|
381
383
|
import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
|
|
382
384
|
import { RollupStorage } from '@aztec/l1-artifacts/RollupStorage';
|
|
383
385
|
import chunk from 'lodash.chunk';
|
|
384
|
-
import { encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
|
|
386
|
+
import { ContractFunctionRevertedError, RpcRequestError, decodeErrorResult, encodeAbiParameters, encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
|
|
385
387
|
import { getPublicClient } from '../client.js';
|
|
386
388
|
import { formatViemError } from '../utils.js';
|
|
387
|
-
import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
|
|
388
389
|
import { GSEContract } from './gse.js';
|
|
389
390
|
import { SlasherContract } from './slasher_contract.js';
|
|
390
|
-
import {
|
|
391
|
+
import { SlashingProposerContract } from './slashing_proposer.js';
|
|
391
392
|
import { checkBlockTag } from './utils.js';
|
|
392
|
-
export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
|
|
393
|
-
SlashingProposerType[SlashingProposerType["None"] = 0] = "None";
|
|
394
|
-
SlashingProposerType[SlashingProposerType["Tally"] = 1] = "Tally";
|
|
395
|
-
SlashingProposerType[SlashingProposerType["Empire"] = 2] = "Empire";
|
|
396
|
-
return SlashingProposerType;
|
|
397
|
-
}({});
|
|
398
393
|
/**
|
|
399
394
|
* Status of a validator/attester in the staking system.
|
|
400
395
|
* Matches the Status enum in StakingLib.sol
|
|
@@ -405,6 +400,37 @@ export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
|
|
|
405
400
|
AttesterStatus[AttesterStatus["EXITING"] = 3] = "EXITING";
|
|
406
401
|
return AttesterStatus;
|
|
407
402
|
}({});
|
|
403
|
+
/** Field offsets within the CompressedTempCheckpointLog struct in Solidity storage. */ export var TempCheckpointLogField = /*#__PURE__*/ function(TempCheckpointLogField) {
|
|
404
|
+
TempCheckpointLogField[TempCheckpointLogField["HeaderHash"] = 0] = "HeaderHash";
|
|
405
|
+
TempCheckpointLogField[TempCheckpointLogField["BlobCommitmentsHash"] = 1] = "BlobCommitmentsHash";
|
|
406
|
+
TempCheckpointLogField[TempCheckpointLogField["OutHash"] = 2] = "OutHash";
|
|
407
|
+
TempCheckpointLogField[TempCheckpointLogField["AttestationsHash"] = 3] = "AttestationsHash";
|
|
408
|
+
TempCheckpointLogField[TempCheckpointLogField["PayloadDigest"] = 4] = "PayloadDigest";
|
|
409
|
+
TempCheckpointLogField[TempCheckpointLogField["SlotNumber"] = 5] = "SlotNumber";
|
|
410
|
+
TempCheckpointLogField[TempCheckpointLogField["FeeHeader"] = 6] = "FeeHeader";
|
|
411
|
+
return TempCheckpointLogField;
|
|
412
|
+
}({});
|
|
413
|
+
const INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR = 'ValidatorSelection__InsufficientValidatorSetSize';
|
|
414
|
+
function isValidatorSelectionError(err, errorName) {
|
|
415
|
+
return getErrorCause(err, ContractFunctionRevertedError)?.data?.errorName === errorName || decodeRpcRequestErrorName(err) === errorName;
|
|
416
|
+
}
|
|
417
|
+
function decodeRpcRequestErrorName(err) {
|
|
418
|
+
const data = getErrorCause(err, RpcRequestError)?.data;
|
|
419
|
+
if (!isHexString(data)) {
|
|
420
|
+
return undefined;
|
|
421
|
+
}
|
|
422
|
+
try {
|
|
423
|
+
return decodeErrorResult({
|
|
424
|
+
abi: RollupAbi,
|
|
425
|
+
data
|
|
426
|
+
}).errorName;
|
|
427
|
+
} catch {
|
|
428
|
+
return undefined;
|
|
429
|
+
}
|
|
430
|
+
}
|
|
431
|
+
function isHexString(value) {
|
|
432
|
+
return typeof value === 'string' && value.startsWith('0x');
|
|
433
|
+
}
|
|
408
434
|
export class RollupContract {
|
|
409
435
|
client;
|
|
410
436
|
static{
|
|
@@ -499,6 +525,16 @@ export class RollupContract {
|
|
|
499
525
|
2,
|
|
500
526
|
"getGenesisArchiveTreeRoot"
|
|
501
527
|
],
|
|
528
|
+
[
|
|
529
|
+
memoize,
|
|
530
|
+
2,
|
|
531
|
+
"getVkTreeRoot"
|
|
532
|
+
],
|
|
533
|
+
[
|
|
534
|
+
memoize,
|
|
535
|
+
2,
|
|
536
|
+
"getProtocolContractsHash"
|
|
537
|
+
],
|
|
502
538
|
[
|
|
503
539
|
memoize,
|
|
504
540
|
2,
|
|
@@ -507,6 +543,7 @@ export class RollupContract {
|
|
|
507
543
|
], []));
|
|
508
544
|
}
|
|
509
545
|
rollup;
|
|
546
|
+
logger;
|
|
510
547
|
static cachedStfStorageSlot;
|
|
511
548
|
cachedEscapeHatch;
|
|
512
549
|
static get checkBlobStorageSlot() {
|
|
@@ -525,12 +562,12 @@ export class RollupContract {
|
|
|
525
562
|
}
|
|
526
563
|
static getFromConfig(config) {
|
|
527
564
|
const client = getPublicClient(config);
|
|
528
|
-
const address = config.
|
|
565
|
+
const address = config.rollupAddress.toString();
|
|
529
566
|
return new RollupContract(client, address);
|
|
530
567
|
}
|
|
531
568
|
constructor(client, address){
|
|
532
569
|
this.client = client;
|
|
533
|
-
_initProto(this);
|
|
570
|
+
this.logger = (_initProto(this), createLogger('ethereum:rollup'));
|
|
534
571
|
if (address instanceof EthAddress) {
|
|
535
572
|
address = address.toString();
|
|
536
573
|
}
|
|
@@ -555,34 +592,10 @@ export class RollupContract {
|
|
|
555
592
|
return undefined;
|
|
556
593
|
}
|
|
557
594
|
const proposerAddress = await slasher.getProposer();
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
type: 'function',
|
|
561
|
-
name: 'SLASHING_PROPOSER_TYPE',
|
|
562
|
-
inputs: [],
|
|
563
|
-
outputs: [
|
|
564
|
-
{
|
|
565
|
-
name: '',
|
|
566
|
-
type: 'uint8',
|
|
567
|
-
internalType: 'enum SlasherFlavor'
|
|
568
|
-
}
|
|
569
|
-
],
|
|
570
|
-
stateMutability: 'view'
|
|
571
|
-
}
|
|
572
|
-
];
|
|
573
|
-
const proposer = getContract({
|
|
574
|
-
address: proposerAddress.toString(),
|
|
575
|
-
abi: proposerAbi,
|
|
576
|
-
client: this.client
|
|
577
|
-
});
|
|
578
|
-
const proposerType = await proposer.read.SLASHING_PROPOSER_TYPE();
|
|
579
|
-
if (proposerType === 1..valueOf()) {
|
|
580
|
-
return new TallySlashingProposerContract(this.client, proposerAddress);
|
|
581
|
-
} else if (proposerType === 2..valueOf()) {
|
|
582
|
-
return new EmpireSlashingProposerContract(this.client, proposerAddress);
|
|
583
|
-
} else {
|
|
584
|
-
throw new Error(`Unknown slashing proposer type: ${proposerType}`);
|
|
595
|
+
if (proposerAddress.isZero()) {
|
|
596
|
+
return undefined;
|
|
585
597
|
}
|
|
598
|
+
return new SlashingProposerContract(this.client, proposerAddress);
|
|
586
599
|
}
|
|
587
600
|
getL1StartBlock() {
|
|
588
601
|
return this.rollup.read.L1_BLOCK_AT_GENESIS();
|
|
@@ -640,18 +653,35 @@ export class RollupContract {
|
|
|
640
653
|
0n
|
|
641
654
|
]));
|
|
642
655
|
}
|
|
656
|
+
async getVkTreeRoot() {
|
|
657
|
+
const slot = BigInt(RollupContract.stfStorageSlot) + 3n;
|
|
658
|
+
const value = await this.client.getStorageAt({
|
|
659
|
+
address: this.address,
|
|
660
|
+
slot: `0x${slot.toString(16)}`
|
|
661
|
+
});
|
|
662
|
+
return Fr.fromString(value ?? '0x0');
|
|
663
|
+
}
|
|
664
|
+
async getProtocolContractsHash() {
|
|
665
|
+
const slot = BigInt(RollupContract.stfStorageSlot) + 4n;
|
|
666
|
+
const value = await this.client.getStorageAt({
|
|
667
|
+
address: this.address,
|
|
668
|
+
slot: `0x${slot.toString(16)}`
|
|
669
|
+
});
|
|
670
|
+
return Fr.fromString(value ?? '0x0');
|
|
671
|
+
}
|
|
643
672
|
/**
|
|
644
673
|
* Returns rollup constants used for epoch queries.
|
|
645
674
|
* Return type is `L1RollupConstants` which is defined in stdlib,
|
|
646
675
|
* so we cant reference it until we move this contract to that package.
|
|
647
676
|
*/ async getRollupConstants() {
|
|
648
|
-
const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize] = await Promise.all([
|
|
677
|
+
const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize, rollupManaLimit] = await Promise.all([
|
|
649
678
|
this.getL1StartBlock(),
|
|
650
679
|
this.getL1GenesisTime(),
|
|
651
680
|
this.getSlotDuration(),
|
|
652
681
|
this.getEpochDuration(),
|
|
653
682
|
this.getProofSubmissionEpochs(),
|
|
654
|
-
this.getTargetCommitteeSize()
|
|
683
|
+
this.getTargetCommitteeSize(),
|
|
684
|
+
this.getManaLimit()
|
|
655
685
|
]);
|
|
656
686
|
return {
|
|
657
687
|
l1StartBlock,
|
|
@@ -659,7 +689,8 @@ export class RollupContract {
|
|
|
659
689
|
slotDuration,
|
|
660
690
|
epochDuration: Number(epochDuration),
|
|
661
691
|
proofSubmissionEpochs: Number(proofSubmissionEpochs),
|
|
662
|
-
targetCommitteeSize
|
|
692
|
+
targetCommitteeSize,
|
|
693
|
+
rollupManaLimit: Number(rollupManaLimit)
|
|
663
694
|
};
|
|
664
695
|
}
|
|
665
696
|
async getSlasherAddress() {
|
|
@@ -705,7 +736,11 @@ export class RollupContract {
|
|
|
705
736
|
BigInt(epoch)
|
|
706
737
|
]);
|
|
707
738
|
return isOpen;
|
|
708
|
-
} catch
|
|
739
|
+
} catch (err) {
|
|
740
|
+
this.logger.warn('isEscapeHatchOpen failed (treating as closed); RPC or contract error may cause liveness risk', {
|
|
741
|
+
epoch: Number(epoch),
|
|
742
|
+
error: err
|
|
743
|
+
});
|
|
709
744
|
return false;
|
|
710
745
|
}
|
|
711
746
|
}
|
|
@@ -721,8 +756,9 @@ export class RollupContract {
|
|
|
721
756
|
async getOwner() {
|
|
722
757
|
return EthAddress.fromString(await this.rollup.read.owner());
|
|
723
758
|
}
|
|
724
|
-
async getActiveAttesterCount() {
|
|
725
|
-
|
|
759
|
+
async getActiveAttesterCount(options) {
|
|
760
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
761
|
+
return Number(await this.rollup.read.getActiveAttesterCount(options));
|
|
726
762
|
}
|
|
727
763
|
async getSlashingProposerAddress() {
|
|
728
764
|
const slasher = await this.getSlasherContract();
|
|
@@ -734,24 +770,40 @@ export class RollupContract {
|
|
|
734
770
|
getCheckpointReward() {
|
|
735
771
|
return this.rollup.read.getCheckpointReward();
|
|
736
772
|
}
|
|
737
|
-
async getCheckpointNumber() {
|
|
738
|
-
|
|
773
|
+
async getCheckpointNumber(options) {
|
|
774
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
775
|
+
return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber(options));
|
|
739
776
|
}
|
|
740
|
-
async getProvenCheckpointNumber() {
|
|
741
|
-
|
|
777
|
+
async getProvenCheckpointNumber(options) {
|
|
778
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
779
|
+
return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber(options));
|
|
742
780
|
}
|
|
743
|
-
async getSlotNumber() {
|
|
744
|
-
|
|
781
|
+
async getSlotNumber(options) {
|
|
782
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
783
|
+
return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot(options));
|
|
745
784
|
}
|
|
746
|
-
async getL1FeesAt(timestamp) {
|
|
785
|
+
async getL1FeesAt(timestamp, options) {
|
|
786
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
747
787
|
const result = await this.rollup.read.getL1FeesAt([
|
|
748
788
|
timestamp
|
|
749
|
-
]);
|
|
789
|
+
], options);
|
|
750
790
|
return {
|
|
751
791
|
baseFee: result.baseFee,
|
|
752
792
|
blobFee: result.blobFee
|
|
753
793
|
};
|
|
754
794
|
}
|
|
795
|
+
async getFeeHeader(checkpointNumber) {
|
|
796
|
+
const result = await this.rollup.read.getFeeHeader([
|
|
797
|
+
checkpointNumber
|
|
798
|
+
]);
|
|
799
|
+
return {
|
|
800
|
+
excessMana: result.excessMana,
|
|
801
|
+
manaUsed: result.manaUsed,
|
|
802
|
+
ethPerFeeAsset: result.ethPerFeeAsset,
|
|
803
|
+
congestionCost: result.congestionCost,
|
|
804
|
+
proverCost: result.proverCost
|
|
805
|
+
};
|
|
806
|
+
}
|
|
755
807
|
getEthPerFeeAsset() {
|
|
756
808
|
return this.rollup.read.getEthPerFeeAsset();
|
|
757
809
|
}
|
|
@@ -764,7 +816,7 @@ export class RollupContract {
|
|
|
764
816
|
timestamp
|
|
765
817
|
]
|
|
766
818
|
}).catch((e)=>{
|
|
767
|
-
if (e
|
|
819
|
+
if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
|
|
768
820
|
return {
|
|
769
821
|
result: undefined
|
|
770
822
|
};
|
|
@@ -791,7 +843,7 @@ export class RollupContract {
|
|
|
791
843
|
functionName: 'getCurrentEpochCommittee',
|
|
792
844
|
args: []
|
|
793
845
|
}).catch((e)=>{
|
|
794
|
-
if (e
|
|
846
|
+
if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
|
|
795
847
|
return {
|
|
796
848
|
result: undefined
|
|
797
849
|
};
|
|
@@ -820,10 +872,11 @@ export class RollupContract {
|
|
|
820
872
|
});
|
|
821
873
|
return EthAddress.fromString(result);
|
|
822
874
|
}
|
|
823
|
-
async getCheckpoint(checkpointNumber) {
|
|
875
|
+
async getCheckpoint(checkpointNumber, options) {
|
|
876
|
+
await checkBlockTag(options?.blockNumber, this.client);
|
|
824
877
|
const result = await this.rollup.read.getCheckpoint([
|
|
825
878
|
BigInt(checkpointNumber)
|
|
826
|
-
]);
|
|
879
|
+
], options);
|
|
827
880
|
return {
|
|
828
881
|
archive: Fr.fromString(result.archive),
|
|
829
882
|
headerHash: Buffer32.fromString(result.headerHash),
|
|
@@ -853,6 +906,28 @@ export class RollupContract {
|
|
|
853
906
|
0.5
|
|
854
907
|
]));
|
|
855
908
|
}
|
|
909
|
+
/**
|
|
910
|
+
* Returns the effective pending checkpoint, accounting for potential prunes.
|
|
911
|
+
* When a prune can happen, the L1 contract uses the proven checkpoint instead of the pending one.
|
|
912
|
+
* This mirrors the behavior of getEffectivePendingCheckpointNumber in STFLib.sol.
|
|
913
|
+
* @param atTimestamp - The timestamp to evaluate pruneability at. Defaults to the current L1 block timestamp.
|
|
914
|
+
* @param options - Optional L1 block number to pin the queries to.
|
|
915
|
+
*/ getEffectivePendingCheckpoint(atTimestamp, options) {
|
|
916
|
+
return retry(async ()=>{
|
|
917
|
+
const timestamp = atTimestamp ?? (await this.client.getBlock()).timestamp;
|
|
918
|
+
const canPrune = await this.canPruneAtTime(timestamp, options);
|
|
919
|
+
if (canPrune) {
|
|
920
|
+
const provenCheckpointNumber = await this.getProvenCheckpointNumber(options);
|
|
921
|
+
return await this.getCheckpoint(provenCheckpointNumber, options);
|
|
922
|
+
}
|
|
923
|
+
const pendingCheckpointNumber = await this.getCheckpointNumber(options);
|
|
924
|
+
return await this.getCheckpoint(pendingCheckpointNumber, options);
|
|
925
|
+
}, 'getting effective pending checkpoint', makeBackoff([
|
|
926
|
+
0.5,
|
|
927
|
+
0.5,
|
|
928
|
+
0.5
|
|
929
|
+
]));
|
|
930
|
+
}
|
|
856
931
|
async getTips() {
|
|
857
932
|
const { pending, proven } = await this.rollup.read.getTips();
|
|
858
933
|
return {
|
|
@@ -937,9 +1012,8 @@ export class RollupContract {
|
|
|
937
1012
|
* @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
|
|
938
1013
|
* timestamp of the next L1 block
|
|
939
1014
|
* @throws otherwise
|
|
940
|
-
*/ async
|
|
941
|
-
const
|
|
942
|
-
const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
|
|
1015
|
+
*/ async canProposeAt(archive, account, timestamp, stateOverride = []) {
|
|
1016
|
+
const timeOfNextL1Slot = timestamp;
|
|
943
1017
|
const who = typeof account === 'string' ? account : account.address;
|
|
944
1018
|
try {
|
|
945
1019
|
const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
|
|
@@ -952,7 +1026,7 @@ export class RollupContract {
|
|
|
952
1026
|
who
|
|
953
1027
|
],
|
|
954
1028
|
account,
|
|
955
|
-
stateOverride
|
|
1029
|
+
stateOverride
|
|
956
1030
|
});
|
|
957
1031
|
return {
|
|
958
1032
|
slot: SlotNumber.fromBigInt(slot),
|
|
@@ -964,11 +1038,15 @@ export class RollupContract {
|
|
|
964
1038
|
}
|
|
965
1039
|
}
|
|
966
1040
|
/**
|
|
967
|
-
* Returns a state override that sets the pending
|
|
968
|
-
*
|
|
969
|
-
*
|
|
970
|
-
|
|
971
|
-
|
|
1041
|
+
* Returns a state override that sets the pending and/or proven checkpoint numbers. Useful for simulations.
|
|
1042
|
+
* Both values share a single storage slot (pending in the upper 128 bits, proven in the lower 128 bits), so
|
|
1043
|
+
* a single combined override is emitted to avoid the second state-diff clobbering the first. The current live
|
|
1044
|
+
* value is read once to preserve any half not being overridden. Returns an empty override if neither is set.
|
|
1045
|
+
*
|
|
1046
|
+
* Throws if the resulting `proven > pending`, which would crash the simulation: `STFLib.canPruneAtTime` calls
|
|
1047
|
+
* `getEpochForCheckpoint(proven + 1)` whenever `pending != proven`, and that asserts `_n <= tips.pending`.
|
|
1048
|
+
*/ async makeChainTipsOverride(override) {
|
|
1049
|
+
if (override.pending === undefined && override.proven === undefined) {
|
|
972
1050
|
return [];
|
|
973
1051
|
}
|
|
974
1052
|
const slot = RollupContract.stfStorageSlot;
|
|
@@ -976,8 +1054,15 @@ export class RollupContract {
|
|
|
976
1054
|
address: this.address,
|
|
977
1055
|
slot
|
|
978
1056
|
});
|
|
979
|
-
const
|
|
980
|
-
const
|
|
1057
|
+
const currentRaw = currentValue ? hexToBigInt(currentValue) : 0n;
|
|
1058
|
+
const currentPending = currentRaw >> 128n;
|
|
1059
|
+
const currentProven = currentRaw & (1n << 128n) - 1n;
|
|
1060
|
+
const newPending = override.pending !== undefined ? BigInt(override.pending) : currentPending;
|
|
1061
|
+
const newProven = override.proven !== undefined ? BigInt(override.proven) : currentProven;
|
|
1062
|
+
if (newProven > newPending) {
|
|
1063
|
+
throw new Error(`Invalid chain tips override: proven (${newProven}) > pending (${newPending})`);
|
|
1064
|
+
}
|
|
1065
|
+
const newValue = newPending << 128n | newProven;
|
|
981
1066
|
return [
|
|
982
1067
|
{
|
|
983
1068
|
address: this.address,
|
|
@@ -990,6 +1075,161 @@ export class RollupContract {
|
|
|
990
1075
|
}
|
|
991
1076
|
];
|
|
992
1077
|
}
|
|
1078
|
+
/**
|
|
1079
|
+
* Returns a state override that patches `tempCheckpointLogs[checkpointNumber]` with every field that
|
|
1080
|
+
* the L1 contract reads during `propose()` for the checkpoint that builds on top of it (proposer
|
|
1081
|
+
* pipelining simulation). Mirrors the writes done by `ProposeLib.addTempCheckpointLog`.
|
|
1082
|
+
*
|
|
1083
|
+
* `blobCommitmentsHash` and `attestationsHash` are intentionally not exposed here — the propose path
|
|
1084
|
+
* never asserts against them, so leaving them at storage zero is harmless.
|
|
1085
|
+
*/ async makeTempCheckpointLogOverride(checkpointNumber, fields) {
|
|
1086
|
+
const constants = await this.getRollupConstants();
|
|
1087
|
+
const slotAt = (field)=>`0x${this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants).toString(16).padStart(64, '0')}`;
|
|
1088
|
+
const word = (v)=>`0x${v.toString(16).padStart(64, '0')}`;
|
|
1089
|
+
const stateDiff = [];
|
|
1090
|
+
if (fields.headerHash) {
|
|
1091
|
+
stateDiff.push({
|
|
1092
|
+
slot: slotAt(0),
|
|
1093
|
+
value: fields.headerHash.toString()
|
|
1094
|
+
});
|
|
1095
|
+
}
|
|
1096
|
+
if (fields.outHash) {
|
|
1097
|
+
stateDiff.push({
|
|
1098
|
+
slot: slotAt(2),
|
|
1099
|
+
value: fields.outHash.toString()
|
|
1100
|
+
});
|
|
1101
|
+
}
|
|
1102
|
+
if (fields.payloadDigest) {
|
|
1103
|
+
stateDiff.push({
|
|
1104
|
+
slot: slotAt(4),
|
|
1105
|
+
value: fields.payloadDigest.toString()
|
|
1106
|
+
});
|
|
1107
|
+
}
|
|
1108
|
+
if (fields.slotNumber !== undefined) {
|
|
1109
|
+
// CompressedSlot is uint32 on L1 (SafeCast.toUint32 reverts on overflow). Match that behavior here
|
|
1110
|
+
// so a malformed override surfaces immediately rather than silently truncating into a wrong slot.
|
|
1111
|
+
const slotNumber = BigInt(fields.slotNumber);
|
|
1112
|
+
if (slotNumber < 0n || slotNumber > 0xffffffffn) {
|
|
1113
|
+
throw new Error(`slotNumber ${slotNumber} does not fit in uint32`);
|
|
1114
|
+
}
|
|
1115
|
+
stateDiff.push({
|
|
1116
|
+
slot: slotAt(5),
|
|
1117
|
+
value: word(slotNumber)
|
|
1118
|
+
});
|
|
1119
|
+
}
|
|
1120
|
+
if (fields.feeHeader) {
|
|
1121
|
+
stateDiff.push({
|
|
1122
|
+
slot: slotAt(6),
|
|
1123
|
+
value: word(RollupContract.compressFeeHeader(fields.feeHeader))
|
|
1124
|
+
});
|
|
1125
|
+
}
|
|
1126
|
+
if (stateDiff.length === 0) {
|
|
1127
|
+
return [];
|
|
1128
|
+
}
|
|
1129
|
+
return [
|
|
1130
|
+
{
|
|
1131
|
+
address: this.address,
|
|
1132
|
+
stateDiff
|
|
1133
|
+
}
|
|
1134
|
+
];
|
|
1135
|
+
}
|
|
1136
|
+
/**
|
|
1137
|
+
* Returns a state override that sets archives[checkpointNumber] to the given archive value.
|
|
1138
|
+
* Used when simulating a canProposeAtTime call where the local archive differs from L1
|
|
1139
|
+
* (e.g. pipelining where the parent checkpoint hasn't landed on L1 yet).
|
|
1140
|
+
*/ makeArchiveOverride(checkpointNumber, archive) {
|
|
1141
|
+
const archivesMappingBase = hexToBigInt(RollupContract.stfStorageSlot) + 1n;
|
|
1142
|
+
const archiveSlot = hexToBigInt(keccak256(encodeAbiParameters([
|
|
1143
|
+
{
|
|
1144
|
+
type: 'uint256'
|
|
1145
|
+
},
|
|
1146
|
+
{
|
|
1147
|
+
type: 'uint256'
|
|
1148
|
+
}
|
|
1149
|
+
], [
|
|
1150
|
+
BigInt(checkpointNumber),
|
|
1151
|
+
archivesMappingBase
|
|
1152
|
+
])));
|
|
1153
|
+
return [
|
|
1154
|
+
{
|
|
1155
|
+
address: this.address,
|
|
1156
|
+
stateDiff: [
|
|
1157
|
+
{
|
|
1158
|
+
slot: `0x${archiveSlot.toString(16).padStart(64, '0')}`,
|
|
1159
|
+
value: archive.toString()
|
|
1160
|
+
}
|
|
1161
|
+
]
|
|
1162
|
+
}
|
|
1163
|
+
];
|
|
1164
|
+
}
|
|
1165
|
+
/** Merges multiple StateOverride arrays, combining stateDiff entries for the same address. */ static mergeStateOverrides(...overrides) {
|
|
1166
|
+
const byAddress = new Map();
|
|
1167
|
+
for (const override of overrides){
|
|
1168
|
+
for (const entry of override){
|
|
1169
|
+
const key = entry.address.toLowerCase();
|
|
1170
|
+
const existing = byAddress.get(key);
|
|
1171
|
+
if (existing) {
|
|
1172
|
+
existing.stateDiff.push(...entry.stateDiff ?? []);
|
|
1173
|
+
if (entry.balance !== undefined) {
|
|
1174
|
+
existing.balance = entry.balance;
|
|
1175
|
+
}
|
|
1176
|
+
} else {
|
|
1177
|
+
byAddress.set(key, {
|
|
1178
|
+
address: entry.address,
|
|
1179
|
+
balance: entry.balance,
|
|
1180
|
+
stateDiff: [
|
|
1181
|
+
...entry.stateDiff ?? []
|
|
1182
|
+
]
|
|
1183
|
+
});
|
|
1184
|
+
}
|
|
1185
|
+
}
|
|
1186
|
+
}
|
|
1187
|
+
return [
|
|
1188
|
+
...byAddress.values()
|
|
1189
|
+
];
|
|
1190
|
+
}
|
|
1191
|
+
/** Compresses a FeeHeader into a uint256 matching FeeHeaderLib.compress() in FeeStructs.sol. */ static compressFeeHeader(feeHeader) {
|
|
1192
|
+
const MASK_48_BITS = (1n << 48n) - 1n;
|
|
1193
|
+
const MASK_64_BITS = (1n << 64n) - 1n;
|
|
1194
|
+
const MASK_63_BITS = (1n << 63n) - 1n;
|
|
1195
|
+
let value = BigInt(feeHeader.manaUsed) & (1n << 32n) - 1n; // bits [0:31]
|
|
1196
|
+
value |= (feeHeader.excessMana < MASK_48_BITS ? feeHeader.excessMana : MASK_48_BITS) << 32n; // bits [32:79]
|
|
1197
|
+
value |= (BigInt(feeHeader.ethPerFeeAsset) & MASK_48_BITS) << 80n; // bits [80:127]
|
|
1198
|
+
value |= (feeHeader.congestionCost < MASK_64_BITS ? feeHeader.congestionCost : MASK_64_BITS) << 128n; // bits [128:191]
|
|
1199
|
+
value |= (feeHeader.proverCost < MASK_63_BITS ? feeHeader.proverCost : MASK_63_BITS) << 192n; // bits [192:254]
|
|
1200
|
+
value |= 1n << 255n; // preheat flag
|
|
1201
|
+
return value;
|
|
1202
|
+
}
|
|
1203
|
+
/** Computes the fee header for a child checkpoint given parent fee header and child data.
|
|
1204
|
+
* Must stay in sync with Solidity FeeLib.sol (computeNewEthPerFeeAsset, clampedAdd). */ static computeChildFeeHeader(parentFeeHeader, childManaUsed, feeAssetPriceModifier, manaTarget) {
|
|
1205
|
+
const MIN_ETH_PER_FEE_ASSET = 100n;
|
|
1206
|
+
const MAX_ETH_PER_FEE_ASSET = 100_000_000_000_000n; // 1e14, matches FeeLib.sol
|
|
1207
|
+
// excessMana = clampedAdd(parent.excessMana + parent.manaUsed, -manaTarget)
|
|
1208
|
+
const sum = parentFeeHeader.excessMana + parentFeeHeader.manaUsed;
|
|
1209
|
+
const excessMana = sum > manaTarget ? sum - manaTarget : 0n;
|
|
1210
|
+
// ethPerFeeAsset = computeNewEthPerFeeAsset(max(parent.ethPerFeeAsset, MIN), modifier)
|
|
1211
|
+
const parentPrice = parentFeeHeader.ethPerFeeAsset > MIN_ETH_PER_FEE_ASSET ? parentFeeHeader.ethPerFeeAsset : MIN_ETH_PER_FEE_ASSET;
|
|
1212
|
+
let newPrice;
|
|
1213
|
+
if (feeAssetPriceModifier >= 0n) {
|
|
1214
|
+
newPrice = parentPrice * (10_000n + feeAssetPriceModifier) / 10_000n;
|
|
1215
|
+
} else {
|
|
1216
|
+
const absMod = -feeAssetPriceModifier;
|
|
1217
|
+
newPrice = parentPrice * (10_000n - absMod) / 10_000n;
|
|
1218
|
+
}
|
|
1219
|
+
if (newPrice < MIN_ETH_PER_FEE_ASSET) {
|
|
1220
|
+
newPrice = MIN_ETH_PER_FEE_ASSET;
|
|
1221
|
+
}
|
|
1222
|
+
if (newPrice > MAX_ETH_PER_FEE_ASSET) {
|
|
1223
|
+
newPrice = MAX_ETH_PER_FEE_ASSET;
|
|
1224
|
+
}
|
|
1225
|
+
return {
|
|
1226
|
+
excessMana,
|
|
1227
|
+
manaUsed: childManaUsed,
|
|
1228
|
+
ethPerFeeAsset: newPrice,
|
|
1229
|
+
congestionCost: 0n,
|
|
1230
|
+
proverCost: 0n
|
|
1231
|
+
};
|
|
1232
|
+
}
|
|
993
1233
|
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
|
|
994
1234
|
return {
|
|
995
1235
|
to: this.address,
|
|
@@ -1031,11 +1271,25 @@ export class RollupContract {
|
|
|
1031
1271
|
prover
|
|
1032
1272
|
]);
|
|
1033
1273
|
}
|
|
1034
|
-
getManaMinFeeAt(timestamp, inFeeAsset) {
|
|
1274
|
+
getManaMinFeeAt(timestamp, inFeeAsset, stateOverride) {
|
|
1035
1275
|
return this.rollup.read.getManaMinFeeAt([
|
|
1036
1276
|
timestamp,
|
|
1037
1277
|
inFeeAsset
|
|
1278
|
+
], {
|
|
1279
|
+
stateOverride
|
|
1280
|
+
});
|
|
1281
|
+
}
|
|
1282
|
+
async getManaMinFeeComponentsAt(timestamp, inFeeAsset) {
|
|
1283
|
+
const result = await this.rollup.read.getManaMinFeeComponentsAt([
|
|
1284
|
+
timestamp,
|
|
1285
|
+
inFeeAsset
|
|
1038
1286
|
]);
|
|
1287
|
+
return {
|
|
1288
|
+
sequencerCost: result.sequencerCost,
|
|
1289
|
+
proverCost: result.proverCost,
|
|
1290
|
+
congestionCost: result.congestionCost,
|
|
1291
|
+
congestionMultiplier: result.congestionMultiplier
|
|
1292
|
+
};
|
|
1039
1293
|
}
|
|
1040
1294
|
async getSlotAt(timestamp) {
|
|
1041
1295
|
return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
|
|
@@ -1086,15 +1340,24 @@ export class RollupContract {
|
|
|
1086
1340
|
prover
|
|
1087
1341
|
]);
|
|
1088
1342
|
}
|
|
1089
|
-
async getAttesters() {
|
|
1090
|
-
|
|
1343
|
+
async getAttesters(timestamp) {
|
|
1344
|
+
// Pin every read to a single L1 block so the attester count and the chunked index reads
|
|
1345
|
+
// observe a consistent set. Without this, the count and each chunk default to `latest` and
|
|
1346
|
+
// can straddle a block boundary (or reorg), yielding an inconsistent or truncated set.
|
|
1347
|
+
const block = await this.client.getBlock();
|
|
1348
|
+
const blockNumber = block.number ?? undefined;
|
|
1349
|
+
const ts = timestamp ?? block.timestamp;
|
|
1350
|
+
const attesterSize = await this.getActiveAttesterCount({
|
|
1351
|
+
blockNumber
|
|
1352
|
+
});
|
|
1091
1353
|
const gse = new GSEContract(this.client, await this.getGSE());
|
|
1092
|
-
const ts = (await this.client.getBlock()).timestamp;
|
|
1093
1354
|
const indices = Array.from({
|
|
1094
1355
|
length: attesterSize
|
|
1095
1356
|
}, (_, i)=>BigInt(i));
|
|
1096
1357
|
const chunks = chunk(indices, 1000);
|
|
1097
|
-
const results = await Promise.all(chunks.map((chunk)=>gse.getAttestersFromIndicesAtTime(this.address, ts, chunk
|
|
1358
|
+
const results = await Promise.all(chunks.map((chunk)=>gse.getAttestersFromIndicesAtTime(this.address, ts, chunk, {
|
|
1359
|
+
blockNumber
|
|
1360
|
+
})));
|
|
1098
1361
|
return results.flat().map((addr)=>EthAddress.fromString(addr));
|
|
1099
1362
|
}
|
|
1100
1363
|
async getAttesterView(address) {
|
|
@@ -1195,7 +1458,8 @@ export class RollupContract {
|
|
|
1195
1458
|
const args = log.args;
|
|
1196
1459
|
if (args.checkpointNumber !== undefined) {
|
|
1197
1460
|
callback({
|
|
1198
|
-
checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber)
|
|
1461
|
+
checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber),
|
|
1462
|
+
event: log
|
|
1199
1463
|
});
|
|
1200
1464
|
}
|
|
1201
1465
|
}
|
|
@@ -1226,6 +1490,18 @@ export class RollupContract {
|
|
|
1226
1490
|
}
|
|
1227
1491
|
});
|
|
1228
1492
|
}
|
|
1493
|
+
/**
|
|
1494
|
+
* Fetches OwnershipTransferred events emitted on the L1 block this rollup was deployed on.
|
|
1495
|
+
* The Rollup inherits from Ownable and emits this event in its constructor, so the event
|
|
1496
|
+
* is guaranteed to exist on `l1StartBlock` for any correctly deployed rollup. Used as a
|
|
1497
|
+
* probe to detect RPC nodes that prune historical logs.
|
|
1498
|
+
*/ async getOwnershipTransferredEventsAtDeploy() {
|
|
1499
|
+
const l1StartBlock = await this.getL1StartBlock();
|
|
1500
|
+
return await this.rollup.getEvents.OwnershipTransferred({}, {
|
|
1501
|
+
fromBlock: l1StartBlock,
|
|
1502
|
+
toBlock: l1StartBlock
|
|
1503
|
+
});
|
|
1504
|
+
}
|
|
1229
1505
|
/** Fetches CheckpointProposed events within the given block range. */ async getCheckpointProposedEvents(fromBlock, toBlock) {
|
|
1230
1506
|
const logs = await this.rollup.getEvents.CheckpointProposed({}, {
|
|
1231
1507
|
fromBlock,
|
|
@@ -1239,9 +1515,58 @@ export class RollupContract {
|
|
|
1239
1515
|
checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber),
|
|
1240
1516
|
archive: Fr.fromString(log.args.archive),
|
|
1241
1517
|
versionedBlobHashes: log.args.versionedBlobHashes.map((h)=>Buffer.from(h.slice(2), 'hex')),
|
|
1242
|
-
attestationsHash:
|
|
1243
|
-
|
|
1518
|
+
attestationsHash: (()=>{
|
|
1519
|
+
if (!log.args.attestationsHash) {
|
|
1520
|
+
throw new Error(`CheckpointProposed event missing attestationsHash for checkpoint ${log.args.checkpointNumber}`);
|
|
1521
|
+
}
|
|
1522
|
+
return Buffer32.fromString(log.args.attestationsHash);
|
|
1523
|
+
})(),
|
|
1524
|
+
payloadDigest: (()=>{
|
|
1525
|
+
if (!log.args.payloadDigest) {
|
|
1526
|
+
throw new Error(`CheckpointProposed event missing payloadDigest for checkpoint ${log.args.checkpointNumber}`);
|
|
1527
|
+
}
|
|
1528
|
+
return Buffer32.fromString(log.args.payloadDigest);
|
|
1529
|
+
})()
|
|
1244
1530
|
}
|
|
1245
1531
|
}));
|
|
1246
1532
|
}
|
|
1533
|
+
/** Packs pending and proven checkpoint numbers into the chain tips storage format. */ static packChainTips(pendingCheckpointNumber, provenCheckpointNumber) {
|
|
1534
|
+
return pendingCheckpointNumber << 128n | provenCheckpointNumber & (1n << 128n) - 1n;
|
|
1535
|
+
}
|
|
1536
|
+
/** Storage slot for the chain tips (offset 0 within the STF storage struct). */ static get chainTipsStorageSlot() {
|
|
1537
|
+
return BigInt(RollupContract.stfStorageSlot);
|
|
1538
|
+
}
|
|
1539
|
+
/**
|
|
1540
|
+
* Computes the storage slot for a field within a tempCheckpointLog entry.
|
|
1541
|
+
* @param checkpointNumber - The checkpoint number
|
|
1542
|
+
* @param field - The field within the CompressedTempCheckpointLog struct
|
|
1543
|
+
*/ async getTempCheckpointLogStorageSlot(checkpointNumber, field) {
|
|
1544
|
+
const [epochDuration, proofSubmissionEpochs] = await Promise.all([
|
|
1545
|
+
this.getEpochDuration(),
|
|
1546
|
+
this.getProofSubmissionEpochs()
|
|
1547
|
+
]);
|
|
1548
|
+
return this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, {
|
|
1549
|
+
epochDuration,
|
|
1550
|
+
proofSubmissionEpochs
|
|
1551
|
+
});
|
|
1552
|
+
}
|
|
1553
|
+
computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants) {
|
|
1554
|
+
const fieldOffset = BigInt(field);
|
|
1555
|
+
const { epochDuration, proofSubmissionEpochs } = constants;
|
|
1556
|
+
const roundaboutSize = BigInt(epochDuration) * (BigInt(proofSubmissionEpochs) + 1n) + 1n;
|
|
1557
|
+
const tempCheckpointLogsBase = BigInt(RollupContract.stfStorageSlot) + 2n;
|
|
1558
|
+
const circularIndex = BigInt(checkpointNumber) % roundaboutSize;
|
|
1559
|
+
const entryBase = BigInt(keccak256(encodeAbiParameters([
|
|
1560
|
+
{
|
|
1561
|
+
type: 'uint256'
|
|
1562
|
+
},
|
|
1563
|
+
{
|
|
1564
|
+
type: 'uint256'
|
|
1565
|
+
}
|
|
1566
|
+
], [
|
|
1567
|
+
circularIndex,
|
|
1568
|
+
tempCheckpointLogsBase
|
|
1569
|
+
])));
|
|
1570
|
+
return entryBase + fieldOffset;
|
|
1571
|
+
}
|
|
1247
1572
|
}
|