diff --git a/smart-contracts/package.json b/smart-contracts/package.json index 1eb5ea4c7e8..46e11bdde1a 100644 --- a/smart-contracts/package.json +++ b/smart-contracts/package.json @@ -12,13 +12,13 @@ "@nomicfoundation/hardhat-ethers": "3.0.8", "@nomicfoundation/hardhat-network-helpers": "1.0.12", "@nomicfoundation/hardhat-verify": "2.0.12", - "@openzeppelin/contracts": "5.0.2", + "@openzeppelin/contracts": "5.2.0", "@openzeppelin/contracts-upgradeable": "4.9.6", - "@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.0.2", - "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.0.2", - "@openzeppelin/hardhat-upgrades": "3.4.0", + "@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.2.0", + "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.2.0", + "@openzeppelin/hardhat-upgrades": "3.8.0", "@openzeppelin/merkle-tree": "1.0.7", - "@openzeppelin/upgrades-core": "1.39.0", + "@openzeppelin/upgrades-core": "1.41.0", "@uniswap/v3-core": "1.0.1", "@uniswap/v3-periphery": "1.4.4", "@unlock-protocol/contracts": "workspace:./packages/contracts", @@ -27,7 +27,7 @@ "@unlock-protocol/networks": "workspace:./packages/networks", "babel-polyfill": "6.26.0", "babel-register": "6.26.0", - "eslint": "9.11.1", + "eslint": "9.18.0", "eth-gas-reporter": "0.2.27", "ethers": "6.13.4", "fs-extra": "11.2.0", @@ -37,7 +37,7 @@ "hardhat-gas-reporter": "2.2.2", "hardhat-storage-layout": "0.1.7", "hardhat-tracer": "3.1.0", - "prettier": "3.3.3", + "prettier": "3.4.2", "prettier-plugin-solidity": "1.4.1", "solhint": "5.0.4", "solidity-coverage": "0.8.14", diff --git a/yarn.lock b/yarn.lock index 12dea7163e3..4c0a007c114 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5940,6 +5940,15 @@ __metadata: languageName: node linkType: hard +"@eslint/core@npm:^0.10.0": + version: 0.10.0 + resolution: "@eslint/core@npm:0.10.0" + dependencies: + "@types/json-schema": "npm:^7.0.15" + checksum: 10/de41d7fa5dc468b70fb15c72829096939fc0217c41b8519af4620bc1089cb42539a15325c4c3ee3832facac1836c8c944c4a0c4d0cc8b33ffd8e95962278ae14 + languageName: node + linkType: hard + "@eslint/core@npm:^0.6.0": version: 0.6.0 resolution: "@eslint/core@npm:0.6.0" @@ -6023,6 +6032,13 @@ __metadata: languageName: node linkType: hard +"@eslint/js@npm:9.18.0": + version: 9.18.0 + resolution: "@eslint/js@npm:9.18.0" + checksum: 10/364a7d030dad9dbda1458d8dbcea0199fe7d48bcfefe4b49389df6c45cdc5a2449f70e5d8a794e46ed9fb34af3fe5a3f53e30020d306b6ee791e2a1b2b9fa25f + languageName: node + linkType: hard + "@eslint/js@npm:9.9.1": version: 9.9.1 resolution: "@eslint/js@npm:9.9.1" @@ -6055,6 +6071,16 @@ __metadata: languageName: node linkType: hard +"@eslint/plugin-kit@npm:^0.2.5": + version: 0.2.5 + resolution: "@eslint/plugin-kit@npm:0.2.5" + dependencies: + "@eslint/core": "npm:^0.10.0" + levn: "npm:^0.4.1" + checksum: 10/82d0142bc7054587bde4f75c2c517f477df7c320e4bdb47a4d5f766899a313ce65e9ce5d59428178d0be473a95292065053f69637042546b811ad89079781cbc + languageName: node + linkType: hard + "@eth-optimism/contracts@npm:0.6.0": version: 0.6.0 resolution: "@eth-optimism/contracts@npm:0.6.0" @@ -11986,12 +12012,12 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts-upgradeable5@npm:@openzeppelin/contracts-upgradeable@5.0.2, @openzeppelin/contracts-upgradeable@npm:5.0.2": - version: 5.0.2 - resolution: "@openzeppelin/contracts-upgradeable@npm:5.0.2" +"@openzeppelin/contracts-upgradeable5@npm:@openzeppelin/contracts-upgradeable@5.2.0": + version: 5.2.0 + resolution: "@openzeppelin/contracts-upgradeable@npm:5.2.0" peerDependencies: - "@openzeppelin/contracts": 5.0.2 - checksum: 10/71847c6bbd7a859a2f02f496215b9664e41375589010e66da32f080d9af9215accf558da63134926e0eb3eb87ee7ab952462bc877ec5c5e1ac077b44cac9c363 + "@openzeppelin/contracts": 5.2.0 + checksum: 10/202f8a0fe118d1b5b838867224b183b8fcef814e9e45c575deb99859a031ef89ca0e778f0e3cf14b18494d5b867bbe0c8ea9d064a4410c53afb20d7b470c7479 languageName: node linkType: hard @@ -12002,6 +12028,15 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/contracts-upgradeable@npm:5.0.2": + version: 5.0.2 + resolution: "@openzeppelin/contracts-upgradeable@npm:5.0.2" + peerDependencies: + "@openzeppelin/contracts": 5.0.2 + checksum: 10/71847c6bbd7a859a2f02f496215b9664e41375589010e66da32f080d9af9215accf558da63134926e0eb3eb87ee7ab952462bc877ec5c5e1ac077b44cac9c363 + languageName: node + linkType: hard + "@openzeppelin/contracts-upgradeable@npm:^5.0.0": version: 5.1.0 resolution: "@openzeppelin/contracts-upgradeable@npm:5.1.0" @@ -12011,10 +12046,10 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts5@npm:@openzeppelin/contracts@5.0.2, @openzeppelin/contracts@npm:5.0.2": - version: 5.0.2 - resolution: "@openzeppelin/contracts@npm:5.0.2" - checksum: 10/938ebffbdade7dc59ea3df5b562c0e457bbefde9d82be8fa2acfd11da887df11653ac07922f41746b80cdbc106430e1e6978ce244fe99b00a7d9dc1418fc7670 +"@openzeppelin/contracts5@npm:@openzeppelin/contracts@5.2.0, @openzeppelin/contracts@npm:5.2.0": + version: 5.2.0 + resolution: "@openzeppelin/contracts@npm:5.2.0" + checksum: 10/d77e1bdfca6fa1c40b5a32bb92220ec633ef86cc0bf43a011ad218c26c9e763c70ace3fc1e148a0462394a3aed8c5d7445935ebfeb146ba1454abec66625e420 languageName: node linkType: hard @@ -12025,6 +12060,13 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/contracts@npm:5.0.2": + version: 5.0.2 + resolution: "@openzeppelin/contracts@npm:5.0.2" + checksum: 10/938ebffbdade7dc59ea3df5b562c0e457bbefde9d82be8fa2acfd11da887df11653ac07922f41746b80cdbc106430e1e6978ce244fe99b00a7d9dc1418fc7670 + languageName: node + linkType: hard + "@openzeppelin/defender-sdk-account-client@npm:^1.15.2": version: 1.15.2 resolution: "@openzeppelin/defender-sdk-account-client@npm:1.15.2" @@ -12221,33 +12263,6 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/hardhat-upgrades@npm:3.4.0": - version: 3.4.0 - resolution: "@openzeppelin/hardhat-upgrades@npm:3.4.0" - dependencies: - "@openzeppelin/defender-sdk-base-client": "npm:^1.14.4" - "@openzeppelin/defender-sdk-deploy-client": "npm:^1.14.4" - "@openzeppelin/defender-sdk-network-client": "npm:^1.14.4" - "@openzeppelin/upgrades-core": "npm:^1.38.0" - chalk: "npm:^4.1.0" - debug: "npm:^4.1.1" - ethereumjs-util: "npm:^7.1.5" - proper-lockfile: "npm:^4.1.1" - undici: "npm:^6.11.1" - peerDependencies: - "@nomicfoundation/hardhat-ethers": ^3.0.0 - "@nomicfoundation/hardhat-verify": ^2.0.0 - ethers: ^6.6.0 - hardhat: ^2.0.2 - peerDependenciesMeta: - "@nomicfoundation/hardhat-verify": - optional: true - bin: - migrate-oz-cli-project: dist/scripts/migrate-oz-cli-project.js - checksum: 10/e407ddd3df3c901c52e577cd2462017176bb88055b6bfbce8fc66d056b1e5cc8aa1686ccde637223bf8bbbde77f63269a7291517ef4053454d804bed1b921756 - languageName: node - linkType: hard - "@openzeppelin/hardhat-upgrades@npm:3.8.0": version: 3.8.0 resolution: "@openzeppelin/hardhat-upgrades@npm:3.8.0" @@ -12314,26 +12329,6 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/upgrades-core@npm:1.39.0": - version: 1.39.0 - resolution: "@openzeppelin/upgrades-core@npm:1.39.0" - dependencies: - "@nomicfoundation/slang": "npm:^0.17.0" - cbor: "npm:^9.0.0" - chalk: "npm:^4.1.0" - compare-versions: "npm:^6.0.0" - debug: "npm:^4.1.1" - ethereumjs-util: "npm:^7.0.3" - minimatch: "npm:^9.0.5" - minimist: "npm:^1.2.7" - proper-lockfile: "npm:^4.1.1" - solidity-ast: "npm:^0.4.51" - bin: - openzeppelin-upgrades-core: dist/cli/cli.js - checksum: 10/7779ce35966a6ee054eb4f167ef98f0d95dd4e5e5f309b89a59b6eaf0de8d0395205eb3b19957aea09c74c92754073a4c12f7728f86e072208694361aeb6c201 - languageName: node - linkType: hard - "@openzeppelin/upgrades-core@npm:1.41.0, @openzeppelin/upgrades-core@npm:^1.41.0": version: 1.41.0 resolution: "@openzeppelin/upgrades-core@npm:1.41.0" @@ -12354,7 +12349,7 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/upgrades-core@npm:^1.32.2, @openzeppelin/upgrades-core@npm:^1.37.0, @openzeppelin/upgrades-core@npm:^1.38.0, @openzeppelin/upgrades-core@npm:^1.40.0": +"@openzeppelin/upgrades-core@npm:^1.32.2, @openzeppelin/upgrades-core@npm:^1.37.0, @openzeppelin/upgrades-core@npm:^1.40.0": version: 1.40.0 resolution: "@openzeppelin/upgrades-core@npm:1.40.0" dependencies: @@ -19041,13 +19036,13 @@ __metadata: "@nomicfoundation/hardhat-ethers": "npm:3.0.8" "@nomicfoundation/hardhat-network-helpers": "npm:1.0.12" "@nomicfoundation/hardhat-verify": "npm:2.0.12" - "@openzeppelin/contracts": "npm:5.0.2" + "@openzeppelin/contracts": "npm:5.2.0" "@openzeppelin/contracts-upgradeable": "npm:4.9.6" - "@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.0.2" - "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.0.2" - "@openzeppelin/hardhat-upgrades": "npm:3.4.0" + "@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.2.0" + "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.2.0" + "@openzeppelin/hardhat-upgrades": "npm:3.8.0" "@openzeppelin/merkle-tree": "npm:1.0.7" - "@openzeppelin/upgrades-core": "npm:1.39.0" + "@openzeppelin/upgrades-core": "npm:1.41.0" "@uniswap/v3-core": "npm:1.0.1" "@uniswap/v3-periphery": "npm:1.4.4" "@unlock-protocol/contracts": "workspace:./packages/contracts" @@ -19056,7 +19051,7 @@ __metadata: "@unlock-protocol/networks": "workspace:./packages/networks" babel-polyfill: "npm:6.26.0" babel-register: "npm:6.26.0" - eslint: "npm:9.11.1" + eslint: "npm:9.18.0" eth-gas-reporter: "npm:0.2.27" ethers: "npm:6.13.4" fs-extra: "npm:11.2.0" @@ -19066,7 +19061,7 @@ __metadata: hardhat-gas-reporter: "npm:2.2.2" hardhat-storage-layout: "npm:0.1.7" hardhat-tracer: "npm:3.1.0" - prettier: "npm:3.3.3" + prettier: "npm:3.4.2" prettier-plugin-solidity: "npm:1.4.1" solhint: "npm:5.0.4" solidity-coverage: "npm:0.8.14" @@ -29183,6 +29178,55 @@ __metadata: languageName: node linkType: hard +"eslint@npm:9.18.0": + version: 9.18.0 + resolution: "eslint@npm:9.18.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@eslint-community/regexpp": "npm:^4.12.1" + "@eslint/config-array": "npm:^0.19.0" + "@eslint/core": "npm:^0.10.0" + "@eslint/eslintrc": "npm:^3.2.0" + "@eslint/js": "npm:9.18.0" + "@eslint/plugin-kit": "npm:^0.2.5" + "@humanfs/node": "npm:^0.16.6" + "@humanwhocodes/module-importer": "npm:^1.0.1" + "@humanwhocodes/retry": "npm:^0.4.1" + "@types/estree": "npm:^1.0.6" + "@types/json-schema": "npm:^7.0.15" + ajv: "npm:^6.12.4" + chalk: "npm:^4.0.0" + cross-spawn: "npm:^7.0.6" + debug: "npm:^4.3.2" + escape-string-regexp: "npm:^4.0.0" + eslint-scope: "npm:^8.2.0" + eslint-visitor-keys: "npm:^4.2.0" + espree: "npm:^10.3.0" + esquery: "npm:^1.5.0" + esutils: "npm:^2.0.2" + fast-deep-equal: "npm:^3.1.3" + file-entry-cache: "npm:^8.0.0" + find-up: "npm:^5.0.0" + glob-parent: "npm:^6.0.2" + ignore: "npm:^5.2.0" + imurmurhash: "npm:^0.1.4" + is-glob: "npm:^4.0.0" + json-stable-stringify-without-jsonify: "npm:^1.0.1" + lodash.merge: "npm:^4.6.2" + minimatch: "npm:^3.1.2" + natural-compare: "npm:^1.4.0" + optionator: "npm:^0.9.3" + peerDependencies: + jiti: "*" + peerDependenciesMeta: + jiti: + optional: true + bin: + eslint: bin/eslint.js + checksum: 10/85f22991aab4b0809fdfc557ec2bd309062e7211b631674e71827a73c45e44febaa80dedda35150154e331a2d372c3a25e8e5dd4a99dc8a982fe8f7d645d859f + languageName: node + linkType: hard + "eslint@npm:9.9.1": version: 9.9.1 resolution: "eslint@npm:9.9.1" @@ -44071,15 +44115,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.3.3": - version: 3.3.3 - resolution: "prettier@npm:3.3.3" - bin: - prettier: bin/prettier.cjs - checksum: 10/5beac1f30b5b40162532b8e2f7c3a4eb650910a2695e9c8512a62ffdc09dae93190c29db9107fa7f26d1b6c71aad3628ecb9b5de1ecb0911191099be109434d7 - languageName: node - linkType: hard - "prettier@npm:3.4.2": version: 3.4.2 resolution: "prettier@npm:3.4.2"