@aztec/ethereum 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

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 (144) hide show
  1. package/dest/client.d.ts +27 -3
  2. package/dest/client.d.ts.map +1 -1
  3. package/dest/client.js +63 -8
  4. package/dest/config.d.ts +15 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +29 -9
  7. package/dest/contracts/chain_state_override.d.ts +78 -0
  8. package/dest/contracts/chain_state_override.d.ts.map +1 -0
  9. package/dest/contracts/chain_state_override.js +137 -0
  10. package/dest/contracts/empire_base.d.ts +1 -3
  11. package/dest/contracts/empire_base.d.ts.map +1 -1
  12. package/dest/contracts/fee_asset_price_oracle.d.ts +6 -2
  13. package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -1
  14. package/dest/contracts/fee_asset_price_oracle.js +11 -6
  15. package/dest/contracts/governance.d.ts +135 -35
  16. package/dest/contracts/governance.d.ts.map +1 -1
  17. package/dest/contracts/governance.js +226 -15
  18. package/dest/contracts/governance_proposer.d.ts +33 -4
  19. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  20. package/dest/contracts/governance_proposer.js +52 -13
  21. package/dest/contracts/gse.d.ts +4 -2
  22. package/dest/contracts/gse.d.ts.map +1 -1
  23. package/dest/contracts/gse.js +2 -2
  24. package/dest/contracts/inbox.d.ts +3 -3
  25. package/dest/contracts/inbox.d.ts.map +1 -1
  26. package/dest/contracts/inbox.js +12 -7
  27. package/dest/contracts/index.d.ts +3 -3
  28. package/dest/contracts/index.d.ts.map +1 -1
  29. package/dest/contracts/index.js +2 -2
  30. package/dest/contracts/multicall.d.ts +127 -12
  31. package/dest/contracts/multicall.d.ts.map +1 -1
  32. package/dest/contracts/multicall.js +201 -94
  33. package/dest/contracts/outbox.d.ts +27 -4
  34. package/dest/contracts/outbox.d.ts.map +1 -1
  35. package/dest/contracts/outbox.js +34 -7
  36. package/dest/contracts/rollup.d.ts +5433 -30
  37. package/dest/contracts/rollup.d.ts.map +1 -1
  38. package/dest/contracts/rollup.js +436 -102
  39. package/dest/contracts/slashing_proposer.d.ts +171 -0
  40. package/dest/contracts/slashing_proposer.d.ts.map +1 -0
  41. package/dest/contracts/slashing_proposer.js +753 -0
  42. package/dest/contracts/watch_event.d.ts +36 -0
  43. package/dest/contracts/watch_event.d.ts.map +1 -0
  44. package/dest/contracts/watch_event.js +66 -0
  45. package/dest/deploy_aztec_l1_contracts.d.ts +4 -7
  46. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
  47. package/dest/deploy_aztec_l1_contracts.js +15 -8
  48. package/dest/foundry_binary.d.ts +13 -0
  49. package/dest/foundry_binary.d.ts.map +1 -0
  50. package/dest/foundry_binary.js +52 -0
  51. package/dest/generated/l1-contracts-defaults.d.ts +2 -2
  52. package/dest/generated/l1-contracts-defaults.js +2 -2
  53. package/dest/l1_artifacts.d.ts +14941 -16273
  54. package/dest/l1_artifacts.d.ts.map +1 -1
  55. package/dest/l1_artifacts.js +9 -24
  56. package/dest/l1_contract_addresses.d.ts +61 -65
  57. package/dest/l1_contract_addresses.d.ts.map +1 -1
  58. package/dest/l1_contract_addresses.js +101 -82
  59. package/dest/l1_reader.d.ts +5 -5
  60. package/dest/l1_reader.d.ts.map +1 -1
  61. package/dest/l1_reader.js +9 -7
  62. package/dest/l1_tx_utils/config.js +3 -3
  63. package/dest/l1_tx_utils/l1_tx_utils.d.ts +9 -1
  64. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  65. package/dest/l1_tx_utils/l1_tx_utils.js +115 -54
  66. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
  67. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  68. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +57 -23
  69. package/dest/l1_tx_utils/tx_delayer.d.ts +5 -3
  70. package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -1
  71. package/dest/l1_tx_utils/tx_delayer.js +7 -5
  72. package/dest/publisher_manager.d.ts +34 -8
  73. package/dest/publisher_manager.d.ts.map +1 -1
  74. package/dest/publisher_manager.js +119 -8
  75. package/dest/queries.d.ts +13 -2
  76. package/dest/queries.d.ts.map +1 -1
  77. package/dest/queries.js +62 -3
  78. package/dest/test/blob_kzg_warmup.d.ts +19 -0
  79. package/dest/test/blob_kzg_warmup.d.ts.map +1 -0
  80. package/dest/test/blob_kzg_warmup.js +64 -0
  81. package/dest/test/chain_monitor.d.ts +55 -4
  82. package/dest/test/chain_monitor.d.ts.map +1 -1
  83. package/dest/test/chain_monitor.js +104 -3
  84. package/dest/test/eth_cheat_codes.d.ts +31 -6
  85. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  86. package/dest/test/eth_cheat_codes.js +67 -44
  87. package/dest/test/index.d.ts +2 -1
  88. package/dest/test/index.d.ts.map +1 -1
  89. package/dest/test/index.js +1 -0
  90. package/dest/test/recording_rpc_server.d.ts +18 -0
  91. package/dest/test/recording_rpc_server.d.ts.map +1 -0
  92. package/dest/test/recording_rpc_server.js +68 -0
  93. package/dest/test/rollup_cheat_codes.d.ts +60 -3
  94. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  95. package/dest/test/rollup_cheat_codes.js +86 -7
  96. package/dest/test/start_anvil.d.ts +15 -1
  97. package/dest/test/start_anvil.d.ts.map +1 -1
  98. package/dest/test/start_anvil.js +58 -7
  99. package/dest/utils.d.ts +9 -2
  100. package/dest/utils.d.ts.map +1 -1
  101. package/dest/utils.js +59 -24
  102. package/package.json +6 -6
  103. package/src/client.ts +72 -2
  104. package/src/config.ts +44 -13
  105. package/src/contracts/chain_state_override.ts +200 -0
  106. package/src/contracts/empire_base.ts +0 -2
  107. package/src/contracts/fee_asset_price_oracle.ts +10 -5
  108. package/src/contracts/governance.ts +310 -10
  109. package/src/contracts/governance_proposer.ts +56 -13
  110. package/src/contracts/gse.ts +7 -2
  111. package/src/contracts/inbox.ts +13 -5
  112. package/src/contracts/index.ts +2 -2
  113. package/src/contracts/multicall.ts +243 -105
  114. package/src/contracts/outbox.ts +42 -8
  115. package/src/contracts/rollup.ts +487 -103
  116. package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +119 -45
  117. package/src/contracts/watch_event.ts +110 -0
  118. package/src/deploy_aztec_l1_contracts.ts +19 -10
  119. package/src/foundry_binary.ts +57 -0
  120. package/src/generated/l1-contracts-defaults.ts +2 -2
  121. package/src/l1_artifacts.ts +12 -35
  122. package/src/l1_contract_addresses.ts +120 -94
  123. package/src/l1_reader.ts +17 -10
  124. package/src/l1_tx_utils/config.ts +3 -3
  125. package/src/l1_tx_utils/l1_tx_utils.ts +107 -50
  126. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +57 -17
  127. package/src/l1_tx_utils/tx_delayer.ts +16 -7
  128. package/src/publisher_manager.ts +143 -12
  129. package/src/queries.ts +70 -4
  130. package/src/test/blob_kzg_warmup.ts +65 -0
  131. package/src/test/chain_monitor.ts +148 -3
  132. package/src/test/eth_cheat_codes.ts +63 -47
  133. package/src/test/index.ts +1 -0
  134. package/src/test/recording_rpc_server.ts +69 -0
  135. package/src/test/rollup_cheat_codes.ts +115 -6
  136. package/src/test/start_anvil.ts +71 -8
  137. package/src/utils.ts +56 -29
  138. package/dest/contracts/empire_slashing_proposer.d.ts +0 -69
  139. package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
  140. package/dest/contracts/empire_slashing_proposer.js +0 -216
  141. package/dest/contracts/tally_slashing_proposer.d.ts +0 -140
  142. package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
  143. package/dest/contracts/tally_slashing_proposer.js +0 -320
  144. package/src/contracts/empire_slashing_proposer.ts +0 -265
