diff --git a/.yarn/cache/@matterlabs-hardhat-zksync-deploy-npm-1.0.0-95ca26f992-88e8a758c4.zip b/.yarn/cache/@matterlabs-hardhat-zksync-deploy-npm-1.0.0-95ca26f992-88e8a758c4.zip deleted file mode 100644 index 28eecd264..000000000 Binary files a/.yarn/cache/@matterlabs-hardhat-zksync-deploy-npm-1.0.0-95ca26f992-88e8a758c4.zip and /dev/null differ diff --git a/.yarn/cache/@matterlabs-hardhat-zksync-solc-npm-1.0.0-a3760cd715-7ce8c992aa.zip b/.yarn/cache/@matterlabs-hardhat-zksync-solc-npm-1.0.0-a3760cd715-7ce8c992aa.zip deleted file mode 100644 index 50674174b..000000000 Binary files a/.yarn/cache/@matterlabs-hardhat-zksync-solc-npm-1.0.0-a3760cd715-7ce8c992aa.zip and /dev/null differ diff --git a/.yarn/cache/@matterlabs-hardhat-zksync-toolbox-npm-1.0.0-66ebb2bd96-f8106ea1f5.zip b/.yarn/cache/@matterlabs-hardhat-zksync-toolbox-npm-1.0.0-66ebb2bd96-f8106ea1f5.zip deleted file mode 100644 index 7cf529afb..000000000 Binary files a/.yarn/cache/@matterlabs-hardhat-zksync-toolbox-npm-1.0.0-66ebb2bd96-f8106ea1f5.zip and /dev/null differ diff --git a/.yarn/cache/@ts-morph-common-npm-0.20.0-804dfb2c72-eb02480971.zip b/.yarn/cache/@ts-morph-common-npm-0.20.0-804dfb2c72-eb02480971.zip deleted file mode 100644 index 5356eab9d..000000000 Binary files a/.yarn/cache/@ts-morph-common-npm-0.20.0-804dfb2c72-eb02480971.zip and /dev/null differ diff --git a/.yarn/cache/buildcheck-npm-0.0.3-ac31c4ae43-baf30605c5.zip b/.yarn/cache/buildcheck-npm-0.0.3-ac31c4ae43-baf30605c5.zip deleted file mode 100644 index 32ed77bee..000000000 Binary files a/.yarn/cache/buildcheck-npm-0.0.3-ac31c4ae43-baf30605c5.zip and /dev/null differ diff --git a/.yarn/cache/code-block-writer-npm-12.0.0-943b9e5c78-9f6505a4d6.zip b/.yarn/cache/code-block-writer-npm-12.0.0-943b9e5c78-9f6505a4d6.zip deleted file mode 100644 index 7cd7c8ba8..000000000 Binary files a/.yarn/cache/code-block-writer-npm-12.0.0-943b9e5c78-9f6505a4d6.zip and /dev/null differ diff --git a/.yarn/cache/cpu-features-npm-0.0.4-b474ef5da3-a20d58e41e.zip b/.yarn/cache/cpu-features-npm-0.0.4-b474ef5da3-a20d58e41e.zip deleted file mode 100644 index d976f97e6..000000000 Binary files a/.yarn/cache/cpu-features-npm-0.0.4-b474ef5da3-a20d58e41e.zip and /dev/null differ diff --git a/.yarn/cache/docker-modem-npm-3.0.5-f3577eede7-79027f8e71.zip b/.yarn/cache/docker-modem-npm-3.0.5-f3577eede7-79027f8e71.zip deleted file mode 100644 index 47f3acf32..000000000 Binary files a/.yarn/cache/docker-modem-npm-3.0.5-f3577eede7-79027f8e71.zip and /dev/null differ diff --git a/.yarn/cache/dockerode-npm-3.3.4-e90aa9eba2-6cb4b9d1c4.zip b/.yarn/cache/dockerode-npm-3.3.4-e90aa9eba2-6cb4b9d1c4.zip deleted file mode 100644 index 8db885863..000000000 Binary files a/.yarn/cache/dockerode-npm-3.3.4-e90aa9eba2-6cb4b9d1c4.zip and /dev/null differ diff --git a/.yarn/cache/fast-glob-npm-3.3.2-0a8cb4f2ca-900e4979f4.zip b/.yarn/cache/fast-glob-npm-3.3.2-0a8cb4f2ca-900e4979f4.zip deleted file mode 100644 index 409893e13..000000000 Binary files a/.yarn/cache/fast-glob-npm-3.3.2-0a8cb4f2ca-900e4979f4.zip and /dev/null differ diff --git a/.yarn/cache/minimatch-npm-7.4.6-f3feee458c-1a6c8d2261.zip b/.yarn/cache/minimatch-npm-7.4.6-f3feee458c-1a6c8d2261.zip deleted file mode 100644 index 08f6bbec3..000000000 Binary files a/.yarn/cache/minimatch-npm-7.4.6-f3feee458c-1a6c8d2261.zip and /dev/null differ diff --git a/.yarn/cache/mkdirp-npm-2.1.6-832c38f12a-8a1d09ffac.zip b/.yarn/cache/mkdirp-npm-2.1.6-832c38f12a-8a1d09ffac.zip deleted file mode 100644 index 1de27b5d7..000000000 Binary files a/.yarn/cache/mkdirp-npm-2.1.6-832c38f12a-8a1d09ffac.zip and /dev/null differ diff --git a/.yarn/cache/nan-npm-2.16.0-cac314a230-cb16937273.zip b/.yarn/cache/nan-npm-2.16.0-cac314a230-cb16937273.zip deleted file mode 100644 index d2907fbe7..000000000 Binary files a/.yarn/cache/nan-npm-2.16.0-cac314a230-cb16937273.zip and /dev/null differ diff --git a/.yarn/cache/ssh2-npm-1.11.0-ba52882820-e40cb9f171.zip b/.yarn/cache/ssh2-npm-1.11.0-ba52882820-e40cb9f171.zip deleted file mode 100644 index f5fba1aeb..000000000 Binary files a/.yarn/cache/ssh2-npm-1.11.0-ba52882820-e40cb9f171.zip and /dev/null differ diff --git a/.yarn/cache/ts-morph-npm-19.0.0-c935ce32ca-c2546da8dc.zip b/.yarn/cache/ts-morph-npm-19.0.0-c935ce32ca-c2546da8dc.zip deleted file mode 100644 index 8e78aca68..000000000 Binary files a/.yarn/cache/ts-morph-npm-19.0.0-c935ce32ca-c2546da8dc.zip and /dev/null differ diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index 0844d0a05..c3d997839 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -5,7 +5,9 @@ import { CHAINS } from 'chains'; import '@nomiclabs/hardhat-ethers'; import '@nomicfoundation/hardhat-viem'; import '@nomiclabs/hardhat-solhint'; // https://github.com/protofire/solhint/blob/master/docs/rules.md -import '@matterlabs/hardhat-zksync-toolbox'; +import '@matterlabs/hardhat-zksync-chai-matchers'; +import '@matterlabs/hardhat-zksync-solc'; +import '@matterlabs/hardhat-zksync-verify'; import 'hardhat-gas-reporter'; import 'hardhat-abi-exporter'; import 'hardhat-tracer'; diff --git a/contracts/package.json b/contracts/package.json index dd4be44da..07027ceb1 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -11,9 +11,7 @@ }, "devDependencies": { "@matterlabs/hardhat-zksync-chai-matchers": "^1.0.0", - "@matterlabs/hardhat-zksync-deploy": "^1.0.0", "@matterlabs/hardhat-zksync-solc": "^1.0.2", - "@matterlabs/hardhat-zksync-toolbox": "^1.0.0", "@matterlabs/hardhat-zksync-verify": "^1.1.0", "@matterlabs/zksync-contracts": "^0.6.1", "@nomicfoundation/hardhat-chai-matchers": "^2.0.2", diff --git a/contracts/scripts/deployAccountImplementation.ts b/contracts/scripts/deployAccountImplementation.ts index e442bc0eb..885eb972f 100644 --- a/contracts/scripts/deployAccountImplementation.ts +++ b/contracts/scripts/deployAccountImplementation.ts @@ -9,7 +9,7 @@ const main = async () => { await hre.run(TASK_COMPILE); const { address, deployTx } = await deploy('Account'); - if (deployTx) await displayTx(address, deployTx); + await displayTx(address, deployTx); await verify({ contract: 'contracts/Account.sol:Account', address }); }; diff --git a/contracts/scripts/deployProxyFactory.ts b/contracts/scripts/deployProxyFactory.ts index 0846beda1..e95e145cb 100644 --- a/contracts/scripts/deployProxyFactory.ts +++ b/contracts/scripts/deployProxyFactory.ts @@ -9,7 +9,7 @@ const main = async () => { await hre.run(TASK_COMPILE); const { address, deployTx, constructorArgs } = await deployFactory('AccountProxy'); - if (deployTx) await displayTx(address, deployTx); + await displayTx(address, deployTx); await verify({ contract: 'contracts/Factory.sol:Factory', diff --git a/contracts/scripts/util/display.ts b/contracts/scripts/util/display.ts index b9a86bda3..afb078fde 100644 --- a/contracts/scripts/util/display.ts +++ b/contracts/scripts/util/display.ts @@ -4,7 +4,16 @@ import { CONFIG } from '../../config'; import { ContractTransactionResponse } from 'ethers'; import { network } from '../../test/util'; -export const displayTx = async (address: Address, tx: ContractTransactionResponse) => { +export async function displayTx(address: Address, tx: ContractTransactionResponse | null) { + if (!tx) { + console.log(` + ====== Deployment ====== + Address: ${address} + ======================== + `); + return; + } + const receipt = await tx.wait(); if (!receipt) return; @@ -29,4 +38,4 @@ export const displayTx = async (address: Address, tx: ContractTransactionRespons } ======================== `); -}; +} diff --git a/contracts/test/deployment.ts b/contracts/test/deployment.ts index eb4d80ba3..cf663b74f 100644 --- a/contracts/test/deployment.ts +++ b/contracts/test/deployment.ts @@ -29,7 +29,7 @@ describe('Deployment', () => { describe('Proxy factory', () => { it('should deploy', async () => { - const { address } = await deployFactory('ERC1967Proxy'); + const { address } = await deployFactory('AccountProxy'); expect((await network.getBytecode({ address }))?.length ?? 0).to.be.gt(0); }); }); diff --git a/contracts/test/util/deploy.ts b/contracts/test/util/deploy.ts index 35ea88138..bc8d76e46 100644 --- a/contracts/test/util/deploy.ts +++ b/contracts/test/util/deploy.ts @@ -1,5 +1,4 @@ import * as hre from 'hardhat'; -import { Deployer } from '@matterlabs/hardhat-zksync-deploy'; import { asAddress, asPolicy, @@ -10,16 +9,12 @@ import { TxOptions, } from 'lib'; import { network, wallet, wallets } from './network'; -import { BytesLike, Overrides } from 'ethers'; +import { BytesLike, hexlify, Interface, Overrides } from 'ethers'; import * as zk from 'zksync2-js'; import { getApprovals } from './approval'; -import { Address, parseEther } from 'viem'; +import { Address, parseEther, zeroHash } from 'viem'; import { CONFIG } from '../../config'; -function getDeployer() { - return new Deployer(hre, new zk.Wallet(CONFIG.walletPrivateKey)); -} - type AccountContractName = 'Account' | 'TestAccount'; type ContractName = | AccountContractName @@ -32,22 +27,44 @@ type ContractName = interface DeployOptions { constructorArgs?: ConstructorArgs; overrides?: Overrides; - additionalFactoryDeps?: BytesLike[]; + factoryDeps?: BytesLike[]; } +const zkProvider = new zk.Provider(CONFIG.chain.rpcUrls.default.http[0]); + export async function deploy( contractName: ContractName, - { constructorArgs, overrides, additionalFactoryDeps }: DeployOptions = {}, + { constructorArgs, overrides, factoryDeps }: DeployOptions = {}, ) { - const deployer = getDeployer(); - const artifact = await deployer.loadArtifact(contractName); + const sender = new zk.Wallet(CONFIG.walletPrivateKey, zkProvider); + const artifact = await hre.artifacts.readArtifact(contractName); - const contract = await deployer.deploy( - artifact, - constructorArgs, - overrides, - additionalFactoryDeps, + const factory = new zk.ContractFactory(artifact.abi, artifact.bytecode, sender, 'create2'); + + const salt = zeroHash; + + const encodedConstructorArgs = new Interface(artifact.abi).encodeDeploy(constructorArgs ?? []); + + // const constructorAbiParams = + // (artifact.abi as Abi).find((x): x is AbiConstructor => 'type' in x && x.type === 'constructor') + // ?.inputs ?? []; + // const encodedConstructorArgs = encodeAbiParameters(constructorAbiParams, constructorArgs ?? []); + + const potentialAddress = asAddress( + zk.utils.create2Address( + sender.address, + hexlify(zk.utils.hashBytecode(artifact.bytecode)), + salt, + encodedConstructorArgs, + ), ); + + const isDeployed = !!(await network.getBytecode({ address: potentialAddress }))?.length; + if (isDeployed) return { address: potentialAddress, deployTx: null, constructorArgs }; + + const contract = await factory.deploy(encodedConstructorArgs, { + customData: { ...overrides, salt, factoryDeps }, + }); await contract.waitForDeployment(); return { @@ -60,13 +77,12 @@ export async function deploy( export type DeployResult = Awaited>; export const deployFactory = async (childContractName: 'AccountProxy') => { - const deployer = getDeployer(); - const childContractArtifact = await deployer.loadArtifact(childContractName); + const childContractArtifact = await hre.artifacts.readArtifact(childContractName); const childContractBytecodeHash = zk.utils.hashBytecode(childContractArtifact.bytecode); return deploy('Factory', { constructorArgs: [childContractBytecodeHash], - additionalFactoryDeps: [childContractArtifact.bytecode], + factoryDeps: [childContractArtifact.bytecode], }); }; diff --git a/packages/lib/src/contract.ts b/packages/lib/src/contract.ts index 29805ce03..a1241d5cc 100644 --- a/packages/lib/src/contract.ts +++ b/packages/lib/src/contract.ts @@ -10,7 +10,7 @@ export const TEST_VERIFIER_ABI = testVerifierArtifact.abi; export const ACCOUNT_IMPLEMENTATION = { ...accountArtifact, address: addresses({ - 'zksync-goerli': '0xc3380460A7D89981536A9ecA83e289DD0EF0c3D4', + 'zksync-goerli': '0x59B6FBe744C13121FDfb304A4012f43A4aafbf3A', }), } as const; @@ -22,7 +22,7 @@ export const ACCOUNT_PROXY = { export const ACCOUNT_PROXY_FACTORY = { abi: accountProxyFactoryArtifact.abi, address: addresses({ - 'zksync-goerli': '0x2f04b94F5a39891C10E666992f08f1a69774b764', + 'zksync-goerli': '0x1251D2CDaB43cb7b9b6610D0531aEB9b80fFE9ad', }), }; diff --git a/yarn.lock b/yarn.lock index fd88149fa..1cdecd0db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8415,37 +8415,6 @@ __metadata: languageName: node linkType: hard -"@matterlabs/hardhat-zksync-deploy@npm:^1.0.0": - version: 1.0.0 - resolution: "@matterlabs/hardhat-zksync-deploy@npm:1.0.0" - dependencies: - "@matterlabs/hardhat-zksync-solc": 1.0.0 - chalk: 4.1.2 - ts-morph: ^19.0.0 - peerDependencies: - ethers: ^6.7.1 - hardhat: ^2.18.1 - zksync2-js: ^0.2.2 - checksum: 88e8a758c4bbd65f1028e49cb4bd592b138263d2c249baba16258bd9909605b097054e40b274b5420c0f4ff3fc6aa3147f98accf9045652af210aedcf37069f2 - languageName: node - linkType: hard - -"@matterlabs/hardhat-zksync-solc@npm:1.0.0": - version: 1.0.0 - resolution: "@matterlabs/hardhat-zksync-solc@npm:1.0.0" - dependencies: - "@nomiclabs/hardhat-docker": ^2.0.0 - chalk: 4.1.2 - dockerode: ^3.3.4 - fs-extra: ^11.1.1 - proper-lockfile: ^4.1.2 - semver: ^7.5.1 - peerDependencies: - hardhat: ^2.18.1 - checksum: 7ce8c992aab9e44796f9355065ffe302876cd076ed9a026da057afd2735b167d4a08544f632898db49d2b5c8abeca2c3d0362e4d72e3fd3d9f89d3bbe45bc0aa - languageName: node - linkType: hard - "@matterlabs/hardhat-zksync-solc@npm:^1.0.0, @matterlabs/hardhat-zksync-solc@npm:^1.0.2": version: 1.0.2 resolution: "@matterlabs/hardhat-zksync-solc@npm:1.0.2" @@ -8462,18 +8431,6 @@ __metadata: languageName: node linkType: hard -"@matterlabs/hardhat-zksync-toolbox@npm:^1.0.0": - version: 1.0.0 - resolution: "@matterlabs/hardhat-zksync-toolbox@npm:1.0.0" - peerDependencies: - "@matterlabs/hardhat-zksync-chai-matchers": ^1.0.0 - "@matterlabs/hardhat-zksync-deploy": ^1.0.0 - "@matterlabs/hardhat-zksync-solc": ^1.0.0 - "@matterlabs/hardhat-zksync-verify": ^1.0.0 - checksum: f8106ea1f5538cedd36f68a7c5051aca4b0d9d68f20f79ac5ce1783184c2ef61fd81bb36b30ca9d3ba04e6e4f1b306e68b24d322b44c07a8f020ded571ed20b1 - languageName: node - linkType: hard - "@matterlabs/hardhat-zksync-verify@npm:^1.1.0": version: 1.1.0 resolution: "@matterlabs/hardhat-zksync-verify@npm:1.1.0" @@ -11575,18 +11532,6 @@ __metadata: languageName: node linkType: hard -"@ts-morph/common@npm:~0.20.0": - version: 0.20.0 - resolution: "@ts-morph/common@npm:0.20.0" - dependencies: - fast-glob: ^3.2.12 - minimatch: ^7.4.3 - mkdirp: ^2.1.6 - path-browserify: ^1.0.1 - checksum: eb02480971fbe045b4dd099d1ddb262d47d657197fefb73a4a2c89523975bfb0b23050207d49d19e853ef23bffdcb9d89a778f52f6b3385ae5bcf63322523700 - languageName: node - linkType: hard - "@tsconfig/docusaurus@npm:1.0.6": version: 1.0.6 resolution: "@tsconfig/docusaurus@npm:1.0.6" @@ -16479,13 +16424,6 @@ __metadata: languageName: node linkType: hard -"buildcheck@npm:0.0.3": - version: 0.0.3 - resolution: "buildcheck@npm:0.0.3" - checksum: baf30605c56e80c2ca0502e40e18f2ebc7075bb4a861c941c0b36cd468b27957ed11a62248003ce99b9e5f91a7dfa859b30aad4fa50f0090c77a6f596ba20e6d - languageName: node - linkType: hard - "buildcheck@npm:~0.0.6": version: 0.0.6 resolution: "buildcheck@npm:0.0.6" @@ -17606,13 +17544,6 @@ __metadata: languageName: node linkType: hard -"code-block-writer@npm:^12.0.0": - version: 12.0.0 - resolution: "code-block-writer@npm:12.0.0" - checksum: 9f6505a4d668c9131c6f3f686359079439e66d5f50c236614d52fcfa53aeb0bc615b2c6c64ef05b5511e3b0433ccfd9f7756ad40eb3b9298af6a7d791ab1981d - languageName: node - linkType: hard - "collapse-white-space@npm:^1.0.2": version: 1.0.6 resolution: "collapse-white-space@npm:1.0.6" @@ -18090,9 +18021,7 @@ __metadata: resolution: "contracts@workspace:contracts" dependencies: "@matterlabs/hardhat-zksync-chai-matchers": ^1.0.0 - "@matterlabs/hardhat-zksync-deploy": ^1.0.0 "@matterlabs/hardhat-zksync-solc": ^1.0.2 - "@matterlabs/hardhat-zksync-toolbox": ^1.0.0 "@matterlabs/hardhat-zksync-verify": ^1.1.0 "@matterlabs/zksync-contracts": ^0.6.1 "@nomicfoundation/hardhat-chai-matchers": ^2.0.2 @@ -18377,17 +18306,6 @@ __metadata: languageName: node linkType: hard -"cpu-features@npm:~0.0.4": - version: 0.0.4 - resolution: "cpu-features@npm:0.0.4" - dependencies: - buildcheck: 0.0.3 - nan: ^2.15.0 - node-gyp: latest - checksum: a20d58e41e63182b34753dfe23bd1d967944ec13d84b70849b5d334fb4a558b7e71e7f955ed86c8e75dd65b5c5b882f1c494174d342cb6d8a062d77f79d39596 - languageName: node - linkType: hard - "cpu-features@npm:~0.0.8": version: 0.0.9 resolution: "cpu-features@npm:0.0.9" @@ -19701,18 +19619,6 @@ __metadata: languageName: node linkType: hard -"docker-modem@npm:^3.0.0": - version: 3.0.5 - resolution: "docker-modem@npm:3.0.5" - dependencies: - debug: ^4.1.1 - readable-stream: ^3.5.0 - split-ca: ^1.0.1 - ssh2: ^1.4.0 - checksum: 79027f8e719a77031790af628f9aa1d72607ec3769149de3a4b683930f2e4d113ae0e3a7345b32ff3b2289f886879f4fcf216afb17908178ba00f9661c4e0dd6 - languageName: node - linkType: hard - "docker-modem@npm:^5.0.0": version: 5.0.1 resolution: "docker-modem@npm:5.0.1" @@ -19736,17 +19642,6 @@ __metadata: languageName: node linkType: hard -"dockerode@npm:^3.3.4": - version: 3.3.4 - resolution: "dockerode@npm:3.3.4" - dependencies: - "@balena/dockerignore": ^1.0.2 - docker-modem: ^3.0.0 - tar-fs: ~2.0.1 - checksum: 6cb4b9d1c42feb3acfa77daf103b070cc412351dc7dc0a1553cc774ccd1be1a1412a87f8aa13c3155c63ec5c61a7cadc833b4248c4d8342814bbf708f795b952 - languageName: node - linkType: hard - "dockerode@npm:^4.0.0": version: 4.0.0 resolution: "dockerode@npm:4.0.0" @@ -22450,19 +22345,6 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.12": - version: 3.3.2 - resolution: "fast-glob@npm:3.3.2" - dependencies: - "@nodelib/fs.stat": ^2.0.2 - "@nodelib/fs.walk": ^1.2.3 - glob-parent: ^5.1.2 - merge2: ^1.3.0 - micromatch: ^4.0.4 - checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1 - languageName: node - linkType: hard - "fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" @@ -29872,15 +29754,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^7.4.3": - version: 7.4.6 - resolution: "minimatch@npm:7.4.6" - dependencies: - brace-expansion: ^2.0.1 - checksum: 1a6c8d22618df9d2a88aabeef1de5622eb7b558e9f8010be791cb6b0fa6e102d39b11c28d75b855a1e377b12edc7db8ff12a99c20353441caa6a05e78deb5da9 - languageName: node - linkType: hard - "minimatch@npm:^8.0.2": version: 8.0.3 resolution: "minimatch@npm:8.0.3" @@ -30106,15 +29979,6 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^2.1.6": - version: 2.1.6 - resolution: "mkdirp@npm:2.1.6" - bin: - mkdirp: dist/cjs/src/bin.js - checksum: 8a1d09ffac585e55f41c54f445051f5bc33a7de99b952bb04c576cafdf1a67bb4bae8cb93736f7da6838771fbf75bc630430a3a59e1252047d2278690bd150ee - languageName: node - linkType: hard - "mnemonist@npm:^0.38.0": version: 0.38.5 resolution: "mnemonist@npm:0.38.5" @@ -30430,15 +30294,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.15.0, nan@npm:^2.16.0": - version: 2.16.0 - resolution: "nan@npm:2.16.0" - dependencies: - node-gyp: latest - checksum: cb16937273ea55b01ea47df244094c12297ce6b29b36e845d349f1f7c268b8d7c5abd126a102c5678a1e1afd0d36bba35ea0cc959e364928ce60561c9306064a - languageName: node - linkType: hard - "nanoid@npm:3.3.3": version: 3.3.3 resolution: "nanoid@npm:3.3.3" @@ -31955,7 +31810,7 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:^1.0.0, path-browserify@npm:^1.0.1": +"path-browserify@npm:^1.0.0": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 @@ -37579,23 +37434,6 @@ __metadata: languageName: node linkType: hard -"ssh2@npm:^1.4.0": - version: 1.11.0 - resolution: "ssh2@npm:1.11.0" - dependencies: - asn1: ^0.2.4 - bcrypt-pbkdf: ^1.0.2 - cpu-features: ~0.0.4 - nan: ^2.16.0 - dependenciesMeta: - cpu-features: - optional: true - nan: - optional: true - checksum: e40cb9f171741a807c170dc555078aa8c49dc93dd36fc9c8be026fce1cfd31f0d37078d9b60a0f2cfb11d0e007ed5407376b72f8a0ef9f2cb89574632bbfb824 - languageName: node - linkType: hard - "sshpk@npm:^1.7.0": version: 1.17.0 resolution: "sshpk@npm:1.17.0" @@ -39347,16 +39185,6 @@ __metadata: languageName: node linkType: hard -"ts-morph@npm:^19.0.0": - version: 19.0.0 - resolution: "ts-morph@npm:19.0.0" - dependencies: - "@ts-morph/common": ~0.20.0 - code-block-writer: ^12.0.0 - checksum: c2546da8dcbdfd5f987ef39f30e52de5cc89391b7357ad45e7a09d05d2fd0cabb92c9d1cf14860ba27e9e3476707b854ba9671a1c8e0a925b6457305ef3e23ea - languageName: node - linkType: hard - "ts-node@npm:^10.9.1": version: 10.9.1 resolution: "ts-node@npm:10.9.1"