From 1fef4f12336908f2fc18834ab747dec6778d0f52 Mon Sep 17 00:00:00 2001 From: julienbrg Date: Thu, 21 Nov 2024 13:14:23 +0100 Subject: [PATCH] upgrade to OZ contracts v5.1.0 --- package.json | 2 +- pnpm-lock.yaml | 102 +++++++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 87bac1f..9721499 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.4.1", - "@openzeppelin/contracts": "^5.0.2", + "@openzeppelin/contracts": "^5.1.0", "@types/node": "^20.11.10", "cli-color": "^2.0.3", "dotenv": "^16.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27f2a1a..12d14e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,10 +10,10 @@ importers: dependencies: '@nomiclabs/hardhat-ethers': specifier: npm:hardhat-deploy-ethers@^0.4.1 - version: hardhat-deploy-ethers@0.4.1(@nomicfoundation/hardhat-ethers@3.0.5)(hardhat-deploy@0.11.45)(hardhat@2.22.2) + version: hardhat-deploy-ethers@0.4.1(@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)))(hardhat-deploy@0.11.45)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@openzeppelin/contracts': - specifier: ^5.0.2 - version: 5.0.2 + specifier: ^5.1.0 + version: 5.1.0 '@types/node': specifier: ^20.11.10 version: 20.12.7 @@ -32,25 +32,25 @@ importers: devDependencies: '@nomicfoundation/hardhat-chai-matchers': specifier: ^2.0.3 - version: 2.0.6(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2) + version: 2.0.6(@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)))(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@nomicfoundation/hardhat-ethers': specifier: ^3.0.5 - version: 3.0.5(ethers@6.11.1)(hardhat@2.22.2) + version: 3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@nomicfoundation/hardhat-network-helpers': specifier: ^1.0.10 - version: 1.0.10(hardhat@2.22.2) + version: 1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@nomicfoundation/hardhat-toolbox': specifier: ^3.0.0 - version: 3.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.6)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.10)(@nomicfoundation/hardhat-verify@1.1.1)(@typechain/ethers-v6@0.4.3)(@typechain/hardhat@8.0.3)(@types/chai@4.3.14)(@types/mocha@10.0.6)(@types/node@20.12.7)(chai@4.4.1)(ethers@6.11.1)(hardhat-gas-reporter@1.0.10)(hardhat@2.22.2)(solidity-coverage@0.8.12)(ts-node@10.9.2)(typechain@8.3.2)(typescript@5.4.5) + version: 3.0.0(7qz3agb4rry2tvtia5hadz3p6e) '@nomicfoundation/hardhat-verify': specifier: ^1.1.1 - version: 1.1.1(hardhat@2.22.2) + version: 1.1.1(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@typechain/ethers-v6': specifier: ^0.4.3 - version: 0.4.3(ethers@6.11.1)(typechain@8.3.2)(typescript@5.4.5) + version: 0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5) '@typechain/hardhat': specifier: ^8.0.3 - version: 8.0.3(@typechain/ethers-v6@0.4.3)(ethers@6.11.1)(hardhat@2.22.2)(typechain@8.3.2) + version: 8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5))(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))(typechain@8.3.2(typescript@5.4.5)) '@types/chai': specifier: ^4.3.11 version: 4.3.14 @@ -65,10 +65,10 @@ importers: version: 4.4.1 hardhat: specifier: ^2.19.4 - version: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + version: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) hardhat-gas-reporter: specifier: ^1.0.9 - version: 1.0.10(hardhat@2.22.2) + version: 1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) prettier: specifier: ^2.8.8 version: 2.8.8 @@ -77,7 +77,7 @@ importers: version: 1.3.1(prettier@2.8.8) solidity-coverage: specifier: ^0.8.6 - version: 0.8.12(hardhat@2.22.2) + version: 0.8.12(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) ts-node: specifier: ^10.9.2 version: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) @@ -443,8 +443,8 @@ packages: resolution: {integrity: sha512-1LMtXj1puAxyFusBgUIy5pZk3073cNXYnXUpuNKFghHbIit/xZgbk0AokpUADbNm3gyD6bFWl3LRFh3dhVdREg==} engines: {node: '>= 12'} - '@openzeppelin/contracts@5.0.2': - resolution: {integrity: sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==} + '@openzeppelin/contracts@5.1.0': + resolution: {integrity: sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==} '@scure/base@1.1.6': resolution: {integrity: sha512-ok9AWwhcgYuGG3Zfhyqg+zwl+Wn5uE+dwC0NV/2qQkx4dABbb/bx96vWu8NSj+BNjjSjno+JRYRjle1jV08k3g==} @@ -2609,59 +2609,59 @@ snapshots: '@nomicfoundation/ethereumjs-rlp': 5.0.4 ethereum-cryptography: 0.1.3 - '@nomicfoundation/hardhat-chai-matchers@2.0.6(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2)': + '@nomicfoundation/hardhat-chai-matchers@2.0.6(@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)))(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))': dependencies: - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) '@types/chai-as-promised': 7.1.8 chai: 4.4.1 chai-as-promised: 7.1.1(chai@4.4.1) deep-eql: 4.1.3 ethers: 6.11.1 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) ordinal: 1.0.3 - '@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2)': + '@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))': dependencies: debug: 4.3.4(supports-color@8.1.1) ethers: 6.11.1 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) lodash.isequal: 4.5.0 transitivePeerDependencies: - supports-color - '@nomicfoundation/hardhat-network-helpers@1.0.10(hardhat@2.22.2)': + '@nomicfoundation/hardhat-network-helpers@1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))': dependencies: ethereumjs-util: 7.1.5 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) - '@nomicfoundation/hardhat-toolbox@3.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.6)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.10)(@nomicfoundation/hardhat-verify@1.1.1)(@typechain/ethers-v6@0.4.3)(@typechain/hardhat@8.0.3)(@types/chai@4.3.14)(@types/mocha@10.0.6)(@types/node@20.12.7)(chai@4.4.1)(ethers@6.11.1)(hardhat-gas-reporter@1.0.10)(hardhat@2.22.2)(solidity-coverage@0.8.12)(ts-node@10.9.2)(typechain@8.3.2)(typescript@5.4.5)': + '@nomicfoundation/hardhat-toolbox@3.0.0(7qz3agb4rry2tvtia5hadz3p6e)': dependencies: - '@nomicfoundation/hardhat-chai-matchers': 2.0.6(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2) - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2) - '@nomicfoundation/hardhat-network-helpers': 1.0.10(hardhat@2.22.2) - '@nomicfoundation/hardhat-verify': 1.1.1(hardhat@2.22.2) - '@typechain/ethers-v6': 0.4.3(ethers@6.11.1)(typechain@8.3.2)(typescript@5.4.5) - '@typechain/hardhat': 8.0.3(@typechain/ethers-v6@0.4.3)(ethers@6.11.1)(hardhat@2.22.2)(typechain@8.3.2) + '@nomicfoundation/hardhat-chai-matchers': 2.0.6(@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)))(chai@4.4.1)(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + '@nomicfoundation/hardhat-network-helpers': 1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + '@nomicfoundation/hardhat-verify': 1.1.1(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + '@typechain/ethers-v6': 0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5) + '@typechain/hardhat': 8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5))(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))(typechain@8.3.2(typescript@5.4.5)) '@types/chai': 4.3.14 '@types/mocha': 10.0.6 '@types/node': 20.12.7 chai: 4.4.1 ethers: 6.11.1 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) - hardhat-gas-reporter: 1.0.10(hardhat@2.22.2) - solidity-coverage: 0.8.12(hardhat@2.22.2) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) + hardhat-gas-reporter: 1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + solidity-coverage: 0.8.12(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) ts-node: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) typechain: 8.3.2(typescript@5.4.5) typescript: 5.4.5 - '@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.2)': + '@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))': dependencies: '@ethersproject/abi': 5.7.0 '@ethersproject/address': 5.7.0 cbor: 8.1.0 chalk: 2.4.2 debug: 4.3.4(supports-color@8.1.1) - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) lodash.clonedeep: 4.5.0 semver: 6.3.1 table: 6.8.2 @@ -2712,7 +2712,7 @@ snapshots: '@nomicfoundation/solidity-analyzer-win32-ia32-msvc': 0.1.1 '@nomicfoundation/solidity-analyzer-win32-x64-msvc': 0.1.1 - '@openzeppelin/contracts@5.0.2': {} + '@openzeppelin/contracts@5.1.0': {} '@scure/base@1.1.6': {} @@ -2803,7 +2803,7 @@ snapshots: '@tsconfig/node16@1.0.4': {} - '@typechain/ethers-v6@0.4.3(ethers@6.11.1)(typechain@8.3.2)(typescript@5.4.5)': + '@typechain/ethers-v6@0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5)': dependencies: ethers: 6.11.1 lodash: 4.17.21 @@ -2811,12 +2811,12 @@ snapshots: typechain: 8.3.2(typescript@5.4.5) typescript: 5.4.5 - '@typechain/hardhat@8.0.3(@typechain/ethers-v6@0.4.3)(ethers@6.11.1)(hardhat@2.22.2)(typechain@8.3.2)': + '@typechain/hardhat@8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5))(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5))(typechain@8.3.2(typescript@5.4.5))': dependencies: - '@typechain/ethers-v6': 0.4.3(ethers@6.11.1)(typechain@8.3.2)(typescript@5.4.5) + '@typechain/ethers-v6': 0.4.3(ethers@6.11.1)(typechain@8.3.2(typescript@5.4.5))(typescript@5.4.5) ethers: 6.11.1 fs-extra: 9.1.0 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) typechain: 8.3.2(typescript@5.4.5) '@types/bn.js@4.11.6': @@ -3237,6 +3237,7 @@ snapshots: debug@4.3.4(supports-color@8.1.1): dependencies: ms: 2.1.2 + optionalDependencies: supports-color: 8.1.1 decamelize@4.0.0: {} @@ -3557,7 +3558,7 @@ snapshots: imul: 1.0.1 follow-redirects@1.15.6(debug@4.3.4): - dependencies: + optionalDependencies: debug: 4.3.4(supports-color@8.1.1) form-data@2.5.1: @@ -3718,10 +3719,10 @@ snapshots: optionalDependencies: uglify-js: 3.17.4 - hardhat-deploy-ethers@0.4.1(@nomicfoundation/hardhat-ethers@3.0.5)(hardhat-deploy@0.11.45)(hardhat@2.22.2): + hardhat-deploy-ethers@0.4.1(@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)))(hardhat-deploy@0.11.45)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)): dependencies: - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2) - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.11.1)(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) hardhat-deploy: 0.11.45 hardhat-deploy@0.11.45: @@ -3755,11 +3756,11 @@ snapshots: - supports-color - utf-8-validate - hardhat-gas-reporter@1.0.10(hardhat@2.22.2): + hardhat-gas-reporter@1.0.10(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)): dependencies: array-uniq: 1.0.3 eth-gas-reporter: 0.2.27 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) sha1: 1.1.1 transitivePeerDependencies: - '@codechecks/client' @@ -3767,7 +3768,7 @@ snapshots: - debug - utf-8-validate - hardhat@2.22.2(ts-node@10.9.2)(typescript@5.4.5): + hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5): dependencies: '@ethersproject/abi': 5.7.0 '@metamask/eth-sig-util': 4.0.1 @@ -3808,12 +3809,13 @@ snapshots: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) tsort: 0.0.1 - typescript: 5.4.5 undici: 5.28.4 uuid: 8.3.2 ws: 7.5.9 + optionalDependencies: + ts-node: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - bufferutil - c-kzg @@ -4437,7 +4439,7 @@ snapshots: solidity-comments-extractor@0.0.8: {} - solidity-coverage@0.8.12(hardhat@2.22.2): + solidity-coverage@0.8.12(hardhat@2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)): dependencies: '@ethersproject/abi': 5.7.0 '@solidity-parser/parser': 0.18.0 @@ -4448,7 +4450,7 @@ snapshots: ghost-testrpc: 0.0.2 global-modules: 2.0.0 globby: 10.0.2 - hardhat: 2.22.2(ts-node@10.9.2)(typescript@5.4.5) + hardhat: 2.22.2(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5) jsonschema: 1.4.1 lodash: 4.17.21 mocha: 10.4.0