package/dest/client.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { Logger } from '@aztec/foundation/log';
2
- import { type Chain, type HDAccount, type LocalAccount, type PrivateKeyAccount } from 'viem';
2
+ import { type Chain, type FallbackTransport, type HDAccount, type HttpTransport, type LocalAccount, type PrivateKeyAccount } from 'viem';
3
3
  import type { ExtendedViemWalletClient, ViemPublicClient } from './types.js';
4
4
  type Config = {
5
5
  /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
@@ -8,11 +8,35 @@ type Config = {
8
8
  l1ChainId: number;
9
9
  /** The polling interval viem uses in ms */
10
10
  viemPollingIntervalMS?: number;
11
+ /** Timeout for HTTP requests to the L1 RPC node in ms. */
12
+ l1HttpTimeoutMS?: number;
11
13
  };
12
14
  export type { Config as EthereumClientConfig };
15
+ /** Error exposed by L1 RPC transports without including provider URLs in its message. */
16
+ export declare class L1RpcError extends Error {
17
+ constructor(message: string, options?: ErrorOptions);
18
+ }
19
+ /** Creates a viem fallback HTTP transport for the given L1 RPC URLs. */
20
+ export declare function makeL1HttpTransport(rpcUrls: string[], opts?: {
21
+ timeout?: number;
22
+ }): FallbackTransport<HttpTransport[]>;
23
+ /** Returns the HTTP status from an L1 RPC error's cause chain, if one is available. */
24
+ export declare function getL1RpcHttpStatus(err: unknown): number | undefined;
25
+ /** Returns true when an L1 RPC error's cause chain contains the given HTTP status. */
26
+ export declare function isL1RpcHttpStatus(err: unknown, status: number): boolean;
27
+ /** Returns the JSON-RPC error code reported by the L1 node, if the error's cause chain carries one. */
28
+ export declare function getL1RpcErrorCode(err: unknown): number | undefined;
29
+ /**
30
+ * Returns the individual RPC URLs underlying a viem public client that was constructed with a
31
+ * fallback HTTP transport (see {@link makeL1HttpTransport}). Returns an empty array if the
32
+ * transport shape is not recognized (e.g. mock clients in tests, or non-fallback transports).
33
+ */
34
+ export declare function getRpcUrlsFromClient(client: ViemPublicClient): string[];
13
35
  /** Returns a viem public client given the L1 config. */
14
36
  export declare function getPublicClient(config: Config): ViemPublicClient;
15
37
  /** Returns a viem public client after waiting for the L1 RPC node to become available. */
16
38
  export declare function waitForPublicClient(config: Config, logger?: Logger): Promise<ViemPublicClient>;
17
- export declare function createExtendedL1Client(rpcUrls: string[], mnemonicOrPrivateKeyOrHdAccount: string | HDAccount | PrivateKeyAccount | LocalAccount, chain?: Chain, pollingIntervalMS?: number, addressIndex?: number): ExtendedViemWalletClient;
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLFNBQVMsRUFDZCxLQUFLLFlBQVksRUFDakIsS0FBSyxpQkFBaUIsRUFNdkIsTUFBTSxNQUFNLENBQUM7QUFLZCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUU3RSxLQUFLLE1BQU0sR0FBRztJQUNaLDBGQUEwRjtJQUMxRixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIseUNBQXlDO0lBQ3pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMkNBQTJDO0lBQzNDLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2hDLENBQUM7QUFFRixZQUFZLEVBQUUsTUFBTSxJQUFJLG9CQUFvQixFQUFFLENBQUM7QUFJL0Msd0RBQXdEO0FBQ3hELHdCQUFnQixlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsQ0FPaEU7QUFFRCwwRkFBMEY7QUFDMUYsd0JBQXNCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUlwRztBQXlCRCx3QkFBZ0Isc0JBQXNCLENBQ3BDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsK0JBQStCLEVBQUUsTUFBTSxHQUFHLFNBQVMsR0FBRyxpQkFBaUIsR0FBRyxZQUFZLEVBQ3RGLEtBQUssR0FBRSxLQUFlLEVBQ3RCLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxFQUMxQixZQUFZLENBQUMsRUFBRSxNQUFNLEdBQ3BCLHdCQUF3QixDQWdCMUIifQ==
39
+ export declare function createExtendedL1Client(rpcUrls: string[], mnemonicOrPrivateKeyOrHdAccount: string | HDAccount | PrivateKeyAccount | LocalAccount, chain?: Chain, pollingIntervalMS?: number, addressIndex?: number, opts?: {
40
+ httpTimeoutMS?: number;
41
+ }): ExtendedViemWalletClient;
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLGlCQUFpQixFQUN0QixLQUFLLFNBQVMsRUFFZCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssaUJBQWlCLEVBT3ZCLE1BQU0sTUFBTSxDQUFDO0FBS2QsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFN0UsS0FBSyxNQUFNLEdBQUc7SUFDWiwwRkFBMEY7SUFDMUYsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLHlDQUF5QztJQUN6QyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLDJDQUEyQztJQUMzQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUMvQiwwREFBMEQ7SUFDMUQsZUFBZSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQzFCLENBQUM7QUFFRixZQUFZLEVBQUUsTUFBTSxJQUFJLG9CQUFvQixFQUFFLENBQUM7QUFFL0MseUZBQXlGO0FBQ3pGLHFCQUFhLFVBQVcsU0FBUSxLQUFLO0lBQ25DLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxZQUFZLEVBR2xEO0NBQ0Y7QUFFRCx3RUFBd0U7QUFDeEUsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLHNDQUVqRjtBQUVELHVGQUF1RjtBQUN2Rix3QkFBZ0Isa0JBQWtCLENBQUMsR0FBRyxFQUFFLE9BQU8sR0FBRyxNQUFNLEdBQUcsU0FBUyxDQUVuRTtBQUVELHNGQUFzRjtBQUN0Rix3QkFBZ0IsaUJBQWlCLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFdkU7QUFFRCx1R0FBdUc7QUFDdkcsd0JBQWdCLGlCQUFpQixDQUFDLEdBQUcsRUFBRSxPQUFPLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FFbEU7QUFrQkQ7Ozs7R0FJRztBQUNILHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsTUFBTSxFQUFFLENBV3ZFO0FBSUQsd0RBQXdEO0FBQ3hELHdCQUFnQixlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsQ0FPaEU7QUFFRCwwRkFBMEY7QUFDMUYsd0JBQXNCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUlwRztBQXlCRCx3QkFBZ0Isc0JBQXNCLENBQ3BDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsK0JBQStCLEVBQUUsTUFBTSxHQUFHLFNBQVMsR0FBRyxpQkFBaUIsR0FBRyxZQUFZLEVBQ3RGLEtBQUssR0FBRSxLQUFlLEVBQ3RCLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxFQUMxQixZQUFZLENBQUMsRUFBRSxNQUFNLEVBQ3JCLElBQUksQ0FBQyxFQUFFO0lBQUUsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDaEMsd0JBQXdCLENBZ0IxQiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAMvB,MAAM,MAAM,CAAC;AAKd,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,MAAM,GAAG;IACZ,0FAA0F;IAC1F,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAI/C,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG;AAyBD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,+BAA+B,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,EACtF,KAAK,GAAE,KAAe,EACtB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,YAAY,CAAC,EAAE,MAAM,GACpB,wBAAwB,CAgB1B"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAEd,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAOvB,MAAM,MAAM,CAAC;AAKd,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,MAAM,GAAG;IACZ,0FAA0F;IAC1F,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,0DAA0D;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAE/C,yFAAyF;AACzF,qBAAa,UAAW,SAAQ,KAAK;IACnC,YAAY,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,EAGlD;CACF;AAED,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,sCAEjF;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEnE;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED,uGAAuG;AACvG,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAElE;AAkBD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAWvE;AAID,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG;AAyBD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,+BAA+B,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,EACtF,KAAK,GAAE,KAAe,EACtB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,YAAY,CAAC,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,wBAAwB,CAgB1B"}
package/dest/client.js CHANGED
@@ -1,16 +1,71 @@
1
1
  import { retryUntil } from '@aztec/foundation/retry';
