@aztec/ethereum 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

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 (229) hide show
  1. package/dest/account.d.ts +1 -1
  2. package/dest/chain.d.ts +1 -1
  3. package/dest/client.d.ts +10 -2
  4. package/dest/client.d.ts.map +1 -1
  5. package/dest/client.js +13 -3
  6. package/dest/config.d.ts +24 -68
  7. package/dest/config.d.ts.map +1 -1
  8. package/dest/config.js +67 -380
  9. package/dest/constants.d.ts +1 -1
  10. package/dest/contracts/empire_base.d.ts +9 -5
  11. package/dest/contracts/empire_base.d.ts.map +1 -1
  12. package/dest/contracts/empire_base.js +1 -1
  13. package/dest/contracts/empire_slashing_proposer.d.ts +8 -4
  14. package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
  15. package/dest/contracts/empire_slashing_proposer.js +39 -17
  16. package/dest/contracts/errors.d.ts +1 -1
  17. package/dest/contracts/errors.d.ts.map +1 -1
  18. package/dest/contracts/fee_asset_handler.d.ts +6 -5
  19. package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
  20. package/dest/contracts/fee_asset_handler.js +11 -9
  21. package/dest/contracts/fee_asset_price_oracle.d.ts +101 -0
  22. package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
  23. package/dest/contracts/fee_asset_price_oracle.js +651 -0
  24. package/dest/contracts/fee_juice.d.ts +1 -1
  25. package/dest/contracts/fee_juice.d.ts.map +1 -1
  26. package/dest/contracts/governance.d.ts +18 -16
  27. package/dest/contracts/governance.d.ts.map +1 -1
  28. package/dest/contracts/governance.js +14 -4
  29. package/dest/contracts/governance_proposer.d.ts +8 -4
  30. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  31. package/dest/contracts/governance_proposer.js +412 -11
  32. package/dest/contracts/gse.d.ts +1 -1
  33. package/dest/contracts/gse.d.ts.map +1 -1
  34. package/dest/contracts/inbox.d.ts +24 -3
  35. package/dest/contracts/inbox.d.ts.map +1 -1
  36. package/dest/contracts/inbox.js +36 -1
  37. package/dest/contracts/index.d.ts +4 -1
  38. package/dest/contracts/index.d.ts.map +1 -1
  39. package/dest/contracts/index.js +3 -0
  40. package/dest/contracts/log.d.ts +13 -0
  41. package/dest/contracts/log.d.ts.map +1 -0
  42. package/dest/contracts/log.js +1 -0
  43. package/dest/contracts/multicall.d.ts +2 -2
  44. package/dest/contracts/multicall.d.ts.map +1 -1
  45. package/dest/contracts/multicall.js +2 -1
  46. package/dest/contracts/outbox.d.ts +41 -0
  47. package/dest/contracts/outbox.d.ts.map +1 -0
  48. package/dest/contracts/outbox.js +86 -0
  49. package/dest/contracts/registry.d.ts +3 -1
  50. package/dest/contracts/registry.d.ts.map +1 -1
  51. package/dest/contracts/registry.js +30 -1
  52. package/dest/contracts/rollup.d.ts +208 -123
  53. package/dest/contracts/rollup.d.ts.map +1 -1
  54. package/dest/contracts/rollup.js +807 -188
  55. package/dest/contracts/slasher_contract.d.ts +1 -1
  56. package/dest/contracts/slasher_contract.d.ts.map +1 -1
  57. package/dest/contracts/tally_slashing_proposer.d.ts +9 -7
  58. package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -1
  59. package/dest/contracts/tally_slashing_proposer.js +11 -4
  60. package/dest/contracts/utils.d.ts +1 -1
  61. package/dest/deploy_aztec_l1_contracts.d.ts +259 -0
  62. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -0
  63. package/dest/deploy_aztec_l1_contracts.js +413 -0
  64. package/dest/deploy_l1_contract.d.ts +68 -0
  65. package/dest/deploy_l1_contract.d.ts.map +1 -0
  66. package/dest/deploy_l1_contract.js +312 -0
  67. package/dest/eth-signer/eth-signer.d.ts +1 -1
  68. package/dest/eth-signer/index.d.ts +1 -1
  69. package/dest/forwarder_proxy.d.ts +32 -0
  70. package/dest/forwarder_proxy.d.ts.map +1 -0
  71. package/dest/forwarder_proxy.js +93 -0
  72. package/dest/generated/l1-contracts-defaults.d.ts +30 -0
  73. package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
  74. package/dest/generated/l1-contracts-defaults.js +30 -0
  75. package/dest/l1_artifacts.d.ts +7608 -2048
  76. package/dest/l1_artifacts.d.ts.map +1 -1
  77. package/dest/l1_contract_addresses.d.ts +3 -3
  78. package/dest/l1_contract_addresses.d.ts.map +1 -1
  79. package/dest/l1_contract_addresses.js +3 -3
  80. package/dest/l1_reader.d.ts +5 -1
  81. package/dest/l1_reader.d.ts.map +1 -1
  82. package/dest/l1_reader.js +12 -1
  83. package/dest/l1_tx_utils/config.d.ts +11 -5
  84. package/dest/l1_tx_utils/config.d.ts.map +1 -1
  85. package/dest/l1_tx_utils/config.js +43 -7
  86. package/dest/l1_tx_utils/constants.d.ts +8 -2
  87. package/dest/l1_tx_utils/constants.d.ts.map +1 -1
  88. package/dest/l1_tx_utils/constants.js +27 -2
  89. package/dest/l1_tx_utils/factory.d.ts +18 -10
  90. package/dest/l1_tx_utils/factory.d.ts.map +1 -1
  91. package/dest/l1_tx_utils/factory.js +17 -7
  92. package/dest/l1_tx_utils/fee-strategies/index.d.ts +10 -0
  93. package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -0
  94. package/dest/l1_tx_utils/fee-strategies/index.js +12 -0
  95. package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +8 -0
  96. package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -0
  97. package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +129 -0
  98. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +23 -0
  99. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -0
  100. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +191 -0
  101. package/dest/l1_tx_utils/fee-strategies/types.d.ts +51 -0
  102. package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -0
  103. package/dest/l1_tx_utils/fee-strategies/types.js +3 -0
  104. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +41 -0
  105. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -0
  106. package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +42 -0
  107. package/dest/l1_tx_utils/index-blobs.d.ts +3 -0
  108. package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -0
  109. package/dest/l1_tx_utils/index-blobs.js +2 -0
  110. package/dest/l1_tx_utils/index.d.ts +4 -1
  111. package/dest/l1_tx_utils/index.d.ts.map +1 -1
  112. package/dest/l1_tx_utils/index.js +3 -0
  113. package/dest/l1_tx_utils/interfaces.d.ts +2 -2
  114. package/dest/l1_tx_utils/interfaces.d.ts.map +1 -1
  115. package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +233 -0
  116. package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -0
  117. package/dest/l1_tx_utils/l1_fee_analyzer.js +506 -0
  118. package/dest/l1_tx_utils/l1_tx_utils.d.ts +18 -8
  119. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  120. package/dest/l1_tx_utils/l1_tx_utils.js +75 -46
  121. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +19 -30
  122. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  123. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +63 -167
  124. package/dest/l1_tx_utils/signer.d.ts +1 -1
  125. package/dest/l1_tx_utils/tx_delayer.d.ts +56 -0
  126. package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
  127. package/dest/{test → l1_tx_utils}/tx_delayer.js +65 -36
  128. package/dest/l1_tx_utils/types.d.ts +1 -1
  129. package/dest/l1_tx_utils/types.d.ts.map +1 -1
  130. package/dest/l1_tx_utils/utils.d.ts +1 -1
  131. package/dest/l1_types.d.ts +1 -1
  132. package/dest/publisher_manager.d.ts +3 -2
  133. package/dest/publisher_manager.d.ts.map +1 -1
  134. package/dest/publisher_manager.js +2 -2
  135. package/dest/queries.d.ts +2 -2
  136. package/dest/queries.d.ts.map +1 -1
  137. package/dest/queries.js +16 -6
  138. package/dest/test/chain_monitor.d.ts +47 -25
  139. package/dest/test/chain_monitor.d.ts.map +1 -1
  140. package/dest/test/chain_monitor.js +66 -38
  141. package/dest/test/eth_cheat_codes.d.ts +11 -3
  142. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  143. package/dest/test/eth_cheat_codes.js +11 -3
  144. package/dest/test/eth_cheat_codes_with_state.d.ts +1 -1
  145. package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -1
  146. package/dest/test/index.d.ts +1 -3
  147. package/dest/test/index.d.ts.map +1 -1
  148. package/dest/test/index.js +0 -2
  149. package/dest/test/rollup_cheat_codes.d.ts +17 -13
  150. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  151. package/dest/test/rollup_cheat_codes.js +62 -38
  152. package/dest/test/start_anvil.d.ts +18 -2
  153. package/dest/test/start_anvil.d.ts.map +1 -1
  154. package/dest/test/start_anvil.js +129 -28
  155. package/dest/test/upgrade_utils.d.ts +1 -1
  156. package/dest/test/upgrade_utils.js +2 -2
  157. package/dest/types.d.ts +57 -2
  158. package/dest/types.d.ts.map +1 -1
  159. package/dest/utils.d.ts +16 -3
  160. package/dest/utils.d.ts.map +1 -1
  161. package/dest/utils.js +80 -12
  162. package/dest/zkPassportVerifierAddress.d.ts +1 -1
  163. package/package.json +34 -16
  164. package/src/client.ts +10 -2
  165. package/src/config.ts +86 -460
  166. package/src/contracts/README.md +157 -0
  167. package/src/contracts/empire_base.ts +8 -5
  168. package/src/contracts/empire_slashing_proposer.ts +38 -32
  169. package/src/contracts/fee_asset_handler.ts +10 -7
  170. package/src/contracts/fee_asset_price_oracle.ts +280 -0
  171. package/src/contracts/governance.ts +13 -4
  172. package/src/contracts/governance_proposer.ts +26 -6
  173. package/src/contracts/inbox.ts +55 -3
  174. package/src/contracts/index.ts +3 -0
  175. package/src/contracts/log.ts +13 -0
  176. package/src/contracts/multicall.ts +5 -2
  177. package/src/contracts/outbox.ts +98 -0
  178. package/src/contracts/registry.ts +31 -1
  179. package/src/contracts/rollup.ts +485 -162
  180. package/src/contracts/tally_slashing_proposer.ts +15 -8
  181. package/src/deploy_aztec_l1_contracts.ts +650 -0
  182. package/src/deploy_l1_contract.ts +362 -0
  183. package/src/forwarder_proxy.ts +108 -0
  184. package/src/generated/l1-contracts-defaults.ts +32 -0
  185. package/src/l1_contract_addresses.ts +22 -20
  186. package/src/l1_reader.ts +21 -1
  187. package/src/l1_tx_utils/config.ts +52 -11
  188. package/src/l1_tx_utils/constants.ts +13 -2
  189. package/src/l1_tx_utils/factory.ts +31 -31
  190. package/src/l1_tx_utils/fee-strategies/index.ts +22 -0
  191. package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +163 -0
  192. package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +245 -0
  193. package/src/l1_tx_utils/fee-strategies/types.ts +56 -0
  194. package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +108 -0
  195. package/src/l1_tx_utils/index-blobs.ts +2 -0
  196. package/src/l1_tx_utils/index.ts +3 -0
  197. package/src/l1_tx_utils/interfaces.ts +1 -1
  198. package/src/l1_tx_utils/l1_fee_analyzer.ts +803 -0
  199. package/src/l1_tx_utils/l1_tx_utils.ts +84 -36
  200. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +77 -213
  201. package/src/{test → l1_tx_utils}/tx_delayer.ts +82 -52
  202. package/src/publisher_manager.ts +4 -2
  203. package/src/queries.ts +17 -6
  204. package/src/test/chain_monitor.ts +110 -51
  205. package/src/test/eth_cheat_codes.ts +9 -3
  206. package/src/test/index.ts +0 -2
  207. package/src/test/rollup_cheat_codes.ts +63 -43
  208. package/src/test/start_anvil.ts +156 -27
  209. package/src/test/upgrade_utils.ts +2 -2
  210. package/src/types.ts +62 -0
  211. package/src/utils.ts +100 -15
  212. package/dest/deploy_l1_contracts.d.ts +0 -226
  213. package/dest/deploy_l1_contracts.d.ts.map +0 -1
  214. package/dest/deploy_l1_contracts.js +0 -1473
  215. package/dest/index.d.ts +0 -18
  216. package/dest/index.d.ts.map +0 -1
  217. package/dest/index.js +0 -17
  218. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
  219. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
  220. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
  221. package/dest/test/delayed_tx_utils.d.ts +0 -13
  222. package/dest/test/delayed_tx_utils.d.ts.map +0 -1
  223. package/dest/test/delayed_tx_utils.js +0 -28
  224. package/dest/test/tx_delayer.d.ts +0 -36
  225. package/dest/test/tx_delayer.d.ts.map +0 -1
  226. package/src/deploy_l1_contracts.ts +0 -1849
  227. package/src/index.ts +0 -17
  228. package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
  229. package/src/test/delayed_tx_utils.ts +0 -52
