Fix merge conflicts with the matterlab's main branch.

.github/workflows/npm_publish.yaml

@@ -2,22 +2,28 @@ name: Publish to NPM
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   build:
     runs-on: [self-hosted, ci-runner]
+    environment: production release
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "18.x"
+          registry-url: "https://registry.npmjs.org"
       - name: Install dependencies and build
-        run: npm ci && npm run build
+        run: npm ci && npm run build && npm run replaceVars
+        env:
+          RUDDER_STACK_KEY: ${{ secrets.RUDDER_STACK_KEY }}
+          RUDDER_STACK_DATAPLANE_URL: ${{ secrets.RUDDER_STACK_DATAPLANE_URL }}
       - name: Publish package on NPM
         run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPMJS_NPM_MATTERLABS_AUTOMATION_TOKEN }}
+          RUDDER_STACK_KEY: ${{ secrets.RUDDER_STACK_KEY }}
+          RUDDER_STACK_DATAPLANE_URL: ${{ secrets.RUDDER_STACK_DATAPLANE_URL }}

.gitignore

@@ -7,3 +7,6 @@ typechain
 #Hardhat files
 cache
 artifacts
+
+bin
+bin/

README.md

@@ -13,11 +13,15 @@ You can install this program globally with `npm i -g zksync-cli` or run the comm
 
 ### Commands
 
+- `zksync-cli help`: Provides detailed information about each command. 
+
 - `zksync-cli create {PROJECT_NAME}`: creates a new Hardhat project in the given project name. If not provided, creates the project in the current folder, although this requires the folder to be empty.
 
-- `zksync-cli deposit`: deposits funds from L1 (Goerli testnet) to zkSync 2.0 testnet. It will ask to enter: recipient wallet, amount in ETH (eg 0.1) and the private key of the wallet you're sending the funds from.
+- `zksync-cli deposit`: deposits funds from L1 (Goerli testnet) to zkSync 2.0 testnet. It will ask to enter: network, recipient wallet, amount in ETH (eg 0.1) and the private key of the wallet you're sending the funds from.
+
+- `zksync-cli withdraw`: withdraws funds from zkSync 2.0 to L1 (Goerli testnet). It will ask to enter: network, recipient wallet, amount in ETH (eg 0.1) and the private key of the wallet you're sending the funds from.
 
-- `zksync-cli withdraw`: withdraws funds from zkSync 2.0 to L1 (Goerli testnet). It will ask to enter: recipient wallet, amount in ETH (eg 0.1) and the private key of the wallet you're sending the funds from.
+- `zksync-cli confirm-withdrawal`: confirms withdrawal of funds from zkSync 2.0 to L1 (Goerli testnet). It will ask to enter: network, withdrawal transaction address and the private key of the wallet you sent the funds from.
 
 > Both deposit and withdraw might take a couple of minutes to complete.
 
@@ -30,6 +34,12 @@ You can install this program globally with `npm i -g zksync-cli` or run the comm
   - `zksync-cli localnet help`: Display this message and quit.
   - `zksync-cli localnet wallets`: Display seeded wallet keys.
 
+### Options (flags)
+
+- `--zeek`: zeek, the dev cat, will search for an inspirational quote and provide to you at the end of any command.
+- `--l1-rpc-url`: override the default Goerli L1 rpc URL when `localnet` is selected as the network.
+- `--l2-rpc-url`: override the default zkSync testnet rpc URL when `localnet` is selected as the network.
+
 ## Developing new features
 
 ### Install and build
@@ -48,6 +58,11 @@ git push --tags
 
 Proper tests will be included soon. For now, you can test new changes locally by installing this package globably with `npm i -g`.
 
+
+### Tracking
+
+zkSync-cli tracks its usage for the single purpose of providing data so it can be improved. Data is fully anonymized. If you want to disable the tracking, set the environment variable NO_TRACKING to true.
+
 ## Official Links
 
 - [Website](https://zksync.io/)

bin/index.js

@@ -1,5 +1,14 @@
 #! /usr/bin/env node
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,29 +22,59 @@ const create_1 = __importDefault(require("./create"));
 const deposit_1 = __importDefault(require("./deposit"));
 const withdraw_1 = __importDefault(require("./withdraw"));
 const localnet_1 = __importDefault(require("./localnet"));
-const availableOptions = ['create', 'deposit', 'withdraw', 'localnet'];
+const help_1 = __importDefault(require("./help"));
+const confirm_withdraw_1 = __importDefault(require("./confirm-withdraw"));
+const zeek_1 = __importDefault(require("./zeek"));
+const availableOptions = [
+    "create",
+    "deposit",
+    "withdraw",
+    "localnet",
+    "confirm-withdraw",
+    "help",
+];
 // second argument should be the selected option
 const option = process.argv[2];
-if (!availableOptions.includes(option)) {
-    console.log(`Invalid operation. Available operations are: ${availableOptions}`);
-    process.exit(-1);
-}
-// Starts CLI
-console.log(chalk_1.default.magentaBright(figlet_1.default.textSync(`zkSync ${option}`, { horizontalLayout: 'full' })));
-switch (option) {
-    case 'create':
-        // arg 3 is the project name
-        const projectName = process.argv[3] || '.';
-        (0, create_1.default)(projectName);
-        break;
-    case 'deposit':
-        (0, deposit_1.default)();
-        break;
-    case 'withdraw':
-        (0, withdraw_1.default)();
-        break;
-    case 'localnet':
-        const subcommandName = process.argv[3] || undefined;
-        (0, localnet_1.default)(subcommandName);
-        break;
-}
+const main = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (!availableOptions.includes(option)) {
+        console.log(`Invalid operation. Available operations are: ${availableOptions}`);
+        process.exit(-1);
+    }
+    // Starts CLI
+    console.log(chalk_1.default.magentaBright(figlet_1.default.textSync(`zkSync ${option}`, { horizontalLayout: "full" })));
+    const zeekFlag = Boolean(process.argv.filter((arg) => arg === "--zeek")[0]);
+    const l1RpcUrl = String(process.argv
+        .filter((arg) => arg.startsWith("l1-rpc-url"))
+        .map((arg) => arg.split("=")[1])[0]);
+    const l2RpcUrl = String(process.argv
+        .filter((arg) => arg.startsWith("l2-rpc-url"))
+        .map((arg) => arg.split("=")[1])[0]);
+    switch (option) {
+        case "create":
+            // arg 3 is the project name
+            const projectName = process.argv[3] || ".";
+            yield (0, create_1.default)(projectName, zeekFlag);
+            break;
+        case "deposit":
+            yield (0, deposit_1.default)(zeekFlag, l1RpcUrl, l2RpcUrl);
+            break;
+        case "withdraw":
+            yield (0, withdraw_1.default)(zeekFlag, l1RpcUrl, l2RpcUrl);
+            break;
+        case "confirm-withdraw":
+            yield (0, confirm_withdraw_1.default)(zeekFlag, l1RpcUrl, l2RpcUrl);
+            break;
+        case 'localnet':
+            const subcommandName = process.argv[3] || undefined;
+            (0, localnet_1.default)(subcommandName);
+            break;
+        case "help":
+            (0, help_1.default)();
+            break;
+    }
+    if (zeekFlag) {
+        yield (0, zeek_1.default)();
+    }
+    process.exit(0);
+});
+main();