@aztec/cli 0.7.7 → 0.7.8

package/dest/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAwB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,YAE1C;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,qBAiB/E;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,iBAwBnF"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAwB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,YAE1C;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,qBAiB/E;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,iBAyBnF"}

package/dest/client.js

@@ -46,24 +46,23 @@ class VersionMismatchError extends Error {
  */
 export async function checkServerVersion(rpc, expectedVersionRange) {
     const serverName = 'Aztec Sandbox';
-    const { client } = await rpc.getNodeInfo();
-    if (!client) {
+    const { sandboxVersion } = await rpc.getNodeInfo();
+    if (!sandboxVersion) {
         throw new VersionMismatchError(`Couldn't determine ${serverName} version. You may run into issues.`);
     }
-    const version = client.split('@')[1];
-    if (!version || !valid(version)) {
-        throw new VersionMismatchError(`Missing or invalid version identifier for ${serverName} (${version ?? 'empty'}).`);
+    if (!sandboxVersion || !valid(sandboxVersion)) {
+        throw new VersionMismatchError(`Missing or invalid version identifier for ${serverName} (${sandboxVersion ?? 'empty'}).`);
     }
-    else if (!satisfies(version, expectedVersionRange)) {
-        if (gtr(version, expectedVersionRange)) {
-            throw new VersionMismatchError(`${serverName} is running version ${version} which is newer than the expected by this CLI (${expectedVersionRange}). Consider upgrading your CLI to a newer version.`);
+    else if (!satisfies(sandboxVersion, expectedVersionRange)) {
+        if (gtr(sandboxVersion, expectedVersionRange)) {
+            throw new VersionMismatchError(`${serverName} is running version ${sandboxVersion} which is newer than the expected by this CLI (${expectedVersionRange}). Consider upgrading your CLI to a newer version.`);
         }
-        else if (ltr(version, expectedVersionRange)) {
-            throw new VersionMismatchError(`${serverName} is running version ${version} which is older than the expected by this CLI (${expectedVersionRange}). Consider upgrading your ${serverName} to a newer version.`);
+        else if (ltr(sandboxVersion, expectedVersionRange)) {
+            throw new VersionMismatchError(`${serverName} is running version ${sandboxVersion} which is older than the expected by this CLI (${expectedVersionRange}). Consider upgrading your ${serverName} to a newer version.`);
         }
         else {
-            throw new VersionMismatchError(`${serverName} is running version ${version} which does not match the expected by this CLI (${expectedVersionRange}).`);
+            throw new VersionMismatchError(`${serverName} is running version ${sandboxVersion} which does not match the expected by this CLI (${expectedVersionRange}).`);
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVksb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFdEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLElBQUksQ0FBQztBQUNsQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN4QyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRXBEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFDLE1BQWM7SUFDekMsT0FBTyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN0QyxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxzQkFBc0IsQ0FBQyxNQUFjLEVBQUUsTUFBbUI7SUFDOUUsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sZUFBZSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQzVGLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNqRixNQUFNLG9CQUFvQixHQUFHLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDLDZDQUE2QztJQUV2RyxJQUFJO1FBQ0YsTUFBTSxrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztLQUN4RDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osSUFBSSxHQUFHLFlBQVksb0JBQW9CLEVBQUU7WUFDdkMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDM0I7YUFBTTtZQUNMLE1BQU0sR0FBRyxDQUFDO1NBQ1g7S0FDRjtJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUM7QUFFRCxtREFBbUQ7QUFDbkQsTUFBTSxvQkFBcUIsU0FBUSxLQUFLO0NBQUc7QUFFM0M7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsa0JBQWtCLENBQUMsR0FBYSxFQUFFLG9CQUE0QjtJQUNsRixNQUFNLFVBQVUsR0FBRyxlQUFlLENBQUM7SUFDbkMsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE1BQU0sR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzNDLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFDWCxNQUFNLElBQUksb0JBQW9CLENBQUMsc0JBQXNCLFVBQVUsb0NBQW9DLENBQUMsQ0FBQztLQUN0RztJQUNELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDckMsSUFBSSxDQUFDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRTtRQUMvQixNQUFNLElBQUksb0JBQW9CLENBQUMsNkNBQTZDLFVBQVUsS0FBSyxPQUFPLElBQUksT0FBTyxJQUFJLENBQUMsQ0FBQztLQUNwSDtTQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7UUFDcEQsSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7WUFDdEMsTUFBTSxJQUFJLG9CQUFvQixDQUM1QixHQUFHLFVBQVUsdUJBQXVCLE9BQU8sa0RBQWtELG9CQUFvQixvREFBb0QsQ0FDdEssQ0FBQztTQUNIO2FBQU0sSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7WUFDN0MsTUFBTSxJQUFJLG9CQUFvQixDQUM1QixHQUFHLFVBQVUsdUJBQXVCLE9BQU8sa0RBQWtELG9CQUFvQiw4QkFBOEIsVUFBVSxzQkFBc0IsQ0FDaEwsQ0FBQztTQUNIO2FBQU07WUFDTCxNQUFNLElBQUksb0JBQW9CLENBQzVCLEdBQUcsVUFBVSx1QkFBdUIsT0FBTyxtREFBbUQsb0JBQW9CLElBQUksQ0FDdkgsQ0FBQztTQUNIO0tBQ0Y7QUFDSCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVksb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFdEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLElBQUksQ0FBQztBQUNsQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN4QyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRXBEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFDLE1BQWM7SUFDekMsT0FBTyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN0QyxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxzQkFBc0IsQ0FBQyxNQUFjLEVBQUUsTUFBbUI7SUFDOUUsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sZUFBZSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQzVGLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNqRixNQUFNLG9CQUFvQixHQUFHLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDLDZDQUE2QztJQUV2RyxJQUFJO1FBQ0YsTUFBTSxrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztLQUN4RDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osSUFBSSxHQUFHLFlBQVksb0JBQW9CLEVBQUU7WUFDdkMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDM0I7YUFBTTtZQUNMLE1BQU0sR0FBRyxDQUFDO1NBQ1g7S0FDRjtJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUM7QUFFRCxtREFBbUQ7QUFDbkQsTUFBTSxvQkFBcUIsU0FBUSxLQUFLO0NBQUc7QUFFM0M7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsa0JBQWtCLENBQUMsR0FBYSxFQUFFLG9CQUE0QjtJQUNsRixNQUFNLFVBQVUsR0FBRyxlQUFlLENBQUM7SUFDbkMsTUFBTSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ25ELElBQUksQ0FBQyxjQUFjLEVBQUU7UUFDbkIsTUFBTSxJQUFJLG9CQUFvQixDQUFDLHNCQUFzQixVQUFVLG9DQUFvQyxDQUFDLENBQUM7S0FDdEc7SUFDRCxJQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxFQUFFO1FBQzdDLE1BQU0sSUFBSSxvQkFBb0IsQ0FDNUIsNkNBQTZDLFVBQVUsS0FBSyxjQUFjLElBQUksT0FBTyxJQUFJLENBQzFGLENBQUM7S0FDSDtTQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7UUFDM0QsSUFBSSxHQUFHLENBQUMsY0FBYyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7WUFDN0MsTUFBTSxJQUFJLG9CQUFvQixDQUM1QixHQUFHLFVBQVUsdUJBQXVCLGNBQWMsa0RBQWtELG9CQUFvQixvREFBb0QsQ0FDN0ssQ0FBQztTQUNIO2FBQU0sSUFBSSxHQUFHLENBQUMsY0FBYyxFQUFFLG9CQUFvQixDQUFDLEVBQUU7WUFDcEQsTUFBTSxJQUFJLG9CQUFvQixDQUM1QixHQUFHLFVBQVUsdUJBQXVCLGNBQWMsa0RBQWtELG9CQUFvQiw4QkFBOEIsVUFBVSxzQkFBc0IsQ0FDdkwsQ0FBQztTQUNIO2FBQU07WUFDTCxNQUFNLElBQUksb0JBQW9CLENBQzVCLEdBQUcsVUFBVSx1QkFBdUIsY0FBYyxtREFBbUQsb0JBQW9CLElBQUksQ0FDOUgsQ0FBQztTQUNIO0tBQ0Y7QUFDSCxDQUFDIn0=

package/dest/client.test.js

@@ -7,17 +7,17 @@ describe('client', () => {
             rpc = mock();
         });
         it('checks versions match', async () => {
-            rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha47' });
+            rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha47' });
             await checkServerVersion(rpc, '0.1.0-alpha47');
         });
         it('reports mismatch on older rpc version', async () => {
-            rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha47' });
+            rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha47' });
             await expect(checkServerVersion(rpc, '0.1.0-alpha48')).rejects.toThrowError(/is older than the expected by this CLI/);
         });
         it('reports mismatch on newer rpc version', async () => {
-            rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha48' });
+            rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha48' });
             await expect(checkServerVersion(rpc, '0.1.0-alpha47')).rejects.toThrowError(/is newer than the expected by this CLI/);
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFhLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXJELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVqRCxRQUFRLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRTtJQUN0QixRQUFRLENBQUMsb0JBQW9CLEVBQUUsR0FBRyxFQUFFO1FBQ2xDLElBQUksR0FBd0IsQ0FBQztRQUU3QixVQUFVLENBQUMsR0FBRyxFQUFFO1lBQ2QsR0FBRyxHQUFHLElBQUksRUFBWSxDQUFDO1FBQ3pCLENBQUMsQ0FBQyxDQUFDO1FBRUgsRUFBRSxDQUFDLHVCQUF1QixFQUFFLEtBQUssSUFBSSxFQUFFO1lBQ3JDLEdBQUcsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUMsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQWMsQ0FBQyxDQUFDO1lBQy9FLE1BQU0sa0JBQWtCLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO1FBRUgsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLEtBQUssSUFBSSxFQUFFO1lBQ3JELEdBQUcsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUMsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQWMsQ0FBQyxDQUFDO1lBQy9FLE1BQU0sTUFBTSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsRUFBRSxlQUFlLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQ3pFLHdDQUF3QyxDQUN6QyxDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7UUFFSCxFQUFFLENBQUMsdUNBQXVDLEVBQUUsS0FBSyxJQUFJLEVBQUU7WUFDckQsR0FBRyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sRUFBRSxtQkFBbUIsRUFBYyxDQUFDLENBQUM7WUFDL0UsTUFBTSxNQUFNLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDekUsd0NBQXdDLENBQ3pDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50LnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFhLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXJELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVqRCxRQUFRLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRTtJQUN0QixRQUFRLENBQUMsb0JBQW9CLEVBQUUsR0FBRyxFQUFFO1FBQ2xDLElBQUksR0FBd0IsQ0FBQztRQUU3QixVQUFVLENBQUMsR0FBRyxFQUFFO1lBQ2QsR0FBRyxHQUFHLElBQUksRUFBWSxDQUFDO1FBQ3pCLENBQUMsQ0FBQyxDQUFDO1FBRUgsRUFBRSxDQUFDLHVCQUF1QixFQUFFLEtBQUssSUFBSSxFQUFFO1lBQ3JDLEdBQUcsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUMsRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFjLENBQUMsQ0FBQztZQUNuRixNQUFNLGtCQUFrQixDQUFDLEdBQUcsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNqRCxDQUFDLENBQUMsQ0FBQztRQUVILEVBQUUsQ0FBQyx1Q0FBdUMsRUFBRSxLQUFLLElBQUksRUFBRTtZQUNyRCxHQUFHLENBQUMsV0FBVyxDQUFDLGlCQUFpQixDQUFDLEVBQUUsY0FBYyxFQUFFLGVBQWUsRUFBYyxDQUFDLENBQUM7WUFDbkYsTUFBTSxNQUFNLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDekUsd0NBQXdDLENBQ3pDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztRQUVILEVBQUUsQ0FBQyx1Q0FBdUMsRUFBRSxLQUFLLElBQUksRUFBRTtZQUNyRCxHQUFHLENBQUMsV0FBVyxDQUFDLGlCQUFpQixDQUFDLEVBQUUsY0FBYyxFQUFFLGVBQWUsRUFBYyxDQUFDLENBQUM7WUFDbkYsTUFBTSxNQUFNLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDekUsd0NBQXdDLENBQ3pDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMifQ==

package/dest/unbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbox.d.ts","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAwQ9C;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,KAAK,iBAqBX"}
+{"version":3,"file":"unbox.d.ts","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA8Q9C;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,KAAK,iBA6BX"}

package/dest/unbox.js

@@ -4,6 +4,7 @@ import fetch from 'node-fetch';
 import * as path from 'path';
 const GITHUB_OWNER = 'AztecProtocol';
 const GITHUB_REPO = 'aztec-packages';
+const GITHUB_TAG_PREFIX = 'aztec-packages';
 const NOIR_CONTRACTS_PATH = 'yarn-project/noir-contracts/src/contracts';
 const BOXES_PATH = 'yarn-project/boxes';
 /**
@@ -59,26 +60,25 @@ async function copyFolderFromGithub(data, repositoryFolderPath, localOutputPath,
  * monorepo on github.  this will copy over the `yarn-projects/boxes/{contract_name}` folder
  * as well as the specified `directoryPath` if the box doesn't include source code
  * `directoryPath` should point to a single noir contract in `yarn-projects/noir-contracts/src/contracts/...`
- * @param tagVersion - the version of the CLI that is running.  we pull from the corresponding tag in the monorepo
+ * @param tag - The git tag to pull.
  * @param directoryPath - path to a noir contract's source code (folder) in the github repo
  * @param outputPath - local path that we will copy the noir contracts and web3 starter kit to
  * @returns
  */
-async function downloadContractAndBoxFromGithub(tagVersion, contractName, outputPath, log) {
-    const tagName = `aztec-packages-v${tagVersion}`;
+async function downloadContractAndBoxFromGithub(tag, contractName, outputPath, log) {
     // small string conversion, in the ABI the contract name looks like PrivateToken
     // but in the repostory it looks like private_token
     const kebabCaseContractName = contractNameToFolder(contractName, '-');
     log(`Downloading @aztex/boxes/${kebabCaseContractName} to ${outputPath}...`);
     // Step 1: Fetch the monorepo ZIP from GitHub, matching the CLI version
-    const url = `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/archive/refs/tags/${tagName}.zip`;
+    const url = `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/archive/refs/tags/${tag}.zip`;
     const response = await fetch(url);
     const buffer = await response.arrayBuffer();
     const zip = new JSZip();
     const data = await zip.loadAsync(buffer);
     // Step 2: copy the '@aztec/boxes/{contract-name}' subpackage to the output directory
     // this is currently only implemented for PrivateToken under 'boxes/private-token/'
-    const repoDirectoryPrefix = `${GITHUB_REPO}-${tagName}`;
+    const repoDirectoryPrefix = `${GITHUB_REPO}-${tag}`;
     const boxPath = `${repoDirectoryPrefix}/${BOXES_PATH}/${kebabCaseContractName}`;
     await copyFolderFromGithub(data, boxPath, outputPath, log);
     const contractTargetDirectory = path.join(outputPath, 'src', 'contracts');
@@ -113,14 +113,15 @@ async function downloadContractAndBoxFromGithub(tagVersion, contractName, output
  * something usable by the copied standalone unboxed folder.  Adjusts relative paths
  * and package versions.
  * @param packageVersion - CLI npm version, which determines what npm version to grab
+ * @param tag - The git tag.
  * @param outputPath - relative path where we are copying everything
  * @param log - logger
  */
-async function updatePackagingConfigurations(packageVersion, outputPath, log) {
+async function updatePackagingConfigurations(packageVersion, tag, outputPath, log) {
     await updatePackageJsonVersions(packageVersion, outputPath, log);
     await updateTsConfig('tsconfig.json', outputPath, log);
     await updateTsConfig('tsconfig.dest.json', outputPath, log);
-    await updateNargoToml(packageVersion, outputPath, log);
+    await updateNargoToml(tag, outputPath, log);
 }
 /**
  * adjust the contract Nargo.toml file to use the same repository version as the npm packages
@@ -128,14 +129,14 @@ async function updatePackagingConfigurations(packageVersion, outputPath, log) {
  * @param outputPath - relative path where we are copying everything
  * @param log - logger
  */
-async function updateNargoToml(packageVersion, outputPath, log) {
+async function updateNargoToml(tag, outputPath, log) {
     const nargoTomlPath = path.join(outputPath, 'src', 'contracts', 'Nargo.toml');
     const fileContent = await fs.readFile(nargoTomlPath, 'utf-8');
     const lines = fileContent.split('\n');
-    const updatedLines = lines.map(line => line.replace(/tag="master"/g, `tag="v${packageVersion}"`));
+    const updatedLines = lines.map(line => line.replace(/tag="master"/g, `tag="${tag}"`));
     const updatedContent = updatedLines.join('\n');
     await fs.writeFile(nargoTomlPath, updatedContent);
-    log(`Updated Nargo.toml to point to local copy of noir-libs.`);
+    log(`Updated Nargo.toml to point to the compatible version of aztec noir libs.`);
 }
 /**
  * The `tsconfig.json` also needs to be updated to remove the "references" section, which
@@ -244,12 +245,19 @@ export async function unboxContract(contractName, outputDirectoryName, packageVe
         return;
     }
     const outputPath = await createDirectory(outputDirectoryName, log);
+    const tag = `${GITHUB_TAG_PREFIX}-v${packageVersion}`;
     // downloads the selected contract's relevant folder in @aztec/boxes/{contract_name}
     // and the noir source code from `noir-contracts` into `${outputDirectoryName}/src/contracts`
     // if not present in the box
-    await downloadContractAndBoxFromGithub(packageVersion, contractName, outputPath, log);
+    await downloadContractAndBoxFromGithub(tag, contractName, outputPath, log);
     // make adjustments for packaging to work as a standalone, as opposed to part of yarn workspace
     // as in the monorepo source files
-    await updatePackagingConfigurations(packageVersion, outputPath, log);
+    await updatePackagingConfigurations(packageVersion, tag, outputPath, log);
+    log('');
+    log(`${contractName} has been successfully initialised!`);
+    log('To get started, simply run the following commands:');
+    log(`    cd ${outputDirectoryName}`);
+    log('    yarn');
+    log('    yarn start:dev');
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unbox.js","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unbox.js","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@aztec/cli",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "main": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/aztec.js": "0.7.7",
-    "@aztec/ethereum": "0.7.7",
-    "@aztec/foundation": "0.7.7",
-    "@aztec/noir-compiler": "0.7.7",
-    "@aztec/noir-contracts": "0.7.7",
-    "@aztec/types": "0.7.7",
+    "@aztec/aztec.js": "0.7.8",
+    "@aztec/ethereum": "0.7.8",
+    "@aztec/foundation": "0.7.8",
+    "@aztec/noir-compiler": "0.7.8",
+    "@aztec/noir-contracts": "0.7.8",
+    "@aztec/types": "0.7.8",
     "commander": "^9.0.0",
     "jszip": "^3.10.1",
     "lodash.startcase": "^4.4.0",

package/src/client.test.ts

@@ -13,19 +13,19 @@ describe('client', () => {
     });
 
     it('checks versions match', async () => {
-      rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha47' } as NodeInfo);
+      rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha47' } as NodeInfo);
       await checkServerVersion(rpc, '0.1.0-alpha47');
     });
 
     it('reports mismatch on older rpc version', async () => {
-      rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha47' } as NodeInfo);
+      rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha47' } as NodeInfo);
       await expect(checkServerVersion(rpc, '0.1.0-alpha48')).rejects.toThrowError(
         /is older than the expected by this CLI/,
       );
     });
 
     it('reports mismatch on newer rpc version', async () => {
-      rpc.getNodeInfo.mockResolvedValue({ client: 'rpc@0.1.0-alpha48' } as NodeInfo);
+      rpc.getNodeInfo.mockResolvedValue({ sandboxVersion: '0.1.0-alpha48' } as NodeInfo);
       await expect(checkServerVersion(rpc, '0.1.0-alpha47')).rejects.toThrowError(
         /is newer than the expected by this CLI/,
       );

package/src/client.ts

@@ -51,25 +51,26 @@ class VersionMismatchError extends Error {}
  */
 export async function checkServerVersion(rpc: AztecRPC, expectedVersionRange: string) {
   const serverName = 'Aztec Sandbox';
-  const { client } = await rpc.getNodeInfo();
-  if (!client) {
+  const { sandboxVersion } = await rpc.getNodeInfo();
+  if (!sandboxVersion) {
     throw new VersionMismatchError(`Couldn't determine ${serverName} version. You may run into issues.`);
   }
-  const version = client.split('@')[1];
-  if (!version || !valid(version)) {
-    throw new VersionMismatchError(`Missing or invalid version identifier for ${serverName} (${version ?? 'empty'}).`);
-  } else if (!satisfies(version, expectedVersionRange)) {
-    if (gtr(version, expectedVersionRange)) {
+  if (!sandboxVersion || !valid(sandboxVersion)) {
+    throw new VersionMismatchError(
+      `Missing or invalid version identifier for ${serverName} (${sandboxVersion ?? 'empty'}).`,
+    );
+  } else if (!satisfies(sandboxVersion, expectedVersionRange)) {
+    if (gtr(sandboxVersion, expectedVersionRange)) {
       throw new VersionMismatchError(
-        `${serverName} is running version ${version} which is newer than the expected by this CLI (${expectedVersionRange}). Consider upgrading your CLI to a newer version.`,
+        `${serverName} is running version ${sandboxVersion} which is newer than the expected by this CLI (${expectedVersionRange}). Consider upgrading your CLI to a newer version.`,
       );
-    } else if (ltr(version, expectedVersionRange)) {
+    } else if (ltr(sandboxVersion, expectedVersionRange)) {
       throw new VersionMismatchError(
-        `${serverName} is running version ${version} which is older than the expected by this CLI (${expectedVersionRange}). Consider upgrading your ${serverName} to a newer version.`,
+        `${serverName} is running version ${sandboxVersion} which is older than the expected by this CLI (${expectedVersionRange}). Consider upgrading your ${serverName} to a newer version.`,
       );
     } else {
       throw new VersionMismatchError(
-        `${serverName} is running version ${version} which does not match the expected by this CLI (${expectedVersionRange}).`,
+        `${serverName} is running version ${sandboxVersion} which does not match the expected by this CLI (${expectedVersionRange}).`,
       );
     }
   }

package/src/unbox.ts

@@ -16,6 +16,7 @@ import * as path from 'path';
 
 const GITHUB_OWNER = 'AztecProtocol';
 const GITHUB_REPO = 'aztec-packages';
+const GITHUB_TAG_PREFIX = 'aztec-packages';
 const NOIR_CONTRACTS_PATH = 'yarn-project/noir-contracts/src/contracts';
 const BOXES_PATH = 'yarn-project/boxes';
 
@@ -77,25 +78,24 @@ async function copyFolderFromGithub(data: JSZip, repositoryFolderPath: string, l
  * monorepo on github.  this will copy over the `yarn-projects/boxes/{contract_name}` folder
  * as well as the specified `directoryPath` if the box doesn't include source code
  * `directoryPath` should point to a single noir contract in `yarn-projects/noir-contracts/src/contracts/...`
- * @param tagVersion - the version of the CLI that is running.  we pull from the corresponding tag in the monorepo
+ * @param tag - The git tag to pull.
  * @param directoryPath - path to a noir contract's source code (folder) in the github repo
  * @param outputPath - local path that we will copy the noir contracts and web3 starter kit to
  * @returns
  */
 async function downloadContractAndBoxFromGithub(
-  tagVersion: string,
+  tag: string,
   contractName: string,
   outputPath: string,
   log: LogFn,
 ): Promise<void> {
-  const tagName = `aztec-packages-v${tagVersion}`;
   // small string conversion, in the ABI the contract name looks like PrivateToken
   // but in the repostory it looks like private_token
 
   const kebabCaseContractName = contractNameToFolder(contractName, '-');
   log(`Downloading @aztex/boxes/${kebabCaseContractName} to ${outputPath}...`);
   // Step 1: Fetch the monorepo ZIP from GitHub, matching the CLI version
-  const url = `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/archive/refs/tags/${tagName}.zip`;
+  const url = `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/archive/refs/tags/${tag}.zip`;
   const response = await fetch(url);
   const buffer = await response.arrayBuffer();
 
@@ -104,7 +104,7 @@ async function downloadContractAndBoxFromGithub(
 
   // Step 2: copy the '@aztec/boxes/{contract-name}' subpackage to the output directory
   // this is currently only implemented for PrivateToken under 'boxes/private-token/'
-  const repoDirectoryPrefix = `${GITHUB_REPO}-${tagName}`;
+  const repoDirectoryPrefix = `${GITHUB_REPO}-${tag}`;
 
   const boxPath = `${repoDirectoryPrefix}/${BOXES_PATH}/${kebabCaseContractName}`;
   await copyFolderFromGithub(data, boxPath, outputPath, log);
@@ -144,14 +144,20 @@ async function downloadContractAndBoxFromGithub(
  * something usable by the copied standalone unboxed folder.  Adjusts relative paths
  * and package versions.
  * @param packageVersion - CLI npm version, which determines what npm version to grab
+ * @param tag - The git tag.
  * @param outputPath - relative path where we are copying everything
  * @param log - logger
  */
-async function updatePackagingConfigurations(packageVersion: string, outputPath: string, log: LogFn): Promise<void> {
+async function updatePackagingConfigurations(
+  packageVersion: string,
+  tag: string,
+  outputPath: string,
+  log: LogFn,
+): Promise<void> {
   await updatePackageJsonVersions(packageVersion, outputPath, log);
   await updateTsConfig('tsconfig.json', outputPath, log);
   await updateTsConfig('tsconfig.dest.json', outputPath, log);
-  await updateNargoToml(packageVersion, outputPath, log);
+  await updateNargoToml(tag, outputPath, log);
 }
 
 /**
@@ -160,14 +166,14 @@ async function updatePackagingConfigurations(packageVersion: string, outputPath:
  * @param outputPath - relative path where we are copying everything
  * @param log - logger
  */
-async function updateNargoToml(packageVersion: string, outputPath: string, log: LogFn): Promise<void> {
+async function updateNargoToml(tag: string, outputPath: string, log: LogFn): Promise<void> {
   const nargoTomlPath = path.join(outputPath, 'src', 'contracts', 'Nargo.toml');
   const fileContent = await fs.readFile(nargoTomlPath, 'utf-8');
   const lines = fileContent.split('\n');
-  const updatedLines = lines.map(line => line.replace(/tag="master"/g, `tag="v${packageVersion}"`));
+  const updatedLines = lines.map(line => line.replace(/tag="master"/g, `tag="${tag}"`));
   const updatedContent = updatedLines.join('\n');
   await fs.writeFile(nargoTomlPath, updatedContent);
-  log(`Updated Nargo.toml to point to local copy of noir-libs.`);
+  log(`Updated Nargo.toml to point to the compatible version of aztec noir libs.`);
 }
 
 /**
@@ -300,11 +306,19 @@ export async function unboxContract(
   }
   const outputPath = await createDirectory(outputDirectoryName, log);
 
+  const tag = `${GITHUB_TAG_PREFIX}-v${packageVersion}`;
   // downloads the selected contract's relevant folder in @aztec/boxes/{contract_name}
   // and the noir source code from `noir-contracts` into `${outputDirectoryName}/src/contracts`
   // if not present in the box
-  await downloadContractAndBoxFromGithub(packageVersion, contractName, outputPath, log);
+  await downloadContractAndBoxFromGithub(tag, contractName, outputPath, log);
   // make adjustments for packaging to work as a standalone, as opposed to part of yarn workspace
   // as in the monorepo source files
-  await updatePackagingConfigurations(packageVersion, outputPath, log);
+  await updatePackagingConfigurations(packageVersion, tag, outputPath, log);
+
+  log('');
+  log(`${contractName} has been successfully initialised!`);
+  log('To get started, simply run the following commands:');
+  log(`    cd ${outputDirectoryName}`);
+  log('    yarn');
+  log('    yarn start:dev');
 }