package/dest/account.d.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  export declare function getAddressFromPrivateKey(privateKey: `0x${string}`): `0x${string}`;
2
- //# sourceMappingURL=account.d.ts.map
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FjY291bnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsd0JBQWdCLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxLQUFLLE1BQU0sRUFBRSxHQUFHLEtBQUssTUFBTSxFQUFFLENBRWpGIn0=
package/dest/chain.d.ts CHANGED
@@ -22,4 +22,4 @@ export declare function createEthereumChain(rpcUrls: string[], _chainId: number
22
22
  * Helper function to determine if a chain id is an instance of Anvil
23
23
  */
24
24
  export declare function isAnvilTestChain(_chainId: number | string): boolean;
25
- //# sourceMappingURL=chain.d.ts.map
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jaGFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFLbEM7O0dBRUc7QUFDSCxNQUFNLFdBQVcsYUFBYTtJQUM1Qjs7T0FFRztJQUNILFNBQVMsRUFBRSxLQUFLLENBQUM7SUFFakI7O09BRUc7SUFDSCxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDbkI7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxhQUFhLENBK0IvRjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sQ0FTbkUifQ==
package/dest/client.d.ts CHANGED
@@ -8,11 +8,19 @@ 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
+ /** Creates a viem fallback HTTP transport for the given L1 RPC URLs. */
16
+ export declare function makeL1HttpTransport(rpcUrls: string[], opts?: {
17
+ timeout?: number;
18
+ }): import("viem").FallbackTransport<import("viem").HttpTransport<undefined, false>[]>;
13
19
  /** Returns a viem public client given the L1 config. */
14
20
  export declare function getPublicClient(config: Config): ViemPublicClient;
15
21
  /** Returns a viem public client after waiting for the L1 RPC node to become available. */
16
22
  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=client.d.ts.map
23
+ export declare function createExtendedL1Client(rpcUrls: string[], mnemonicOrPrivateKeyOrHdAccount: string | HDAccount | PrivateKeyAccount | LocalAccount, chain?: Chain, pollingIntervalMS?: number, addressIndex?: number, opts?: {
24
+ httpTimeoutMS?: number;
25
+ }): ExtendedViemWalletClient;
26
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLFNBQVMsRUFDZCxLQUFLLFlBQVksRUFDakIsS0FBSyxpQkFBaUIsRUFNdkIsTUFBTSxNQUFNLENBQUM7QUFLZCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUU3RSxLQUFLLE1BQU0sR0FBRztJQUNaLDBGQUEwRjtJQUMxRixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIseUNBQXlDO0lBQ3pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMkNBQTJDO0lBQzNDLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLDBEQUEwRDtJQUMxRCxlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDMUIsQ0FBQztBQUVGLFlBQVksRUFBRSxNQUFNLElBQUksb0JBQW9CLEVBQUUsQ0FBQztBQUUvQyx3RUFBd0U7QUFDeEUsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLHNGQUVqRjtBQUlELHdEQUF3RDtBQUN4RCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBT2hFO0FBRUQsMEZBQTBGO0FBQzFGLHdCQUFzQixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FJcEc7QUF5QkQsd0JBQWdCLHNCQUFzQixDQUNwQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQ2pCLCtCQUErQixFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsaUJBQWlCLEdBQUcsWUFBWSxFQUN0RixLQUFLLEdBQUUsS0FBZSxFQUN0QixpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sRUFDMUIsWUFBWSxDQUFDLEVBQUUsTUFBTSxFQUNyQixJQUFJLENBQUMsRUFBRTtJQUFFLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ2hDLHdCQUF3QixDQWdCMUIifQ==
@@ -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;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;IAC/B,0DAA0D;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAE/C,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,sFAEjF;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
@@ -3,12 +3,20 @@ import { createPublicClient, createWalletClient, fallback, http, publicActions }
3
3
  import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
4
4
  import { foundry } from 'viem/chains';
5
5
  import { createEthereumChain } from './chain.js';
6
+ /** Creates a viem fallback HTTP transport for the given L1 RPC URLs. */ export function makeL1HttpTransport(rpcUrls, opts) {
7
+ return fallback(rpcUrls.map((url)=>http(url, {
8
+ batch: false,
9
+ timeout: opts?.timeout
10
+ })));
11
+ }
6
12
  // TODO: Use these methods to abstract the creation of viem clients.
7
13
  /** Returns a viem public client given the L1 config. */ export function getPublicClient(config) {
8
14
  const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
9
15
  return createPublicClient({
10
16
  chain: chain.chainInfo,
11
- transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
17
+ transport: makeL1HttpTransport(config.l1RpcUrls, {
18
+ timeout: config.l1HttpTimeoutMS
19
+ }),
12
20
  pollingInterval: config.viemPollingIntervalMS
13
21
  });
14
22
  }
@@ -31,14 +39,16 @@ async function waitForRpc(client, config, logger) {
31
39
  throw new Error(`Ethereum node at ${config.l1RpcUrls.join(', ')} has chain ID ${l1ChainId} but expected ${config.l1ChainId}`);
32
40
  }
33
41
  }
