From 0046202b2d53b4ecf0be4747fb05a1e077f3708d Mon Sep 17 00:00:00 2001 From: JohnGuilding Date: Wed, 29 May 2024 15:10:39 +0100 Subject: [PATCH] Update and fix versions for modulekit and zkemail contracts --- foundry.toml | 2 +- package.json | 4 +- pnpm-lock.yaml | 520 +++------------------ test/integration/external/MockRegistry.sol | 23 +- 4 files changed, 70 insertions(+), 479 deletions(-) diff --git a/foundry.toml b/foundry.toml index 21ef960a..069bc8e3 100644 --- a/foundry.toml +++ b/foundry.toml @@ -3,7 +3,7 @@ emv_version = "paris" src = "src" out = "out" script = "script" -libs = ["node_modules"] +libs = ["node_modules", "lib"] fs_permissions = [{ access = "read", path = "out-optimized" }, { access = "read-write", path = "gas_calculations" }] allow_paths = ["*", "/"] diff --git a/package.json b/package.json index d465e58c..892d59e0 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "test:optimized": "pnpm run build:optimized && FOUNDRY_PROFILE=test-optimized forge test" }, "dependencies": { - "@rhinestone/modulekit": "^0.4.1", + "@rhinestone/modulekit": "v0.4.2", "@openzeppelin/contracts-upgradeable": "v5.0.1", - "@zk-email/contracts": "^6.0.2" + "@zk-email/contracts": "v6.0.3" }, "files": [ "src", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 08a9c4d6..20088b71 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,10 +12,10 @@ importers: specifier: v5.0.1 version: 5.0.1(@openzeppelin/contracts@5.0.1) '@rhinestone/modulekit': - specifier: ^0.4.1 - version: 0.4.2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)(typescript@5.3.3) + specifier: v0.4.2 + version: 0.4.2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))(typescript@5.3.3) '@zk-email/contracts': - specifier: ^6.0.2 + specifier: v6.0.3 version: 6.0.3 packages: @@ -41,183 +41,93 @@ packages: resolution: {integrity: sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==} engines: {node: '>=14'} - '@ethersproject/abi@5.4.0': - resolution: {integrity: sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==} - '@ethersproject/abi@5.7.0': resolution: {integrity: sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==} - '@ethersproject/abstract-provider@5.4.0': - resolution: {integrity: sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==} - '@ethersproject/abstract-provider@5.7.0': resolution: {integrity: sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==} - '@ethersproject/abstract-signer@5.4.0': - resolution: {integrity: sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==} - '@ethersproject/abstract-signer@5.7.0': resolution: {integrity: sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==} - '@ethersproject/address@5.4.0': - resolution: {integrity: sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==} - '@ethersproject/address@5.7.0': resolution: {integrity: sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==} - '@ethersproject/base64@5.4.0': - resolution: {integrity: sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==} - '@ethersproject/base64@5.7.0': resolution: {integrity: sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==} - '@ethersproject/basex@5.4.0': - resolution: {integrity: sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==} - '@ethersproject/basex@5.7.0': resolution: {integrity: sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==} - '@ethersproject/bignumber@5.4.0': - resolution: {integrity: sha512-OXUu9f9hO3vGRIPxU40cignXZVaYyfx6j9NNMjebKdnaCL3anCLSSy8/b8d03vY6dh7duCC0kW72GEC4tZer2w==} - '@ethersproject/bignumber@5.7.0': resolution: {integrity: sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==} - '@ethersproject/bytes@5.4.0': - resolution: {integrity: sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==} - '@ethersproject/bytes@5.7.0': resolution: {integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==} - '@ethersproject/constants@5.4.0': - resolution: {integrity: sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==} - '@ethersproject/constants@5.7.0': resolution: {integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==} - '@ethersproject/contracts@5.4.0': - resolution: {integrity: sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==} - '@ethersproject/contracts@5.7.0': resolution: {integrity: sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==} - '@ethersproject/hash@5.4.0': - resolution: {integrity: sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==} - '@ethersproject/hash@5.7.0': resolution: {integrity: sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==} - '@ethersproject/hdnode@5.4.0': - resolution: {integrity: sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==} - '@ethersproject/hdnode@5.7.0': resolution: {integrity: sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==} - '@ethersproject/json-wallets@5.4.0': - resolution: {integrity: sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==} - '@ethersproject/json-wallets@5.7.0': resolution: {integrity: sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==} - '@ethersproject/keccak256@5.4.0': - resolution: {integrity: sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==} - '@ethersproject/keccak256@5.7.0': resolution: {integrity: sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==} - '@ethersproject/logger@5.4.0': - resolution: {integrity: sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==} - '@ethersproject/logger@5.7.0': resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==} - '@ethersproject/networks@5.4.0': - resolution: {integrity: sha512-5fywtKRDcnaVeA5SjxXH3DOQqe/IbeD/plwydi94SdPps1fbDUrnO6SzDExaruBZXxpxJcO9upG9UComsei4bg==} - '@ethersproject/networks@5.7.1': resolution: {integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==} - '@ethersproject/pbkdf2@5.4.0': - resolution: {integrity: sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==} - '@ethersproject/pbkdf2@5.7.0': resolution: {integrity: sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==} - '@ethersproject/properties@5.4.0': - resolution: {integrity: sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==} - '@ethersproject/properties@5.7.0': resolution: {integrity: sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==} - '@ethersproject/providers@5.4.0': - resolution: {integrity: sha512-XRmI9syLnkNdLA8ikEeg0duxmwSWTTt9S+xabnTOyI51JPJyhQ0QUNT+wvmod218ebb7rLupHDPQ7UVe2/+Tjg==} - '@ethersproject/providers@5.7.2': resolution: {integrity: sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==} - '@ethersproject/random@5.4.0': - resolution: {integrity: sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==} - '@ethersproject/random@5.7.0': resolution: {integrity: sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==} - '@ethersproject/rlp@5.4.0': - resolution: {integrity: sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==} - '@ethersproject/rlp@5.7.0': resolution: {integrity: sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==} - '@ethersproject/sha2@5.4.0': - resolution: {integrity: sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==} - '@ethersproject/sha2@5.7.0': resolution: {integrity: sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==} - '@ethersproject/signing-key@5.4.0': - resolution: {integrity: sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==} - '@ethersproject/signing-key@5.7.0': resolution: {integrity: sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==} - '@ethersproject/solidity@5.4.0': - resolution: {integrity: sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==} - '@ethersproject/solidity@5.7.0': resolution: {integrity: sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==} - '@ethersproject/strings@5.4.0': - resolution: {integrity: sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==} - '@ethersproject/strings@5.7.0': resolution: {integrity: sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==} - '@ethersproject/transactions@5.4.0': - resolution: {integrity: sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==} - '@ethersproject/transactions@5.7.0': resolution: {integrity: sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==} - '@ethersproject/units@5.4.0': - resolution: {integrity: sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==} - '@ethersproject/units@5.7.0': resolution: {integrity: sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==} - '@ethersproject/wallet@5.4.0': - resolution: {integrity: sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==} - '@ethersproject/wallet@5.7.0': resolution: {integrity: sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==} - '@ethersproject/web@5.4.0': - resolution: {integrity: sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==} - '@ethersproject/web@5.7.1': resolution: {integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==} - '@ethersproject/wordlists@5.4.0': - resolution: {integrity: sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==} - '@ethersproject/wordlists@5.7.0': resolution: {integrity: sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==} @@ -442,22 +352,19 @@ packages: '@rhinestone/erc4337-validation@0.0.1-alpha.2': resolution: {integrity: sha512-sxBSHoR0hV0rN2bv5HfINHR3RyBChfd0OWH0TP8nlA9FolJ1EezLByxcyrvAgi2QLQ2Zf2zVcNky1qYdfF4NjQ==} - '@rhinestone/module-bases@https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562': - resolution: {tarball: https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562} - name: '@rhinestone/module-bases' + '@rhinestone/module-bases@https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/f07c146de6f37fdfa6b3084bf82dd856130a9eec': + resolution: {tarball: https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/f07c146de6f37fdfa6b3084bf82dd856130a9eec} version: 0.0.1 '@rhinestone/modulekit@0.4.2': resolution: {integrity: sha512-L1NvJw7XYkx2gTBuVvhP6U6Tk5Z7BVa/CA6KtZNRrfPuF2DneG5Ejg4S+wXUuEkkFiRudU4nADeWRkP5j/EimA==} - '@rhinestone/safe7579@https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/ed1eb51f5030631f50735cd1971203f0c5642069': - resolution: {tarball: https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/ed1eb51f5030631f50735cd1971203f0c5642069} - name: '@rhinestone/safe7579' + '@rhinestone/safe7579@https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/9365a2599bd8b04684b01a42d730eea3449281d5': + resolution: {tarball: https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/9365a2599bd8b04684b01a42d730eea3449281d5} version: 1.0.0 '@rhinestone/sentinellist@https://codeload.github.com/rhinestonewtf/sentinellist/tar.gz/446b16c3ec5ba1d0acd730ecf2bebd2ac48f915f': resolution: {tarball: https://codeload.github.com/rhinestonewtf/sentinellist/tar.gz/446b16c3ec5ba1d0acd730ecf2bebd2ac48f915f} - name: '@rhinestone/sentinellist' version: 1.0.1 '@safe-global/safe-contracts@1.4.1': @@ -582,17 +489,14 @@ packages: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2: resolution: {tarball: https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2} - name: accountabstraction version: 0.7.0 accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6: resolution: {tarball: https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6} - name: accountabstraction version: 0.6.0 accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38: resolution: {tarball: https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38} - name: accountabstraction version: 0.7.0 adm-zip@0.4.16: @@ -939,7 +843,6 @@ packages: ds-test@https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0: resolution: {tarball: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0} - name: ds-test version: 1.0.0 elliptic@6.5.4: @@ -962,9 +865,8 @@ packages: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae: - resolution: {tarball: https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae} - name: erc7579-implementation + erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779: + resolution: {tarball: https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779} version: 0.3.1 error-ex@1.3.2: @@ -1038,9 +940,6 @@ packages: ethereumjs-wallet@1.0.2: resolution: {integrity: sha512-CCWV4RESJgRdHIvFciVQFnCHfqyhXWchTPlkfp28Qc53ufs+doi5I/cV2+xeK9+qEo25XCWfP9MiL+WEPAZfdA==} - ethers@5.4.0: - resolution: {integrity: sha512-hqN1x0CV8VMpQ25WnNEjaMqtB3nA4DRAb2FSmmNaUbD1dF6kWbHs8YaXbVvD37FCg3GTEyc4rV9Pxafk1ByHKw==} - ethers@5.7.2: resolution: {integrity: sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==} @@ -1108,7 +1007,6 @@ packages: forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5: resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5} - name: forge-std version: 1.8.2 form-data-encoder@2.1.4: @@ -1380,9 +1278,6 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - js-sha3@0.5.7: - resolution: {integrity: sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==} - js-sha3@0.8.0: resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==} @@ -1872,12 +1767,10 @@ packages: solady@https://codeload.github.com/vectorized/solady/tar.gz/bfff552c0d282c15258cab9377a7d4c5247d0434: resolution: {tarball: https://codeload.github.com/vectorized/solady/tar.gz/bfff552c0d282c15258cab9377a7d4c5247d0434} - name: solady version: 0.0.201 solarray@https://codeload.github.com/sablier-labs/solarray/tar.gz/6bf10cb34cdace52a3ba5fe437e78cc82df92684: resolution: {tarball: https://codeload.github.com/sablier-labs/solarray/tar.gz/6bf10cb34cdace52a3ba5fe437e78cc82df92684} - name: solarray version: 1.0.0 solc@0.7.3: @@ -2187,18 +2080,6 @@ snapshots: ethereum-cryptography: 2.1.3 micro-ftch: 0.3.1 - '@ethersproject/abi@5.4.0': - dependencies: - '@ethersproject/address': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.7.0 - '@ethersproject/hash': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/abi@5.7.0': dependencies: '@ethersproject/address': 5.7.0 @@ -2211,16 +2092,6 @@ snapshots: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - '@ethersproject/abstract-provider@5.4.0': - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/networks': 5.7.1 - '@ethersproject/properties': 5.7.0 - '@ethersproject/transactions': 5.7.0 - '@ethersproject/web': 5.7.1 - '@ethersproject/abstract-provider@5.7.0': dependencies: '@ethersproject/bignumber': 5.7.0 @@ -2231,14 +2102,6 @@ snapshots: '@ethersproject/transactions': 5.7.0 '@ethersproject/web': 5.7.1 - '@ethersproject/abstract-signer@5.4.0': - dependencies: - '@ethersproject/abstract-provider': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/abstract-signer@5.7.0': dependencies: '@ethersproject/abstract-provider': 5.7.0 @@ -2247,14 +2110,6 @@ snapshots: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 - '@ethersproject/address@5.4.0': - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/rlp': 5.7.0 - '@ethersproject/address@5.7.0': dependencies: '@ethersproject/bignumber': 5.7.0 @@ -2263,65 +2118,29 @@ snapshots: '@ethersproject/logger': 5.7.0 '@ethersproject/rlp': 5.7.0 - '@ethersproject/base64@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/base64@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 - '@ethersproject/basex@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/basex@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/properties': 5.7.0 - '@ethersproject/bignumber@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - bn.js: 4.12.0 - '@ethersproject/bignumber@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 bn.js: 5.2.1 - '@ethersproject/bytes@5.4.0': - dependencies: - '@ethersproject/logger': 5.7.0 - '@ethersproject/bytes@5.7.0': dependencies: '@ethersproject/logger': 5.7.0 - '@ethersproject/constants@5.4.0': - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/constants@5.7.0': dependencies: '@ethersproject/bignumber': 5.7.0 - '@ethersproject/contracts@5.4.0': - dependencies: - '@ethersproject/abi': 5.7.0 - '@ethersproject/abstract-provider': 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/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/transactions': 5.7.0 - '@ethersproject/contracts@5.7.0': dependencies: '@ethersproject/abi': 5.7.0 @@ -2335,17 +2154,6 @@ snapshots: '@ethersproject/properties': 5.7.0 '@ethersproject/transactions': 5.7.0 - '@ethersproject/hash@5.4.0': - dependencies: - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/hash@5.7.0': dependencies: '@ethersproject/abstract-signer': 5.7.0 @@ -2358,21 +2166,6 @@ snapshots: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - '@ethersproject/hdnode@5.4.0': - dependencies: - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/basex': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/pbkdf2': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/sha2': 5.7.0 - '@ethersproject/signing-key': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/transactions': 5.7.0 - '@ethersproject/wordlists': 5.7.0 - '@ethersproject/hdnode@5.7.0': dependencies: '@ethersproject/abstract-signer': 5.7.0 @@ -2388,22 +2181,6 @@ snapshots: '@ethersproject/transactions': 5.7.0 '@ethersproject/wordlists': 5.7.0 - '@ethersproject/json-wallets@5.4.0': - dependencies: - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/hdnode': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/pbkdf2': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/random': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/transactions': 5.7.0 - aes-js: 3.0.0 - scrypt-js: 3.0.1 - '@ethersproject/json-wallets@5.7.0': dependencies: '@ethersproject/abstract-signer': 5.7.0 @@ -2420,71 +2197,26 @@ snapshots: aes-js: 3.0.0 scrypt-js: 3.0.1 - '@ethersproject/keccak256@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - js-sha3: 0.5.7 - '@ethersproject/keccak256@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 js-sha3: 0.8.0 - '@ethersproject/logger@5.4.0': {} - '@ethersproject/logger@5.7.0': {} - '@ethersproject/networks@5.4.0': - dependencies: - '@ethersproject/logger': 5.7.0 - '@ethersproject/networks@5.7.1': dependencies: '@ethersproject/logger': 5.7.0 - '@ethersproject/pbkdf2@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/sha2': 5.7.0 - '@ethersproject/pbkdf2@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/sha2': 5.7.0 - '@ethersproject/properties@5.4.0': - dependencies: - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties@5.7.0': dependencies: '@ethersproject/logger': 5.7.0 - '@ethersproject/providers@5.4.0': - dependencies: - '@ethersproject/abstract-provider': 5.7.0 - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.7.0 - '@ethersproject/basex': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.7.0 - '@ethersproject/hash': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/networks': 5.7.1 - '@ethersproject/properties': 5.7.0 - '@ethersproject/random': 5.7.0 - '@ethersproject/rlp': 5.7.0 - '@ethersproject/sha2': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/transactions': 5.7.0 - '@ethersproject/web': 5.7.1 - bech32: 1.1.4 - ws: 7.4.6 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - '@ethersproject/providers@5.7.2': dependencies: '@ethersproject/abstract-provider': 5.7.0 @@ -2511,47 +2243,22 @@ snapshots: - bufferutil - utf-8-validate - '@ethersproject/random@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/random@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/rlp@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/rlp@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/sha2@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - hash.js: 1.1.7 - '@ethersproject/sha2@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 hash.js: 1.1.7 - '@ethersproject/signing-key@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - bn.js: 4.12.0 - elliptic: 6.5.4 - hash.js: 1.1.7 - '@ethersproject/signing-key@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 @@ -2561,14 +2268,6 @@ snapshots: elliptic: 6.5.4 hash.js: 1.1.7 - '@ethersproject/solidity@5.4.0': - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/sha2': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/solidity@5.7.0': dependencies: '@ethersproject/bignumber': 5.7.0 @@ -2578,30 +2277,12 @@ snapshots: '@ethersproject/sha2': 5.7.0 '@ethersproject/strings': 5.7.0 - '@ethersproject/strings@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/strings@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/transactions@5.4.0': - dependencies: - '@ethersproject/address': 5.7.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/rlp': 5.7.0 - '@ethersproject/signing-key': 5.7.0 - '@ethersproject/transactions@5.7.0': dependencies: '@ethersproject/address': 5.7.0 @@ -2614,36 +2295,12 @@ snapshots: '@ethersproject/rlp': 5.7.0 '@ethersproject/signing-key': 5.7.0 - '@ethersproject/units@5.4.0': - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/constants': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/units@5.7.0': dependencies: '@ethersproject/bignumber': 5.7.0 '@ethersproject/constants': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/wallet@5.4.0': - dependencies: - '@ethersproject/abstract-provider': 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/hash': 5.7.0 - '@ethersproject/hdnode': 5.7.0 - '@ethersproject/json-wallets': 5.7.0 - '@ethersproject/keccak256': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/random': 5.7.0 - '@ethersproject/signing-key': 5.7.0 - '@ethersproject/transactions': 5.7.0 - '@ethersproject/wordlists': 5.7.0 - '@ethersproject/wallet@5.7.0': dependencies: '@ethersproject/abstract-provider': 5.7.0 @@ -2662,14 +2319,6 @@ snapshots: '@ethersproject/transactions': 5.7.0 '@ethersproject/wordlists': 5.7.0 - '@ethersproject/web@5.4.0': - dependencies: - '@ethersproject/base64': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/web@5.7.1': dependencies: '@ethersproject/base64': 5.7.0 @@ -2678,14 +2327,6 @@ snapshots: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - '@ethersproject/wordlists@5.4.0': - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/hash': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.7.0 - '@ethersproject/strings': 5.7.0 - '@ethersproject/wordlists@5.7.0': dependencies: '@ethersproject/bytes': 5.7.0 @@ -2696,9 +2337,9 @@ snapshots: '@fastify/busboy@2.1.1': {} - '@gnosis.pm/safe-contracts@1.3.0(ethers@5.4.0)': + '@gnosis.pm/safe-contracts@1.3.0(ethers@5.7.2)': dependencies: - ethers: 5.4.0 + ethers: 5.7.2 '@metamask/eth-sig-util@4.0.1': dependencies: @@ -2832,7 +2473,7 @@ snapshots: '@nomicfoundation/solidity-analyzer-win32-ia32-msvc': 0.1.1 '@nomicfoundation/solidity-analyzer-win32-x64-msvc': 0.1.1 - '@nomiclabs/hardhat-etherscan@2.1.8(hardhat@2.21.0)': + '@nomiclabs/hardhat-etherscan@2.1.8(hardhat@2.21.0(typescript@5.3.3))': dependencies: '@ethersproject/abi': 5.7.0 '@ethersproject/address': 5.7.0 @@ -2868,11 +2509,11 @@ snapshots: '@prb/math@4.0.2': {} - '@rhinestone/erc4337-validation@0.0.1-alpha.2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)(typescript@5.3.3)': + '@rhinestone/erc4337-validation@0.0.1-alpha.2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))(typescript@5.3.3)': dependencies: '@openzeppelin/contracts': 5.0.1 - account-abstraction: accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) - account-abstraction-v0.6: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + account-abstraction: accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) + account-abstraction-v0.6: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) ds-test: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 prettier: 2.8.8 @@ -2889,11 +2530,10 @@ snapshots: - typescript - utf-8-validate - '@rhinestone/module-bases@https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)': - id: '@rhinestone/module-bases@https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562' + '@rhinestone/module-bases@https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/f07c146de6f37fdfa6b3084bf82dd856130a9eec(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))': dependencies: - '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) - erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) + erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 transitivePeerDependencies: - bufferutil @@ -2905,18 +2545,18 @@ snapshots: - typechain - utf-8-validate - '@rhinestone/modulekit@0.4.2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)(typescript@5.3.3)': + '@rhinestone/modulekit@0.4.2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))(typescript@5.3.3)': dependencies: - '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) - '@ERC4337/account-abstraction-v0.6': accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) + '@ERC4337/account-abstraction-v0.6': accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@prb/math': 4.0.2 - '@rhinestone/erc4337-validation': 0.0.1-alpha.2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)(typescript@5.3.3) - '@rhinestone/module-bases': https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) - '@rhinestone/safe7579': https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/ed1eb51f5030631f50735cd1971203f0c5642069(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@rhinestone/erc4337-validation': 0.0.1-alpha.2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))(typescript@5.3.3) + '@rhinestone/module-bases': https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/f07c146de6f37fdfa6b3084bf82dd856130a9eec(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) + '@rhinestone/safe7579': https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/9365a2599bd8b04684b01a42d730eea3449281d5(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@rhinestone/sentinellist': https://codeload.github.com/rhinestonewtf/sentinellist/tar.gz/446b16c3ec5ba1d0acd730ecf2bebd2ac48f915f - '@safe-global/safe-contracts': 1.4.1(ethers@5.4.0) + '@safe-global/safe-contracts': 1.4.1(ethers@5.7.2) ds-test: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 - erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 solady: https://codeload.github.com/vectorized/solady/tar.gz/bfff552c0d282c15258cab9377a7d4c5247d0434 solarray: https://codeload.github.com/sablier-labs/solarray/tar.gz/6bf10cb34cdace52a3ba5fe437e78cc82df92684 @@ -2931,15 +2571,14 @@ snapshots: - typescript - utf-8-validate - '@rhinestone/safe7579@https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/ed1eb51f5030631f50735cd1971203f0c5642069(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)': - id: '@rhinestone/safe7579@https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/ed1eb51f5030631f50735cd1971203f0c5642069' + '@rhinestone/safe7579@https://codeload.github.com/rhinestonewtf/safe7579/tar.gz/9365a2599bd8b04684b01a42d730eea3449281d5(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))': dependencies: - '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) - '@rhinestone/module-bases': https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/7bd6daf4b00a46f8b0af161e3111242a66beb562(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@ERC4337/account-abstraction': accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) + '@rhinestone/module-bases': https://codeload.github.com/rhinestonewtf/module-bases/tar.gz/f07c146de6f37fdfa6b3084bf82dd856130a9eec(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@rhinestone/sentinellist': https://codeload.github.com/rhinestonewtf/sentinellist/tar.gz/446b16c3ec5ba1d0acd730ecf2bebd2ac48f915f - '@safe-global/safe-contracts': 1.4.1(ethers@5.4.0) + '@safe-global/safe-contracts': 1.4.1(ethers@5.7.2) ds-test: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 - erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + erc7579: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 solady: https://codeload.github.com/vectorized/solady/tar.gz/bfff552c0d282c15258cab9377a7d4c5247d0434 solarray: https://codeload.github.com/sablier-labs/solarray/tar.gz/6bf10cb34cdace52a3ba5fe437e78cc82df92684 @@ -2957,9 +2596,9 @@ snapshots: dependencies: forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 - '@safe-global/safe-contracts@1.4.1(ethers@5.4.0)': + '@safe-global/safe-contracts@1.4.1(ethers@5.7.2)': dependencies: - ethers: 5.4.0 + ethers: 5.7.2 '@scure/base@1.1.5': {} @@ -3054,7 +2693,7 @@ snapshots: - bufferutil - utf-8-validate - '@typechain/hardhat@2.3.1(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0)': + '@typechain/hardhat@2.3.1(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3))': dependencies: fs-extra: 9.1.0 hardhat: 2.21.0(typescript@5.3.3) @@ -3111,21 +2750,20 @@ snapshots: abbrev@1.0.9: {} - accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0): - id: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2 + accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)): dependencies: - '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0) + '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0(typescript@5.3.3)) '@openzeppelin/contracts': 5.0.1 '@thehubbleproject/bls': 0.5.1 - '@typechain/hardhat': 2.3.1(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@typechain/hardhat': 2.3.1(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@types/debug': 4.1.12 '@types/mocha': 9.1.1 debug: 4.3.4(supports-color@8.1.1) ethereumjs-util: 7.1.5 ethereumjs-wallet: 1.0.2 hardhat-deploy: 0.11.45 - hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.4.0)(hardhat@2.21.0) - solidity-coverage: 0.8.10(hardhat@2.21.0) + hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3)) + solidity-coverage: 0.8.10(hardhat@2.21.0(typescript@5.3.3)) source-map-support: 0.5.21 table: 6.8.1 typescript: 4.9.5 @@ -3139,20 +2777,19 @@ snapshots: - typechain - utf-8-validate - accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0): - id: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6 + accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/7174d6d845618dbd11cee68eefa715f5263690b6(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)): dependencies: - '@gnosis.pm/safe-contracts': 1.3.0(ethers@5.4.0) - '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0) + '@gnosis.pm/safe-contracts': 1.3.0(ethers@5.7.2) + '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0(typescript@5.3.3)) '@openzeppelin/contracts': 4.9.6 '@thehubbleproject/bls': 0.5.1 - '@typechain/hardhat': 2.3.1(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@typechain/hardhat': 2.3.1(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@types/mocha': 9.1.1 ethereumjs-util: 7.1.5 ethereumjs-wallet: 1.0.2 hardhat-deploy: 0.11.45 - hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.4.0)(hardhat@2.21.0) - solidity-coverage: 0.8.10(hardhat@2.21.0) + hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3)) + solidity-coverage: 0.8.10(hardhat@2.21.0(typescript@5.3.3)) source-map-support: 0.5.21 table: 6.8.1 typescript: 4.9.5 @@ -3166,21 +2803,20 @@ snapshots: - typechain - utf-8-validate - accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0): - id: accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38 + accountabstraction@https://codeload.github.com/kopy-kat/account-abstraction/tar.gz/c5887153fbfe3ed09b2637cac39873f96d676f38(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)): dependencies: - '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0) + '@nomiclabs/hardhat-etherscan': 2.1.8(hardhat@2.21.0(typescript@5.3.3)) '@openzeppelin/contracts': 5.0.1 '@thehubbleproject/bls': 0.5.1 - '@typechain/hardhat': 2.3.1(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + '@typechain/hardhat': 2.3.1(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) '@types/debug': 4.1.12 '@types/mocha': 9.1.1 debug: 4.3.4(supports-color@8.1.1) ethereumjs-util: 7.1.5 ethereumjs-wallet: 1.0.2 hardhat-deploy: 0.11.45 - hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.4.0)(hardhat@2.21.0) - solidity-coverage: 0.8.10(hardhat@2.21.0) + hardhat-deploy-ethers: 0.3.0-beta.13(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3)) + solidity-coverage: 0.8.10(hardhat@2.21.0(typescript@5.3.3)) source-map-support: 0.5.21 table: 6.8.1 typescript: 4.9.5 @@ -3488,6 +3124,7 @@ snapshots: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 + optionalDependencies: typescript: 5.3.3 create-hash@1.2.0: @@ -3512,6 +3149,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: {} @@ -3581,11 +3219,10 @@ snapshots: env-paths@2.2.1: {} - erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0): - id: erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/c1a0fa69d08f7992bc4e910b4a108fb21fc10fae + erc7579-implementation@https://codeload.github.com/erc7579/erc7579-implementation/tar.gz/338bf8af011aa1588b5e1b2a19d1d7ead33bf779(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)): dependencies: '@rhinestone/sentinellist': https://codeload.github.com/rhinestonewtf/sentinellist/tar.gz/446b16c3ec5ba1d0acd730ecf2bebd2ac48f915f - account-abstraction: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2(ethers@5.4.0)(hardhat@2.21.0)(lodash@4.17.21)(typechain@5.2.0) + account-abstraction: accountabstraction@https://codeload.github.com/eth-infinitism/account-abstraction/tar.gz/62e1cf39220321a6e1c7bef51e974c3bf8a4e2e2(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3))(lodash@4.17.21)(typechain@5.2.0(typescript@5.3.3)) ds-test: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5 solady: https://codeload.github.com/vectorized/solady/tar.gz/bfff552c0d282c15258cab9377a7d4c5247d0434 @@ -3702,42 +3339,6 @@ snapshots: utf8: 3.0.0 uuid: 8.3.2 - ethers@5.4.0: - dependencies: - '@ethersproject/abi': 5.4.0 - '@ethersproject/abstract-provider': 5.4.0 - '@ethersproject/abstract-signer': 5.4.0 - '@ethersproject/address': 5.4.0 - '@ethersproject/base64': 5.4.0 - '@ethersproject/basex': 5.4.0 - '@ethersproject/bignumber': 5.4.0 - '@ethersproject/bytes': 5.4.0 - '@ethersproject/constants': 5.4.0 - '@ethersproject/contracts': 5.4.0 - '@ethersproject/hash': 5.4.0 - '@ethersproject/hdnode': 5.4.0 - '@ethersproject/json-wallets': 5.4.0 - '@ethersproject/keccak256': 5.4.0 - '@ethersproject/logger': 5.4.0 - '@ethersproject/networks': 5.4.0 - '@ethersproject/pbkdf2': 5.4.0 - '@ethersproject/properties': 5.4.0 - '@ethersproject/providers': 5.4.0 - '@ethersproject/random': 5.4.0 - '@ethersproject/rlp': 5.4.0 - '@ethersproject/sha2': 5.4.0 - '@ethersproject/signing-key': 5.4.0 - '@ethersproject/solidity': 5.4.0 - '@ethersproject/strings': 5.4.0 - '@ethersproject/transactions': 5.4.0 - '@ethersproject/units': 5.4.0 - '@ethersproject/wallet': 5.4.0 - '@ethersproject/web': 5.4.0 - '@ethersproject/wordlists': 5.4.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - ethers@5.7.2: dependencies: '@ethersproject/abi': 5.7.0 @@ -3834,7 +3435,7 @@ snapshots: imul: 1.0.1 follow-redirects@1.15.5(debug@4.3.4): - dependencies: + optionalDependencies: debug: 4.3.4(supports-color@8.1.1) forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/52715a217dc51d0de15877878ab8213f6cbbbab5: {} @@ -3996,9 +3597,9 @@ snapshots: optionalDependencies: uglify-js: 3.17.4 - hardhat-deploy-ethers@0.3.0-beta.13(ethers@5.4.0)(hardhat@2.21.0): + hardhat-deploy-ethers@0.3.0-beta.13(ethers@5.7.2)(hardhat@2.21.0(typescript@5.3.3)): dependencies: - ethers: 5.4.0 + ethers: 5.7.2 hardhat: 2.21.0(typescript@5.3.3) hardhat-deploy@0.11.45: @@ -4074,10 +3675,11 @@ snapshots: source-map-support: 0.5.21 stacktrace-parser: 0.1.10 tsort: 0.0.1 - typescript: 5.3.3 undici: 5.28.3 uuid: 8.3.2 ws: 7.5.9 + optionalDependencies: + typescript: 5.3.3 transitivePeerDependencies: - bufferutil - c-kzg @@ -4205,8 +3807,6 @@ snapshots: isexe@2.0.0: {} - js-sha3@0.5.7: {} - js-sha3@0.8.0: {} js-tokens@4.0.0: {} @@ -4731,7 +4331,7 @@ snapshots: transitivePeerDependencies: - typescript - solidity-coverage@0.8.10(hardhat@2.21.0): + solidity-coverage@0.8.10(hardhat@2.21.0(typescript@5.3.3)): dependencies: '@ethersproject/abi': 5.7.0 '@solidity-parser/parser': 0.18.0 diff --git a/test/integration/external/MockRegistry.sol b/test/integration/external/MockRegistry.sol index 341ecc6d..f15ad199 100644 --- a/test/integration/external/MockRegistry.sol +++ b/test/integration/external/MockRegistry.sol @@ -5,17 +5,16 @@ import {IERC7484} from "safe7579/interfaces/IERC7484.sol"; /** Used to setup the Safe in SafeIntegrationBase.sol. Taken from safe7579/test/mocks/MockRegistry.sol */ contract MockRegistry is IERC7484 { - event NewTrustedAttesters(); event Log(address sender); - function check(address module) external view override {} + function check(address module) external view {} function checkForAccount( address smartAccount, address module - ) external view override {} + ) external view {} - function check(address module, uint256 moduleType) external view override {} + function check(address module, uint256 moduleType) external view {} function checkForAccount( address smartAccount, @@ -23,31 +22,23 @@ contract MockRegistry is IERC7484 { uint256 moduleType ) external view override {} - function check(address module, address attester) external view override {} - function check( - address module, - uint256 moduleType, - address attester - ) external view override {} - - function checkN( address module, address[] calldata attesters, uint256 threshold - ) external view override {} + ) external view {} - function checkN( + function check( address module, uint256 moduleType, address[] calldata attesters, uint256 threshold - ) external view override {} + ) external view {} function trustAttesters( uint8 threshold, address[] calldata attesters - ) external override { + ) external { emit Log(msg.sender); emit NewTrustedAttesters(); }