@aztec/ethereum 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/client.d.ts +16 -2
- package/dest/client.d.ts.map +1 -1
- package/dest/client.js +27 -7
- package/dest/config.d.ts +22 -33
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +59 -64
- package/dest/contracts/chain_state_override.d.ts +78 -0
- package/dest/contracts/chain_state_override.d.ts.map +1 -0
- package/dest/contracts/chain_state_override.js +137 -0
- package/dest/contracts/fee_asset_handler.d.ts +1 -1
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.js +2 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts +105 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
- package/dest/contracts/fee_asset_price_oracle.js +656 -0
- package/dest/contracts/governance.d.ts +110 -33
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +207 -16
- package/dest/contracts/governance_proposer.d.ts +33 -1
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +57 -3
- package/dest/contracts/inbox.d.ts +18 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +38 -2
- package/dest/contracts/index.d.ts +5 -3
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +4 -2
- package/dest/contracts/log.d.ts +13 -0
- package/dest/contracts/log.d.ts.map +1 -0
- package/dest/contracts/log.js +1 -0
- package/dest/contracts/multicall.d.ts +127 -12
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +201 -93
- package/dest/contracts/outbox.d.ts +21 -4
- package/dest/contracts/outbox.d.ts.map +1 -1
- package/dest/contracts/outbox.js +29 -6
- package/dest/contracts/registry.d.ts +3 -1
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/registry.js +30 -1
- package/dest/contracts/rollup.d.ts +5288 -27
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +432 -69
- package/dest/contracts/{tally_slashing_proposer.d.ts → slashing_proposer.d.ts} +3 -4
- package/dest/contracts/slashing_proposer.d.ts.map +1 -0
- package/dest/contracts/{tally_slashing_proposer.js → slashing_proposer.js} +18 -13
- package/dest/deploy_aztec_l1_contracts.d.ts +9 -8
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +58 -32
- package/dest/deploy_l1_contract.js +3 -3
- package/dest/generated/l1-contracts-defaults.d.ts +30 -0
- package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
- package/dest/generated/l1-contracts-defaults.js +30 -0
- package/dest/l1_artifacts.d.ts +15699 -16241
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_artifacts.js +9 -24
- package/dest/l1_contract_addresses.d.ts +61 -65
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +101 -82
- package/dest/l1_reader.d.ts +5 -5
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +9 -7
- package/dest/l1_tx_utils/config.d.ts +7 -1
- package/dest/l1_tx_utils/config.d.ts.map +1 -1
- package/dest/l1_tx_utils/config.js +14 -1
- package/dest/l1_tx_utils/constants.d.ts +1 -1
- package/dest/l1_tx_utils/constants.js +2 -2
- package/dest/l1_tx_utils/factory.d.ts +18 -10
- package/dest/l1_tx_utils/factory.d.ts.map +1 -1
- package/dest/l1_tx_utils/factory.js +17 -7
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +1 -1
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +1 -1
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
- package/dest/l1_tx_utils/index-blobs.js +2 -2
- package/dest/l1_tx_utils/index.d.ts +2 -1
- package/dest/l1_tx_utils/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/index.js +1 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +26 -7
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +101 -66
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +11 -7
- package/dest/l1_tx_utils/tx_delayer.d.ts +58 -0
- package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
- package/dest/{test → l1_tx_utils}/tx_delayer.js +67 -37
- package/dest/publisher_manager.d.ts +21 -6
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +81 -7
- package/dest/queries.d.ts +14 -3
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +66 -4
- package/dest/test/chain_monitor.d.ts +23 -3
- package/dest/test/chain_monitor.d.ts.map +1 -1
- package/dest/test/chain_monitor.js +38 -2
- package/dest/test/eth_cheat_codes.d.ts +24 -4
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +17 -4
- package/dest/test/index.d.ts +1 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +0 -2
- package/dest/test/rollup_cheat_codes.d.ts +34 -4
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +69 -8
- package/dest/test/start_anvil.d.ts +23 -3
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +143 -29
- package/dest/test/upgrade_utils.js +2 -2
- package/dest/utils.d.ts +9 -1
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +81 -12
- package/package.json +9 -10
- package/src/client.ts +28 -2
- package/src/config.ts +75 -65
- package/src/contracts/README.md +157 -0
- package/src/contracts/chain_state_override.ts +200 -0
- package/src/contracts/fee_asset_handler.ts +2 -0
- package/src/contracts/fee_asset_price_oracle.ts +285 -0
- package/src/contracts/governance.ts +279 -13
- package/src/contracts/governance_proposer.ts +58 -2
- package/src/contracts/inbox.ts +57 -2
- package/src/contracts/index.ts +4 -2
- package/src/contracts/log.ts +13 -0
- package/src/contracts/multicall.ts +243 -102
- package/src/contracts/outbox.ts +38 -8
- package/src/contracts/registry.ts +31 -1
- package/src/contracts/rollup.ts +500 -68
- package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +16 -14
- package/src/deploy_aztec_l1_contracts.ts +81 -40
- package/src/deploy_l1_contract.ts +3 -3
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_artifacts.ts +12 -35
- package/src/l1_contract_addresses.ts +120 -94
- package/src/l1_reader.ts +17 -10
- package/src/l1_tx_utils/config.ts +20 -0
- package/src/l1_tx_utils/constants.ts +2 -2
- package/src/l1_tx_utils/factory.ts +31 -31
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +1 -1
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +1 -1
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
- package/src/l1_tx_utils/index-blobs.ts +2 -2
- package/src/l1_tx_utils/index.ts +1 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +99 -48
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +11 -7
- package/src/{test → l1_tx_utils}/tx_delayer.ts +93 -56
- package/src/publisher_manager.ts +107 -10
- package/src/queries.ts +73 -5
- package/src/test/chain_monitor.ts +65 -3
- package/src/test/eth_cheat_codes.ts +16 -4
- package/src/test/index.ts +0 -2
- package/src/test/rollup_cheat_codes.ts +75 -8
- package/src/test/start_anvil.ts +177 -29
- package/src/test/upgrade_utils.ts +2 -2
- package/src/utils.ts +88 -14
- package/dest/contracts/empire_slashing_proposer.d.ts +0 -67
- package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
- package/dest/contracts/empire_slashing_proposer.js +0 -209
- package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
- package/dest/test/delayed_tx_utils.d.ts +0 -13
- package/dest/test/delayed_tx_utils.d.ts.map +0 -1
- package/dest/test/delayed_tx_utils.js +0 -28
- package/dest/test/tx_delayer.d.ts +0 -36
- package/dest/test/tx_delayer.d.ts.map +0 -1
- package/src/contracts/empire_slashing_proposer.ts +0 -270
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
- package/src/test/delayed_tx_utils.ts +0 -52
package/dest/client.d.ts
CHANGED
|
@@ -8,11 +8,25 @@ 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>[]>;
|
|
19
|
+
/**
|
|
20
|
+
* Returns the individual RPC URLs underlying a viem public client that was constructed with a
|
|
21
|
+
* fallback HTTP transport (see {@link makeL1HttpTransport}). Returns an empty array if the
|
|
22
|
+
* transport shape is not recognized (e.g. mock clients in tests, or non-fallback transports).
|
|
23
|
+
*/
|
|
24
|
+
export declare function getRpcUrlsFromClient(client: ViemPublicClient): string[];
|
|
13
25
|
/** Returns a viem public client given the L1 config. */
|
|
14
26
|
export declare function getPublicClient(config: Config): ViemPublicClient;
|
|
15
27
|
/** Returns a viem public client after waiting for the L1 RPC node to become available. */
|
|
16
28
|
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
|
|
18
|
-
|
|
29
|
+
export declare function createExtendedL1Client(rpcUrls: string[], mnemonicOrPrivateKeyOrHdAccount: string | HDAccount | PrivateKeyAccount | LocalAccount, chain?: Chain, pollingIntervalMS?: number, addressIndex?: number, opts?: {
|
|
30
|
+
httpTimeoutMS?: number;
|
|
31
|
+
}): ExtendedViemWalletClient;
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLFNBQVMsRUFDZCxLQUFLLFlBQVksRUFDakIsS0FBSyxpQkFBaUIsRUFNdkIsTUFBTSxNQUFNLENBQUM7QUFLZCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUU3RSxLQUFLLE1BQU0sR0FBRztJQUNaLDBGQUEwRjtJQUMxRixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIseUNBQXlDO0lBQ3pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMkNBQTJDO0lBQzNDLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLDBEQUEwRDtJQUMxRCxlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDMUIsQ0FBQztBQUVGLFlBQVksRUFBRSxNQUFNLElBQUksb0JBQW9CLEVBQUUsQ0FBQztBQUUvQyx3RUFBd0U7QUFDeEUsd0JBQWdCLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLHNGQUVqRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0Isb0JBQW9CLENBQUMsTUFBTSxFQUFFLGdCQUFnQixHQUFHLE1BQU0sRUFBRSxDQVd2RTtBQUlELHdEQUF3RDtBQUN4RCx3QkFBZ0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBT2hFO0FBRUQsMEZBQTBGO0FBQzFGLHdCQUFzQixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FJcEc7QUF5QkQsd0JBQWdCLHNCQUFzQixDQUNwQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQ2pCLCtCQUErQixFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsaUJBQWlCLEdBQUcsWUFBWSxFQUN0RixLQUFLLEdBQUUsS0FBZSxFQUN0QixpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sRUFDMUIsWUFBWSxDQUFDLEVBQUUsTUFBTSxFQUNyQixJQUFJLENBQUMsRUFBRTtJQUFFLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ2hDLHdCQUF3QixDQWdCMUIifQ==
|
package/dest/client.d.ts.map
CHANGED
|
@@ -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;
|
|
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;AAED;;;;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
|
@@ -3,14 +3,34 @@ 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
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Returns the individual RPC URLs underlying a viem public client that was constructed with a
|
|
14
|
+
* fallback HTTP transport (see {@link makeL1HttpTransport}). Returns an empty array if the
|
|
15
|
+
* transport shape is not recognized (e.g. mock clients in tests, or non-fallback transports).
|
|
16
|
+
*/ export function getRpcUrlsFromClient(client) {
|
|
17
|
+
const transport = client.transport;
|
|
18
|
+
if (Array.isArray(transport?.transports)) {
|
|
19
|
+
return transport.transports.map((t)=>t?.value?.url).filter((url)=>typeof url === 'string');
|
|
20
|
+
}
|
|
21
|
+
const singleUrl = transport?.value?.url ?? transport?.url;
|
|
22
|
+
return typeof singleUrl === 'string' ? [
|
|
23
|
+
singleUrl
|
|
24
|
+
] : [];
|
|
25
|
+
}
|
|
6
26
|
// TODO: Use these methods to abstract the creation of viem clients.
|
|
7
27
|
/** Returns a viem public client given the L1 config. */ export function getPublicClient(config) {
|
|
8
28
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
9
29
|
return createPublicClient({
|
|
10
30
|
chain: chain.chainInfo,
|
|
11
|
-
transport:
|
|
12
|
-
|
|
13
|
-
|
|
31
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, {
|
|
32
|
+
timeout: config.l1HttpTimeoutMS
|
|
33
|
+
}),
|
|
14
34
|
pollingInterval: config.viemPollingIntervalMS
|
|
15
35
|
});
|
|
16
36
|
}
|
|
@@ -33,16 +53,16 @@ async function waitForRpc(client, config, logger) {
|
|
|
33
53
|
throw new Error(`Ethereum node at ${config.l1RpcUrls.join(', ')} has chain ID ${l1ChainId} but expected ${config.l1ChainId}`);
|
|
34
54
|
}
|
|
35
55
|
}
|
|
36
|
-
export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex) {
|
|
56
|
+
export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex, opts) {
|
|
37
57
|
const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string' ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x') ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, {
|
|
38
58
|
addressIndex
|
|
39
59
|
}) : mnemonicOrPrivateKeyOrHdAccount;
|
|
40
60
|
const extendedClient = createWalletClient({
|
|
41
61
|
account: hdAccount,
|
|
42
62
|
chain,
|
|
43
|
-
transport:
|
|
44
|
-
|
|
45
|
-
|
|
63
|
+
transport: makeL1HttpTransport(rpcUrls, {
|
|
64
|
+
timeout: opts?.httpTimeoutMS
|
|
65
|
+
}),
|
|
46
66
|
pollingInterval: pollingIntervalMS
|
|
47
67
|
}).extend(publicActions);
|
|
48
68
|
return extendedClient;
|
package/dest/config.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ export type GenesisStateConfig = {
|
|
|
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. */
|
|
@@ -44,54 +46,41 @@ export type L1ContractsConfig = {
|
|
|
44
46
|
slashingOffsetInRounds: number;
|
|
45
47
|
/** How long slashing can be disabled for in seconds when vetoer disables it */
|
|
46
48
|
slashingDisableDuration: number;
|
|
47
|
-
/**
|
|
48
|
-
|
|
49
|
-
/** Minimum amount that can be slashed
|
|
49
|
+
/** Whether to deploy a slasher proposer */
|
|
50
|
+
slasherEnabled: boolean;
|
|
51
|
+
/** Minimum amount that can be slashed */
|
|
50
52
|
slashAmountSmall: bigint;
|
|
51
|
-
/** Medium amount to slash
|
|
53
|
+
/** Medium amount to slash */
|
|
52
54
|
slashAmountMedium: bigint;
|
|
53
|
-
/** Largest amount that can be slashed per round
|
|
55
|
+
/** Largest amount that can be slashed per round */
|
|
54
56
|
slashAmountLarge: bigint;
|
|
55
57
|
/** Governance proposing quorum (defaults to roundSize/2 + 1) */
|
|
56
58
|
governanceProposerQuorum?: number;
|
|
57
59
|
/** Governance proposing round size */
|
|
58
60
|
governanceProposerRoundSize: number;
|
|
61
|
+
/** Governance voting duration in seconds (only for local/devnet/next-net, default 3600) */
|
|
62
|
+
governanceVotingDuration?: number;
|
|
59
63
|
/** The mana target for the rollup */
|
|
60
64
|
manaTarget: bigint;
|
|
61
65
|
/** The proving cost per mana */
|
|
62
66
|
provingCostPerMana: bigint;
|
|
67
|
+
/** The initial ETH per fee asset price (with 1e12 precision) */
|
|
68
|
+
initialEthPerFeeAsset: bigint;
|
|
63
69
|
/** The number of seconds to wait for an exit */
|
|
64
70
|
exitDelaySeconds: number;
|
|
65
71
|
} & L1TxUtilsConfig;
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
lagInEpochsForValidatorSet: number;
|
|
72
|
-
lagInEpochsForRandao: number;
|
|
73
|
-
inboxLag: number;
|
|
74
|
-
aztecProofSubmissionEpochs: number;
|
|
75
|
-
activationThreshold: bigint;
|
|
76
|
-
ejectionThreshold: bigint;
|
|
77
|
-
localEjectionThreshold: bigint;
|
|
78
|
-
slashAmountSmall: bigint;
|
|
79
|
-
slashAmountMedium: bigint;
|
|
80
|
-
slashAmountLarge: bigint;
|
|
81
|
-
slashingRoundSizeInEpochs: number;
|
|
82
|
-
slashingLifetimeInRounds: number;
|
|
83
|
-
slashingExecutionDelayInRounds: number;
|
|
84
|
-
slashingVetoer: EthAddress;
|
|
85
|
-
governanceProposerRoundSize: number;
|
|
86
|
-
manaTarget: bigint;
|
|
87
|
-
provingCostPerMana: bigint;
|
|
88
|
-
exitDelaySeconds: number;
|
|
89
|
-
slasherFlavor: "tally";
|
|
90
|
-
slashingOffsetInRounds: number;
|
|
91
|
-
slashingDisableDuration: number;
|
|
92
|
-
};
|
|
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
|
+
*/
|
|
93
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;
|
|
94
83
|
export declare const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig>;
|
|
95
84
|
export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
|
|
96
85
|
export declare function getGenesisStateConfigEnvVars(): GenesisStateConfig;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQVF4QixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdFQUFnRTtJQUNoRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUM1QixDQUFDO0FBRUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLHlDQUF5QztJQUN6QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IsdUZBQXVGO0lBQ3ZGLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQix3Q0FBd0M7SUFDeEMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLDJDQUEyQztJQUMzQyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMsb0ZBQW9GO0lBQ3BGLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyxpRkFBaUY7SUFDakYsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLHNGQUFzRjtJQUN0RixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLCtFQUErRTtJQUMvRSwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkMseUNBQXlDO0lBQ3pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztJQUM1Qix5Q0FBeUM7SUFDekMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1IQUFtSDtJQUNuSCxzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0Isd0tBQXdLO0lBQ3hLLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4Qiw0RUFBNEU7SUFDNUUseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLGdHQUFnRztJQUNoRyx3QkFBd0IsRUFBRSxNQUFNLENBQUM7SUFDakMseUdBQXlHO0lBQ3pHLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUN2Qyx5RUFBeUU7SUFDekUsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQiw0SUFBNEk7SUFDNUksc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLCtFQUErRTtJQUMvRSx1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsMkNBQTJDO0lBQzNDLGNBQWMsRUFBRSxPQUFPLENBQUM7SUFDeEIseUNBQXlDO0lBQ3pDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6Qiw2QkFBNkI7SUFDN0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1EQUFtRDtJQUNuRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsZ0VBQWdFO0lBQ2hFLHdCQUF3QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLHNDQUFzQztJQUN0QywyQkFBMkIsRUFBRSxNQUFNLENBQUM7SUFDcEMsMkZBQTJGO0lBQzNGLHdCQUF3QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLHFDQUFxQztJQUNyQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLGdDQUFnQztJQUNoQyxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0IsZ0VBQWdFO0lBQ2hFLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixnREFBZ0Q7SUFDaEQsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0NBQzFCLEdBQUcsZUFBZSxDQUFDO0FBRXBCOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0seUJBQXlCLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLENBc0ozRSxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHdCQUF3QixtQkFBOEMsQ0FBQztBQUVwRixlQUFPLE1BQU0sMEJBQTBCLEVBQUUsa0JBQWtCLENBQUMsa0JBQWtCLENBcUI3RSxDQUFDO0FBRUYsd0JBQWdCLDJCQUEyQixJQUFJLGlCQUFpQixDQUUvRDtBQUVELHdCQUFnQiw0QkFBNEIsSUFBSSxrQkFBa0IsQ0FFakUifQ==
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAQxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;
|
|
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,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,118 +1,91 @@
|
|
|
1
|
-
import {
|
|
2
|
-
bigintConfigHelper, booleanConfigHelper, enumConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
1
|
+
import { bigintConfigHelper, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, omitConfigMappings, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
3
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { l1ContractsDefaultEnv } from './generated/l1-contracts-defaults.js';
|
|
4
4
|
import { l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
lagInEpochsForValidatorSet: 2,
|
|
11
|
-
lagInEpochsForRandao: 2,
|
|
12
|
-
inboxLag: 1,
|
|
13
|
-
aztecProofSubmissionEpochs: 1,
|
|
14
|
-
activationThreshold: 100n * 10n ** 18n,
|
|
15
|
-
ejectionThreshold: 50n * 10n ** 18n,
|
|
16
|
-
localEjectionThreshold: 98n * 10n ** 18n,
|
|
17
|
-
slashAmountSmall: 10n * 10n ** 18n,
|
|
18
|
-
slashAmountMedium: 20n * 10n ** 18n,
|
|
19
|
-
slashAmountLarge: 50n * 10n ** 18n,
|
|
20
|
-
slashingRoundSizeInEpochs: 4,
|
|
21
|
-
slashingLifetimeInRounds: 5,
|
|
22
|
-
slashingExecutionDelayInRounds: 0,
|
|
23
|
-
slashingVetoer: EthAddress.ZERO,
|
|
24
|
-
governanceProposerRoundSize: 300,
|
|
25
|
-
manaTarget: BigInt(100e6),
|
|
26
|
-
provingCostPerMana: BigInt(100),
|
|
27
|
-
exitDelaySeconds: 2 * 24 * 60 * 60,
|
|
28
|
-
slasherFlavor: 'tally',
|
|
29
|
-
slashingOffsetInRounds: 2,
|
|
30
|
-
slashingDisableDuration: 5 * 24 * 60 * 60
|
|
31
|
-
};
|
|
32
|
-
export const l1ContractsConfigMappings = {
|
|
5
|
+
/**
|
|
6
|
+
* Config mappings for L1ContractsConfig.
|
|
7
|
+
* Default values come from generated l1-contracts-defaults.json (source: defaults.yml).
|
|
8
|
+
* Real deployments use forge scripts which require explicit env vars (vm.envUint).
|
|
9
|
+
*/ export const l1ContractsConfigMappings = {
|
|
33
10
|
ethereumSlotDuration: {
|
|
34
11
|
env: 'ETHEREUM_SLOT_DURATION',
|
|
35
12
|
description: 'How many seconds an L1 slot lasts.',
|
|
36
|
-
...numberConfigHelper(
|
|
13
|
+
...numberConfigHelper(l1ContractsDefaultEnv.ETHEREUM_SLOT_DURATION)
|
|
37
14
|
},
|
|
38
15
|
aztecSlotDuration: {
|
|
39
16
|
env: 'AZTEC_SLOT_DURATION',
|
|
40
17
|
description: 'How many seconds an L2 slots lasts (must be multiple of ethereum slot duration).',
|
|
41
|
-
...numberConfigHelper(
|
|
18
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLOT_DURATION)
|
|
42
19
|
},
|
|
43
20
|
aztecEpochDuration: {
|
|
44
21
|
env: 'AZTEC_EPOCH_DURATION',
|
|
45
|
-
description: `How many L2 slots an epoch lasts (maximum
|
|
46
|
-
...numberConfigHelper(
|
|
22
|
+
description: `How many L2 slots an epoch lasts (maximum MAX_CHECKPOINTS_PER_EPOCH).`,
|
|
23
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EPOCH_DURATION)
|
|
47
24
|
},
|
|
48
25
|
aztecTargetCommitteeSize: {
|
|
49
26
|
env: 'AZTEC_TARGET_COMMITTEE_SIZE',
|
|
50
27
|
description: 'The target validator committee size.',
|
|
51
|
-
...numberConfigHelper(
|
|
28
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_TARGET_COMMITTEE_SIZE)
|
|
52
29
|
},
|
|
53
30
|
lagInEpochsForValidatorSet: {
|
|
54
31
|
env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
|
|
55
32
|
description: 'The number of epochs to lag behind the current epoch for validator selection.',
|
|
56
|
-
...numberConfigHelper(
|
|
33
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET)
|
|
57
34
|
},
|
|
58
35
|
lagInEpochsForRandao: {
|
|
59
36
|
env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
|
|
60
37
|
description: 'The number of epochs to lag behind the current epoch for randao selection.',
|
|
61
|
-
...numberConfigHelper(
|
|
38
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_RANDAO)
|
|
62
39
|
},
|
|
63
40
|
inboxLag: {
|
|
64
41
|
env: 'AZTEC_INBOX_LAG',
|
|
65
42
|
description: 'The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks).',
|
|
66
|
-
...numberConfigHelper(
|
|
43
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_INBOX_LAG)
|
|
67
44
|
},
|
|
68
45
|
aztecProofSubmissionEpochs: {
|
|
69
46
|
env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
|
|
70
47
|
description: 'The number of epochs after an epoch ends that proofs are still accepted.',
|
|
71
|
-
...numberConfigHelper(
|
|
48
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_PROOF_SUBMISSION_EPOCHS)
|
|
72
49
|
},
|
|
73
50
|
activationThreshold: {
|
|
74
51
|
env: 'AZTEC_ACTIVATION_THRESHOLD',
|
|
75
52
|
description: 'The deposit amount for a validator',
|
|
76
|
-
...bigintConfigHelper(
|
|
53
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_ACTIVATION_THRESHOLD))
|
|
77
54
|
},
|
|
78
55
|
ejectionThreshold: {
|
|
79
56
|
env: 'AZTEC_EJECTION_THRESHOLD',
|
|
80
57
|
description: 'The minimum stake for a validator.',
|
|
81
|
-
...bigintConfigHelper(
|
|
58
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_EJECTION_THRESHOLD))
|
|
82
59
|
},
|
|
83
60
|
localEjectionThreshold: {
|
|
84
61
|
env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
|
|
85
62
|
description: 'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
|
|
86
|
-
...bigintConfigHelper(
|
|
63
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_LOCAL_EJECTION_THRESHOLD))
|
|
87
64
|
},
|
|
88
65
|
slashingOffsetInRounds: {
|
|
89
66
|
env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
|
|
90
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)',
|
|
91
|
-
...numberConfigHelper(
|
|
68
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_OFFSET_IN_ROUNDS)
|
|
92
69
|
},
|
|
93
|
-
|
|
94
|
-
env: '
|
|
95
|
-
description: '
|
|
96
|
-
...
|
|
97
|
-
'empire',
|
|
98
|
-
'tally',
|
|
99
|
-
'none'
|
|
100
|
-
], DefaultL1ContractsConfig.slasherFlavor)
|
|
70
|
+
slasherEnabled: {
|
|
71
|
+
env: 'AZTEC_SLASHER_ENABLED',
|
|
72
|
+
description: 'Whether to deploy a slasher proposer',
|
|
73
|
+
...booleanConfigHelper(true)
|
|
101
74
|
},
|
|
102
75
|
slashAmountSmall: {
|
|
103
76
|
env: 'AZTEC_SLASH_AMOUNT_SMALL',
|
|
104
77
|
description: 'Small slashing amount for light offenses',
|
|
105
|
-
...bigintConfigHelper(
|
|
78
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_SMALL))
|
|
106
79
|
},
|
|
107
80
|
slashAmountMedium: {
|
|
108
81
|
env: 'AZTEC_SLASH_AMOUNT_MEDIUM',
|
|
109
82
|
description: 'Medium slashing amount for moderate offenses',
|
|
110
|
-
...bigintConfigHelper(
|
|
83
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_MEDIUM))
|
|
111
84
|
},
|
|
112
85
|
slashAmountLarge: {
|
|
113
86
|
env: 'AZTEC_SLASH_AMOUNT_LARGE',
|
|
114
87
|
description: 'Large slashing amount for severe offenses',
|
|
115
|
-
...bigintConfigHelper(
|
|
88
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_LARGE))
|
|
116
89
|
},
|
|
117
90
|
slashingQuorum: {
|
|
118
91
|
env: 'AZTEC_SLASHING_QUORUM',
|
|
@@ -122,28 +95,28 @@ export const l1ContractsConfigMappings = {
|
|
|
122
95
|
slashingRoundSizeInEpochs: {
|
|
123
96
|
env: 'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS',
|
|
124
97
|
description: 'The slashing round size',
|
|
125
|
-
...numberConfigHelper(
|
|
98
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS)
|
|
126
99
|
},
|
|
127
100
|
slashingLifetimeInRounds: {
|
|
128
101
|
env: 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS',
|
|
129
102
|
description: 'The slashing lifetime in rounds',
|
|
130
|
-
...numberConfigHelper(
|
|
103
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_LIFETIME_IN_ROUNDS)
|
|
131
104
|
},
|
|
132
105
|
slashingExecutionDelayInRounds: {
|
|
133
106
|
env: 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS',
|
|
134
107
|
description: 'The slashing execution delay in rounds',
|
|
135
|
-
...numberConfigHelper(
|
|
108
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS)
|
|
136
109
|
},
|
|
137
110
|
slashingVetoer: {
|
|
138
111
|
env: 'AZTEC_SLASHING_VETOER',
|
|
139
112
|
description: 'The slashing vetoer',
|
|
140
113
|
parseEnv: (val)=>EthAddress.fromString(val),
|
|
141
|
-
defaultValue:
|
|
114
|
+
defaultValue: EthAddress.fromString(l1ContractsDefaultEnv.AZTEC_SLASHING_VETOER)
|
|
142
115
|
},
|
|
143
116
|
slashingDisableDuration: {
|
|
144
117
|
env: 'AZTEC_SLASHING_DISABLE_DURATION',
|
|
145
118
|
description: 'How long slashing can be disabled for in seconds when vetoer disables it',
|
|
146
|
-
...numberConfigHelper(
|
|
119
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_DISABLE_DURATION)
|
|
147
120
|
},
|
|
148
121
|
governanceProposerQuorum: {
|
|
149
122
|
env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
|
|
@@ -153,25 +126,41 @@ export const l1ContractsConfigMappings = {
|
|
|
153
126
|
governanceProposerRoundSize: {
|
|
154
127
|
env: 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
|
|
155
128
|
description: 'The governance proposing round size',
|
|
156
|
-
...numberConfigHelper(
|
|
129
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE)
|
|
130
|
+
},
|
|
131
|
+
governanceVotingDuration: {
|
|
132
|
+
env: 'AZTEC_GOVERNANCE_VOTING_DURATION',
|
|
133
|
+
description: 'Governance voting duration in seconds (only for local/devnet/next-net)',
|
|
134
|
+
...numberConfigHelper(3600)
|
|
157
135
|
},
|
|
158
136
|
manaTarget: {
|
|
159
137
|
env: 'AZTEC_MANA_TARGET',
|
|
160
138
|
description: 'The mana target for the rollup',
|
|
161
|
-
...bigintConfigHelper(
|
|
139
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_MANA_TARGET))
|
|
162
140
|
},
|
|
163
141
|
provingCostPerMana: {
|
|
164
142
|
env: 'AZTEC_PROVING_COST_PER_MANA',
|
|
165
143
|
description: 'The proving cost per mana',
|
|
166
|
-
...bigintConfigHelper(
|
|
144
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_PROVING_COST_PER_MANA))
|
|
145
|
+
},
|
|
146
|
+
initialEthPerFeeAsset: {
|
|
147
|
+
env: 'AZTEC_INITIAL_ETH_PER_FEE_ASSET',
|
|
148
|
+
description: 'The initial ETH per fee asset price (with 1e12 precision)',
|
|
149
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_INITIAL_ETH_PER_FEE_ASSET))
|
|
167
150
|
},
|
|
168
151
|
exitDelaySeconds: {
|
|
169
152
|
env: 'AZTEC_EXIT_DELAY_SECONDS',
|
|
170
153
|
description: 'The delay before a validator can exit the set',
|
|
171
|
-
...numberConfigHelper(
|
|
154
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EXIT_DELAY_SECONDS)
|
|
172
155
|
},
|
|
173
|
-
...l1TxUtilsConfigMappings
|
|
156
|
+
...omitConfigMappings(l1TxUtilsConfigMappings, [
|
|
157
|
+
'ethereumSlotDuration'
|
|
158
|
+
])
|
|
174
159
|
};
|
|
160
|
+
/**
|
|
161
|
+
* Default L1 contracts configuration derived from l1ContractsConfigMappings.
|
|
162
|
+
* Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
|
|
163
|
+
*/ export const DefaultL1ContractsConfig = getDefaultConfig(l1ContractsConfigMappings);
|
|
175
164
|
export const genesisStateConfigMappings = {
|
|
176
165
|
testAccounts: {
|
|
177
166
|
env: 'TEST_ACCOUNTS',
|
|
@@ -182,6 +171,12 @@ export const genesisStateConfigMappings = {
|
|
|
182
171
|
env: 'SPONSORED_FPC',
|
|
183
172
|
description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
|
|
184
173
|
...booleanConfigHelper(false)
|
|
174
|
+
},
|
|
175
|
+
prefundAddresses: {
|
|
176
|
+
env: 'PREFUND_ADDRESSES',
|
|
177
|
+
description: 'Comma-separated list of Aztec addresses to prefund with fee juice at genesis (local network only).',
|
|
178
|
+
parseEnv: (val)=>val.split(',').map((a)=>a.trim()).filter((a)=>a.length > 0),
|
|
179
|
+
defaultValue: []
|
|
185
180
|
}
|
|
186
181
|
};
|
|
187
182
|
export function getL1ContractsConfigEnvVars() {
|
|
@@ -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"}
|