update: upgradable dep fix

.github/workflows/ci.yml

@@ -88,6 +88,12 @@ jobs:
           yarn hardhat compile
           yarn hardhat deploy-zksync
 
+      - name: Test node example
+        run: |
+          cd examples/node-example
+          yarn hardhat compile
+          yarn hardhat test
+
       - name: Test zkvyper example
         run: |
           cd examples/vyper-example

.github/workflows/publish-node.yaml

@@ -0,0 +1,59 @@
+name: Publish Node Plugin
+
+on:
+  push:
+    tags:
+      - '@matterlabs/hardhat-zksync-node@*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
+
+      - name: Setup environment
+        run: yarn && yarn build
+
+      - name: Publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPMJS_NPM_MATTERLABS_AUTOMATION_TOKEN }}
+        run: |
+          if [[ ${{ github.ref }} == *"beta"* ]]; then
+            echo "Publishing package with beta tag"
+            npm publish @matterlabs/hardhat-zksync-node --tag beta --workspace=packages/hardhat-zksync-node --access=public
+          elif [[ ${{ github.ref }} == *"alpha"* ]]; then
+            echo "Publishing package with alpha tag"
+            npm publish @matterlabs/hardhat-zksync-node --tag alpha --workspace=packages/hardhat-zksync-node --access=public
+          else
+            echo "Publishing package with latest tag"
+            npm publish @matterlabs/hardhat-zksync-node --tag latest --workspace=packages/hardhat-zksync-node --access=public
+          fi
+
+      - name: Create github release from tags
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [[ ${{ github.ref }} != *"beta"* ]] && [[ ${{ github.ref }} != *"alpha"* ]]; then
+            node scripts/create-release-from-tags/run.js --package hardhat-zksync-node
+          else
+            echo "Skipping github release creation for beta and alpha tags"
+          fi
+
+      - name: Create the MM Message
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh -R matter-labs/hardhat-zksync release view "$GITHUB_REF_NAME" --json tagName,body --template '## {{.tagName}} {{"\n"}}{{.body}}' > ./release_info
+          jq --null-input --arg text "$(cat ./release_info)" '{"text": $text}' > mattermost.json
+
+      - uses: mattermost/action-mattermost-notify@master
+        env:
+          MATTERMOST_USERNAME: "Hardhat Release Bot"
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_URL }}
+

config/typescript/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-      "target": "ES2017",
+      "target": "ES2021",
       "module": "commonjs",
       "declaration": true,
       "declarationMap": true,

examples/node-example/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: [`${__dirname}/../../config/eslint/eslintrc.js`],
+  parserOptions: {
+    project: `${__dirname}/tsconfig.json`,
+    sourceType: "module",
+  },
+};

examples/node-example/.gitignore

@@ -0,0 +1,3 @@
+cache
+artifacts
+contracts/tmp

examples/node-example/README.md

@@ -0,0 +1,61 @@
+# zkSync 2.0 deploy environment example
+
+This project demonstrates how to compile and deploy your contracts in zkSync 2.0 using the Hardhat plugins.
+
+## Prerequisites
+
+- node.js 14.x or later.
+- yarn.
+
+## Configuration
+
+Plugin configuration is located in [`hardhat.config.ts`](./hardhat.config.ts).
+You should only change the zkSync network configuration.
+
+`hardhat.config.ts` example with zkSync network configured with the name `zkTestnet` and `goerli` used as the underlying layer 1 network:
+```ts
+import "@matterlabs/hardhat-zksync-deploy";
+import { HardhatUserConfig } from 'hardhat/types';
+
+const config: HardhatUserConfig = {
+    networks: {
+        goerli: {
+            url: 'https://goerli.infura.io/v3/<API_KEY>' // you can use either the URL of the Ethereum Web3 RPC, or the identifier of the network (e.g. `mainnet` or `rinkeby`)
+        },
+        zkTestnet: {
+            url: 'https://zksync2-testnet.zksync.dev', // you should use the URL of the zkSync network RPC
+            ethNetwork: 'goerli',
+            zksync: true
+        },
+    }
+};
+
+export default config;
+```
+
+## Usage
+
+Before using plugins, you need to build them first
+
+```sh
+# Run the following in the *root* of the repo.
+yarn
+yarn build
+```
+
+After that you should be able to run plugins:
+
+```sh
+# Run the following in `examples/basic-example` folder.
+yarn
+yarn hardhat compile
+yarn hardhat deploy-zksync
+```
+
+- `yarn hardhat compile`: compiles all the contracts in the `contracts` folder.
+- `yarn hardhat deploy-zksync`: runs all the deploy scripts in the `deploy` folder.
+    - To run a specific script, add the `--script` argument, e.g. `--script 001_deploy.ts`.
+    - To run on a specific zkSync network, use standard hardhat `--network` argument, e.g. `--network zkTestnet`
+    (with `zkTestnet` network specified in the `hardhat.config` networks section, with the `zksync` flag set to `true` and `ethNetwork` specified).
+
+If you don't specify zkSync network (`--network`), `local-setup` with <http://localhost:8545> (Ethereum RPC URL) and <http://localhost:3050> (zkSync RPC URL) will be used.

