diff --git a/contracts/EscrowFactory.sol b/contracts/EscrowFactory.sol index 78e21d5..b2e054a 100644 --- a/contracts/EscrowFactory.sol +++ b/contracts/EscrowFactory.sol @@ -5,6 +5,7 @@ pragma solidity 0.8.23; import { IOrderMixin } from "@1inch/limit-order-protocol-contract/contracts/interfaces/IOrderMixin.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { ExtensionBase } from "@1inch/limit-order-settlement/contracts/ExtensionBase.sol"; import { Address, AddressLib } from "@1inch/solidity-utils/contracts/libraries/AddressLib.sol"; import { SafeERC20 } from "@1inch/solidity-utils/contracts/libraries/SafeERC20.sol"; import { ClonesWithImmutableArgs } from "clones-with-immutable-args/ClonesWithImmutableArgs.sol"; @@ -12,29 +13,21 @@ import { ClonesWithImmutableArgs } from "clones-with-immutable-args/ClonesWithIm import { IEscrowFactory } from "./interfaces/IEscrowFactory.sol"; import { Escrow } from "./Escrow.sol"; -contract EscrowFactory is IEscrowFactory { +contract EscrowFactory is IEscrowFactory, ExtensionBase { using AddressLib for Address; using ClonesWithImmutableArgs for address; using SafeERC20 for IERC20; address public immutable IMPLEMENTATION; - address public immutable LIMIT_ORDER_PROTOCOL; - /// @dev Modifier to check if the caller is the limit order protocol contract. - modifier onlyLimitOrderProtocol { - if (msg.sender != LIMIT_ORDER_PROTOCOL) revert OnlyLimitOrderProtocol(); - _; - } - - constructor(address implementation, address limitOrderProtocol) { + constructor(address implementation, address limitOrderProtocol) ExtensionBase(limitOrderProtocol) { IMPLEMENTATION = implementation; - LIMIT_ORDER_PROTOCOL = limitOrderProtocol; } /** * @dev Creates a new escrow contract for maker. */ - function postInteraction( + function _postInteraction( IOrderMixin.Order calldata order, bytes calldata /* extension */, bytes32 orderHash, @@ -43,7 +36,7 @@ contract EscrowFactory is IEscrowFactory { uint256 takingAmount, uint256 /* remainingMakingAmount */, bytes calldata extraData - ) external onlyLimitOrderProtocol { + ) internal override { bytes memory interactionParams = abi.encode( order.maker, taker, diff --git a/contracts/interfaces/IEscrowFactory.sol b/contracts/interfaces/IEscrowFactory.sol index 96f1a42..84d00fe 100644 --- a/contracts/interfaces/IEscrowFactory.sol +++ b/contracts/interfaces/IEscrowFactory.sol @@ -18,5 +18,4 @@ interface IEscrowFactory { error InsufficientEscrowBalance(); error InvalidCreationTime(); - error OnlyLimitOrderProtocol(); } diff --git a/hardhat.config.js b/hardhat.config.js index db74473..7674424 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -3,7 +3,7 @@ require('@nomicfoundation/hardhat-ethers'); require('@nomicfoundation/hardhat-verify'); require('dotenv').config(); require('hardhat-dependency-compiler'); -// require('hardhat-deploy'); +require('hardhat-deploy'); require('hardhat-gas-reporter'); // require('hardhat-tracer'); require('solidity-coverage'); diff --git a/package.json b/package.json index b277c34..89a7b87 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,10 @@ }, "license": "MIT", "dependencies": { - "@1inch/solidity-utils": "3.5.4", + "@1inch/solidity-utils": "3.5.5", "@openzeppelin/contracts": "5.0.1", - "@1inch/limit-order-protocol-contract": "4.0.0-prerelease-15" + "@1inch/limit-order-protocol-contract": "4.0.0-prerelease-16", + "@1inch/limit-order-settlement": "2.0.0-prerelease-3" }, "devDependencies": { "@nomicfoundation/hardhat-chai-matchers": "2.0.2", diff --git a/yarn.lock b/yarn.lock index 833d3e3..38650fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,45 +2,80 @@ # yarn lockfile v1 -"@1inch/limit-order-protocol-contract@4.0.0-prerelease-15": - version "4.0.0-prerelease-15" - resolved "https://registry.yarnpkg.com/@1inch/limit-order-protocol-contract/-/limit-order-protocol-contract-4.0.0-prerelease-15.tgz#574b1ca2b19b47d8d6d071e80ecc0f9010d273d0" - integrity sha512-lKV5biQWgVDdSEwTitfXbuEZuBou1E7tN6NikS1Y+dPmPTESGkd5YLEycGJILw6VXx/f5fbLo65rbX6tlolxQw== +"@1inch/delegating@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@1inch/delegating/-/delegating-1.1.0.tgz#d7a14c5033ffa297e92d78c96b71aecc5162795f" + integrity sha512-7FGsu7xRYy/hEhOmlj60rJ4yrhtEWPX6ikqq7dbadWZpdqg+Mfe3rHOUZ2sV/YgRLZu4N+VDNzKhv0mws/oo8g== + dependencies: + "@1inch/farming" "3.2.0" + "@1inch/solidity-utils" "3.5.5" + "@1inch/token-plugins" "1.3.0" + "@openzeppelin/contracts" "5.0.1" + +"@1inch/farming@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@1inch/farming/-/farming-3.2.0.tgz#0091a713f7df3c99050e7a98b5d168ddc83fb3de" + integrity sha512-5XM2hH5fC5pkCYW6diCl2/TuaitPHQbkqfIOFgXyBUFqKey9+ZaKG/qtKTtS8r2S2SACjUiM54lczVMw4meZfg== + dependencies: + "@1inch/solidity-utils" "3.5.5" + "@1inch/token-plugins" "1.3.0" + "@openzeppelin/contracts" "5.0.1" + +"@1inch/limit-order-protocol-contract@4.0.0-prerelease-16": + version "4.0.0-prerelease-16" + resolved "https://registry.yarnpkg.com/@1inch/limit-order-protocol-contract/-/limit-order-protocol-contract-4.0.0-prerelease-16.tgz#95863fc36e83901d4b83c897390c6440b93317d1" + integrity sha512-d3AHzXIjMyfGUwZwpqoBSGYEmqO/mm14FCAAEgK4gumCdrPkacdXOosujs9eutEr3zyBPh5Q3BxeWi3wwkDgMA== dependencies: - "@1inch/solidity-utils" "2.2.27" + "@1inch/solidity-utils" "3.5.5" "@chainlink/contracts" "0.6.1" - "@openzeppelin/contracts" "4.9.0" - -"@1inch/solidity-utils@2.2.27": - version "2.2.27" - resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-2.2.27.tgz#28a131304788674042dae002e817b2cd9346f232" - integrity sha512-rybgnA5Bd1+XRrAdIK3sNWWIMXZ5tWl4Ds4IwZVCzAXMLvxdXnJyb6zm//uuko9cRH63aDjct5Mzf+ggg36AJg== - dependencies: - "@metamask/eth-sig-util" "5.0.2" - "@nomicfoundation/hardhat-network-helpers" "1.0.8" - "@nomiclabs/hardhat-ethers" "2.2.2" - "@openzeppelin/contracts" "4.8.2" - "@uniswap/permit2-sdk" "^1.2.0" - ethereumjs-util "7.1.5" - ethers "5.7.2" + "@openzeppelin/contracts" "5.0.1" + +"@1inch/limit-order-settlement@2.0.0-prerelease-3": + version "2.0.0-prerelease-3" + resolved "https://registry.yarnpkg.com/@1inch/limit-order-settlement/-/limit-order-settlement-2.0.0-prerelease-3.tgz#0767f1333db4b4c4fae4406f6c9edbeb6d92310a" + integrity sha512-U8v+pbR2stCvAHQU8TnSP/L9cKQ71EP4PvswjbMXawoNYUIBr7c/RzqC6wzfIlRC3v2M9FyperbAx82wmtNyjg== + dependencies: + "@1inch/delegating" "1.1.0" + "@1inch/limit-order-protocol-contract" "4.0.0-prerelease-16" + "@1inch/solidity-utils" "3.5.5" + "@1inch/st1inch" "2.2.0" + "@openzeppelin/contracts" "5.0.1" -"@1inch/solidity-utils@3.5.4": - version "3.5.4" - resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-3.5.4.tgz#427147f300eb8cbdee2e3512dca96e2e15101ca7" - integrity sha512-uX4vhCMBw/2z+fNCfZQ0H2RPMva0wp62voZ2mwTktIPLLp0d5xslvmoJPbuLq6vDn1EWo3trw3u/qeGDn1n0KQ== +"@1inch/solidity-utils@3.5.5": + version "3.5.5" + resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-3.5.5.tgz#14353aa36270e4213927c7de31088953aa277a25" + integrity sha512-uX9fzLLxQIvXB4gIczTZ11C2tRrqswJsXV7WNhdPn5CZnCrp8gyBGnuxLjEbY1jZK+NPs2AtZB7FD+/+0ZN+Kg== dependencies: - "@metamask/eth-sig-util" "7.0.0" + "@metamask/eth-sig-util" "7.0.1" "@nomicfoundation/hardhat-ethers" "3.0.5" - "@nomicfoundation/hardhat-network-helpers" "1.0.9" - "@nomicfoundation/hardhat-verify" "2.0.1" - "@openzeppelin/contracts" "5.0.0" + "@nomicfoundation/hardhat-network-helpers" "1.0.10" + "@nomicfoundation/hardhat-verify" "2.0.2" + "@openzeppelin/contracts" "5.0.1" "@uniswap/permit2-sdk" "1.2.0" chai "4.3.10" dotenv "16.3.1" ethereumjs-util "7.1.5" - ethers "6.8.1" - hardhat "2.19.1" - hardhat-deploy "0.11.43" + ethers "6.9.0" + hardhat "2.19.2" + hardhat-deploy "0.11.44" + +"@1inch/st1inch@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@1inch/st1inch/-/st1inch-2.2.0.tgz#3dc39ee49d6954613dc951233afdd0c766864507" + integrity sha512-bsle68chQS/d2K1//1S6u9g/Yq3so1qtuQEXIJw9vs74lZbdpLUcgMTQ9MTmGaCfs4cn2Da2MmTKSLX/yXMnog== + dependencies: + "@1inch/farming" "3.2.0" + "@1inch/solidity-utils" "3.5.5" + "@1inch/token-plugins" "1.3.0" + "@openzeppelin/contracts" "5.0.1" + +"@1inch/token-plugins@1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@1inch/token-plugins/-/token-plugins-1.3.0.tgz#365d50d4953225816a4749301150c6612b13e874" + integrity sha512-Um/8GKAC2Q2C6sITmGj+zr1xiJ3/jPtR/FllwMsDrdfEr7+AVbKH+GL755A7/MS8qz2Df10gSS8iz9Dj/N7/0g== + dependencies: + "@1inch/solidity-utils" "3.5.5" + "@openzeppelin/contracts" "5.0.1" "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -213,7 +248,7 @@ "@ethereumjs/util" "^8.1.0" ethereum-cryptography "^2.0.0" -"@ethereumjs/util@^8.0.0", "@ethereumjs/util@^8.1.0": +"@ethereumjs/util@^8.1.0": version "8.1.0" resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.1.0.tgz#299df97fb6b034e0577ce9f94c7d9d1004409ed4" integrity sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA== @@ -626,28 +661,15 @@ "@metamask/utils" "^8.0.0" superstruct "^1.0.3" -"@metamask/eth-sig-util@5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-5.0.2.tgz#c518279a6e17a88135a13d53a0b970f145ff8bce" - integrity sha512-RU6fG/H6/UlBol221uBkq5C7w3TwLK611nEZliO2u+kO0vHKGBXnIPlhI0tzKUigjhUeOd9mhCNbNvhh0LKt9Q== - dependencies: - "@ethereumjs/util" "^8.0.0" - bn.js "^4.11.8" - ethereum-cryptography "^1.1.2" - ethjs-util "^0.1.6" - tweetnacl "^1.0.3" - tweetnacl-util "^0.15.1" - -"@metamask/eth-sig-util@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.0.tgz#b035a2b826018578a5d463668bb64828271376d8" - integrity sha512-8KeXZB4SKx3EfNS5ahbjUMegyGvDQYk6Nk3hmM658sXpfAQR5ZlIXBgj+9RF+ZROqsU6EuNVgKt7Fr10re60PQ== +"@metamask/eth-sig-util@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.1.tgz#ad3227d6120f15f9293478de7dd9685a5c329586" + integrity sha512-59GSrMyFH2fPfu7nKeIQdZ150zxXNNhAQIUaFRUW+MGtVA4w/ONbiQobcRBLi+jQProfIyss51G8pfLPcQ0ylg== dependencies: "@ethereumjs/util" "^8.1.0" "@metamask/abi-utils" "^2.0.2" "@metamask/utils" "^8.1.0" ethereum-cryptography "^2.1.2" - ethjs-util "^0.1.6" tweetnacl "^1.0.3" tweetnacl-util "^0.15.1" @@ -895,35 +917,6 @@ dependencies: ethereumjs-util "^7.1.4" -"@nomicfoundation/hardhat-network-helpers@1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.8.tgz#e4fe1be93e8a65508c46d73c41fa26c7e9f84931" - integrity sha512-MNqQbzUJZnCMIYvlniC3U+kcavz/PhhQSsY90tbEtUyMj/IQqsLwIRZa4ctjABh3Bz0KCh9OXUZ7Yk/d9hr45Q== - dependencies: - ethereumjs-util "^7.1.4" - -"@nomicfoundation/hardhat-network-helpers@1.0.9": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.9.tgz#767449e8a2acda79306ac84626117583d95d25aa" - integrity sha512-OXWCv0cHpwLUO2u7bFxBna6dQtCC2Gg/aN/KtJLO7gmuuA28vgmVKYFRCDUqrbjujzgfwQ2aKyZ9Y3vSmDqS7Q== - dependencies: - ethereumjs-util "^7.1.4" - -"@nomicfoundation/hardhat-verify@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.0.1.tgz#1b9d707516f8e5db4e1d6bd679acbfd71e567928" - integrity sha512-TuJrhW5p9x92wDRiRhNkGQ/wzRmOkfCLkoRg8+IRxyeLigOALbayQEmkNiGWR03vGlxZS4znXhKI7y97JwZ6Og== - dependencies: - "@ethersproject/abi" "^5.1.2" - "@ethersproject/address" "^5.0.2" - cbor "^8.1.0" - chalk "^2.4.2" - debug "^4.1.1" - lodash.clonedeep "^4.5.0" - semver "^6.3.0" - table "^6.8.0" - undici "^5.14.0" - "@nomicfoundation/hardhat-verify@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.0.2.tgz#085f8509a335db44ea3bf39a8561f1ce0462fea2" @@ -1005,11 +998,6 @@ "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1" "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1" -"@nomiclabs/hardhat-ethers@2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.2.tgz#812d48929c3bf8fe840ec29eab4b613693467679" - integrity sha512-NLDlDFL2us07C0jB/9wzvR0kuLivChJWCXTKcj3yqjZqMoYp7g7wwS157F70VHx/+9gHIBGzak5pKDwG8gEefA== - "@oclif/command@^1.8.0": version "1.8.36" resolved "https://registry.yarnpkg.com/@oclif/command/-/command-1.8.36.tgz#9739b9c268580d064a50887c4597d1b4e86ca8b5" @@ -1138,21 +1126,6 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2.tgz#d81f786fda2871d1eb8a8c5a73e455753ba53527" integrity sha512-z0zMCjyhhp4y7XKAcDAi3Vgms4T2PstwBdahiO0+9NaGICQKjynK3wduSRplTgk4LXmoO1yfDGO5RbjKYxtuxA== -"@openzeppelin/contracts@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.2.tgz#d815ade0027b50beb9bcca67143c6bcc3e3923d6" - integrity sha512-kEUOgPQszC0fSYWpbh2kT94ltOJwj1qfT2DWo+zVttmGmf97JZ99LspePNaeeaLhCImaHVeBbjaQFZQn7+Zc5g== - -"@openzeppelin/contracts@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.0.tgz#683f33b6598970051bc5f0806fd8660da9e018dd" - integrity sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA== - -"@openzeppelin/contracts@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.0.tgz#ee0e4b4564f101a5c4ee398cd4d73c0bd92b289c" - integrity sha512-bv2sdS6LKqVVMLI5+zqnNrNU/CA+6z6CmwFXm/MzmOPBRSO5reEJN7z0Gbzvs0/bv/MZZXNklubpwy3v2+azsw== - "@openzeppelin/contracts@5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.1.tgz#93da90fc209a0a4ff09c1deb037fbb35e4020890" @@ -1421,9 +1394,9 @@ "@types/node" "*" "@types/qs@^6.2.31", "@types/qs@^6.9.7": - version "6.9.10" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.10.tgz#0af26845b5067e1c9a622658a51f60a3934d51e8" - integrity sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw== + version "6.9.11" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda" + integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== "@types/readable-stream@^2.3.13": version "2.3.15" @@ -1445,7 +1418,7 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@uniswap/permit2-sdk@1.2.0", "@uniswap/permit2-sdk@^1.2.0": +"@uniswap/permit2-sdk@1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@uniswap/permit2-sdk/-/permit2-sdk-1.2.0.tgz#ed86440a87a6c318169c8e6f161fc263ad040891" integrity sha512-Ietv3FxN7+RCXcPSED/i/8b0a2GUZrMdyX05k3FsSztvYKyPFAMS/hBXojF0NZqYB1bHecqYc7Ej+7tV/rdYXg== @@ -2754,7 +2727,7 @@ ethereum-cryptography@0.1.3, ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -ethereum-cryptography@^1.0.3, ethereum-cryptography@^1.1.2: +ethereum-cryptography@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz#5ccfa183e85fdaf9f9b299a79430c044268c9b3a" integrity sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw== @@ -2806,7 +2779,20 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.1: ethjs-util "0.1.6" rlp "^2.2.3" -ethers@5.7.2, ethers@^5.3.1, ethers@^5.6.1, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: +ethers@6.9.0: + version "6.9.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.9.0.tgz#a4534bdcdfde306aee94ef32f3d5c70d7e33fcb9" + integrity sha512-pmfNyQzc2mseLe91FnT2vmNaTt8dDzhxZ/xItAV7uGsF4dI4ek2ufMu3rAkgQETL/TIs0GS5A+U05g9QyWnv3Q== + dependencies: + "@adraffy/ens-normalize" "1.10.0" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "18.15.13" + aes-js "4.0.0-beta.5" + tslib "2.4.0" + ws "8.5.0" + +ethers@^5.3.1, ethers@^5.6.1, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -2842,32 +2828,6 @@ ethers@5.7.2, ethers@^5.3.1, ethers@^5.6.1, ethers@^5.7.0, ethers@^5.7.1, ethers "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethers@6.8.1: - version "6.8.1" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.8.1.tgz#ee2a1a39b5f62a13678f90ccd879175391d0a2b4" - integrity sha512-iEKm6zox5h1lDn6scuRWdIdFJUCGg3+/aQWu0F4K0GVyEZiktFkqrJbRjTn1FlYEPz7RKA707D6g5Kdk6j7Ljg== - dependencies: - "@adraffy/ens-normalize" "1.10.0" - "@noble/curves" "1.2.0" - "@noble/hashes" "1.3.2" - "@types/node" "18.15.13" - aes-js "4.0.0-beta.5" - tslib "2.4.0" - ws "8.5.0" - -ethers@6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.9.0.tgz#a4534bdcdfde306aee94ef32f3d5c70d7e33fcb9" - integrity sha512-pmfNyQzc2mseLe91FnT2vmNaTt8dDzhxZ/xItAV7uGsF4dI4ek2ufMu3rAkgQETL/TIs0GS5A+U05g9QyWnv3Q== - dependencies: - "@adraffy/ens-normalize" "1.10.0" - "@noble/curves" "1.2.0" - "@noble/hashes" "1.3.2" - "@types/node" "18.15.13" - aes-js "4.0.0-beta.5" - tslib "2.4.0" - ws "8.5.0" - ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -3332,36 +3292,6 @@ hardhat-dependency-compiler@1.1.3: resolved "https://registry.yarnpkg.com/hardhat-dependency-compiler/-/hardhat-dependency-compiler-1.1.3.tgz#1e49e23f68878bd713f860c66648a711bc4a4a79" integrity sha512-bCDqsOxGST6WkbMvj4lPchYWidNSSBm5CFnkyAex1T11cGmr9otZTGl81W6f9pmrtBXbKCvr3OSuNJ6Q394sAw== -hardhat-deploy@0.11.43: - version "0.11.43" - resolved "https://registry.yarnpkg.com/hardhat-deploy/-/hardhat-deploy-0.11.43.tgz#b22ff15b3ea201b72ba0f17f4b2e182cc950e73e" - integrity sha512-D760CjDtinwjOCpKOvdyRtIJYLQIYXmhfgkFe+AkxlYM9bPZ/T4tZ/xIB2tR89ZT+z0hF1YuZFBXIL3/G/9T5g== - dependencies: - "@ethersproject/abi" "^5.7.0" - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/constants" "^5.7.0" - "@ethersproject/contracts" "^5.7.0" - "@ethersproject/providers" "^5.7.2" - "@ethersproject/solidity" "^5.7.0" - "@ethersproject/transactions" "^5.7.0" - "@ethersproject/wallet" "^5.7.0" - "@types/qs" "^6.9.7" - axios "^0.21.1" - chalk "^4.1.2" - chokidar "^3.5.2" - debug "^4.3.2" - enquirer "^2.3.6" - ethers "^5.7.0" - form-data "^4.0.0" - fs-extra "^10.0.0" - match-all "^1.2.6" - murmur-128 "^0.2.1" - qs "^6.9.4" - zksync-web3 "^0.14.3" - hardhat-deploy@0.11.44: version "0.11.44" resolved "https://registry.yarnpkg.com/hardhat-deploy/-/hardhat-deploy-0.11.44.tgz#a7a771a675a3837ce4c321f2c18d4b6fa1ed03a0" @@ -3410,60 +3340,6 @@ hardhat-tracer@2.7.0: debug "^4.3.4" ethers "^5.6.1" -hardhat@2.19.1: - version "2.19.1" - resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.1.tgz#5e09e8070ecfc6109ba9d3a4a117ec2b0643032a" - integrity sha512-bsWa63g1GB78ZyMN08WLhFElLPA+J+pShuKD1BFO2+88g3l+BL3R07vj9deIi9dMbssxgE714Gof1dBEDGqnCw== - dependencies: - "@ethersproject/abi" "^5.1.2" - "@metamask/eth-sig-util" "^4.0.0" - "@nomicfoundation/ethereumjs-block" "5.0.2" - "@nomicfoundation/ethereumjs-blockchain" "7.0.2" - "@nomicfoundation/ethereumjs-common" "4.0.2" - "@nomicfoundation/ethereumjs-evm" "2.0.2" - "@nomicfoundation/ethereumjs-rlp" "5.0.2" - "@nomicfoundation/ethereumjs-statemanager" "2.0.2" - "@nomicfoundation/ethereumjs-trie" "6.0.2" - "@nomicfoundation/ethereumjs-tx" "5.0.2" - "@nomicfoundation/ethereumjs-util" "9.0.2" - "@nomicfoundation/ethereumjs-vm" "7.0.2" - "@nomicfoundation/solidity-analyzer" "^0.1.0" - "@sentry/node" "^5.18.1" - "@types/bn.js" "^5.1.0" - "@types/lru-cache" "^5.1.0" - adm-zip "^0.4.16" - aggregate-error "^3.0.0" - ansi-escapes "^4.3.0" - chalk "^2.4.2" - chokidar "^3.4.0" - ci-info "^2.0.0" - debug "^4.1.1" - enquirer "^2.3.0" - env-paths "^2.2.0" - ethereum-cryptography "^1.0.3" - ethereumjs-abi "^0.6.8" - find-up "^2.1.0" - fp-ts "1.19.3" - fs-extra "^7.0.1" - glob "7.2.0" - immutable "^4.0.0-rc.12" - io-ts "1.10.4" - keccak "^3.0.2" - lodash "^4.17.11" - mnemonist "^0.38.0" - mocha "^10.0.0" - p-map "^4.0.0" - raw-body "^2.4.1" - resolve "1.17.0" - semver "^6.3.0" - solc "0.7.3" - source-map-support "^0.5.13" - stacktrace-parser "^0.1.10" - tsort "0.0.1" - undici "^5.14.0" - uuid "^8.3.2" - ws "^7.4.6" - hardhat@2.19.2: version "2.19.2" resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.2.tgz#815819e4efd234941d495decb718b358d572e2c8"