chore: lint examples

matter-labs · Dec 23, 2023 · 2a105c7 · 2a105c7
1 parent 7f47602
commit 2a105c7
Show file tree

Hide file tree

Showing 20 changed files with 99 additions and 74 deletions.
diff --git a/examples/basic-example/deploy/002_factory.ts b/examples/basic-example/deploy/002_factory.ts
@@ -39,7 +39,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {
 
     // Call the deployed contract.
     const greetingFromContract = await factoryContract.getFooName();
-    if (greetingFromContract == 'Foo') {
+    if (greetingFromContract === 'Foo') {
         console.info(chalk.green(`Successful greeting from the contract!`));
     } else {
         throw new Error(`Contract returned unexpected greeting: ${greetingFromContract}`);

diff --git a/examples/basic-example/deploy/003_account_abstraction.ts b/examples/basic-example/deploy/003_account_abstraction.ts
@@ -5,7 +5,7 @@ import { Deployer } from '@matterlabs/hardhat-zksync-deploy';
 import chalk from 'chalk';
 
 export default async function (hre: HardhatRuntimeEnvironment) {
-    //return;
+    // return;
     console.info(chalk.yellow('Running deploy script for the Account Abstraction'));
     // Initialize an Ethereum wallet.
     const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
@@ -58,15 +58,15 @@ export default async function (hre: HardhatRuntimeEnvironment) {
     aaTx = {
         ...aaTx,
         from: multisigAddress,
-        gasLimit: gasLimit,
-        gasPrice: gasPrice,
+        gasLimit,
+        gasPrice,
         chainId: (await provider.getNetwork()).chainId,
         nonce: await provider.getTransactionCount(multisigAddress),
         type: 113,
         customData: {
             gasPerPubdata: zk.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
         } as zk.types.Eip712Meta,
-        value: ethers.toBigInt(0)
+        value: ethers.toBigInt(0),
     };
     const signedTxHash = zk.EIP712Signer.getSignedDigest(aaTx);
 
@@ -84,17 +84,16 @@ export default async function (hre: HardhatRuntimeEnvironment) {
 
     console.log(`The multisig's nonce before the first tx is ${await provider.getTransactionCount(multisigAddress)}`);
 
-    const serialized = zk.utils.serializeEip712(aaTx)
-   
+    const serialized = zk.utils.serializeEip712(aaTx);
+
     const tx = await provider.broadcastTransaction(serialized);
     await tx.wait();
-    
+
     console.log(`The multisig's nonce after the first tx is ${await provider.getTransactionCount(multisigAddress)}`);
     const greetingFromContract = await greeterContract.greet();
     if (greetingFromContract === newGreeting) {
         console.info(chalk.green('Successfully initiated tx from deployed multisig!'));
     } else {
         throw new Error(`Contract said something unexpected: ${greetingFromContract}`);
     }
-
 }
diff --git a/examples/node-example/package.json b/examples/node-example/package.json
@@ -25,14 +25,14 @@
     "eslint-plugin-import": "2.29.0",
     "eslint-plugin-no-only-tests": "3.1.0",
     "eslint-plugin-prettier": "5.0.1",
-    "chai": "^4.3.7",
     "mocha": "^10.1.0",
     "prettier": "3.1.0",
     "rimraf": "^3.0.2",
     "ts-node": "^10.6.0",
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "chai": "^4.3.7",
     "@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",

diff --git a/examples/node-example/test/tests.ts b/examples/node-example/test/tests.ts
@@ -1,13 +1,13 @@
-import { expect } from "chai";
-import { Wallet, Provider,Contract } from "zksync-ethers";
-import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
+import { expect } from 'chai';
+import { Wallet, Provider, Contract } from 'zksync-ethers';
+import { Deployer } from '@matterlabs/hardhat-zksync-deploy';
 import { ZkSyncArtifact } from '@matterlabs/hardhat-zksync-deploy/src/types';
-import "@matterlabs/hardhat-zksync-node/dist/type-extensions";
-import * as hre from "hardhat";
+import '@matterlabs/hardhat-zksync-node/dist/type-extensions';
+import * as hre from 'hardhat';
 
 const RICH_PRIVATE_KEY = '0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110';
 
-describe("Greeter", function () {
+describe('Greeter', function () {
     let provider: Provider;
     let deployer: Deployer;
     let artifact: ZkSyncArtifact;
@@ -22,20 +22,20 @@ describe("Greeter", function () {
     });
 
     // Test the constructor
-    it("Should set the greeting to the constructor argument", async function () {
-        expect(await contract.greet()).to.equal("Hello, world!");
+    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!");
+    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 () {
-        //Added for preveting nonce errors.
-        await new Promise(resolve => setTimeout(resolve, 1000));
-        await contract.setGreeting("Hello, Ethereum!");
-        expect(await contract.greet()).to.equal("Hello, Ethereum!");
+    it('Should set a new greeting', async function () {
+        // Added for preveting nonce errors.
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await contract.setGreeting('Hello, Ethereum!');
+        expect(await contract.greet()).to.equal('Hello, Ethereum!');
     });
 });
diff --git a/examples/noninline-libraries-example/deploy/001_deploy.ts b/examples/noninline-libraries-example/deploy/001_deploy.ts
@@ -8,7 +8,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {
     console.info(chalk.yellow(`Running deploy script for the Test contract`));
 
     // Create zkWallet object
-    const zkWallet = new zk.Wallet("0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110");
+    const zkWallet = new zk.Wallet('0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110');
 
     // // Create deployer object and load desired artifact.
     const deployer = new Deployer(hre, zkWallet);
@@ -23,4 +23,4 @@ export default async function (hre: HardhatRuntimeEnvironment) {
     // Show the contract info.
     const contractAddress = await greeterContract.getAddress();
     console.info(chalk.green(`${artifact.contractName} was deployed to ${contractAddress}!`));
-};
+}
diff --git a/examples/upgradable-example/package.json b/examples/upgradable-example/package.json
@@ -24,18 +24,20 @@
     "eslint-plugin-import": "2.29.0",
     "eslint-plugin-no-only-tests": "3.1.0",
     "eslint-plugin-prettier": "5.0.1",
-    "hardhat": "^2.19.2",
     "prettier": "3.1.0",
     "rimraf": "^3.0.2",
     "ts-node": "^10.6.0",
-    "typescript": "^5.1.6",
-    "zksync-ethers":"^6.0.0"
+    "typescript": "^5.1.6"
   },
   "dependencies": {
+    "zksync-ethers":"^6.0.0",
+    "hardhat": "^2.19.2",
     "@matterlabs/hardhat-zksync-deploy": "link:../../packages/hardhat-zksync-deploy",
     "@matterlabs/hardhat-zksync-solc": "link:../../packages/hardhat-zksync-solc",
     "@matterlabs/hardhat-zksync-upgradable": "link:../../packages/hardhat-zksync-upgradable",
     "@matterlabs/hardhat-zksync-verify": "link:../../packages/hardhat-zksync-verify",
+    "chalk": "4.1.2",
+    "ethers": "^6.7.1",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",
     "zksync": "^0.13.1"
   },

diff --git a/examples/upgradable-example/scripts/deploy-box-beacon.ts b/examples/upgradable-example/scripts/deploy-box-beacon.ts
@@ -6,7 +6,7 @@ import * as hre from 'hardhat';
 
 async function main() {
     const contractName = 'Box';
-    console.info(chalk.yellow('Deploying ' + contractName + '...'));
+    console.info(chalk.yellow(`Deploying ${contractName}...`));
 
     const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
     const zkWallet = Wallet.fromMnemonic(testMnemonic);

diff --git a/examples/upgradable-example/scripts/deploy-box-proxy.ts b/examples/upgradable-example/scripts/deploy-box-proxy.ts
@@ -6,7 +6,7 @@ import * as hre from 'hardhat';
 
 async function main() {
     const contractName = 'Box';
-    console.info(chalk.yellow('Deploying ' + contractName + '...'));
+    console.info(chalk.yellow(`Deploying ${contractName}...`));
 
     const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
     const zkWallet = Wallet.fromMnemonic(testMnemonic);

diff --git a/examples/upgradable-example/scripts/deploy-box-uups.ts b/examples/upgradable-example/scripts/deploy-box-uups.ts
@@ -6,7 +6,7 @@ import * as hre from 'hardhat';
 
 async function main() {
     const contractName = 'BoxUups';
-    console.info(chalk.yellow('Deploying ' + contractName + '...'));
+    console.info(chalk.yellow(`Deploying ${contractName}...`));
 
     const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
     const zkWallet = Wallet.fromMnemonic(testMnemonic);

diff --git a/examples/upgradable-example/scripts/upgrade-box-beacon.ts b/examples/upgradable-example/scripts/upgrade-box-beacon.ts
@@ -3,7 +3,7 @@ import { Wallet } from 'zksync-ethers';
 import * as zk from 'zksync-ethers';
 import chalk from 'chalk';
 import * as hre from 'hardhat';
-import {Contract} from 'ethers'
+import { Contract } from 'ethers';
 
 async function main() {
     const testMnemonic = 'stuff slice staff easily soup parent arm payment cotton trade scatter struggle';
@@ -16,26 +16,25 @@ async function main() {
     const contract = await deployer.loadArtifact(contractName);
     const beacon = await hre.zkUpgrades.deployBeacon(deployer.zkWallet, contract);
     await beacon.waitForDeployment();
-    
+
     const beaconAddress = await beacon.getAddress();
 
-    const boxBeaconProxy = await hre.zkUpgrades.deployBeaconProxy(deployer.zkWallet,beaconAddress, contract, [42]);
+    const boxBeaconProxy = await hre.zkUpgrades.deployBeaconProxy(deployer.zkWallet, beaconAddress, contract, [42]);
     await boxBeaconProxy.waitForDeployment();
 
     // upgrade beacon
 
     const boxV2Implementation = await deployer.loadArtifact('BoxV2');
-    await hre.zkUpgrades.upgradeBeacon(deployer.zkWallet,beaconAddress, boxV2Implementation);
-    console.info(chalk.green('Successfully upgraded beacon Box to BoxV2 on address: ',beaconAddress));
+    await hre.zkUpgrades.upgradeBeacon(deployer.zkWallet, beaconAddress, boxV2Implementation);
+    console.info(chalk.green('Successfully upgraded beacon Box to BoxV2 on address: ', beaconAddress));
 
-    const attachTo = new zk.ContractFactory<any[],Contract>(
+    const attachTo = new zk.ContractFactory<any[], Contract>(
         boxV2Implementation.abi,
         boxV2Implementation.bytecode,
         deployer.zkWallet,
-        deployer.deploymentType
+        deployer.deploymentType,
     );
-    const upgradedBox =  attachTo.attach(await boxBeaconProxy.getAddress());
-
+    const upgradedBox = attachTo.attach(await boxBeaconProxy.getAddress());
 
     upgradedBox.connect(zkWallet);
     // wait some time before the next call

diff --git a/examples/verify-example/test/helpers.ts b/examples/verify-example/test/helpers.ts
@@ -1,13 +1,12 @@
-import { TASK_COMPILE } from "@matterlabs/hardhat-zksync-verify/dist/src/constants";
+import { TASK_COMPILE } from '@matterlabs/hardhat-zksync-verify/dist/src/constants';
 import { resetHardhatContext } from 'hardhat/plugins-testing';
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 export const MOCK_ADDRESS = '0x110eb1e16A63c608787236E728Fa1817C72e6950';
 export const WRONG_NUMBER_OF_CONSTRUCTOR_ARGUMENTS_ERROR =
     'The number of constructor arguments you provided (0) does not match the number of constructor arguments the contract has been deployed with (1).';
 export const CONTRACT_ALREADY_VERIFIED_ERROR = 'This contract is already verified';
 
-
 declare module 'mocha' {
     interface Context {
         env: HardhatRuntimeEnvironment;
@@ -25,4 +24,4 @@ export function useEnvironment(networkName = 'testnet') {
     after('Resetting hardhat', function () {
         resetHardhatContext();
     });
-}
+}
diff --git a/examples/verify-example/test/tests.ts b/examples/verify-example/test/tests.ts
@@ -1,10 +1,13 @@
 import assert from 'assert';
-import {
-    TASK_CHECK_VERIFICATION_STATUS,
-} from '@matterlabs/hardhat-zksync-verify/dist/src/constants';
+import { TASK_CHECK_VERIFICATION_STATUS } from '@matterlabs/hardhat-zksync-verify/dist/src/constants';
 
 import chalk from 'chalk';
-import { CONTRACT_ALREADY_VERIFIED_ERROR, MOCK_ADDRESS, WRONG_NUMBER_OF_CONSTRUCTOR_ARGUMENTS_ERROR, useEnvironment } from './helpers';
+import {
+    CONTRACT_ALREADY_VERIFIED_ERROR,
+    MOCK_ADDRESS,
+    WRONG_NUMBER_OF_CONSTRUCTOR_ARGUMENTS_ERROR,
+    useEnvironment,
+} from './helpers';
 
 describe('verify plugin', async function () {
     const testnetVerifyURL = 'https://explorer.sepolia.era.zksync.dev/contract_verification';
@@ -49,7 +52,7 @@ describe('verify plugin', async function () {
                 constructorArguments: constructorArgs,
             });
 
-            const success = await this.env.run(TASK_CHECK_VERIFICATION_STATUS, { verificationId: verificationId });
+            const success = await this.env.run(TASK_CHECK_VERIFICATION_STATUS, { verificationId });
 
             assert.equal(success, true);
         });
@@ -114,7 +117,10 @@ describe('verify plugin', async function () {
             const contractName = 'MintingContract';
 
             const factoryContract = await this.env.zksyncEthers.getContractFactory(contractName);
-            const contract = await factoryContract.deploy('ContractName', 'ContractSymbol', MOCK_ADDRESS, [MOCK_ADDRESS, MOCK_ADDRESS]);
+            const contract = await factoryContract.deploy('ContractName', 'ContractSymbol', MOCK_ADDRESS, [
+                MOCK_ADDRESS,
+                MOCK_ADDRESS,
+            ]);
 
             this.deployedAddress = await contract.getAddress();
             console.info(chalk.green(`${contractName} was deployed to ${this.deployedAddress}`));
@@ -130,7 +136,7 @@ describe('verify plugin', async function () {
                 constructorArguments: constructorArgs,
             });
 
-            const success = await this.env.run(TASK_CHECK_VERIFICATION_STATUS, { verificationId: verificationId });
+            const success = await this.env.run(TASK_CHECK_VERIFICATION_STATUS, { verificationId });
 
             assert.equal(success, true);
         });
@@ -179,4 +185,4 @@ describe('verify plugin', async function () {
             console.log('Verification ID: ', verificationId);
         });
     });
-});
+});
diff --git a/examples/verify-vyper-example/package.json b/examples/verify-vyper-example/package.json
@@ -18,6 +18,7 @@
     "@typescript-eslint/eslint-plugin": "6.13.1",
     "@typescript-eslint/parser": "6.13.1",
     "eslint": "^8.54.0",
+    "chalk": "4.1.2",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-import": "2.29.0",
     "eslint-plugin-no-only-tests": "3.1.0",
@@ -30,7 +31,9 @@
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "link:../../packages/hardhat-zksync-deploy",
     "@matterlabs/hardhat-zksync-vyper": "link:../../packages/hardhat-zksync-vyper",
+    "@matterlabs/hardhat-zksync-verify": "link:../../packages/hardhat-zksync-verify",
     "@matterlabs/hardhat-zksync-verify-vyper": "link:../../packages/hardhat-zksync-verify-vyper",
+    "chalk": "4.1.2",
     "@nomiclabs/hardhat-vyper": "^3.0.5",
     "ethers": "^6.7.1",
     "hardhat": "^2.19.2"

diff --git a/examples/verify-vyper-example/test/helpers.ts b/examples/verify-vyper-example/test/helpers.ts
@@ -1,13 +1,12 @@
-import { TASK_COMPILE } from "@matterlabs/hardhat-zksync-verify/dist/src/constants";
+import { TASK_COMPILE } from '@matterlabs/hardhat-zksync-verify/dist/src/constants';
 import { resetHardhatContext } from 'hardhat/plugins-testing';
-import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 export const MOCK_ADDRESS = '0x110eb1e16A63c608787236E728Fa1817C72e6950';
 export const WRONG_NUMBER_OF_CONSTRUCTOR_ARGUMENTS_ERROR =
     'The number of constructor arguments you provided (2) does not match the number of constructor arguments the contract has been deployed with (0).';
 export const CONTRACT_ALREADY_VERIFIED_ERROR = 'This contract is already verified';
 
-
 declare module 'mocha' {
     interface Context {
         env: HardhatRuntimeEnvironment;
@@ -25,4 +24,4 @@ export function useEnvironment(networkName = 'testnet') {
     after('Resetting hardhat', function () {
         resetHardhatContext();
     });
-}
+}