2
- import { createPublicClient, createWalletClient, fallback, http, publicActions } from 'viem';
2
+ import { getErrorCause } from '@aztec/foundation/types';
3
+ import { HttpRequestError, RpcRequestError, createPublicClient, createWalletClient, fallback, http, publicActions } from 'viem';
3
4
  import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
4
5
  import { foundry } from 'viem/chains';
5
6
  import { createEthereumChain } from './chain.js';
7
+ /** Error exposed by L1 RPC transports without including provider URLs in its message. */ export class L1RpcError extends Error {
8
+ constructor(message, options){
9
+ super(message, options);
10
+ this.name = 'L1RpcError';
11
+ }
12
+ }
13
+ /** Creates a viem fallback HTTP transport for the given L1 RPC URLs. */ export function makeL1HttpTransport(rpcUrls, opts) {
14
+ return wrapL1RpcTransport(fallback(rpcUrls.map((url)=>http(url, {
15
+ batch: false,
16
+ timeout: opts?.timeout
17
+ }))));
18
+ }
19
+ /** Returns the HTTP status from an L1 RPC error's cause chain, if one is available. */ export function getL1RpcHttpStatus(err) {
20
+ return getErrorCause(err, HttpRequestError)?.status;
21
+ }
22
+ /** Returns true when an L1 RPC error's cause chain contains the given HTTP status. */ export function isL1RpcHttpStatus(err, status) {
23
+ return getL1RpcHttpStatus(err) === status;
24
+ }
25
+ /** Returns the JSON-RPC error code reported by the L1 node, if the error's cause chain carries one. */ export function getL1RpcErrorCode(err) {
26
+ return getErrorCause(err, RpcRequestError)?.code;
27
+ }
28
+ function wrapL1RpcTransport(transport) {
29
+ const wrappedTransport = (parameters)=>{
30
+ const fallbackTransport = transport(parameters);
31
+ const request = async (args)=>{
32
+ try {
33
+ return await fallbackTransport.request(args);
34
+ } catch (err) {
35
+ throw err instanceof L1RpcError ? err : new L1RpcError('L1 RPC request failed', {
36
+ cause: err
37
+ });
38
+ }
39
+ };
40
+ return {
41
+ ...fallbackTransport,
42
+ request
43
+ };
44
+ };
45
+ return wrappedTransport;
46
+ }
47
+ /**
48
+ * Returns the individual RPC URLs underlying a viem public client that was constructed with a
49
+ * fallback HTTP transport (see {@link makeL1HttpTransport}). Returns an empty array if the
50
+ * transport shape is not recognized (e.g. mock clients in tests, or non-fallback transports).
51
+ */ export function getRpcUrlsFromClient(client) {
52
+ const transport = client.transport;
53
+ if (Array.isArray(transport?.transports)) {
54
+ return transport.transports.map((t)=>t?.value?.url).filter((url)=>typeof url === 'string');
55
+ }
56
+ const singleUrl = transport?.value?.url ?? transport?.url;
57
+ return typeof singleUrl === 'string' ? [
58
+ singleUrl
59
+ ] : [];
60
+ }
6
61
  // TODO: Use these methods to abstract the creation of viem clients.
7
62
  /** Returns a viem public client given the L1 config. */ export function getPublicClient(config) {
8
63
  const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
9
64
  return createPublicClient({
10
65
  chain: chain.chainInfo,
11
- transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
12
- batch: false
13
- }))),
66
+ transport: makeL1HttpTransport(config.l1RpcUrls, {
67
+ timeout: config.l1HttpTimeoutMS
68
+ }),
14
69
  pollingInterval: config.viemPollingIntervalMS
15
70
  });
16
71
  }
@@ -33,16 +88,16 @@ async function waitForRpc(client, config, logger) {
33
88
  throw new Error(`Ethereum node at ${config.l1RpcUrls.join(', ')} has chain ID ${l1ChainId} but expected ${config.l1ChainId}`);
34
89
  }
35
90
  }
36
- export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex) {
91
+ export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex, opts) {
37
92
  const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string' ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x') ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, {
38
93
  addressIndex
39
94
  }) : mnemonicOrPrivateKeyOrHdAccount;
40
95
  const extendedClient = createWalletClient({
41
96
  account: hdAccount,
42
97
  chain,
43
- transport: fallback(rpcUrls.map((url)=>http(url, {
44
- batch: false
45
- }))),
98
+ transport: makeL1HttpTransport(rpcUrls, {
99
+ timeout: opts?.httpTimeoutMS
100
+ }),
46
101
  pollingInterval: pollingIntervalMS
47
102
  }).extend(publicActions);
48
103
  return extendedClient;
