@aztec/builder 0.37.0 → 0.38.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/cli/update/update.d.ts +1 -1
- package/dest/cli/update/update.d.ts.map +1 -1
- package/dest/cli/update/update.js +2 -2
- package/dest/cli.js +8 -19
- package/package.json +5 -5
- package/src/cli/update/update.ts +0 -1
- package/src/cli.ts +7 -22
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type LogFn } from '@aztec/foundation/log';
|
|
2
|
-
export declare function update(projectPath: string, contracts: string[],
|
|
2
|
+
export declare function update(projectPath: string, contracts: 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/cli/update/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAanD,wBAAsB,MAAM,CAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/update/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAanD,wBAAsB,MAAM,CAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CA+Cf"}
|
|
@@ -5,7 +5,7 @@ import { updateAztecNr } from './noir.js';
|
|
|
5
5
|
import { getNewestVersion, updateAztecDeps, updateLockfile } from './npm.js';
|
|
6
6
|
const AZTECJS_PACKAGE = '@aztec/aztec.js';
|
|
7
7
|
const UPDATE_DOCS_URL = 'https://docs.aztec.network/developers/updating';
|
|
8
|
-
export async function update(projectPath, contracts,
|
|
8
|
+
export async function update(projectPath, contracts, aztecVersion, log) {
|
|
9
9
|
const targetAztecVersion = aztecVersion === 'latest' ? await getNewestVersion(AZTECJS_PACKAGE, 'latest') : parse(aztecVersion);
|
|
10
10
|
if (!targetAztecVersion) {
|
|
11
11
|
throw new Error(`Invalid aztec version ${aztecVersion}`);
|
|
@@ -55,4 +55,4 @@ function printChanges(changes, log) {
|
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS91cGRhdGUvdXBkYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHL0IsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2hELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDMUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFFN0UsTUFBTSxlQUFlLEdBQUcsaUJBQWlCLENBQUM7QUFDMUMsTUFBTSxlQUFlLEdBQUcsZ0RBQWdELENBQUM7QUFFekUsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQzFCLFdBQW1CLEVBQ25CLFNBQW1CLEVBQ25CLFlBQW9CLEVBQ3BCLEdBQVU7SUFFVixNQUFNLGtCQUFrQixHQUN0QixZQUFZLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxNQUFNLGdCQUFnQixDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBRXRHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLFlBQVksRUFBRSxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELE1BQU0sd0JBQXdCLEdBQXdCLEVBQUUsQ0FBQztJQUN6RCxJQUFJLENBQUM7UUFDSCxNQUFNLFVBQVUsR0FBRyxNQUFNLGVBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFdBQVcsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZHLElBQUksVUFBVSxDQUFDLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdkMsY0FBYyxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBRUQsd0JBQXdCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxHQUFHLFlBQVksS0FBSyxJQUFJLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUNuRSxHQUFHLENBQUMsNEJBQTRCLFdBQVcsMEJBQTBCLENBQUMsQ0FBQztRQUN6RSxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sR0FBRyxDQUFDO1FBQ1osQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLE1BQU0sUUFBUSxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQztZQUNILHdCQUF3QixDQUFDLElBQUksQ0FDM0IsTUFBTSxhQUFhLENBQ2pCLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsV0FBVyxFQUFFLFFBQVEsQ0FBQyxFQUM3QyxHQUFHLGlCQUFpQixLQUFLLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxFQUNyRCxHQUFHLENBQ0osQ0FDRixDQUFDO1FBQ0osQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixJQUFJLEdBQUcsWUFBWSxLQUFLLElBQUksTUFBTSxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO2dCQUNuRSxHQUFHLENBQUMsMEJBQTBCLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQ2xGLENBQUM7aUJBQU0sQ0FBQztnQkFDTixNQUFNLEdBQUcsQ0FBQztZQUNaLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELEdBQUcsQ0FBQyxzREFBc0QsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUU3RSx3QkFBd0IsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDekMsWUFBWSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3QixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FBQyxPQUEwQixFQUFFLEdBQVU7SUFDMUQsR0FBRyxDQUFDLFFBQVEsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDdEMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3RCLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUNsRCxHQUFHLENBQUMsYUFBYSxJQUFJLFNBQVMsSUFBSSxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0FBQ0gsQ0FBQyJ9
|
package/dest/cli.js
CHANGED
|
@@ -1,23 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createConsoleLogger } from '@aztec/foundation/log';
|
|
3
|
-
import { Command
|
|
4
|
-
import { lookup } from 'dns/promises';
|
|
3
|
+
import { Command } from 'commander';
|
|
5
4
|
import { dirname } from 'path';
|
|
6
5
|
const program = new Command();
|
|
7
|
-
const log = createConsoleLogger('aztec:
|
|
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
|
-
const getLocalhost = () => lookup('host.docker.internal')
|
|
13
|
-
.then(() => 'host.docker.internal')
|
|
14
|
-
.catch(() => 'localhost');
|
|
15
|
-
const LOCALHOST = await getLocalhost();
|
|
6
|
+
const log = createConsoleLogger('aztec:builder');
|
|
16
7
|
const main = async () => {
|
|
17
|
-
const pxeOption = new Option('-u, --rpc-url <string>', 'URL of the PXE')
|
|
18
|
-
.env('PXE_URL')
|
|
19
|
-
.default(`http://${LOCALHOST}:8080`)
|
|
20
|
-
.makeOptionMandatory(true);
|
|
21
8
|
program.name('aztec-builder');
|
|
22
9
|
program
|
|
23
10
|
.command('codegen')
|
|
@@ -35,17 +22,19 @@ const main = async () => {
|
|
|
35
22
|
.argument('[projectPath]', 'Path to the project directory', process.cwd())
|
|
36
23
|
.option('--contract [paths...]', 'Paths to contracts to update dependencies', [])
|
|
37
24
|
.option('--aztec-version <semver>', 'The version to update Aztec packages to. Defaults to latest', 'latest')
|
|
38
|
-
.addOption(pxeOption)
|
|
39
25
|
.action(async (projectPath, options) => {
|
|
40
26
|
const { update } = await import('./cli/update/update.js');
|
|
41
|
-
const { contract, aztecVersion
|
|
42
|
-
await update(projectPath, contract,
|
|
27
|
+
const { contract, aztecVersion } = options;
|
|
28
|
+
await update(projectPath, contract, aztecVersion, log);
|
|
43
29
|
});
|
|
44
30
|
await program.parseAsync(process.argv);
|
|
31
|
+
// I force exit here because spawnSync in npm.ts just blocks the process from exiting. Spent a bit of time debugging
|
|
32
|
+
// it without success and I think it doesn't make sense to invest more time in this.
|
|
33
|
+
process.exit(0);
|
|
45
34
|
};
|
|
46
35
|
main().catch(err => {
|
|
47
36
|
log(`Error running command`);
|
|
48
37
|
log(err);
|
|
49
38
|
process.exit(1);
|
|
50
39
|
});
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFNUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRS9CLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxFQUFFLENBQUM7QUFDOUIsTUFBTSxHQUFHLEdBQUcsbUJBQW1CLENBQUMsZUFBZSxDQUFDLENBQUM7QUFFakQsTUFBTSxJQUFJLEdBQUcsS0FBSyxJQUFJLEVBQUU7SUFDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUM5QixPQUFPO1NBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQztTQUNsQixRQUFRLENBQUMsaUJBQWlCLEVBQUUsc0NBQXNDLENBQUM7U0FDbkUsTUFBTSxDQUFDLHFCQUFxQixFQUFFLHVDQUF1QyxDQUFDO1NBQ3RFLE1BQU0sQ0FBQyxTQUFTLEVBQUUsK0RBQStELENBQUM7U0FDbEYsV0FBVyxDQUFDLDhEQUE4RCxDQUFDO1NBQzNFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsV0FBbUIsRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1FBQ3ZELE1BQU0sRUFBRSxZQUFZLEVBQUUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQzFELFlBQVksQ0FBQyxNQUFNLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDdkUsQ0FBQyxDQUFDLENBQUM7SUFFTCxPQUFPO1NBQ0osT0FBTyxDQUFDLFFBQVEsQ0FBQztTQUNqQixXQUFXLENBQUMsc0NBQXNDLENBQUM7U0FDbkQsUUFBUSxDQUFDLGVBQWUsRUFBRSwrQkFBK0IsRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7U0FDekUsTUFBTSxDQUFDLHVCQUF1QixFQUFFLDJDQUEyQyxFQUFFLEVBQUUsQ0FBQztTQUNoRixNQUFNLENBQUMsMEJBQTBCLEVBQUUsNkRBQTZELEVBQUUsUUFBUSxDQUFDO1NBQzNHLE1BQU0sQ0FBQyxLQUFLLEVBQUUsV0FBbUIsRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUM3QyxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxNQUFNLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUMxRCxNQUFNLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxNQUFNLE1BQU0sQ0FBQyxXQUFXLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN6RCxDQUFDLENBQUMsQ0FBQztJQUVMLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkMsb0hBQW9IO0lBQ3BILG9GQUFvRjtJQUNwRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQztBQUVGLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtJQUNqQixHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QixHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDVCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/builder",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"entryPoints": [
|
|
11
11
|
"./src/index.ts"
|
|
12
12
|
],
|
|
13
|
-
"name": "Aztec
|
|
13
|
+
"name": "Aztec builder",
|
|
14
14
|
"tsconfig": "./tsconfig.json"
|
|
15
15
|
},
|
|
16
16
|
"bin": {
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
]
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@aztec/circuits.js": "0.
|
|
61
|
-
"@aztec/foundation": "0.
|
|
62
|
-
"@aztec/types": "0.
|
|
60
|
+
"@aztec/circuits.js": "0.38.0",
|
|
61
|
+
"@aztec/foundation": "0.38.0",
|
|
62
|
+
"@aztec/types": "0.38.0",
|
|
63
63
|
"@iarna/toml": "^2.2.5",
|
|
64
64
|
"base64-js": "^1.5.1",
|
|
65
65
|
"commander": "^9.0.0",
|
package/src/cli/update/update.ts
CHANGED
package/src/cli.ts
CHANGED
|
@@ -1,30 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createConsoleLogger } from '@aztec/foundation/log';
|
|
3
3
|
|
|
4
|
-
import { Command
|
|
5
|
-
import { lookup } from 'dns/promises';
|
|
4
|
+
import { Command } from 'commander';
|
|
6
5
|
import { dirname } from 'path';
|
|
7
6
|
|
|
8
7
|
const program = new Command();
|
|
9
|
-
const log = createConsoleLogger('aztec:
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
|
|
13
|
-
* localhost as being host.docker.internal.
|
|
14
|
-
*/
|
|
15
|
-
const getLocalhost = () =>
|
|
16
|
-
lookup('host.docker.internal')
|
|
17
|
-
.then(() => 'host.docker.internal')
|
|
18
|
-
.catch(() => 'localhost');
|
|
19
|
-
|
|
20
|
-
const LOCALHOST = await getLocalhost();
|
|
8
|
+
const log = createConsoleLogger('aztec:builder');
|
|
21
9
|
|
|
22
10
|
const main = async () => {
|
|
23
|
-
const pxeOption = new Option('-u, --rpc-url <string>', 'URL of the PXE')
|
|
24
|
-
.env('PXE_URL')
|
|
25
|
-
.default(`http://${LOCALHOST}:8080`)
|
|
26
|
-
.makeOptionMandatory(true);
|
|
27
|
-
|
|
28
11
|
program.name('aztec-builder');
|
|
29
12
|
program
|
|
30
13
|
.command('codegen')
|
|
@@ -43,14 +26,16 @@ const main = async () => {
|
|
|
43
26
|
.argument('[projectPath]', 'Path to the project directory', process.cwd())
|
|
44
27
|
.option('--contract [paths...]', 'Paths to contracts to update dependencies', [])
|
|
45
28
|
.option('--aztec-version <semver>', 'The version to update Aztec packages to. Defaults to latest', 'latest')
|
|
46
|
-
.addOption(pxeOption)
|
|
47
29
|
.action(async (projectPath: string, options) => {
|
|
48
30
|
const { update } = await import('./cli/update/update.js');
|
|
49
|
-
const { contract, aztecVersion
|
|
50
|
-
await update(projectPath, contract,
|
|
31
|
+
const { contract, aztecVersion } = options;
|
|
32
|
+
await update(projectPath, contract, aztecVersion, log);
|
|
51
33
|
});
|
|
52
34
|
|
|
53
35
|
await program.parseAsync(process.argv);
|
|
36
|
+
// I force exit here because spawnSync in npm.ts just blocks the process from exiting. Spent a bit of time debugging
|
|
37
|
+
// it without success and I think it doesn't make sense to invest more time in this.
|
|
38
|
+
process.exit(0);
|
|
54
39
|
};
|
|
55
40
|
|
|
56
41
|
main().catch(err => {
|