@aztec/node-keystore 0.0.1-commit.f146247c → 0.0.1-commit.f1b29a41e
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.
|
@@ -30,7 +30,7 @@ export declare class KeystoreManager {
|
|
|
30
30
|
constructor(keystore: KeyStore);
|
|
31
31
|
/**
|
|
32
32
|
* Validates all remote signers in the keystore are accessible and have the required addresses.
|
|
33
|
-
*
|
|
33
|
+
* Retries each web3signer URL with backoff to tolerate transient unavailability at boot time.
|
|
34
34
|
*/
|
|
35
35
|
validateSigners(): Promise<void>;
|
|
36
36
|
/**
|
|
@@ -58,6 +58,8 @@ export declare class KeystoreManager {
|
|
|
58
58
|
*/
|
|
59
59
|
createPublisherSigners(validatorIndex: number): EthSigner[];
|
|
60
60
|
createAllValidatorPublisherSigners(): EthSigner[];
|
|
61
|
+
/** Create a signer for the top-level funding account, if configured. */
|
|
62
|
+
createFundingSigner(): EthSigner | undefined;
|
|
61
63
|
/**
|
|
62
64
|
* Create signers for slasher accounts
|
|
63
65
|
*/
|
|
@@ -136,4 +138,4 @@ export declare class KeystoreManager {
|
|
|
136
138
|
/** Extract ETH accounts from AttesterAccounts */
|
|
137
139
|
private extractEthAccountsFromAttester;
|
|
138
140
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5c3RvcmVfbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2tleXN0b3JlX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUNILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzVELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFLaEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFLaEQsT0FBTyxLQUFLLEVBSVYsV0FBVyxFQUVYLHFCQUFxQixFQUNyQixRQUFRLEVBRVIsY0FBYyxFQUNkLGlCQUFpQixJQUFJLHVCQUF1QixFQUM3QyxNQUFNLFlBQVksQ0FBQztBQUVwQjs7R0FFRztBQUNILHFCQUFhLGFBQWMsU0FBUSxLQUFLO0lBR3BCLEtBQUssQ0FBQztJQUZ4QixZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsS0FBSyxDQUFDLG1CQUFPLEVBSTlCO0NBQ0Y7QUFFRDs7R0FFRztBQUNILHFCQUFhLGVBQWU7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQVc7SUFFcEM7Ozs7T0FJRztJQUNILFlBQVksUUFBUSxFQUFFLFFBQVEsRUFHN0I7SUFFRDs7O09BR0c7SUFDRyxlQUFlLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQTRFckM7SUFFRDs7Ozs7T0FLRztJQUNILE9BQU8sQ0FBQywrQkFBK0I7SUFrQnZDOzs7T0FHRztJQUNILE9BQU8sQ0FBQywwQ0FBMEM7SUFLbEQ7O09BRUc7SUFDSCxPQUFPLENBQUMsMkNBQTJDO0lBK0NuRDs7T0FFRztJQUNILHFCQUFxQixDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUFFLENBSXpEO0lBRUQ7O09BRUc7SUFDSCxzQkFBc0IsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFBRSxDQW9CMUQ7SUFFRCxrQ0FBa0MsSUFBSSxTQUFTLEVBQUUsQ0FTaEQ7SUFFRCx3RUFBd0U7SUFDeEUsbUJBQW1CLElBQUksU0FBUyxHQUFHLFNBQVMsQ0FNM0M7SUFFRDs7T0FFRztJQUNILG9CQUFvQixJQUFJLFNBQVMsRUFBRSxDQU1sQztJQUVEOztPQUVHO0lBQ0gsbUJBQW1CLElBQUk7UUFBRSxFQUFFLEVBQUUsVUFBVSxHQUFHLFNBQVMsQ0FBQztRQUFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQTtLQUFFLEdBQUcsU0FBUyxDQStCdEY7SUFFRDs7T0FFRztJQUNILFlBQVksQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLHVCQUF1QixDQUtuRDtJQUVEOztPQUVHO0lBQ0gsaUJBQWlCLElBQUksTUFBTSxDQUUxQjtJQUVEOztPQUVHO0lBQ0gsa0JBQWtCLENBQUMsY0FBYyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsVUFBVSxHQUFHLFVBQVUsQ0FjbEY7SUFFRDs7T0FFRztJQUNILGVBQWUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksQ0FlcEQ7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsSUFBSSxXQUFXLEdBQUcsU0FBUyxDQUU1QztJQUVEOzs7T0FHRztJQUNILGVBQWUsSUFBSSxjQUFjLEdBQUcsU0FBUyxDQUU1QztJQUVEOzs7T0FHRztJQUNILHVDQUF1QyxJQUFJLElBQUksQ0FtQjlDO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsNEJBQTRCO0lBK0JwQzs7T0FFRztJQUNILE9BQU8sQ0FBQywwQkFBMEI7SUEyQ2xDOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHNCQUFzQjtJQWtEOUI7O09BRUc7SUFDSCxPQUFPLENBQUMsZ0NBQWdDO0lBd0J4Qzs7T0FFRztJQUNILE9BQU8sQ0FBQyx5QkFBeUI7SUE4QmpDOztPQUVHO0lBQ0csV0FBVyxDQUFDLE1BQU0sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLFFBQVEsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBRTFFO0lBRUQ7O09BRUc7SUFDRyxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUV6RjtJQUVEOzs7T0FHRztJQUNILDhCQUE4QixDQUM1QixjQUFjLEVBQUUsTUFBTSxFQUN0QixlQUFlLEVBQUUsVUFBVSxHQUMxQixxQkFBcUIsR0FBRyxTQUFTLENBd0duQztJQUVELGlEQUFpRDtJQUNqRCxPQUFPLENBQUMsOEJBQThCO0NBeUJ2QyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keystore_manager.d.ts","sourceRoot":"","sources":["../src/keystore_manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"keystore_manager.d.ts","sourceRoot":"","sources":["../src/keystore_manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAKhD,OAAO,KAAK,EAIV,WAAW,EAEX,qBAAqB,EACrB,QAAQ,EAER,cAAc,EACd,iBAAiB,IAAI,uBAAuB,EAC7C,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;IAGpB,KAAK,CAAC;IAFxB,YACE,OAAO,EAAE,MAAM,EACC,KAAK,CAAC,mBAAO,EAI9B;CACF;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC;;;;OAIG;IACH,YAAY,QAAQ,EAAE,QAAQ,EAG7B;IAED;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CA4ErC;IAED;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAkBvC;;;OAGG;IACH,OAAO,CAAC,0CAA0C;IAKlD;;OAEG;IACH,OAAO,CAAC,2CAA2C;IA+CnD;;OAEG;IACH,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE,CAIzD;IAED;;OAEG;IACH,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE,CAoB1D;IAED,kCAAkC,IAAI,SAAS,EAAE,CAShD;IAED,wEAAwE;IACxE,mBAAmB,IAAI,SAAS,GAAG,SAAS,CAM3C;IAED;;OAEG;IACH,oBAAoB,IAAI,SAAS,EAAE,CAMlC;IAED;;OAEG;IACH,mBAAmB,IAAI;QAAE,EAAE,EAAE,UAAU,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,SAAS,EAAE,CAAA;KAAE,GAAG,SAAS,CA+BtF;IAED;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAKnD;IAED;;OAEG;IACH,iBAAiB,IAAI,MAAM,CAE1B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,GAAG,UAAU,CAclF;IAED;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,CAepD;IAED;;;OAGG;IACH,kBAAkB,IAAI,WAAW,GAAG,SAAS,CAE5C;IAED;;;OAGG;IACH,eAAe,IAAI,cAAc,GAAG,SAAS,CAE5C;IAED;;;OAGG;IACH,uCAAuC,IAAI,IAAI,CAmB9C;IAED;;OAEG;IACH,OAAO,CAAC,4BAA4B;IA+BpC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA2ClC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,gCAAgC;IAwBxC;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA8BjC;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAE1E;IAED;;OAEG;IACG,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,CAEzF;IAED;;;OAGG;IACH,8BAA8B,CAC5B,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,UAAU,GAC1B,qBAAqB,GAAG,SAAS,CAwGnC;IAED,iDAAiD;IACjD,OAAO,CAAC,8BAA8B;CAyBvC"}
|
package/dest/keystore_manager.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Manages keystore configuration and delegates signing operations to appropriate signers.
|
|
5
5
|
*/ import { Buffer32 } from '@aztec/foundation/buffer';
|
|
6
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
6
7
|
import { Wallet } from '@ethersproject/wallet';
|
|
7
8
|
import { readFileSync, readdirSync, statSync } from 'fs';
|
|
8
9
|
import { extname, join } from 'path';
|
|
@@ -32,7 +33,7 @@ import { LocalSigner, RemoteSigner } from './signer.js';
|
|
|
32
33
|
}
|
|
33
34
|
/**
|
|
34
35
|
* Validates all remote signers in the keystore are accessible and have the required addresses.
|
|
35
|
-
*
|
|
36
|
+
* Retries each web3signer URL with backoff to tolerate transient unavailability at boot time.
|
|
36
37
|
*/ async validateSigners() {
|
|
37
38
|
// Collect all remote signers with their addresses grouped by URL
|
|
38
39
|
const remoteSignersByUrl = new Map();
|
|
@@ -87,12 +88,14 @@ import { LocalSigner, RemoteSigner } from './signer.js';
|
|
|
87
88
|
if (this.keystore.prover && typeof this.keystore.prover === 'object' && 'publisher' in this.keystore.prover) {
|
|
88
89
|
collectRemoteSigners(this.keystore.prover.publisher, this.keystore.remoteSigner);
|
|
89
90
|
}
|
|
90
|
-
// Validate each remote signer URL with all its addresses
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
91
|
+
// Validate each remote signer URL with all its addresses, retrying on transient failures
|
|
92
|
+
await Promise.all(Array.from(remoteSignersByUrl.entries()).filter(([, addresses])=>addresses.size > 0).map(([url, addresses])=>retry(()=>RemoteSigner.validateAccess(url, Array.from(addresses)), `Validating web3signer at ${url}`, makeBackoff([
|
|
93
|
+
1,
|
|
94
|
+
2,
|
|
95
|
+
4,
|
|
96
|
+
8,
|
|
97
|
+
16
|
|
98
|
+
]))));
|
|
96
99
|
}
|
|
97
100
|
/**
|
|
98
101
|
* Validates that attester addresses are unique across all validators
|
|
@@ -191,6 +194,13 @@ import { LocalSigner, RemoteSigner } from './signer.js';
|
|
|
191
194
|
}
|
|
192
195
|
return allPublishers;
|
|
193
196
|
}
|
|
197
|
+
/** Create a signer for the top-level funding account, if configured. */ createFundingSigner() {
|
|
198
|
+
const fundingAccount = this.keystore.fundingAccount;
|
|
199
|
+
if (!fundingAccount) {
|
|
200
|
+
return undefined;
|
|
201
|
+
}
|
|
202
|
+
return this.createSignerFromEthAccount(fundingAccount, this.keystore.remoteSigner);
|
|
203
|
+
}
|
|
194
204
|
/**
|
|
195
205
|
* Create signers for slasher accounts
|
|
196
206
|
*/ createSlasherSigners() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/node-keystore",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.f1b29a41e",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -64,9 +64,9 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
68
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
69
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
67
|
+
"@aztec/ethereum": "0.0.1-commit.f1b29a41e",
|
|
68
|
+
"@aztec/foundation": "0.0.1-commit.f1b29a41e",
|
|
69
|
+
"@aztec/stdlib": "0.0.1-commit.f1b29a41e",
|
|
70
70
|
"@ethersproject/wallet": "^5.7.0",
|
|
71
71
|
"tslib": "^2.4.0",
|
|
72
72
|
"viem": "npm:@aztec/viem@2.38.2",
|
package/src/keystore_manager.ts
CHANGED
|
@@ -7,6 +7,7 @@ import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
|
7
7
|
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
8
8
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
9
9
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
10
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
10
11
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
12
|
|
|
12
13
|
import { Wallet } from '@ethersproject/wallet';
|
|
@@ -61,7 +62,7 @@ export class KeystoreManager {
|
|
|
61
62
|
|
|
62
63
|
/**
|
|
63
64
|
* Validates all remote signers in the keystore are accessible and have the required addresses.
|
|
64
|
-
*
|
|
65
|
+
* Retries each web3signer URL with backoff to tolerate transient unavailability at boot time.
|
|
65
66
|
*/
|
|
66
67
|
async validateSigners(): Promise<void> {
|
|
67
68
|
// Collect all remote signers with their addresses grouped by URL
|
|
@@ -127,12 +128,18 @@ export class KeystoreManager {
|
|
|
127
128
|
collectRemoteSigners(this.keystore.prover.publisher, this.keystore.remoteSigner);
|
|
128
129
|
}
|
|
129
130
|
|
|
130
|
-
// Validate each remote signer URL with all its addresses
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
131
|
+
// Validate each remote signer URL with all its addresses, retrying on transient failures
|
|
132
|
+
await Promise.all(
|
|
133
|
+
Array.from(remoteSignersByUrl.entries())
|
|
134
|
+
.filter(([, addresses]) => addresses.size > 0)
|
|
135
|
+
.map(([url, addresses]) =>
|
|
136
|
+
retry(
|
|
137
|
+
() => RemoteSigner.validateAccess(url, Array.from(addresses)),
|
|
138
|
+
`Validating web3signer at ${url}`,
|
|
139
|
+
makeBackoff([1, 2, 4, 8, 16]),
|
|
140
|
+
),
|
|
141
|
+
),
|
|
142
|
+
);
|
|
136
143
|
}
|
|
137
144
|
|
|
138
145
|
/**
|
|
@@ -263,6 +270,15 @@ export class KeystoreManager {
|
|
|
263
270
|
return allPublishers;
|
|
264
271
|
}
|
|
265
272
|
|
|
273
|
+
/** Create a signer for the top-level funding account, if configured. */
|
|
274
|
+
createFundingSigner(): EthSigner | undefined {
|
|
275
|
+
const fundingAccount = this.keystore.fundingAccount;
|
|
276
|
+
if (!fundingAccount) {
|
|
277
|
+
return undefined;
|
|
278
|
+
}
|
|
279
|
+
return this.createSignerFromEthAccount(fundingAccount, this.keystore.remoteSigner);
|
|
280
|
+
}
|
|
281
|
+
|
|
266
282
|
/**
|
|
267
283
|
* Create signers for slasher accounts
|
|
268
284
|
*/
|