examples/node-example/contracts/Greeter.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+pragma abicoder v2;
+
+contract Greeter {
+    string greeting;
+    constructor(string memory _greeting) {
+        greeting = _greeting;
+    }
+
+    function greet() public view returns (string memory) {
+        return greeting;
+    }
+
+    function setGreeting(string memory _greeting) public {
+        greeting = _greeting;
+    }
+}

examples/node-example/deploy/001_deploy.js

@@ -0,0 +1,44 @@
+const ethers = require('ethers');
+const zk = require('zksync-web3');
+const { Deployer } = require('@matterlabs/hardhat-zksync-deploy');
+const chalk = require('chalk');
+
+// An example of a deploy script which will deploy and call a simple contract.
+module.exports = async function (hre) {
+    console.info(chalk.yellow(`Running deploy script for the Greeter contract`));
+
+    // Initialize an Ethereum wallet.
+    const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
+    const zkWallet = zk.Wallet.fromMnemonic(testMnemonic, "m/44'/60'/0'/0/0");
+
+    // Create deployer object and load desired artifact.
+    const deployer = new Deployer(hre, zkWallet);
+
+    // Deposit some funds to L2 in order to be able to perform deposits.
+    const depositHandle = await deployer.zkWallet.deposit({
+        to: deployer.zkWallet.address,
+        token: zk.utils.ETH_ADDRESS,
+        amount: ethers.utils.parseEther('0.001'),
+    });
+    await depositHandle.wait();
+
+    // Load the artifact we want to deploy.
+    const artifact = await deployer.loadArtifact('Greeter');
+
+    // Deploy this contract. The returned object will be of a `Contract` type, similarly to ones in `ethers`.
+    // `greeting` is an argument for contract constructor.
+    const greeting = 'Hi there!';
+    const greeterContract = await deployer.deploy(artifact, [greeting]);
+
+    // Show the contract info.
+    const contractAddress = greeterContract.address;
+    console.info(chalk.green(`${artifact.contractName} was deployed to ${contractAddress}!`));
+
+    // Call the deployed contract.
+    const greetingFromContract = await greeterContract.greet();
+    if (greetingFromContract == greeting) {
+        console.info(chalk.green(`Successful greeting from the contract`));
+    } else {
+        throw new Error(`Contract returned unexpected greeting: ${greetingFromContract}`);
+    }
+};

examples/node-example/hardhat.config.ts

@@ -0,0 +1,37 @@
+import '@matterlabs/hardhat-zksync-deploy';
+import '@matterlabs/hardhat-zksync-solc';
+import '@matterlabs/hardhat-zksync-node';
+
+import { HardhatUserConfig } from 'hardhat/config';
+
+const config: HardhatUserConfig = {
+    zksolc: {
+        compilerSource: 'binary',
+        settings: {
+            isSystem: true,
+            optimizer: {
+                enabled: true,
+            },
+        }
+    },
+    networks: {
+        hardhat: {
+            zksync: true,
+        },
+        ethNetwork: {
+            url: 'http://0.0.0.0:8545',
+        },
+        zkSyncNetwork: {
+            url: 'http://0.0.0.0:3050',
+            ethNetwork: 'ethNetwork',
+            zksync: true,
+        },
+    },
+    // Docker image only works for solidity ^0.8.0.
+    // For earlier versions you need to use binary releases of zksolc.
+    solidity: {
+        version: '0.8.17',
+    },
+};
+
+export default config;

examples/node-example/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "harhat-zksync-example-node",
+  "version": "0.1.0",
+  "author": "Matter Labs",
+  "license": "MIT",
+  "scripts": {
+    "lint": "yarn prettier --check && yarn eslint",
+    "lint:fix": "yarn eslint --fix",
+    "fmt": "yarn prettier --write",
+    "eslint": "eslint deploy/*.ts",
+    "prettier": "prettier deploy/*.ts",
+    "test": "mocha test/tests.ts --exit",
+    "build": "tsc --build .",
+    "clean": "rimraf dist"
+  },
+  "devDependencies": {
+    "@types/node": "^18.11.17",
+    "@types/chai": "^4.2.0",
+    "@types/mocha": "^9.1.0",
+    "@typescript-eslint/eslint-plugin": "4.29.2",
+    "@typescript-eslint/parser": "5.13.0",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-prettier": "3.4.0",
+    "chai": "^4.3.7",
+    "mocha": "^10.1.0",
+    "prettier": "2.3.2",
+    "rimraf": "^3.0.2",
+    "ts-node": "^10.6.0",
+    "typescript": "^4.6.2"
+  },
+  "dependencies": {
+    "@matterlabs/hardhat-zksync-deploy": "link:../../packages/hardhat-zksync-deploy",
+    "@matterlabs/hardhat-zksync-solc": "link:../../packages/hardhat-zksync-solc",
+    "@matterlabs/hardhat-zksync-node": "link:../../packages/hardhat-zksync-node",
+    "@matterlabs/hardhat-zksync-chai-matchers": "link:../../packages/hardhat-zksync-chai-matchers",
+    "chalk": "4.1.2",
+    "hardhat": "^2.14.0",
+    "ethers": "~5.7.2",
+    "zksync-web3": "^0.14.3",
+    "@matterlabs/zksync-contracts": "^0.6.1",
+    "@openzeppelin/contracts": "^4.9.2",
+    "@openzeppelin/contracts-upgradeable": "^4.9.2"
+  },
+  "prettier": {
+    "tabWidth": 4,
+    "printWidth": 120,
+    "parser": "typescript",
+    "singleQuote": true,
+    "bracketSpacing": true
+  }
+}

