@aztec/stdlib 5.0.0-rc.2 → 5.0.0
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/block/attestation_info.d.ts +1 -1
- package/dest/block/attestation_info.d.ts.map +1 -1
- package/dest/block/attestation_info.js +7 -4
- package/dest/block/l2_block_source.d.ts +34 -3
- package/dest/block/l2_block_source.d.ts.map +1 -1
- package/dest/block/l2_block_source.js +15 -0
- package/dest/block/l2_block_stream/event_driven_l2_block_stream.d.ts +39 -0
- package/dest/block/l2_block_stream/event_driven_l2_block_stream.d.ts.map +1 -0
- package/dest/block/l2_block_stream/event_driven_l2_block_stream.js +165 -0
- package/dest/block/l2_block_stream/index.d.ts +2 -1
- package/dest/block/l2_block_stream/index.d.ts.map +1 -1
- package/dest/block/l2_block_stream/index.js +1 -0
- package/dest/block/l2_block_stream/interfaces.d.ts +16 -2
- package/dest/block/l2_block_stream/interfaces.d.ts.map +1 -1
- package/dest/block/l2_block_stream/interfaces.js +25 -1
- package/dest/block/l2_block_stream/l2_block_stream.d.ts +21 -35
- package/dest/block/l2_block_stream/l2_block_stream.d.ts.map +1 -1
- package/dest/block/l2_block_stream/l2_block_stream.js +5 -30
- package/dest/block/proposal/attestations_and_signers.d.ts +19 -1
- package/dest/block/proposal/attestations_and_signers.d.ts.map +1 -1
- package/dest/block/proposal/attestations_and_signers.js +47 -7
- package/dest/block/validate_block_result.d.ts +16 -1
- package/dest/block/validate_block_result.d.ts.map +1 -1
- package/dest/block/validate_block_result.js +18 -3
- package/dest/config/network-consensus-config.d.ts +1 -1
- package/dest/config/network-consensus-config.d.ts.map +1 -1
- package/dest/config/network-consensus-config.js +2 -10
- package/dest/contract/contract_address.d.ts +5 -4
- package/dest/contract/contract_address.d.ts.map +1 -1
- package/dest/contract/contract_instance.d.ts +16 -2
- package/dest/contract/contract_instance.d.ts.map +1 -1
- package/dest/contract/contract_instance.js +45 -0
- package/dest/contract/interfaces/contract_instance.d.ts +71 -10
- package/dest/contract/interfaces/contract_instance.d.ts.map +1 -1
- package/dest/contract/interfaces/contract_instance.js +7 -2
- package/dest/contract/partial_address.d.ts +9 -3
- package/dest/contract/partial_address.d.ts.map +1 -1
- package/dest/contract/partial_address.js +8 -2
- package/dest/database-version/version_manager.d.ts +18 -4
- package/dest/database-version/version_manager.d.ts.map +1 -1
- package/dest/database-version/version_manager.js +76 -6
- package/dest/ha-signing/config.d.ts +19 -5
- package/dest/ha-signing/config.d.ts.map +1 -1
- package/dest/ha-signing/config.js +9 -3
- package/dest/ha-signing/local_config.d.ts +10 -2
- package/dest/ha-signing/local_config.d.ts.map +1 -1
- package/dest/ha-signing/local_config.js +8 -2
- package/dest/hash/hash.d.ts +1 -2
- package/dest/hash/hash.d.ts.map +1 -1
- package/dest/hash/hash.js +0 -7
- package/dest/interfaces/archiver.d.ts +8 -1
- package/dest/interfaces/archiver.d.ts.map +1 -1
- package/dest/interfaces/archiver.js +2 -1
- package/dest/interfaces/aztec-node-admin.d.ts +5 -2
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/configs.d.ts +4 -1
- package/dest/interfaces/configs.d.ts.map +1 -1
- package/dest/interfaces/configs.js +1 -0
- package/dest/interfaces/private_kernel_prover.d.ts +9 -11
- package/dest/interfaces/private_kernel_prover.d.ts.map +1 -1
- package/dest/interfaces/proving-job.d.ts +87 -74
- package/dest/interfaces/proving-job.d.ts.map +1 -1
- package/dest/interfaces/proving-job.js +13 -4
- package/dest/interfaces/server_circuit_prover.d.ts +3 -3
- package/dest/interfaces/server_circuit_prover.d.ts.map +1 -1
- package/dest/interfaces/validator.d.ts +7 -3
- package/dest/interfaces/validator.d.ts.map +1 -1
- package/dest/interfaces/world_state.d.ts +14 -1
- package/dest/interfaces/world_state.d.ts.map +1 -1
- package/dest/kernel/hints/find_private_kernel_reset_dimensions.d.ts +8 -2
- package/dest/kernel/hints/find_private_kernel_reset_dimensions.d.ts.map +1 -1
- package/dest/kernel/hints/find_private_kernel_reset_dimensions.js +12 -74
- package/dest/kernel/index.d.ts +2 -2
- package/dest/kernel/index.d.ts.map +1 -1
- package/dest/kernel/index.js +1 -1
- package/dest/kernel/private_circuit_public_inputs.d.ts +13 -3
- package/dest/kernel/private_circuit_public_inputs.d.ts.map +1 -1
- package/dest/kernel/private_circuit_public_inputs.js +14 -7
- package/dest/kernel/private_context_inputs.d.ts +4 -3
- package/dest/kernel/private_context_inputs.d.ts.map +1 -1
- package/dest/kernel/private_context_inputs.js +7 -3
- package/dest/kernel/private_kernel_circuit_public_inputs.d.ts +7 -1
- package/dest/kernel/private_kernel_circuit_public_inputs.d.ts.map +1 -1
- package/dest/kernel/private_kernel_circuit_public_inputs.js +7 -0
- package/dest/kernel/private_kernel_init_2_circuit_private_inputs.d.ts +2 -3
- package/dest/kernel/private_kernel_init_2_circuit_private_inputs.d.ts.map +1 -1
- package/dest/kernel/private_kernel_init_2_circuit_private_inputs.js +3 -5
- package/dest/kernel/private_kernel_init_3_circuit_private_inputs.d.ts +2 -3
- package/dest/kernel/private_kernel_init_3_circuit_private_inputs.d.ts.map +1 -1
- package/dest/kernel/private_kernel_init_3_circuit_private_inputs.js +3 -5
- package/dest/kernel/private_kernel_init_circuit_private_inputs.d.ts +1 -9
- package/dest/kernel/private_kernel_init_circuit_private_inputs.d.ts.map +1 -1
- package/dest/kernel/private_kernel_init_circuit_private_inputs.js +2 -6
- package/dest/kernel/private_kernel_reset_dimensions.d.ts +7 -8
- package/dest/kernel/private_kernel_reset_dimensions.d.ts.map +1 -1
- package/dest/kernel/private_kernel_reset_tail_circuit_private_inputs.d.ts +29 -0
- package/dest/kernel/private_kernel_reset_tail_circuit_private_inputs.d.ts.map +1 -0
- package/dest/kernel/private_kernel_reset_tail_circuit_private_inputs.js +36 -0
- package/dest/keys/derivation.d.ts +41 -6
- package/dest/keys/derivation.d.ts.map +1 -1
- package/dest/keys/derivation.js +49 -26
- package/dest/logs/app_tagging_secret.d.ts +16 -8
- package/dest/logs/app_tagging_secret.d.ts.map +1 -1
- package/dest/logs/app_tagging_secret.js +24 -27
- package/dest/logs/index.d.ts +1 -3
- package/dest/logs/index.d.ts.map +1 -1
- package/dest/logs/index.js +0 -2
- package/dest/logs/shared_secret_derivation.d.ts +19 -6
- package/dest/logs/shared_secret_derivation.d.ts.map +1 -1
- package/dest/logs/shared_secret_derivation.js +26 -11
- package/dest/messaging/l1_to_l2_message.d.ts +23 -2
- package/dest/messaging/l1_to_l2_message.d.ts.map +1 -1
- package/dest/messaging/l1_to_l2_message.js +36 -11
- package/dest/p2p/attestation_utils.d.ts +1 -1
- package/dest/p2p/attestation_utils.d.ts.map +1 -1
- package/dest/p2p/attestation_utils.js +8 -1
- package/dest/p2p/checkpoint_attestation.d.ts +9 -1
- package/dest/p2p/checkpoint_attestation.d.ts.map +1 -1
- package/dest/p2p/checkpoint_attestation.js +10 -0
- package/dest/p2p/signature_utils.d.ts +10 -1
- package/dest/p2p/signature_utils.d.ts.map +1 -1
- package/dest/p2p/signature_utils.js +9 -1
- package/dest/rollup/avm_proof_data.d.ts +3 -3
- package/dest/rollup/avm_proof_data.d.ts.map +1 -1
- package/dest/stats/stats.d.ts +2 -2
- package/dest/stats/stats.d.ts.map +1 -1
- package/dest/tests/factories.d.ts +1 -1
- package/dest/tests/factories.d.ts.map +1 -1
- package/dest/tests/factories.js +4 -3
- package/dest/tx/private_tx_constant_data.d.ts +18 -2
- package/dest/tx/private_tx_constant_data.d.ts.map +1 -1
- package/dest/tx/private_tx_constant_data.js +13 -4
- package/dest/tx/simulated_tx.d.ts +10 -6
- package/dest/tx/simulated_tx.d.ts.map +1 -1
- package/dest/world-state/genesis_data.d.ts +9 -1
- package/dest/world-state/genesis_data.d.ts.map +1 -1
- package/dest/world-state/genesis_data.js +1 -0
- package/package.json +8 -8
- package/src/block/attestation_info.ts +7 -2
- package/src/block/l2_block_source.ts +54 -2
- package/src/block/l2_block_stream/event_driven_l2_block_stream.ts +207 -0
- package/src/block/l2_block_stream/index.ts +1 -0
- package/src/block/l2_block_stream/interfaces.ts +35 -1
- package/src/block/l2_block_stream/l2_block_stream.ts +35 -62
- package/src/block/proposal/attestations_and_signers.ts +53 -7
- package/src/block/validate_block_result.ts +48 -2
- package/src/config/network-consensus-config.ts +2 -13
- package/src/contract/contract_address.ts +4 -3
- package/src/contract/contract_instance.ts +62 -1
- package/src/contract/interfaces/contract_instance.ts +26 -8
- package/src/contract/partial_address.ts +8 -2
- package/src/database-version/version_manager.ts +96 -6
- package/src/ha-signing/config.ts +23 -5
- package/src/ha-signing/local_config.ts +20 -1
- package/src/hash/hash.ts +0 -8
- package/src/interfaces/archiver.ts +8 -0
- package/src/interfaces/configs.ts +3 -0
- package/src/interfaces/private_kernel_prover.ts +10 -12
- package/src/interfaces/proving-job.ts +15 -3
- package/src/interfaces/server_circuit_prover.ts +2 -2
- package/src/interfaces/world_state.ts +14 -0
- package/src/kernel/hints/find_private_kernel_reset_dimensions.ts +22 -112
- package/src/kernel/index.ts +1 -1
- package/src/kernel/private_circuit_public_inputs.ts +12 -1
- package/src/kernel/private_context_inputs.ts +10 -3
- package/src/kernel/private_kernel_circuit_public_inputs.ts +9 -0
- package/src/kernel/private_kernel_init_2_circuit_private_inputs.ts +0 -3
- package/src/kernel/private_kernel_init_3_circuit_private_inputs.ts +0 -3
- package/src/kernel/private_kernel_init_circuit_private_inputs.ts +0 -6
- package/src/kernel/private_kernel_reset_dimensions.ts +15 -5
- package/src/kernel/private_kernel_reset_tail_circuit_private_inputs.ts +69 -0
- package/src/keys/derivation.ts +69 -24
- package/src/logs/app_tagging_secret.ts +34 -27
- package/src/logs/index.ts +0 -2
- package/src/logs/shared_secret_derivation.ts +31 -15
- package/src/messaging/l1_to_l2_message.ts +51 -13
- package/src/p2p/attestation_utils.ts +8 -1
- package/src/p2p/checkpoint_attestation.ts +12 -0
- package/src/p2p/signature_utils.ts +9 -0
- package/src/rollup/avm_proof_data.ts +2 -2
- package/src/stats/stats.ts +2 -2
- package/src/tests/factories.ts +3 -6
- package/src/tx/private_tx_constant_data.ts +25 -2
- package/src/world-state/genesis_data.ts +10 -0
- package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts +0 -47
- package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts.map +0 -1
- package/dest/kernel/private_kernel_tail_circuit_private_inputs.js +0 -38
- package/dest/logs/message_context.d.ts +0 -17
- package/dest/logs/message_context.d.ts.map +0 -1
- package/dest/logs/message_context.js +0 -9
- package/dest/logs/pending_tagged_log.d.ts +0 -11
- package/dest/logs/pending_tagged_log.d.ts.map +0 -1
- package/dest/logs/pending_tagged_log.js +0 -4
- package/src/kernel/private_kernel_tail_circuit_private_inputs.ts +0 -58
- package/src/logs/message_context.ts +0 -18
- package/src/logs/pending_tagged_log.ts +0 -12
|
@@ -75,6 +75,51 @@ export class SerializableContractInstance {
|
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
+
export class SerializableContractInstancePreimage {
|
|
79
|
+
version = VERSION;
|
|
80
|
+
salt;
|
|
81
|
+
deployer;
|
|
82
|
+
originalContractClassId;
|
|
83
|
+
initializationHash;
|
|
84
|
+
immutablesHash;
|
|
85
|
+
publicKeys;
|
|
86
|
+
constructor(instance){
|
|
87
|
+
if (instance.version !== VERSION) {
|
|
88
|
+
throw new Error(`Unexpected contract class version ${instance.version}`);
|
|
89
|
+
}
|
|
90
|
+
this.salt = instance.salt;
|
|
91
|
+
this.deployer = instance.deployer;
|
|
92
|
+
this.originalContractClassId = instance.originalContractClassId;
|
|
93
|
+
this.initializationHash = instance.initializationHash;
|
|
94
|
+
this.immutablesHash = instance.immutablesHash;
|
|
95
|
+
this.publicKeys = instance.publicKeys;
|
|
96
|
+
}
|
|
97
|
+
toBuffer() {
|
|
98
|
+
return serializeToBuffer(numToUInt8(this.version), this.salt, this.deployer, this.originalContractClassId, this.initializationHash, this.immutablesHash, this.publicKeys);
|
|
99
|
+
}
|
|
100
|
+
/** Returns a copy of this object with its address included. */ withAddress(address) {
|
|
101
|
+
return {
|
|
102
|
+
...this,
|
|
103
|
+
address
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
static fromBuffer(bufferOrReader) {
|
|
107
|
+
const reader = BufferReader.asReader(bufferOrReader);
|
|
108
|
+
const version = reader.readUInt8();
|
|
109
|
+
if (version !== VERSION) {
|
|
110
|
+
throw new Error(`Unexpected contract instance preimage version ${version}`);
|
|
111
|
+
}
|
|
112
|
+
return new SerializableContractInstancePreimage({
|
|
113
|
+
version: VERSION,
|
|
114
|
+
salt: reader.readObject(Fr),
|
|
115
|
+
deployer: reader.readObject(AztecAddress),
|
|
116
|
+
originalContractClassId: reader.readObject(Fr),
|
|
117
|
+
initializationHash: reader.readObject(Fr),
|
|
118
|
+
immutablesHash: reader.readObject(Fr),
|
|
119
|
+
publicKeys: reader.readObject(PublicKeys)
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
}
|
|
78
123
|
/**
|
|
79
124
|
* Generates a Contract Instance from some instantiation params.
|
|
80
125
|
* @param artifact - The account contract build artifact.
|
|
@@ -4,19 +4,19 @@ import { AztecAddress } from '../../aztec-address/index.js';
|
|
|
4
4
|
import { PublicKeys } from '../../keys/public_keys.js';
|
|
5
5
|
declare const VERSION: 2;
|
|
6
6
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
7
|
+
* The address preimage of a contract instance: the immutable data that hashes to its address, i.e. everything a
|
|
8
|
+
* contract deployment commits to.
|
|
9
|
+
*
|
|
10
|
+
* Note that `originaContractClassId` is not necessarily the instance's _current_ class id, in case of upgrades: that
|
|
11
|
+
* one is not part of the preimage and is instead derived from chain state.
|
|
10
12
|
*/
|
|
11
|
-
export interface
|
|
13
|
+
export interface ContractInstancePreimage {
|
|
12
14
|
/** Version identifier. Initially one, bumped for any changes to the contract instance struct. */
|
|
13
15
|
version: typeof VERSION;
|
|
14
16
|
/** User-generated pseudorandom value for uniqueness. */
|
|
15
17
|
salt: Fr;
|
|
16
18
|
/** Optional deployer address or zero if this was a universal deploy. */
|
|
17
19
|
deployer: AztecAddress;
|
|
18
|
-
/** Identifier of the contract class for this instance. */
|
|
19
|
-
currentContractClassId: Fr;
|
|
20
20
|
/** Identifier of the original (at deployment) contract class for this instance */
|
|
21
21
|
originalContractClassId: Fr;
|
|
22
22
|
/** Hash of the selector and arguments to the constructor. */
|
|
@@ -26,14 +26,24 @@ export interface ContractInstance {
|
|
|
26
26
|
/** Public keys associated with this instance. */
|
|
27
27
|
publicKeys: PublicKeys;
|
|
28
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* The address preimage plus the current contract class id, which is chain-tracked state derived from the
|
|
31
|
+
* ContractInstanceRegistry (it equals the original class id unless the contract has been upgraded).
|
|
32
|
+
*/
|
|
33
|
+
export interface ContractInstance extends ContractInstancePreimage {
|
|
34
|
+
/** Identifier of the contract class this instance currently runs (as of some block). */
|
|
35
|
+
currentContractClassId: Fr;
|
|
36
|
+
}
|
|
37
|
+
export type ContractInstancePreimageWithAddress = ContractInstancePreimage & {
|
|
38
|
+
address: AztecAddress;
|
|
39
|
+
};
|
|
29
40
|
export type ContractInstanceWithAddress = ContractInstance & {
|
|
30
41
|
address: AztecAddress;
|
|
31
42
|
};
|
|
32
|
-
export declare const
|
|
43
|
+
export declare const ContractInstancePreimageSchema: z.ZodObject<{
|
|
33
44
|
version: z.ZodLiteral<2>;
|
|
34
45
|
salt: import("../../schemas/index.js").ZodFor<Fr>;
|
|
35
46
|
deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
36
|
-
currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
37
47
|
originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
38
48
|
initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
39
49
|
immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
@@ -53,11 +63,60 @@ export declare const ContractInstanceSchema: z.ZodObject<{
|
|
|
53
63
|
fbpkMHash: Fr;
|
|
54
64
|
}>>;
|
|
55
65
|
}, z.core.$strip>;
|
|
56
|
-
export declare const
|
|
66
|
+
export declare const ContractInstanceSchema: z.ZodIntersection<z.ZodObject<{
|
|
57
67
|
version: z.ZodLiteral<2>;
|
|
58
68
|
salt: import("../../schemas/index.js").ZodFor<Fr>;
|
|
59
69
|
deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
70
|
+
originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
71
|
+
initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
72
|
+
immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
73
|
+
publicKeys: z.ZodPipe<z.ZodObject<{
|
|
74
|
+
npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
75
|
+
ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
|
|
76
|
+
ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
77
|
+
tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
78
|
+
mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
79
|
+
fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
80
|
+
}, z.core.$strip>, z.ZodTransform<PublicKeys, {
|
|
81
|
+
npkMHash: Fr;
|
|
82
|
+
ivpkM: import("@aztec/foundation/schemas").Point;
|
|
83
|
+
ovpkMHash: Fr;
|
|
84
|
+
tpkMHash: Fr;
|
|
85
|
+
mspkMHash: Fr;
|
|
86
|
+
fbpkMHash: Fr;
|
|
87
|
+
}>>;
|
|
88
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
60
89
|
currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
90
|
+
}, z.core.$strip>>;
|
|
91
|
+
export declare const ContractInstancePreimageWithAddressSchema: z.ZodIntersection<z.ZodObject<{
|
|
92
|
+
version: z.ZodLiteral<2>;
|
|
93
|
+
salt: import("../../schemas/index.js").ZodFor<Fr>;
|
|
94
|
+
deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
95
|
+
originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
96
|
+
initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
97
|
+
immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
98
|
+
publicKeys: z.ZodPipe<z.ZodObject<{
|
|
99
|
+
npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
100
|
+
ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
|
|
101
|
+
ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
102
|
+
tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
103
|
+
mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
104
|
+
fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
|
|
105
|
+
}, z.core.$strip>, z.ZodTransform<PublicKeys, {
|
|
106
|
+
npkMHash: Fr;
|
|
107
|
+
ivpkM: import("@aztec/foundation/schemas").Point;
|
|
108
|
+
ovpkMHash: Fr;
|
|
109
|
+
tpkMHash: Fr;
|
|
110
|
+
mspkMHash: Fr;
|
|
111
|
+
fbpkMHash: Fr;
|
|
112
|
+
}>>;
|
|
113
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
114
|
+
address: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
115
|
+
}, z.core.$strip>>;
|
|
116
|
+
export declare const ContractInstanceWithAddressSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
117
|
+
version: z.ZodLiteral<2>;
|
|
118
|
+
salt: import("../../schemas/index.js").ZodFor<Fr>;
|
|
119
|
+
deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
61
120
|
originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
62
121
|
initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
63
122
|
immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
|
|
@@ -77,6 +136,8 @@ export declare const ContractInstanceWithAddressSchema: z.ZodIntersection<z.ZodO
|
|
|
77
136
|
fbpkMHash: Fr;
|
|
78
137
|
}>>;
|
|
79
138
|
}, z.core.$strip>, z.ZodObject<{
|
|
139
|
+
currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
|
|
140
|
+
}, z.core.$strip>>, z.ZodObject<{
|
|
80
141
|
address: import("../../schemas/index.js").ZodFor<AztecAddress>;
|
|
81
142
|
}, z.core.$strip>>;
|
|
82
143
|
/**
|
|
@@ -90,4 +151,4 @@ export declare function contractInstanceFromPlainObject(obj: any): ContractInsta
|
|
|
90
151
|
*/
|
|
91
152
|
export declare function contractInstanceWithAddressFromPlainObject(address: AztecAddress, obj: any): ContractInstanceWithAddress;
|
|
92
153
|
export {};
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2luc3RhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHdkQsUUFBQSxNQUFNLE9BQU8sR0FBYSxDQUFDO0FBRTNCOzs7Ozs7R0FNRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMsaUdBQWlHO0lBQ2pHLE9BQU8sRUFBRSxPQUFPLE9BQU8sQ0FBQztJQUN4Qix3REFBd0Q7SUFDeEQsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUNULHdFQUF3RTtJQUN4RSxRQUFRLEVBQUUsWUFBWSxDQUFDO0lBQ3ZCLGtGQUFrRjtJQUNsRix1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFDNUIsNkRBQTZEO0lBQzdELGtCQUFrQixFQUFFLEVBQUUsQ0FBQztJQUN2QiwrREFBK0Q7SUFDL0QsY0FBYyxFQUFFLEVBQUUsQ0FBQztJQUNuQixpREFBaUQ7SUFDakQsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxnQkFBaUIsU0FBUSx3QkFBd0I7SUFDaEUsd0ZBQXdGO0lBQ3hGLHNCQUFzQixFQUFFLEVBQUUsQ0FBQztDQUM1QjtBQUVELE1BQU0sTUFBTSxtQ0FBbUMsR0FBRyx3QkFBd0IsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUE7Q0FBRSxDQUFDO0FBRXZHLE1BQU0sTUFBTSwyQkFBMkIsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUE7Q0FBRSxDQUFDO0FBRXZGLGVBQU8sTUFBTSw4QkFBOEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7aUJBVTFDLENBQUM7QUFFRixlQUFPLE1BQU0sc0JBQXNCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7a0JBRWxDLENBQUM7QUFFRixlQUFPLE1BQU0seUNBQXlDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7a0JBRXJELENBQUM7QUFFRixlQUFPLE1BQU0saUNBQWlDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztrQkFFN0MsQ0FBQztBQUVGOzs7R0FHRztBQUNILHdCQUFnQiwrQkFBK0IsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGdCQUFnQixDQVcxRTtBQUVEOzs7R0FHRztBQUNILHdCQUFnQiwwQ0FBMEMsQ0FDeEQsT0FBTyxFQUFFLFlBQVksRUFDckIsR0FBRyxFQUFFLEdBQUcsR0FDUCwyQkFBMkIsQ0FLN0IifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B
|
|
1
|
+
{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,iGAAiG;IACjG,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB,wDAAwD;IACxD,IAAI,EAAE,EAAE,CAAC;IACT,wEAAwE;IACxE,QAAQ,EAAE,YAAY,CAAC;IACvB,kFAAkF;IAClF,uBAAuB,EAAE,EAAE,CAAC;IAC5B,6DAA6D;IAC7D,kBAAkB,EAAE,EAAE,CAAC;IACvB,+DAA+D;IAC/D,cAAc,EAAE,EAAE,CAAC;IACnB,iDAAiD;IACjD,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,wBAAwB;IAChE,wFAAwF;IACxF,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,mCAAmC,GAAG,wBAAwB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEvG,MAAM,MAAM,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEvF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;iBAU1C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;kBAElC,CAAC;AAEF,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;kBAErD,CAAC;AAEF,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;kBAE7C,CAAC;AAEF;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CAW1E;AAED;;;GAGG;AACH,wBAAgB,0CAA0C,CACxD,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,GAAG,GACP,2BAA2B,CAK7B"}
|
|
@@ -4,16 +4,21 @@ import { AztecAddress } from '../../aztec-address/index.js';
|
|
|
4
4
|
import { PublicKeys } from '../../keys/public_keys.js';
|
|
5
5
|
import { schemas, zodFor } from '../../schemas/index.js';
|
|
6
6
|
const VERSION = 2;
|
|
7
|
-
export const
|
|
7
|
+
export const ContractInstancePreimageSchema = zodFor()(z.object({
|
|
8
8
|
version: z.literal(VERSION),
|
|
9
9
|
salt: schemas.Fr,
|
|
10
10
|
deployer: schemas.AztecAddress,
|
|
11
|
-
currentContractClassId: schemas.Fr,
|
|
12
11
|
originalContractClassId: schemas.Fr,
|
|
13
12
|
initializationHash: schemas.Fr,
|
|
14
13
|
immutablesHash: schemas.Fr,
|
|
15
14
|
publicKeys: PublicKeys.schema
|
|
16
15
|
}));
|
|
16
|
+
export const ContractInstanceSchema = zodFor()(ContractInstancePreimageSchema.and(z.object({
|
|
17
|
+
currentContractClassId: schemas.Fr
|
|
18
|
+
})));
|
|
19
|
+
export const ContractInstancePreimageWithAddressSchema = zodFor()(ContractInstancePreimageSchema.and(z.object({
|
|
20
|
+
address: schemas.AztecAddress
|
|
21
|
+
})));
|
|
17
22
|
export const ContractInstanceWithAddressSchema = zodFor()(ContractInstanceSchema.and(z.object({
|
|
18
23
|
address: schemas.AztecAddress
|
|
19
24
|
})));
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
4
|
-
*
|
|
3
|
+
* The contract-side preimage of an Aztec address, i.e. the commitment to a specific contract instance.
|
|
4
|
+
*
|
|
5
|
+
* A partial address commits to a contract's code and initialization
|
|
6
|
+
* (`hash(contract_class_id, salted_initialization_hash)`) but not to its keys. Combined with an account's `PublicKeys`,
|
|
7
|
+
* it fully determines the address: `address = (hash(public_keys_hash, partial_address) * G + Ivpk_m).x`. Two accounts
|
|
8
|
+
* therefore share an address only if they share both their public keys and their partial address.
|
|
9
|
+
*
|
|
10
|
+
* See `computePartialAddress` for the derivation.
|
|
5
11
|
*/
|
|
6
12
|
export type PartialAddress = Fr;
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFydGlhbF9hZGRyZXNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvcGFydGlhbF9hZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpEOzs7Ozs7Ozs7R0FTRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcsRUFBRSxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partial_address.d.ts","sourceRoot":"","sources":["../../src/contract/partial_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD
|
|
1
|
+
{"version":3,"file":"partial_address.d.ts","sourceRoot":"","sources":["../../src/contract/partial_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
2
|
+
* The contract-side preimage of an Aztec address, i.e. the commitment to a specific contract instance.
|
|
3
|
+
*
|
|
4
|
+
* A partial address commits to a contract's code and initialization
|
|
5
|
+
* (`hash(contract_class_id, salted_initialization_hash)`) but not to its keys. Combined with an account's `PublicKeys`,
|
|
6
|
+
* it fully determines the address: `address = (hash(public_keys_hash, partial_address) * G + Ivpk_m).x`. Two accounts
|
|
7
|
+
* therefore share an address only if they share both their public keys and their partial address.
|
|
8
|
+
*
|
|
9
|
+
* See `computePartialAddress` for the derivation.
|
|
4
10
|
*/ export { };
|
|
@@ -2,9 +2,17 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
2
2
|
import { type Logger } from '@aztec/foundation/log';
|
|
3
3
|
import fs from 'fs/promises';
|
|
4
4
|
import { DatabaseVersion } from './database_version.js';
|
|
5
|
-
export type DatabaseVersionManagerFs = Pick<typeof fs, 'readFile' | '
|
|
5
|
+
export type DatabaseVersionManagerFs = Pick<typeof fs, 'readFile' | 'rm' | 'mkdir' | 'rename' | 'open'>;
|
|
6
6
|
export declare const DATABASE_VERSION_FILE_NAME = "db_version";
|
|
7
7
|
export type SchemaVersionMismatchPolicy = 'reset' | 'throw';
|
|
8
|
+
/**
|
|
9
|
+
* How to react when the version file exists but cannot be read (permissions, IO error, truncation).
|
|
10
|
+
* `'reset'` (default) treats the store as unversioned and lets the reset path run — safe for stores
|
|
11
|
+
* where an empty state is legitimate. `'throw'` refuses to open, leaving data untouched — required
|
|
12
|
+
* for protection stores (e.g. signing protection) that must never be silently wiped by a transient
|
|
13
|
+
* filesystem error. A genuinely missing file (ENOENT) is a first boot and is never affected by this.
|
|
14
|
+
*/
|
|
15
|
+
export type VersionFileReadFailurePolicy = 'reset' | 'throw';
|
|
8
16
|
export type DatabaseVersionManagerOptions<T> = {
|
|
9
17
|
schemaVersion: number;
|
|
10
18
|
rollupAddress: EthAddress;
|
|
@@ -12,6 +20,7 @@ export type DatabaseVersionManagerOptions<T> = {
|
|
|
12
20
|
onOpen: (dataDir: string) => Promise<T>;
|
|
13
21
|
onUpgrade?: (dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>;
|
|
14
22
|
schemaVersionMismatchPolicy?: SchemaVersionMismatchPolicy;
|
|
23
|
+
versionFileReadFailurePolicy?: VersionFileReadFailurePolicy;
|
|
15
24
|
fileSystem?: DatabaseVersionManagerFs;
|
|
16
25
|
log?: Logger;
|
|
17
26
|
};
|
|
@@ -28,6 +37,7 @@ export declare class DatabaseVersionManager<T> {
|
|
|
28
37
|
private onOpen;
|
|
29
38
|
private onUpgrade?;
|
|
30
39
|
private schemaVersionMismatchPolicy;
|
|
40
|
+
private versionFileReadFailurePolicy;
|
|
31
41
|
private fileSystem;
|
|
32
42
|
private log;
|
|
33
43
|
/**
|
|
@@ -37,13 +47,16 @@ export declare class DatabaseVersionManager<T> {
|
|
|
37
47
|
* @param rollupAddress - The rollup contract address
|
|
38
48
|
* @param dataDirectory - The directory where version information will be stored
|
|
39
49
|
* @param onOpen - A callback to the open the database at the given location
|
|
40
|
-
* @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the
|
|
50
|
+
* @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the
|
|
51
|
+
* database. Must be idempotent: since the version marker is written only after a successful open, a crash after
|
|
52
|
+
* onUpgrade but before the marker is written re-runs onUpgrade on the next start.
|
|
41
53
|
* @param schemaVersionMismatchPolicy - Whether schema mismatches should reset data or throw
|
|
54
|
+
* @param versionFileReadFailurePolicy - Whether an unreadable (non-missing) version file should reset data or throw
|
|
42
55
|
* @param fileSystem - An interface to access the filesystem
|
|
43
56
|
* @param log - Optional custom logger
|
|
44
57
|
* @param options - Configuration options
|
|
45
58
|
*/
|
|
46
|
-
constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, schemaVersionMismatchPolicy, fileSystem, log }: DatabaseVersionManagerOptions<T>);
|
|
59
|
+
constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, schemaVersionMismatchPolicy, versionFileReadFailurePolicy, fileSystem, log }: DatabaseVersionManagerOptions<T>);
|
|
47
60
|
static writeVersion(version: DatabaseVersion, dataDir: string, fileSystem?: DatabaseVersionManagerFs): Promise<void>;
|
|
48
61
|
/**
|
|
49
62
|
* Checks the stored version against the current version and handles the outcome
|
|
@@ -54,6 +67,7 @@ export declare class DatabaseVersionManager<T> {
|
|
|
54
67
|
* @returns True if data was reset, false if upgraded or no change needed
|
|
55
68
|
*/
|
|
56
69
|
open(): Promise<[T, boolean]>;
|
|
70
|
+
private closeQuietly;
|
|
57
71
|
/**
|
|
58
72
|
* Writes the current version to the version file
|
|
59
73
|
*/
|
|
@@ -71,4 +85,4 @@ export declare class DatabaseVersionManager<T> {
|
|
|
71
85
|
*/
|
|
72
86
|
getSchemaVersion(): number;
|
|
73
87
|
}
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbl9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UtdmVyc2lvbi92ZXJzaW9uX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHN0IsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE1BQU0sTUFBTSx3QkFBd0IsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUUsVUFBVSxHQUFHLElBQUksR0FBRyxPQUFPLEdBQUcsUUFBUSxHQUFHLE1BQU0sQ0FBQyxDQUFDO0FBRXhHLGVBQU8sTUFBTSwwQkFBMEIsZUFBZSxDQUFDO0FBQ3ZELE1BQU0sTUFBTSwyQkFBMkIsR0FBRyxPQUFPLEdBQUcsT0FBTyxDQUFDO0FBRTVEOzs7Ozs7R0FNRztBQUNILE1BQU0sTUFBTSw0QkFBNEIsR0FBRyxPQUFPLEdBQUcsT0FBTyxDQUFDO0FBRTdELE1BQU0sTUFBTSw2QkFBNkIsQ0FBQyxDQUFDLElBQUk7SUFDN0MsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQzFCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsTUFBTSxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUYsMkJBQTJCLENBQUMsRUFBRSwyQkFBMkIsQ0FBQztJQUMxRCw0QkFBNEIsQ0FBQyxFQUFFLDRCQUE0QixDQUFDO0lBQzVELFVBQVUsQ0FBQyxFQUFFLHdCQUF3QixDQUFDO0lBQ3RDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gscUJBQWEsc0JBQXNCLENBQUMsQ0FBQztJQUNuQyxnQkFBdUIsWUFBWSxnQkFBOEI7SUFFakUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQVM7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWtCO0lBRWpELE9BQU8sQ0FBQyxhQUFhLENBQVM7SUFDOUIsT0FBTyxDQUFDLE1BQU0sQ0FBa0M7SUFDaEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFvRjtJQUN0RyxPQUFPLENBQUMsMkJBQTJCLENBQThCO0lBQ2pFLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBK0I7SUFDbkUsT0FBTyxDQUFDLFVBQVUsQ0FBMkI7SUFDN0MsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUVwQjs7Ozs7Ozs7Ozs7Ozs7O09BZUc7SUFDSCxZQUFZLEVBQ1YsYUFBYSxFQUNiLGFBQWEsRUFDYixhQUFhLEVBQ2IsTUFBTSxFQUNOLFNBQVMsRUFDVCwyQkFBcUMsRUFDckMsNEJBQXNDLEVBQ3RDLFVBQWUsRUFDZixHQUFnRCxFQUNqRCxFQUFFLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxFQWVsQztJQUVELE9BQWEsWUFBWSxDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEdBQUUsd0JBQTZCLGlCQTZCN0c7SUFFRDs7Ozs7OztPQU9HO0lBQ1UsSUFBSSxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQXFHekM7WUFNYSxZQUFZO0lBZTFCOztPQUVHO0lBQ0ksWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRS9DO0lBRUQ7O09BRUc7SUFDVSxrQkFBa0IsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBUS9DO0lBRUQ7O09BRUc7SUFDSSxnQkFBZ0IsSUFBSSxNQUFNLENBRWhDO0lBRUQ7O09BRUc7SUFDSSxnQkFBZ0IsSUFBSSxNQUFNLENBRWhDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version_manager.d.ts","sourceRoot":"","sources":["../../src/database-version/version_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"version_manager.d.ts","sourceRoot":"","sources":["../../src/database-version/version_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;AAExG,eAAO,MAAM,0BAA0B,eAAe,CAAC;AACvD,MAAM,MAAM,2BAA2B,GAAG,OAAO,GAAG,OAAO,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,MAAM,4BAA4B,GAAG,OAAO,GAAG,OAAO,CAAC;AAE7D,MAAM,MAAM,6BAA6B,CAAC,CAAC,IAAI;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,UAAU,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,2BAA2B,CAAC,EAAE,2BAA2B,CAAC;IAC1D,4BAA4B,CAAC,EAAE,4BAA4B,CAAC;IAC5D,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,qBAAa,sBAAsB,CAAC,CAAC;IACnC,gBAAuB,YAAY,gBAA8B;IAEjE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,SAAS,CAAC,CAAoF;IACtG,OAAO,CAAC,2BAA2B,CAA8B;IACjE,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,GAAG,CAAS;IAEpB;;;;;;;;;;;;;;;OAeG;IACH,YAAY,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,MAAM,EACN,SAAS,EACT,2BAAqC,EACrC,4BAAsC,EACtC,UAAe,EACf,GAAgD,EACjD,EAAE,6BAA6B,CAAC,CAAC,CAAC,EAelC;IAED,OAAa,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,wBAA6B,iBA6B7G;IAED;;;;;;;OAOG;IACU,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAqGzC;YAMa,YAAY;IAe1B;;OAEG;IACI,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;IAED;;OAEG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ/C;IAED;;OAEG;IACI,gBAAgB,IAAI,MAAM,CAEhC;IAED;;OAEG;IACI,gBAAgB,IAAI,MAAM,CAEhC;CACF"}
|
|
@@ -15,6 +15,7 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
15
15
|
onOpen;
|
|
16
16
|
onUpgrade;
|
|
17
17
|
schemaVersionMismatchPolicy;
|
|
18
|
+
versionFileReadFailurePolicy;
|
|
18
19
|
fileSystem;
|
|
19
20
|
log;
|
|
20
21
|
/**
|
|
@@ -24,12 +25,15 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
24
25
|
* @param rollupAddress - The rollup contract address
|
|
25
26
|
* @param dataDirectory - The directory where version information will be stored
|
|
26
27
|
* @param onOpen - A callback to the open the database at the given location
|
|
27
|
-
* @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the
|
|
28
|
+
* @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the
|
|
29
|
+
* database. Must be idempotent: since the version marker is written only after a successful open, a crash after
|
|
30
|
+
* onUpgrade but before the marker is written re-runs onUpgrade on the next start.
|
|
28
31
|
* @param schemaVersionMismatchPolicy - Whether schema mismatches should reset data or throw
|
|
32
|
+
* @param versionFileReadFailurePolicy - Whether an unreadable (non-missing) version file should reset data or throw
|
|
29
33
|
* @param fileSystem - An interface to access the filesystem
|
|
30
34
|
* @param log - Optional custom logger
|
|
31
35
|
* @param options - Configuration options
|
|
32
|
-
*/ constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, schemaVersionMismatchPolicy = 'reset', fileSystem = fs, log = createLogger(`foundation:version-manager`) }){
|
|
36
|
+
*/ constructor({ schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, schemaVersionMismatchPolicy = 'reset', versionFileReadFailurePolicy = 'reset', fileSystem = fs, log = createLogger(`foundation:version-manager`) }){
|
|
33
37
|
if (schemaVersion < 1) {
|
|
34
38
|
throw new TypeError(`Invalid schema version received: ${schemaVersion}`);
|
|
35
39
|
}
|
|
@@ -39,6 +43,7 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
39
43
|
this.onOpen = onOpen;
|
|
40
44
|
this.onUpgrade = onUpgrade;
|
|
41
45
|
this.schemaVersionMismatchPolicy = schemaVersionMismatchPolicy;
|
|
46
|
+
this.versionFileReadFailurePolicy = versionFileReadFailurePolicy;
|
|
42
47
|
this.fileSystem = fileSystem;
|
|
43
48
|
this.log = log;
|
|
44
49
|
}
|
|
@@ -46,7 +51,31 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
46
51
|
await fileSystem.mkdir(dataDir, {
|
|
47
52
|
recursive: true
|
|
48
53
|
});
|
|
49
|
-
|
|
54
|
+
const finalPath = join(dataDir, DatabaseVersionManager.VERSION_FILE);
|
|
55
|
+
const tmpPath = `${finalPath}.tmp`;
|
|
56
|
+
// Atomic durable write: fill a temp file, fsync it, then rename it into place. The marker only
|
|
57
|
+
// becomes visible under its final name once its bytes are durably on disk, so a crash mid-write
|
|
58
|
+
// can never leave a "valid" version file sitting over an empty or partially-populated data dir.
|
|
59
|
+
const handle = await fileSystem.open(tmpPath, 'w');
|
|
60
|
+
try {
|
|
61
|
+
await handle.writeFile(version.toBuffer());
|
|
62
|
+
await handle.sync();
|
|
63
|
+
} finally{
|
|
64
|
+
await handle.close();
|
|
65
|
+
}
|
|
66
|
+
await fileSystem.rename(tmpPath, finalPath);
|
|
67
|
+
// Best-effort fsync of the containing directory so the rename itself survives a crash. Not all
|
|
68
|
+
// filesystems support directory fsync, so a failure here is non-fatal.
|
|
69
|
+
try {
|
|
70
|
+
const dirHandle = await fileSystem.open(dataDir, 'r');
|
|
71
|
+
try {
|
|
72
|
+
await dirHandle.sync();
|
|
73
|
+
} finally{
|
|
74
|
+
await dirHandle.close();
|
|
75
|
+
}
|
|
76
|
+
} catch {
|
|
77
|
+
// directory fsync is best-effort
|
|
78
|
+
}
|
|
50
79
|
}
|
|
51
80
|
/**
|
|
52
81
|
* Checks the stored version against the current version and handles the outcome
|
|
@@ -68,6 +97,15 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
68
97
|
storedVersion = DatabaseVersion.empty();
|
|
69
98
|
// only turn off these logs if the data dir didn't exist before
|
|
70
99
|
shouldLogDataReset = false;
|
|
100
|
+
} else if (this.versionFileReadFailurePolicy === 'throw') {
|
|
101
|
+
// The version file exists but could not be read/parsed (permissions, IO error, truncation).
|
|
102
|
+
// Treating this as "unversioned" would reset the data directory, silently wiping a store that
|
|
103
|
+
// must fail closed. Refuse to open instead, leaving the data untouched for the operator.
|
|
104
|
+
const code = err?.code;
|
|
105
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
106
|
+
throw new Error(`Failed to read database version file at ${this.versionFile} (${code ?? 'unknown error'}: ${message}). ` + `Refusing to open the database; data was NOT reset. Resolve the underlying filesystem error and retry.`, {
|
|
107
|
+
cause: err
|
|
108
|
+
});
|
|
71
109
|
} else {
|
|
72
110
|
this.log.warn(`Failed to read stored version information: ${err}. Defaulting to empty version`);
|
|
73
111
|
storedVersion = DatabaseVersion.empty();
|
|
@@ -113,14 +151,46 @@ export const DATABASE_VERSION_FILE_NAME = 'db_version';
|
|
|
113
151
|
if (needsReset) {
|
|
114
152
|
await this.resetDataDirectory();
|
|
115
153
|
}
|
|
116
|
-
//
|
|
117
|
-
|
|
154
|
+
// Open the database first, then record the version marker. Writing the marker only after a
|
|
155
|
+
// successful open makes it a post-commit record: if the process crashes between the reset and a
|
|
156
|
+
// durable open, no marker is left behind, so the next startup re-runs the reset instead of
|
|
157
|
+
// trusting a marker that sits over empty or partially-initialized data.
|
|
158
|
+
const instance = await this.onOpen(this.dataDirectory);
|
|
159
|
+
// Only (re)write the marker when it would actually change — first boot, reset, or upgrade. On a
|
|
160
|
+
// normal boot it already matches, so skipping avoids an unnecessary fsync (and the directory
|
|
161
|
+
// write permission the temp-file+rename needs) and, more importantly, any window where a
|
|
162
|
+
// marker-write failure would orphan the database we just opened.
|
|
163
|
+
if (!storedVersion.equals(this.currentVersion)) {
|
|
164
|
+
try {
|
|
165
|
+
await this.writeVersion();
|
|
166
|
+
} catch (err) {
|
|
167
|
+
// The database opened but recording the marker failed; close the freshly opened instance so
|
|
168
|
+
// we do not leak its file handles / locks before propagating the failure.
|
|
169
|
+
await this.closeQuietly(instance);
|
|
170
|
+
throw err;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
118
173
|
return [
|
|
119
|
-
|
|
174
|
+
instance,
|
|
120
175
|
needsReset
|
|
121
176
|
];
|
|
122
177
|
}
|
|
123
178
|
/**
|
|
179
|
+
* Best-effort close of a just-opened database instance, used to avoid leaking handles/locks when a
|
|
180
|
+
* post-open step fails. Swallows close errors so the original failure is the one that propagates.
|
|
181
|
+
*/ async closeQuietly(instance) {
|
|
182
|
+
const closable = instance;
|
|
183
|
+
const dispose = closable?.close ?? closable?.[Symbol.asyncDispose];
|
|
184
|
+
if (typeof dispose !== 'function') {
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
try {
|
|
188
|
+
await dispose.call(closable);
|
|
189
|
+
} catch (err) {
|
|
190
|
+
this.log.warn(`Failed to close database after version-write failure: ${err}`);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
124
194
|
* Writes the current version to the version file
|
|
125
195
|
*/ writeVersion(dir) {
|
|
126
196
|
return DatabaseVersionManager.writeVersion(this.currentVersion, dir ?? this.dataDirectory, this.fileSystem);
|
|
@@ -9,8 +9,20 @@ export type BaseSignerConfig = {
|
|
|
9
9
|
nodeId: string;
|
|
10
10
|
/** How long to wait between polls when a duty is being signed (ms) */
|
|
11
11
|
pollingIntervalMs: number;
|
|
12
|
-
/**
|
|
13
|
-
|
|
12
|
+
/**
|
|
13
|
+
* How long (ms) to wait for a peer node's in-progress signing before giving up and treating the
|
|
14
|
+
* duty as already handled. This is the cross-node wait/poll timeout, distinct from
|
|
15
|
+
* signerCallTimeoutMs (the hard upper bound on this node's own signer call).
|
|
16
|
+
*/
|
|
17
|
+
peerSigningTimeoutMs: number;
|
|
18
|
+
/**
|
|
19
|
+
* Hard upper bound (ms) on a single signer call made by this node. If the (possibly remote)
|
|
20
|
+
* signer does not return within this time, the call is aborted, the duty lock is released, and
|
|
21
|
+
* signing fails so it can be safely retried. The effective value is clamped to
|
|
22
|
+
* maxStuckDutiesAgeMs / 2 at construction, so a slow signer's lock is always released before
|
|
23
|
+
* stuck-duty cleanup could reclaim it. Defaults to 30_000 when unset.
|
|
24
|
+
*/
|
|
25
|
+
signerCallTimeoutMs?: number;
|
|
14
26
|
/** Maximum age of a stuck duty in ms (defaults to 2x hardcoded Aztec slot duration if not set) */
|
|
15
27
|
maxStuckDutiesAgeMs?: number;
|
|
16
28
|
/** Optional: clean up old duties after this many hours (disabled if not set) */
|
|
@@ -21,7 +33,8 @@ export declare const BaseSignerConfigSchema: z.ZodObject<{
|
|
|
21
33
|
rollupAddress: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, string, z.core.$ZodTypeInternals<import("@aztec/foundation/eth-address").EthAddress, string>>;
|
|
22
34
|
nodeId: z.ZodString;
|
|
23
35
|
pollingIntervalMs: z.ZodNumber;
|
|
24
|
-
|
|
36
|
+
peerSigningTimeoutMs: z.ZodNumber;
|
|
37
|
+
signerCallTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
25
38
|
maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
|
|
26
39
|
cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
|
|
27
40
|
}, z.core.$strip>;
|
|
@@ -59,7 +72,8 @@ export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
|
59
72
|
rollupAddress: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, string, z.core.$ZodTypeInternals<import("@aztec/foundation/eth-address").EthAddress, string>>;
|
|
60
73
|
nodeId: z.ZodString;
|
|
61
74
|
pollingIntervalMs: z.ZodNumber;
|
|
62
|
-
|
|
75
|
+
peerSigningTimeoutMs: z.ZodNumber;
|
|
76
|
+
signerCallTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
63
77
|
maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
|
|
64
78
|
cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
|
|
65
79
|
haSigningEnabled: z.ZodBoolean;
|
|
@@ -69,4 +83,4 @@ export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
|
69
83
|
poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
70
84
|
poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
71
85
|
}, z.core.$strip>;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGEtc2lnbmluZy9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sdUNBQXVDLENBQUM7QUFDL0MsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBQ3ZCLFdBQVcsRUFPWixNQUFNLDBCQUEwQixDQUFDO0FBR2xDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7O0dBRUc7QUFDSCxNQUFNLE1BQU0sZ0JBQWdCLEdBQUc7SUFDN0Isc0NBQXNDO0lBQ3RDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixzRUFBc0U7SUFDdEUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCOzs7O09BSUc7SUFDSCxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0I7Ozs7OztPQU1HO0lBQ0gsbUJBQW1CLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDN0Isa0dBQWtHO0lBQ2xHLG1CQUFtQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzdCLGdGQUFnRjtJQUNoRiwwQkFBMEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQyxHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsQ0FBQztBQUUvQyxlQUFPLE1BQU0sd0JBQXdCLEVBQUUsa0JBQWtCLENBQUMsZ0JBQWdCLENBZ0N6RSxDQUFDO0FBRUYsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7aUJBUUUsQ0FBQztBQUV0Qzs7OztHQUlHO0FBQ0gsTUFBTSxXQUFXLHVCQUF3QixTQUFRLGdCQUFnQjtJQUMvRCwwREFBMEQ7SUFDMUQsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDO0lBQzFCOzs7T0FHRztJQUNILFdBQVcsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNsQywwREFBMEQ7SUFDMUQsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHlEQUF5RDtJQUN6RCxZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsb0RBQW9EO0lBQ3BELGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzNCLGtFQUFrRTtJQUNsRSx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQztBQUVELGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxrQkFBa0IsQ0FBQyx1QkFBdUIsQ0FpQ3ZGLENBQUM7QUFFRixlQUFPLE1BQU0sOEJBQThCLEVBQUUsdUJBRTVDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHVCQUF1QixDQUUxRDtBQUVELGVBQU8sTUFBTSw2QkFBNkI7Ozs7Ozs7Ozs7Ozs7O2lCQU9FLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAOZ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAOZ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kGAAkG;IAClG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gFAAgF;IAChF,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC,GAAG,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;AAE/C,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAgCzE,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;iBAQE,CAAC;AAEtC;;;;GAIG;AACH,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC/D,0DAA0D;IAC1D,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kEAAkE;IAClE,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,+BAA+B,EAAE,kBAAkB,CAAC,uBAAuB,CAiCvF,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,uBAE5C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,uBAAuB,CAE1D;AAED,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;iBAOE,CAAC"}
|
|
@@ -12,11 +12,16 @@ export const baseSignerConfigMappings = {
|
|
|
12
12
|
description: 'The number of ms to wait between polls when a duty is being signed',
|
|
13
13
|
...numberConfigHelper(100)
|
|
14
14
|
},
|
|
15
|
-
|
|
15
|
+
peerSigningTimeoutMs: {
|
|
16
16
|
env: 'VALIDATOR_HA_SIGNING_TIMEOUT_MS',
|
|
17
|
-
description:
|
|
17
|
+
description: "How long to wait for a peer node's in-progress signing before giving up",
|
|
18
18
|
...numberConfigHelper(3_000)
|
|
19
19
|
},
|
|
20
|
+
signerCallTimeoutMs: {
|
|
21
|
+
env: 'VALIDATOR_SIGNER_CALL_TIMEOUT_MS',
|
|
22
|
+
description: 'Hard upper bound in ms on a single signer call before it is aborted (default 30000)',
|
|
23
|
+
...numberConfigHelper(30_000)
|
|
24
|
+
},
|
|
20
25
|
maxStuckDutiesAgeMs: {
|
|
21
26
|
env: 'VALIDATOR_HA_MAX_STUCK_DUTIES_AGE_MS',
|
|
22
27
|
description: 'The maximum age of a stuck duty in ms (defaults to 2x Aztec slot duration)',
|
|
@@ -32,7 +37,8 @@ export const baseSignerConfigMappings = {
|
|
|
32
37
|
export const BaseSignerConfigSchema = z.object({
|
|
33
38
|
nodeId: z.string(),
|
|
34
39
|
pollingIntervalMs: z.number().min(0),
|
|
35
|
-
|
|
40
|
+
peerSigningTimeoutMs: z.number().min(0),
|
|
41
|
+
signerCallTimeoutMs: z.number().min(0).optional(),
|
|
36
42
|
maxStuckDutiesAgeMs: z.number().min(0).optional(),
|
|
37
43
|
cleanupOldDutiesAfterHours: z.number().min(0).optional(),
|
|
38
44
|
...pickL1ContractAddressesSchema('rollupAddress')
|
|
@@ -12,21 +12,29 @@ import { type BaseSignerConfig } from './config.js';
|
|
|
12
12
|
export type LocalSignerConfig = BaseSignerConfig & DataStoreConfig & {
|
|
13
13
|
/** Maximum size of the local signing-protection LMDB store in KB. Overwrites the general dataStoreMapSizeKb. */
|
|
14
14
|
signingProtectionMapSizeKb?: number;
|
|
15
|
+
/**
|
|
16
|
+
* Allow local signing protection to run against an ephemeral store when no data directory is set.
|
|
17
|
+
* Without this, a missing data directory fails startup, since ephemeral protection does not survive
|
|
18
|
+
* restarts. Intended for dev/test networks only; production validators must persist to disk.
|
|
19
|
+
*/
|
|
20
|
+
allowEphemeralSigningProtection?: boolean;
|
|
15
21
|
};
|
|
16
22
|
export declare const localSignerConfigMappings: ConfigMappingsType<LocalSignerConfig>;
|
|
17
23
|
export declare const LocalSignerConfigSchema: z.ZodObject<{
|
|
18
24
|
rollupAddress: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, string, z.core.$ZodTypeInternals<import("@aztec/foundation/eth-address").EthAddress, string>>;
|
|
19
25
|
nodeId: z.ZodString;
|
|
20
26
|
pollingIntervalMs: z.ZodNumber;
|
|
21
|
-
|
|
27
|
+
peerSigningTimeoutMs: z.ZodNumber;
|
|
28
|
+
signerCallTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
22
29
|
maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
|
|
23
30
|
cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
|
|
24
31
|
dataDirectory: z.ZodOptional<z.ZodString>;
|
|
25
32
|
dataStoreMapSizeKb: z.ZodNumber;
|
|
26
33
|
signingProtectionMapSizeKb: z.ZodOptional<z.ZodNumber>;
|
|
34
|
+
allowEphemeralSigningProtection: z.ZodOptional<z.ZodBoolean>;
|
|
27
35
|
}, z.core.$strip>;
|
|
28
36
|
/**
|
|
29
37
|
* Returns the local signer configuration from environment variables.
|
|
30
38
|
*/
|
|
31
39
|
export declare function getLocalSignerConfigEnvVars(): LocalSignerConfig;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWxfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGEtc2lnbmluZy9sb2NhbF9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBSXhCLE1BQU0sMEJBQTBCLENBQUM7QUFFbEMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHdCQUF3QixDQUFDO0FBRWxGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQW9ELE1BQU0sYUFBYSxDQUFDO0FBRXRHOzs7Ozs7R0FNRztBQUNILE1BQU0sTUFBTSxpQkFBaUIsR0FBRyxnQkFBZ0IsR0FDOUMsZUFBZSxHQUFHO0lBQ2hCLGdIQUFnSDtJQUNoSCwwQkFBMEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNwQzs7OztPQUlHO0lBQ0gsK0JBQStCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDM0MsQ0FBQztBQUVKLGVBQU8sTUFBTSx5QkFBeUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsQ0FnQjNFLENBQUM7QUFFRixlQUFPLE1BQU0sdUJBQXVCOzs7Ozs7Ozs7Ozs7aUJBT25DLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQiwyQkFBMkIsSUFBSSxpQkFBaUIsQ0FFL0QifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local_config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/local_config.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"local_config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/local_config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,gBAAgB,EAAoD,MAAM,aAAa,CAAC;AAEtG;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAC9C,eAAe,GAAG;IAChB,gHAAgH;IAChH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;OAIG;IACH,+BAA+B,CAAC,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEJ,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAgB3E,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;iBAOnC,CAAC;AAEF;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
|