@aztec/cli 0.0.1-commit.f504929 → 0.0.1-commit.f650c0a5c
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/cmds/aztec_node/get_node_info.d.ts +1 -1
- package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_node_info.js +0 -2
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts +1 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -4
- package/dest/config/cached_fetch.d.ts +19 -10
- package/dest/config/cached_fetch.d.ts.map +1 -1
- package/dest/config/cached_fetch.js +110 -32
- package/dest/config/generated/networks.d.ts +18 -25
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +19 -26
- package/dest/config/network_config.d.ts +1 -1
- package/dest/config/network_config.d.ts.map +1 -1
- package/dest/config/network_config.js +3 -2
- package/dest/utils/aztec.d.ts +1 -2
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +2 -3
- package/package.json +30 -30
- package/src/cmds/aztec_node/get_node_info.ts +0 -2
- package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
- package/src/cmds/l1/deploy_new_rollup.ts +1 -3
- package/src/config/cached_fetch.ts +119 -31
- package/src/config/generated/networks.ts +17 -24
- package/src/config/network_config.ts +3 -2
- package/src/utils/aztec.ts +12 -18
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { LogFn } from '@aztec/foundation/log';
|
|
2
2
|
export declare function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, logJson: (output: any) => void): Promise<void>;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X25vZGVfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvYXp0ZWNfbm9kZS9nZXRfbm9kZV9pbmZvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFzQixXQUFXLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxJQUFJLGlCQXlEM0cifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,iBAyD3G"}
|
|
@@ -20,7 +20,6 @@ export async function getNodeInfo(nodeUrl, json, log, logJson) {
|
|
|
20
20
|
rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
21
21
|
governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
|
|
22
22
|
governance: info.l1ContractAddresses.governanceAddress.toString(),
|
|
23
|
-
slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
|
|
24
23
|
feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
|
|
25
24
|
stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()
|
|
26
25
|
},
|
|
@@ -48,7 +47,6 @@ export async function getNodeInfo(nodeUrl, json, log, logJson) {
|
|
|
48
47
|
log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
49
48
|
log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
50
49
|
log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
|
|
51
|
-
log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
52
50
|
log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
53
51
|
log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
54
52
|
log(`L2 Contract Addresses:`);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
3
3
|
export declare function deployL1ContractsCmd(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: EthAddress[], realVerifier: boolean, existingToken: EthAddress | undefined, log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2wxX2NvbnRyYWN0c19jbWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2RlcGxveV9sMV9jb250cmFjdHNfY21kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSzVELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVMzRCx3QkFBc0Isb0JBQW9CLENBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsT0FBTyxFQUFFLE1BQU0sRUFDZixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixpQkFBaUIsRUFBRSxVQUFVLEVBQUUsRUFDL0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsYUFBYSxFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQ3JDLEdBQUcsRUFBRSxLQUFLLEVBQ1YsV0FBVyxFQUFFLE1BQU0saUJBNkVwQiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6EpB"}
|
|
@@ -70,7 +70,6 @@ export async function deployL1ContractsCmd(rpcUrls, chainId, privateKey, mnemoni
|
|
|
70
70
|
log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
71
71
|
log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
72
72
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
73
|
-
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
74
73
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
75
74
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
76
75
|
log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);
|
|
@@ -2,4 +2,4 @@ import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { LogFn } from '@aztec/foundation/log';
|
|
4
4
|
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: Operator[], realVerifier: boolean, log: LogFn): Promise<void>;
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X25ld19yb2xsdXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2RlcGxveV9uZXdfcm9sbHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBTW5ELHdCQUFzQixlQUFlLENBQ25DLGVBQWUsRUFBRSxVQUFVLEVBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsT0FBTyxFQUFFLE1BQU0sRUFDZixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsR0FBRyxFQUFFLEtBQUssaUJBMENYIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,iBA0CX"}
|
|
@@ -9,20 +9,18 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
10
|
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
11
|
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
12
|
-
const { rollup
|
|
12
|
+
const { rollup } = await deployNewRollupContracts(registryAddress, rpcUrls, privateKey, chainId, mnemonic, mnemonicIndex, initialValidators, genesisArchiveRoot, fundingNeeded, config, realVerifier);
|
|
13
13
|
if (json) {
|
|
14
14
|
log(JSON.stringify({
|
|
15
15
|
rollupAddress: rollup.address,
|
|
16
16
|
initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
|
|
17
17
|
initialValidators: initialValidators.map((a)=>a.attester.toString()),
|
|
18
|
-
genesisArchiveRoot: genesisArchiveRoot.toString()
|
|
19
|
-
slashFactoryAddress: slashFactoryAddress.toString()
|
|
18
|
+
genesisArchiveRoot: genesisArchiveRoot.toString()
|
|
20
19
|
}, null, 2));
|
|
21
20
|
} else {
|
|
22
21
|
log(`Rollup Address: ${rollup.address}`);
|
|
23
22
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
24
23
|
log(`Initial validators: ${initialValidators.map((a)=>a.attester.toString()).join(', ')}`);
|
|
25
24
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
26
|
-
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
27
25
|
}
|
|
28
26
|
}
|
|
@@ -1,18 +1,27 @@
|
|
|
1
1
|
export interface CachedFetchOptions {
|
|
2
|
-
/**
|
|
3
|
-
cacheDurationMs: number;
|
|
4
|
-
/** The cache file */
|
|
2
|
+
/** The cache file path for storing data. If not provided, no caching is performed. */
|
|
5
3
|
cacheFile?: string;
|
|
4
|
+
/** Fallback max-age in milliseconds when server sends no Cache-Control header. Defaults to 5 minutes. */
|
|
5
|
+
defaultMaxAgeMs?: number;
|
|
6
6
|
}
|
|
7
|
+
/** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */
|
|
8
|
+
export declare function parseMaxAge(response: {
|
|
9
|
+
headers: {
|
|
10
|
+
get(name: string): string | null;
|
|
11
|
+
};
|
|
12
|
+
}): number | undefined;
|
|
7
13
|
/**
|
|
8
|
-
* Fetches data from a URL with file-based caching
|
|
9
|
-
*
|
|
14
|
+
* Fetches data from a URL with file-based HTTP conditional caching.
|
|
15
|
+
*
|
|
16
|
+
* Data is stored as raw JSON in the cache file (same format as the server returns).
|
|
17
|
+
* Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
|
|
18
|
+
* This keeps the data file human-readable and backward-compatible with older code.
|
|
10
19
|
*
|
|
11
20
|
* @param url - The URL to fetch from
|
|
12
|
-
* @param
|
|
13
|
-
* @param
|
|
14
|
-
* @param
|
|
15
|
-
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
21
|
+
* @param options - Caching options
|
|
22
|
+
* @param fetch - Fetch implementation (defaults to globalThis.fetch)
|
|
23
|
+
* @param log - Logger instance
|
|
24
|
+
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
16
25
|
*/
|
|
17
26
|
export declare function cachedFetch<T = any>(url: string, options: CachedFetchOptions, fetch?: typeof globalThis.fetch, log?: import("@aztec/aztec.js/log").Logger): Promise<T | undefined>;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHNGQUFzRjtJQUN0RixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIseUdBQXlHO0lBQ3pHLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMxQjtBQVVELHVIQUF1SDtBQUN2SCx3QkFBZ0IsV0FBVyxDQUFDLFFBQVEsRUFBRTtJQUFFLE9BQU8sRUFBRTtRQUFFLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxJQUFJLENBQUE7S0FBRSxDQUFBO0NBQUUsR0FBRyxNQUFNLEdBQUcsU0FBUyxDQVUzRztBQUVEOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHdCQUFzQixXQUFXLENBQUMsQ0FBQyxHQUFHLEdBQUcsRUFDdkMsR0FBRyxFQUFFLE1BQU0sRUFDWCxPQUFPLEVBQUUsa0JBQWtCLEVBQzNCLEtBQUssMEJBQW1CLEVBQ3hCLEdBQUcsdUNBQStCLEdBQ2pDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBb0V4QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,
|
|
1
|
+
{"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAUD,uHAAuH;AACvH,wBAAgB,WAAW,CAAC,QAAQ,EAAE;IAAE,OAAO,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAU3G;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAoExB"}
|
|
@@ -1,50 +1,105 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
2
|
-
import { mkdir, readFile,
|
|
2
|
+
import { mkdir, readFile, writeFile } from 'fs/promises';
|
|
3
3
|
import { dirname } from 'path';
|
|
4
|
+
const DEFAULT_MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes
|
|
5
|
+
/** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */ export function parseMaxAge(response) {
|
|
6
|
+
const cacheControl = response.headers.get('cache-control');
|
|
7
|
+
if (!cacheControl) {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
const match = cacheControl.match(/max-age=(\d+)/);
|
|
11
|
+
if (!match) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
return parseInt(match[1], 10) * 1000;
|
|
15
|
+
}
|
|
4
16
|
/**
|
|
5
|
-
* Fetches data from a URL with file-based caching
|
|
6
|
-
*
|
|
17
|
+
* Fetches data from a URL with file-based HTTP conditional caching.
|
|
18
|
+
*
|
|
19
|
+
* Data is stored as raw JSON in the cache file (same format as the server returns).
|
|
20
|
+
* Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
|
|
21
|
+
* This keeps the data file human-readable and backward-compatible with older code.
|
|
7
22
|
*
|
|
8
23
|
* @param url - The URL to fetch from
|
|
9
|
-
* @param
|
|
10
|
-
* @param
|
|
11
|
-
* @param
|
|
12
|
-
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
24
|
+
* @param options - Caching options
|
|
25
|
+
* @param fetch - Fetch implementation (defaults to globalThis.fetch)
|
|
26
|
+
* @param log - Logger instance
|
|
27
|
+
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
13
28
|
*/ export async function cachedFetch(url, options, fetch = globalThis.fetch, log = createLogger('cached_fetch')) {
|
|
14
|
-
const {
|
|
15
|
-
//
|
|
29
|
+
const { cacheFile, defaultMaxAgeMs = DEFAULT_MAX_AGE_MS } = options;
|
|
30
|
+
// If no cacheFile, just fetch normally without caching
|
|
31
|
+
if (!cacheFile) {
|
|
32
|
+
return fetchAndParse(url, fetch, log);
|
|
33
|
+
}
|
|
34
|
+
const metaFile = cacheFile + '.meta';
|
|
35
|
+
// Try to read metadata
|
|
36
|
+
let meta;
|
|
16
37
|
try {
|
|
17
|
-
|
|
18
|
-
const info = await stat(cacheFile);
|
|
19
|
-
if (info.mtimeMs + cacheDurationMs > Date.now()) {
|
|
20
|
-
const cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
|
|
21
|
-
return cachedData;
|
|
22
|
-
}
|
|
23
|
-
}
|
|
38
|
+
meta = JSON.parse(await readFile(metaFile, 'utf-8'));
|
|
24
39
|
} catch {
|
|
25
|
-
log.trace('
|
|
40
|
+
log.trace('No usable cache metadata found');
|
|
26
41
|
}
|
|
42
|
+
// Try to read cached data
|
|
43
|
+
let cachedData;
|
|
27
44
|
try {
|
|
28
|
-
|
|
45
|
+
cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
|
|
46
|
+
} catch {
|
|
47
|
+
log.trace('No usable cached data found');
|
|
48
|
+
}
|
|
49
|
+
// If metadata and data exist and cache is fresh, return directly
|
|
50
|
+
if (meta && cachedData !== undefined && meta.expiresAt > Date.now()) {
|
|
51
|
+
return cachedData;
|
|
52
|
+
}
|
|
53
|
+
// Cache is stale or missing — make a (possibly conditional) request
|
|
54
|
+
try {
|
|
55
|
+
const headers = {};
|
|
56
|
+
if (meta?.etag && cachedData !== undefined) {
|
|
57
|
+
headers['If-None-Match'] = meta.etag;
|
|
58
|
+
}
|
|
59
|
+
const response = await fetch(url, {
|
|
60
|
+
headers
|
|
61
|
+
});
|
|
62
|
+
if (response.status === 304 && cachedData !== undefined) {
|
|
63
|
+
// Not modified — recompute expiry from new response headers and return cached data
|
|
64
|
+
const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
|
|
65
|
+
await writeMetaFile(metaFile, {
|
|
66
|
+
etag: meta?.etag,
|
|
67
|
+
expiresAt: Date.now() + maxAgeMs
|
|
68
|
+
}, log);
|
|
69
|
+
return cachedData;
|
|
70
|
+
}
|
|
29
71
|
if (!response.ok) {
|
|
30
72
|
log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
|
|
31
|
-
return
|
|
73
|
+
return cachedData;
|
|
32
74
|
}
|
|
75
|
+
// 200 — parse new data and cache it
|
|
33
76
|
const data = await response.json();
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
err
|
|
45
|
-
});
|
|
46
|
-
}
|
|
77
|
+
const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
|
|
78
|
+
const etag = response.headers.get('etag') ?? undefined;
|
|
79
|
+
await ensureDir(cacheFile, log);
|
|
80
|
+
await Promise.all([
|
|
81
|
+
writeFile(cacheFile, JSON.stringify(data), 'utf-8'),
|
|
82
|
+
writeFile(metaFile, JSON.stringify({
|
|
83
|
+
etag,
|
|
84
|
+
expiresAt: Date.now() + maxAgeMs
|
|
85
|
+
}), 'utf-8')
|
|
86
|
+
]);
|
|
47
87
|
return data;
|
|
88
|
+
} catch (err) {
|
|
89
|
+
log.warn(`Failed to fetch from ${url}`, {
|
|
90
|
+
err
|
|
91
|
+
});
|
|
92
|
+
return cachedData;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
async function fetchAndParse(url, fetch, log) {
|
|
96
|
+
try {
|
|
97
|
+
const response = await fetch(url);
|
|
98
|
+
if (!response.ok) {
|
|
99
|
+
log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
return await response.json();
|
|
48
103
|
} catch (err) {
|
|
49
104
|
log.warn(`Failed to fetch from ${url}`, {
|
|
50
105
|
err
|
|
@@ -52,3 +107,26 @@ import { dirname } from 'path';
|
|
|
52
107
|
return undefined;
|
|
53
108
|
}
|
|
54
109
|
}
|
|
110
|
+
async function ensureDir(filePath, log) {
|
|
111
|
+
try {
|
|
112
|
+
await mkdir(dirname(filePath), {
|
|
113
|
+
recursive: true
|
|
114
|
+
});
|
|
115
|
+
} catch (err) {
|
|
116
|
+
log.warn('Failed to create cache directory for: ' + filePath, {
|
|
117
|
+
err
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
async function writeMetaFile(metaFile, meta, log) {
|
|
122
|
+
try {
|
|
123
|
+
await mkdir(dirname(metaFile), {
|
|
124
|
+
recursive: true
|
|
125
|
+
});
|
|
126
|
+
await writeFile(metaFile, JSON.stringify(meta), 'utf-8');
|
|
127
|
+
} catch (err) {
|
|
128
|
+
log.warn('Failed to write cache metadata: ' + metaFile, {
|
|
129
|
+
err
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
}
|
|
@@ -11,7 +11,7 @@ export declare const devnetConfig: {
|
|
|
11
11
|
readonly AZTEC_MANA_TARGET: 100000000;
|
|
12
12
|
readonly AZTEC_PROVING_COST_PER_MANA: 100;
|
|
13
13
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
14
|
-
readonly
|
|
14
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
15
15
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
16
16
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
17
17
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
@@ -21,14 +21,12 @@ export declare const devnetConfig: {
|
|
|
21
21
|
readonly AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000;
|
|
22
22
|
readonly AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000;
|
|
23
23
|
readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300;
|
|
24
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
25
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
26
24
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
27
25
|
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
28
26
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
29
27
|
readonly P2P_ENABLED: true;
|
|
30
28
|
readonly BOOTSTRAP_NODES: "";
|
|
31
|
-
readonly SEQ_MIN_TX_PER_BLOCK:
|
|
29
|
+
readonly SEQ_MIN_TX_PER_BLOCK: 1;
|
|
32
30
|
readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
|
|
33
31
|
readonly SEQ_BLOCK_DURATION_MS: 6000;
|
|
34
32
|
readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
|
|
@@ -55,8 +53,6 @@ export declare const devnetConfig: {
|
|
|
55
53
|
readonly BLOB_ALLOW_EMPTY_SOURCES: false;
|
|
56
54
|
readonly P2P_MAX_PENDING_TX_COUNT: 1000;
|
|
57
55
|
readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false;
|
|
58
|
-
readonly AUTO_UPDATE: "none";
|
|
59
|
-
readonly AUTO_UPDATE_URL: "";
|
|
60
56
|
readonly PUBLIC_OTEL_OPT_OUT: true;
|
|
61
57
|
readonly PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "";
|
|
62
58
|
readonly PUBLIC_OTEL_COLLECT_FROM: "";
|
|
@@ -72,6 +68,7 @@ export declare const devnetConfig: {
|
|
|
72
68
|
readonly SLASH_UNKNOWN_PENALTY: 10000000000000000000;
|
|
73
69
|
readonly SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000;
|
|
74
70
|
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 0;
|
|
71
|
+
readonly ENABLE_VERSION_CHECK: true;
|
|
75
72
|
};
|
|
76
73
|
export declare const testnetConfig: {
|
|
77
74
|
readonly ETHEREUM_SLOT_DURATION: 12;
|
|
@@ -83,19 +80,17 @@ export declare const testnetConfig: {
|
|
|
83
80
|
readonly AZTEC_INBOX_LAG: 1;
|
|
84
81
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
85
82
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
86
|
-
readonly
|
|
83
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
87
84
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
88
85
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
89
86
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
90
87
|
readonly AZTEC_SLASHING_DISABLE_DURATION: 432000;
|
|
91
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
92
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
93
88
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
94
89
|
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
95
90
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
96
91
|
readonly P2P_ENABLED: true;
|
|
97
92
|
readonly BOOTSTRAP_NODES: "";
|
|
98
|
-
readonly SEQ_MIN_TX_PER_BLOCK:
|
|
93
|
+
readonly SEQ_MIN_TX_PER_BLOCK: 1;
|
|
99
94
|
readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
|
|
100
95
|
readonly SEQ_BLOCK_DURATION_MS: 6000;
|
|
101
96
|
readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
|
|
@@ -122,10 +117,11 @@ export declare const testnetConfig: {
|
|
|
122
117
|
readonly AZTEC_SLASH_AMOUNT_LARGE: 1e+23;
|
|
123
118
|
readonly L1_CHAIN_ID: 11155111;
|
|
124
119
|
readonly TEST_ACCOUNTS: false;
|
|
125
|
-
readonly SPONSORED_FPC:
|
|
120
|
+
readonly SPONSORED_FPC: false;
|
|
126
121
|
readonly TRANSACTIONS_DISABLED: false;
|
|
127
|
-
readonly
|
|
122
|
+
readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
|
|
128
123
|
readonly PROVER_REAL_PROOFS: true;
|
|
124
|
+
readonly P2P_MAX_PENDING_TX_COUNT: 1000;
|
|
129
125
|
readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
|
|
130
126
|
readonly SLASH_PRUNE_PENALTY: 10000000000000000000;
|
|
131
127
|
readonly SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000;
|
|
@@ -139,6 +135,7 @@ export declare const testnetConfig: {
|
|
|
139
135
|
readonly SLASH_UNKNOWN_PENALTY: 10000000000000000000;
|
|
140
136
|
readonly SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000;
|
|
141
137
|
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 64;
|
|
138
|
+
readonly ENABLE_VERSION_CHECK: true;
|
|
142
139
|
};
|
|
143
140
|
export declare const mainnetConfig: {
|
|
144
141
|
readonly ETHEREUM_SLOT_DURATION: 12;
|
|
@@ -149,17 +146,15 @@ export declare const mainnetConfig: {
|
|
|
149
146
|
readonly AZTEC_INBOX_LAG: 1;
|
|
150
147
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
151
148
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
152
|
-
readonly
|
|
149
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
153
150
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
154
151
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
155
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
156
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
157
152
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
158
153
|
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
159
154
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
160
155
|
readonly P2P_ENABLED: true;
|
|
161
156
|
readonly BOOTSTRAP_NODES: "";
|
|
162
|
-
readonly SEQ_MIN_TX_PER_BLOCK:
|
|
157
|
+
readonly SEQ_MIN_TX_PER_BLOCK: 1;
|
|
163
158
|
readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
|
|
164
159
|
readonly SEQ_BLOCK_DURATION_MS: 6000;
|
|
165
160
|
readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
|
|
@@ -195,17 +190,15 @@ export declare const mainnetConfig: {
|
|
|
195
190
|
readonly L1_CHAIN_ID: 1;
|
|
196
191
|
readonly TEST_ACCOUNTS: false;
|
|
197
192
|
readonly SPONSORED_FPC: false;
|
|
198
|
-
readonly TRANSACTIONS_DISABLED:
|
|
199
|
-
readonly
|
|
193
|
+
readonly TRANSACTIONS_DISABLED: false;
|
|
194
|
+
readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
|
|
200
195
|
readonly PROVER_REAL_PROOFS: true;
|
|
201
|
-
readonly SYNC_SNAPSHOTS_URLS: "https://aztec-labs-snapshots.com/mainnet/";
|
|
202
196
|
readonly BLOB_ALLOW_EMPTY_SOURCES: true;
|
|
203
|
-
readonly P2P_MAX_PENDING_TX_COUNT:
|
|
197
|
+
readonly P2P_MAX_PENDING_TX_COUNT: 1000;
|
|
204
198
|
readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
|
|
205
|
-
readonly
|
|
206
|
-
readonly
|
|
207
|
-
readonly
|
|
208
|
-
readonly PUBLIC_OTEL_COLLECT_FROM: "sequencer";
|
|
199
|
+
readonly PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "";
|
|
200
|
+
readonly PUBLIC_OTEL_COLLECT_FROM: "";
|
|
201
|
+
readonly ENABLE_VERSION_CHECK: false;
|
|
209
202
|
readonly SLASH_PRUNE_PENALTY: 0;
|
|
210
203
|
readonly SLASH_DATA_WITHHOLDING_PENALTY: 0;
|
|
211
204
|
readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8;
|
|
@@ -219,4 +212,4 @@ export declare const mainnetConfig: {
|
|
|
219
212
|
readonly SLASH_INVALID_BLOCK_PENALTY: 2e+21;
|
|
220
213
|
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 1200;
|
|
221
214
|
};
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXVFZixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQWtFaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTBFaEIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuEf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0EhB,CAAC"}
|
|
@@ -13,7 +13,7 @@ export const devnetConfig = {
|
|
|
13
13
|
AZTEC_MANA_TARGET: 100000000,
|
|
14
14
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
15
15
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
16
|
-
|
|
16
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
17
17
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
18
18
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
19
19
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -23,14 +23,12 @@ export const devnetConfig = {
|
|
|
23
23
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
24
24
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
25
25
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
26
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
27
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
28
26
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
29
27
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
30
28
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
31
29
|
P2P_ENABLED: true,
|
|
32
30
|
BOOTSTRAP_NODES: '',
|
|
33
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
31
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
34
32
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
35
33
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
36
34
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -57,8 +55,6 @@ export const devnetConfig = {
|
|
|
57
55
|
BLOB_ALLOW_EMPTY_SOURCES: false,
|
|
58
56
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
59
57
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
|
|
60
|
-
AUTO_UPDATE: 'none',
|
|
61
|
-
AUTO_UPDATE_URL: '',
|
|
62
58
|
PUBLIC_OTEL_OPT_OUT: true,
|
|
63
59
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
64
60
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
@@ -73,7 +69,8 @@ export const devnetConfig = {
|
|
|
73
69
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
|
|
74
70
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
75
71
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
76
|
-
SLASH_GRACE_PERIOD_L2_SLOTS: 0
|
|
72
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 0,
|
|
73
|
+
ENABLE_VERSION_CHECK: true
|
|
77
74
|
};
|
|
78
75
|
export const testnetConfig = {
|
|
79
76
|
ETHEREUM_SLOT_DURATION: 12,
|
|
@@ -85,19 +82,17 @@ export const testnetConfig = {
|
|
|
85
82
|
AZTEC_INBOX_LAG: 1,
|
|
86
83
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
87
84
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
88
|
-
|
|
85
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
89
86
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
90
87
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
91
88
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
92
89
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
93
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
94
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
95
90
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
96
91
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
97
92
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
98
93
|
P2P_ENABLED: true,
|
|
99
94
|
BOOTSTRAP_NODES: '',
|
|
100
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
95
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
101
96
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
102
97
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
103
98
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -124,10 +119,11 @@ export const testnetConfig = {
|
|
|
124
119
|
AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
|
|
125
120
|
L1_CHAIN_ID: 11155111,
|
|
126
121
|
TEST_ACCOUNTS: false,
|
|
127
|
-
SPONSORED_FPC:
|
|
122
|
+
SPONSORED_FPC: false,
|
|
128
123
|
TRANSACTIONS_DISABLED: false,
|
|
129
|
-
|
|
124
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
130
125
|
PROVER_REAL_PROOFS: true,
|
|
126
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
131
127
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
132
128
|
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
133
129
|
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
@@ -140,7 +136,8 @@ export const testnetConfig = {
|
|
|
140
136
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
|
|
141
137
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
142
138
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
143
|
-
SLASH_GRACE_PERIOD_L2_SLOTS: 64
|
|
139
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
140
|
+
ENABLE_VERSION_CHECK: true
|
|
144
141
|
};
|
|
145
142
|
export const mainnetConfig = {
|
|
146
143
|
ETHEREUM_SLOT_DURATION: 12,
|
|
@@ -151,17 +148,15 @@ export const mainnetConfig = {
|
|
|
151
148
|
AZTEC_INBOX_LAG: 1,
|
|
152
149
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
153
150
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
154
|
-
|
|
151
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
155
152
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
156
153
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
157
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
158
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
159
154
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
160
155
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
161
156
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
162
157
|
P2P_ENABLED: true,
|
|
163
158
|
BOOTSTRAP_NODES: '',
|
|
164
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
159
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
165
160
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
166
161
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
167
162
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -197,17 +192,15 @@ export const mainnetConfig = {
|
|
|
197
192
|
L1_CHAIN_ID: 1,
|
|
198
193
|
TEST_ACCOUNTS: false,
|
|
199
194
|
SPONSORED_FPC: false,
|
|
200
|
-
TRANSACTIONS_DISABLED:
|
|
201
|
-
|
|
195
|
+
TRANSACTIONS_DISABLED: false,
|
|
196
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
202
197
|
PROVER_REAL_PROOFS: true,
|
|
203
|
-
SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
|
|
204
198
|
BLOB_ALLOW_EMPTY_SOURCES: true,
|
|
205
|
-
P2P_MAX_PENDING_TX_COUNT:
|
|
199
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
206
200
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
|
|
201
|
+
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
202
|
+
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
203
|
+
ENABLE_VERSION_CHECK: false,
|
|
211
204
|
SLASH_PRUNE_PENALTY: 0,
|
|
212
205
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
213
206
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
@@ -19,4 +19,4 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
|
|
|
19
19
|
* Does not throw if the network simply doesn't exist in the config - just returns without enriching
|
|
20
20
|
*/
|
|
21
21
|
export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBWXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXNERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkFpQ2pGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAsDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAiCjF"}
|
|
@@ -5,7 +5,6 @@ import { cachedFetch } from './cached_fetch.js';
|
|
|
5
5
|
import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
|
|
6
6
|
const DEFAULT_CONFIG_URL = 'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
|
|
7
7
|
const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json';
|
|
8
|
-
const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
9
8
|
/**
|
|
10
9
|
* Fetches remote network configuration from GitHub with caching support.
|
|
11
10
|
* Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
|
|
@@ -64,7 +63,6 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
|
64
63
|
let rawConfig;
|
|
65
64
|
if (url.protocol === 'http:' || url.protocol === 'https:') {
|
|
66
65
|
rawConfig = await cachedFetch(url.href, {
|
|
67
|
-
cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
|
|
68
66
|
cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined
|
|
69
67
|
});
|
|
70
68
|
} else if (url.protocol === 'file:') {
|
|
@@ -109,6 +107,9 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
|
109
107
|
if (networkConfig.blobFileStoreUrls?.length) {
|
|
110
108
|
enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
|
|
111
109
|
}
|
|
110
|
+
if (networkConfig.txCollectionFileStoreUrls?.length) {
|
|
111
|
+
enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
|
|
112
|
+
}
|
|
112
113
|
if (networkConfig.blockDurationMs !== undefined) {
|
|
113
114
|
enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
|
|
114
115
|
}
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -15,7 +15,6 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
|
15
15
|
export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
|
|
16
16
|
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], privateKey: string | undefined, chainId: number, mnemonic: string, mnemonicIndex: number, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean): Promise<{
|
|
17
17
|
rollup: RollupContract;
|
|
18
|
-
slashFactoryAddress: EthAddress;
|
|
19
18
|
}>;
|
|
20
19
|
/**
|
|
21
20
|
* Gets all contracts available in \@aztec/noir-contracts.js.
|
|
@@ -54,4 +53,4 @@ export declare const stripLeadingHex: (hex: string) => string;
|
|
|
54
53
|
*/
|
|
55
54
|
export declare const addLeadingHex: (hex: string) => `0x${string}`;
|
|
56
55
|
export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQTtDQUFFLENBQUMsQ0EwQ3JDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC,CA0CrC;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
|
package/dest/utils/aztec.js
CHANGED
|
@@ -51,7 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
|
|
|
51
51
|
initialValidators
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
|
-
const { rollup
|
|
54
|
+
const { rollup } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
|
|
55
55
|
vkTreeRoot: getVKTreeRoot(),
|
|
56
56
|
protocolContractsHash,
|
|
57
57
|
genesisArchiveRoot,
|
|
@@ -61,8 +61,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
|
|
|
61
61
|
...config
|
|
62
62
|
});
|
|
63
63
|
return {
|
|
64
|
-
rollup
|
|
65
|
-
slashFactoryAddress: EthAddress.fromString(slashFactoryAddress)
|
|
64
|
+
rollup
|
|
66
65
|
};
|
|
67
66
|
}
|
|
68
67
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.f650c0a5c",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -77,23 +77,23 @@
|
|
|
77
77
|
]
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
81
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
82
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
83
|
-
"@aztec/constants": "0.0.1-commit.
|
|
84
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
85
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
86
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
87
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
88
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
89
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
90
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
91
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
92
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
93
|
-
"@aztec/slasher": "0.0.1-commit.
|
|
94
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
95
|
-
"@aztec/wallets": "0.0.1-commit.
|
|
96
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
80
|
+
"@aztec/accounts": "0.0.1-commit.f650c0a5c",
|
|
81
|
+
"@aztec/archiver": "0.0.1-commit.f650c0a5c",
|
|
82
|
+
"@aztec/aztec.js": "0.0.1-commit.f650c0a5c",
|
|
83
|
+
"@aztec/constants": "0.0.1-commit.f650c0a5c",
|
|
84
|
+
"@aztec/entrypoints": "0.0.1-commit.f650c0a5c",
|
|
85
|
+
"@aztec/ethereum": "0.0.1-commit.f650c0a5c",
|
|
86
|
+
"@aztec/foundation": "0.0.1-commit.f650c0a5c",
|
|
87
|
+
"@aztec/l1-artifacts": "0.0.1-commit.f650c0a5c",
|
|
88
|
+
"@aztec/node-keystore": "0.0.1-commit.f650c0a5c",
|
|
89
|
+
"@aztec/node-lib": "0.0.1-commit.f650c0a5c",
|
|
90
|
+
"@aztec/p2p": "0.0.1-commit.f650c0a5c",
|
|
91
|
+
"@aztec/protocol-contracts": "0.0.1-commit.f650c0a5c",
|
|
92
|
+
"@aztec/sequencer-client": "0.0.1-commit.f650c0a5c",
|
|
93
|
+
"@aztec/slasher": "0.0.1-commit.f650c0a5c",
|
|
94
|
+
"@aztec/stdlib": "0.0.1-commit.f650c0a5c",
|
|
95
|
+
"@aztec/wallets": "0.0.1-commit.f650c0a5c",
|
|
96
|
+
"@aztec/world-state": "0.0.1-commit.f650c0a5c",
|
|
97
97
|
"@ethersproject/wallet": "^5.8.0",
|
|
98
98
|
"@iarna/toml": "^2.2.5",
|
|
99
99
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
@@ -107,9 +107,9 @@
|
|
|
107
107
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
108
108
|
},
|
|
109
109
|
"devDependencies": {
|
|
110
|
-
"@aztec/aztec-node": "0.0.1-commit.
|
|
111
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
112
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
110
|
+
"@aztec/aztec-node": "0.0.1-commit.f650c0a5c",
|
|
111
|
+
"@aztec/kv-store": "0.0.1-commit.f650c0a5c",
|
|
112
|
+
"@aztec/telemetry-client": "0.0.1-commit.f650c0a5c",
|
|
113
113
|
"@jest/globals": "^30.0.0",
|
|
114
114
|
"@types/jest": "^30.0.0",
|
|
115
115
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -126,15 +126,15 @@
|
|
|
126
126
|
"typescript": "^5.3.3"
|
|
127
127
|
},
|
|
128
128
|
"peerDependencies": {
|
|
129
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
130
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
131
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
132
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
133
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
134
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
135
|
-
"@aztec/noir-test-contracts.js": "0.0.1-commit.
|
|
136
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
137
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
129
|
+
"@aztec/accounts": "0.0.1-commit.f650c0a5c",
|
|
130
|
+
"@aztec/bb-prover": "0.0.1-commit.f650c0a5c",
|
|
131
|
+
"@aztec/ethereum": "0.0.1-commit.f650c0a5c",
|
|
132
|
+
"@aztec/l1-artifacts": "0.0.1-commit.f650c0a5c",
|
|
133
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.f650c0a5c",
|
|
134
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.f650c0a5c",
|
|
135
|
+
"@aztec/noir-test-contracts.js": "0.0.1-commit.f650c0a5c",
|
|
136
|
+
"@aztec/protocol-contracts": "0.0.1-commit.f650c0a5c",
|
|
137
|
+
"@aztec/stdlib": "0.0.1-commit.f650c0a5c"
|
|
138
138
|
},
|
|
139
139
|
"files": [
|
|
140
140
|
"dest",
|
|
@@ -23,7 +23,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
|
|
|
23
23
|
rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
24
24
|
governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
|
|
25
25
|
governance: info.l1ContractAddresses.governanceAddress.toString(),
|
|
26
|
-
slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
|
|
27
26
|
feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
|
|
28
27
|
stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
|
|
29
28
|
},
|
|
@@ -51,7 +50,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
|
|
|
51
50
|
log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
52
51
|
log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
53
52
|
log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
|
|
54
|
-
log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
55
53
|
log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
56
54
|
log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
57
55
|
log(`L2 Contract Addresses:`);
|
|
@@ -96,7 +96,6 @@ export async function deployL1ContractsCmd(
|
|
|
96
96
|
log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
97
97
|
log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
98
98
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
99
|
-
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
100
99
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
101
100
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
102
101
|
log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);
|
|
@@ -29,7 +29,7 @@ export async function deployNewRollup(
|
|
|
29
29
|
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
30
|
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
31
31
|
|
|
32
|
-
const { rollup
|
|
32
|
+
const { rollup } = await deployNewRollupContracts(
|
|
33
33
|
registryAddress,
|
|
34
34
|
rpcUrls,
|
|
35
35
|
privateKey,
|
|
@@ -51,7 +51,6 @@ export async function deployNewRollup(
|
|
|
51
51
|
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
|
|
52
52
|
initialValidators: initialValidators.map(a => a.attester.toString()),
|
|
53
53
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
54
|
-
slashFactoryAddress: slashFactoryAddress.toString(),
|
|
55
54
|
},
|
|
56
55
|
null,
|
|
57
56
|
2,
|
|
@@ -62,6 +61,5 @@ export async function deployNewRollup(
|
|
|
62
61
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
63
62
|
log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
|
|
64
63
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
65
|
-
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
66
64
|
}
|
|
67
65
|
}
|
|
@@ -1,24 +1,48 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
2
2
|
|
|
3
|
-
import { mkdir, readFile,
|
|
3
|
+
import { mkdir, readFile, writeFile } from 'fs/promises';
|
|
4
4
|
import { dirname } from 'path';
|
|
5
5
|
|
|
6
6
|
export interface CachedFetchOptions {
|
|
7
|
-
/**
|
|
8
|
-
cacheDurationMs: number;
|
|
9
|
-
/** The cache file */
|
|
7
|
+
/** The cache file path for storing data. If not provided, no caching is performed. */
|
|
10
8
|
cacheFile?: string;
|
|
9
|
+
/** Fallback max-age in milliseconds when server sends no Cache-Control header. Defaults to 5 minutes. */
|
|
10
|
+
defaultMaxAgeMs?: number;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/** Cache metadata stored in a sidecar .meta file alongside the data file. */
|
|
14
|
+
interface CacheMeta {
|
|
15
|
+
etag?: string;
|
|
16
|
+
expiresAt: number;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const DEFAULT_MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes
|
|
20
|
+
|
|
21
|
+
/** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */
|
|
22
|
+
export function parseMaxAge(response: { headers: { get(name: string): string | null } }): number | undefined {
|
|
23
|
+
const cacheControl = response.headers.get('cache-control');
|
|
24
|
+
if (!cacheControl) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
const match = cacheControl.match(/max-age=(\d+)/);
|
|
28
|
+
if (!match) {
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
return parseInt(match[1], 10) * 1000;
|
|
11
32
|
}
|
|
12
33
|
|
|
13
34
|
/**
|
|
14
|
-
* Fetches data from a URL with file-based caching
|
|
15
|
-
*
|
|
35
|
+
* Fetches data from a URL with file-based HTTP conditional caching.
|
|
36
|
+
*
|
|
37
|
+
* Data is stored as raw JSON in the cache file (same format as the server returns).
|
|
38
|
+
* Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
|
|
39
|
+
* This keeps the data file human-readable and backward-compatible with older code.
|
|
16
40
|
*
|
|
17
41
|
* @param url - The URL to fetch from
|
|
18
|
-
* @param
|
|
19
|
-
* @param
|
|
20
|
-
* @param
|
|
21
|
-
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
42
|
+
* @param options - Caching options
|
|
43
|
+
* @param fetch - Fetch implementation (defaults to globalThis.fetch)
|
|
44
|
+
* @param log - Logger instance
|
|
45
|
+
* @returns The fetched and parsed JSON data, or undefined if fetch fails
|
|
22
46
|
*/
|
|
23
47
|
export async function cachedFetch<T = any>(
|
|
24
48
|
url: string,
|
|
@@ -26,42 +50,106 @@ export async function cachedFetch<T = any>(
|
|
|
26
50
|
fetch = globalThis.fetch,
|
|
27
51
|
log = createLogger('cached_fetch'),
|
|
28
52
|
): Promise<T | undefined> {
|
|
29
|
-
const {
|
|
53
|
+
const { cacheFile, defaultMaxAgeMs = DEFAULT_MAX_AGE_MS } = options;
|
|
54
|
+
|
|
55
|
+
// If no cacheFile, just fetch normally without caching
|
|
56
|
+
if (!cacheFile) {
|
|
57
|
+
return fetchAndParse<T>(url, fetch, log);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const metaFile = cacheFile + '.meta';
|
|
30
61
|
|
|
31
|
-
// Try to read
|
|
62
|
+
// Try to read metadata
|
|
63
|
+
let meta: CacheMeta | undefined;
|
|
32
64
|
try {
|
|
33
|
-
|
|
34
|
-
const info = await stat(cacheFile);
|
|
35
|
-
if (info.mtimeMs + cacheDurationMs > Date.now()) {
|
|
36
|
-
const cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
|
|
37
|
-
return cachedData;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
65
|
+
meta = JSON.parse(await readFile(metaFile, 'utf-8'));
|
|
40
66
|
} catch {
|
|
41
|
-
log.trace('
|
|
67
|
+
log.trace('No usable cache metadata found');
|
|
42
68
|
}
|
|
43
69
|
|
|
70
|
+
// Try to read cached data
|
|
71
|
+
let cachedData: T | undefined;
|
|
44
72
|
try {
|
|
45
|
-
|
|
73
|
+
cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
|
|
74
|
+
} catch {
|
|
75
|
+
log.trace('No usable cached data found');
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// If metadata and data exist and cache is fresh, return directly
|
|
79
|
+
if (meta && cachedData !== undefined && meta.expiresAt > Date.now()) {
|
|
80
|
+
return cachedData;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
// Cache is stale or missing — make a (possibly conditional) request
|
|
84
|
+
try {
|
|
85
|
+
const headers: Record<string, string> = {};
|
|
86
|
+
if (meta?.etag && cachedData !== undefined) {
|
|
87
|
+
headers['If-None-Match'] = meta.etag;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
const response = await fetch(url, { headers });
|
|
91
|
+
|
|
92
|
+
if (response.status === 304 && cachedData !== undefined) {
|
|
93
|
+
// Not modified — recompute expiry from new response headers and return cached data
|
|
94
|
+
const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
|
|
95
|
+
await writeMetaFile(metaFile, { etag: meta?.etag, expiresAt: Date.now() + maxAgeMs }, log);
|
|
96
|
+
return cachedData;
|
|
97
|
+
}
|
|
98
|
+
|
|
46
99
|
if (!response.ok) {
|
|
47
100
|
log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
|
|
48
|
-
return
|
|
101
|
+
return cachedData;
|
|
49
102
|
}
|
|
50
103
|
|
|
51
|
-
|
|
104
|
+
// 200 — parse new data and cache it
|
|
105
|
+
const data = (await response.json()) as T;
|
|
106
|
+
const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
|
|
107
|
+
const etag = response.headers.get('etag') ?? undefined;
|
|
52
108
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
} catch (err) {
|
|
59
|
-
log.warn('Failed to cache data on disk: ' + cacheFile, { cacheFile, err });
|
|
60
|
-
}
|
|
109
|
+
await ensureDir(cacheFile, log);
|
|
110
|
+
await Promise.all([
|
|
111
|
+
writeFile(cacheFile, JSON.stringify(data), 'utf-8'),
|
|
112
|
+
writeFile(metaFile, JSON.stringify({ etag, expiresAt: Date.now() + maxAgeMs }), 'utf-8'),
|
|
113
|
+
]);
|
|
61
114
|
|
|
62
115
|
return data;
|
|
116
|
+
} catch (err) {
|
|
117
|
+
log.warn(`Failed to fetch from ${url}`, { err });
|
|
118
|
+
return cachedData;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
async function fetchAndParse<T>(
|
|
123
|
+
url: string,
|
|
124
|
+
fetch: typeof globalThis.fetch,
|
|
125
|
+
log: ReturnType<typeof createLogger>,
|
|
126
|
+
): Promise<T | undefined> {
|
|
127
|
+
try {
|
|
128
|
+
const response = await fetch(url);
|
|
129
|
+
if (!response.ok) {
|
|
130
|
+
log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
133
|
+
return (await response.json()) as T;
|
|
63
134
|
} catch (err) {
|
|
64
135
|
log.warn(`Failed to fetch from ${url}`, { err });
|
|
65
136
|
return undefined;
|
|
66
137
|
}
|
|
67
138
|
}
|
|
139
|
+
|
|
140
|
+
async function ensureDir(filePath: string, log: ReturnType<typeof createLogger>) {
|
|
141
|
+
try {
|
|
142
|
+
await mkdir(dirname(filePath), { recursive: true });
|
|
143
|
+
} catch (err) {
|
|
144
|
+
log.warn('Failed to create cache directory for: ' + filePath, { err });
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
async function writeMetaFile(metaFile: string, meta: CacheMeta, log: ReturnType<typeof createLogger>) {
|
|
149
|
+
try {
|
|
150
|
+
await mkdir(dirname(metaFile), { recursive: true });
|
|
151
|
+
await writeFile(metaFile, JSON.stringify(meta), 'utf-8');
|
|
152
|
+
} catch (err) {
|
|
153
|
+
log.warn('Failed to write cache metadata: ' + metaFile, { err });
|
|
154
|
+
}
|
|
155
|
+
}
|
|
@@ -14,7 +14,7 @@ export const devnetConfig = {
|
|
|
14
14
|
AZTEC_MANA_TARGET: 100000000,
|
|
15
15
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
16
16
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
17
|
-
|
|
17
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
18
18
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
19
19
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
20
20
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -24,14 +24,12 @@ export const devnetConfig = {
|
|
|
24
24
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
25
25
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
26
26
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
27
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
28
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
29
27
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
30
28
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
31
29
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
32
30
|
P2P_ENABLED: true,
|
|
33
31
|
BOOTSTRAP_NODES: '',
|
|
34
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
32
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
35
33
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
36
34
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
37
35
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -58,8 +56,6 @@ export const devnetConfig = {
|
|
|
58
56
|
BLOB_ALLOW_EMPTY_SOURCES: false,
|
|
59
57
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
60
58
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
|
|
61
|
-
AUTO_UPDATE: 'none',
|
|
62
|
-
AUTO_UPDATE_URL: '',
|
|
63
59
|
PUBLIC_OTEL_OPT_OUT: true,
|
|
64
60
|
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
65
61
|
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
@@ -75,6 +71,7 @@ export const devnetConfig = {
|
|
|
75
71
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
76
72
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
77
73
|
SLASH_GRACE_PERIOD_L2_SLOTS: 0,
|
|
74
|
+
ENABLE_VERSION_CHECK: true,
|
|
78
75
|
} as const;
|
|
79
76
|
|
|
80
77
|
export const testnetConfig = {
|
|
@@ -87,19 +84,17 @@ export const testnetConfig = {
|
|
|
87
84
|
AZTEC_INBOX_LAG: 1,
|
|
88
85
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
89
86
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
90
|
-
|
|
87
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
91
88
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
92
89
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
93
90
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
94
91
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
95
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
96
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
97
92
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
98
93
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
99
94
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
100
95
|
P2P_ENABLED: true,
|
|
101
96
|
BOOTSTRAP_NODES: '',
|
|
102
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
97
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
103
98
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
104
99
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
105
100
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -126,10 +121,11 @@ export const testnetConfig = {
|
|
|
126
121
|
AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
|
|
127
122
|
L1_CHAIN_ID: 11155111,
|
|
128
123
|
TEST_ACCOUNTS: false,
|
|
129
|
-
SPONSORED_FPC:
|
|
124
|
+
SPONSORED_FPC: false,
|
|
130
125
|
TRANSACTIONS_DISABLED: false,
|
|
131
|
-
|
|
126
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
132
127
|
PROVER_REAL_PROOFS: true,
|
|
128
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
133
129
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
134
130
|
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
135
131
|
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
@@ -143,6 +139,7 @@ export const testnetConfig = {
|
|
|
143
139
|
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
144
140
|
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
145
141
|
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
142
|
+
ENABLE_VERSION_CHECK: true,
|
|
146
143
|
} as const;
|
|
147
144
|
|
|
148
145
|
export const mainnetConfig = {
|
|
@@ -154,17 +151,15 @@ export const mainnetConfig = {
|
|
|
154
151
|
AZTEC_INBOX_LAG: 1,
|
|
155
152
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
156
153
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
157
|
-
|
|
154
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
158
155
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
159
156
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
160
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
161
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
162
157
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
163
158
|
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
164
159
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
165
160
|
P2P_ENABLED: true,
|
|
166
161
|
BOOTSTRAP_NODES: '',
|
|
167
|
-
SEQ_MIN_TX_PER_BLOCK:
|
|
162
|
+
SEQ_MIN_TX_PER_BLOCK: 1,
|
|
168
163
|
SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
|
|
169
164
|
SEQ_BLOCK_DURATION_MS: 6000,
|
|
170
165
|
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
|
|
@@ -200,17 +195,15 @@ export const mainnetConfig = {
|
|
|
200
195
|
L1_CHAIN_ID: 1,
|
|
201
196
|
TEST_ACCOUNTS: false,
|
|
202
197
|
SPONSORED_FPC: false,
|
|
203
|
-
TRANSACTIONS_DISABLED:
|
|
204
|
-
|
|
198
|
+
TRANSACTIONS_DISABLED: false,
|
|
199
|
+
SEQ_MAX_TX_PER_CHECKPOINT: 72,
|
|
205
200
|
PROVER_REAL_PROOFS: true,
|
|
206
|
-
SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
|
|
207
201
|
BLOB_ALLOW_EMPTY_SOURCES: true,
|
|
208
|
-
P2P_MAX_PENDING_TX_COUNT:
|
|
202
|
+
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
209
203
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
|
|
204
|
+
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
|
|
205
|
+
PUBLIC_OTEL_COLLECT_FROM: '',
|
|
206
|
+
ENABLE_VERSION_CHECK: false,
|
|
214
207
|
SLASH_PRUNE_PENALTY: 0,
|
|
215
208
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
216
209
|
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
@@ -9,7 +9,6 @@ import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
|
|
|
9
9
|
const DEFAULT_CONFIG_URL =
|
|
10
10
|
'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
|
|
11
11
|
const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json';
|
|
12
|
-
const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
13
12
|
|
|
14
13
|
/**
|
|
15
14
|
* Fetches remote network configuration from GitHub with caching support.
|
|
@@ -87,7 +86,6 @@ async function fetchNetworkConfigFromUrl(
|
|
|
87
86
|
|
|
88
87
|
if (url.protocol === 'http:' || url.protocol === 'https:') {
|
|
89
88
|
rawConfig = await cachedFetch(url.href, {
|
|
90
|
-
cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
|
|
91
89
|
cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined,
|
|
92
90
|
});
|
|
93
91
|
} else if (url.protocol === 'file:') {
|
|
@@ -141,6 +139,9 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
|
|
|
141
139
|
if (networkConfig.blobFileStoreUrls?.length) {
|
|
142
140
|
enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
|
|
143
141
|
}
|
|
142
|
+
if (networkConfig.txCollectionFileStoreUrls?.length) {
|
|
143
|
+
enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
|
|
144
|
+
}
|
|
144
145
|
if (networkConfig.blockDurationMs !== undefined) {
|
|
145
146
|
enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
|
|
146
147
|
}
|
package/src/utils/aztec.ts
CHANGED
|
@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(
|
|
|
49
49
|
feeJuicePortalInitialBalance: bigint,
|
|
50
50
|
config: L1ContractsConfig,
|
|
51
51
|
realVerifier: boolean,
|
|
52
|
-
): Promise<{ rollup: RollupContract
|
|
52
|
+
): Promise<{ rollup: RollupContract }> {
|
|
53
53
|
const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
|
|
54
54
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
55
55
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -80,23 +80,17 @@ export async function deployNewRollupContracts(
|
|
|
80
80
|
logger.info('Initializing new rollup with old attesters', { initialValidators });
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
const { rollup
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
realVerifier,
|
|
95
|
-
...config,
|
|
96
|
-
},
|
|
97
|
-
);
|
|
98
|
-
|
|
99
|
-
return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
|
|
83
|
+
const { rollup } = await deployRollupForUpgrade(privateKey as Hex, rpcUrls[0], chainId, registryAddress, {
|
|
84
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
85
|
+
protocolContractsHash,
|
|
86
|
+
genesisArchiveRoot,
|
|
87
|
+
initialValidators,
|
|
88
|
+
feeJuicePortalInitialBalance,
|
|
89
|
+
realVerifier,
|
|
90
|
+
...config,
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
return { rollup };
|
|
100
94
|
}
|
|
101
95
|
|
|
102
96
|
/**
|