diff --git a/code/webauthn/contracts/deploy/deploy.ts b/code/webauthn/contracts/deploy/deploy.ts index 1ed16db6..13987aed 100644 --- a/code/webauthn/contracts/deploy/deploy.ts +++ b/code/webauthn/contracts/deploy/deploy.ts @@ -1,6 +1,6 @@ import { utils, Wallet, Provider } from 'zksync-ethers'; import type { HardhatRuntimeEnvironment } from 'hardhat/types'; -import { Deployer } from '@matterlabs/hardhat-zksync-deploy'; +import { Deployer } from '@matterlabs/hardhat-zksync'; // load env file import dotenv from 'dotenv'; import { ethers } from 'ethers'; diff --git a/code/webauthn/contracts/hardhat.config.ts b/code/webauthn/contracts/hardhat.config.ts index adddb038..8e9e409e 100644 --- a/code/webauthn/contracts/hardhat.config.ts +++ b/code/webauthn/contracts/hardhat.config.ts @@ -1,9 +1,6 @@ import type { HardhatUserConfig } from 'hardhat/config'; -import '@matterlabs/hardhat-zksync-node'; -import '@matterlabs/hardhat-zksync-deploy'; -import '@matterlabs/hardhat-zksync-solc'; -import '@matterlabs/hardhat-zksync-verify'; +import '@matterlabs/hardhat-zksync'; const config: HardhatUserConfig = { defaultNetwork: 'inMemoryNode', diff --git a/code/webauthn/contracts/package-lock.json b/code/webauthn/contracts/package-lock.json index 708b762c..d9d71c54 100644 --- a/code/webauthn/contracts/package-lock.json +++ b/code/webauthn/contracts/package-lock.json @@ -8,7 +8,6 @@ "license": "MIT", "devDependencies": { "@matterlabs/hardhat-zksync": "^1.1.0", - "@matterlabs/hardhat-zksync-deploy": "^1.3.0", "@matterlabs/zksync-contracts": "^0.6.1", "@nomicfoundation/hardhat-verify": "^2.0.9", "@openzeppelin/contracts": "^4.9.5", @@ -604,59 +603,6 @@ "@matterlabs/hardhat-zksync-verify": "^1.5.0" } }, - "node_modules/@matterlabs/hardhat-zksync-deploy": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-1.3.0.tgz", - "integrity": "sha512-4UHOgOwIBC4JA3W8DE9GHqbAuBhCPAjtM+Oew1aiYYGkIsPUAMYsH35+4I2FzJsYyE6mD6ATmoS/HfZweQHTlQ==", - "dev": true, - "dependencies": { - "@matterlabs/hardhat-zksync-solc": "^1.0.4", - "chai": "^4.3.6", - "chalk": "4.1.2", - "fs-extra": "^11.2.0", - "glob": "^10.3.10", - "lodash": "^4.17.21", - "sinon": "^17.0.1", - "sinon-chai": "^3.7.0", - "ts-morph": "^21.0.1" - }, - "peerDependencies": { - "ethers": "^6.7.1", - "hardhat": "^2.19.4", - "zksync-ethers": "^6.0.0" - } - }, - "node_modules/@matterlabs/hardhat-zksync-deploy/node_modules/nise": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", - "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/text-encoding": "^0.7.2", - "just-extend": "^6.2.0", - "path-to-regexp": "^6.2.1" - } - }, - "node_modules/@matterlabs/hardhat-zksync-deploy/node_modules/sinon": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.1.tgz", - "integrity": "sha512-wmwE19Lie0MLT+ZYNpDymasPHUKTaZHUH/pKEubRXIzySv9Atnlw+BUMGCzWgV7b7wO+Hw6f1TEOr0IUnmU8/g==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.5", - "supports-color": "^7.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" - } - }, "node_modules/@matterlabs/hardhat-zksync-ethers": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@matterlabs/hardhat-zksync-ethers/-/hardhat-zksync-ethers-1.1.0.tgz", @@ -2061,18 +2007,6 @@ "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", "dev": true }, - "node_modules/@ts-morph/common": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.22.0.tgz", - "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==", - "dev": true, - "dependencies": { - "fast-glob": "^3.3.2", - "minimatch": "^9.0.3", - "mkdirp": "^3.0.1", - "path-browserify": "^1.0.1" - } - }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", @@ -2860,12 +2794,6 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/code-block-writer": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz", - "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==", - "dev": true - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -6410,16 +6338,6 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true }, - "node_modules/ts-morph": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-21.0.1.tgz", - "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==", - "dev": true, - "dependencies": { - "@ts-morph/common": "~0.22.0", - "code-block-writer": "^12.0.0" - } - }, "node_modules/ts-node": { "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", diff --git a/code/webauthn/contracts/package.json b/code/webauthn/contracts/package.json index ebe33c3e..c28354cd 100644 --- a/code/webauthn/contracts/package.json +++ b/code/webauthn/contracts/package.json @@ -17,7 +17,6 @@ }, "devDependencies": { "@matterlabs/hardhat-zksync": "^1.1.0", - "@matterlabs/hardhat-zksync-deploy": "^1.3.0", "@matterlabs/zksync-contracts": "^0.6.1", "@nomicfoundation/hardhat-verify": "^2.0.9", "@openzeppelin/contracts": "^4.9.5", diff --git a/content/tutorials/signing-transactions-with-webauthn/20.building-the-contracts.md b/content/tutorials/signing-transactions-with-webauthn/20.building-the-contracts.md index a68815d6..dac2aef7 100644 --- a/content/tutorials/signing-transactions-with-webauthn/20.building-the-contracts.md +++ b/content/tutorials/signing-transactions-with-webauthn/20.building-the-contracts.md @@ -35,30 +35,13 @@ Enter the private key below for a pre-configured rich wallet: :test-action{actionId="add-env-pk"} -Once that is done, move into the `contracts` folders and -install the dependency below: - -:test-action{actionId="install-deps"} - -::code-group - -```bash [npm] -cd contracts -npm install -D @matterlabs/hardhat-zksync-deploy@1.3.0 -``` - -```bash [yarn] -cd contracts -yarn add -D @matterlabs/hardhat-zksync-deploy@1.3.0 -``` - -:: - -Then, delete the template contracts, scripts, and tests: +Once that is done, move into the `contracts` folder +and delete the template contracts, scripts, and tests: :test-action{actionId="remove-template-files"} ```shell +cd contracts rm -rf ./contracts/* rm -rf ./deploy/* rm -rf ./test/* diff --git a/tests/configs/signing-txns-with-webauthn.ts b/tests/configs/signing-txns-with-webauthn.ts index 59042fff..7e54114e 100644 --- a/tests/configs/signing-txns-with-webauthn.ts +++ b/tests/configs/signing-txns-with-webauthn.ts @@ -20,17 +20,9 @@ const contractSteps: IStepConfig = { atLine: 1, removeLines: [1], }, - 'install-deps': { - action: 'runCommand', - commandFolder: 'tests-output/zksync-webauthn', - }, - 'wait-for-install': { - action: 'wait', - timeout: 5000, - }, 'remove-template-files': { action: 'runCommand', - commandFolder: 'tests-output/zksync-webauthn/contracts', + commandFolder: 'tests-output/zksync-webauthn', }, 'create-paymaster': { action: 'runCommand',