package/dest/config.d.ts CHANGED
@@ -46,13 +46,13 @@ export type L1ContractsConfig = {
46
46
  slashingOffsetInRounds: number;
47
47
  /** How long slashing can be disabled for in seconds when vetoer disables it */
48
48
  slashingDisableDuration: number;
49
- /** Type of slasher proposer */
50
- slasherFlavor: 'empire' | 'tally' | 'none';
51
- /** Minimum amount that can be slashed in tally slashing */
49
+ /** Whether to deploy a slasher proposer */
50
+ slasherEnabled: boolean;
51
+ /** Minimum amount that can be slashed */
52
52
  slashAmountSmall: bigint;
53
- /** Medium amount to slash in tally slashing */
53
+ /** Medium amount to slash */
54
54
  slashAmountMedium: bigint;
55
- /** Largest amount that can be slashed per round in tally slashing */
55
+ /** Largest amount that can be slashed per round */
56
56
  slashAmountLarge: bigint;
57
57
  /** Governance proposing quorum (defaults to roundSize/2 + 1) */
58
58
  governanceProposerQuorum?: number;
@@ -80,7 +80,16 @@ export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsCo
80
80
  * Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
81
81
  */
82
82
  export declare const DefaultL1ContractsConfig: L1ContractsConfig;
83
+ /**
84
+ * Validates that `ethereumSlotDuration` and `aztecSlotDuration` are positive and that the L2 slot is an exact
85
+ * multiple of the L1 slot. Every L2 slot boundary must land on an L1 slot boundary; a non-multiple pairing
86
+ * desyncs the epoch/checkpoint timing math throughout the sequencer, validator client, and timetables. Returns
87
+ * a list of error messages (empty when valid).
88
+ */
89
+ export declare function validateSlotDurations(config: Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration'>): string[];
90
+ /** Throws if {@link validateSlotDurations} reports any errors. */
91
+ export declare function assertValidSlotDurations(config: Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration'>): void;
83
92
  export declare const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig>;
84
93
  export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
85
94
  export declare function getGenesisStateConfigEnvVars(): GenesisStateConfig;
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQVN4QixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUM1QixDQUFDO0FBRUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLHlDQUF5QztJQUN6QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IsdUZBQXVGO0lBQ3ZGLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQix3Q0FBd0M7SUFDeEMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLDJDQUEyQztJQUMzQyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMsb0ZBQW9GO0lBQ3BGLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyxpRkFBaUY7SUFDakYsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLHNGQUFzRjtJQUN0RixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLCtFQUErRTtJQUMvRSwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkMseUNBQXlDO0lBQ3pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztJQUM1Qix5Q0FBeUM7SUFDekMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1IQUFtSDtJQUNuSCxzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0Isd0tBQXdLO0lBQ3hLLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4Qiw0RUFBNEU7SUFDNUUseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLGdHQUFnRztJQUNoRyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMseUdBQXlHO0lBQ3pHLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUN2Qyx5RUFBeUU7SUFDekUsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQiw0SUFBNEk7SUFDNUksc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLCtFQUErRTtJQUMvRSx1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsK0JBQStCO0lBQy9CLGFBQWEsRUFBRSxRQUFRLEdBQUcsT0FBTyxHQUFHLE1BQU0sQ0FBQztJQUMzQywyREFBMkQ7SUFDM0QsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLCtDQUErQztJQUMvQyxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIscUVBQXFFO0lBQ3JFLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixnRUFBZ0U7SUFDaEUsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEMsc0NBQXNDO0lBQ3RDLDJCQUEyQixFQUFFLE1BQU0sQ0FBQztJQUNwQywyRkFBMkY7SUFDM0Ysd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEMscUNBQXFDO0lBQ3JDLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsZ0NBQWdDO0lBQ2hDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixnRUFBZ0U7SUFDaEUscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLGdEQUFnRDtJQUNoRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUIsR0FBRyxlQUFlLENBQUM7QUFFcEI7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsQ0F5SjNFLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sd0JBQXdCLG1CQUE4QyxDQUFDO0FBRXBGLGVBQU8sTUFBTSwwQkFBMEIsRUFBRSxrQkFBa0IsQ0FBQyxrQkFBa0IsQ0FxQjdFLENBQUM7QUFFRix3QkFBZ0IsMkJBQTJCLElBQUksaUJBQWlCLENBRS9EO0FBRUQsd0JBQWdCLDRCQUE0QixJQUFJLGtCQUFrQixDQUVqRSJ9
95
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQVF4QixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUM1QixDQUFDO0FBRUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLHlDQUF5QztJQUN6QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IsdUZBQXVGO0lBQ3ZGLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQix3Q0FBd0M7SUFDeEMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLDJDQUEyQztJQUMzQyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMsb0ZBQW9GO0lBQ3BGLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyxpRkFBaUY7SUFDakYsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLHNGQUFzRjtJQUN0RixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLCtFQUErRTtJQUMvRSwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkMseUNBQXlDO0lBQ3pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztJQUM1Qix5Q0FBeUM7SUFDekMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1IQUFtSDtJQUNuSCxzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0Isd0tBQXdLO0lBQ3hLLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4Qiw0RUFBNEU7SUFDNUUseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLGdHQUFnRztJQUNoRyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMseUdBQXlHO0lBQ3pHLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUN2Qyx5RUFBeUU7SUFDekUsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQiw0SUFBNEk7SUFDNUksc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLCtFQUErRTtJQUMvRSx1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsMkNBQTJDO0lBQzNDLGNBQWMsRUFBRSxPQUFPLENBQUM7SUFDeEIseUNBQXlDO0lBQ3pDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6Qiw2QkFBNkI7SUFDN0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1EQUFtRDtJQUNuRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsZ0VBQWdFO0lBQ2hFLHdCQUF3QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLHNDQUFzQztJQUN0QywyQkFBMkIsRUFBRSxNQUFNLENBQUM7SUFDcEMsMkZBQTJGO0lBQzNGLHdCQUF3QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLHFDQUFxQztJQUNyQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLGdDQUFnQztJQUNoQyxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0IsZ0VBQWdFO0lBQ2hFLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixnREFBZ0Q7SUFDaEQsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0NBQzFCLEdBQUcsZUFBZSxDQUFDO0FBRXBCOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0seUJBQXlCLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLENBc0ozRSxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHdCQUF3QixtQkFBOEMsQ0FBQztBQUVwRjs7Ozs7R0FLRztBQUNILHdCQUFnQixxQkFBcUIsQ0FDbkMsTUFBTSxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxzQkFBc0IsR0FBRyxtQkFBbUIsQ0FBQyxHQUM1RSxNQUFNLEVBQUUsQ0FlVjtBQUVELGtFQUFrRTtBQUNsRSx3QkFBZ0Isd0JBQXdCLENBQ3RDLE1BQU0sRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLENBQUMsR0FDNUUsSUFBSSxDQUtOO0FBRUQsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGtCQUFrQixDQUFDLGtCQUFrQixDQXFCN0UsQ0FBQztBQUVGLHdCQUFnQiwyQkFBMkIsSUFBSSxpQkFBaUIsQ0FFL0Q7QUFFRCx3QkFBZ0IsNEJBQTRCLElBQUksa0JBQWtCLENBRWpFIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EASxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,yBAAyB,CAAC;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,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,oFAAoF;IACpF,0BAA0B,EAAE,MAAM,CAAC;IACnC,iFAAiF;IACjF,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,2FAA2F;IAC3F,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAyJ3E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,mBAA8C,CAAC;AAEpF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAqB7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAQxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,yBAAyB,CAAC;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,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,oFAAoF;IACpF,0BAA0B,EAAE,MAAM,CAAC;IACnC,iFAAiF;IACjF,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,2CAA2C;IAC3C,cAAc,EAAE,OAAO,CAAC;IACxB,yCAAyC;IACzC,gBAAgB,EAAE,MAAM,CAAC;IACzB,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mDAAmD;IACnD,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,2FAA2F;IAC3F,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAsJ3E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,mBAA8C,CAAC;AAEpF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,CAAC,GAC5E,MAAM,EAAE,CAeV;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,CAAC,GAC5E,IAAI,CAKN;AAED,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAqB7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE"}
package/dest/config.js CHANGED
@@ -1,4 +1,4 @@
1
- import { bigintConfigHelper, booleanConfigHelper, enumConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, omitConfigMappings, optionalNumberConfigHelper } from '@aztec/foundation/config';
1
+ import { bigintConfigHelper, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, omitConfigMappings, optionalNumberConfigHelper } from '@aztec/foundation/config';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
3
  import { l1ContractsDefaultEnv } from './generated/l1-contracts-defaults.js';
4
4
  import { l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
@@ -67,14 +67,10 @@ import { l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
67
67
  description: 'How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset)',
68
68
  ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_OFFSET_IN_ROUNDS)
69
69
  },
70
- slasherFlavor: {
71
- env: 'AZTEC_SLASHER_FLAVOR',
72
- description: 'Type of slasher proposer (empire, tally, or none)',
73
- ...enumConfigHelper([
74
- 'empire',
75
- 'tally',
76
- 'none'
77
- ], l1ContractsDefaultEnv.AZTEC_SLASHER_FLAVOR)
70
+ slasherEnabled: {
71
+ env: 'AZTEC_SLASHER_ENABLED',
72
+ description: 'Whether to deploy a slasher proposer',
73
+ ...booleanConfigHelper(true)
78
74
  },
79
75
  slashAmountSmall: {
80
76
  env: 'AZTEC_SLASH_AMOUNT_SMALL',
@@ -165,6 +161,30 @@ import { l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
165
161
  * Default L1 contracts configuration derived from l1ContractsConfigMappings.
166
162
  * Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
167
163
  */ export const DefaultL1ContractsConfig = getDefaultConfig(l1ContractsConfigMappings);
164
+ /**
165
+ * Validates that `ethereumSlotDuration` and `aztecSlotDuration` are positive and that the L2 slot is an exact
166
+ * multiple of the L1 slot. Every L2 slot boundary must land on an L1 slot boundary; a non-multiple pairing
167
+ * desyncs the epoch/checkpoint timing math throughout the sequencer, validator client, and timetables. Returns
168
+ * a list of error messages (empty when valid).
169
+ */ export function validateSlotDurations(config) {
170
+ const errors = [];
171
+ if (config.ethereumSlotDuration <= 0) {
172
+ errors.push(`ethereumSlotDuration must be positive (got ${config.ethereumSlotDuration})`);
173
+ }
174
+ if (config.aztecSlotDuration <= 0) {
175
+ errors.push(`aztecSlotDuration must be positive (got ${config.aztecSlotDuration})`);
176
+ }
177
+ if (config.ethereumSlotDuration > 0 && config.aztecSlotDuration % config.ethereumSlotDuration !== 0) {
178
+ errors.push(`aztecSlotDuration (${config.aztecSlotDuration}s) must be a multiple of ethereumSlotDuration ` + `(${config.ethereumSlotDuration}s)`);
179
+ }
180
+ return errors;
181
+ }
182
+ /** Throws if {@link validateSlotDurations} reports any errors. */ export function assertValidSlotDurations(config) {
183
+ const errors = validateSlotDurations(config);
184
+ if (errors.length > 0) {
185
+ throw new Error(`Invalid slot duration configuration:\n${errors.map((e)=>` - ${e}`).join('\n')}`);
186
+ }
187
+ }
168
188
  export const genesisStateConfigMappings = {
169
189
  testAccounts: {
170
190
  env: 'TEST_ACCOUNTS',
@@ -0,0 +1,78 @@
1
+ import type { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
+ import type { Buffer32 } from '@aztec/foundation/buffer';
3
+ import type { Fr } from '@aztec/foundation/curves/bn254';
4
+ import type { StateOverride } from 'viem';
5
+ import { type FeeHeader, RollupContract } from './rollup.js';
6
+ /**
7
+ * Override values for the pending checkpoint that the simulation should treat as already applied.
8
+ * Every field is optional at plan-building time so callers can populate them incrementally; whatever
9
+ * is present at translation time is forwarded to the partial `tempCheckpointLogs` helper so the
10
+ * load-bearing `slotNumber` can land even if other fields could not be derived locally.
11
+ */
12
+ export type PendingCheckpointOverrideState = {
13
+ archive?: Fr;
14
+ feeHeader?: FeeHeader;
15
+ headerHash?: Fr;
16
+ outHash?: Fr;
17
+ payloadDigest?: Buffer32;
18
+ slotNumber?: SlotNumber;
19
+ };
20
+ export type ChainTipsOverride = {
21
+ pending?: CheckpointNumber;
22
+ proven?: CheckpointNumber;
23
+ };
24
+ /** Describes the simulated L1 rollup state that downstream calls should observe. */
25
+ export type SimulationOverridesPlan = {
26
+ chainTipsOverride?: ChainTipsOverride;
27
+ pendingCheckpointState?: PendingCheckpointOverrideState;
28
+ disableBlobCheck?: boolean;
29
+ };
30
+ /** Builds a single-checkpoint simulation plan before it is translated into a viem state override. */
31
+ export declare class SimulationOverridesBuilder {
32
+ private chainTipsOverride?;
33
+ private pendingCheckpointState?;
34
+ private disableBlobCheck;
35
+ /** Starts from an existing plan so callers can extend or specialize it. */
36
+ static from(plan: SimulationOverridesPlan | undefined): SimulationOverridesBuilder;
37
+ /**
38
+ * Merges another plan into this builder. Later values win on a per-half basis for chain tips,
39
+ * but explicit `undefined` fields in the incoming plan are ignored so they cannot erase a
40
+ * previously-set value.
41
+ */
42
+ merge(plan: SimulationOverridesPlan | undefined): this;
43
+ /**
44
+ * Sets the pending and/or proven checkpoint number overrides. Subsequent calls merge into the existing
45
+ * override on a per-half basis, so callers can set pending in one call and proven in another without
46
+ * clobbering each other.
47
+ */
48
+ withChainTips(override: ChainTipsOverride): this;
49
+ /** Overrides the archive root for the configured pending checkpoint. */
50
+ withPendingArchive(archive: Fr): this;
51
+ /** Overrides the fee header for the configured pending checkpoint. */
52
+ withPendingFeeHeader(feeHeader: FeeHeader): this;
53
+ /**
54
+ * Overrides one or more `tempCheckpointLogs` cell fields for the configured pending checkpoint.
55
+ * Fields are independent: any subset can be provided. The translator (`makeTempCheckpointLogOverride`)
56
+ * emits a stateDiff entry per field actually set, so unspecified fields stay at their on-chain
57
+ * values.
58
+ *
59
+ * `slotNumber` is load-bearing for `STFLib.canPruneAtTime`: when the simulation overrides `pending`
60
+ * to a checkpoint that has no on-chain `tempCheckpointLogs` entry yet, the missing slotNumber falls
61
+ * back to 0 and the contract treats the pending tip as belonging to epoch 0, triggering a phantom
62
+ * prune that silently undoes the `pending` override.
63
+ */
64
+ withPendingTempCheckpointLogFields(fields: {
65
+ headerHash?: Fr;
66
+ outHash?: Fr;
67
+ payloadDigest?: Buffer32;
68
+ slotNumber?: SlotNumber;
69
+ }): this;
70
+ /** Disables blob checking for simulations that cannot provide DA inputs. */
71
+ withoutBlobCheck(): this;
72
+ /** Builds the final plan, or `undefined` when no overrides were configured. */
73
+ build(): SimulationOverridesPlan | undefined;
74
+ private assertPendingCheckpointNumber;
75
+ }
76
+ /** Translates a simulation plan into the viem state override shape expected by rollup calls. */
77
+ export declare function buildSimulationOverridesStateOverride(rollup: RollupContract, plan: SimulationOverridesPlan | undefined): Promise<StateOverride>;
78
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fc3RhdGVfb3ZlcnJpZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvY2hhaW5fc3RhdGVfb3ZlcnJpZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTFDLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFN0Q7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sOEJBQThCLEdBQUc7SUFDM0MsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ2IsU0FBUyxDQUFDLEVBQUUsU0FBUyxDQUFDO0lBQ3RCLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNoQixPQUFPLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDYixhQUFhLENBQUMsRUFBRSxRQUFRLENBQUM7SUFDekIsVUFBVSxDQUFDLEVBQUUsVUFBVSxDQUFDO0NBQ3pCLENBQUM7QUFFRixNQUFNLE1BQU0saUJBQWlCLEdBQUc7SUFDOUIsT0FBTyxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDM0IsQ0FBQztBQUVGLG9GQUFvRjtBQUNwRixNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsaUJBQWlCLENBQUMsRUFBRSxpQkFBaUIsQ0FBQztJQUN0QyxzQkFBc0IsQ0FBQyxFQUFFLDhCQUE4QixDQUFDO0lBQ3hELGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQzVCLENBQUM7QUFFRixxR0FBcUc7QUFDckcscUJBQWEsMEJBQTBCO0lBQ3JDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFvQjtJQUM5QyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FBaUM7SUFDaEUsT0FBTyxDQUFDLGdCQUFnQixDQUFTO0lBRWpDLDJFQUEyRTtJQUMzRSxPQUFjLElBQUksQ0FBQyxJQUFJLEVBQUUsdUJBQXVCLEdBQUcsU0FBUyxHQUFHLDBCQUEwQixDQUV4RjtJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsSUFBSSxFQUFFLHVCQUF1QixHQUFHLFNBQVMsR0FBRyxJQUFJLENBYzVEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLEdBQUcsSUFBSSxDQUd0RDtJQUVELHdFQUF3RTtJQUNqRSxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FJM0M7SUFFRCxzRUFBc0U7SUFDL0Qsb0JBQW9CLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBSXREO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNJLGtDQUFrQyxDQUFDLE1BQU0sRUFBRTtRQUNoRCxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDaEIsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ2IsYUFBYSxDQUFDLEVBQUUsUUFBUSxDQUFDO1FBQ3pCLFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztLQUN6QixHQUFHLElBQUksQ0FJUDtJQUVELDRFQUE0RTtJQUNyRSxnQkFBZ0IsSUFBSSxJQUFJLENBRzlCO0lBRUQsK0VBQStFO0lBQ3hFLEtBQUssSUFBSSx1QkFBdUIsR0FBRyxTQUFTLENBVWxEO0lBRUQsT0FBTyxDQUFDLDZCQUE2QjtDQUt0QztBQUVELGdHQUFnRztBQUNoRyx3QkFBc0IscUNBQXFDLENBQ3pELE1BQU0sRUFBRSxjQUFjLEVBQ3RCLElBQUksRUFBRSx1QkFBdUIsR0FBRyxTQUFTLEdBQ3hDLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FpRHhCIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chain_state_override.d.ts","sourceRoot":"","sources":["../../src/contracts/chain_state_override.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,oFAAoF;AACpF,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,sBAAsB,CAAC,EAAE,8BAA8B,CAAC;IACxD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,qGAAqG;AACrG,qBAAa,0BAA0B;IACrC,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAiC;IAChE,OAAO,CAAC,gBAAgB,CAAS;IAEjC,2EAA2E;IAC3E,OAAc,IAAI,CAAC,IAAI,EAAE,uBAAuB,GAAG,SAAS,GAAG,0BAA0B,CAExF;IAED;;;;OAIG;IACI,KAAK,CAAC,IAAI,EAAE,uBAAuB,GAAG,SAAS,GAAG,IAAI,CAc5D;IAED;;;;OAIG;IACI,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAGtD;IAED,wEAAwE;IACjE,kBAAkB,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAI3C;IAED,sEAAsE;IAC/D,oBAAoB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAItD;IAED;;;;;;;;;;OAUG;IACI,kCAAkC,CAAC,MAAM,EAAE;QAChD,UAAU,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,aAAa,CAAC,EAAE,QAAQ,CAAC;QACzB,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB,GAAG,IAAI,CAIP;IAED,4EAA4E;IACrE,gBAAgB,IAAI,IAAI,CAG9B;IAED,+EAA+E;IACxE,KAAK,IAAI,uBAAuB,GAAG,SAAS,CAUlD;IAED,OAAO,CAAC,6BAA6B;CAKtC;AAED,gGAAgG;AAChG,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,uBAAuB,GAAG,SAAS,GACxC,OAAO,CAAC,aAAa,CAAC,CAiDxB"}
@@ -0,0 +1,137 @@
1
+ import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
2
+ import { merge } from '@aztec/foundation/collection';
3
+ import { RollupContract } from './rollup.js';
4
+ /** Builds a single-checkpoint simulation plan before it is translated into a viem state override. */ export class SimulationOverridesBuilder {
5
+ chainTipsOverride;
6
+ pendingCheckpointState;
7
+ disableBlobCheck = false;
8
+ /** Starts from an existing plan so callers can extend or specialize it. */ static from(plan) {
9
+ return new SimulationOverridesBuilder().merge(plan);
10
+ }
11
+ /**
12
+ * Merges another plan into this builder. Later values win on a per-half basis for chain tips,
13
+ * but explicit `undefined` fields in the incoming plan are ignored so they cannot erase a
14
+ * previously-set value.
15
+ */ merge(plan) {
16
+ if (!plan) {
17
+ return this;
18
+ }
19
+ if (plan.chainTipsOverride) {
20
+ this.chainTipsOverride = merge(this.chainTipsOverride ?? {}, plan.chainTipsOverride);
21
+ }
22
+ if (plan.pendingCheckpointState) {
23
+ this.pendingCheckpointState = merge(this.pendingCheckpointState ?? {}, plan.pendingCheckpointState);
24
+ }
25
+ this.disableBlobCheck = this.disableBlobCheck || (plan.disableBlobCheck ?? false);
26
+ return this;
27
+ }
28
+ /**
29
+ * Sets the pending and/or proven checkpoint number overrides. Subsequent calls merge into the existing
30
+ * override on a per-half basis, so callers can set pending in one call and proven in another without
31
+ * clobbering each other.
32
+ */ withChainTips(override) {
33
+ this.chainTipsOverride = {
34
+ ...this.chainTipsOverride ?? {},
35
+ ...override
36
+ };
37
+ return this;
38
+ }
39
+ /** Overrides the archive root for the configured pending checkpoint. */ withPendingArchive(archive) {
40
+ this.assertPendingCheckpointNumber();
41
+ this.pendingCheckpointState = {
42
+ ...this.pendingCheckpointState ?? {},
43
+ archive
44
+ };
45
+ return this;
46
+ }
47
+ /** Overrides the fee header for the configured pending checkpoint. */ withPendingFeeHeader(feeHeader) {
48
+ this.assertPendingCheckpointNumber();
49
+ this.pendingCheckpointState = {
50
+ ...this.pendingCheckpointState ?? {},
51
+ feeHeader
52
+ };
53
+ return this;
54
+ }
55
+ /**
56
+ * Overrides one or more `tempCheckpointLogs` cell fields for the configured pending checkpoint.
57
+ * Fields are independent: any subset can be provided. The translator (`makeTempCheckpointLogOverride`)
58
+ * emits a stateDiff entry per field actually set, so unspecified fields stay at their on-chain
59
+ * values.
60
+ *
61
+ * `slotNumber` is load-bearing for `STFLib.canPruneAtTime`: when the simulation overrides `pending`
62
+ * to a checkpoint that has no on-chain `tempCheckpointLogs` entry yet, the missing slotNumber falls
63
+ * back to 0 and the contract treats the pending tip as belonging to epoch 0, triggering a phantom
64
+ * prune that silently undoes the `pending` override.
65
+ */ withPendingTempCheckpointLogFields(fields) {
66
+ this.assertPendingCheckpointNumber();
67
+ this.pendingCheckpointState = {
68
+ ...this.pendingCheckpointState ?? {},
69
+ ...fields
70
+ };
71
+ return this;
72
+ }
73
+ /** Disables blob checking for simulations that cannot provide DA inputs. */ withoutBlobCheck() {
74
+ this.disableBlobCheck = true;
75
+ return this;
76
+ }
77
+ /** Builds the final plan, or `undefined` when no overrides were configured. */ build() {
78
+ if (!this.pendingCheckpointState && !this.chainTipsOverride && !this.disableBlobCheck) {
79
+ return undefined;
80
+ }
81
+ return {
82
+ chainTipsOverride: this.chainTipsOverride,
83
+ pendingCheckpointState: this.pendingCheckpointState,
84
+ disableBlobCheck: this.disableBlobCheck || undefined
85
+ };
86
+ }
87
+ assertPendingCheckpointNumber() {
88
+ if (this.chainTipsOverride?.pending === undefined) {
89
+ throw new Error('withChainTips({ pending }) must be called before attaching archive or fee header overrides');
90
+ }
91
+ }
92
+ }
93
+ /** Translates a simulation plan into the viem state override shape expected by rollup calls. */ export async function buildSimulationOverridesStateOverride(rollup, plan) {
94
+ if (!plan) {
95
+ return [];
96
+ }
97
+ const rollupStateDiff = [];
98
+ if (plan.chainTipsOverride) {
99
+ rollupStateDiff.push(...extractRollupStateDiff(await rollup.makeChainTipsOverride(plan.chainTipsOverride)));
100
+ }
101
+ if (plan.pendingCheckpointState && plan.chainTipsOverride?.pending === undefined) {
102
+ throw new Error('pendingCheckpointState requires chainTipsOverride.pending to be set');
103
+ }
104
+ if (plan.pendingCheckpointState?.archive) {
105
+ rollupStateDiff.push(...extractRollupStateDiff(rollup.makeArchiveOverride(plan.chainTipsOverride.pending, plan.pendingCheckpointState.archive)));
106
+ }
107
+ if (plan.pendingCheckpointState) {
108
+ rollupStateDiff.push(...extractRollupStateDiff(await rollup.makeTempCheckpointLogOverride(plan.chainTipsOverride.pending, {
109
+ headerHash: plan.pendingCheckpointState.headerHash,
110
+ outHash: plan.pendingCheckpointState.outHash,
111
+ payloadDigest: plan.pendingCheckpointState.payloadDigest,
112
+ slotNumber: plan.pendingCheckpointState.slotNumber,
113
+ feeHeader: plan.pendingCheckpointState.feeHeader
114
+ })));
115
+ }
116
+ if (plan.disableBlobCheck) {
117
+ rollupStateDiff.push({
118
+ slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
119
+ value: toPaddedHex(0n, true)
120
+ });
121
+ }
122
+ if (rollupStateDiff.length === 0) {
123
+ return [];
124
+ }
125
+ return [
126
+ {
127
+ address: rollup.address,
128
+ stateDiff: rollupStateDiff
129
+ }
130
+ ];
131
+ }
132
+ function extractRollupStateDiff(override) {
133
+ const entries = Array.isArray(override) ? override : override ? [
134
+ override
135
+ ] : [];
136
+ return entries.flatMap((entry)=>entry.stateDiff ?? []);
137
+ }
@@ -14,8 +14,6 @@ export interface IEmpireBase {
14
14
  computeRound(slot: SlotNumber): Promise<bigint>;
15
15
  createSignalRequest(payload: Hex): L1TxRequest;
16
16
  createSignalRequestWithSignature(payload: Hex, slot: SlotNumber, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
17
- /** Checks if a payload was ever submitted to governance via submitRoundWinner. */
18
- hasPayloadBeenProposed(payload: Hex, fromBlock: bigint): Promise<boolean>;
19
17
  }
20
18
  export declare function encodeSignal(payload: Hex): Hex;
21
19
  export declare function encodeSignalWithSignature(payload: Hex, signature: Signature): `0x${string}`;
@@ -29,4 +27,4 @@ export declare function encodeSignalWithSignature(payload: Hex, signature: Signa
29
27
  * @returns The EIP-712 signature
30
28
  */
31
29
  export declare function signSignalWithSig(signer: (msg: TypedDataDefinition) => Promise<Hex>, payload: Hex, slot: SlotNumber, instance: Hex, verifyingContract: Hex, chainId: number): Promise<Signature>;
32
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1waXJlX2Jhc2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvZW1waXJlX2Jhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRzVELE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBRSxLQUFLLG1CQUFtQixFQUFzQixNQUFNLE1BQU0sQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxNQUFNLFdBQVcsV0FBVztJQUMxQixJQUFJLE9BQU8sSUFBSSxVQUFVLENBQUM7SUFDMUIsWUFBWSxDQUNWLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLEtBQUssRUFBRSxNQUFNLEdBQ1osT0FBTyxDQUFDO1FBQUUsY0FBYyxFQUFFLFVBQVUsQ0FBQztRQUFDLHNCQUFzQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxPQUFPLENBQUM7UUFBQyxRQUFRLEVBQUUsT0FBTyxDQUFBO0tBQUUsQ0FBQyxDQUFDO0lBQ25ILFlBQVksQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNoRCxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFdBQVcsQ0FBQztJQUMvQyxnQ0FBZ0MsQ0FDOUIsT0FBTyxFQUFFLEdBQUcsRUFDWixJQUFJLEVBQUUsVUFBVSxFQUNoQixPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQ2pELE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUN4QixrRkFBa0Y7SUFDbEYsc0JBQXNCLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztDQUMzRTtBQUVELHdCQUFnQixZQUFZLENBQUMsT0FBTyxFQUFFLEdBQUcsR0FBRyxHQUFHLENBTTlDO0FBRUQsd0JBQWdCLHlCQUF5QixDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLFNBQVMsaUJBTTNFO0FBRUQ7Ozs7Ozs7O0dBUUc7QUFDSCx3QkFBc0IsaUJBQWlCLENBQ3JDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ2xELE9BQU8sRUFBRSxHQUFHLEVBQ1osSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLEdBQUcsRUFDYixpQkFBaUIsRUFBRSxHQUFHLEVBQ3RCLE9BQU8sRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQThCcEIifQ==
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1waXJlX2Jhc2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvZW1waXJlX2Jhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRzVELE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBRSxLQUFLLG1CQUFtQixFQUFzQixNQUFNLE1BQU0sQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxNQUFNLFdBQVcsV0FBVztJQUMxQixJQUFJLE9BQU8sSUFBSSxVQUFVLENBQUM7SUFDMUIsWUFBWSxDQUNWLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLEtBQUssRUFBRSxNQUFNLEdBQ1osT0FBTyxDQUFDO1FBQUUsY0FBYyxFQUFFLFVBQVUsQ0FBQztRQUFDLHNCQUFzQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxPQUFPLENBQUM7UUFBQyxRQUFRLEVBQUUsT0FBTyxDQUFBO0tBQUUsQ0FBQyxDQUFDO0lBQ25ILFlBQVksQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNoRCxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFdBQVcsQ0FBQztJQUMvQyxnQ0FBZ0MsQ0FDOUIsT0FBTyxFQUFFLEdBQUcsRUFDWixJQUFJLEVBQUUsVUFBVSxFQUNoQixPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQ2pELE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztDQUN6QjtBQUVELHdCQUFnQixZQUFZLENBQUMsT0FBTyxFQUFFLEdBQUcsR0FBRyxHQUFHLENBTTlDO0FBRUQsd0JBQWdCLHlCQUF5QixDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLFNBQVMsaUJBTTNFO0FBRUQ7Ozs7Ozs7O0dBUUc7QUFDSCx3QkFBc0IsaUJBQWlCLENBQ3JDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ2xELE9BQU8sRUFBRSxHQUFHLEVBQ1osSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLEdBQUcsRUFDYixpQkFBaUIsRUFBRSxHQUFHLEVBQ3RCLE9BQU8sRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQThCcEIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"empire_base.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAsB,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,IAAI,OAAO,IAAI,UAAU,CAAC;IAC1B,YAAY,CACV,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,UAAU,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,aAAa,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnH,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C,gCAAgC,CAC9B,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAAC;IACxB,kFAAkF;IAClF,sBAAsB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3E;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAM9C;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,iBAM3E;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,EAClD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,GAAG,EACb,iBAAiB,EAAE,GAAG,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,CA8BpB"}
1
+ {"version":3,"file":"empire_base.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAsB,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,IAAI,OAAO,IAAI,UAAU,CAAC;IAC1B,YAAY,CACV,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,UAAU,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,aAAa,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnH,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C,gCAAgC,CAC9B,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAM9C;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,iBAM3E;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,EAClD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,GAAG,EACb,iBAAiB,EAAE,GAAG,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,CA8BpB"}
@@ -31,9 +31,13 @@ export declare class FeeAssetPriceOracle {
31
31
  *
32
32
  * Returns 0 if not on mainnet or if the oracle query fails.
33
33
  *
34
+ * @param currentPriceE12 - Optional override for the parent checkpoint's eth-per-fee-asset
35
+ * (E12 scale). When omitted, the latest published value is read from L1. Pipelined
36
+ * proposers should supply the predicted parent value so the modifier they emit aligns
37
+ * with the parent fee header L1 will see when the previous pipelined checkpoint lands.
34
38
  * @returns The price modifier in basis points (positive to increase price, negative to decrease)
35
39
  */
36
- computePriceModifier(): Promise<bigint>;
40
+ computePriceModifier(currentPriceE12?: bigint): Promise<bigint>;
37
41
  /**
38
42
  * Gets the current oracle price (ETH per fee asset, scaled by 1e12).
39
43
  * Returns undefined if not on mainnet or if the oracle query fails.
@@ -98,4 +102,4 @@ declare class UniswapPriceOracle {
98
102
  getMeanEthPerFeeAssetE12(numBlocks?: number): Promise<bigint>;
99
103
  }
100
104
  export {};
101
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2Fzc2V0X3ByaWNlX29yYWNsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9mZWVfYXNzZXRfcHJpY2Vfb3JhY2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUFtRSxNQUFNLE1BQU0sQ0FBQztBQUVqRyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU3Qyw4RUFBNEU7QUFDNUUsZUFBTyxNQUFNLGdDQUFnQyxPQUFPLENBQUM7QUFFckQ7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUV2RTtBQUVEOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQjtJQUU1QixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsR0FBRztJQUhiLFlBQ1UsTUFBTSxFQUFFLFVBQVUsRUFDVCxjQUFjLEVBQUUsY0FBYyxFQUN2QyxHQUFHLEdBQUUsTUFBK0MsRUFDMUQ7SUFHRSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEdBQUcsU0FBUyxDQUFDLENBb0JoRTtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNHLG9CQUFvQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0EyQjVDO0lBRUQ7OztPQUdHO0lBQ0csY0FBYyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBWWxEO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsdUJBQXVCLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FrQnpFO0NBQ0Y7QUFFRCxvREFBb0Q7QUFDcEQsZUFBTyxNQUFNLGtCQUFrQixZQUFzRSxDQUFDO0FBSXRHOzs7Ozs7Ozs7OztHQVdHO0FBQ0gsd0JBQWdCLCtCQUErQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUs1RTtBQW1CRDs7O0dBR0c7QUFDSCxjQUFNLGtCQUFrQjtJQU1wQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFMekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7SUFDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQU07SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQVM7SUFFN0IsWUFDbUIsTUFBTSxFQUFFLFVBQVUsRUFDbkMsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQVViO0lBRUQ7Ozs7O09BS0c7SUFFSCxhQUFhLElBQUksR0FBRyxDQVVuQjtJQUVLLGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHMUM7SUFFRDs7Ozs7T0FLRztJQUNHLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTWhFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csd0JBQXdCLENBQUMsU0FBUyxHQUFFLE1BQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBMkJyRTtDQUNGIn0=
105
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2Fzc2V0X3ByaWNlX29yYWNsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9mZWVfYXNzZXRfcHJpY2Vfb3JhY2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUFtRSxNQUFNLE1BQU0sQ0FBQztBQUVqRyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU3Qyw4RUFBNEU7QUFDNUUsZUFBTyxNQUFNLGdDQUFnQyxPQUFPLENBQUM7QUFFckQ7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUV2RTtBQUVEOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQjtJQUU1QixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsR0FBRztJQUhiLFlBQ1UsTUFBTSxFQUFFLFVBQVUsRUFDVCxjQUFjLEVBQUUsY0FBYyxFQUN2QyxHQUFHLEdBQUUsTUFBK0MsRUFDMUQ7SUFHRSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsa0JBQWtCLEdBQUcsU0FBUyxDQUFDLENBb0JoRTtJQUVEOzs7Ozs7Ozs7Ozs7O09BYUc7SUFDRyxvQkFBb0IsQ0FBQyxlQUFlLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTRCcEU7SUFFRDs7O09BR0c7SUFDRyxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FZbEQ7SUFFRDs7Ozs7O09BTUc7SUFDSCx1QkFBdUIsQ0FBQyxZQUFZLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCekU7Q0FDRjtBQUVELG9EQUFvRDtBQUNwRCxlQUFPLE1BQU0sa0JBQWtCLFlBQXNFLENBQUM7QUFJdEc7Ozs7Ozs7Ozs7O0dBV0c7QUFDSCx3QkFBZ0IsK0JBQStCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBSzVFO0FBbUJEOzs7R0FHRztBQUNILGNBQU0sa0JBQWtCO0lBTXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUx6QixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQztJQUMzQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBTTtJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUU3QixZQUNtQixNQUFNLEVBQUUsVUFBVSxFQUNuQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBVWI7SUFFRDs7Ozs7T0FLRztJQUVILGFBQWEsSUFBSSxHQUFHLENBVW5CO0lBRUssaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUcxQztJQUVEOzs7OztPQUtHO0lBQ0csb0JBQW9CLENBQUMsV0FBVyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FNaEU7SUFFRDs7Ozs7O09BTUc7SUFDRyx3QkFBd0IsQ0FBQyxTQUFTLEdBQUUsTUFBVSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0EyQnJFO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"fee_asset_price_oracle.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_price_oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,KAAK,GAAG,EAAmE,MAAM,MAAM,CAAC;AAEjG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,8EAA4E;AAC5E,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,GAAG;IAHb,YACU,MAAM,EAAE,UAAU,EACT,cAAc,EAAE,cAAc,EACvC,GAAG,GAAE,MAA+C,EAC1D;IAGE,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoBhE;IAED;;;;;;;;;OASG;IACG,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CA2B5C;IAED;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYlD;IAED;;;;;;OAMG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAkBzE;CACF;AAED,oDAAoD;AACpD,eAAO,MAAM,kBAAkB,YAAsE,CAAC;AAItG;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAK5E;AAmBD;;;GAGG;AACH,cAAM,kBAAkB;IAMpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAM;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,MAAM,EAAE,UAAU,EACnC,GAAG,CAAC,EAAE,MAAM,EAUb;IAED;;;;;OAKG;IAEH,aAAa,IAAI,GAAG,CAUnB;IAEK,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAG1C;IAED;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhE;IAED;;;;;;OAMG;IACG,wBAAwB,CAAC,SAAS,GAAE,MAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CA2BrE;CACF"}
1
+ {"version":3,"file":"fee_asset_price_oracle.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_price_oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,KAAK,GAAG,EAAmE,MAAM,MAAM,CAAC;AAEjG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,8EAA4E;AAC5E,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,GAAG;IAHb,YACU,MAAM,EAAE,UAAU,EACT,cAAc,EAAE,cAAc,EACvC,GAAG,GAAE,MAA+C,EAC1D;IAGE,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoBhE;IAED;;;;;;;;;;;;;OAaG;IACG,oBAAoB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BpE;IAED;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYlD;IAED;;;;;;OAMG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAkBzE;CACF;AAED,oDAAoD;AACpD,eAAO,MAAM,kBAAkB,YAAsE,CAAC;AAItG;;;;;;;;;;;GAWG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAK5E;AAmBD;;;GAGG;AACH,cAAM,kBAAkB;IAMpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAM;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,MAAM,EAAE,UAAU,EACnC,GAAG,CAAC,EAAE,MAAM,EAUb;IAED;;;;;OAKG;IAEH,aAAa,IAAI,GAAG,CAUnB;IAEK,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAG1C;IAED;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhE;IAED;;;;;;OAMG;IACG,wBAAwB,CAAC,SAAS,GAAE,MAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CA2BrE;CACF"}
@@ -436,23 +436,28 @@ import { encodeAbiParameters, getContract, keccak256, parseAbiParameters } from
436
436
  *
437
437
  * Returns 0 if not on mainnet or if the oracle query fails.
438
438
  *
439
+ * @param currentPriceE12 - Optional override for the parent checkpoint's eth-per-fee-asset
440
+ * (E12 scale). When omitted, the latest published value is read from L1. Pipelined
441
+ * proposers should supply the predicted parent value so the modifier they emit aligns
442
+ * with the parent fee header L1 will see when the previous pipelined checkpoint lands.
439
443
  * @returns The price modifier in basis points (positive to increase price, negative to decrease)
440
- */ async computePriceModifier() {
444
+ */ async computePriceModifier(currentPriceE12) {
441
445
  const uniswapOracle = await this.getUniswapOracle();
442
446
  if (!uniswapOracle) {
443
447
  return 0n;
444
448
  }
445
449
  try {
446
- // Get current on-chain price (ETH per fee asset, E12)
447
- const currentPriceE12 = await this.rollupContract.getEthPerFeeAsset();
450
+ // Get current on-chain price (ETH per fee asset, E12), preferring the caller-supplied value.
451
+ const resolvedCurrentPriceE12 = currentPriceE12 ?? await this.rollupContract.getEthPerFeeAsset();
448
452
  // Get oracle price (median of last N blocks, ETH per fee asset, E12)
449
453
  const oraclePriceE12 = await uniswapOracle.getMeanEthPerFeeAssetE12();
450
454
  // Compute modifier in basis points
451
- const modifier = this.computePriceModifierBps(currentPriceE12, oraclePriceE12);
455
+ const modifier = this.computePriceModifierBps(resolvedCurrentPriceE12, oraclePriceE12);
452
456
  this.log.debug('Computed price modifier', {
453
- currentPriceE12: currentPriceE12.toString(),
457
+ currentPriceE12: resolvedCurrentPriceE12.toString(),
454
458
  oraclePriceE12: oraclePriceE12.toString(),
455
- modifierBps: modifier.toString()
459
+ modifierBps: modifier.toString(),
460
+ currentPriceFromCaller: currentPriceE12 !== undefined
456
461
  });
457
462
  return modifier;
458
463
  } catch (err) {