34
- export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex) {
42
+ export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex, opts) {
35
43
  const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string' ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x') ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, {
36
44
  addressIndex
37
45
  }) : mnemonicOrPrivateKeyOrHdAccount;
38
46
  const extendedClient = createWalletClient({
39
47
  account: hdAccount,
40
48
  chain,
41
- transport: fallback(rpcUrls.map((url)=>http(url))),
49
+ transport: makeL1HttpTransport(rpcUrls, {
50
+ timeout: opts?.httpTimeoutMS
51
+ }),
42
52
  pollingInterval: pollingIntervalMS
43
53
  }).extend(publicActions);
44
54
  return extendedClient;
package/dest/config.d.ts CHANGED
@@ -1,11 +1,13 @@
1
- import { type ConfigMappingsType, type NetworkNames } from '@aztec/foundation/config';
1
+ import { type ConfigMappingsType } from '@aztec/foundation/config';
2
2
  import { EthAddress } from '@aztec/foundation/eth-address';
3
- import { type L1TxUtilsConfig } from './l1_tx_utils/index.js';
3
+ import { type L1TxUtilsConfig } from './l1_tx_utils/config.js';
4
4
  export type GenesisStateConfig = {
5
5
  /** Whether to populate the genesis state with initial fee juice for the test accounts */
6
6
  testAccounts: boolean;
7
7
  /** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
8
8
  sponsoredFPC: boolean;
9
+ /** Additional addresses to prefund with fee juice at genesis */
10
+ prefundAddresses: string[];
9
11
  };