examples/node-example/test/tests.ts

@@ -0,0 +1,35 @@
+import { expect } from "chai";
+import { Contract, Wallet } from "zksync-web3";
+import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
+import { ZkSyncArtifact } from '@matterlabs/hardhat-zksync-deploy/src/types';
+import { ZkSyncProviderAdapter } from "@matterlabs/hardhat-zksync-node";
+import * as hre from "hardhat";
+
+describe("Greeter", function () {
+    let deployer: Deployer;
+    let artifact: ZkSyncArtifact;
+    let contract: Contract;
+
+    beforeEach(async function () {
+        // Deploy the contract before each test
+        deployer = new Deployer(hre, new Wallet('0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110', (hre.network.provider as ZkSyncProviderAdapter)._zkSyncProvider));
+        artifact = await deployer.loadArtifact('Greeter');
+        contract = await deployer.deploy(artifact, ['Hello, world!']);
+    });
+
+    // Test the constructor
+    it("Should set the greeting to the constructor argument", async function () {
+        expect(await contract.greet()).to.equal("Hello, world!");
+    });
+
+    // Test the greet() function
+    it("Should return the current greeting", async function () {
+        expect(await contract.greet()).to.equal("Hello, world!");
+    });
+
+    // Test the setGreeting() function
+    it("Should set a new greeting", async function () {
+        await contract.setGreeting("Hello, Ethereum!");
+        expect(await contract.greet()).to.equal("Hello, Ethereum!");
+    });
+});

examples/node-example/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "dist"
+  },
+  "include": [
+    "./hardhat.config.ts",
+    "./scripts",
+    "./deploy",
+    "./test",
+    "typechain/**/*"
+  ]
+}

package.json

@@ -18,8 +18,8 @@
     "wsrun": "^5.2.2"
   },
   "scripts": {
-    "build": "tsc --build packages/hardhat-zksync-solc packages/hardhat-zksync-deploy packages/hardhat-zksync-vyper packages/hardhat-zksync-chai-matchers packages/hardhat-zksync-verify packages/hardhat-zksync-toolbox packages/hardhat-zksync-upgradable packages/hardhat-zksync-verify-vyper",
-    "watch": "tsc --build --watch packages/hardhat-zksync-solc packages/hardhat-zksync-deploy packages/hardhat-zksync-vyper packages/hardhat-zksync-chai-matchers packages/hardhat-zksync-verify packages/hardhat-zksync-toolbox packages/hardhat-zksync-upgradable packages/hardhat-zksync-verify-vyper",
+    "build": "tsc --build packages/hardhat-zksync-solc packages/hardhat-zksync-deploy packages/hardhat-zksync-vyper packages/hardhat-zksync-chai-matchers packages/hardhat-zksync-verify packages/hardhat-zksync-toolbox packages/hardhat-zksync-upgradable packages/hardhat-zksync-verify-vyper packages/hardhat-zksync-node packages/hardhat-zksync-zksync2js",
+    "watch": "tsc --build --watch packages/hardhat-zksync-solc packages/hardhat-zksync-deploy packages/hardhat-zksync-vyper packages/hardhat-zksync-chai-matchers packages/hardhat-zksync-verify packages/hardhat-zksync-toolbox packages/hardhat-zksync-upgradable packages/hardhat-zksync-verify-vyper packages/hardhat-zksync-node packages/hardhat-zksync-zksync2js",
     "clean": "wsrun --exclude-missing clean",
     "lint": "wsrun --exclude-missing --stages lint",
     "lint:fix": "wsrun --exclude-missing --stages lint:fix",

packages/hardhat-zksync-chai-matchers/package.json

@@ -52,7 +52,7 @@
     "eslint-config-prettier": "8.4.0",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-prettier": "4.0.0",
-    "ethers": "^5.7.2",
+    "ethers": "~5.7.2",
     "hardhat": "^2.14.0",
     "mocha": "^10.1.0",
     "prettier": "2.5.1",

packages/hardhat-zksync-node/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: [`${__dirname}/../../config/eslint/eslintrc.js`],
+  parserOptions: {
+    project: `${__dirname}/tsconfig.json`,
+    sourceType: "module",
+  },
+};