@aztec/ethereum 0.76.4-devnet-test-rc3 → 0.76.4

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.
Files changed (15) hide show
  1. package/dest/config.d.ts +2 -2
  2. package/dest/config.d.ts.map +1 -1
  3. package/dest/config.js +6 -6
  4. package/dest/contracts/rollup.d.ts +2 -22
  5. package/dest/contracts/rollup.d.ts.map +1 -1
  6. package/dest/contracts/rollup.js +6 -45
  7. package/dest/deploy_l1_contracts.d.ts +490 -1117
  8. package/dest/deploy_l1_contracts.d.ts.map +1 -1
  9. package/dest/deploy_l1_contracts.js +3 -2
  10. package/dest/queries.js +4 -4
  11. package/package.json +4 -4
  12. package/src/config.ts +7 -6
  13. package/src/contracts/rollup.ts +3 -66
  14. package/src/deploy_l1_contracts.ts +2 -1
  15. package/src/queries.ts +3 -3
package/dest/config.d.ts CHANGED
@@ -10,7 +10,7 @@ export type L1ContractsConfig = {
10
10
  /** The target validator committee size. */
11
11
  aztecTargetCommitteeSize: number;
12
12
  /** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
13
- aztecEpochProofClaimWindowInL2Slots: number;
13
+ aztecProofSubmissionWindow: number;
14
14
  /** The minimum stake for a validator. */
15
15
  minimumStake: bigint;
16
16
  /** The slashing quorum */
@@ -27,7 +27,7 @@ export declare const DefaultL1ContractsConfig: {
27
27
  aztecSlotDuration: number;
28
28
  aztecEpochDuration: number;
29
29
  aztecTargetCommitteeSize: number;
30
- aztecEpochProofClaimWindowInL2Slots: number;
30
+ aztecProofSubmissionWindow: number;
31
31
  minimumStake: bigint;
32
32
  slashingQuorum: number;
33
33
  slashingRoundSize: number;
package/dest/config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;IAC5C,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;CACrC,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;CAWR,CAAC;AAE9B,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAoD3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;CACrC,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;CAWR,CAAC;AAE9B,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAqD3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
package/dest/config.js CHANGED
@@ -5,7 +5,7 @@ export const DefaultL1ContractsConfig = {
5
5
  aztecSlotDuration: 24,
6
6
  aztecEpochDuration: 16,
7
7
  aztecTargetCommitteeSize: 48,
8
- aztecEpochProofClaimWindowInL2Slots: 13,
8
+ aztecProofSubmissionWindow: 32, // you have a full epoch to submit a proof after the epoch to prove ends
9
9
  minimumStake: BigInt(100e18),
10
10
  slashingQuorum: 6,
11
11
  slashingRoundSize: 10,
@@ -33,10 +33,10 @@ export const l1ContractsConfigMappings = {
33
33
  description: 'The target validator committee size.',
34
34
  ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
35
35
  },
36
- aztecEpochProofClaimWindowInL2Slots: {
37
- env: 'AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS',
38
- description: 'The number of L2 slots that we can wait for a proof of an epoch to be produced.',
39
- ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochProofClaimWindowInL2Slots),
36
+ aztecProofSubmissionWindow: {
37
+ env: 'AZTEC_PROOF_SUBMISSION_WINDOW',
38
+ description: 'The number of L2 slots that a proof for an epoch can be submitted in, starting from the beginning of the epoch.',
39
+ ...numberConfigHelper(DefaultL1ContractsConfig.aztecProofSubmissionWindow),
40
40
  },
41
41
  minimumStake: {
42
42
  env: 'AZTEC_MINIMUM_STAKE',
@@ -68,4 +68,4 @@ export const l1ContractsConfigMappings = {
68
68
  export function getL1ContractsConfigEnvVars() {
69
69
  return getConfigFromMappings(l1ContractsConfigMappings);
70
70
  }
71
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsa0JBQWtCLEVBQ2xCLHFCQUFxQixFQUNyQixrQkFBa0IsR0FDbkIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQXdCLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUF5QmpGLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHO0lBQ3RDLG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsaUJBQWlCLEVBQUUsRUFBRTtJQUNyQixrQkFBa0IsRUFBRSxFQUFFO0lBQ3RCLHdCQUF3QixFQUFFLEVBQUU7SUFDNUIsbUNBQW1DLEVBQUUsRUFBRTtJQUN2QyxZQUFZLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUM1QixjQUFjLEVBQUUsQ0FBQztJQUNqQixpQkFBaUIsRUFBRSxFQUFFO0lBQ3JCLHdCQUF3QixFQUFFLENBQUM7SUFDM0IsMkJBQTJCLEVBQUUsRUFBRTtDQUNKLENBQUM7QUFFOUIsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQTBDO0lBQzlFLG9CQUFvQixFQUFFO1FBQ3BCLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLG9DQUFvQztRQUNqRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLG9CQUFvQixDQUFDO0tBQ3JFO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLHFCQUFxQjtRQUMxQixXQUFXLEVBQUUsa0ZBQWtGO1FBQy9GLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsaUJBQWlCLENBQUM7S0FDbEU7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxzRUFBc0U7UUFDbkYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxrQkFBa0IsQ0FBQztLQUNuRTtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw2QkFBNkI7UUFDbEMsV0FBVyxFQUFFLHNDQUFzQztRQUNuRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLHdCQUF3QixDQUFDO0tBQ3pFO0lBQ0QsbUNBQW1DLEVBQUU7UUFDbkMsR0FBRyxFQUFFLDRDQUE0QztRQUNqRCxXQUFXLEVBQUUsaUZBQWlGO1FBQzlGLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsbUNBQW1DLENBQUM7S0FDcEY7SUFDRCxZQUFZLEVBQUU7UUFDWixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSxvQ0FBb0M7UUFDakQsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxZQUFZLENBQUM7S0FDN0Q7SUFDRCxjQUFjLEVBQUU7UUFDZCxHQUFHLEVBQUUsdUJBQXVCO1FBQzVCLFdBQVcsRUFBRSxxQkFBcUI7UUFDbEMsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxjQUFjLENBQUM7S0FDL0Q7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsMkJBQTJCO1FBQ2hDLFdBQVcsRUFBRSx5QkFBeUI7UUFDdEMsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsRTtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSxrQ0FBa0M7UUFDdkMsV0FBVyxFQUFFLGlDQUFpQztRQUM5QyxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLHdCQUF3QixDQUFDO0tBQ3pFO0lBQ0QsMkJBQTJCLEVBQUU7UUFDM0IsR0FBRyxFQUFFLHNDQUFzQztRQUMzQyxXQUFXLEVBQUUscUNBQXFDO1FBQ2xELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsMkJBQTJCLENBQUM7S0FDNUU7SUFDRCxHQUFHLHVCQUF1QjtDQUMzQixDQUFDO0FBRUYsTUFBTSxVQUFVLDJCQUEyQjtJQUN6QyxPQUFPLHFCQUFxQixDQUFDLHlCQUF5QixDQUFDLENBQUM7QUFDMUQsQ0FBQyJ9
71
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsa0JBQWtCLEVBQ2xCLHFCQUFxQixFQUNyQixrQkFBa0IsR0FDbkIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQXdCLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUF5QmpGLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHO0lBQ3RDLG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsaUJBQWlCLEVBQUUsRUFBRTtJQUNyQixrQkFBa0IsRUFBRSxFQUFFO0lBQ3RCLHdCQUF3QixFQUFFLEVBQUU7SUFDNUIsMEJBQTBCLEVBQUUsRUFBRSxFQUFFLHdFQUF3RTtJQUN4RyxZQUFZLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUM1QixjQUFjLEVBQUUsQ0FBQztJQUNqQixpQkFBaUIsRUFBRSxFQUFFO0lBQ3JCLHdCQUF3QixFQUFFLENBQUM7SUFDM0IsMkJBQTJCLEVBQUUsRUFBRTtDQUNKLENBQUM7QUFFOUIsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQTBDO0lBQzlFLG9CQUFvQixFQUFFO1FBQ3BCLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLG9DQUFvQztRQUNqRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLG9CQUFvQixDQUFDO0tBQ3JFO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLHFCQUFxQjtRQUMxQixXQUFXLEVBQUUsa0ZBQWtGO1FBQy9GLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsaUJBQWlCLENBQUM7S0FDbEU7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxzRUFBc0U7UUFDbkYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxrQkFBa0IsQ0FBQztLQUNuRTtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw2QkFBNkI7UUFDbEMsV0FBVyxFQUFFLHNDQUFzQztRQUNuRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLHdCQUF3QixDQUFDO0tBQ3pFO0lBQ0QsMEJBQTBCLEVBQUU7UUFDMUIsR0FBRyxFQUFFLCtCQUErQjtRQUNwQyxXQUFXLEVBQ1QsaUhBQWlIO1FBQ25ILEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsMEJBQTBCLENBQUM7S0FDM0U7SUFDRCxZQUFZLEVBQUU7UUFDWixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSxvQ0FBb0M7UUFDakQsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxZQUFZLENBQUM7S0FDN0Q7SUFDRCxjQUFjLEVBQUU7UUFDZCxHQUFHLEVBQUUsdUJBQXVCO1FBQzVCLFdBQVcsRUFBRSxxQkFBcUI7UUFDbEMsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxjQUFjLENBQUM7S0FDL0Q7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsMkJBQTJCO1FBQ2hDLFdBQVcsRUFBRSx5QkFBeUI7UUFDdEMsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsRTtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSxrQ0FBa0M7UUFDdkMsV0FBVyxFQUFFLGlDQUFpQztRQUM5QyxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLHdCQUF3QixDQUFDO0tBQ3pFO0lBQ0QsMkJBQTJCLEVBQUU7UUFDM0IsR0FBRyxFQUFFLHNDQUFzQztRQUMzQyxXQUFXLEVBQUUscUNBQXFDO1FBQ2xELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsMkJBQTJCLENBQUM7S0FDNUU7SUFDRCxHQUFHLHVCQUF1QjtDQUMzQixDQUFDO0FBRUYsTUFBTSxVQUFVLDJCQUEyQjtJQUN6QyxPQUFPLHFCQUFxQixDQUFDLHlCQUF5QixDQUFDLENBQUM7QUFDMUQsQ0FBQyJ9
package/dest/contracts/rollup.d.ts CHANGED
@@ -8,13 +8,6 @@ import { type L1ContractAddresses } from '../l1_contract_addresses.js';
8
8
  import { type L1ReaderConfig } from '../l1_reader.js';
9
9
  import { SlashingProposerContract } from './slashing_proposer.js';
10
10
  export type L1RollupContractAddresses = Pick<L1ContractAddresses, 'rollupAddress' | 'inboxAddress' | 'outboxAddress' | 'feeJuicePortalAddress' | 'feeJuiceAddress' | 'stakingAssetAddress' | 'rewardDistributorAddress'>;
11
- export type EpochProofQuoteViemArgs = {
12
- epochToProve: bigint;
13
- validUntilSlot: bigint;
14
- bondAmount: bigint;
15
- prover: `0x${string}`;
16
- basisPointFee: number;
17
- };
18
11
  export declare class RollupContract {
19
12
  readonly client: PublicClient<HttpTransport, Chain>;
20
13
  private readonly rollup;
@@ -26,7 +19,7 @@ export declare class RollupContract {
26
19
  getSlashingProposer(): Promise<SlashingProposerContract>;
27
20
  getL1StartBlock(): Promise<bigint>;
28
21
  getL1GenesisTime(): Promise<bigint>;
29
- getClaimDurationInL2Slots(): Promise<bigint>;
22
+ getProofSubmissionWindow(): Promise<bigint>;
30
23
  getEpochDuration(): Promise<bigint>;
31
24
  getSlotDuration(): Promise<bigint>;
32
25
  getTargetCommitteeSize(): Promise<bigint>;
@@ -46,14 +39,12 @@ export declare class RollupContract {
46
39
  excessMana: bigint;
47
40
  feeAssetPriceNumerator: bigint;
48
41
  manaUsed: bigint;
49
- provingCostPerManaNumerator: bigint;
50
42
  congestionCost: bigint;
51
43
  };
52
44
  archive: `0x${string}`;
53
45
  blockHash: `0x${string}`;
54
46
  slotNumber: bigint;
55
47
  }>;
56
- getProofCommitmentEscrow(): Promise<`0x${string}`>;
57
48
  getTips(): Promise<{
58
49
  pendingBlockNumber: bigint;
59
50
  provenBlockNumber: bigint;
@@ -63,6 +54,7 @@ export declare class RollupContract {
63
54
  getRollupAddresses(): Promise<L1RollupContractAddresses>;
64
55
  getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
65
56
  getEpochProofPublicInputs(args: readonly [
57
+ bigint,
66
58
  bigint,
67
59
  readonly [
68
60
  `0x${string}`,
@@ -77,19 +69,7 @@ export declare class RollupContract {
77
69
  `0x${string}`,
78
70
  `0x${string}`
79
71
  ]): Promise<readonly `0x${string}`[]>;
80
- getProofClaim(): Promise<{
81
- epochToProve: bigint;
82
- basisPointFee: bigint;
83
- bondAmount: bigint;
84
- bondProvider: EthAddress;
85
- proposerClaimant: EthAddress;
86
- } | undefined>;
87
- getClaimableEpoch(): Promise<bigint | undefined>;
88
72
  getEpochToProve(): Promise<bigint | undefined>;
89
- validateProofQuote(quote: {
90
- quote: EpochProofQuoteViemArgs;
91
- signature: ViemSignature;
92
- }, account: `0x${string}` | Account, slotDuration: bigint | number): Promise<void>;
93
73
  validateHeader(args: readonly [
94
74
  `0x${string}`,
95
75
  ViemSignature[],
package/dest/contracts/rollup.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
package/dest/contracts/rollup.js CHANGED
@@ -12,7 +12,7 @@ let RollupContract = (() => {
12
12
  let _getSlashingProposer_decorators;
13
13
  let _getL1StartBlock_decorators;
14
14
  let _getL1GenesisTime_decorators;
15
- let _getClaimDurationInL2Slots_decorators;
15
+ let _getProofSubmissionWindow_decorators;
16
16
  let _getEpochDuration_decorators;
17
17
  let _getSlotDuration_decorators;
18
18
  let _getTargetCommitteeSize_decorators;
@@ -56,8 +56,8 @@ let RollupContract = (() => {
56
56
  getL1GenesisTime() {
57
57
  return this.rollup.read.getGenesisTime();
58
58
  }
59
- getClaimDurationInL2Slots() {
60
- return this.rollup.read.CLAIM_DURATION_IN_L2_SLOTS();
59
+ getProofSubmissionWindow() {
60
+ return this.rollup.read.getProofSubmissionWindow();
61
61
  }
62
62
  getEpochDuration() {
63
63
  return this.rollup.read.getEpochDuration();
@@ -110,9 +110,6 @@ let RollupContract = (() => {
110
110
  getBlock(blockNumber) {
111
111
  return this.rollup.read.getBlock([blockNumber]);
112
112
  }
113
- getProofCommitmentEscrow() {
114
- return this.rollup.read.PROOF_COMMITMENT_ESCROW();
115
- }
116
113
  getTips() {
117
114
  return this.rollup.read.getTips();
118
115
  }
@@ -148,29 +145,6 @@ let RollupContract = (() => {
148
145
  getEpochProofPublicInputs(args) {
149
146
  return this.rollup.read.getEpochProofPublicInputs(args);
150
147
  }
151
- async getProofClaim() {
152
- const { epochToProve, basisPointFee, bondAmount, bondProvider: bondProviderHex, proposerClaimant: proposerClaimantHex, } = await this.rollup.read.getProofClaim();
153
- const bondProvider = EthAddress.fromString(bondProviderHex);
154
- const proposerClaimant = EthAddress.fromString(proposerClaimantHex);
155
- if (bondProvider.isZero() && proposerClaimant.isZero() && epochToProve === 0n) {
156
- return undefined;
157
- }
158
- return {
159
- epochToProve,
160
- basisPointFee,
161
- bondAmount,
162
- bondProvider,
163
- proposerClaimant,
164
- };
165
- }
166
- async getClaimableEpoch() {
167
- try {
168
- return await this.rollup.read.getClaimableEpoch();
169
- }
170
- catch (err) {
171
- throw formatViemError(err);
172
- }
173
- }
174
148
  async getEpochToProve() {
175
149
  try {
176
150
  return await this.rollup.read.getEpochToProve();
@@ -179,19 +153,6 @@ let RollupContract = (() => {
179
153
  throw formatViemError(err);
180
154
  }
181
155
  }
182
- async validateProofQuote(quote, account, slotDuration) {
183
- if (typeof slotDuration === 'number') {
184
- slotDuration = BigInt(slotDuration);
185
- }
186
- const timeOfNextL1Slot = BigInt((await this.client.getBlock()).timestamp + slotDuration);
187
- const args = [timeOfNextL1Slot, quote];
188
- try {
189
- await this.rollup.read.validateEpochProofRightClaimAtTime(args, { account });
190
- }
191
- catch (err) {
192
- throw formatViemError(err);
193
- }
194
- }
195
156
  async validateHeader(args, account) {
196
157
  try {
197
158
  await this.rollup.read.validateHeader(args, { account });
@@ -228,7 +189,7 @@ let RollupContract = (() => {
228
189
  _getSlashingProposer_decorators = [memoize];
229
190
  _getL1StartBlock_decorators = [memoize];
230
191
  _getL1GenesisTime_decorators = [memoize];
231
- _getClaimDurationInL2Slots_decorators = [memoize];
192
+ _getProofSubmissionWindow_decorators = [memoize];
232
193
  _getEpochDuration_decorators = [memoize];
233
194
  _getSlotDuration_decorators = [memoize];
234
195
  _getTargetCommitteeSize_decorators = [memoize];
@@ -236,7 +197,7 @@ let RollupContract = (() => {
236
197
  __esDecorate(_a, null, _getSlashingProposer_decorators, { kind: "method", name: "getSlashingProposer", static: false, private: false, access: { has: obj => "getSlashingProposer" in obj, get: obj => obj.getSlashingProposer }, metadata: _metadata }, null, _instanceExtraInitializers);
237
198
  __esDecorate(_a, null, _getL1StartBlock_decorators, { kind: "method", name: "getL1StartBlock", static: false, private: false, access: { has: obj => "getL1StartBlock" in obj, get: obj => obj.getL1StartBlock }, metadata: _metadata }, null, _instanceExtraInitializers);
238
199
  __esDecorate(_a, null, _getL1GenesisTime_decorators, { kind: "method", name: "getL1GenesisTime", static: false, private: false, access: { has: obj => "getL1GenesisTime" in obj, get: obj => obj.getL1GenesisTime }, metadata: _metadata }, null, _instanceExtraInitializers);
239
- __esDecorate(_a, null, _getClaimDurationInL2Slots_decorators, { kind: "method", name: "getClaimDurationInL2Slots", static: false, private: false, access: { has: obj => "getClaimDurationInL2Slots" in obj, get: obj => obj.getClaimDurationInL2Slots }, metadata: _metadata }, null, _instanceExtraInitializers);
200
+ __esDecorate(_a, null, _getProofSubmissionWindow_decorators, { kind: "method", name: "getProofSubmissionWindow", static: false, private: false, access: { has: obj => "getProofSubmissionWindow" in obj, get: obj => obj.getProofSubmissionWindow }, metadata: _metadata }, null, _instanceExtraInitializers);
240
201
  __esDecorate(_a, null, _getEpochDuration_decorators, { kind: "method", name: "getEpochDuration", static: false, private: false, access: { has: obj => "getEpochDuration" in obj, get: obj => obj.getEpochDuration }, metadata: _metadata }, null, _instanceExtraInitializers);
241
202
  __esDecorate(_a, null, _getSlotDuration_decorators, { kind: "method", name: "getSlotDuration", static: false, private: false, access: { has: obj => "getSlotDuration" in obj, get: obj => obj.getSlotDuration }, metadata: _metadata }, null, _instanceExtraInitializers);
242
203
  __esDecorate(_a, null, _getTargetCommitteeSize_decorators, { kind: "method", name: "getTargetCommitteeSize", static: false, private: false, access: { has: obj => "getTargetCommitteeSize" in obj, get: obj => obj.getTargetCommitteeSize }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -246,4 +207,4 @@ let RollupContract = (() => {
246
207
  _a;
247
208
  })();
248
209
  export { RollupContract };
249
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
210
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}