10
12
  export type L1ContractsConfig = {
11
13
  /** How many seconds an L1 slot lasts. */
@@ -17,7 +19,11 @@ export type L1ContractsConfig = {
17
19
  /** The target validator committee size. */
18
20
  aztecTargetCommitteeSize: number;
19
21
  /** The number of epochs to lag behind the current epoch for validator selection. */
20
- lagInEpochs: number;
22
+ lagInEpochsForValidatorSet: number;
23
+ /** The number of epochs to lag behind the current epoch for randao selection. */
24
+ lagInEpochsForRandao: number;
25
+ /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
26
+ inboxLag: number;
21
27
  /** The number of epochs after an epoch ends that proofs are still accepted. */
22
28
  aztecProofSubmissionEpochs: number;
23
29
  /** The deposit amount for a validator */
@@ -52,79 +58,29 @@ export type L1ContractsConfig = {
52
58
  governanceProposerQuorum?: number;
53
59
  /** Governance proposing round size */
54
60
  governanceProposerRoundSize: number;
61
+ /** Governance voting duration in seconds (only for local/devnet/next-net, default 3600) */
62
+ governanceVotingDuration?: number;
55
63
  /** The mana target for the rollup */
56
64
  manaTarget: bigint;
57
65
  /** The proving cost per mana */
58
66
  provingCostPerMana: bigint;
67
+ /** The initial ETH per fee asset price (with 1e12 precision) */
68
+ initialEthPerFeeAsset: bigint;
59
69
  /** The number of seconds to wait for an exit */
60
70
  exitDelaySeconds: number;
61
71
  } & L1TxUtilsConfig;
62
- export declare const DefaultL1ContractsConfig: {
63
- ethereumSlotDuration: number;
64
- aztecSlotDuration: number;
65
- aztecEpochDuration: number;
66
- aztecTargetCommitteeSize: number;
67
- lagInEpochs: number;
68
- aztecProofSubmissionEpochs: number;
69
- activationThreshold: bigint;
70
- ejectionThreshold: bigint;
71
- localEjectionThreshold: bigint;
72
- slashAmountSmall: bigint;
73
- slashAmountMedium: bigint;
74
- slashAmountLarge: bigint;
75
- slashingRoundSizeInEpochs: number;
76
- slashingLifetimeInRounds: number;
77
- slashingExecutionDelayInRounds: number;
78
- slashingVetoer: EthAddress;
79
- governanceProposerRoundSize: number;
80
- manaTarget: bigint;
81
- provingCostPerMana: bigint;
82
- exitDelaySeconds: number;
83
- slasherFlavor: "tally";
84
- slashingOffsetInRounds: number;
85
- slashingDisableDuration: number;
86
- };
87
- export declare const getGovernanceConfiguration: (networkName: NetworkNames) => {
88
- proposeConfig: {
89
- lockDelay: bigint;
90
- lockAmount: bigint;
91
- };
92
- votingDelay: bigint;
93
- votingDuration: bigint;
94
- executionDelay: bigint;
95
- gracePeriod: bigint;
96
- quorum: bigint;
97
- requiredYeaMargin: bigint;
98
- minimumVotes: bigint;
99
- };
100
- export declare const getRewardConfig: (networkName: NetworkNames) => {
101
- sequencerBps: number;
102
- rewardDistributor: `0x${string}`;
103
- booster: `0x${string}`;
104
- blockReward: bigint;
105
- };
106
- export declare const getRewardBoostConfig: () => {
107
- increment: number;
108
- maxScore: number;
109
- a: number;
110
- k: number;
111
- minimum: number;
112
- };
113
- export declare const getEntryQueueConfig: (networkName: NetworkNames) => {
114
- bootstrapValidatorSetSize: bigint;
115
- bootstrapFlushSize: bigint;
116
- normalFlushSizeMin: bigint;
117
- normalFlushSizeQuotient: bigint;
118
- maxQueueFlushSize: bigint;
119
- };
72
+ /**
73
+ * Config mappings for L1ContractsConfig.
74
+ * Default values come from generated l1-contracts-defaults.json (source: defaults.yml).
75
+ * Real deployments use forge scripts which require explicit env vars (vm.envUint).
76
+ */
120
77
  export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig>;
78
+ /**
79
+ * Default L1 contracts configuration derived from l1ContractsConfigMappings.
80
+ * Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
81
+ */
82
+ export declare const DefaultL1ContractsConfig: L1ContractsConfig;
121
83
  export declare const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig>;
122
84
  export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
123
85
  export declare function getGenesisStateConfigEnvVars(): GenesisStateConfig;
124
- /**
125
- * Validates the L1 contracts configuration to ensure all requirements enforced by L1 contracts
126
- * during construction are satisfied before deployment.
127
- * Accumulates all validation errors and throws an exception listing them all if any are found.
128
- */
129
- export declare function validateConfig(config: Omit<L1ContractsConfig, keyof L1TxUtilsConfig>): void;
130
- //# sourceMappingURL=config.d.ts.map
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQVN4QixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUM1QixDQUFDO0FBRUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLHlDQUF5QztJQUN6QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IsdUZBQXVGO0lBQ3ZGLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQix3Q0FBd0M7SUFDeEMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLDJDQUEyQztJQUMzQyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMsb0ZBQW9GO0lBQ3BGLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyxpRkFBaUY7SUFDakYsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLHNGQUFzRjtJQUN0RixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLCtFQUErRTtJQUMvRSwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkMseUNBQXlDO0lBQ3pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztJQUM1Qix5Q0FBeUM7SUFDekMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1IQUFtSDtJQUNuSCxzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0Isd0tBQXdLO0lBQ3hLLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4Qiw0RUFBNEU7SUFDNUUseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLGdHQUFnRztJQUNoRyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMseUdBQXlHO0lBQ3pHLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUN2Qyx5RUFBeUU7SUFDekUsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQiw0SUFBNEk7SUFDNUksc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLCtFQUErRTtJQUMvRSx1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsK0JBQStCO0lBQy9CLGFBQWEsRUFBRSxRQUFRLEdBQUcsT0FBTyxHQUFHLE1BQU0sQ0FBQztJQUMzQywyREFBMkQ7SUFDM0QsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLCtDQUErQztJQUMvQyxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIscUVBQXFFO0lBQ3JFLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixnRUFBZ0U7SUFDaEUsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEMsc0NBQXNDO0lBQ3RDLDJCQUEyQixFQUFFLE1BQU0sQ0FBQztJQUNwQywyRkFBMkY7SUFDM0Ysd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEMscUNBQXFDO0lBQ3JDLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsZ0NBQWdDO0lBQ2hDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixnRUFBZ0U7SUFDaEUscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLGdEQUFnRDtJQUNoRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUIsR0FBRyxlQUFlLENBQUM7QUFFcEI7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsQ0F5SjNFLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sd0JBQXdCLG1CQUE4QyxDQUFDO0FBRXBGLGVBQU8sTUFBTSwwQkFBMEIsRUFBRSxrQkFBa0IsQ0FBQyxrQkFBa0IsQ0FxQjdFLENBQUM7QUFFRix3QkFBZ0IsMkJBQTJCLElBQUksaUJBQWlCLENBRS9EO0FBRUQsd0JBQWdCLDRCQUE0QixJQUFJLGtCQUFrQixDQUVqRSJ9
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAEvF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,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,WAAW,EAAE,MAAM,CAAC;IACpB,+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,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAC;AA2E9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAmBnE,CAAC;AAoBF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAcxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AA2CF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAmB5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkI3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
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"}