From 3325abc8051fbb87868459db324cf5f12aca6e88 Mon Sep 17 00:00:00 2001 From: Vittorio Minacori Date: Wed, 23 Oct 2024 16:32:27 +0200 Subject: [PATCH] chore: update dependencies --- analysis/description-table/SampleContract.md | 2 +- dist/SampleContract.dist.sol | 53 +++++------ package-lock.json | 92 ++++++++++---------- package.json | 6 +- 4 files changed, 78 insertions(+), 75 deletions(-) diff --git a/analysis/description-table/SampleContract.md b/analysis/description-table/SampleContract.md index 286eddd..ded2933 100644 --- a/analysis/description-table/SampleContract.md +++ b/analysis/description-table/SampleContract.md @@ -5,7 +5,7 @@ | File Name | SHA-1 Hash | |-------------|--------------| -| dist/SampleContract.dist.sol | 199a7fa75f0719a5f45be6077a295f7400a9aa8a | +| dist/SampleContract.dist.sol | 3a4dd0c5a1120a9d68ba53cefa07f9c85f8ec4d1 | ### Contracts Description Table diff --git a/dist/SampleContract.dist.sol b/dist/SampleContract.dist.sol index f0a3c02..3c2908a 100644 --- a/dist/SampleContract.dist.sol +++ b/dist/SampleContract.dist.sol @@ -1,8 +1,8 @@ -// Sources flattened with hardhat v2.22.13 https://hardhat.org +// Sources flattened with hardhat v2.22.14 https://hardhat.org // SPDX-License-Identifier: MIT -// File @openzeppelin/contracts/utils/Context.sol@v5.0.2 +// File @openzeppelin/contracts/utils/Context.sol@v5.1.0 // Original license: SPDX_License_Identifier: MIT // OpenZeppelin Contracts (last updated v5.0.1) (utils/Context.sol) @@ -34,7 +34,7 @@ abstract contract Context { } -// File @openzeppelin/contracts/access/Ownable.sol@v5.0.2 +// File @openzeppelin/contracts/access/Ownable.sol@v5.1.0 // Original license: SPDX_License_Identifier: MIT // OpenZeppelin Contracts (last updated v5.0.0) (access/Ownable.sol) @@ -136,16 +136,16 @@ abstract contract Ownable is Context { } -// File @openzeppelin/contracts/utils/introspection/IERC165.sol@v5.0.2 +// File @openzeppelin/contracts/utils/introspection/IERC165.sol@v5.1.0 // Original license: SPDX_License_Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (utils/introspection/IERC165.sol) +// OpenZeppelin Contracts (last updated v5.1.0) (utils/introspection/IERC165.sol) pragma solidity ^0.8.20; /** - * @dev Interface of the ERC165 standard, as defined in the - * https://eips.ethereum.org/EIPS/eip-165[EIP]. + * @dev Interface of the ERC-165 standard, as defined in the + * https://eips.ethereum.org/EIPS/eip-165[ERC]. * * Implementers can declare support of contract interfaces, which can then be * queried by others ({ERC165Checker}). @@ -156,7 +156,7 @@ interface IERC165 { /** * @dev Returns true if this contract implements the interface defined by * `interfaceId`. See the corresponding - * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified[EIP section] + * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified[ERC section] * to learn more about how these ids are created. * * This function call must use less than 30 000 gas. @@ -165,15 +165,15 @@ interface IERC165 { } -// File @openzeppelin/contracts/token/ERC721/IERC721.sol@v5.0.2 +// File @openzeppelin/contracts/token/ERC721/IERC721.sol@v5.1.0 // Original license: SPDX_License_Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/IERC721.sol) +// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC721/IERC721.sol) pragma solidity ^0.8.20; /** - * @dev Required interface of an ERC721 compliant contract. + * @dev Required interface of an ERC-721 compliant contract. */ interface IERC721 is IERC165 { /** @@ -223,7 +223,7 @@ interface IERC721 is IERC165 { /** * @dev Safely transfers `tokenId` token from `from` to `to`, checking first that contract recipients - * are aware of the ERC721 protocol to prevent tokens from being forever locked. + * are aware of the ERC-721 protocol to prevent tokens from being forever locked. * * Requirements: * @@ -242,7 +242,7 @@ interface IERC721 is IERC165 { /** * @dev Transfers `tokenId` token from `from` to `to`. * - * WARNING: Note that the caller is responsible to confirm that the recipient is capable of receiving ERC721 + * WARNING: Note that the caller is responsible to confirm that the recipient is capable of receiving ERC-721 * or else they may be permanently lost. Usage of {safeTransferFrom} prevents loss, though the caller must * understand this adds an external call which potentially creates a reentrancy vulnerability. * @@ -302,15 +302,15 @@ interface IERC721 is IERC165 { } -// File @openzeppelin/contracts/token/ERC20/IERC20.sol@v5.0.2 +// File @openzeppelin/contracts/token/ERC20/IERC20.sol@v5.1.0 // Original license: SPDX_License_Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/IERC20.sol) +// OpenZeppelin Contracts (last updated v5.1.0) (token/ERC20/IERC20.sol) pragma solidity ^0.8.20; /** - * @dev Interface of the ERC20 standard as defined in the EIP. + * @dev Interface of the ERC-20 standard as defined in the ERC. */ interface IERC20 { /** @@ -385,7 +385,7 @@ interface IERC20 { } -// File eth-token-recover/contracts/recover/RecoverERC20.sol@v6.3.0 +// File eth-token-recover/contracts/recover/RecoverERC20.sol@v6.4.0 // Original license: SPDX_License_Identifier: MIT @@ -393,11 +393,11 @@ pragma solidity ^0.8.20; /** * @title RecoverERC20 - * @dev Allows to recover any ERC20 token sent into the contract and send them to a receiver. + * @dev Allows to recover any ERC-20 token sent into the contract and sends them to a receiver. */ abstract contract RecoverERC20 { /** - * @dev Recovers a `tokenAmount` of the ERC20 `tokenAddress` locked into this contract + * @dev Recovers a `tokenAmount` of the ERC-20 `tokenAddress` locked into this contract * and sends them to the `tokenReceiver` address. * * WARNING: it allows everyone to recover tokens. Access controls MUST be defined in derived contracts. @@ -413,7 +413,7 @@ abstract contract RecoverERC20 { } -// File eth-token-recover/contracts/recover/RecoverERC721.sol@v6.3.0 +// File eth-token-recover/contracts/recover/RecoverERC721.sol@v6.4.0 // Original license: SPDX_License_Identifier: MIT @@ -421,11 +421,11 @@ pragma solidity ^0.8.20; /** * @title RecoverERC721 - * @dev Allows to recover any ERC721 token sent into the contract and send them to a receiver. + * @dev Allows to recover any ERC-721 token sent into the contract and sends them to a receiver. */ abstract contract RecoverERC721 { /** - * @dev Recovers the `tokenId` of the ERC721 `tokenAddress` locked into this contract + * @dev Recovers the `tokenId` of the ERC-721 `tokenAddress` locked into this contract * and sends it to the `tokenReceiver` address. * * WARNING: it allows everyone to recover tokens. Access controls MUST be defined in derived contracts. @@ -446,7 +446,7 @@ abstract contract RecoverERC721 { } -// File eth-token-recover/contracts/TokenRecover.sol@v6.3.0 +// File eth-token-recover/contracts/TokenRecover.sol@v6.4.0 // Original license: SPDX_License_Identifier: MIT @@ -455,7 +455,8 @@ pragma solidity ^0.8.20; /** * @title TokenRecover - * @dev Allows the contract owner to recover any ERC20 or ERC721 token sent into the contract and send them to a receiver. + * @dev Allows the contract owner to recover any ERC-20 or ERC-721 token sent into the contract + * and sends them to a receiver. */ abstract contract TokenRecover is Ownable, RecoverERC20, RecoverERC721 { /** @@ -464,7 +465,7 @@ abstract contract TokenRecover is Ownable, RecoverERC20, RecoverERC721 { constructor(address initialOwner) Ownable(initialOwner) {} /** - * @dev Recovers a `tokenAmount` of the ERC20 `tokenAddress` locked into this contract + * @dev Recovers a `tokenAmount` of the ERC-20 `tokenAddress` locked into this contract * and sends them to the `tokenReceiver` address. * * NOTE: restricting access to owner only. See `RecoverERC20::_recoverERC20`. @@ -478,7 +479,7 @@ abstract contract TokenRecover is Ownable, RecoverERC20, RecoverERC721 { } /** - * @dev Recovers the `tokenId` of the ERC721 `tokenAddress` locked into this contract + * @dev Recovers the `tokenId` of the ERC-721 `tokenAddress` locked into this contract * and sends it to the `tokenReceiver` address. * * NOTE: restricting access to owner only. See `RecoverERC721::_recoverERC721`. diff --git a/package-lock.json b/package-lock.json index 5d01508..b8dc96c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@openzeppelin/contracts": "5.0.2", - "eth-token-recover": "6.3.0" + "@openzeppelin/contracts": "5.1.0", + "eth-token-recover": "6.4.0" }, "devDependencies": { "@nomiclabs/hardhat-truffle5": "^2.0.7", @@ -24,7 +24,7 @@ "eth-sig-util": "^3.0.1", "ethereumjs-wallet": "^1.0.2", "graphlib": "^2.1.8", - "hardhat": "^2.22.13", + "hardhat": "^2.22.14", "hardhat-exposed": "^0.3.15", "hardhat-gas-reporter": "^2.2.1", "lite-server": "^2.6.1", @@ -2159,28 +2159,28 @@ } }, "node_modules/@nomicfoundation/edr": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.6.3.tgz", - "integrity": "sha512-hThe5ORR75WFYTXKL0K2AyLDxkTMrG+VQ1yL9BhQYsuh3OIH+3yNDxMz2LjfvrpOrMmJ4kk5NKdFewpqDojjXQ==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.6.4.tgz", + "integrity": "sha512-YgrSuT3yo5ZQkbvBGqQ7hG+RDvz3YygSkddg4tb1Z0Y6pLXFzwrcEwWaJCFAVeeZxdxGfCgGMUYgRVneK+WXkw==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/edr-darwin-arm64": "0.6.3", - "@nomicfoundation/edr-darwin-x64": "0.6.3", - "@nomicfoundation/edr-linux-arm64-gnu": "0.6.3", - "@nomicfoundation/edr-linux-arm64-musl": "0.6.3", - "@nomicfoundation/edr-linux-x64-gnu": "0.6.3", - "@nomicfoundation/edr-linux-x64-musl": "0.6.3", - "@nomicfoundation/edr-win32-x64-msvc": "0.6.3" + "@nomicfoundation/edr-darwin-arm64": "0.6.4", + "@nomicfoundation/edr-darwin-x64": "0.6.4", + "@nomicfoundation/edr-linux-arm64-gnu": "0.6.4", + "@nomicfoundation/edr-linux-arm64-musl": "0.6.4", + "@nomicfoundation/edr-linux-x64-gnu": "0.6.4", + "@nomicfoundation/edr-linux-x64-musl": "0.6.4", + "@nomicfoundation/edr-win32-x64-msvc": "0.6.4" }, "engines": { "node": ">= 18" } }, "node_modules/@nomicfoundation/edr-darwin-arm64": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.6.3.tgz", - "integrity": "sha512-hqtI7tYDqKG5PDmZ//Z65EH5cgH8VL/SAAu50rpHP7WAVfJWkOCcYbecywwF6nhHdonJbRTDGAeG1/+VOy6zew==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.6.4.tgz", + "integrity": "sha512-QNQErISLgssV9+qia8sIjRANqtbW8snSDvjspixT/kSQ5ZSGxxctTg7x72wPSrcu8+EBEveIe5uqENIp5GH8HQ==", "dev": true, "license": "MIT", "engines": { @@ -2188,9 +2188,9 @@ } }, "node_modules/@nomicfoundation/edr-darwin-x64": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.6.3.tgz", - "integrity": "sha512-4fGi79/lyOlRUORhCYsYb3sWqRHuHT7qqzyZfZuNOn8llaxmT1k36xNmvpyg37R8SzjnhT/DzoukSJrs23Ip9Q==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.6.4.tgz", + "integrity": "sha512-cjVmREiwByyc9+oGfvAh49IAw+oVJHF9WWYRD+Tm/ZlSpnEVWxrGNBak2bd/JSYjn+mZE7gmWS4SMRi4nKaLUg==", "dev": true, "license": "MIT", "engines": { @@ -2198,9 +2198,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-arm64-gnu": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.6.3.tgz", - "integrity": "sha512-yFFTvGFMhfAvQ1Z2itUh1jpoUA+mVROyVELcaxjIq8fyg602lQmbS+NXkhQ+oaeDgJ+06mSENrHBg4fcfRf9cw==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.6.4.tgz", + "integrity": "sha512-96o9kRIVD6W5VkgKvUOGpWyUGInVQ5BRlME2Fa36YoNsRQMaKtmYJEU0ACosYES6ZTpYC8U5sjMulvPtVoEfOA==", "dev": true, "license": "MIT", "engines": { @@ -2208,9 +2208,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-arm64-musl": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.6.3.tgz", - "integrity": "sha512-pOKmd0Fa3a6BHg5qbjbl/jMRELVi9oazbfiuU7Bvgn/dpTK+ID3jwT0SXiuC2zxjmPByWgXL6G9XRf5BPAM2rQ==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.6.4.tgz", + "integrity": "sha512-+JVEW9e5plHrUfQlSgkEj/UONrIU6rADTEk+Yp9pbe+mzNkJdfJYhs5JYiLQRP4OjxH4QOrXI97bKU6FcEbt5Q==", "dev": true, "license": "MIT", "engines": { @@ -2218,9 +2218,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-x64-gnu": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.6.3.tgz", - "integrity": "sha512-3AUferhkLIXtLV63w5GjpHttzdxZ36i656XMy+pkBZbbiqnzIVeKWg6DJv1A94fQY16gB4gqj9CLq4CWvbNN6w==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.6.4.tgz", + "integrity": "sha512-nzYWW+fO3EZItOeP4CrdMgDXfaGBIBkKg0Y/7ySpUxLqzut40O4Mb0/+quqLAFkacUSWMlFp8nsmypJfOH5zoA==", "dev": true, "license": "MIT", "engines": { @@ -2228,9 +2228,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-x64-musl": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.6.3.tgz", - "integrity": "sha512-fr6bD872WIBXe9YnTDi0CzYepMcYRgSnkVqn0yK4wRnIvKrloWhxXNVY45GVIl51aNZguBnvoA4WEt6HIazs3A==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.6.4.tgz", + "integrity": "sha512-QFRoE9qSQ2boRrVeQ1HdzU+XN7NUgwZ1SIy5DQt4d7jCP+5qTNsq8LBNcqhRBOATgO63nsweNUhxX/Suj5r1Sw==", "dev": true, "license": "MIT", "engines": { @@ -2238,9 +2238,9 @@ } }, "node_modules/@nomicfoundation/edr-win32-x64-msvc": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.6.3.tgz", - "integrity": "sha512-sn34MvN1ajw2Oq1+Drpxej78Z0HfIzI4p4WlolupAV9dOZKzp2JAIQeLVfZpjIFbF3zuyxLPP4dUBrQoFPEqhA==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.6.4.tgz", + "integrity": "sha512-2yopjelNkkCvIjUgBGhrn153IBPLwnsDeNiq6oA0WkeM8tGmQi4td+PGi9jAriUDAkc59Yoi2q9hYA6efiY7Zw==", "dev": true, "license": "MIT", "engines": { @@ -2574,9 +2574,10 @@ } }, "node_modules/@openzeppelin/contracts": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", - "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.1.0.tgz", + "integrity": "sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==", + "license": "MIT" }, "node_modules/@openzeppelin/test-helpers": { "version": "0.5.16", @@ -9079,11 +9080,12 @@ } }, "node_modules/eth-token-recover": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/eth-token-recover/-/eth-token-recover-6.3.0.tgz", - "integrity": "sha512-x5XJU2Voli9NUvv6Hke8admzxckMFwGJBGjcG8EDCYoSZXwd2FiQfrXHfSI6ObZgQkKYR5ZzzN2qrykdt0mCRw==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/eth-token-recover/-/eth-token-recover-6.4.0.tgz", + "integrity": "sha512-kZqwcuibZK1MSJ1XF203x7hLrxXR8ErUQi6Pn0zbpQ9gYRthhmO5+UzGAUQ/8Uxf7BdiejWeA4cTWtfLO6Z8HQ==", + "license": "MIT", "dependencies": { - "@openzeppelin/contracts": "5.0.2" + "@openzeppelin/contracts": "5.1.0" } }, "node_modules/ethereum-bloom-filters": { @@ -10430,15 +10432,15 @@ } }, "node_modules/hardhat": { - "version": "2.22.13", - "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.22.13.tgz", - "integrity": "sha512-psVJX4FSXDpSXwsU8OcKTJN04pQEj9cFBMX5OPko+OFwbIoiOpvRmafa954/UaA1934npTj8sV3gaTSdx9bPbA==", + "version": "2.22.14", + "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.22.14.tgz", + "integrity": "sha512-sD8vHtS9l5QQVHzyPPe3auwZDJyZ0fG3Z9YENVa4oOqVEefCuHcPzdU736rei3zUKTqkX0zPIHkSMHpu02Fq1A==", "dev": true, "license": "MIT", "dependencies": { "@ethersproject/abi": "^5.1.2", "@metamask/eth-sig-util": "^4.0.0", - "@nomicfoundation/edr": "^0.6.3", + "@nomicfoundation/edr": "^0.6.4", "@nomicfoundation/ethereumjs-common": "4.0.4", "@nomicfoundation/ethereumjs-tx": "5.0.4", "@nomicfoundation/ethereumjs-util": "9.0.4", diff --git a/package.json b/package.json index e0c5622..ec298da 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "eth-sig-util": "^3.0.1", "ethereumjs-wallet": "^1.0.2", "graphlib": "^2.1.8", - "hardhat": "^2.22.13", + "hardhat": "^2.22.14", "hardhat-exposed": "^0.3.15", "hardhat-gas-reporter": "^2.2.1", "lite-server": "^2.6.1", @@ -79,7 +79,7 @@ "yargs": "^17.7.2" }, "dependencies": { - "@openzeppelin/contracts": "5.0.2", - "eth-token-recover": "6.3.0" + "@openzeppelin/contracts": "5.1.0", + "eth-token-recover": "6.4.0" } }