@aztec/cli 0.16.6 → 0.16.8
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/add_note.js +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +16 -8
- package/dest/parse_args.d.ts +105 -0
- package/dest/parse_args.d.ts.map +1 -0
- package/dest/parse_args.js +233 -0
- package/dest/update/npm.d.ts.map +1 -1
- package/dest/update/npm.js +17 -1
- package/dest/update/update.d.ts +2 -2
- package/dest/update/update.d.ts.map +1 -1
- package/dest/update/update.js +29 -72
- package/dest/utils.d.ts +1 -103
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +1 -220
- package/package.json +8 -8
package/dest/cmds/add_note.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ExtendedNote, Note } from '@aztec/types';
|
|
2
2
|
import { createCompatibleClient } from '../client.js';
|
|
3
|
-
import { parseFields } from '../
|
|
3
|
+
import { parseFields } from '../parse_args.js';
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
*/
|
|
@@ -10,4 +10,4 @@ export async function addNote(address, contractAddress, storageSlot, txHash, not
|
|
|
10
10
|
const client = await createCompatibleClient(rpcUrl, debugLogger);
|
|
11
11
|
await client.addNote(extendedNote);
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkX25vdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY21kcy9hZGRfbm90ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBVSxNQUFNLGNBQWMsQ0FBQztBQUUxRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DOztHQUVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxPQUFPLENBQzNCLE9BQXFCLEVBQ3JCLGVBQTZCLEVBQzdCLFdBQWUsRUFDZixNQUFjLEVBQ2QsVUFBb0IsRUFDcEIsTUFBYyxFQUNkLFdBQXdCO0lBRXhCLE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sWUFBWSxHQUFHLElBQUksWUFBWSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLFdBQVcsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMzRixNQUFNLE1BQU0sR0FBRyxNQUFNLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsQ0FBQztJQUNqRSxNQUFNLE1BQU0sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDckMsQ0FBQyJ9
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAkC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAocxE"}
|
package/dest/index.js
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
|
-
import { initAztecJs } from '@aztec/aztec.js/init';
|
|
2
1
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
3
2
|
import { addNoirCompilerCommanderActions } from '@aztec/noir-compiler/cli';
|
|
4
3
|
import { Command, Option } from 'commander';
|
|
4
|
+
import { resolve as dnsResolve } from 'dns';
|
|
5
5
|
import { readFileSync } from 'fs';
|
|
6
6
|
import { dirname, resolve } from 'path';
|
|
7
|
-
import { parseAztecAddress, parseEthereumAddress, parseField, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalSelector, parseOptionalTxHash, parsePartialAddress, parsePrivateKey, parsePublicKey, parseSaltFromHexString, parseTxHash, } from './
|
|
8
|
-
|
|
7
|
+
import { parseAztecAddress, parseEthereumAddress, parseField, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalSelector, parseOptionalTxHash, parsePartialAddress, parsePrivateKey, parsePublicKey, parseSaltFromHexString, parseTxHash, } from './parse_args.js';
|
|
8
|
+
/**
|
|
9
|
+
* If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
|
|
10
|
+
* localhost as being host.docker.internal.
|
|
11
|
+
*/
|
|
12
|
+
function getLocalhost() {
|
|
13
|
+
return new Promise(resolve => dnsResolve('host.docker.internal', err => (err ? resolve('localhost') : resolve('host.docker.internal'))));
|
|
14
|
+
}
|
|
15
|
+
const LOCALHOST = await getLocalhost();
|
|
16
|
+
const { ETHEREUM_HOST = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY } = process.env;
|
|
9
17
|
/**
|
|
10
18
|
* Returns commander program that defines the CLI.
|
|
11
19
|
* @param log - Console logger.
|
|
@@ -20,13 +28,12 @@ export function getProgram(log, debugLogger) {
|
|
|
20
28
|
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(cliVersion);
|
|
21
29
|
const pxeOption = new Option('-u, --rpc-url <string>', 'URL of the PXE')
|
|
22
30
|
.env('PXE_URL')
|
|
23
|
-
.default(
|
|
31
|
+
.default(`http://${LOCALHOST}:8080`)
|
|
24
32
|
.makeOptionMandatory(true);
|
|
25
33
|
const createPrivateKeyOption = (description, mandatory) => new Option('-k, --private-key <string>', description)
|
|
26
34
|
.env('PRIVATE_KEY')
|
|
27
35
|
.argParser(parsePrivateKey)
|
|
28
36
|
.makeOptionMandatory(mandatory);
|
|
29
|
-
program.hook('preAction', initAztecJs);
|
|
30
37
|
program
|
|
31
38
|
.command('deploy-l1-contracts')
|
|
32
39
|
.description('Deploys all necessary Ethereum contracts for Aztec.')
|
|
@@ -301,13 +308,14 @@ export function getProgram(log, debugLogger) {
|
|
|
301
308
|
.description('Updates Nodejs and Noir dependencies')
|
|
302
309
|
.argument('[projectPath]', 'Path to the project directory', process.cwd())
|
|
303
310
|
.option('--contract [paths...]', 'Paths to contracts to update dependencies', [])
|
|
304
|
-
.option('--
|
|
311
|
+
.option('--aztec-version <semver>', 'The version to update Aztec packages to. Defaults to latest', 'latest')
|
|
305
312
|
.addOption(pxeOption)
|
|
306
313
|
.action(async (projectPath, options) => {
|
|
307
314
|
const { update } = await import('./update/update.js');
|
|
308
|
-
|
|
315
|
+
const { contract, aztecVersion, rpcUrl } = options;
|
|
316
|
+
await update(projectPath, contract, rpcUrl, aztecVersion, log);
|
|
309
317
|
});
|
|
310
318
|
addNoirCompilerCommanderActions(program, log);
|
|
311
319
|
return program;
|
|
312
320
|
}
|
|
313
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
321
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { FunctionSelector } from '@aztec/aztec.js/abi';
|
|
2
|
+
import { AztecAddress } from '@aztec/aztec.js/aztec_address';
|
|
3
|
+
import { EthAddress } from '@aztec/aztec.js/eth_address';
|
|
4
|
+
import { Fr, GrumpkinScalar, Point } from '@aztec/aztec.js/fields';
|
|
5
|
+
import { LogId } from '@aztec/aztec.js/log_id';
|
|
6
|
+
import { TxHash } from '@aztec/aztec.js/tx_hash';
|
|
7
|
+
/**
|
|
8
|
+
* Parses a hex encoded string to an Fr integer to be used as salt
|
|
9
|
+
* @param str - Hex encoded string
|
|
10
|
+
* @returns A integer to be used as salt
|
|
11
|
+
*/
|
|
12
|
+
export declare function parseSaltFromHexString(str: string): Fr;
|
|
13
|
+
/**
|
|
14
|
+
* Parses an AztecAddress from a string.
|
|
15
|
+
* @param address - A serialized Aztec address
|
|
16
|
+
* @returns An Aztec address
|
|
17
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
18
|
+
*/
|
|
19
|
+
export declare function parseAztecAddress(address: string): AztecAddress;
|
|
20
|
+
/**
|
|
21
|
+
* Parses an Ethereum address from a string.
|
|
22
|
+
* @param address - A serialized Ethereum address
|
|
23
|
+
* @returns An Ethereum address
|
|
24
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
25
|
+
*/
|
|
26
|
+
export declare function parseEthereumAddress(address: string): EthAddress;
|
|
27
|
+
/**
|
|
28
|
+
* Parses an AztecAddress from a string.
|
|
29
|
+
* @param address - A serialized Aztec address
|
|
30
|
+
* @returns An Aztec address
|
|
31
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
32
|
+
*/
|
|
33
|
+
export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
|
|
34
|
+
/**
|
|
35
|
+
* Parses an optional log ID string into a LogId object.
|
|
36
|
+
*
|
|
37
|
+
* @param logId - The log ID string to parse.
|
|
38
|
+
* @returns The parsed LogId object, or undefined if the log ID is missing or empty.
|
|
39
|
+
*/
|
|
40
|
+
export declare function parseOptionalLogId(logId: string): LogId | undefined;
|
|
41
|
+
/**
|
|
42
|
+
* Parses a selector from a string.
|
|
43
|
+
* @param selector - A serialized selector.
|
|
44
|
+
* @returns A selector.
|
|
45
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
46
|
+
*/
|
|
47
|
+
export declare function parseOptionalSelector(selector: string): FunctionSelector | undefined;
|
|
48
|
+
/**
|
|
49
|
+
* Parses a string into an integer or returns undefined if the input is falsy.
|
|
50
|
+
*
|
|
51
|
+
* @param value - The string to parse into an integer.
|
|
52
|
+
* @returns The parsed integer, or undefined if the input string is falsy.
|
|
53
|
+
* @throws If the input is not a valid integer.
|
|
54
|
+
*/
|
|
55
|
+
export declare function parseOptionalInteger(value: string): number | undefined;
|
|
56
|
+
/**
|
|
57
|
+
* Parses a TxHash from a string.
|
|
58
|
+
* @param txHash - A transaction hash
|
|
59
|
+
* @returns A TxHash instance
|
|
60
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
61
|
+
*/
|
|
62
|
+
export declare function parseTxHash(txHash: string): TxHash;
|
|
63
|
+
/**
|
|
64
|
+
* Parses an optional TxHash from a string.
|
|
65
|
+
* Calls parseTxHash internally.
|
|
66
|
+
* @param txHash - A transaction hash
|
|
67
|
+
* @returns A TxHash instance, or undefined if the input string is falsy.
|
|
68
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
69
|
+
*/
|
|
70
|
+
export declare function parseOptionalTxHash(txHash: string): TxHash | undefined;
|
|
71
|
+
/**
|
|
72
|
+
* Parses a public key from a string.
|
|
73
|
+
* @param publicKey - A public key
|
|
74
|
+
* @returns A Point instance
|
|
75
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
76
|
+
*/
|
|
77
|
+
export declare function parsePublicKey(publicKey: string): Point;
|
|
78
|
+
/**
|
|
79
|
+
* Parses a partial address from a string.
|
|
80
|
+
* @param address - A partial address
|
|
81
|
+
* @returns A Fr instance
|
|
82
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
83
|
+
*/
|
|
84
|
+
export declare function parsePartialAddress(address: string): Fr;
|
|
85
|
+
/**
|
|
86
|
+
* Parses a private key from a string.
|
|
87
|
+
* @param privateKey - A string
|
|
88
|
+
* @returns A private key
|
|
89
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
90
|
+
*/
|
|
91
|
+
export declare function parsePrivateKey(privateKey: string): GrumpkinScalar;
|
|
92
|
+
/**
|
|
93
|
+
* Parses a field from a string.
|
|
94
|
+
* @param field - A string representing the field.
|
|
95
|
+
* @returns A field.
|
|
96
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
97
|
+
*/
|
|
98
|
+
export declare function parseField(field: string): Fr;
|
|
99
|
+
/**
|
|
100
|
+
* Parses an array of strings to Frs.
|
|
101
|
+
* @param fields - An array of strings representing the fields.
|
|
102
|
+
* @returns An array of Frs.
|
|
103
|
+
*/
|
|
104
|
+
export declare function parseFields(fields: string[]): Fr[];
|
|
105
|
+
//# sourceMappingURL=parse_args.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse_args.d.ts","sourceRoot":"","sources":["../src/parse_args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CActD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAMhE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAKnE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CASpF;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAStE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKtE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,EAAE,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAYlE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,CAyB5C;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAElD"}
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
import { FunctionSelector } from '@aztec/aztec.js/abi';
|
|
2
|
+
import { AztecAddress } from '@aztec/aztec.js/aztec_address';
|
|
3
|
+
import { EthAddress } from '@aztec/aztec.js/eth_address';
|
|
4
|
+
import { Fr, GrumpkinScalar, Point } from '@aztec/aztec.js/fields';
|
|
5
|
+
import { LogId } from '@aztec/aztec.js/log_id';
|
|
6
|
+
import { TxHash } from '@aztec/aztec.js/tx_hash';
|
|
7
|
+
import { InvalidArgumentError } from 'commander';
|
|
8
|
+
/**
|
|
9
|
+
* Removes the leading 0x from a hex string. If no leading 0x is found the string is returned unchanged.
|
|
10
|
+
* @param hex - A hex string
|
|
11
|
+
* @returns A new string with leading 0x removed
|
|
12
|
+
*/
|
|
13
|
+
const stripLeadingHex = (hex) => {
|
|
14
|
+
if (hex.length > 2 && hex.startsWith('0x')) {
|
|
15
|
+
return hex.substring(2);
|
|
16
|
+
}
|
|
17
|
+
return hex;
|
|
18
|
+
};
|
|
19
|
+
/**
|
|
20
|
+
* Parses a hex encoded string to an Fr integer to be used as salt
|
|
21
|
+
* @param str - Hex encoded string
|
|
22
|
+
* @returns A integer to be used as salt
|
|
23
|
+
*/
|
|
24
|
+
export function parseSaltFromHexString(str) {
|
|
25
|
+
const hex = stripLeadingHex(str);
|
|
26
|
+
// ensure it's a hex string
|
|
27
|
+
if (!hex.match(/^[0-9a-f]+$/i)) {
|
|
28
|
+
throw new InvalidArgumentError('Invalid hex string');
|
|
29
|
+
}
|
|
30
|
+
// pad it so that we may read it as a buffer.
|
|
31
|
+
// Buffer needs _exactly_ two hex characters per byte
|
|
32
|
+
const padded = hex.length % 2 === 1 ? '0' + hex : hex;
|
|
33
|
+
// finally, turn it into an integer
|
|
34
|
+
return Fr.fromBuffer(Buffer.from(padded, 'hex'));
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Parses an AztecAddress from a string.
|
|
38
|
+
* @param address - A serialized Aztec address
|
|
39
|
+
* @returns An Aztec address
|
|
40
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
41
|
+
*/
|
|
42
|
+
export function parseAztecAddress(address) {
|
|
43
|
+
try {
|
|
44
|
+
return AztecAddress.fromString(address);
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
throw new InvalidArgumentError(`Invalid address: ${address}`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Parses an Ethereum address from a string.
|
|
52
|
+
* @param address - A serialized Ethereum address
|
|
53
|
+
* @returns An Ethereum address
|
|
54
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
55
|
+
*/
|
|
56
|
+
export function parseEthereumAddress(address) {
|
|
57
|
+
try {
|
|
58
|
+
return EthAddress.fromString(address);
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
throw new InvalidArgumentError(`Invalid address: ${address}`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Parses an AztecAddress from a string.
|
|
66
|
+
* @param address - A serialized Aztec address
|
|
67
|
+
* @returns An Aztec address
|
|
68
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
69
|
+
*/
|
|
70
|
+
export function parseOptionalAztecAddress(address) {
|
|
71
|
+
if (!address) {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
return parseAztecAddress(address);
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Parses an optional log ID string into a LogId object.
|
|
78
|
+
*
|
|
79
|
+
* @param logId - The log ID string to parse.
|
|
80
|
+
* @returns The parsed LogId object, or undefined if the log ID is missing or empty.
|
|
81
|
+
*/
|
|
82
|
+
export function parseOptionalLogId(logId) {
|
|
83
|
+
if (!logId) {
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
return LogId.fromString(logId);
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Parses a selector from a string.
|
|
90
|
+
* @param selector - A serialized selector.
|
|
91
|
+
* @returns A selector.
|
|
92
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
93
|
+
*/
|
|
94
|
+
export function parseOptionalSelector(selector) {
|
|
95
|
+
if (!selector) {
|
|
96
|
+
return undefined;
|
|
97
|
+
}
|
|
98
|
+
try {
|
|
99
|
+
return FunctionSelector.fromString(selector);
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
throw new InvalidArgumentError(`Invalid selector: ${selector}`);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* Parses a string into an integer or returns undefined if the input is falsy.
|
|
107
|
+
*
|
|
108
|
+
* @param value - The string to parse into an integer.
|
|
109
|
+
* @returns The parsed integer, or undefined if the input string is falsy.
|
|
110
|
+
* @throws If the input is not a valid integer.
|
|
111
|
+
*/
|
|
112
|
+
export function parseOptionalInteger(value) {
|
|
113
|
+
if (!value) {
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
116
|
+
const parsed = Number(value);
|
|
117
|
+
if (!Number.isInteger(parsed)) {
|
|
118
|
+
throw new InvalidArgumentError('Invalid integer.');
|
|
119
|
+
}
|
|
120
|
+
return parsed;
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Parses a TxHash from a string.
|
|
124
|
+
* @param txHash - A transaction hash
|
|
125
|
+
* @returns A TxHash instance
|
|
126
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
127
|
+
*/
|
|
128
|
+
export function parseTxHash(txHash) {
|
|
129
|
+
try {
|
|
130
|
+
return TxHash.fromString(txHash);
|
|
131
|
+
}
|
|
132
|
+
catch {
|
|
133
|
+
throw new InvalidArgumentError(`Invalid transaction hash: ${txHash}`);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Parses an optional TxHash from a string.
|
|
138
|
+
* Calls parseTxHash internally.
|
|
139
|
+
* @param txHash - A transaction hash
|
|
140
|
+
* @returns A TxHash instance, or undefined if the input string is falsy.
|
|
141
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
142
|
+
*/
|
|
143
|
+
export function parseOptionalTxHash(txHash) {
|
|
144
|
+
if (!txHash) {
|
|
145
|
+
return undefined;
|
|
146
|
+
}
|
|
147
|
+
return parseTxHash(txHash);
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* Parses a public key from a string.
|
|
151
|
+
* @param publicKey - A public key
|
|
152
|
+
* @returns A Point instance
|
|
153
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
154
|
+
*/
|
|
155
|
+
export function parsePublicKey(publicKey) {
|
|
156
|
+
try {
|
|
157
|
+
return Point.fromString(publicKey);
|
|
158
|
+
}
|
|
159
|
+
catch (err) {
|
|
160
|
+
throw new InvalidArgumentError(`Invalid public key: ${publicKey}`);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Parses a partial address from a string.
|
|
165
|
+
* @param address - A partial address
|
|
166
|
+
* @returns A Fr instance
|
|
167
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
168
|
+
*/
|
|
169
|
+
export function parsePartialAddress(address) {
|
|
170
|
+
try {
|
|
171
|
+
return Fr.fromString(address);
|
|
172
|
+
}
|
|
173
|
+
catch (err) {
|
|
174
|
+
throw new InvalidArgumentError(`Invalid partial address: ${address}`);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* Parses a private key from a string.
|
|
179
|
+
* @param privateKey - A string
|
|
180
|
+
* @returns A private key
|
|
181
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
182
|
+
*/
|
|
183
|
+
export function parsePrivateKey(privateKey) {
|
|
184
|
+
try {
|
|
185
|
+
const value = GrumpkinScalar.fromString(privateKey);
|
|
186
|
+
// most likely a badly formatted key was passed
|
|
187
|
+
if (value.isZero()) {
|
|
188
|
+
throw new Error('Private key must not be zero');
|
|
189
|
+
}
|
|
190
|
+
return value;
|
|
191
|
+
}
|
|
192
|
+
catch (err) {
|
|
193
|
+
throw new InvalidArgumentError(`Invalid private key: ${privateKey}`);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
/**
|
|
197
|
+
* Parses a field from a string.
|
|
198
|
+
* @param field - A string representing the field.
|
|
199
|
+
* @returns A field.
|
|
200
|
+
* @throws InvalidArgumentError if the input string is not valid.
|
|
201
|
+
*/
|
|
202
|
+
export function parseField(field) {
|
|
203
|
+
try {
|
|
204
|
+
const isHex = field.startsWith('0x') || field.match(new RegExp(`^[0-9a-f]{${Fr.SIZE_IN_BYTES * 2}}$`, 'i'));
|
|
205
|
+
if (isHex) {
|
|
206
|
+
return Fr.fromString(field);
|
|
207
|
+
}
|
|
208
|
+
if (['true', 'false'].includes(field)) {
|
|
209
|
+
return new Fr(field === 'true');
|
|
210
|
+
}
|
|
211
|
+
const isNumber = +field || field === '0';
|
|
212
|
+
if (isNumber) {
|
|
213
|
+
return new Fr(BigInt(field));
|
|
214
|
+
}
|
|
215
|
+
const isBigInt = field.endsWith('n');
|
|
216
|
+
if (isBigInt) {
|
|
217
|
+
return new Fr(BigInt(field.replace(/n$/, '')));
|
|
218
|
+
}
|
|
219
|
+
return new Fr(BigInt(field));
|
|
220
|
+
}
|
|
221
|
+
catch (err) {
|
|
222
|
+
throw new InvalidArgumentError(`Invalid field: ${field}`);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
/**
|
|
226
|
+
* Parses an array of strings to Frs.
|
|
227
|
+
* @param fields - An array of strings representing the fields.
|
|
228
|
+
* @returns An array of Frs.
|
|
229
|
+
*/
|
|
230
|
+
export function parseFields(fields) {
|
|
231
|
+
return fields.map(parseField);
|
|
232
|
+
}
|
|
233
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VfYXJncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wYXJzZV9hcmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsS0FBSyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9DLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFakQ7Ozs7R0FJRztBQUNILE1BQU0sZUFBZSxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUU7SUFDdEMsSUFBSSxHQUFHLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQzFDLE9BQU8sR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUN6QjtJQUNELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxHQUFXO0lBQ2hELE1BQU0sR0FBRyxHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUVqQywyQkFBMkI7SUFDM0IsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEVBQUU7UUFDOUIsTUFBTSxJQUFJLG9CQUFvQixDQUFDLG9CQUFvQixDQUFDLENBQUM7S0FDdEQ7SUFFRCw2Q0FBNkM7SUFDN0MscURBQXFEO0lBQ3JELE1BQU0sTUFBTSxHQUFH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
|
package/dest/update/npm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/update/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM9C,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/update/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM9C,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAWhD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,sBAAsB;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC,CAKD;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,SAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/F;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAuBpE"}
|
package/dest/update/npm.js
CHANGED
|
@@ -4,6 +4,14 @@ import { readFile } from 'fs/promises';
|
|
|
4
4
|
import { join, relative, resolve } from 'path';
|
|
5
5
|
import { parse } from 'semver';
|
|
6
6
|
import { atomicUpdateFile } from '../utils.js';
|
|
7
|
+
const deprecatedNpmPackages = new Set([]);
|
|
8
|
+
const npmDeprecationMessage = `
|
|
9
|
+
The following packages have been deprecated and will no longer be updated on the npm registry:
|
|
10
|
+
${Array.from(deprecatedNpmPackages)
|
|
11
|
+
.map(pkg => ` - ${pkg}`)
|
|
12
|
+
.join('\n')}
|
|
13
|
+
Remove them from package.json
|
|
14
|
+
`;
|
|
7
15
|
/**
|
|
8
16
|
* Looks up a package.json file and returns its contents
|
|
9
17
|
* @param projectPath - Path to Nodejs project
|
|
@@ -47,6 +55,7 @@ export async function updateAztecDeps(projectPath, aztecVersion, log) {
|
|
|
47
55
|
};
|
|
48
56
|
log(`Updating @aztec packages to ${aztecVersion} in ${relative(process.cwd(), changes.file)}`);
|
|
49
57
|
const version = aztecVersion.version;
|
|
58
|
+
let detectedDeprecatedPackages = false;
|
|
50
59
|
for (const depType of ['dependencies', 'devDependencies']) {
|
|
51
60
|
const dependencies = pkg[depType];
|
|
52
61
|
if (!dependencies) {
|
|
@@ -60,6 +69,10 @@ export async function updateAztecDeps(projectPath, aztecVersion, log) {
|
|
|
60
69
|
if (name === '@aztec/aztec-ui') {
|
|
61
70
|
continue;
|
|
62
71
|
}
|
|
72
|
+
if (deprecatedNpmPackages.has(name)) {
|
|
73
|
+
detectedDeprecatedPackages = true;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
63
76
|
if (dependencies[name] !== version) {
|
|
64
77
|
changes.dependencies.push({
|
|
65
78
|
name,
|
|
@@ -70,6 +83,9 @@ export async function updateAztecDeps(projectPath, aztecVersion, log) {
|
|
|
70
83
|
}
|
|
71
84
|
}
|
|
72
85
|
}
|
|
86
|
+
if (detectedDeprecatedPackages) {
|
|
87
|
+
log(npmDeprecationMessage);
|
|
88
|
+
}
|
|
73
89
|
if (changes.dependencies.length > 0) {
|
|
74
90
|
const contents = JSON.stringify(pkg, null, 2) + '\n';
|
|
75
91
|
await atomicUpdateFile(resolve(join(projectPath, 'package.json')), contents);
|
|
@@ -106,4 +122,4 @@ export function updateLockfile(projectPath, log) {
|
|
|
106
122
|
log(`No lockfile found in ${projectPath}. Skipping lockfile update...`);
|
|
107
123
|
}
|
|
108
124
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ2hDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9DLE9BQU8sRUFBVSxLQUFLLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFdkMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRy9DLE1BQU0scUJBQXFCLEdBQUcsSUFBSSxHQUFHLENBQVMsRUFBRSxDQUFDLENBQUM7QUFDbEQsTUFBTSxxQkFBcUIsR0FBRzs7RUFFNUIsS0FBSyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQztLQUNoQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO0tBQ3hCLElBQUksQ0FBQyxJQUFJLENBQUM7O0NBRVosQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGVBQWUsQ0FBQyxXQUFtQjtJQU12RCxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFFaEUsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFdBQW1CLEVBQUUsT0FBTyxHQUFHLFFBQVE7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
|
package/dest/update/update.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function update(projectPath: string, contracts: string[], pxeUrl: string,
|
|
1
|
+
import { LogFn } from '@aztec/foundation/log';
|
|
2
|
+
export declare function update(projectPath: string, contracts: string[], pxeUrl: string, aztecVersion: string, log: LogFn): Promise<void>;
|
|
3
3
|
//# sourceMappingURL=update.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAa9C,wBAAsB,MAAM,CAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CA+Cf"}
|
package/dest/update/update.js
CHANGED
|
@@ -1,53 +1,46 @@
|
|
|
1
1
|
import { relative, resolve } from 'path';
|
|
2
|
-
import {
|
|
3
|
-
import { createCompatibleClient } from '../client.js';
|
|
2
|
+
import { parse } from 'semver';
|
|
4
3
|
import { GITHUB_TAG_PREFIX } from '../github.js';
|
|
5
4
|
import { updateAztecNr } from './noir.js';
|
|
6
|
-
import { getNewestVersion
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
https://docs.aztec.network/dev_docs/cli/updating
|
|
20
|
-
|
|
21
|
-
Once the sandbox is updated, run the \`aztec-cli update\` command again`);
|
|
22
|
-
return;
|
|
5
|
+
import { getNewestVersion, updateAztecDeps, updateLockfile } from './npm.js';
|
|
6
|
+
const AZTECJS_PACKAGE = '@aztec/aztec.js';
|
|
7
|
+
const UPDATE_DOCS_URL = 'https://docs.aztec.network/dev_docs/updating';
|
|
8
|
+
export async function update(projectPath, contracts, pxeUrl, aztecVersion, log) {
|
|
9
|
+
const targetAztecVersion = aztecVersion === 'latest' ? await getNewestVersion(AZTECJS_PACKAGE, 'latest') : parse(aztecVersion);
|
|
10
|
+
if (!targetAztecVersion) {
|
|
11
|
+
throw new Error(`Invalid aztec version ${aztecVersion}`);
|
|
12
|
+
}
|
|
13
|
+
const projectDependencyChanges = [];
|
|
14
|
+
try {
|
|
15
|
+
const npmChanges = await updateAztecDeps(resolve(process.cwd(), projectPath), targetAztecVersion, log);
|
|
16
|
+
if (npmChanges.dependencies.length > 0) {
|
|
17
|
+
updateLockfile(projectPath, log);
|
|
23
18
|
}
|
|
19
|
+
projectDependencyChanges.push(npmChanges);
|
|
24
20
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const npmChanges = await updateAztecDeps(projectPath, targetSandboxVersion, log);
|
|
33
|
-
if (npmChanges.dependencies.length > 0) {
|
|
34
|
-
updateLockfile(projectPath, log);
|
|
21
|
+
catch (err) {
|
|
22
|
+
if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
|
|
23
|
+
log(`No package.json found in ${projectPath}. Skipping npm update...`);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
throw err;
|
|
27
|
+
}
|
|
35
28
|
}
|
|
36
|
-
const contractChanges = [];
|
|
37
29
|
for (const contract of contracts) {
|
|
38
30
|
try {
|
|
39
|
-
|
|
31
|
+
projectDependencyChanges.push(await updateAztecNr(resolve(process.cwd(), projectPath, contract), `${GITHUB_TAG_PREFIX}-v${targetAztecVersion.version}`, log));
|
|
40
32
|
}
|
|
41
33
|
catch (err) {
|
|
42
34
|
if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
|
|
43
35
|
log(`No Nargo.toml found in ${relative(process.cwd(), contract)}. Skipping...`);
|
|
44
|
-
process.exit(1);
|
|
45
36
|
}
|
|
46
|
-
|
|
37
|
+
else {
|
|
38
|
+
throw err;
|
|
39
|
+
}
|
|
47
40
|
}
|
|
48
41
|
}
|
|
49
|
-
|
|
50
|
-
|
|
42
|
+
log(`To update Docker containers follow instructions at ${UPDATE_DOCS_URL}`);
|
|
43
|
+
projectDependencyChanges.forEach(changes => {
|
|
51
44
|
printChanges(changes, log);
|
|
52
45
|
});
|
|
53
46
|
}
|
|
@@ -62,40 +55,4 @@ function printChanges(changes, log) {
|
|
|
62
55
|
});
|
|
63
56
|
}
|
|
64
57
|
}
|
|
65
|
-
|
|
66
|
-
try {
|
|
67
|
-
const pkg = await readPackageJson(projectPath);
|
|
68
|
-
// use coerce instead of parse because it eliminates semver operators like ~ and ^
|
|
69
|
-
if (pkg.dependencies?.[SANDBOX_PACKAGE]) {
|
|
70
|
-
return coerce(pkg.dependencies[SANDBOX_PACKAGE]);
|
|
71
|
-
}
|
|
72
|
-
else if (pkg.devDependencies?.[SANDBOX_PACKAGE]) {
|
|
73
|
-
return coerce(pkg.devDependencies[SANDBOX_PACKAGE]);
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
return null;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
catch (err) {
|
|
80
|
-
if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
|
|
81
|
-
log(`No package.json found in ${projectPath}`);
|
|
82
|
-
process.exit(1);
|
|
83
|
-
}
|
|
84
|
-
throw err;
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
async function getRemoteSandboxVersion(pxeUrl, log, debugLog) {
|
|
88
|
-
try {
|
|
89
|
-
const client = await createCompatibleClient(pxeUrl, debugLog);
|
|
90
|
-
const nodeInfo = await client.getNodeInfo();
|
|
91
|
-
return parse(nodeInfo.sandboxVersion);
|
|
92
|
-
}
|
|
93
|
-
catch (err) {
|
|
94
|
-
if (err instanceof Error && err.message === 'fetch failed') {
|
|
95
|
-
log(`Could not connect to Sandbox running on ${pxeUrl}`);
|
|
96
|
-
process.exit(1);
|
|
97
|
-
}
|
|
98
|
-
throw err;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekMsT0FBTyxFQUFVLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUV2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRWpELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDMUMsT0FBTyxFQUFFLGdCQUFnQixJQUFJLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRWxILE1BQU0sZUFBZSxHQUFHLHNCQUFzQixDQUFDO0FBRS9DLE1BQU0sQ0FBQyxLQUFLLFVBQVUsTUFBTSxDQUMxQixXQUFtQixFQUNuQixTQUFtQixFQUNuQixNQUFjLEVBQ2QsY0FBc0IsRUFDdEIsR0FBVSxFQUNWLFFBQXFCO0lBRXJCLE1BQU0sb0JBQW9CLEdBQ3hCLGNBQWMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFMUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLGNBQWMsRUFBRSxDQUFDLENBQUM7S0FDNUQ7SUFFRCxJQUFJLHFCQUFxQixHQUFHLE1BQU0sb0JBQW9CLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRXpFLElBQUksQ0FBQyxxQkFBcUIsRUFBRTtRQUMxQixxQkFBcUIs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
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUvQixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFakQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUMxQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUU3RSxNQUFNLGVBQWUsR0FBRyxpQkFBaUIsQ0FBQztBQUMxQyxNQUFNLGVBQWUsR0FBRyw4Q0FBOEMsQ0FBQztBQUV2RSxNQUFNLENBQUMsS0FBSyxVQUFVLE1BQU0sQ0FDMUIsV0FBbUIsRUFDbkIsU0FBbUIsRUFDbkIsTUFBYyxFQUNkLFlBQW9CLEVBQ3BCLEdBQVU7SUFFVixNQUFNLGtCQUFrQixHQUN0QixZQUFZLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxNQUFNLGdCQUFnQixDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBRXRHLElBQUksQ0FBQyxrQkFBa0IsRUFBRTtRQUN2QixNQUFNLElBQUksS0FBSyxDQUFDLHlCQUF5QixZQUFZLEVBQUUsQ0FBQyxDQUFDO0tBQzFEO0lBRUQsTUFBTSx3QkFBd0IsR0FBd0IsRUFBRSxDQUFDO0lBQ3pELElBQUk7UUFDRixNQUFNLFVBQVUsR0FBRyxNQUFNLGVBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFdBQVcsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZHLElBQUksVUFBVSxDQUFDLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ3RDLGNBQWMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUM7U0FDbEM7UUFFRCx3QkFBd0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7S0FDM0M7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNaLElBQUksR0FBRyxZQUFZLEtBQUssSUFBSSxNQUFNLElBQUksR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFO1lBQ2xFLEdBQUcsQ0FBQyw0QkFBNEIsV0FBVywwQkFBMEIsQ0FBQyxDQUFDO1NBQ3hFO2FBQU07WUFDTCxNQUFNLEdBQUcsQ0FBQztTQUNYO0tBQ0Y7SUFFRCxLQUFLLE1BQU0sUUFBUSxJQUFJLFNBQVMsRUFBRTtRQUNoQyxJQUFJO1lBQ0Ysd0JBQXdCLENBQUMsSUFBSSxDQUMzQixNQUFNLGFBQWEsQ0FDakIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxXQUFXLEVBQUUsUUFBUSxDQUFDLEVBQzdDLEdBQUcsaUJBQWlCLEtBQUssa0JBQWtCLENBQUMsT0FBTyxFQUFFLEVBQ3JELEdBQUcsQ0FDSixDQUNGLENBQUM7U0FDSDtRQUFDLE9BQU8sR0FBRyxFQUFFO1lBQ1osSUFBSSxHQUFHLFlBQVksS0FBSyxJQUFJLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUU7Z0JBQ2xFLEdBQUcsQ0FBQywwQkFBMEIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxRQUFRLENBQUMsZUFBZSxDQUFDLENBQUM7YUFDakY7aUJBQU07Z0JBQ0wsTUFBTSxHQUFHLENBQUM7YUFDWDtTQUNGO0tBQ0Y7SUFFRCxHQUFHLENBQUMsc0RBQXNELGVBQWUsRUFBRSxDQUFDLENBQUM7SUFFN0Usd0JBQXdCLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3pDLFlBQVksQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDN0IsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsT0FBMEIsRUFBRSxHQUFVO0lBQzFELEdBQUcsQ0FBQyxRQUFRLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0RCxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtRQUNyQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDckI7U0FBTTtRQUNMLE9BQU8sQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUU7WUFDbEQsR0FBRyxDQUFDLGFBQWEsSUFBSSxTQUFTLElBQUksT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO0tBQ0o7QUFDSCxDQUFDIn0=
|
package/dest/utils.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import { type ContractArtifact, type FunctionArtifact
|
|
1
|
+
import { type ContractArtifact, type FunctionArtifact } from '@aztec/aztec.js/abi';
|
|
2
2
|
import { AztecAddress } from '@aztec/aztec.js/aztec_address';
|
|
3
|
-
import { EthAddress } from '@aztec/aztec.js/eth_address';
|
|
4
|
-
import { Fr, GrumpkinScalar, Point } from '@aztec/aztec.js/fields';
|
|
5
3
|
import { type PXE } from '@aztec/aztec.js/interfaces/pxe';
|
|
6
|
-
import { LogId } from '@aztec/aztec.js/log_id';
|
|
7
|
-
import { TxHash } from '@aztec/aztec.js/tx_hash';
|
|
8
4
|
import { DebugLogger, LogFn } from '@aztec/foundation/log';
|
|
9
5
|
/**
|
|
10
6
|
* Helper type to dynamically import contracts.
|
|
@@ -64,104 +60,6 @@ export declare function prepTx(contractFile: string, functionName: string, _func
|
|
|
64
60
|
* @returns A new string with leading 0x removed
|
|
65
61
|
*/
|
|
66
62
|
export declare const stripLeadingHex: (hex: string) => string;
|
|
67
|
-
/**
|
|
68
|
-
* Parses a hex encoded string to an Fr integer to be used as salt
|
|
69
|
-
* @param str - Hex encoded string
|
|
70
|
-
* @returns A integer to be used as salt
|
|
71
|
-
*/
|
|
72
|
-
export declare function parseSaltFromHexString(str: string): Fr;
|
|
73
|
-
/**
|
|
74
|
-
* Parses an AztecAddress from a string.
|
|
75
|
-
* @param address - A serialized Aztec address
|
|
76
|
-
* @returns An Aztec address
|
|
77
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
78
|
-
*/
|
|
79
|
-
export declare function parseAztecAddress(address: string): AztecAddress;
|
|
80
|
-
/**
|
|
81
|
-
* Parses an Ethereum address from a string.
|
|
82
|
-
* @param address - A serialized Ethereum address
|
|
83
|
-
* @returns An Ethereum address
|
|
84
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
85
|
-
*/
|
|
86
|
-
export declare function parseEthereumAddress(address: string): EthAddress;
|
|
87
|
-
/**
|
|
88
|
-
* Parses an AztecAddress from a string.
|
|
89
|
-
* @param address - A serialized Aztec address
|
|
90
|
-
* @returns An Aztec address
|
|
91
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
92
|
-
*/
|
|
93
|
-
export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
|
|
94
|
-
/**
|
|
95
|
-
* Parses an optional log ID string into a LogId object.
|
|
96
|
-
*
|
|
97
|
-
* @param logId - The log ID string to parse.
|
|
98
|
-
* @returns The parsed LogId object, or undefined if the log ID is missing or empty.
|
|
99
|
-
*/
|
|
100
|
-
export declare function parseOptionalLogId(logId: string): LogId | undefined;
|
|
101
|
-
/**
|
|
102
|
-
* Parses a selector from a string.
|
|
103
|
-
* @param selector - A serialized selector.
|
|
104
|
-
* @returns A selector.
|
|
105
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
106
|
-
*/
|
|
107
|
-
export declare function parseOptionalSelector(selector: string): FunctionSelector | undefined;
|
|
108
|
-
/**
|
|
109
|
-
* Parses a string into an integer or returns undefined if the input is falsy.
|
|
110
|
-
*
|
|
111
|
-
* @param value - The string to parse into an integer.
|
|
112
|
-
* @returns The parsed integer, or undefined if the input string is falsy.
|
|
113
|
-
* @throws If the input is not a valid integer.
|
|
114
|
-
*/
|
|
115
|
-
export declare function parseOptionalInteger(value: string): number | undefined;
|
|
116
|
-
/**
|
|
117
|
-
* Parses a TxHash from a string.
|
|
118
|
-
* @param txHash - A transaction hash
|
|
119
|
-
* @returns A TxHash instance
|
|
120
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
121
|
-
*/
|
|
122
|
-
export declare function parseTxHash(txHash: string): TxHash;
|
|
123
|
-
/**
|
|
124
|
-
* Parses an optional TxHash from a string.
|
|
125
|
-
* Calls parseTxHash internally.
|
|
126
|
-
* @param txHash - A transaction hash
|
|
127
|
-
* @returns A TxHash instance, or undefined if the input string is falsy.
|
|
128
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
129
|
-
*/
|
|
130
|
-
export declare function parseOptionalTxHash(txHash: string): TxHash | undefined;
|
|
131
|
-
/**
|
|
132
|
-
* Parses a public key from a string.
|
|
133
|
-
* @param publicKey - A public key
|
|
134
|
-
* @returns A Point instance
|
|
135
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
136
|
-
*/
|
|
137
|
-
export declare function parsePublicKey(publicKey: string): Point;
|
|
138
|
-
/**
|
|
139
|
-
* Parses a partial address from a string.
|
|
140
|
-
* @param address - A partial address
|
|
141
|
-
* @returns A Fr instance
|
|
142
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
143
|
-
*/
|
|
144
|
-
export declare function parsePartialAddress(address: string): Fr;
|
|
145
|
-
/**
|
|
146
|
-
* Parses a private key from a string.
|
|
147
|
-
* @param privateKey - A string
|
|
148
|
-
* @returns A private key
|
|
149
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
150
|
-
*/
|
|
151
|
-
export declare function parsePrivateKey(privateKey: string): GrumpkinScalar;
|
|
152
|
-
/**
|
|
153
|
-
* Parses a field from a string.
|
|
154
|
-
* @param field - A string representing the field.
|
|
155
|
-
* @returns A field.
|
|
156
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
157
|
-
*/
|
|
158
|
-
export declare function parseField(field: string): Fr;
|
|
159
|
-
/**
|
|
160
|
-
* Parses an array of strings to Frs.
|
|
161
|
-
* @param fields - An array of strings representing the fields.
|
|
162
|
-
* @returns An array of Frs.
|
|
163
|
-
*/
|
|
164
|
-
export declare function parseFields(fields: string[]): Fr[];
|
|
165
63
|
/**
|
|
166
64
|
* Updates a file in place atomically.
|
|
167
65
|
* @param filePath - Path to file
|
package/dest/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D;;GAEG;AACH,UAAU,aAAa;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAMhG;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,wDA0CzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,2BAGhD;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BAuBpE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,yBAgBzD;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;GAM3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAqBxE"}
|
package/dest/utils.js
CHANGED
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import { FunctionSelector } from '@aztec/aztec.js/abi';
|
|
2
1
|
import { AztecAddress } from '@aztec/aztec.js/aztec_address';
|
|
3
|
-
import { EthAddress } from '@aztec/aztec.js/eth_address';
|
|
4
|
-
import { Fr, GrumpkinScalar, Point } from '@aztec/aztec.js/fields';
|
|
5
|
-
import { LogId } from '@aztec/aztec.js/log_id';
|
|
6
|
-
import { TxHash } from '@aztec/aztec.js/tx_hash';
|
|
7
2
|
import { CommanderError, InvalidArgumentError } from 'commander';
|
|
8
3
|
import { readFile, rename, writeFile } from 'fs/promises';
|
|
9
4
|
import { encodeArgs } from './encoding.js';
|
|
@@ -145,220 +140,6 @@ export const stripLeadingHex = (hex) => {
|
|
|
145
140
|
}
|
|
146
141
|
return hex;
|
|
147
142
|
};
|
|
148
|
-
/**
|
|
149
|
-
* Parses a hex encoded string to an Fr integer to be used as salt
|
|
150
|
-
* @param str - Hex encoded string
|
|
151
|
-
* @returns A integer to be used as salt
|
|
152
|
-
*/
|
|
153
|
-
export function parseSaltFromHexString(str) {
|
|
154
|
-
const hex = stripLeadingHex(str);
|
|
155
|
-
// ensure it's a hex string
|
|
156
|
-
if (!hex.match(/^[0-9a-f]+$/i)) {
|
|
157
|
-
throw new InvalidArgumentError('Invalid hex string');
|
|
158
|
-
}
|
|
159
|
-
// pad it so that we may read it as a buffer.
|
|
160
|
-
// Buffer needs _exactly_ two hex characters per byte
|
|
161
|
-
const padded = hex.length % 2 === 1 ? '0' + hex : hex;
|
|
162
|
-
// finally, turn it into an integer
|
|
163
|
-
return Fr.fromBuffer(Buffer.from(padded, 'hex'));
|
|
164
|
-
}
|
|
165
|
-
/**
|
|
166
|
-
* Parses an AztecAddress from a string.
|
|
167
|
-
* @param address - A serialized Aztec address
|
|
168
|
-
* @returns An Aztec address
|
|
169
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
170
|
-
*/
|
|
171
|
-
export function parseAztecAddress(address) {
|
|
172
|
-
try {
|
|
173
|
-
return AztecAddress.fromString(address);
|
|
174
|
-
}
|
|
175
|
-
catch {
|
|
176
|
-
throw new InvalidArgumentError(`Invalid address: ${address}`);
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
/**
|
|
180
|
-
* Parses an Ethereum address from a string.
|
|
181
|
-
* @param address - A serialized Ethereum address
|
|
182
|
-
* @returns An Ethereum address
|
|
183
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
184
|
-
*/
|
|
185
|
-
export function parseEthereumAddress(address) {
|
|
186
|
-
try {
|
|
187
|
-
return EthAddress.fromString(address);
|
|
188
|
-
}
|
|
189
|
-
catch {
|
|
190
|
-
throw new InvalidArgumentError(`Invalid address: ${address}`);
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
/**
|
|
194
|
-
* Parses an AztecAddress from a string.
|
|
195
|
-
* @param address - A serialized Aztec address
|
|
196
|
-
* @returns An Aztec address
|
|
197
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
198
|
-
*/
|
|
199
|
-
export function parseOptionalAztecAddress(address) {
|
|
200
|
-
if (!address) {
|
|
201
|
-
return undefined;
|
|
202
|
-
}
|
|
203
|
-
return parseAztecAddress(address);
|
|
204
|
-
}
|
|
205
|
-
/**
|
|
206
|
-
* Parses an optional log ID string into a LogId object.
|
|
207
|
-
*
|
|
208
|
-
* @param logId - The log ID string to parse.
|
|
209
|
-
* @returns The parsed LogId object, or undefined if the log ID is missing or empty.
|
|
210
|
-
*/
|
|
211
|
-
export function parseOptionalLogId(logId) {
|
|
212
|
-
if (!logId) {
|
|
213
|
-
return undefined;
|
|
214
|
-
}
|
|
215
|
-
return LogId.fromString(logId);
|
|
216
|
-
}
|
|
217
|
-
/**
|
|
218
|
-
* Parses a selector from a string.
|
|
219
|
-
* @param selector - A serialized selector.
|
|
220
|
-
* @returns A selector.
|
|
221
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
222
|
-
*/
|
|
223
|
-
export function parseOptionalSelector(selector) {
|
|
224
|
-
if (!selector) {
|
|
225
|
-
return undefined;
|
|
226
|
-
}
|
|
227
|
-
try {
|
|
228
|
-
return FunctionSelector.fromString(selector);
|
|
229
|
-
}
|
|
230
|
-
catch {
|
|
231
|
-
throw new InvalidArgumentError(`Invalid selector: ${selector}`);
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
/**
|
|
235
|
-
* Parses a string into an integer or returns undefined if the input is falsy.
|
|
236
|
-
*
|
|
237
|
-
* @param value - The string to parse into an integer.
|
|
238
|
-
* @returns The parsed integer, or undefined if the input string is falsy.
|
|
239
|
-
* @throws If the input is not a valid integer.
|
|
240
|
-
*/
|
|
241
|
-
export function parseOptionalInteger(value) {
|
|
242
|
-
if (!value) {
|
|
243
|
-
return undefined;
|
|
244
|
-
}
|
|
245
|
-
const parsed = Number(value);
|
|
246
|
-
if (!Number.isInteger(parsed)) {
|
|
247
|
-
throw new InvalidArgumentError('Invalid integer.');
|
|
248
|
-
}
|
|
249
|
-
return parsed;
|
|
250
|
-
}
|
|
251
|
-
/**
|
|
252
|
-
* Parses a TxHash from a string.
|
|
253
|
-
* @param txHash - A transaction hash
|
|
254
|
-
* @returns A TxHash instance
|
|
255
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
256
|
-
*/
|
|
257
|
-
export function parseTxHash(txHash) {
|
|
258
|
-
try {
|
|
259
|
-
return TxHash.fromString(txHash);
|
|
260
|
-
}
|
|
261
|
-
catch {
|
|
262
|
-
throw new InvalidArgumentError(`Invalid transaction hash: ${txHash}`);
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
/**
|
|
266
|
-
* Parses an optional TxHash from a string.
|
|
267
|
-
* Calls parseTxHash internally.
|
|
268
|
-
* @param txHash - A transaction hash
|
|
269
|
-
* @returns A TxHash instance, or undefined if the input string is falsy.
|
|
270
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
271
|
-
*/
|
|
272
|
-
export function parseOptionalTxHash(txHash) {
|
|
273
|
-
if (!txHash) {
|
|
274
|
-
return undefined;
|
|
275
|
-
}
|
|
276
|
-
return parseTxHash(txHash);
|
|
277
|
-
}
|
|
278
|
-
/**
|
|
279
|
-
* Parses a public key from a string.
|
|
280
|
-
* @param publicKey - A public key
|
|
281
|
-
* @returns A Point instance
|
|
282
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
283
|
-
*/
|
|
284
|
-
export function parsePublicKey(publicKey) {
|
|
285
|
-
try {
|
|
286
|
-
return Point.fromString(publicKey);
|
|
287
|
-
}
|
|
288
|
-
catch (err) {
|
|
289
|
-
throw new InvalidArgumentError(`Invalid public key: ${publicKey}`);
|
|
290
|
-
}
|
|
291
|
-
}
|
|
292
|
-
/**
|
|
293
|
-
* Parses a partial address from a string.
|
|
294
|
-
* @param address - A partial address
|
|
295
|
-
* @returns A Fr instance
|
|
296
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
297
|
-
*/
|
|
298
|
-
export function parsePartialAddress(address) {
|
|
299
|
-
try {
|
|
300
|
-
return Fr.fromString(address);
|
|
301
|
-
}
|
|
302
|
-
catch (err) {
|
|
303
|
-
throw new InvalidArgumentError(`Invalid partial address: ${address}`);
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
|
-
/**
|
|
307
|
-
* Parses a private key from a string.
|
|
308
|
-
* @param privateKey - A string
|
|
309
|
-
* @returns A private key
|
|
310
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
311
|
-
*/
|
|
312
|
-
export function parsePrivateKey(privateKey) {
|
|
313
|
-
try {
|
|
314
|
-
const value = GrumpkinScalar.fromString(privateKey);
|
|
315
|
-
// most likely a badly formatted key was passed
|
|
316
|
-
if (value.isZero()) {
|
|
317
|
-
throw new Error('Private key must not be zero');
|
|
318
|
-
}
|
|
319
|
-
return value;
|
|
320
|
-
}
|
|
321
|
-
catch (err) {
|
|
322
|
-
throw new InvalidArgumentError(`Invalid private key: ${privateKey}`);
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
/**
|
|
326
|
-
* Parses a field from a string.
|
|
327
|
-
* @param field - A string representing the field.
|
|
328
|
-
* @returns A field.
|
|
329
|
-
* @throws InvalidArgumentError if the input string is not valid.
|
|
330
|
-
*/
|
|
331
|
-
export function parseField(field) {
|
|
332
|
-
try {
|
|
333
|
-
const isHex = field.startsWith('0x') || field.match(new RegExp(`^[0-9a-f]{${Fr.SIZE_IN_BYTES * 2}}$`, 'i'));
|
|
334
|
-
if (isHex) {
|
|
335
|
-
return Fr.fromString(field);
|
|
336
|
-
}
|
|
337
|
-
if (['true', 'false'].includes(field)) {
|
|
338
|
-
return new Fr(field === 'true');
|
|
339
|
-
}
|
|
340
|
-
const isNumber = +field || field === '0';
|
|
341
|
-
if (isNumber) {
|
|
342
|
-
return new Fr(BigInt(field));
|
|
343
|
-
}
|
|
344
|
-
const isBigInt = field.endsWith('n');
|
|
345
|
-
if (isBigInt) {
|
|
346
|
-
return new Fr(BigInt(field.replace(/n$/, '')));
|
|
347
|
-
}
|
|
348
|
-
return new Fr(BigInt(field));
|
|
349
|
-
}
|
|
350
|
-
catch (err) {
|
|
351
|
-
throw new InvalidArgumentError(`Invalid field: ${field}`);
|
|
352
|
-
}
|
|
353
|
-
}
|
|
354
|
-
/**
|
|
355
|
-
* Parses an array of strings to Frs.
|
|
356
|
-
* @param fields - An array of strings representing the fields.
|
|
357
|
-
* @returns An array of Frs.
|
|
358
|
-
*/
|
|
359
|
-
export function parseFields(fields) {
|
|
360
|
-
return fields.map(parseField);
|
|
361
|
-
}
|
|
362
143
|
/**
|
|
363
144
|
* Updates a file in place atomically.
|
|
364
145
|
* @param filePath - Path to file
|
|
@@ -384,4 +165,4 @@ export async function atomicUpdateFile(filePath, contents) {
|
|
|
384
165
|
}
|
|
385
166
|
}
|
|
386
167
|
}
|
|
387
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAGjD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAA0B,EAAE,MAAc;IAC5E,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,KAAK,CAAC,YAAY,MAAM,6BAA6B,CAAC,CAAC;KAC9D;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,MAAc,EACd,UAAkB,EAClB,QAAgB,EAChB,WAAwB;IAExB,MAAM,EACJ,4BAA4B,EAC5B,iCAAiC,EACjC,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,cAAc,GACf,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACxC,MAAM,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACnF,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAEjF,MAAM,OAAO,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,WAAW,GAAqC;QACpD,yBAAyB,EAAE;YACzB,WAAW,EAAE,4BAA4B;YACzC,gBAAgB,EAAE,iCAAiC;SACpD;QACD,QAAQ,EAAE;YACR,WAAW,EAAE,WAAW;YACxB,gBAAgB,EAAE,gBAAgB;SACnC;QACD,KAAK,EAAE;YACL,WAAW,EAAE,QAAQ;YACrB,gBAAgB,EAAE,aAAa;SAChC;QACD,MAAM,EAAE;YACN,WAAW,EAAE,SAAS;YACtB,gBAAgB,EAAE,cAAc;SACjC;QACD,MAAM,EAAE;YACN,WAAW,EAAE,SAAS;YACtB,gBAAgB,EAAE,cAAc;SACjC;KACF,CAAC;IACF,OAAO,MAAM,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AACnG,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B;IAC/C,MAAM,SAAS,GAAkB,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACjF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,GAAU;IACnE,+CAA+C;IAC/C,IAAI,QAAgB,CAAC;IACrB,MAAM,SAAS,GAAG,MAAM,2BAA2B,EAAE,CAAC;IACtD,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,SAAS,CAAC,OAAO,CAAqB,CAAC;KAC/C;IAED,IAAI;QACF,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC5C;IAAC,MAAM;QACN,MAAM,KAAK,CAAC,YAAY,OAAO,YAAY,CAAC,CAAC;KAC9C;IAED,6CAA6C;IAC7C,IAAI,gBAAkC,CAAC;IACvC,IAAI;QACF,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAqB,CAAC;KAC7D;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,sCAAsC,CAAC,CAAC;QAC5C,MAAM,GAAG,CAAC;KACX;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAQ,EAAE,KAAc;IACxD,IAAI,IAAkB,CAAC;IACvB,IAAI,KAAK,EAAE;QACT,IAAI;YACF,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACvC;QAAC,MAAM;YACN,MAAM,IAAI,oBAAoB,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;SAC1E;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,qBAAqB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,YAAoB,EAAE,YAAoB,EAAE,aAAuB,EAAE,GAAU;IAC1G,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE5E,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE;IAC7C,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC1C,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACzB;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAEjC,2BAA2B;IAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;QAC9B,MAAM,IAAI,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;KACtD;IAED,6CAA6C;IAC7C,qDAAqD;IACrD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAEtD,mCAAmC;IACnC,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI;QACF,OAAO,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACzC;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,IAAI;QACF,OAAO,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACvC;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KAC9C;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;KACjE;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;KACpD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,IAAI;QACF,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAClC;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,IAAI;QACF,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI;QACF,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI;QACF,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpD,+CAA+C;QAC/C,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QAED,OAAO,KAAK,CAAC;KACd;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC;KACtE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,IAAI;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC,aAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5G,IAAI,KAAK,EAAE;YACT,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACrC,OAAO,IAAI,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC;QACzC,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SAC9B;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;QAED,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KAC9B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;KAC3D;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,MAAgB;IAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IACvE,MAAM,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtC,IAAI;QACF,MAAM,SAAS,CAAC,WAAW,EAAE,QAAQ,EAAE;YACrC,6CAA6C;YAC7C,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KACrC;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,KAAK,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC5D,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,CAAC,EACD,CAAC,CAAC,IAAI,EACN,kCAAkC,WAAW,mCAAmC,CACjF,CAAC;YACF,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC;YACvC,MAAM,cAAc,CAAC;SACtB;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC"}
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSzdELE9BQU8sRUFBRSxjQUFjLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDakUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTFELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFTM0M7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBQUMsUUFBMEIsRUFBRSxNQUFjO0lBQzVFLE1BQU0sRUFBRSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDO0lBQ2xFLElBQUksQ0FBQyxFQUFFLEVBQUU7UUFDUCxNQUFNLEtBQUssQ0FBQyxZQUFZLE1BQU0sNkJBQTZCLENBQUMsQ0FBQztLQUM5RDtJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVBQ2QsVUFBa0IsRUFDbEIsUUFBZ0IsRUFDaEIsV0FBd0I7SUFFeEIsTUFBTSxFQUNKLDRCQUE0QixFQUM1QixpQ0FBaUMsRUFDakMsUUFBUSxFQUNSLGFBQWEsRUFDYixTQUFTLEVBQ1QsY0FBYyxFQUNkLFdBQVcsRUFDWCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULGNBQWMsR0FDZixHQUFHLE1BQU0sTUFBTSxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDeEMsTUFBTSxFQUFFLG1CQUFtQixFQUFFLGlCQUFpQixFQUFFLEdBQUcsTUFBTSxNQUFNLENBQUMs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dest/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -34,13 +34,13 @@
|
|
|
34
34
|
"rootDir": "./src"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@aztec/aztec.js": "0.16.
|
|
38
|
-
"@aztec/ethereum": "0.16.
|
|
39
|
-
"@aztec/foundation": "0.16.
|
|
40
|
-
"@aztec/l1-artifacts": "0.16.
|
|
41
|
-
"@aztec/noir-compiler": "0.16.
|
|
42
|
-
"@aztec/noir-contracts": "0.16.
|
|
43
|
-
"@aztec/types": "0.16.
|
|
37
|
+
"@aztec/aztec.js": "0.16.8",
|
|
38
|
+
"@aztec/ethereum": "0.16.8",
|
|
39
|
+
"@aztec/foundation": "0.16.8",
|
|
40
|
+
"@aztec/l1-artifacts": "0.16.8",
|
|
41
|
+
"@aztec/noir-compiler": "0.16.8",
|
|
42
|
+
"@aztec/noir-contracts": "0.16.8",
|
|
43
|
+
"@aztec/types": "0.16.8",
|
|
44
44
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
45
45
|
"@ltd/j-toml": "^1.38.0",
|
|
46
46
|
"commander": "^9.0.0",
|